diff -Nru gnome-session-3.9.90/aclocal.m4 gnome-session-3.14.0/aclocal.m4 --- gnome-session-3.9.90/aclocal.m4 2013-08-20 14:50:04.000000000 +0000 +++ gnome-session-3.14.0/aclocal.m4 2014-09-22 14:19:22.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -512,17 +512,27 @@ AC_SUBST(DISABLE_DEPRECATED) ]) +# gnome-compiler-flags.m4 +# +# serial 2 +# + dnl GNOME_COMPILE_WARNINGS dnl Turn on many useful compiler warnings and substitute the result into dnl WARN_CFLAGS dnl For now, only works on GCC +dnl Pass the default value of the --enable-compile-warnings configure option as +dnl the first argument to the macro, defaulting to 'yes'. +dnl Additional warning/error flags can be passed as an optional second argument. +dnl +dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) AC_DEFUN([GNOME_COMPILE_WARNINGS],[ dnl ****************************** dnl More compiler warnings dnl ****************************** AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], [Turn on compiler warnings]),, [enable_compile_warnings="m4_default([$1],[yes])"]) @@ -555,6 +565,11 @@ -Werror=missing-include-dirs \ " + dnl Additional warning or error flags provided by the module author to + dnl allow stricter standards to be imposed on a per-module basis. + dnl The author can pass -W or -Werror flags here as they see fit. + additional_flags="m4_default([$2],[])" + case "$enable_compile_warnings" in no) warning_flags= @@ -562,11 +577,8 @@ minimum) warning_flags="-Wall" ;; - yes) - warning_flags="$base_warn_flags $base_error_flags" - ;; - maximum|error) - warning_flags="$base_warn_flags $base_error_flags" + yes|maximum|error) + warning_flags="$base_warn_flags $base_error_flags $additional_flags" ;; *) AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) @@ -599,7 +611,7 @@ AC_MSG_RESULT($tested_warning_flags) AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], + AS_HELP_STRING([--enable-iso-c], [Try to warn if code is not ISO C ]),, [enable_iso_c=no]) @@ -627,7 +639,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[ AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] [Turn on compiler warnings.]),, [enable_cxx_warnings="m4_default([$1],[minimum])"]) @@ -653,7 +665,7 @@ AC_MSG_RESULT($warnCXXFLAGS) AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], + AS_HELP_STRING([--enable-iso-cxx], [Try to warn if code is not ISO C++ ]),, [enable_iso_cxx=no]) @@ -717,7 +729,7 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) %.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas @@ -763,7 +775,7 @@ ) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -995,6 +1007,21 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1007,10 +1034,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -1026,7 +1053,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -1393,6 +1420,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -1501,7 +1534,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1509,7 +1583,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -1657,38 +1730,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -1759,6 +1800,53 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru gnome-session-3.9.90/capplet/gsm-app-dialog.c gnome-session-3.14.0/capplet/gsm-app-dialog.c --- gnome-session-3.9.90/capplet/gsm-app-dialog.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsm-app-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,540 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include "config.h" - -#include -#include -#include - -#include "gsm-util.h" - -#include "gsm-app-dialog.h" - -#define GTKBUILDER_FILE "session-properties.ui" - -#define CAPPLET_NAME_ENTRY_WIDGET_NAME "session_properties_name_entry" -#define CAPPLET_COMMAND_ENTRY_WIDGET_NAME "session_properties_command_entry" -#define CAPPLET_COMMENT_ENTRY_WIDGET_NAME "session_properties_comment_entry" -#define CAPPLET_BROWSE_WIDGET_NAME "session_properties_browse_button" - - -#define GSM_APP_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogPrivate)) - -struct GsmAppDialogPrivate -{ - GtkWidget *name_entry; - GtkWidget *command_entry; - GtkWidget *comment_entry; - GtkWidget *browse_button; - char *name; - char *command; - char *comment; -}; - -static void gsm_app_dialog_class_init (GsmAppDialogClass *klass); -static void gsm_app_dialog_init (GsmAppDialog *app_dialog); -static void gsm_app_dialog_finalize (GObject *object); - -enum { - PROP_0, - PROP_NAME, - PROP_COMMAND, - PROP_COMMENT -}; - -G_DEFINE_TYPE (GsmAppDialog, gsm_app_dialog, GTK_TYPE_DIALOG) - -static char * -make_exec_uri (const char *exec) -{ - GString *str; - const char *c; - - if (exec == NULL) { - return g_strdup (""); - } - - if (strchr (exec, ' ') == NULL) { - return g_strdup (exec); - } - - str = g_string_new_len (NULL, strlen (exec)); - - str = g_string_append_c (str, '"'); - for (c = exec; *c != '\0'; c++) { - /* FIXME: GKeyFile will add an additional backslach so we'll - * end up with toto\\" instead of toto\" - * We could use g_key_file_set_value(), but then we don't - * benefit from the other escaping that glib is doing... - */ - if (*c == '"') { - str = g_string_append (str, "\\\""); - } else { - str = g_string_append_c (str, *c); - } - } - str = g_string_append_c (str, '"'); - - return g_string_free (str, FALSE); -} - -static void -on_browse_button_clicked (GtkWidget *widget, - GsmAppDialog *dialog) -{ - GtkWidget *chooser; - int response; - - chooser = gtk_file_chooser_dialog_new ("", - GTK_WINDOW (dialog), - GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, - GTK_RESPONSE_ACCEPT, - NULL); - - gtk_window_set_transient_for (GTK_WINDOW (chooser), - GTK_WINDOW (dialog)); - - gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE); - - gtk_window_set_title (GTK_WINDOW (chooser), _("Select Command")); - - gtk_widget_show (chooser); - - response = gtk_dialog_run (GTK_DIALOG (chooser)); - - if (response == GTK_RESPONSE_ACCEPT) { - char *text; - char *uri; - - text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); - - uri = make_exec_uri (text); - - g_free (text); - - gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), uri); - - g_free (uri); - } - - gtk_widget_destroy (chooser); -} - -static void -on_entry_activate (GtkEntry *entry, - GsmAppDialog *dialog) -{ - gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); -} - -static void -setup_dialog (GsmAppDialog *dialog) -{ - GtkWidget *content_area; - GtkWidget *widget; - GtkBuilder *xml; - GError *error; - - xml = gtk_builder_new (); - gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE); - - error = NULL; - if (!gtk_builder_add_from_file (xml, - GTKBUILDER_DIR "/" GTKBUILDER_FILE, - &error)) { - if (error) { - g_warning ("Could not load capplet UI file: %s", - error->message); - g_error_free (error); - } else { - g_warning ("Could not load capplet UI file."); - } - } - - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - widget = GTK_WIDGET (gtk_builder_get_object (xml, "main-table")); - gtk_container_add (GTK_CONTAINER (content_area), widget); - - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); - - g_object_set (dialog, - "allow-shrink", FALSE, - "allow-grow", FALSE, - NULL); - - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - - if (dialog->priv->name == NULL - && dialog->priv->command == NULL - && dialog->priv->comment == NULL) { - gtk_window_set_title (GTK_WINDOW (dialog), _("Add Startup Program")); - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_ADD, GTK_RESPONSE_OK); - } else { - gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Startup Program")); - gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_SAVE, GTK_RESPONSE_OK); - } - - dialog->priv->name_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_NAME_ENTRY_WIDGET_NAME)); - g_signal_connect (dialog->priv->name_entry, - "activate", - G_CALLBACK (on_entry_activate), - dialog); - if (dialog->priv->name != NULL) { - gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), dialog->priv->name); - } - - dialog->priv->browse_button = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_BROWSE_WIDGET_NAME)); - g_signal_connect (dialog->priv->browse_button, - "clicked", - G_CALLBACK (on_browse_button_clicked), - dialog); - - dialog->priv->command_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMAND_ENTRY_WIDGET_NAME)); - g_signal_connect (dialog->priv->command_entry, - "activate", - G_CALLBACK (on_entry_activate), - dialog); - if (dialog->priv->command != NULL) { - gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), dialog->priv->command); - } - - dialog->priv->comment_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMENT_ENTRY_WIDGET_NAME)); - g_signal_connect (dialog->priv->comment_entry, - "activate", - G_CALLBACK (on_entry_activate), - dialog); - if (dialog->priv->comment != NULL) { - gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), dialog->priv->comment); - } - - if (xml != NULL) { - g_object_unref (xml); - } -} - -static GObject * -gsm_app_dialog_constructor (GType type, - guint n_construct_app, - GObjectConstructParam *construct_app) -{ - GsmAppDialog *dialog; - - dialog = GSM_APP_DIALOG (G_OBJECT_CLASS (gsm_app_dialog_parent_class)->constructor (type, - n_construct_app, - construct_app)); - - setup_dialog (dialog); - - gtk_widget_show_all (GTK_WIDGET (dialog)); - - return G_OBJECT (dialog); -} - -static void -gsm_app_dialog_dispose (GObject *object) -{ - GsmAppDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSM_IS_APP_DIALOG (object)); - - dialog = GSM_APP_DIALOG (object); - - g_free (dialog->priv->name); - dialog->priv->name = NULL; - g_free (dialog->priv->command); - dialog->priv->command = NULL; - g_free (dialog->priv->comment); - dialog->priv->comment = NULL; - - G_OBJECT_CLASS (gsm_app_dialog_parent_class)->dispose (object); -} - -static void -gsm_app_dialog_set_name (GsmAppDialog *dialog, - const char *name) -{ - g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); - - g_free (dialog->priv->name); - - dialog->priv->name = g_strdup (name); - g_object_notify (G_OBJECT (dialog), "name"); -} - -static void -gsm_app_dialog_set_command (GsmAppDialog *dialog, - const char *name) -{ - g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); - - g_free (dialog->priv->command); - - dialog->priv->command = g_strdup (name); - g_object_notify (G_OBJECT (dialog), "command"); -} - -static void -gsm_app_dialog_set_comment (GsmAppDialog *dialog, - const char *name) -{ - g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); - - g_free (dialog->priv->comment); - - dialog->priv->comment = g_strdup (name); - g_object_notify (G_OBJECT (dialog), "comment"); -} - -const char * -gsm_app_dialog_get_name (GsmAppDialog *dialog) -{ - g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); - return gtk_entry_get_text (GTK_ENTRY (dialog->priv->name_entry)); -} - -const char * -gsm_app_dialog_get_command (GsmAppDialog *dialog) -{ - g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); - return gtk_entry_get_text (GTK_ENTRY (dialog->priv->command_entry)); -} - -const char * -gsm_app_dialog_get_comment (GsmAppDialog *dialog) -{ - g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); - return gtk_entry_get_text (GTK_ENTRY (dialog->priv->comment_entry)); -} - -static void -gsm_app_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GsmAppDialog *dialog = GSM_APP_DIALOG (object); - - switch (prop_id) { - case PROP_NAME: - gsm_app_dialog_set_name (dialog, g_value_get_string (value)); - break; - case PROP_COMMAND: - gsm_app_dialog_set_command (dialog, g_value_get_string (value)); - break; - case PROP_COMMENT: - gsm_app_dialog_set_comment (dialog, g_value_get_string (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gsm_app_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GsmAppDialog *dialog = GSM_APP_DIALOG (object); - - switch (prop_id) { - case PROP_NAME: - g_value_set_string (value, dialog->priv->name); - break; - case PROP_COMMAND: - g_value_set_string (value, dialog->priv->command); - break; - case PROP_COMMENT: - g_value_set_string (value, dialog->priv->comment); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gsm_app_dialog_class_init (GsmAppDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->get_property = gsm_app_dialog_get_property; - object_class->set_property = gsm_app_dialog_set_property; - object_class->constructor = gsm_app_dialog_constructor; - object_class->dispose = gsm_app_dialog_dispose; - object_class->finalize = gsm_app_dialog_finalize; - - g_object_class_install_property (object_class, - PROP_NAME, - g_param_spec_string ("name", - "name", - "name", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_COMMAND, - g_param_spec_string ("command", - "command", - "command", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_COMMENT, - g_param_spec_string ("comment", - "comment", - "comment", - NULL, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_type_class_add_private (klass, sizeof (GsmAppDialogPrivate)); -} - -static void -gsm_app_dialog_init (GsmAppDialog *dialog) -{ - - dialog->priv = GSM_APP_DIALOG_GET_PRIVATE (dialog); -} - -static void -gsm_app_dialog_finalize (GObject *object) -{ - GsmAppDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSM_IS_APP_DIALOG (object)); - - dialog = GSM_APP_DIALOG (object); - - g_return_if_fail (dialog->priv != NULL); - - G_OBJECT_CLASS (gsm_app_dialog_parent_class)->finalize (object); -} - -GtkWidget * -gsm_app_dialog_new (const char *name, - const char *command, - const char *comment) -{ - GObject *object; - - object = g_object_new (GSM_TYPE_APP_DIALOG, - "name", name, - "command", command, - "comment", comment, - NULL); - - return GTK_WIDGET (object); -} - -gboolean -gsm_app_dialog_run (GsmAppDialog *dialog, - char **name_p, - char **command_p, - char **comment_p) -{ - gboolean retval; - - retval = FALSE; - - while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { - const char *name; - const char *exec; - const char *comment; - const char *error_msg; - GError *error; - char **argv; - int argc; - - name = gsm_app_dialog_get_name (GSM_APP_DIALOG (dialog)); - exec = gsm_app_dialog_get_command (GSM_APP_DIALOG (dialog)); - comment = gsm_app_dialog_get_comment (GSM_APP_DIALOG (dialog)); - - error = NULL; - error_msg = NULL; - - if (gsm_util_text_is_blank (exec)) { - error_msg = _("The startup command cannot be empty"); - } else { - if (!g_shell_parse_argv (exec, &argc, &argv, &error)) { - if (error != NULL) { - error_msg = error->message; - } else { - error_msg = _("The startup command is not valid"); - } - } - } - - if (error_msg != NULL) { - GtkWidget *msgbox; - - msgbox = gtk_message_dialog_new (GTK_WINDOW (dialog), - GTK_DIALOG_MODAL, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", error_msg); - - if (error != NULL) { - g_error_free (error); - } - - gtk_dialog_run (GTK_DIALOG (msgbox)); - - gtk_widget_destroy (msgbox); - - continue; - } - - if (gsm_util_text_is_blank (name)) { - name = argv[0]; - } - - if (name_p) { - *name_p = g_strdup (name); - } - - g_strfreev (argv); - - if (command_p) { - *command_p = g_strdup (exec); - } - - if (comment_p) { - *comment_p = g_strdup (comment); - } - - retval = TRUE; - break; - } - - gtk_widget_destroy (GTK_WIDGET (dialog)); - - return retval; -} diff -Nru gnome-session-3.9.90/capplet/gsm-app-dialog.h gnome-session-3.14.0/capplet/gsm-app-dialog.h --- gnome-session-3.9.90/capplet/gsm-app-dialog.h 2012-12-12 18:26:59.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsm-app-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GSM_APP_DIALOG_H -#define __GSM_APP_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define GSM_TYPE_APP_DIALOG (gsm_app_dialog_get_type ()) -#define GSM_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_APP_DIALOG, GsmAppDialog)) -#define GSM_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_APP_DIALOG, GsmAppDialogClass)) -#define GSM_IS_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_APP_DIALOG)) -#define GSM_IS_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_APP_DIALOG)) -#define GSM_APP_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogClass)) - -typedef struct GsmAppDialogPrivate GsmAppDialogPrivate; - -typedef struct -{ - GtkDialog parent; - GsmAppDialogPrivate *priv; -} GsmAppDialog; - -typedef struct -{ - GtkDialogClass parent_class; -} GsmAppDialogClass; - -GType gsm_app_dialog_get_type (void); - -GtkWidget * gsm_app_dialog_new (const char *name, - const char *command, - const char *comment); - -gboolean gsm_app_dialog_run (GsmAppDialog *dialog, - char **name_p, - char **command_p, - char **comment_p); - -const char * gsm_app_dialog_get_name (GsmAppDialog *dialog); -const char * gsm_app_dialog_get_command (GsmAppDialog *dialog); -const char * gsm_app_dialog_get_comment (GsmAppDialog *dialog); - -G_END_DECLS - -#endif /* __GSM_APP_DIALOG_H */ diff -Nru gnome-session-3.9.90/capplet/gsm-properties-dialog.c gnome-session-3.14.0/capplet/gsm-properties-dialog.c --- gnome-session-3.9.90/capplet/gsm-properties-dialog.c 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsm-properties-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,774 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2007 Vincent Untz. - * Copyright (C) 2008 Lucas Rocha. - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include "config.h" - -#include -#include -#include - -#include "gsm-properties-dialog.h" -#include "gsm-app-dialog.h" -#include "gsm-util.h" -#include "gsp-app.h" -#include "gsp-app-manager.h" - -#define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - -#define GTKBUILDER_FILE "session-properties.ui" - -#define CAPPLET_TREEVIEW_WIDGET_NAME "session_properties_treeview" -#define CAPPLET_ADD_WIDGET_NAME "session_properties_add_button" -#define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" -#define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" -#define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -#define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - -#define STARTUP_APP_ICON "system-run" - -#define SPC_SETTINGS_SCHEMA "org.gnome.SessionManager" -#define SPC_SETTINGS_AUTOSAVE_KEY "auto-save-session" - -struct GsmPropertiesDialogPrivate -{ - GtkBuilder *xml; - GtkListStore *list_store; - GtkTreeModel *tree_filter; - - GtkTreeView *treeview; - GtkWidget *add_button; - GtkWidget *delete_button; - GtkWidget *edit_button; - - GSettings *settings; - - GspAppManager *manager; -}; - -enum { - STORE_COL_VISIBLE = 0, - STORE_COL_ENABLED, - STORE_COL_GICON, - STORE_COL_DESCRIPTION, - STORE_COL_APP, - STORE_COL_SEARCH, - NUMBER_OF_COLUMNS -}; - -static void gsm_properties_dialog_class_init (GsmPropertiesDialogClass *klass); -static void gsm_properties_dialog_init (GsmPropertiesDialog *properties_dialog); -static void gsm_properties_dialog_finalize (GObject *object); - -G_DEFINE_TYPE (GsmPropertiesDialog, gsm_properties_dialog, GTK_TYPE_DIALOG) - -static gboolean -find_by_app (GtkTreeModel *model, - GtkTreeIter *iter, - GspApp *app) -{ - GspApp *iter_app = NULL; - - if (!gtk_tree_model_get_iter_first (model, iter)) { - return FALSE; - } - - do { - gtk_tree_model_get (model, iter, - STORE_COL_APP, &iter_app, - -1); - - if (iter_app == app) { - g_object_unref (iter_app); - return TRUE; - } - } while (gtk_tree_model_iter_next (model, iter)); - - return FALSE; -} - -static void -_fill_iter_from_app (GtkListStore *list_store, - GtkTreeIter *iter, - GspApp *app) -{ - gboolean hidden; - gboolean display; - gboolean enabled; - gboolean shown; - GIcon *icon; - const char *description; - const char *app_name; - - hidden = gsp_app_get_hidden (app); - display = gsp_app_get_display (app); - enabled = gsp_app_get_enabled (app); - shown = gsp_app_get_shown (app); - icon = gsp_app_get_icon (app); - description = gsp_app_get_description (app); - app_name = gsp_app_get_name (app); - - if (G_IS_THEMED_ICON (icon)) { - GtkIconTheme *theme; - const char * const *icon_names; - - theme = gtk_icon_theme_get_default (); - icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon)); - if (icon_names[0] == NULL || - !gtk_icon_theme_has_icon (theme, icon_names[0])) { - g_object_unref (icon); - icon = NULL; - } - } else if (G_IS_FILE_ICON (icon)) { - GFile *iconfile; - - iconfile = g_file_icon_get_file (G_FILE_ICON (icon)); - if (!g_file_query_exists (iconfile, NULL)) { - g_object_unref (icon); - icon = NULL; - } - } - - if (icon == NULL) { - icon = g_themed_icon_new (STARTUP_APP_ICON); - } - - gtk_list_store_set (list_store, iter, - STORE_COL_VISIBLE, !hidden && shown && display, - STORE_COL_ENABLED, enabled, - STORE_COL_GICON, icon, - STORE_COL_DESCRIPTION, description, - STORE_COL_APP, app, - STORE_COL_SEARCH, app_name, - -1); - g_object_unref (icon); -} - -static void -_app_changed (GsmPropertiesDialog *dialog, - GspApp *app) -{ - GtkTreeIter iter; - - if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store), - &iter, app)) { - return; - } - - _fill_iter_from_app (dialog->priv->list_store, &iter, app); -} - -static void -append_app (GsmPropertiesDialog *dialog, - GspApp *app) -{ - GtkTreeIter iter; - - gtk_list_store_append (dialog->priv->list_store, &iter); - _fill_iter_from_app (dialog->priv->list_store, &iter, app); - - g_signal_connect_swapped (app, "changed", - G_CALLBACK (_app_changed), dialog); -} - -static void -_app_added (GsmPropertiesDialog *dialog, - GspApp *app, - GspAppManager *manager) -{ - append_app (dialog, app); -} - -static void -_app_removed (GsmPropertiesDialog *dialog, - GspApp *app, - GspAppManager *manager) -{ - GtkTreeIter iter; - - if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store), - &iter, app)) { - return; - } - - g_signal_handlers_disconnect_by_func (app, - _app_changed, - dialog); - gtk_list_store_remove (dialog->priv->list_store, &iter); -} - -static void -populate_model (GsmPropertiesDialog *dialog) -{ - GSList *apps; - GSList *l; - - apps = gsp_app_manager_get_apps (dialog->priv->manager); - for (l = apps; l != NULL; l = l->next) { - append_app (dialog, GSP_APP (l->data)); - } - g_slist_free (apps); -} - -static void -on_selection_changed (GtkTreeSelection *selection, - GsmPropertiesDialog *dialog) -{ - gboolean sel; - - sel = gtk_tree_selection_get_selected (selection, NULL, NULL); - - gtk_widget_set_sensitive (dialog->priv->edit_button, sel); - gtk_widget_set_sensitive (dialog->priv->delete_button, sel); -} - -static void -on_startup_enabled_toggled (GtkCellRendererToggle *cell_renderer, - char *path, - GsmPropertiesDialog *dialog) -{ - GtkTreeIter iter; - GspApp *app; - gboolean active; - - if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, path)) { - return; - } - - app = NULL; - gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, - STORE_COL_APP, &app, - -1); - - active = gtk_cell_renderer_toggle_get_active (cell_renderer); - active = !active; - - if (app) { - gsp_app_set_enabled (app, active); - g_object_unref (app); - } -} - -static void -on_drag_data_received (GtkWidget *widget, - GdkDragContext *drag_context, - gint x, - gint y, - GtkSelectionData *data, - guint info, - guint time, - GsmPropertiesDialog *dialog) -{ - gboolean dnd_success; - - dnd_success = FALSE; - - if (data != NULL) { - char **filenames; - int i; - - filenames = gtk_selection_data_get_uris (data); - - for (i = 0; filenames[i] && filenames[i][0]; i++) { - /* Return success if at least one file succeeded */ - gboolean file_success; - file_success = gsp_app_copy_desktop_file (filenames[i]); - dnd_success = dnd_success || file_success; - } - - g_strfreev (filenames); - } - - gtk_drag_finish (drag_context, dnd_success, FALSE, time); - g_signal_stop_emission_by_name (widget, "drag_data_received"); -} - -static void -on_drag_begin (GtkWidget *widget, - GdkDragContext *context, - GsmPropertiesDialog *dialog) -{ - GtkTreePath *path; - GtkTreeIter iter; - GspApp *app; - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL); - gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, path); - gtk_tree_path_free (path); - - gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, - STORE_COL_APP, &app, - -1); - - if (app) { - g_object_set_data_full (G_OBJECT (context), "gsp-app", - g_object_ref (app), g_object_unref); - g_object_unref (app); - } - -} - -static void -on_drag_data_get (GtkWidget *widget, - GdkDragContext *context, - GtkSelectionData *selection_data, - guint info, - guint time, - GsmPropertiesDialog *dialog) -{ - GspApp *app; - - app = g_object_get_data (G_OBJECT (context), "gsp-app"); - if (app) { - const char *uris[2]; - char *uri; - - uri = g_filename_to_uri (gsp_app_get_path (app), NULL, NULL); - - uris[0] = uri; - uris[1] = NULL; - gtk_selection_data_set_uris (selection_data, (char **) uris); - - g_free (uri); - } -} - -static void -on_add_app_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) -{ - GtkWidget *add_dialog; - char *name; - char *exec; - char *comment; - - add_dialog = gsm_app_dialog_new (NULL, NULL, NULL); - gtk_window_set_transient_for (GTK_WINDOW (add_dialog), - GTK_WINDOW (dialog)); - - if (gsm_app_dialog_run (GSM_APP_DIALOG (add_dialog), - &name, &exec, &comment)) { - gsp_app_create (name, comment, exec); - g_free (name); - g_free (exec); - g_free (comment); - } -} - -static void -on_delete_app_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) -{ - GtkTreeSelection *selection; - GtkTreeIter iter; - GspApp *app; - - selection = gtk_tree_view_get_selection (dialog->priv->treeview); - - if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) { - return; - } - - app = NULL; - gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, - STORE_COL_APP, &app, - -1); - - if (app) { - gsp_app_delete (app); - g_object_unref (app); - } -} - -static void -on_edit_app_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) -{ - GtkTreeSelection *selection; - GtkTreeIter iter; - GspApp *app; - - selection = gtk_tree_view_get_selection (dialog->priv->treeview); - - if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) { - return; - } - - app = NULL; - gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), - &iter, - STORE_COL_APP, &app, - -1); - - if (app) { - GtkWidget *edit_dialog; - char *name; - char *exec; - char *comment; - - edit_dialog = gsm_app_dialog_new (gsp_app_get_name (app), - gsp_app_get_exec (app), - gsp_app_get_comment (app)); - gtk_window_set_transient_for (GTK_WINDOW (edit_dialog), - GTK_WINDOW (dialog)); - - if (gsm_app_dialog_run (GSM_APP_DIALOG (edit_dialog), - &name, &exec, &comment)) { - gsp_app_update (app, name, comment, exec); - g_free (name); - g_free (exec); - g_free (comment); - } - - g_object_unref (app); - } -} - -static void -on_row_activated (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, - GsmPropertiesDialog *dialog) -{ - on_edit_app_clicked (NULL, dialog); -} - -static void -on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) -{ - g_debug ("Session saving is not implemented yet!"); -} - -static void -setup_dialog (GsmPropertiesDialog *dialog) -{ - GtkTreeView *treeview; - GtkWidget *button; - GtkTreeModel *tree_filter; - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkTreeSelection *selection; - GtkTargetList *targetlist; - - gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, - NULL); - - dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS, - G_TYPE_BOOLEAN, - G_TYPE_BOOLEAN, - G_TYPE_ICON, - G_TYPE_STRING, - G_TYPE_OBJECT, - G_TYPE_STRING); - tree_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->priv->list_store), - NULL); - g_object_unref (dialog->priv->list_store); - dialog->priv->tree_filter = tree_filter; - - gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter), - STORE_COL_VISIBLE); - - treeview = GTK_TREE_VIEW (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_TREEVIEW_WIDGET_NAME)); - dialog->priv->treeview = treeview; - - gtk_tree_view_set_model (treeview, tree_filter); - g_object_unref (tree_filter); - - gtk_tree_view_set_headers_visible (treeview, FALSE); - g_signal_connect (treeview, - "row-activated", - G_CALLBACK (on_row_activated), - dialog); - - selection = gtk_tree_view_get_selection (treeview); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - g_signal_connect (selection, - "changed", - G_CALLBACK (on_selection_changed), - dialog); - - /* CHECKBOX COLUMN */ - renderer = gtk_cell_renderer_toggle_new (); - column = gtk_tree_view_column_new_with_attributes (_("Enabled"), - renderer, - "active", STORE_COL_ENABLED, - NULL); - gtk_tree_view_append_column (treeview, column); - g_signal_connect (renderer, - "toggled", - G_CALLBACK (on_startup_enabled_toggled), - dialog); - - /* ICON COLUMN */ - renderer = gtk_cell_renderer_pixbuf_new (); - column = gtk_tree_view_column_new_with_attributes (_("Icon"), - renderer, - "gicon", STORE_COL_GICON, - "sensitive", STORE_COL_ENABLED, - NULL); - g_object_set (renderer, - "stock-size", GSM_PROPERTIES_ICON_SIZE, - NULL); - gtk_tree_view_append_column (treeview, column); - - /* NAME COLUMN */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (_("Program"), - renderer, - "markup", STORE_COL_DESCRIPTION, - "sensitive", STORE_COL_ENABLED, - NULL); - g_object_set (renderer, - "ellipsize", PANGO_ELLIPSIZE_END, - NULL); - gtk_tree_view_append_column (treeview, column); - - - gtk_tree_view_column_set_sort_column_id (column, STORE_COL_DESCRIPTION); - gtk_tree_view_set_search_column (treeview, STORE_COL_SEARCH); - gtk_tree_view_set_rules_hint (treeview, TRUE); - - gtk_tree_view_enable_model_drag_source (treeview, - GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, - NULL, 0, - GDK_ACTION_COPY); - gtk_drag_source_add_uri_targets (GTK_WIDGET (treeview)); - - gtk_drag_dest_set (GTK_WIDGET (treeview), - GTK_DEST_DEFAULT_ALL, - NULL, 0, - GDK_ACTION_COPY); - - gtk_drag_dest_add_uri_targets (GTK_WIDGET (treeview)); - /* we don't want to accept drags coming from this widget */ - targetlist = gtk_drag_dest_get_target_list (GTK_WIDGET (treeview)); - if (targetlist != NULL) { - GtkTargetEntry *targets; - gint n_targets; - gint i; - - targets = gtk_target_table_new_from_list (targetlist, &n_targets); - for (i = 0; i < n_targets; i++) - targets[i].flags = GTK_TARGET_OTHER_WIDGET; - - targetlist = gtk_target_list_new (targets, n_targets); - gtk_drag_dest_set_target_list (GTK_WIDGET (treeview), targetlist); - gtk_target_list_unref (targetlist); - - gtk_target_table_free (targets, n_targets); - } - - g_signal_connect (treeview, "drag_begin", - G_CALLBACK (on_drag_begin), - dialog); - g_signal_connect (treeview, "drag_data_get", - G_CALLBACK (on_drag_data_get), - dialog); - g_signal_connect (treeview, "drag_data_received", - G_CALLBACK (on_drag_data_received), - dialog); - - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->priv->list_store), - STORE_COL_DESCRIPTION, - GTK_SORT_ASCENDING); - - - button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_ADD_WIDGET_NAME)); - dialog->priv->add_button = button; - g_signal_connect (button, - "clicked", - G_CALLBACK (on_add_app_clicked), - dialog); - - button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_DELETE_WIDGET_NAME)); - dialog->priv->delete_button = button; - g_signal_connect (button, - "clicked", - G_CALLBACK (on_delete_app_clicked), - dialog); - - button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_EDIT_WIDGET_NAME)); - dialog->priv->edit_button = button; - g_signal_connect (button, - "clicked", - G_CALLBACK (on_edit_app_clicked), - dialog); - - button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_REMEMBER_WIDGET_NAME)); - g_settings_bind (dialog->priv->settings, SPC_SETTINGS_AUTOSAVE_KEY, - button, "active", G_SETTINGS_BIND_DEFAULT); - - button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - CAPPLET_SAVE_WIDGET_NAME)); - g_signal_connect (button, - "clicked", - G_CALLBACK (on_save_session_clicked), - dialog); - - dialog->priv->manager = gsp_app_manager_get (); - gsp_app_manager_fill (dialog->priv->manager); - g_signal_connect_swapped (dialog->priv->manager, "added", - G_CALLBACK (_app_added), dialog); - g_signal_connect_swapped (dialog->priv->manager, "removed", - G_CALLBACK (_app_removed), dialog); - - populate_model (dialog); -} - -static GObject * -gsm_properties_dialog_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GsmPropertiesDialog *dialog; - - dialog = GSM_PROPERTIES_DIALOG (G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->constructor (type, - n_construct_properties, - construct_properties)); - - setup_dialog (dialog); - - gtk_widget_show (GTK_WIDGET (dialog)); - - return G_OBJECT (dialog); -} - -static void -gsm_properties_dialog_dispose (GObject *object) -{ - GsmPropertiesDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object)); - - dialog = GSM_PROPERTIES_DIALOG (object); - - if (dialog->priv->xml != NULL) { - g_object_unref (dialog->priv->xml); - dialog->priv->xml = NULL; - } - - if (dialog->priv->settings != NULL) { - g_object_unref (dialog->priv->settings); - dialog->priv->settings = NULL; - } - - G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->dispose (object); - - /* it's important to do this after chaining to the parent dispose - * method because we want to make sure the treeview has been disposed - * and removed all its references to GspApp objects */ - if (dialog->priv->manager != NULL) { - g_object_unref (dialog->priv->manager); - dialog->priv->manager = NULL; - } -} - -static void -gsm_properties_dialog_class_init (GsmPropertiesDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->constructor = gsm_properties_dialog_constructor; - object_class->dispose = gsm_properties_dialog_dispose; - object_class->finalize = gsm_properties_dialog_finalize; - - g_type_class_add_private (klass, sizeof (GsmPropertiesDialogPrivate)); -} - -static void -gsm_properties_dialog_init (GsmPropertiesDialog *dialog) -{ - GtkWidget *content_area; - GtkWidget *widget; - GError *error; - - dialog->priv = GSM_PROPERTIES_DIALOG_GET_PRIVATE (dialog); - - dialog->priv->settings = g_settings_new (SPC_SETTINGS_SCHEMA); - - dialog->priv->xml = gtk_builder_new (); - gtk_builder_set_translation_domain (dialog->priv->xml, GETTEXT_PACKAGE); - - error = NULL; - if (!gtk_builder_add_from_file (dialog->priv->xml, - GTKBUILDER_DIR "/" GTKBUILDER_FILE, - &error)) { - if (error) { - g_warning ("Could not load capplet UI file: %s", - error->message); - g_error_free (error); - } else { - g_warning ("Could not load capplet UI file."); - } - } - - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - "main-notebook")); - gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); - - gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450); - gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_box_set_spacing (GTK_BOX (content_area), 2); - gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); - gtk_window_set_title (GTK_WINDOW (dialog), _("Startup Applications Preferences")); -} - -static void -gsm_properties_dialog_finalize (GObject *object) -{ - GsmPropertiesDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object)); - - dialog = GSM_PROPERTIES_DIALOG (object); - - g_return_if_fail (dialog->priv != NULL); - - G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->finalize (object); -} - -GtkWidget * -gsm_properties_dialog_new (void) -{ - GObject *object; - - object = g_object_new (GSM_TYPE_PROPERTIES_DIALOG, - NULL); - - return GTK_WIDGET (object); -} diff -Nru gnome-session-3.9.90/capplet/gsm-properties-dialog.h gnome-session-3.14.0/capplet/gsm-properties-dialog.h --- gnome-session-3.9.90/capplet/gsm-properties-dialog.h 2012-12-12 18:26:59.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsm-properties-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GSM_PROPERTIES_DIALOG_H -#define __GSM_PROPERTIES_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define GSM_TYPE_PROPERTIES_DIALOG (gsm_properties_dialog_get_type ()) -#define GSM_PROPERTIES_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialog)) -#define GSM_PROPERTIES_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass)) -#define GSM_IS_PROPERTIES_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_PROPERTIES_DIALOG)) -#define GSM_IS_PROPERTIES_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_PROPERTIES_DIALOG)) -#define GSM_PROPERTIES_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass)) - -typedef struct GsmPropertiesDialogPrivate GsmPropertiesDialogPrivate; - -typedef struct -{ - GtkDialog parent; - GsmPropertiesDialogPrivate *priv; -} GsmPropertiesDialog; - -typedef struct -{ - GtkDialogClass parent_class; -} GsmPropertiesDialogClass; - -GType gsm_properties_dialog_get_type (void); - -GtkWidget * gsm_properties_dialog_new (void); - -#define GSM_PROPERTIES_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR - -G_END_DECLS - -#endif /* __GSM_PROPERTIES_DIALOG_H */ diff -Nru gnome-session-3.9.90/capplet/gsp-app.c gnome-session-3.14.0/capplet/gsp-app.c --- gnome-session-3.9.90/capplet/gsp-app.c 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-app.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1102 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2007, 2009 Vincent Untz. - * Copyright (C) 2008 Lucas Rocha. - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#include -#include - -#include "gsm-app-dialog.h" -#include "gsm-properties-dialog.h" -#include "gsm-util.h" -#include "gsp-app-manager.h" -#include "gsp-keyfile.h" - -#include "gsp-app.h" - -#define GSP_APP_SAVE_DELAY 2 - -#define GSP_ASP_SAVE_MASK_HIDDEN 0x0001 -#define GSP_ASP_SAVE_MASK_ENABLED 0x0002 -#define GSP_ASP_SAVE_MASK_NAME 0x0004 -#define GSP_ASP_SAVE_MASK_EXEC 0x0008 -#define GSP_ASP_SAVE_MASK_COMMENT 0x0010 -#define GSP_ASP_SAVE_MASK_NO_DISPLAY 0x0020 -#define GSP_ASP_SAVE_MASK_ALL 0xffff - -struct _GspAppPrivate { - char *basename; - char *path; - - gboolean hidden; - gboolean no_display; - gboolean enabled; - gboolean shown; - - char *name; - char *exec; - char *comment; - char *icon; - - GIcon *gicon; - char *description; - - /* position of the directory in the XDG environment variable */ - unsigned int xdg_position; - /* position of the first system directory in the XDG env var containing - * this autostart app too (G_MAXUINT means none) */ - unsigned int xdg_system_position; - - unsigned int save_timeout; - /* mask of what has changed */ - unsigned int save_mask; - /* path that contains the original file that needs to be saved */ - char *old_system_path; - /* after writing to file, we skip the next file monitor event of type - * CHANGED */ - gboolean skip_next_monitor_event; -}; - -#define GSP_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP, GspAppPrivate)) - - -enum { - CHANGED, - REMOVED, - LAST_SIGNAL -}; - -static guint gsp_app_signals[LAST_SIGNAL] = { 0 }; - - -G_DEFINE_TYPE (GspApp, gsp_app, G_TYPE_OBJECT) - -static void gsp_app_dispose (GObject *object); -static void gsp_app_finalize (GObject *object); -static gboolean _gsp_app_save (gpointer data); - - -static gboolean -_gsp_str_equal (const char *a, - const char *b) -{ - if (g_strcmp0 (a, b) == 0) { - return TRUE; - } - - if (a && !b && a[0] == '\0') { - return TRUE; - } - - if (b && !a && b[0] == '\0') { - return TRUE; - } - - return FALSE; -} - - -static void -gsp_app_class_init (GspAppClass *class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (class); - - gobject_class->dispose = gsp_app_dispose; - gobject_class->finalize = gsp_app_finalize; - - gsp_app_signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GspAppClass, - changed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - gsp_app_signals[REMOVED] = - g_signal_new ("removed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GspAppClass, - removed), - NULL, - NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - - g_type_class_add_private (class, sizeof (GspAppPrivate)); -} - -static void -gsp_app_init (GspApp *app) -{ - app->priv = GSP_APP_GET_PRIVATE (app); - - memset (app->priv, 0, sizeof (GspAppPrivate)); - app->priv->xdg_position = G_MAXUINT; - app->priv->xdg_system_position = G_MAXUINT; -} - -static void -_gsp_app_free_reusable_data (GspApp *app) -{ - if (app->priv->path) { - g_free (app->priv->path); - app->priv->path = NULL; - } - - if (app->priv->name) { - g_free (app->priv->name); - app->priv->name = NULL; - } - - if (app->priv->exec) { - g_free (app->priv->exec); - app->priv->exec = NULL; - } - - if (app->priv->comment) { - g_free (app->priv->comment); - app->priv->comment = NULL; - } - - if (app->priv->icon) { - g_free (app->priv->icon); - app->priv->icon = NULL; - } - - if (app->priv->gicon) { - g_object_unref (app->priv->gicon); - app->priv->gicon = NULL; - } - - if (app->priv->description) { - g_free (app->priv->description); - app->priv->description = NULL; - } - - if (app->priv->old_system_path) { - g_free (app->priv->old_system_path); - app->priv->old_system_path = NULL; - } -} - -static void -gsp_app_dispose (GObject *object) -{ - GspApp *app; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSP_IS_APP (object)); - - app = GSP_APP (object); - - /* we save in dispose since we might need to reference GspAppManager */ - if (app->priv->save_timeout) { - g_source_remove (app->priv->save_timeout); - app->priv->save_timeout = 0; - - /* save now */ - _gsp_app_save (app); - } - - G_OBJECT_CLASS (gsp_app_parent_class)->dispose (object); -} - -static void -gsp_app_finalize (GObject *object) -{ - GspApp *app; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSP_IS_APP (object)); - - app = GSP_APP (object); - - if (app->priv->basename) { - g_free (app->priv->basename); - app->priv->basename = NULL; - } - - _gsp_app_free_reusable_data (app); - - G_OBJECT_CLASS (gsp_app_parent_class)->finalize (object); -} - -static void -_gsp_app_emit_changed (GspApp *app) -{ - g_signal_emit (G_OBJECT (app), gsp_app_signals[CHANGED], 0); -} - -static void -_gsp_app_emit_removed (GspApp *app) -{ - g_signal_emit (G_OBJECT (app), gsp_app_signals[REMOVED], 0); -} - -static void -_gsp_app_update_description (GspApp *app) -{ - const char *primary; - const char *secondary; - - if (!gsm_util_text_is_blank (app->priv->name)) { - primary = app->priv->name; - } else if (!gsm_util_text_is_blank (app->priv->exec)) { - primary = app->priv->exec; - } else { - primary = _("No name"); - } - - if (!gsm_util_text_is_blank (app->priv->comment)) { - secondary = app->priv->comment; - } else { - secondary = _("No description"); - } - - g_free (app->priv->description); - app->priv->description = g_markup_printf_escaped ("%s\n%s", - primary, - secondary); -} - -/* - * Saving - */ - -static void -_gsp_ensure_user_autostart_dir (void) -{ - char *dir; - - dir = g_build_filename (g_get_user_config_dir (), "autostart", NULL); - g_mkdir_with_parents (dir, S_IRWXU); - - g_free (dir); -} - -static gboolean -_gsp_app_user_equal_system (GspApp *app, - char **system_path) -{ - GspAppManager *manager; - const char *system_dir; - char *path; - char *str; - GKeyFile *keyfile; - - manager = gsp_app_manager_get (); - system_dir = gsp_app_manager_get_dir (manager, - app->priv->xdg_system_position); - g_object_unref (manager); - if (!system_dir) { - return FALSE; - } - - path = g_build_filename (system_dir, app->priv->basename, NULL); - - keyfile = g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) { - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - - if (gsp_key_file_get_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_HIDDEN, - FALSE) != app->priv->hidden || - gsp_key_file_get_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - TRUE) != app->priv->enabled || - gsp_key_file_get_shown (keyfile, - gsm_util_get_current_desktop ()) != app->priv->shown) { - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - - if (gsp_key_file_get_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, - FALSE) != app->priv->no_display) { - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - - str = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_NAME); - if (!_gsp_str_equal (str, app->priv->name)) { - g_free (str); - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - g_free (str); - - str = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_COMMENT); - if (!_gsp_str_equal (str, app->priv->comment)) { - g_free (str); - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - g_free (str); - - str = gsp_key_file_get_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_EXEC); - if (!_gsp_str_equal (str, app->priv->exec)) { - g_free (str); - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - g_free (str); - - str = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_ICON); - if (!_gsp_str_equal (str, app->priv->icon)) { - g_free (str); - g_free (path); - g_key_file_free (keyfile); - return FALSE; - } - g_free (str); - - g_key_file_free (keyfile); - - *system_path = path; - - return TRUE; -} - -static inline void -_gsp_app_save_done_success (GspApp *app) -{ - app->priv->save_mask = 0; - - if (app->priv->old_system_path) { - g_free (app->priv->old_system_path); - app->priv->old_system_path = NULL; - } -} - -static gboolean -_gsp_app_save (gpointer data) -{ - GspApp *app; - char *use_path; - GKeyFile *keyfile; - GError *error; - - app = GSP_APP (data); - - /* first check if removing the data from the user dir and using the - * data from the system dir is enough -- this helps us keep clean the - * user config dir by removing unneeded files */ - if (_gsp_app_user_equal_system (app, &use_path)) { - if (g_file_test (app->priv->path, G_FILE_TEST_EXISTS)) { - g_remove (app->priv->path); - } - - g_free (app->priv->path); - app->priv->path = use_path; - - app->priv->xdg_position = app->priv->xdg_system_position; - - _gsp_app_save_done_success (app); - return FALSE; - } - - if (app->priv->old_system_path) - use_path = app->priv->old_system_path; - else - use_path = app->priv->path; - - keyfile = g_key_file_new (); - - error = NULL; - g_key_file_load_from_file (keyfile, use_path, - G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, - &error); - - if (error) { - g_error_free (error); - gsp_key_file_populate (keyfile); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_HIDDEN) { - gsp_key_file_set_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_HIDDEN, - app->priv->hidden); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NO_DISPLAY) { - gsp_key_file_set_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, - app->priv->no_display); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_ENABLED) { - gsp_key_file_set_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - app->priv->enabled); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NAME) { - gsp_key_file_set_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_NAME, - app->priv->name); - gsp_key_file_ensure_C_key (keyfile, G_KEY_FILE_DESKTOP_KEY_NAME); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_COMMENT) { - gsp_key_file_set_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_COMMENT, - app->priv->comment); - gsp_key_file_ensure_C_key (keyfile, G_KEY_FILE_DESKTOP_KEY_COMMENT); - } - - if (app->priv->save_mask & GSP_ASP_SAVE_MASK_EXEC) { - gsp_key_file_set_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_EXEC, - app->priv->exec); - } - - _gsp_ensure_user_autostart_dir (); - if (gsp_key_file_to_file (keyfile, app->priv->path, NULL)) { - app->priv->skip_next_monitor_event = TRUE; - _gsp_app_save_done_success (app); - } else { - g_warning ("Could not save %s file", app->priv->path); - } - - g_key_file_free (keyfile); - - app->priv->save_timeout = 0; - return FALSE; -} - -static void -_gsp_app_queue_save (GspApp *app) -{ - if (app->priv->save_timeout) { - g_source_remove (app->priv->save_timeout); - app->priv->save_timeout = 0; - } - - /* if the file was not in the user directory, then we'll create a copy - * there */ - if (app->priv->xdg_position != 0) { - app->priv->xdg_position = 0; - - if (app->priv->old_system_path == NULL) { - app->priv->old_system_path = app->priv->path; - /* if old_system_path was not NULL, then it means we - * tried to save and we failed; in that case, we want - * to try again and use the old file as a basis again */ - } - - app->priv->path = g_build_filename (g_get_user_config_dir (), - "autostart", - app->priv->basename, NULL); - } - - app->priv->save_timeout = g_timeout_add_seconds (GSP_APP_SAVE_DELAY, - _gsp_app_save, - app); -} - -/* - * Accessors - */ - -const char * -gsp_app_get_basename (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->basename; -} - -const char * -gsp_app_get_path (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->path; -} - -gboolean -gsp_app_get_hidden (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), FALSE); - - return app->priv->hidden; -} - -gboolean -gsp_app_get_display (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), FALSE); - - return !app->priv->no_display; -} - -gboolean -gsp_app_get_enabled (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), FALSE); - - return app->priv->enabled; -} - -void -gsp_app_set_enabled (GspApp *app, - gboolean enabled) -{ - g_return_if_fail (GSP_IS_APP (app)); - - if (enabled == app->priv->enabled) { - return; - } - - app->priv->enabled = enabled; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; - - _gsp_app_queue_save (app); - _gsp_app_emit_changed (app); -} - -gboolean -gsp_app_get_shown (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), FALSE); - - return app->priv->shown; -} - -const char * -gsp_app_get_name (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->name; -} - -const char * -gsp_app_get_exec (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->exec; -} - -const char * -gsp_app_get_comment (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->comment; -} - -GIcon * -gsp_app_get_icon (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - if (app->priv->gicon) { - return g_object_ref (app->priv->gicon); - } else { - return NULL; - } -} - -unsigned int -gsp_app_get_xdg_position (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), G_MAXUINT); - - return app->priv->xdg_position; -} - -unsigned int -gsp_app_get_xdg_system_position (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), G_MAXUINT); - - return app->priv->xdg_system_position; -} - -void -gsp_app_set_xdg_system_position (GspApp *app, - unsigned int position) -{ - g_return_if_fail (GSP_IS_APP (app)); - - app->priv->xdg_system_position = position; -} - -const char * -gsp_app_get_description (GspApp *app) -{ - g_return_val_if_fail (GSP_IS_APP (app), NULL); - - return app->priv->description; -} - -/* - * High-level edition - */ - -void -gsp_app_update (GspApp *app, - const char *name, - const char *comment, - const char *exec) -{ - gboolean changed; - - g_return_if_fail (GSP_IS_APP (app)); - - changed = FALSE; - - if (!_gsp_str_equal (name, app->priv->name)) { - changed = TRUE; - g_free (app->priv->name); - app->priv->name = g_strdup (name); - app->priv->save_mask |= GSP_ASP_SAVE_MASK_NAME; - } - - if (!_gsp_str_equal (comment, app->priv->comment)) { - changed = TRUE; - g_free (app->priv->comment); - app->priv->comment = g_strdup (comment); - app->priv->save_mask |= GSP_ASP_SAVE_MASK_COMMENT; - } - - if (changed) { - _gsp_app_update_description (app); - } - - if (!_gsp_str_equal (exec, app->priv->exec)) { - changed = TRUE; - g_free (app->priv->exec); - app->priv->exec = g_strdup (exec); - app->priv->save_mask |= GSP_ASP_SAVE_MASK_EXEC; - } - - if (changed) { - _gsp_app_queue_save (app); - _gsp_app_emit_changed (app); - } -} - -void -gsp_app_delete (GspApp *app) -{ - g_return_if_fail (GSP_IS_APP (app)); - - if (app->priv->xdg_position == 0 && - app->priv->xdg_system_position == G_MAXUINT) { - /* exists in user directory only */ - if (app->priv->save_timeout) { - g_source_remove (app->priv->save_timeout); - app->priv->save_timeout = 0; - } - - if (g_file_test (app->priv->path, G_FILE_TEST_EXISTS)) { - g_remove (app->priv->path); - } - - /* for extra safety */ - app->priv->hidden = TRUE; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; - - _gsp_app_emit_removed (app); - } else { - /* also exists in system directory, so we have to keep a file - * in the user directory */ - app->priv->hidden = TRUE; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; - - _gsp_app_queue_save (app); - _gsp_app_emit_changed (app); - } -} - -/* - * New autostart app - */ - -void -gsp_app_reload_at (GspApp *app, - const char *path, - unsigned int xdg_position) -{ - g_return_if_fail (GSP_IS_APP (app)); - - app->priv->xdg_position = G_MAXUINT; - gsp_app_new (path, xdg_position); -} - -GspApp * -gsp_app_new (const char *path, - unsigned int xdg_position) -{ - GspAppManager *manager; - GspApp *app; - GKeyFile *keyfile; - char *basename; - gboolean new; - - basename = g_path_get_basename (path); - - manager = gsp_app_manager_get (); - app = gsp_app_manager_find_app_with_basename (manager, basename); - g_object_unref (manager); - - new = (app == NULL); - - if (!new) { - if (app->priv->xdg_position == xdg_position) { - if (app->priv->skip_next_monitor_event) { - app->priv->skip_next_monitor_event = FALSE; - return NULL; - } - /* else: the file got changed but not by us, we'll - * update our data from disk */ - } - - if (app->priv->xdg_position < xdg_position || - app->priv->save_timeout != 0) { - /* we don't really care about this file, since we - * already have something with a higher priority, or - * we're going to write something in the user config - * anyway. - * Note: xdg_position >= 1 so it's a system dir */ - app->priv->xdg_system_position = MIN (xdg_position, - app->priv->xdg_system_position); - return NULL; - } - } - - keyfile = g_key_file_new (); - if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) { - g_key_file_free (keyfile); - g_free (basename); - return NULL; - } - - if (new) { - app = g_object_new (GSP_TYPE_APP, NULL); - app->priv->basename = basename; - } else { - g_free (basename); - _gsp_app_free_reusable_data (app); - } - - app->priv->path = g_strdup (path); - - app->priv->hidden = gsp_key_file_get_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_HIDDEN, - FALSE); - app->priv->no_display = gsp_key_file_get_boolean (keyfile, - G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, - FALSE); - app->priv->enabled = gsp_key_file_get_boolean (keyfile, - GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, - TRUE); - app->priv->shown = gsp_key_file_get_shown (keyfile, - gsm_util_get_current_desktop ()); - - app->priv->name = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_NAME); - app->priv->exec = gsp_key_file_get_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_EXEC); - app->priv->comment = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_COMMENT); - - if (gsm_util_text_is_blank (app->priv->name)) { - g_free (app->priv->name); - app->priv->name = g_strdup (app->priv->exec); - } - - app->priv->icon = gsp_key_file_get_locale_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_ICON); - - if (app->priv->icon) { - /* look at icon and see if it's a themed icon or not */ - if (g_path_is_absolute (app->priv->icon)) { - GFile *iconfile; - - iconfile = g_file_new_for_path (app->priv->icon); - app->priv->gicon = g_file_icon_new (iconfile); - g_object_unref (iconfile); - } else { - app->priv->gicon = g_themed_icon_new (app->priv->icon); - } - } else { - app->priv->gicon = NULL; - } - - g_key_file_free (keyfile); - - _gsp_app_update_description (app); - - if (xdg_position > 0) { - g_assert (xdg_position <= app->priv->xdg_system_position); - app->priv->xdg_system_position = xdg_position; - } - /* else we keep the old value (which is G_MAXUINT if it wasn't set) */ - app->priv->xdg_position = xdg_position; - - g_assert (!new || app->priv->save_timeout == 0); - app->priv->save_timeout = 0; - app->priv->old_system_path = NULL; - app->priv->skip_next_monitor_event = FALSE; - - if (!new) { - _gsp_app_emit_changed (app); - } - - return app; -} - -static char * -_gsp_find_free_basename (const char *suggested_basename) -{ - GspAppManager *manager; - char *base_path; - char *filename; - char *basename; - int i; - - if (g_str_has_suffix (suggested_basename, ".desktop")) { - char *basename_no_ext; - - basename_no_ext = g_strndup (suggested_basename, - strlen (suggested_basename) - strlen (".desktop")); - base_path = g_build_filename (g_get_user_config_dir (), - "autostart", - basename_no_ext, NULL); - g_free (basename_no_ext); - } else { - base_path = g_build_filename (g_get_user_config_dir (), - "autostart", - suggested_basename, NULL); - } - - filename = g_strdup_printf ("%s.desktop", base_path); - basename = g_path_get_basename (filename); - - manager = gsp_app_manager_get (); - - i = 1; -#define _GSP_FIND_MAX_TRY 10000 - while (gsp_app_manager_find_app_with_basename (manager, - basename) != NULL && - g_file_test (filename, G_FILE_TEST_EXISTS) && - i < _GSP_FIND_MAX_TRY) { - g_free (filename); - g_free (basename); - - filename = g_strdup_printf ("%s-%d.desktop", base_path, i); - basename = g_path_get_basename (filename); - - i++; - } - - g_object_unref (manager); - - g_free (base_path); - g_free (filename); - - if (i == _GSP_FIND_MAX_TRY) { - g_free (basename); - return NULL; - } - - return basename; -} - -void -gsp_app_create (const char *name, - const char *comment, - const char *exec) -{ - GspAppManager *manager; - GspApp *app; - char *basename; - char **argv; - int argc; - - g_return_if_fail (!gsm_util_text_is_blank (exec)); - - if (!g_shell_parse_argv (exec, &argc, &argv, NULL)) { - return; - } - - basename = _gsp_find_free_basename (argv[0]); - g_strfreev (argv); - if (basename == NULL) { - return; - } - - app = g_object_new (GSP_TYPE_APP, NULL); - - app->priv->basename = basename; - app->priv->path = g_build_filename (g_get_user_config_dir (), - "autostart", - app->priv->basename, NULL); - - app->priv->hidden = FALSE; - app->priv->no_display = FALSE; - app->priv->enabled = TRUE; - app->priv->shown = TRUE; - - if (!gsm_util_text_is_blank (name)) { - app->priv->name = g_strdup (name); - } else { - app->priv->name = g_strdup (exec); - } - app->priv->exec = g_strdup (exec); - app->priv->comment = g_strdup (comment); - app->priv->icon = NULL; - - app->priv->gicon = NULL; - _gsp_app_update_description (app); - - /* by definition */ - app->priv->xdg_position = 0; - app->priv->xdg_system_position = G_MAXUINT; - - app->priv->save_timeout = 0; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_ALL; - app->priv->old_system_path = NULL; - app->priv->skip_next_monitor_event = FALSE; - - _gsp_app_queue_save (app); - - manager = gsp_app_manager_get (); - gsp_app_manager_add (manager, app); - g_object_unref (app); - g_object_unref (manager); -} - -gboolean -gsp_app_copy_desktop_file (const char *uri) -{ - GspAppManager *manager; - GspApp *app; - GFile *src_file; - char *src_basename; - char *dst_basename; - char *dst_path; - GFile *dst_file; - gboolean changed; - - g_return_val_if_fail (uri != NULL, FALSE); - - src_file = g_file_new_for_uri (uri); - src_basename = g_file_get_basename (src_file); - - if (src_basename == NULL) { - g_object_unref (src_file); - return FALSE; - } - - dst_basename = _gsp_find_free_basename (src_basename); - g_free (src_basename); - - if (dst_basename == NULL) { - g_object_unref (src_file); - return FALSE; - } - - dst_path = g_build_filename (g_get_user_config_dir (), - "autostart", - dst_basename, NULL); - g_free (dst_basename); - - dst_file = g_file_new_for_path (dst_path); - - _gsp_ensure_user_autostart_dir (); - if (!g_file_copy (src_file, dst_file, G_FILE_COPY_NONE, - NULL, NULL, NULL, NULL)) { - g_object_unref (src_file); - g_object_unref (dst_file); - g_free (dst_path); - return FALSE; - } - - g_object_unref (src_file); - g_object_unref (dst_file); - - app = gsp_app_new (dst_path, 0); - if (!app) { - g_remove (dst_path); - g_free (dst_path); - return FALSE; - } - - g_free (dst_path); - - changed = FALSE; - if (app->priv->hidden) { - changed = TRUE; - app->priv->hidden = FALSE; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; - } - - if (app->priv->no_display) { - changed = TRUE; - app->priv->no_display = FALSE; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_NO_DISPLAY; - } - - if (!app->priv->enabled) { - changed = TRUE; - app->priv->enabled = TRUE; - app->priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; - } - - if (changed) { - _gsp_app_queue_save (app); - } - - manager = gsp_app_manager_get (); - gsp_app_manager_add (manager, app); - g_object_unref (app); - g_object_unref (manager); - - return TRUE; -} diff -Nru gnome-session-3.9.90/capplet/gsp-app.h gnome-session-3.14.0/capplet/gsp-app.h --- gnome-session-3.9.90/capplet/gsp-app.h 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-app.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2007, 2009 Vincent Untz. - * Copyright (C) 2008 Lucas Rocha. - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GSP_APP_H -#define __GSP_APP_H - -#include -#include - -G_BEGIN_DECLS - -#define GSP_TYPE_APP (gsp_app_get_type ()) -#define GSP_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSP_TYPE_APP, GspApp)) -#define GSP_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSP_TYPE_APP, GspAppClass)) -#define GSP_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSP_TYPE_APP)) -#define GSP_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSP_TYPE_APP)) -#define GSP_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSP_TYPE_APP, GspAppClass)) - -typedef struct _GspApp GspApp; -typedef struct _GspAppClass GspAppClass; - -typedef struct _GspAppPrivate GspAppPrivate; - -struct _GspAppClass -{ - GObjectClass parent_class; - - void (* changed) (GspApp *app); - void (* removed) (GspApp *app); -}; - -struct _GspApp -{ - GObject parent_instance; - - GspAppPrivate *priv; -}; - -GType gsp_app_get_type (void); - -void gsp_app_create (const char *name, - const char *comment, - const char *exec); -void gsp_app_update (GspApp *app, - const char *name, - const char *comment, - const char *exec); - -gboolean gsp_app_copy_desktop_file (const char *uri); - -void gsp_app_delete (GspApp *app); - -const char *gsp_app_get_basename (GspApp *app); -const char *gsp_app_get_path (GspApp *app); - -gboolean gsp_app_get_hidden (GspApp *app); -gboolean gsp_app_get_display (GspApp *app); - -gboolean gsp_app_get_enabled (GspApp *app); -void gsp_app_set_enabled (GspApp *app, - gboolean enabled); - -gboolean gsp_app_get_shown (GspApp *app); - -const char *gsp_app_get_name (GspApp *app); -const char *gsp_app_get_exec (GspApp *app); -const char *gsp_app_get_comment (GspApp *app); - -const char *gsp_app_get_description (GspApp *app); -GIcon *gsp_app_get_icon (GspApp *app); - -/* private interface for GspAppManager only */ - -GspApp *gsp_app_new (const char *path, - unsigned int xdg_position); - -void gsp_app_reload_at (GspApp *app, - const char *path, - unsigned int xdg_position); - -unsigned int gsp_app_get_xdg_position (GspApp *app); -unsigned int gsp_app_get_xdg_system_position (GspApp *app); -void gsp_app_set_xdg_system_position (GspApp *app, - unsigned int position); - -G_END_DECLS - -#endif /* __GSP_APP_H */ diff -Nru gnome-session-3.9.90/capplet/gsp-app-manager.c gnome-session-3.14.0/capplet/gsp-app-manager.c --- gnome-session-3.9.90/capplet/gsp-app-manager.c 2012-12-12 18:26:59.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-app-manager.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,593 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2007, 2009 Vincent Untz. - * Copyright (C) 2008 Lucas Rocha. - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include - -#include "gsm-util.h" -#include "gsp-app.h" - -#include "gsp-app-manager.h" - -static GspAppManager *manager = NULL; - -typedef struct { - char *dir; - int index; - GFileMonitor *monitor; -} GspXdgDir; - -struct _GspAppManagerPrivate { - GSList *apps; - GSList *dirs; -}; - -#define GSP_APP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP_MANAGER, GspAppManagerPrivate)) - - -enum { - ADDED, - REMOVED, - LAST_SIGNAL -}; - -static guint gsp_app_manager_signals[LAST_SIGNAL] = { 0 }; - - -G_DEFINE_TYPE (GspAppManager, gsp_app_manager, G_TYPE_OBJECT) - -static void gsp_app_manager_dispose (GObject *object); -static void gsp_app_manager_finalize (GObject *object); -static void _gsp_app_manager_app_unref (GspApp *app, - GspAppManager *manager); -static void _gsp_app_manager_app_removed (GspAppManager *manager, - GspApp *app); - -static GspXdgDir * -_gsp_xdg_dir_new (const char *dir, - int index) -{ - GspXdgDir *xdgdir; - - xdgdir = g_slice_new (GspXdgDir); - - xdgdir->dir = g_strdup (dir); - xdgdir->index = index; - xdgdir->monitor = NULL; - - return xdgdir; -} - -static void -_gsp_xdg_dir_free (GspXdgDir *xdgdir) -{ - if (xdgdir->dir) { - g_free (xdgdir->dir); - xdgdir->dir = NULL; - } - - if (xdgdir->monitor) { - g_file_monitor_cancel (xdgdir->monitor); - g_object_unref (xdgdir->monitor); - xdgdir->monitor = NULL; - } - - g_slice_free (GspXdgDir, xdgdir); -} - -static void -gsp_app_manager_class_init (GspAppManagerClass *class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (class); - - gobject_class->dispose = gsp_app_manager_dispose; - gobject_class->finalize = gsp_app_manager_finalize; - - gsp_app_manager_signals[ADDED] = - g_signal_new ("added", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GspAppManagerClass, - added), - NULL, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_OBJECT); - - gsp_app_manager_signals[REMOVED] = - g_signal_new ("removed", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GspAppManagerClass, - removed), - NULL, - NULL, - g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, G_TYPE_OBJECT); - - g_type_class_add_private (class, sizeof (GspAppManagerPrivate)); -} - -static void -gsp_app_manager_init (GspAppManager *manager) -{ - manager->priv = GSP_APP_MANAGER_GET_PRIVATE (manager); - - memset (manager->priv, 0, sizeof (GspAppManagerPrivate)); -} - -static void -gsp_app_manager_dispose (GObject *object) -{ - GspAppManager *manager; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSP_IS_APP_MANAGER (object)); - - manager = GSP_APP_MANAGER (object); - - /* we unref GspApp objects in dispose since they might need to - * reference us during their dispose/finalize */ - g_slist_foreach (manager->priv->apps, - (GFunc) _gsp_app_manager_app_unref, manager); - g_slist_free (manager->priv->apps); - manager->priv->apps = NULL; - - G_OBJECT_CLASS (gsp_app_manager_parent_class)->dispose (object); -} - -static void -gsp_app_manager_finalize (GObject *object) -{ - GspAppManager *manager; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSP_IS_APP_MANAGER (object)); - - manager = GSP_APP_MANAGER (object); - - g_slist_foreach (manager->priv->dirs, - (GFunc) _gsp_xdg_dir_free, NULL); - g_slist_free (manager->priv->dirs); - manager->priv->dirs = NULL; - - G_OBJECT_CLASS (gsp_app_manager_parent_class)->finalize (object); - - manager = NULL; -} - -static void -_gsp_app_manager_emit_added (GspAppManager *manager, - GspApp *app) -{ - g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[ADDED], - 0, app); -} - -static void -_gsp_app_manager_emit_removed (GspAppManager *manager, - GspApp *app) -{ - g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[REMOVED], - 0, app); -} - -/* - * Directories - */ - -static int -gsp_app_manager_get_dir_index (GspAppManager *manager, - const char *dir) -{ - GSList *l; - GspXdgDir *xdgdir; - - g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), -1); - g_return_val_if_fail (dir != NULL, -1); - - for (l = manager->priv->dirs; l != NULL; l = l->next) { - xdgdir = l->data; - if (strcmp (dir, xdgdir->dir) == 0) { - return xdgdir->index; - } - } - - return -1; -} - -const char * -gsp_app_manager_get_dir (GspAppManager *manager, - unsigned int index) -{ - GSList *l; - GspXdgDir *xdgdir; - - g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); - - for (l = manager->priv->dirs; l != NULL; l = l->next) { - xdgdir = l->data; - if (index == xdgdir->index) { - return xdgdir->dir; - } - } - - return NULL; -} - -static int -_gsp_app_manager_find_dir_with_basename (GspAppManager *manager, - const char *basename, - int minimum_index) -{ - GSList *l; - GspXdgDir *xdgdir; - char *path; - GKeyFile *keyfile; - int result = -1; - - path = NULL; - keyfile = g_key_file_new (); - - for (l = manager->priv->dirs; l != NULL; l = l->next) { - xdgdir = l->data; - - if (xdgdir->index <= minimum_index) { - continue; - } - - g_free (path); - path = g_build_filename (xdgdir->dir, basename, NULL); - if (!g_file_test (path, G_FILE_TEST_EXISTS)) { - continue; - } - - if (!g_key_file_load_from_file (keyfile, path, - G_KEY_FILE_NONE, NULL)) { - continue; - } - - /* the file exists and is readable */ - if (result == -1) { - result = xdgdir->index; - } else { - result = MIN (result, xdgdir->index); - } - } - - g_key_file_free (keyfile); - g_free (path); - - return result; -} - -static void -_gsp_app_manager_handle_delete (GspAppManager *manager, - GspApp *app, - const char *basename, - int index) -{ - unsigned int position; - unsigned int system_position; - - position = gsp_app_get_xdg_position (app); - system_position = gsp_app_get_xdg_system_position (app); - - if (system_position < index) { - /* it got deleted, but we don't even care about it */ - return; - } - - if (index < position) { - /* it got deleted, but in a position earlier than the current - * one. This happens when the user file was changed and became - * identical to the system file; in this case, the user file is - * simply removed. */ - g_assert (index == 0); - return; - } - - if (position == index && - (system_position == index || system_position == G_MAXUINT)) { - /* the file used by the user was deleted, and there's no other - * file in system directories. So it really got deleted. */ - _gsp_app_manager_app_removed (manager, app); - return; - } - - if (system_position == index) { - /* then we know that position != index; we just hae to tell - * GspApp if there's still a system directory containing this - * basename */ - int new_system; - - new_system = _gsp_app_manager_find_dir_with_basename (manager, - basename, - index); - if (new_system < 0) { - gsp_app_set_xdg_system_position (app, G_MAXUINT); - } else { - gsp_app_set_xdg_system_position (app, new_system); - } - - return; - } - - if (position == index) { - /* then we know that system_position != G_MAXUINT; we need to - * tell GspApp to change position to system_position */ - const char *dir; - - dir = gsp_app_manager_get_dir (manager, system_position); - if (dir) { - char *path; - - path = g_build_filename (dir, basename, NULL); - gsp_app_reload_at (app, path, - (unsigned int) system_position); - g_free (path); - } else { - _gsp_app_manager_app_removed (manager, app); - } - - return; - } - - g_assert_not_reached (); -} - -static gboolean -gsp_app_manager_xdg_dir_monitor (GFileMonitor *monitor, - GFile *child, - GFile *other_file, - GFileMonitorEvent flags, - gpointer data) -{ - GspAppManager *manager; - GspApp *old_app; - GspApp *app; - GFile *parent; - char *basename; - char *dir; - char *path; - int index; - - manager = GSP_APP_MANAGER (data); - - basename = g_file_get_basename (child); - if (!g_str_has_suffix (basename, ".desktop")) { - /* not a desktop file, we can ignore */ - g_free (basename); - return TRUE; - } - old_app = gsp_app_manager_find_app_with_basename (manager, basename); - - parent = g_file_get_parent (child); - dir = g_file_get_path (parent); - g_object_unref (parent); - - index = gsp_app_manager_get_dir_index (manager, dir); - if (index < 0) { - /* not a directory we know; should never happen, though */ - g_free (dir); - return TRUE; - } - - path = g_file_get_path (child); - - switch (flags) { - case G_FILE_MONITOR_EVENT_CHANGED: - case G_FILE_MONITOR_EVENT_CREATED: - /* we just do as if it was a new file: GspApp is clever enough - * to do the right thing */ - app = gsp_app_new (path, (unsigned int) index); - - /* we didn't have this app before, so add it */ - if (old_app == NULL && app != NULL) { - gsp_app_manager_add (manager, app); - g_object_unref (app); - } - /* else: it was just updated, GspApp took care of - * sending the event */ - break; - case G_FILE_MONITOR_EVENT_DELETED: - if (!old_app) { - /* it got deleted, but we don't know about it, so - * nothing to do */ - break; - } - - _gsp_app_manager_handle_delete (manager, old_app, - basename, index); - break; - default: - break; - } - - g_free (path); - g_free (dir); - g_free (basename); - - return TRUE; -} - -/* - * Initialization - */ - -static void -_gsp_app_manager_fill_from_dir (GspAppManager *manager, - GspXdgDir *xdgdir) -{ - GFile *file; - GDir *dir; - const char *name; - - file = g_file_new_for_path (xdgdir->dir); - xdgdir->monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, - NULL, NULL); - g_object_unref (file); - - if (xdgdir->monitor) { - g_signal_connect (xdgdir->monitor, "changed", - G_CALLBACK (gsp_app_manager_xdg_dir_monitor), - manager); - } - - dir = g_dir_open (xdgdir->dir, 0, NULL); - if (!dir) { - return; - } - - while ((name = g_dir_read_name (dir))) { - GspApp *app; - char *desktop_file_path; - - if (!g_str_has_suffix (name, ".desktop")) { - continue; - } - - desktop_file_path = g_build_filename (xdgdir->dir, name, NULL); - app = gsp_app_new (desktop_file_path, xdgdir->index); - - if (app != NULL) { - gsp_app_manager_add (manager, app); - g_object_unref (app); - } - - g_free (desktop_file_path); - } - - g_dir_close (dir); -} - -void -gsp_app_manager_fill (GspAppManager *manager) -{ - char **autostart_dirs; - int i; - - if (manager->priv->apps != NULL) - return; - - autostart_dirs = gsm_util_get_autostart_dirs (); - /* we always assume that the first directory is the user one */ - g_assert (g_str_has_prefix (autostart_dirs[0], - g_get_user_config_dir ())); - - for (i = 0; autostart_dirs[i] != NULL; i++) { - GspXdgDir *xdgdir; - - if (gsp_app_manager_get_dir_index (manager, - autostart_dirs[i]) >= 0) { - continue; - } - - xdgdir = _gsp_xdg_dir_new (autostart_dirs[i], i); - manager->priv->dirs = g_slist_prepend (manager->priv->dirs, - xdgdir); - - _gsp_app_manager_fill_from_dir (manager, xdgdir); - } - - g_strfreev (autostart_dirs); -} - -/* - * App handling - */ - -static void -_gsp_app_manager_app_unref (GspApp *app, - GspAppManager *manager) -{ - g_signal_handlers_disconnect_by_func (app, - _gsp_app_manager_app_removed, - manager); - g_object_unref (app); -} - -static void -_gsp_app_manager_app_removed (GspAppManager *manager, - GspApp *app) -{ - _gsp_app_manager_emit_removed (manager, app); - manager->priv->apps = g_slist_remove (manager->priv->apps, app); - _gsp_app_manager_app_unref (app, manager); -} - -void -gsp_app_manager_add (GspAppManager *manager, - GspApp *app) -{ - g_return_if_fail (GSP_IS_APP_MANAGER (manager)); - g_return_if_fail (GSP_IS_APP (app)); - - manager->priv->apps = g_slist_prepend (manager->priv->apps, - g_object_ref (app)); - g_signal_connect_swapped (app, "removed", - G_CALLBACK (_gsp_app_manager_app_removed), - manager); - _gsp_app_manager_emit_added (manager, app); -} - -GspApp * -gsp_app_manager_find_app_with_basename (GspAppManager *manager, - const char *basename) -{ - GSList *l; - GspApp *app; - - g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); - g_return_val_if_fail (basename != NULL, NULL); - - for (l = manager->priv->apps; l != NULL; l = l->next) { - app = GSP_APP (l->data); - if (strcmp (basename, gsp_app_get_basename (app)) == 0) - return app; - } - - return NULL; -} - -/* - * Singleton - */ - -GspAppManager * -gsp_app_manager_get (void) -{ - if (manager == NULL) { - manager = g_object_new (GSP_TYPE_APP_MANAGER, NULL); - return manager; - } else { - return g_object_ref (manager); - } -} - -GSList * -gsp_app_manager_get_apps (GspAppManager *manager) -{ - g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); - - return g_slist_copy (manager->priv->apps); -} diff -Nru gnome-session-3.9.90/capplet/gsp-app-manager.h gnome-session-3.14.0/capplet/gsp-app-manager.h --- gnome-session-3.9.90/capplet/gsp-app-manager.h 2012-12-12 18:26:59.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-app-manager.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2007, 2009 Vincent Untz. - * Copyright (C) 2008 Lucas Rocha. - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GSP_APP_MANAGER_H -#define __GSP_APP_MANAGER_H - -#include - -#include - -G_BEGIN_DECLS - -#define GSP_TYPE_APP_MANAGER (gsp_app_manager_get_type ()) -#define GSP_APP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSP_TYPE_APP_MANAGER, GspAppManager)) -#define GSP_APP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSP_TYPE_APP_MANAGER, GspAppManagerClass)) -#define GSP_IS_APP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSP_TYPE_APP_MANAGER)) -#define GSP_IS_APP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSP_TYPE_APP_MANAGER)) -#define GSP_APP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSP_TYPE_APP_MANAGER, GspAppManagerClass)) - -typedef struct _GspAppManager GspAppManager; -typedef struct _GspAppManagerClass GspAppManagerClass; - -typedef struct _GspAppManagerPrivate GspAppManagerPrivate; - -struct _GspAppManagerClass -{ - GObjectClass parent_class; - - void (* added) (GspAppManager *manager, - GspApp *app); - void (* removed) (GspAppManager *manager, - GspApp *app); -}; - -struct _GspAppManager -{ - GObject parent_instance; - - GspAppManagerPrivate *priv; -}; - -GType gsp_app_manager_get_type (void); - -GspAppManager *gsp_app_manager_get (void); - -void gsp_app_manager_fill (GspAppManager *manager); - -GSList *gsp_app_manager_get_apps (GspAppManager *manager); - -GspApp *gsp_app_manager_find_app_with_basename (GspAppManager *manager, - const char *basename); - -const char *gsp_app_manager_get_dir (GspAppManager *manager, - unsigned int index); - -void gsp_app_manager_add (GspAppManager *manager, - GspApp *app); - -G_END_DECLS - -#endif /* __GSP_APP_MANAGER_H */ diff -Nru gnome-session-3.9.90/capplet/gsp-keyfile.c gnome-session-3.14.0/capplet/gsp-keyfile.c --- gnome-session-3.9.90/capplet/gsp-keyfile.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-keyfile.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -/* - * gsp-keyfile.c: GKeyFile extensions - * - * Copyright (C) 2008, 2009 Novell, Inc. - * - * Based on code from panel-keyfile.c (from gnome-panel) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Vincent Untz - */ - -#include - -#include - -#include "gsp-keyfile.h" - -void -gsp_key_file_populate (GKeyFile *keyfile) -{ - gsp_key_file_set_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_TYPE, - "Application"); - - gsp_key_file_set_string (keyfile, - G_KEY_FILE_DESKTOP_KEY_EXEC, - "/bin/false"); -} - -//FIXME: kill this when bug #309224 is fixed -gboolean -gsp_key_file_to_file (GKeyFile *keyfile, - const gchar *path, - GError **error) -{ - GError *write_error; - gchar *data; - gsize length; - gboolean res; - - g_return_val_if_fail (keyfile != NULL, FALSE); - g_return_val_if_fail (path != NULL, FALSE); - - write_error = NULL; - data = g_key_file_to_data (keyfile, &length, &write_error); - - if (write_error) { - g_propagate_error (error, write_error); - return FALSE; - } - - res = g_file_set_contents (path, data, length, &write_error); - g_free (data); - - if (write_error) { - g_propagate_error (error, write_error); - return FALSE; - } - - return res; -} - -gboolean -gsp_key_file_get_boolean (GKeyFile *keyfile, - const gchar *key, - gboolean default_value) -{ - GError *error; - gboolean retval; - - error = NULL; - retval = g_key_file_get_boolean (keyfile, G_KEY_FILE_DESKTOP_GROUP, - key, &error); - if (error != NULL) { - retval = default_value; - g_error_free (error); - } - - return retval; -} - -gboolean -gsp_key_file_get_shown (GKeyFile *keyfile, - const char *current_desktop) -{ - char **only_show_in, **not_show_in; - gboolean found; - int i; - - if (!current_desktop) - return TRUE; - - only_show_in = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, - NULL, NULL); - - if (only_show_in) { - found = FALSE; - for (i = 0; only_show_in[i] != NULL; i++) { - if (g_strcmp0 (current_desktop, only_show_in[i]) == 0) { - found = TRUE; - break; - } - } - - g_strfreev (only_show_in); - - if (!found) - return FALSE; - } - - not_show_in = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, - NULL, NULL); - - if (not_show_in) { - found = FALSE; - for (i = 0; not_show_in[i] != NULL; i++) { - if (g_strcmp0 (current_desktop, not_show_in[i]) == 0) { - found = TRUE; - break; - } - } - - g_strfreev (not_show_in); - - if (found) - return FALSE; - } - - return TRUE; -} - -void -gsp_key_file_set_locale_string (GKeyFile *keyfile, - const gchar *key, - const gchar *value) -{ - const char *locale; - const char * const *langs_pointer; - int i; - - if (value == NULL) { - value = ""; - } - - locale = NULL; - langs_pointer = g_get_language_names (); - for (i = 0; langs_pointer[i] != NULL; i++) { - /* find first without encoding */ - if (strchr (langs_pointer[i], '.') == NULL) { - locale = langs_pointer[i]; - break; - } - } - - if (locale != NULL) { - g_key_file_set_locale_string (keyfile, G_KEY_FILE_DESKTOP_GROUP, - key, locale, value); - } else { - g_key_file_set_string (keyfile, G_KEY_FILE_DESKTOP_GROUP, - key, value); - } -} - -void -gsp_key_file_ensure_C_key (GKeyFile *keyfile, - const char *key) -{ - char *C_value; - char *buffer; - - /* Make sure we set the "C" locale strings to the terms we set here. - * This is so that if the user logs into another locale they get their - * own description there rather then empty. It is not the C locale - * however, but the user created this entry herself so it's OK */ - C_value = gsp_key_file_get_string (keyfile, key); - if (C_value == NULL || C_value [0] == '\0') { - buffer = gsp_key_file_get_locale_string (keyfile, key); - if (buffer) { - gsp_key_file_set_string (keyfile, key, buffer); - g_free (buffer); - } - } - g_free (C_value); -} diff -Nru gnome-session-3.9.90/capplet/gsp-keyfile.h gnome-session-3.14.0/capplet/gsp-keyfile.h --- gnome-session-3.9.90/capplet/gsp-keyfile.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/gsp-keyfile.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -/* - * gsp-keyfile.h: GKeyFile extensions - * - * Copyright (C) 2008, 2009 Novell, Inc. - * - * Based on code from panel-keyfile.h (from gnome-panel) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Vincent Untz - */ - -#ifndef GSP_KEYFILE_H -#define GSP_KEYFILE_H - -#include "glib.h" - -G_BEGIN_DECLS - -#define GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED "X-GNOME-Autostart-enabled" - -void gsp_key_file_populate (GKeyFile *keyfile); - -gboolean gsp_key_file_to_file (GKeyFile *keyfile, - const gchar *path, - GError **error); - -gboolean gsp_key_file_get_boolean (GKeyFile *keyfile, - const gchar *key, - gboolean default_value); -gboolean gsp_key_file_get_shown (GKeyFile *keyfile, - const char *current_desktop); -#define gsp_key_file_get_string(key_file, key) \ - g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, key, NULL) -#define gsp_key_file_get_locale_string(key_file, key) \ - g_key_file_get_locale_string(key_file, G_KEY_FILE_DESKTOP_GROUP, key, NULL, NULL) - -#define gsp_key_file_set_boolean(key_file, key, value) \ - g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, key, value) -#define gsp_key_file_set_string(key_file, key, value) \ - g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, key, value) -void gsp_key_file_set_locale_string (GKeyFile *keyfile, - const gchar *key, - const gchar *value); - -void gsp_key_file_ensure_C_key (GKeyFile *keyfile, - const char *key); - -G_END_DECLS - -#endif /* GSP_KEYFILE_H */ diff -Nru gnome-session-3.9.90/capplet/main.c gnome-session-3.14.0/capplet/main.c --- gnome-session-3.9.90/capplet/main.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/main.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * main.c - * Copyright (C) 1999 Free Software Foundation, Inc. - * Copyright (C) 2008 Lucas Rocha. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - */ - -#include - -#include -#include - -#include -#include - -#include "gsm-properties-dialog.h" - -static gboolean show_version = FALSE; - -static GOptionEntry options[] = { - { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL }, - { NULL, 0, 0, 0, NULL, NULL, NULL } -}; - -static void -dialog_response (GsmPropertiesDialog *dialog, - guint response_id, - gpointer data) -{ - GdkScreen *screen; - GError *error; - - if (response_id == GTK_RESPONSE_HELP) { - screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); - - error = NULL; - gtk_show_uri (screen, "ghelp:user-guide?gosstartsession-2", - gtk_get_current_event_time (), &error); - - if (error != NULL) { - GtkWidget *d; - d = gtk_message_dialog_new (GTK_WINDOW (dialog), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - "%s", - _("Could not display help document")); - gtk_message_dialog_format_secondary_text ( - GTK_MESSAGE_DIALOG (d), - "%s", error->message); - g_error_free (error); - - gtk_dialog_run (GTK_DIALOG (d)); - gtk_widget_destroy (d); - } - } else { - gtk_widget_destroy (GTK_WIDGET (dialog)); - gtk_main_quit (); - } -} - -int -main (int argc, char *argv[]) -{ - GError *error; - GtkWidget *dialog; - - bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - - error = NULL; - if (! gtk_init_with_args (&argc, &argv, " - GNOME Session Properties", options, GETTEXT_PACKAGE, &error)) { - g_warning ("Unable to start: %s", error->message); - g_error_free (error); - return 1; - } - - if (show_version) { - g_print ("%s %s\n", argv [0], VERSION); - return 0; - } - - dialog = gsm_properties_dialog_new (); - g_signal_connect (dialog, - "response", - G_CALLBACK (dialog_response), - NULL); - gtk_widget_show (dialog); - - gtk_main (); - - return 0; -} diff -Nru gnome-session-3.9.90/capplet/Makefile.am gnome-session-3.14.0/capplet/Makefile.am --- gnome-session-3.9.90/capplet/Makefile.am 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -bin_PROGRAMS = gnome-session-properties - -AM_CPPFLAGS = \ - $(SESSION_PROPERTIES_CFLAGS) \ - $(GCONF_CFLAGS) \ - -I$(top_srcdir)/gnome-session \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - $(DISABLE_DEPRECATED_CFLAGS) - -AM_CFLAGS = $(WARN_CFLAGS) - -gnome_session_properties_SOURCES = \ - main.c \ - gsm-properties-dialog.h \ - gsm-properties-dialog.c \ - gsm-app-dialog.h \ - gsm-app-dialog.c \ - gsp-app.h \ - gsp-app.c \ - gsp-app-manager.h \ - gsp-app-manager.c \ - gsp-keyfile.h \ - gsp-keyfile.c - -gnome_session_properties_LDADD = \ - $(SESSION_PROPERTIES_LIBS) \ - $(top_builddir)/gnome-session/libgsmutil.la \ - $(GCONF_LIBS) - --include $(top_srcdir)/git.mk diff -Nru gnome-session-3.9.90/capplet/Makefile.in gnome-session-3.14.0/capplet/Makefile.in --- gnome-session-3.9.90/capplet/Makefile.in 2013-08-20 14:50:05.000000000 +0000 +++ gnome-session-3.14.0/capplet/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,731 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -bin_PROGRAMS = gnome-session-properties$(EXEEXT) -subdir = capplet -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -PROGRAMS = $(bin_PROGRAMS) -am_gnome_session_properties_OBJECTS = main.$(OBJEXT) \ - gsm-properties-dialog.$(OBJEXT) gsm-app-dialog.$(OBJEXT) \ - gsp-app.$(OBJEXT) gsp-app-manager.$(OBJEXT) \ - gsp-keyfile.$(OBJEXT) -gnome_session_properties_OBJECTS = \ - $(am_gnome_session_properties_OBJECTS) -am__DEPENDENCIES_1 = -gnome_session_properties_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(top_builddir)/gnome-session/libgsmutil.la \ - $(am__DEPENDENCIES_1) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(gnome_session_properties_SOURCES) -DIST_SOURCES = $(gnome_session_properties_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXECINFO_LIBS = @EXECINFO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@ -GIOUNIX_LIBS = @GIOUNIX_LIBS@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GL_TEST_CFLAGS = @GL_TEST_CFLAGS@ -GL_TEST_LIBS = @GL_TEST_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@ -GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK3_CFLAGS = @GTK3_CFLAGS@ -GTK3_LIBS = @GTK3_LIBS@ -HAVE_XRENDER = @HAVE_XRENDER@ -HAVE_XTEST = @HAVE_XTEST@ -ICE_CFLAGS = @ICE_CFLAGS@ -ICE_LIBS = @ICE_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SESSION_PROPERTIES_CFLAGS = @SESSION_PROPERTIES_CFLAGS@ -SESSION_PROPERTIES_LIBS = @SESSION_PROPERTIES_LIBS@ -SESSION_SELECTOR_CFLAGS = @SESSION_SELECTOR_CFLAGS@ -SESSION_SELECTOR_LIBS = @SESSION_SELECTOR_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ -STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -X11_CFLAGS = @X11_CFLAGS@ -X11_LIBS = @X11_LIBS@ -XEXT_CFLAGS = @XEXT_CFLAGS@ -XEXT_LIBS = @XEXT_LIBS@ -XGETTEXT = @XGETTEXT@ -XMLTO = @XMLTO@ -XRENDER_CFLAGS = @XRENDER_CFLAGS@ -XRENDER_LIBS = @XRENDER_LIBS@ -XSLTPROC = @XSLTPROC@ -XTEST_CFLAGS = @XTEST_CFLAGS@ -XTEST_LIBS = @XTEST_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -AM_CPPFLAGS = \ - $(SESSION_PROPERTIES_CFLAGS) \ - $(GCONF_CFLAGS) \ - -I$(top_srcdir)/gnome-session \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ - $(DISABLE_DEPRECATED_CFLAGS) - -AM_CFLAGS = $(WARN_CFLAGS) -gnome_session_properties_SOURCES = \ - main.c \ - gsm-properties-dialog.h \ - gsm-properties-dialog.c \ - gsm-app-dialog.h \ - gsm-app-dialog.c \ - gsp-app.h \ - gsp-app.c \ - gsp-app-manager.h \ - gsp-app-manager.c \ - gsp-keyfile.h \ - gsp-keyfile.c - -gnome_session_properties_LDADD = \ - $(SESSION_PROPERTIES_LIBS) \ - $(top_builddir)/gnome-session/libgsmutil.la \ - $(GCONF_LIBS) - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu capplet/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu capplet/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -gnome-session-properties$(EXEEXT): $(gnome_session_properties_OBJECTS) $(gnome_session_properties_DEPENDENCIES) $(EXTRA_gnome_session_properties_DEPENDENCIES) - @rm -f gnome-session-properties$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(gnome_session_properties_OBJECTS) $(gnome_session_properties_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-app-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-properties-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsp-app-manager.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsp-app.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsp-keyfile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-binPROGRAMS - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gnome-session-3.9.90/ChangeLog gnome-session-3.14.0/ChangeLog --- gnome-session-3.9.90/ChangeLog 2013-08-20 14:52:14.000000000 +0000 +++ gnome-session-3.14.0/ChangeLog 2014-09-22 14:19:44.000000000 +0000 @@ -1,30 +1,1675 @@ # Generated by Makefile. Do not edit. -commit 6de7237806146e7042ba093cd190f17f7c019267 (HEAD, master) -Author: Ray Strode -AuthorDate: Tue Aug 20 10:46:00 2013 -0400 -Commit: Ray Strode -CommitDate: Tue Aug 20 10:46:00 2013 -0400 +commit 2d19843f83401d3c100c1aa2fbe0d370223aa787 +Author: Rajesh Ranjan +Date: Sat Sep 20 16:41:40 2014 +0000 + + Updated Hindi translation + +M po/hi.po + +commit 816bf198f43954e229aa924764e27a47c1be7072 +Author: Shankar Prasad +Date: Thu Sep 18 11:18:38 2014 +0000 + + Updated Kannada translation + +M po/kn.po + +commit bd42a09c51321d985db465ca305c6b9b4dbbe432 +Author: Saibal Ray +Date: Wed Sep 17 05:56:51 2014 +0000 + + Updated Bengali (India) translation + +M po/bn_IN.po + +commit 0353b5854ce00b513dd39b2be35df1ca241f52e8 +Author: Umarzuki Bin Mochlis Moktar +Date: Tue Sep 16 06:47:51 2014 +0000 + + Updated Malay translation + +M po/ms.po + +commit d51a34a6918b327d90a09b8fdad144008da4436c +Author: Pawan Chitrakar +Date: Sun Sep 14 17:55:00 2014 +0000 + + Updated Nepali translation + +M po/ne.po + +commit c1c3d1a39746730e18b57653d9dd97f50a5e452a +Author: Sandeep Sheshrao Shedmake +Date: Fri Sep 12 09:43:42 2014 +0530 + + Updated Marathi Translations + +M po/mr.po + +commit 137319663c8b46678e2d951d64ccda01845cd281 +Author: Yosef Or Boczko +Date: Thu Sep 4 09:38:47 2014 +0300 + + Update Hebrew translation + +M po/he.po + +commit c95cae7c05b06d98f8209db5cec642291df1aea2 +Author: Praveen Illa +Date: Wed Aug 27 09:32:01 2014 +0530 + + Updated Telugu Translation + +M po/te.po + +commit 1c8fa0ac0e01c44e7026939772ac86fd9e2a706a +Author: Sweta Kothari +Date: Tue Aug 26 16:44:03 2014 +0530 + + committed file + +M po/gu.po + +commit aa74ea96b75f982d7dfde881752485562c7ef8cc +Author: Manoj Kumar Giri +Date: Mon Aug 25 11:35:55 2014 +0000 + + Updated Oriya translation + +M po/or.po + +commit be269439de90fc174f2d47a5105ddf45e896ad2f +Author: Fabio Tomat +Date: Thu Aug 14 05:46:04 2014 +0200 + + Updated Friulian translation + +M po/fur.po + +commit a7c955c8a07890c69021065e9c336f451aef918e +Author: Piotr Drąg +Date: Thu Jul 31 19:14:38 2014 +0200 + + doap: add + +M gnome-session.doap + +commit 75c1a8d0d91d8d5c768bf530ef4228679b875f39 +Author: Olav Vitters +Date: Wed Jul 30 16:31:04 2014 +0200 + + doap category core + +M gnome-session.doap + +commit a1ac414a84449b95af0ba68d93da3b8376fe92bf +Author: Ray Strode +Date: Fri Jul 18 16:53:20 2014 -0400 + + configure: bump to 3.13.3 + +M configure.ac + +commit 5636431a6058abf931f43875fa89b86999a98e13 +Author: Ray Strode +Date: Fri Jul 18 16:53:08 2014 -0400 + + NEWS: update for release + +M NEWS + +commit 050686830c13b541b3e86a4477ff1c35a70f21a4 +Author: Ray Strode +Date: Fri Jul 18 16:50:54 2014 -0400 + + NEWS: restore NEWS file + + I accidentally truncated it last release. + +M NEWS + +commit 14701e7536db60d20a5413f7bfb3709b69795017 +Author: Tom Tryfonidis +Date: Wed Jul 9 23:15:29 2014 +0000 + + Updated Greek translation + +M po/el.po + +commit ae971a3f237fdd6682613530fad1bdceff925421 +Author: Alexander Shopov +Date: Sat Jun 28 07:59:38 2014 +0300 + + Updated Bulgarian translation + +M po/bg.po + +commit bc89c695b4b97bb282369913965d75ab6e7a3dda +Author: Muhammet Kara +Date: Sat Jun 7 21:38:36 2014 +0000 + + Updated Turkish translation + +M po/tr.po + +commit cc4e6190b632087ae0eee4b2875d6210953a04fd +Author: Anders Jonsson +Date: Sat Jun 7 20:33:21 2014 +0000 + + Updated Swedish translation + +M po/sv.po + +commit 1db085ce7e5197b28ab24a3ec54d888efe98fcb4 +Author: Owen W. Taylor +Date: Mon May 19 13:01:12 2014 -0400 + + Set XDG_CURRENT_DESKTOP if unset + + From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with + older versions of GDM, other display managers, and startx, + set a fallback value if we don't find it set. + + https://bugzilla.gnome.org/show_bug.cgi?id=729575 + +M gnome-session/main.c + +commit 8c73ddc660703ed80207469aea6b64b845ba657d +Author: Florian Müllner +Date: Fri May 9 12:42:22 2014 +0200 + + autostart: Replace should_show() with get_show_in() again + + GDesktopAppInfo's should_show() implementation also considers the + NoDisplay flag, which is generally used by core components like + window managers. Return to use get_show_in(), which just checks + ShowOnlyIn and friends based on XDG_CURRENT_DESKTOP to get the + session back working. + + https://bugzilla.gnome.org/show_bug.cgi?id=729575 + +M gnome-session/gsm-autostart-app.c + +commit 35044a5cbc3b066b1dcee27a28ab576241e16dcf +Author: Florian Müllner +Date: Tue May 6 16:22:07 2014 +0200 + + autostart: Stop messing with XDG_CURRENT_DESKTOP + + The use of the XDG_CURRENT_DESKTOP variable predates the actual + standardization that only happened recently, and indeed does not + work when the variable contains a colon-separated list as allowed + by the new standard. Stop using it altogether, so GIO can handle it + for us (which it will soon). + + https://bugzilla.gnome.org/show_bug.cgi?id=729575 + +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-util.c +M gnome-session/gsm-util.h + +commit b5a73657f883ac2e2461f0063e1d36e301f9124a +Author: Ray Strode +Date: Tue Apr 15 08:55:48 2014 -0400 + + configure: bump to 3.12.1 + +M configure.ac + +commit 252798ff40f03ba605144f7d0c4d1fc2a57555d1 +Author: Ray Strode +Date: Tue Apr 15 08:55:28 2014 -0400 + + NEWS: update for release + +M NEWS + +commit ad66350c85280c2131409a058aba3e4fc306536d +Author: Ryan Lortie +Date: Wed Mar 26 12:04:14 2014 -0400 + + Don't disable ConsoleKit with new upower + + ConsoleKit is still useful, even if we can't suspend/hibernate using + upower anymore. Don't disable the whole thing. + + https://bugzilla.gnome.org/show_bug.cgi?id=727099 + +M gnome-session/Makefile.am +M gnome-session/gsm-consolekit.c +M gnome-session/gsm-system.c + +commit e96cdd4650bfee891b8ea051210ac86fe503a49e +Author: Daniel Mustieles +Date: Tue Apr 15 14:24:35 2014 +0200 + + Updated Spanish translation + +M po/es.po + +commit 89ef9cd07a24a2794b783ec69a7a3532dca0af03 +Author: Bastien Nocera +Date: Thu Apr 3 22:11:45 2014 +0200 + + data: Add DesktopNames to the session files + + So that GDM can export the XDG_CURRENT_DESKTOP environment variable. + + See also https://bugzilla.gnome.org/show_bug.cgi?id=727546 + + https://bugzilla.gnome.org/show_bug.cgi?id=727565 + +M data/gnome-wayland.desktop.in +M data/gnome.desktop.in + +commit e0f152ab3c0bb73fabf816e99003bb7494b2a240 +Author: Dirgita +Date: Thu Apr 10 03:48:12 2014 +0000 + + Updated Indonesian translation + +M po/id.po + +commit fa6f386ab9345934d6a4b25c88d58b59c332df53 +Author: Piotr Drąg +Date: Fri Apr 4 19:21:49 2014 +0200 + + doap: update URLs + +M HACKING +M README +M gnome-session.doap + +commit 2656156bdacef8b98df9a24c48666431044e6bdf +Author: Khoem Sokhem +Date: Thu Apr 3 08:29:17 2014 +0000 + + Updated Khmer translation + +M po/km.po + +commit 15351e90a735e249d2c2817c6d9591cdd1c5f192 +Author: Khoem Sokhem +Date: Wed Apr 2 09:36:23 2014 +0000 + + Updated Khmer translation + +M po/km.po + +commit eae46ba9f18be8d17ce7aee92ab3d9a80a8eaef8 +Author: Ray Strode +Date: Tue Mar 25 09:36:40 2014 -0400 + + configure: bump to 3.12.0 + +M configure.ac + +commit 436b50af25e0b2e2a42066757d2ea7b5ca02240e +Author: Ray Strode +Date: Tue Mar 25 09:36:15 2014 -0400 + + NEWS: update for release + +M NEWS + +commit 3723d3125cc4c984e036f901a9e3f64c2626d23e +Author: Ray Strode +Date: Mon Mar 24 14:38:29 2014 -0400 + + check-accelerated: always return success if wayland + + This command does a lot of things that assumes X is going to be around. + It won't be in the wayland case. For now, just assume the best + and short-circuit to success. + +M tools/gnome-session-check-accelerated.c + +commit 7be4b7c3044e0e1589dc907be7f0e2338855d0cd +Author: Ray Strode +Date: Wed Mar 19 18:26:21 2014 -0400 + + configure: bump to 3.11.92 + +M configure.ac + +commit 5df77f91728fa6ec8e574cf64b546ef33aed5dc0 +Author: Ray Strode +Date: Wed Mar 19 18:28:28 2014 -0400 + + NEWS: update for release + +M NEWS + +commit 3ff4d07f483cfb4c557ceb4e3f3014330d64f45e +Author: Ray Strode +Date: Tue Mar 18 23:36:29 2014 -0400 + + Revert "data: add X-GDM-NeedsVT=true to wayland xsession file" + + This reverts commit 16204920178d80c412c15230c26cf3cd8078a42f. + + The latest cut of wayland support in GDM doesn't have X-GDM-NeedsVT, + it just "does the right thing" for files in /usr/share/wayland-sessions + (versus files in /usr/share/xsessions) + +M data/gnome-wayland.desktop.in + +commit cdca6393d524cb5c00aa106ae67fba81d0582fbc +Author: Fabio Tomat +Date: Mon Mar 3 12:01:43 2014 +0100 + + Updated Friulian translation + +M po/fur.po + +commit 05999faf3a842bc59950eec22fc30b9d8feeef89 +Author: Khaled Hosny +Date: Fri Feb 28 23:26:47 2014 +0200 + + Update Arabic translation + +M po/ar.po + +commit aa4c9d125012ae94154ce075d62342b63b41a7d9 +Author: Dominique Leuenberger +Date: Tue Feb 25 19:28:16 2014 +0100 + + Check stricter for presence of xtrans (with option to disable) + + Not having xtrans available during build results in gnome-sessions + listening on remote TCP sockets (although not acting upon them). + + We strongly encourage the use of xtrans to minimize this surface. If + using xtrans is not an option, it can be overruled by --without-xtrans. + + https://bugzilla.gnome.org/show_bug.cgi?id=725100 + +M configure.ac +M gnome-session/gsm-xsmp-server.c + +commit f0779e688bab7c85ce34bfcf44ef2807807320fc +Author: Shankar Prasad +Date: Mon Feb 3 12:52:08 2014 +0530 + + updated kn.po + +M po/kn.po + +commit 7d455fdc1686d32d7e5628d26af1ac21bdaf2ddf +Author: Daniel Mustieles +Date: Thu Jan 23 12:56:36 2014 +0100 + + Updated FSF's address + +M gnome-session/gdm-log.c +M gnome-session/gdm-log.h +M gnome-session/gsm-app.c +M gnome-session/gsm-app.h +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-autostart-app.h +M gnome-session/gsm-client.c +M gnome-session/gsm-client.h +M gnome-session/gsm-consolekit.c +M gnome-session/gsm-consolekit.h +M gnome-session/gsm-dbus-client.c +M gnome-session/gsm-dbus-client.h +M gnome-session/gsm-fail-whale-dialog.c +M gnome-session/gsm-fail-whale-dialog.h +M gnome-session/gsm-fail-whale.c +M gnome-session/gsm-fail-whale.h +M gnome-session/gsm-icon-names.h +M gnome-session/gsm-inhibitor-flag.h +M gnome-session/gsm-inhibitor.c +M gnome-session/gsm-inhibitor.h +M gnome-session/gsm-manager-logout-mode.h +M gnome-session/gsm-manager.c +M gnome-session/gsm-manager.h +M gnome-session/gsm-presence-flag.h +M gnome-session/gsm-presence.c +M gnome-session/gsm-presence.h +M gnome-session/gsm-process-helper.c +M gnome-session/gsm-process-helper.h +M gnome-session/gsm-session-fill.c +M gnome-session/gsm-session-fill.h +M gnome-session/gsm-session-save.c +M gnome-session/gsm-session-save.h +M gnome-session/gsm-shell-extensions.c +M gnome-session/gsm-shell-extensions.h +M gnome-session/gsm-shell.c +M gnome-session/gsm-shell.h +M gnome-session/gsm-store.c +M gnome-session/gsm-store.h +M gnome-session/gsm-system.c +M gnome-session/gsm-system.h +M gnome-session/gsm-systemd.c +M gnome-session/gsm-systemd.h +M gnome-session/gsm-util.c +M gnome-session/gsm-util.h +M gnome-session/gsm-xsmp-client.c +M gnome-session/gsm-xsmp-client.h +M gnome-session/gsm-xsmp-server.c +M gnome-session/gsm-xsmp-server.h +M gnome-session/main.c +M gnome-session/test-client-dbus.c +M gnome-session/test-inhibit.c +M gnome-session/test-process-helper.c +M tools/gnome-session-inhibit.c +M tools/gnome-session-quit.c +M tools/gnome-session-selector.c + +commit 75f8bada84ce504c1071d0ea40d788c2e863195a +Author: GunChleoc +Date: Wed Jan 22 20:22:44 2014 +0100 + + Added Scottish Gaelic translation + +M po/LINGUAS +A po/gd.po + +commit 8b4c691b02eb1c41e31e108e64d32988de2fb819 +Author: Ray Strode +Date: Tue Jan 14 19:08:52 2014 -0500 + + configure: bump to 3.11.4 + +M configure.ac + +commit d109f5e3338f9560d04f3f158fd6e4d8bbd23ab2 +Author: Ray Strode +Date: Tue Jan 14 19:08:36 2014 -0500 + + NEWS: update for release + +M NEWS + +commit 1504a2ab3edfd8d807200d3f3cd880431af7252f +Author: Nilamdyuti Goswami +Date: Mon Jan 6 17:32:03 2014 +0530 + + Assamese translation updated + +M po/as.po + +commit bf3f8922203552ce79a0c422ad4f306c01829c18 +Author: Ryan Lortie +Date: Fri Jan 3 02:00:49 2014 -0500 + + gsm-system: add a null backend + + Add a 'null' backend for gsm-system to deal with the case where we don't + have systemd and our version of upower is too new. + + Without this fallback case, gnome-session segfaults on startup. + + https://bugzilla.gnome.org/show_bug.cgi?id=721380 + +M gnome-session/gsm-system.c + +commit 3ca99fe9eda1c288d8f9c64ef61af6f1c3fe6a6c +Author: Jorge Pérez Pérez +Date: Sun Dec 22 21:15:50 2013 +0100 + + Updated Aragonese translation + +M po/an.po + +commit 6c715c7cf5af501d5f677ab704da2f8ac8929496 +Merge: b6563e7 9cd6479 +Author: Ray Strode +Date: Tue Dec 17 10:51:21 2013 -0500 + + Version 3.11.3 + + * Warning fixes + * Use modern methods for finding gsettings schemas + * fail whale size request fixes + * Translation updates + +commit 9cd64798234c26a8feb497ec98777cd57be0ff94 +Author: Ray Strode +Date: Tue Dec 17 10:19:54 2013 -0500 + + configure: bump for release + +M configure.ac + +commit 5b00629e0617b6c5ce0b25d2ca8979e264e62709 +Author: Ray Strode +Date: Tue Dec 17 10:19:39 2013 -0500 + + NEWS: update for release + +M NEWS + +commit b6563e7886709dc972b60552038502fb197eab7c +Author: Ray Strode +Date: Wed Dec 11 01:29:23 2013 -0500 + + shell-extensions: stop using g_settings_list_schemas() + + This commit drops another use of g_settings_list_schemas + + https://bugzilla.gnome.org/show_bug.cgi?id=720232 + +M gnome-session/gsm-shell-extensions.c + +commit a1136a42ea98d63645fdece63b1c1898c6d44686 +Author: Ryan Lortie +Date: Wed Dec 11 01:30:50 2013 -0500 + + Add some G_GNUC_PRINTF annotations + + Fix clang build with -Werror=format-nonliteral. + + https://bugzilla.gnome.org/show_bug.cgi?id=720231 + +M gnome-session/gsm-dbus-client.c +M gnome-session/gsm-util.h + +commit 880379a8dd7181351ba49c579a5278d19eadc6b3 +Author: Ryan Lortie +Date: Wed Dec 11 01:29:23 2013 -0500 + + gsettings: stop using g_settings_list_schemas() + + Stop using the old deprecated trick of listing and iterating over all + the schemas. Use g_settings_schema_source_lookup() instead. + + https://bugzilla.gnome.org/show_bug.cgi?id=720232 + +M gnome-session/gsm-autostart-app.c + +commit e6ed366240ee55d35d3c8f9deec32429bbefa811 +Author: Mattias Põldaru +Date: Thu Dec 5 12:46:48 2013 +0200 + + [l10n] Updated Estonian translation + +M po/et.po + +commit ec4e99ab4d4ee8aee6be4d822149d923328632cb +Author: Benjamin Otte +Date: Wed Dec 4 03:35:45 2013 +0100 + + fail-whale: Sanitize size request code + + Code that implements get_preferred_width/height should always also + implement the height-for-width versions. + +M gnome-session/gsm-fail-whale-dialog.c + +commit 272cf29a194e1131b6d3e8d9fe6e7c2ea018b85a +Author: Shantha kumar +Date: Mon Nov 25 12:31:31 2013 +0530 + + Tamil Translations Updated + +M po/ta.po + +commit 4742352c5cb45a793bf4e8879c451dd51eba18e5 +Author: Ray Strode +Date: Mon Nov 18 14:18:41 2013 -0500 + + configure: bump to 3.11.2 + +M configure.ac + +commit 49e3c0bcc5b2b0e047527aab664625d6270dce42 +Author: Ray Strode +Date: Mon Nov 18 14:18:18 2013 -0500 + + NEWS: update for release + +M NEWS + +commit f11f157d507495589b0f4930f4fcc431c87bc121 +Author: Ray Strode +Date: Tue Nov 12 08:32:45 2013 -0500 + + data: blacklist nv25 + + It doesn't work very well. + + https://bugzilla.gnome.org/show_bug.cgi?id=711347 + +M data/hardware-compatibility + +commit bee8fa320a129499313e00d3bfa96defe5cf4a2a +Author: Colin Walters +Date: Sat Nov 2 15:40:18 2013 -0400 + + GsmProcessHelper: Port to GSubprocess + + Just decided to do this to help demo/test GSubprocess. I think the + code gets a *lot* better. + + https://bugzilla.gnome.org/show_bug.cgi?id=711304 + +M gnome-session/Makefile.am +M gnome-session/gsm-process-helper.c + +commit 45a8a7488090f66a8ba30f54de279e018e7a46c4 +Author: Efstathios Iosifidis +Date: Tue Nov 5 15:16:46 2013 +0200 + + Updated Greek translation + +M po/el.po + +commit a6e3182d26344e8ce702c81a1fbdd6d631136488 +Author: Javier Jardón +Date: Sun Nov 3 23:06:13 2013 +0000 + + 3.11.1 + +M NEWS +M configure.ac + +commit 8995ac5ab232276774b326d6b36c15c6d3d9eaba +Author: Matthias Clasen +Date: Fri Nov 1 16:30:06 2013 -0400 + + Fix a possible crash in the presence interface + + Improper error handling in gsm_presence_set_status_text() would + lead to a double free on the next call to that function. + Found using the dfuzzer tool, + https://github.com/matusmarhefka/dfuzzer + +M gnome-session/gsm-presence.c + +commit e68cf253511af579f935055dd6a7af1ec1db2abe +Author: eternalhui +Date: Fri Nov 1 23:06:35 2013 +0800 + + Update Chinese simplified translation + +M po/zh_CN.po + +commit 33de44f12f5ba60c1509ea82e37a4bba5ff6c043 +Author: Anish A +Date: Fri Oct 25 20:50:39 2013 +0530 + + Updated Malayalam Translation + +M po/ml.po + +commit 6e203f466118daf9941fb9c8dd64f1488dea14e7 +Author: Colin Walters +Date: Fri Oct 18 18:15:14 2013 -0400 + + gsm-manager: Don't abort when all clients exit + + If all of our clients exit, remove_clients_for_connection() + calls end_phase() which in turn invokes gsm_manager_quit() that + checks the logout type. + + But at this point we only have _LOGOUT_NONE, so we end up aborting. + It's fine to just call _quit() in this case, and this avoids us + dumping core. + + This was happening to me when session startup failed for other + reasons. + + https://bugzilla.gnome.org/show_bug.cgi?id=710480 + +M gnome-session/gsm-manager.c + +commit c9fd5b00cbf5b0b7820325e21dfcbe8f251cf7d2 +Author: Colin Walters +Date: Mon Oct 21 16:11:28 2013 -0400 + + gsm-util: Use g_unsetenv() rather than g_setenv(variable, NULL) + + This way we don't emit a critical with newer glibs. + + See https://bugzilla.gnome.org/show_bug.cgi?id=704593 + + https://bugzilla.gnome.org/show_bug.cgi?id=710582 + +M gnome-session/gsm-util.c + +commit a609551bc0059a427b82bd7248ede0c3a97abdff +Author: Bastien Nocera +Date: Mon Oct 21 13:35:00 2013 +0200 + + build: Bump requirements for upower-glib + + The new API is in 0.99.0 (as yet unreleased). Furthermore, 0.9.23 + got released and still uses the old API. So bump the requirements + to < 0.99.0. + +M configure.ac + +commit 3b518cadecf07f3885b2207152fff92e4f4aaff1 +Author: Colin Walters +Date: Thu Oct 17 08:41:51 2013 -0400 + + Only support UPower 0.9 + + Newer UPower drops support for APIs that duplicate systemd/logind, so + if we detect it, then require consumers to use the systemd backend. + + https://bugzilla.gnome.org/show_bug.cgi?id=710383 + +M configure.ac +M gnome-session/Makefile.am +M gnome-session/gsm-system.c + +commit a34a2cc86541520af9ee17fb50cfa85e7a1695b7 +Author: Matthias Clasen +Date: Fri Oct 11 09:00:33 2013 -0400 + + Clean up more egg leftovers + +M Makefile.am +M gnome-session/Makefile.am + +commit eacf2268fcb9ffcdb3d6e13a4566739b0a27798d +Author: Matthias Clasen +Date: Fri Oct 11 08:51:51 2013 -0400 + + Drop egg from POTFILES.in + +M po/POTFILES.in + +commit ed6cca527eaac201d6eb4ba49839811e7764c97e +Author: Matthias Clasen +Date: Fri Oct 11 08:34:11 2013 -0400 + + Drop EggSMClient + + Nothing is using it anymore. + +M configure.ac +D egg/Makefile.am +D egg/eggdesktopfile.c +D egg/eggdesktopfile.h +D egg/eggsmclient-private.h +D egg/eggsmclient-xsmp.c +D egg/eggsmclient.c +D egg/eggsmclient.h + +commit ea285af9962313ee2675fff27d3a852bb61e936a +Author: Matthias Clasen +Date: Fri Oct 11 08:22:51 2013 -0400 + + Remove gnome-session-properties + + This tool was not really maintained, and the autostart + configuration is not provided by gnome-tweak-tool. + + https://bugzilla.gnome.org/show_bug.cgi?id=708923 + +M Makefile.am +D capplet/Makefile.am +D capplet/gsm-app-dialog.c +D capplet/gsm-app-dialog.h +D capplet/gsm-properties-dialog.c +D capplet/gsm-properties-dialog.h +D capplet/gsp-app-manager.c +D capplet/gsp-app-manager.h +D capplet/gsp-app.c +D capplet/gsp-app.h +D capplet/gsp-keyfile.c +D capplet/gsp-keyfile.h +D capplet/main.c +M configure.ac +M data/Makefile.am +D data/gnome-session-properties.desktop.in.in +M doc/man/Makefile.am +D doc/man/gnome-session-properties.1 +M po/POTFILES.in + +commit b0955ebfb731caaf215e7f1b45de617612f25dc5 +Author: Matthias Clasen +Date: Fri Oct 11 08:13:00 2013 -0400 + + 3.10.1 + +M configure.ac + +commit 848a9a96c59452e8709bad5d430434be8c921c0a +Author: Matthias Clasen +Date: Fri Oct 11 08:02:31 2013 -0400 + + Updates + +M NEWS + +commit 5c1d00a0237be9839cf1eb15861d47fe8f688adb +Author: Carles Ferrando +Date: Sun Oct 6 21:58:30 2013 +0200 + + [l10n] Updated Catalan (Valencian) translation + +M po/ca@valencia.po + +commit 9feba5fd4d0af08edfa6a147a219d29294819a14 +Author: Arash Mousavi +Date: Sat Oct 5 18:11:38 2013 +0330 + + L10N: Updated Persian translations + +M po/fa.po + +commit ac63470bfabee526851f27e8d20a493275fad8a4 +Author: Arash Mousavi +Date: Sat Oct 5 18:10:10 2013 +0330 + + L10N: Updated Persian translations + +M po/fa.po + +commit 638b5b7b8a6801e72eafb690cf181a1cc79d8278 +Author: Мирослав Николић +Date: Sat Oct 5 06:21:06 2013 +0200 + + Updated Serbian translation + +M po/sr.po +M po/sr@latin.po + +commit 15e263a678f733bb74601aa883b0830f8f0ac00c +Author: Ray Strode +Date: Tue Oct 1 14:25:55 2013 -0400 + + shell: unref correct proxy on destroy + + gsm-shell.c tries to automatically clear it's reference to the + EndSessionDialog proxy when the proxy is destroyed. + + It accidentally unrefs the wrong object though. This commit + fixes that by changing the open coded unref+nullify to g_clear_object + + I believe this will address this crasher: + + https://retrace.fedoraproject.org/faf/problems/1214348/ + + https://bugzilla.gnome.org/show_bug.cgi?id=709221 + +M gnome-session/gsm-shell.c + +commit c3b3d687b2ce310199fd59482b6ab23c69a002e5 +Author: Kjartan Maraas +Date: Tue Sep 24 19:36:59 2013 +0200 + + Updated Norwegian bokmål translation + +M po/nb.po + +commit 562a010899b564950eec26ec68db6dedb2dc00e1 +Author: Friedel Wolff +Date: Tue Sep 24 12:25:45 2013 +0200 + + Updated translation for Afrikaans (af) + +M po/af.po + +commit b6f5152fb7dba3ea7eea80cdc5fd0839e53e160a +Author: Ray Strode +Date: Mon Sep 23 17:31:04 2013 -0400 + + configure: bump to 3.10.0 + +M configure.ac + +commit c0c38910daab357649ad9d5b201d207b774b94fe +Author: Ray Strode +Date: Mon Sep 23 17:28:22 2013 -0400 + + NEWS: update for release + +M NEWS + +commit c3434d502b247aba002cd1751b1df725121e77ff +Author: Ray Strode +Date: Mon Sep 23 12:20:14 2013 -0400 + + data: put wayland session in its own directory + + Right now, display managers look for sessions in /usr/share/xsessions. + + We stuff gnome-shell-wayland.desktop there and then that entry shows up + in the display manager session list. It won't work, since the display + manager doesn't support launching wayland, though. + + This commit moves it to /usr/share/wayland-sessions so that display + managers can 'opt in' to showing wayland sessions, once they support + them. + + This breaks hardcode freeze. + + Approved-By: Matthias Clasen + Approved-By: Javier Jardón + +M data/Makefile.am + +commit 929b13eddcdec1048474e81bd334009134fb671f +Author: António Lima +Date: Sun Sep 22 23:48:12 2013 +0100 + + Updated Portuguese translation + +M po/pt.po + +commit 206a8e020370d0ba50f72b99938c20e3c8c6bcaa +Author: Yuri Myasoedov +Date: Sun Sep 22 20:14:50 2013 +0400 + + Updated Russian translation + +M po/ru.po + +commit 01cd6a0d4b143da082358b2c5888644cf99c79f2 +Author: Reinout van Schouwen +Date: Sun Sep 22 00:12:11 2013 +0200 + + Updated Dutch translation + +M po/nl.po + +commit 38b06c8424711ea201828fe823568d24f8d2c9f9 +Author: Daniel Korostil +Date: Sat Sep 21 11:38:42 2013 +0300 + + Updated Ukrainian + +M po/uk.po + +commit 5966d9130a90bdd91739b2d44d99f8238ebc5870 +Author: Timo Jyrinki +Date: Fri Sep 20 21:32:41 2013 +0300 + + Finnish translation update + +M po/fi.po + +commit fd35929d652b030a96d5c5a0e4d8929b853bdb2f +Author: Antonio Fernandes C. Neto +Date: Thu Sep 19 04:46:08 2013 -0300 + + Updated Brazilian Portuguese translation + +M po/pt_BR.po + +commit c1555d3001c1f950927da4f7a95b680cfffe1133 +Author: Matthias Clasen +Date: Wed Sep 18 10:23:40 2013 -0400 + + 3.9.92 + +M NEWS +M configure.ac + +commit 6041ab49c6d99b380feab60617c280c9879576fb +Author: A S Alam +Date: Tue Sep 17 22:18:24 2013 -0500 + + Punjabi Translation updated by Aman + +M po/pa.po + +commit 0dd2a08e8b1d3647ee9402a4736540442fd3ce64 +Author: Yosef Or Boczko +Date: Wed Sep 18 03:36:36 2013 +0300 + + Updated Hebrew translation + +M po/he.po + +commit b8557b4476b4066364165ed8cf000e8785d48447 +Author: Chao-Hsiung Liao +Date: Tue Sep 17 19:40:30 2013 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + +M po/zh_HK.po +M po/zh_TW.po + +commit 8d608924303c146987077d58d134469620978915 +Author: Giovanni Campagna +Date: Mon Sep 2 20:48:26 2013 +0200 + + GsmPresence: don't check the idletime after adding an idle watch + + Mutter now does it internally. And this way we avoid a sync dbus + call (which can happen at bad times, such as when mutter is blocking + on us to reply XSMP or DBus) + + https://bugzilla.gnome.org/show_bug.cgi?id=707274 + +M gnome-session/gsm-presence.c + +commit a230aa3546f17dcb3ccd905e989f8f2921d7b897 +Author: Josep Sànchez +Date: Mon Sep 16 22:35:13 2013 +0200 + + [l10n] Update Catalan translation + +M po/ca.po + +commit 16204920178d80c412c15230c26cf3cd8078a42f +Author: Ray Strode +Date: Mon Sep 16 11:38:34 2013 -0400 + + data: add X-GDM-NeedsVT=true to wayland xsession file + + This key is required to let the display-manager know that + this program needs its own VT to work, and will supply its + own display on that VT. + +M data/gnome-wayland.desktop.in + +commit 92709dc6266e0cd0b890f1f01f2ac1f5b9335257 +Author: Luca Ferretti +Date: Mon Sep 16 14:24:46 2013 +0200 + + [l10n] Updated Italian translation. + +M po/it.po + +commit 2c9176bb948c9e5024e349f5253269121c6e55c4 +Author: Jiro Matsuzawa +Date: Mon Sep 16 09:16:43 2013 +0900 + + l10n: Update Japanese translation + +M po/ja.po + +commit 79d5fd6bf90b23e76646b8f4e60e7dba8568ced6 +Author: Baurzhan Muftakhidinov +Date: Sun Sep 15 14:00:09 2013 +0600 + + Update Kazakh translation + +M po/kk.po + +commit cfbcfda7f29c3dce8d5305ce4535916bcf59c712 +Author: Inaki Larranaga Murgoitio +Date: Sat Sep 14 18:15:53 2013 +0200 + + Updated Basque language + +M po/eu.po + +commit 3f547adf4f5ce10560c34ed15c93a704a6453acd +Author: Kris Thomsen +Date: Sat Sep 14 15:55:19 2013 +0200 + + Updated Danish translation + +M po/da.po + +commit f56bb981e80927b3a63cdc68b2db3f7fa6e0069b +Author: Changwoo Ryu +Date: Sat Sep 14 04:16:57 2013 +0900 + + Updated Korean translation + +M po/ko.po + +commit 758c52970171a13a3a6457b497f274c57a850f6d +Author: Benjamin Steinwender +Date: Fri Sep 13 19:26:59 2013 +0200 + + Updated German translation + +M po/de.po + +commit 4305afc1fea6848336a43a058912d7bc28189a98 +Author: Dušan Kazik +Date: Fri Sep 13 17:58:23 2013 +0200 + + Updated slovak translation + +M po/sk.po + +commit 3348d9cc8642da4f62a326f998db215a8fa0a92d +Author: Aurimas Černius +Date: Thu Sep 12 22:39:41 2013 +0300 + + Updated Lithuanian translation + +M po/lt.po + +commit 957ce2bc02fb3ba257866dc06ec00622818ebace +Author: Alexandre Franke +Date: Thu Sep 12 18:08:38 2013 +0200 + + Update French translation + +M po/fr.po + +commit c6fb3f719d83de80aa82f84c5d537215a2bb3a14 +Author: Gabor Kelemen +Date: Thu Sep 12 13:53:40 2013 +0200 + + Updated Hungarian translation + +M po/hu.po + +commit b432a77f04756d6717f8728ec9e673d05fde734f +Author: Victor Ibragimov +Date: Thu Sep 12 14:19:16 2013 +0500 + + Tajik translation updated + +M po/tg.po + +commit d900dfadf94a4d0cc5275b9ccc1f6aa93e81830e +Author: Matej Urbančič +Date: Tue Sep 10 21:19:54 2013 +0200 + + Updated Slovenian translation + +M po/sl.po + +commit 279a256928d89646d09ee33da6229cf06c920f24 +Author: Rūdolfs Mazurs +Date: Tue Sep 10 21:39:22 2013 +0300 + + Updated Latvian translation + +M po/lv.po + +commit b7cea69a9f0e1f01adb2f789164598e1b0a369d5 +Author: Marek Černocký +Date: Tue Sep 10 20:15:13 2013 +0200 + + Updated Czech translation + +M po/cs.po + +commit fc9f8bae2deb34d0847838b4e553e4f747ae3420 +Author: Ihar Hrachyshka +Date: Tue Sep 10 20:01:42 2013 +0300 + + Updated Belarusian translation. + +M po/be.po + +commit b4113f51aa2be2952247fd29fc98bdb364099ab8 +Author: Nilamdyuti Goswami +Date: Tue Sep 10 20:07:52 2013 +0530 + + Assamese Translation Updated + +M po/as.po + +commit 83aeb0d2c74793b54a284b665ba954dab172ff8d +Author: Fran Diéguez +Date: Tue Sep 10 15:37:29 2013 +0200 + + Updated Galician translations + +M po/gl.po + +commit f9e24e4c1fe66fbfc611c27bb80b81d55708e37c +Author: Daniel Mustieles +Date: Tue Sep 10 14:26:25 2013 +0200 + + Updated Spanish translation + +M po/es.po + +commit 1653d77ed18eb353ccb0e9975f18cddacb73cda2 +Author: Andika Triwidada +Date: Tue Sep 10 13:08:57 2013 +0700 + + Updated Indonesian translation + +M po/id.po + +commit d37d74d7a7983b6763d567d0d038687cb716b1ca +Author: Enrico Nicoletto +Date: Mon Sep 9 20:25:57 2013 -0300 + + Updated Brazilian Portuguese translation + +M po/pt_BR.po + +commit 54a2da3965f14b38b6bf0af114655c569c288747 +Author: Piotr Drąg +Date: Tue Sep 10 01:11:34 2013 +0200 + + Updated Polish translation + +M po/pl.po + +commit 3484ec63ea1e3a6899f39a367bcccb2dc4a9f00e +Author: Piotr Drąg +Date: Tue Sep 10 01:10:02 2013 +0200 + + Updated POTFILES.in + +M po/POTFILES.in + +commit d4188a8482b62eec0a03f7eff9de37b72360142c +Author: Nathan Maxson +Date: Mon Sep 9 12:47:54 2013 -0700 + + Updated gnome-desktop dependency from 3.7.90 to 3.9.91 + + gnome-session will segfault when run with gnome-desktop versions earlier than 3.9.91 see bug 707533 + +M configure.ac + +commit 054a53890e26643eaa8b5dd37bcf0858824722ff +Author: Khaled Hosny +Date: Mon Sep 9 22:55:16 2013 +0200 + + Update Arabic translation + +M po/ar.po + +commit cdeedf650e4db5337172b3015af9e0cd368d365a +Author: Giovanni Campagna +Date: Tue Jul 30 18:29:12 2013 +0200 + + Add basic support for running in wayland + + Add gnome-wayland, a session running gnome-shell-wayland and + gnome-settings-daemon. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +M data/Makefile.am +A data/gnome-wayland.desktop.in +M data/gnome-wayland.session.desktop.in.in + +commit ffc845b6ff1727952b3c0a276da97caf98feb69d +Author: A S Alam +Date: Mon Sep 9 14:26:04 2013 -0500 + + Punjabi Translation updated by Aman + +M po/pa.po + +commit f5de8f55d5407447ab90a9c700be21d5674167fd +Author: Benjamin Steinwender +Date: Mon Sep 9 06:28:14 2013 +0200 + + Updated German translation + +M po/de.po + +commit e0be1cad0795f44d47e9e5776974f555c569b095 +Author: Victor Ibragimov +Date: Sun Sep 8 16:30:41 2013 +0500 + + Tajik translation updated + +M po/tg.po + +commit d327d23e14df5016122cf21b4ac9b890189d6883 +Author: Kjartan Maraas +Date: Sun Sep 8 11:22:06 2013 +0200 + + Updated Norwegian bokmål translation + +M po/nb.po + +commit ddc7c2dfc666a6c31a922d798df95d1242215562 +Author: Dmitriy S. Seregin +Date: Sat Sep 7 23:02:03 2013 +0400 + + Updated Russian translation + +M po/ru.po + +commit 8898a2440a821d42f60112b844761742f0d8b722 +Author: Ville-Pekka Vainio +Date: Sat Sep 7 20:26:26 2013 +0300 + + Finnish translation update by Jiri Grönroos + +M po/fi.po + +commit 38feaf5f40861bcc192337472dc3f9e5e59904e8 +Author: Marek Černocký +Date: Thu Sep 5 12:22:23 2013 +0200 + + Updated Czech translation + +M po/cs.po + +commit 1792bfa0e66e9f7e03f3fc673510eb1a0543a4f9 +Author: Мирослав Николић +Date: Thu Sep 5 10:10:01 2013 +0200 + + Updated Serbian translation + +M po/sr.po +M po/sr@latin.po + +commit e2effacd0f2b5b96a2182036f10a58cbf99681c9 +Author: Daniel Mustieles +Date: Wed Sep 4 17:30:25 2013 +0200 + + Updated Spanish translation + +M po/es.po + +commit 02d2c01303914e6891acdb1ea18fb981b376af27 +Author: Fran Diéguez +Date: Wed Sep 4 17:06:42 2013 +0200 + + Updated Galician translations + +M po/gl.po + +commit 222efcc7fb4f8bc0ddba7e493bd3b36a8a1c3a2d +Author: Chao-Hsiung Liao +Date: Wed Sep 4 15:05:35 2013 +0800 + + Updated Traditional Chinese translation(Hong Kong and Taiwan) + +M po/zh_HK.po +M po/zh_TW.po + +commit fb7fa889056f3c3e8366a2a44bfba67dc980b335 +Author: Piotr Drąg +Date: Wed Sep 4 02:06:20 2013 +0200 + + Updated Polish translation + +M po/pl.po + +commit 0b20dc4d2634acc8798e369215732732a13f7fce +Author: Aurimas Černius +Date: Wed Sep 4 00:32:22 2013 +0300 + + Updated Lithuanian translation + +M po/lt.po + +commit 8f8b65b4bbeba93081a7e29651bd3a3364f1e1af +Author: Matej Urbančič +Date: Tue Sep 3 22:45:27 2013 +0200 + + Updated Slovenian translation + +M po/sl.po + +commit 7a75a73049f786df60ff123db9dd06b1bafa49a7 +Author: Alexandre Franke +Date: Tue Sep 3 20:28:58 2013 +0200 + + Update French translation + +M po/fr.po + +commit 2f19a970844cb406e766711ba7256f13141a7fa3 +Author: Enrico Nicoletto +Date: Tue Sep 3 14:45:58 2013 -0300 + + Updated Brazilian Portuguese translation + +M po/pt_BR.po + +commit d6bce5f254f16808d28e1da3f4fa9fbdbf6eb4e3 +Author: Piotr Drąg +Date: Tue Sep 3 19:03:59 2013 +0200 + + Updated POTFILES.in and POTFILES.skip + +M po/POTFILES.in +M po/POTFILES.skip + +commit 2917d5effef9b87ba815a973fb81111b6e01f654 +Author: Ray Strode +Date: Tue Sep 3 10:23:36 2013 -0400 + + configure: bump to 3.9.91 + +M configure.ac + +commit 9c469494941cc15c5d266ebeb3052178c91c7689 +Author: Ray Strode +Date: Tue Sep 3 10:25:49 2013 -0400 + + NEWS: update for release + +M NEWS + +commit e2fb2ef71c89fe85e510f4a823797f2808990fee +Author: Giovanni Campagna +Date: Wed Aug 21 10:25:27 2013 +0200 + + GsmManager: don't attempt to restart a wayland compositor + + There is no point in restarting it, the session is already gone. + And we can't show a fail whale either, so just log a message to + the journal and die. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +M gnome-session/gsm-manager.c + +commit 705699b2799a3434d1a8f35c9a92868a5057f73e +Author: Giovanni Campagna +Date: Tue Aug 20 11:10:52 2013 +0200 + + Stop connecting to the X11 server + + Remove all GTK+ code from the main gnome-session binary (including + the two fallback mode dialogs), so that gnome-session can run + when X is not available. + + These dialogs are no longer used anymore, so it's not a UI freeze + break. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +M configure.ac +M data/Makefile.am +D data/gsm-inhibit-dialog.ui +M gnome-session/Makefile.am +D gnome-session/gsm-inhibit-dialog.c +D gnome-session/gsm-inhibit-dialog.h +D gnome-session/gsm-logout-dialog.c +D gnome-session/gsm-logout-dialog.h +M gnome-session/gsm-manager.c +M gnome-session/gsm-util.h +M gnome-session/main.c +M po/POTFILES.in + +commit 672cb149b846597e7d3cb66692d31a7df5450ee2 +Author: Giovanni Campagna +Date: Tue Aug 20 15:11:08 2013 +0200 + + Add a new autostart phase, DisplayServer, that runs before Initialization + + This way, the wayland compositor can initialize (and spawn XWayland) + before gnome-settings-daemon starts. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-manager.c +M gnome-session/gsm-manager.h + +commit c12678b59ccc3f03ea4886345b6676a6b92ca304 +Author: Giovanni Campagna +Date: Tue Aug 20 11:24:07 2013 +0200 + + fail-whale: don't rely on the x11 GTK backend + + This way, we can run as a wayland client, in case XWayland crashed. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +M gnome-session/gsm-fail-whale-dialog.c + +commit d19cf2d981811e32640a89ce7af7c9202f95d1d5 +Author: Giovanni Campagna +Date: Tue Aug 20 11:09:01 2013 +0200 + + GsmManager: remove obsolete code for talking with GDM + + These days shutdown and reboot is handled by logind everywhere, no + need for this ancient code. + + https://bugzilla.gnome.org/show_bug.cgi?id=706420 + +A data/gnome-wayland.session.desktop.in.in +M gnome-session/Makefile.am +D gnome-session/gdm.c +D gnome-session/gdm.h +M gnome-session/gsm-manager.c + +commit 3e8f8d083686d49fd866a582a5895ba834227685 +Author: Alban Crequy +Date: Mon Aug 19 21:13:45 2013 +0100 + + add new phase: GSM_MANAGER_PHASE_EARLY_INITIALIZATION + + gnome-initial-setup-copy-worker and gnome-keyring (and others) used to be + started automatically by the session manager during the + GSM_MANAGER_PHASE_INITIALIZATION phase. This is racy because gnome-keyring + could read its file ~/.local/share/keyrings/login.keyring before it is written + by gnome-initial-setup-copy-worker. The correct solution is to wait + gnome-initial-setup-copy-worker finishes before starting other components in + the initialization phase. + + I want to enforce this order without adding knowledge of gnome-initial-setup in + gnome-keyring and others. It must also work on systems which don't use + gnome-initial-setup. So I don't use a flag file in gnome-keyring's + AutostartCondition to delay its startup. + + Instead, I add a new phase GSM_MANAGER_PHASE_EARLY_INITIALIZATION before the + initialization phase. If no autostart desktop files use that phase, + gnome-session will just go on to the next phase. But if + gnome-initial-setup-copy-worker uses this new phase, it will ensure + gnome-initial-setup-copy-worker finishes before the newly installed files in + $HOME are read by anyone. + + Relevent documentation: + https://wiki.gnome.org/SessionManagement + http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html + http://lists.freedesktop.org/archives/xdg/2007-January/007436.html + + https://bugzilla.gnome.org/show_bug.cgi?id=706692 + +M gnome-session/README +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-manager.c +M gnome-session/gsm-manager.h + +commit 3523fb28bda0396fd87c409d4c310d5680f0837f +Author: Alban Crequy +Date: Mon Aug 19 20:38:53 2013 +0100 + + gnome-session/README: rename enum to match the code + +M gnome-session/README + +commit 6c24fcc915019ebb93fa25866ba17cd668656338 +Author: Cosimo Cecchi +Date: Mon Sep 2 02:16:34 2013 -0700 + + manager: fix deadlock when registering XSMP clients at login + + gnome-session will switch to the next phase whenever the list of + applications pending registration is emptied. + Previously, for XSMP clients, the code in GsmXSMPClient would signal + that an application was registered before sending the reply through + SmsRegisterClientReply(). + As GnomeIdleMonitor will now call into Mutter through DBus, and the + RUNNING phase of the session will initialize its presence component that + uses the monitor, we will end up in a situation where Mutter is waiting + for the XSMP reply from gnome-session, and gnome-session is waiting for + a synchronous DBus reply from Mutter, effectively locking up the login + process until the DBus timeout occurs. + + This commit fixes the bug by signalling XSMP app registration only after + the reply has been sent over the wire. + + https://bugzilla.gnome.org/show_bug.cgi?id=707274 + +M gnome-session/gsm-manager.c +M gnome-session/gsm-xsmp-client.c +M gnome-session/gsm-xsmp-client.h + +commit 2040b88847ed1ee11182caac96b0f09c553c646e +Author: Ray Strode +Date: Tue Aug 27 17:24:48 2013 -0400 + + manager: make Shutdown/Reboot D-Bus APIs failable + + Right now Shutdown and Reboot return as soon as the + operations are initiated. This means we get no notification + if the operation is cancelled by the user later. + + This commit defers returning unless it's clear whether or not + the operation will go through. + + https://bugzilla.gnome.org/show_bug.cgi?id=706676 + +M gnome-session/gsm-manager.c +M gnome-session/gsm-manager.h +M gnome-session/org.gnome.SessionManager.xml + +commit ac9fd0dc97a17674cb082f80df0b1fcc45bc92bf +Author: Kalev Lember +Date: Thu Aug 22 19:58:32 2013 +0200 + + Rename the desktop file to gnome-session-properties.desktop + + ... so that it matches up with the executable gnome-session-properties + name. + + https://bugzilla.gnome.org/show_bug.cgi?id=706611 + +M configure.ac +M data/Makefile.am +R100 data/session-properties.desktop.in.in data/gnome-session-properties.desktop.in.in +M po/POTFILES.in +M po/POTFILES.skip + +commit 7f0d2ad091e8591b4a810fe1d8d7dd3bfd740f5c +Author: Maxime Villard +Date: Wed Aug 21 09:27:52 2013 -0400 + + Drop dead code + +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-inhibit-dialog.c +M gnome-session/gsm-manager.c +M gnome-session/gsm-session-save.c +M tools/gnome-session-check-accelerated.c + +commit 6bb078e856b7cf95e2cbd3518e18d6b875c2ce2b +Author: Maxime Villard +Date: Wed Aug 21 09:27:09 2013 -0400 + + gnome-session: fix uninitialzed variable warnings + +M gnome-session/gsm-dbus-client.c +M gnome-session/gsm-logout-dialog.c + +commit 6de7237806146e7042ba093cd190f17f7c019267 +Author: Ray Strode +Date: Tue Aug 20 10:46:00 2013 -0400 configure: bump to 3.9.90 M configure.ac commit a607d658a1b1fd72cb3f8f37d99a6dcd5bf2caa0 -Author: Ray Strode -AuthorDate: Tue Aug 20 10:45:10 2013 -0400 -Commit: Ray Strode -CommitDate: Tue Aug 20 10:45:10 2013 -0400 +Author: Ray Strode +Date: Tue Aug 20 10:45:10 2013 -0400 NEWS: update for release M NEWS -commit 529956f42562bbe685690c12dbeb11c6d7b9ec3d (origin/master, origin/HEAD) -Author: Frederic Crozat -AuthorDate: Wed Jul 24 15:14:16 2013 +0200 -Commit: Ray Strode -CommitDate: Tue Aug 20 10:37:17 2013 -0400 +commit 529956f42562bbe685690c12dbeb11c6d7b9ec3d +Author: Frederic Crozat +Date: Wed Jul 24 15:14:16 2013 +0200 check-accelerated: check for llvmpipe @@ -38,10 +1683,8 @@ M tools/gnome-session-check-accelerated.c commit 2b5a5b9854b46993c15f69e1839ee236cf1bfd4a -Author: Frederic Crozat -AuthorDate: Wed Jul 24 15:23:57 2013 +0200 -Commit: Ray Strode -CommitDate: Tue Aug 20 10:37:17 2013 -0400 +Author: Frederic Crozat +Date: Wed Jul 24 15:23:57 2013 +0200 check-accelerated: fix indentation @@ -50,10 +1693,8 @@ M tools/gnome-session-check-accelerated.c commit 74c0294078f7cc6d304ea61b4b2fe4fc1e14cca6 -Author: Frederic Crozat -AuthorDate: Wed Jul 24 15:10:59 2013 +0200 -Commit: Ray Strode -CommitDate: Tue Aug 20 10:37:17 2013 -0400 +Author: Frederic Crozat +Date: Wed Jul 24 15:10:59 2013 +0200 check-accelerated: move exit code for helper to separate header @@ -65,20 +1706,16 @@ M tools/gnome-session-check-accelerated.c commit 5d407a3c8a07c9c1b05db295aa5a70f77a50627b -Author: Ryan Lortie -AuthorDate: Mon Aug 12 00:17:31 2013 +0200 -Commit: Ryan Lortie -CommitDate: Mon Aug 12 01:49:43 2013 +0200 +Author: Ryan Lortie +Date: Mon Aug 12 00:17:31 2013 +0200 Update Esperanto translation M po/eo.po commit 8322b59f1f5845b43aa85c7be05b8f7da1d1b84e -Author: Ray Strode -AuthorDate: Tue Aug 6 15:25:59 2013 -0400 -Commit: Ray Strode -CommitDate: Tue Aug 6 15:29:54 2013 -0400 +Author: Ray Strode +Date: Tue Aug 6 15:25:59 2013 -0400 data: black list a poulsbo driver @@ -91,11 +1728,9 @@ M data/hardware-compatibility -commit 1c29c97b54641156548a4dcb067737a494499caa (tag: 3.9.5) -Author: Matthias Clasen -AuthorDate: Tue Jul 30 14:27:28 2013 -0400 -Commit: Matthias Clasen -CommitDate: Tue Jul 30 14:27:28 2013 -0400 +commit 1c29c97b54641156548a4dcb067737a494499caa +Author: Matthias Clasen +Date: Tue Jul 30 14:27:28 2013 -0400 3.9.5 @@ -103,10 +1738,8 @@ M configure.ac commit 7648a6158c9ab2ccf1e8e9918522a8e7acb96261 -Author: Matthias Clasen -AuthorDate: Tue Jul 30 14:15:32 2013 -0400 -Commit: Matthias Clasen -CommitDate: Tue Jul 30 14:16:51 2013 -0400 +Author: Matthias Clasen +Date: Tue Jul 30 14:15:32 2013 -0400 systemd: Check errors on all D-Bus calls @@ -119,10 +1752,8 @@ M gnome-session/gsm-systemd.c commit df37a8325364081b8cbcb378145bcf4cdd1e806d -Author: Colin Walters -AuthorDate: Fri Jul 5 17:14:49 2013 -0400 -Commit: Colin Walters -CommitDate: Mon Jul 8 08:30:34 2013 -0400 +Author: Colin Walters +Date: Fri Jul 5 17:14:49 2013 -0400 Set up systemd journal redirection after early option processing @@ -135,10 +1766,8 @@ M gnome-session/main.c commit 7b15205dc7e0be6a7d4e8936be7470f09e7777e9 -Author: Matthias Clasen -AuthorDate: Tue Jun 18 15:19:40 2013 -0400 -Commit: Matthias Clasen -CommitDate: Tue Jun 18 15:23:52 2013 -0400 +Author: Matthias Clasen +Date: Tue Jun 18 15:19:40 2013 -0400 Re-show the end session dialog when an inhibitor disappears @@ -152,10 +1781,8 @@ M gnome-session/gsm-manager.c commit 711d5068daecb23ccec2dc0fa88fef936b0470e5 -Author: Colin Walters -AuthorDate: Fri Jun 7 15:18:33 2013 -0400 -Commit: Colin Walters -CommitDate: Fri Jun 7 20:32:41 2013 -0400 +Author: Colin Walters +Date: Fri Jun 7 15:18:33 2013 -0400 manager: Warn on abnormal exit codes @@ -167,10 +1794,8 @@ M gnome-session/gsm-manager.c commit 55fab9dc066875641cffbab966ca20e35821afdf -Author: Michael Terry -AuthorDate: Wed May 29 10:31:30 2013 -0400 -Commit: Michael Terry -CommitDate: Wed May 29 10:31:30 2013 -0400 +Author: Michael Terry +Date: Wed May 29 10:31:30 2013 -0400 capplet: Don't show desktop files with NoDisplay=true @@ -181,20 +1806,16 @@ M capplet/gsp-app.h commit c0e628fcf495770d4e01ec99ce78fe2c9112c215 -Author: Ozan Çağlayan -AuthorDate: Fri May 24 19:15:24 2013 +0300 -Commit: Muhammet Kara -CommitDate: Fri May 24 19:15:24 2013 +0300 +Author: Ozan Çağlayan +Date: Fri May 24 19:15:24 2013 +0300 [l10n] Updated Turkish translation M po/tr.po commit ccc427be6401299f352bf9c19765bb19aba32d7d -Author: Antoine Jacoutot -AuthorDate: Fri May 24 08:27:01 2013 +0200 -Commit: Antoine Jacoutot -CommitDate: Fri May 24 08:27:01 2013 +0200 +Author: Antoine Jacoutot +Date: Fri May 24 08:27:01 2013 +0200 Don't unconditionally use LC_* GNU extensions. @@ -204,10 +1825,8 @@ M gnome-session/gsm-manager.c commit 7fcc0f0b21d4ab03e9d12e4f820eed0530576ac2 -Author: Antoine Jacoutot -AuthorDate: Fri May 24 07:57:35 2013 +0200 -Commit: Antoine Jacoutot -CommitDate: Fri May 24 07:57:35 2013 +0200 +Author: Antoine Jacoutot +Date: Fri May 24 07:57:35 2013 +0200 consolekit: fix SessionIsActive @@ -217,20 +1836,16 @@ M gnome-session/gsm-consolekit.c commit ea24f81f8611d1ac54dd87ea317ea50f0aa03247 -Author: Victor Ibragimov -AuthorDate: Thu May 23 17:09:35 2013 +0500 -Commit: Victor Ibragimov -CommitDate: Thu May 23 17:09:35 2013 +0500 +Author: Victor Ibragimov +Date: Thu May 23 17:09:35 2013 +0500 gnome-session updated for Tajik M po/tg.po commit 072bf1d2a7524f30f6f5c0120357fcdcb3bfa53f -Author: Matthias Clasen -AuthorDate: Wed May 15 06:47:46 2013 -0400 -Commit: Matthias Clasen -CommitDate: Wed May 15 10:05:19 2013 -0400 +Author: Matthias Clasen +Date: Wed May 15 06:47:46 2013 -0400 Some forgotten files @@ -242,10 +1857,8 @@ M data/Makefile.am commit ec5ca6da156c232b44a8ab16c7a1a2e8d81a6f82 -Author: Colin Walters -AuthorDate: Mon May 6 16:17:47 2013 -0400 -Commit: Colin Walters -CommitDate: Mon May 6 17:56:17 2013 -0400 +Author: Colin Walters +Date: Mon May 6 16:17:47 2013 -0400 main: If we have systemd, initialize journal here @@ -259,10 +1872,8 @@ M gnome-session/main.c commit 6e14faf9138dbbffd1e63e177e53d88963c379e5 -Author: Colin Walters -AuthorDate: Wed Apr 24 16:40:25 2013 -0400 -Commit: Colin Walters -CommitDate: Wed Apr 24 17:34:41 2013 -0400 +Author: Colin Walters +Date: Wed Apr 24 16:40:25 2013 -0400 GsmAutostartApp: Don't return NULL from constructor, use GInitable @@ -275,11 +1886,9 @@ M gnome-session/gsm-autostart-app.h M gnome-session/gsm-manager.c -commit 43b9c06de0bb8ad81851d42378c514a7e94db9d4 (tag: 3.8.1) -Author: Matthias Clasen -AuthorDate: Mon Apr 15 13:49:10 2013 -0400 -Commit: Matthias Clasen -CommitDate: Mon Apr 15 15:11:59 2013 -0400 +commit 43b9c06de0bb8ad81851d42378c514a7e94db9d4 +Author: Matthias Clasen +Date: Mon Apr 15 13:49:10 2013 -0400 3.8.1 @@ -287,10 +1896,8 @@ M configure.ac commit 610e76491ac6308929203b412b7aa35960d93b25 -Author: Matthias Clasen -AuthorDate: Mon Apr 15 15:11:50 2013 -0400 -Commit: Matthias Clasen -CommitDate: Mon Apr 15 15:11:59 2013 -0400 +Author: Matthias Clasen +Date: Mon Apr 15 15:11:50 2013 -0400 Fix distcheck @@ -302,40 +1909,32 @@ M data/icons/scalable/Makefile.am commit 972751ac1ed274889662ed5894bb26fa0ef60829 -Author: Trần Ngọc Quân -AuthorDate: Sat Apr 13 17:51:28 2013 +1000 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sat Apr 13 17:51:28 2013 +1000 +Author: Trần Ngọc Quân +Date: Sat Apr 13 17:51:28 2013 +1000 Updated Vietnamese translation M po/vi.po commit 00e0e8bf906a03d18ea466b19931186717d1c2d1 -Author: Muhammet Kara -AuthorDate: Wed Apr 10 00:23:04 2013 +0300 -Commit: Muhammet Kara -CommitDate: Wed Apr 10 00:23:04 2013 +0300 +Author: Muhammet Kara +Date: Wed Apr 10 00:23:04 2013 +0300 [l10n] Updated Turkish translation M po/tr.po commit 4e469ffb20a8bbff9c6af24446aa1936a39cbeed -Author: Bruce Cowan -AuthorDate: Sat Apr 6 17:43:51 2013 +0100 -Commit: Bruce Cowan -CommitDate: Sat Apr 6 17:43:51 2013 +0100 +Author: Bruce Cowan +Date: Sat Apr 6 17:43:51 2013 +0100 Updated British English translation M po/en_GB.po commit dc7e507bebcb8a1ab7ae1cc7aa545fff6e419520 -Author: Gheyret Kenji -AuthorDate: Sat Apr 6 18:54:00 2013 +0900 -Commit: Gheyret Kenji -CommitDate: Sat Apr 6 18:54:00 2013 +0900 +Author: Gheyret Kenji +Date: Sat Apr 6 18:54:00 2013 +0900 Updated Uyghur translation @@ -344,20 +1943,16 @@ M po/ug.po commit 48f8b29c1b815a6bbbf7ce5414e7dafaf8bdb9b9 -Author: Wylmer Wang -AuthorDate: Sat Apr 6 16:50:28 2013 +0800 -Commit: YunQiang Su -CommitDate: Sat Apr 6 16:50:28 2013 +0800 +Author: Wylmer Wang +Date: Sat Apr 6 16:50:28 2013 +0800 update Simplified Chinese (zh_CN) translation M po/zh_CN.po commit 1b23718b67a3785c73b56ebcde47b2ee9d6b1470 -Author: Colin Walters -AuthorDate: Mon Apr 1 09:25:24 2013 -0400 -Commit: Colin Walters -CommitDate: Mon Apr 1 09:28:15 2013 -0400 +Author: Colin Walters +Date: Mon Apr 1 09:25:24 2013 -0400 build: Link against libsystemd-daemon again @@ -372,20 +1967,16 @@ M configure.ac commit 31935cfb29097aebf9de04677c52e89d797a28dd -Author: Reşat SABIQ -AuthorDate: Sat Mar 30 12:09:33 2013 -0500 -Commit: Reşat SABIQ -CommitDate: Sat Mar 30 12:09:33 2013 -0500 +Author: Reşat SABIQ +Date: Sat Mar 30 12:09:33 2013 -0500 Updated Crimean Tatar (Crimean Turkish) translation M po/crh.po commit f11fde2c8ddc7ce361a62fc47aea68b114c0df17 -Author: Martin Pitt -AuthorDate: Thu Mar 21 11:06:03 2013 +0100 -Commit: Martin Pitt -CommitDate: Fri Mar 29 10:56:38 2013 +0100 +Author: Martin Pitt +Date: Thu Mar 21 11:06:03 2013 +0100 gsm_systemd_new: Check for logind, not for systemd @@ -403,231 +1994,185 @@ M configure.ac M gnome-session/gsm-systemd.c -commit 1c3e3ca2720570eef59b7cb2b95fe7a33697bfb0 (tag: 3.8.0) -Author: Ray Strode -AuthorDate: Mon Mar 25 21:49:21 2013 -0400 -Commit: Ray Strode -CommitDate: Mon Mar 25 21:49:21 2013 -0400 +commit 1c3e3ca2720570eef59b7cb2b95fe7a33697bfb0 +Author: Ray Strode +Date: Mon Mar 25 21:49:21 2013 -0400 configure: bump to 3.8.0 M configure.ac commit 656a39bf1ecae9294ac2a281ad2a23333c00428e -Author: Ray Strode -AuthorDate: Mon Mar 25 21:48:46 2013 -0400 -Commit: Ray Strode -CommitDate: Mon Mar 25 21:48:46 2013 -0400 +Author: Ray Strode +Date: Mon Mar 25 21:48:46 2013 -0400 NEWS: update to 3.8.0 M NEWS commit 3a3ffe646e6710e7ccef93af93ec26bad10f6b10 -Author: Ray Strode -AuthorDate: Tue Mar 19 13:19:04 2013 -0400 -Commit: Ray Strode -CommitDate: Mon Mar 25 16:41:10 2013 -0400 +Author: Ray Strode +Date: Tue Mar 19 13:19:04 2013 -0400 configure: bumpt to 3.7.92 M configure.ac commit 0c68224c61cd0a3ca6032b2a1a7f804717e64b8b -Author: Ray Strode -AuthorDate: Tue Mar 19 13:18:43 2013 -0400 -Commit: Ray Strode -CommitDate: Mon Mar 25 16:41:10 2013 -0400 +Author: Ray Strode +Date: Tue Mar 19 13:18:43 2013 -0400 NEWS: update for release M NEWS commit ceab9635e5d62902416ec1fec6f18489557a5a4f -Author: Krishnababu Krothapalli -AuthorDate: Mon Mar 25 16:03:12 2013 +0530 -Commit: Krishnababu Krothapalli -CommitDate: Mon Mar 25 16:03:12 2013 +0530 +Author: Krishnababu Krothapalli +Date: Mon Mar 25 16:03:12 2013 +0530 Updated Telugu Translations M po/te.po commit 92cac653a826a6f8725e5dba513771174e76e46c -Author: Rajesh Ranjan -AuthorDate: Mon Mar 25 12:20:50 2013 +0530 -Commit: Rajesh Ranjan -CommitDate: Mon Mar 25 12:20:50 2013 +0530 +Author: Rajesh Ranjan +Date: Mon Mar 25 12:20:50 2013 +0530 hindi translation by chandan kumar M po/hi.po commit fcfd54f1203738f832718d4cb205207548a4be03 -Author: Ani Peter -AuthorDate: Mon Mar 25 10:55:04 2013 +0530 -Commit: Ani Peter -CommitDate: Mon Mar 25 10:55:04 2013 +0530 +Author: Ani Peter +Date: Mon Mar 25 10:55:04 2013 +0530 Completed for Malayalam M po/ml.po commit ffa9343b8b361fcacad94fa6f33de557083ff506 -Author: Petr Kovar -AuthorDate: Sun Mar 24 18:14:44 2013 +0100 -Commit: Petr Kovar -CommitDate: Sun Mar 24 18:14:44 2013 +0100 +Author: Petr Kovar +Date: Sun Mar 24 18:14:44 2013 +0100 Update Czech translation M po/cs.po commit 029c54204a6221b9aedb052b7209d80cc1827f07 -Author: Jorge Pérez Pérez -AuthorDate: Sun Mar 24 00:51:47 2013 +0100 -Commit: Daniel Martinez -CommitDate: Sun Mar 24 00:51:47 2013 +0100 +Author: Jorge Pérez Pérez +Date: Sun Mar 24 00:51:47 2013 +0100 Updated Aragonese translation M po/an.po commit 50797fb49fb06b2dca95c17cf650482fd8c18817 -Author: Wouter Bolsterlee -AuthorDate: Sat Mar 23 23:31:04 2013 +0100 -Commit: Wouter Bolsterlee -CommitDate: Sat Mar 23 23:31:04 2013 +0100 +Author: Wouter Bolsterlee +Date: Sat Mar 23 23:31:04 2013 +0100 Updated Dutch translation M po/nl.po commit 672d38cbccd10efd77d5940b6ce22a54f53f455b -Author: Ihar Hrachyshka -AuthorDate: Sat Mar 23 22:51:01 2013 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sat Mar 23 22:51:01 2013 +0300 +Author: Ihar Hrachyshka +Date: Sat Mar 23 22:51:01 2013 +0300 Updated Belarusian translation. M po/be.po commit 20d40f021b434eeb0f3687d6195664b7875d5058 -Author: Khaled Hosny -AuthorDate: Sat Mar 23 18:21:18 2013 +0200 -Commit: Khaled Hosny -CommitDate: Sat Mar 23 18:21:18 2013 +0200 +Author: Khaled Hosny +Date: Sat Mar 23 18:21:18 2013 +0200 Update Arabic translation M po/ar.po commit c28751035dca5019852f1a74de3d2a37946bd0be -Author: Yasin -AuthorDate: Sat Mar 23 18:17:16 2013 +0200 -Commit: Khaled Hosny -CommitDate: Sat Mar 23 18:17:16 2013 +0200 +Author: Yasin +Date: Sat Mar 23 18:17:16 2013 +0200 Update Arabic translation M po/ar.po commit 3444222451d162cd3365da88f9cfc7f54bbb1d19 -Author: Daniel Korostil -AuthorDate: Sat Mar 23 13:21:42 2013 +0200 -Commit: Daniel Korostil -CommitDate: Sat Mar 23 13:21:42 2013 +0200 +Author: Daniel Korostil +Date: Sat Mar 23 13:21:42 2013 +0200 Uploaded Ukranian M po/uk.po commit e87497bc59d3ae602680bd498d8b51f36d39aeac -Author: Daniel Korostil -AuthorDate: Sat Mar 23 13:17:30 2013 +0200 -Commit: Daniel Korostil -CommitDate: Sat Mar 23 13:17:30 2013 +0200 +Author: Daniel Korostil +Date: Sat Mar 23 13:17:30 2013 +0200 Uploaded Ukranian M po/uk.po commit 38c622ef17164928da746612af17530f802ba319 -Author: Shankar Prasad -AuthorDate: Fri Mar 22 21:50:54 2013 +0530 -Commit: Shankar Prasad -CommitDate: Fri Mar 22 21:51:27 2013 +0530 +Author: Shankar Prasad +Date: Fri Mar 22 21:50:54 2013 +0530 Updated kn translations M po/kn.po commit a0a53e8c618472e9783633f1eaf0e9bd041a49f5 -Author: Shantha kumar -AuthorDate: Fri Mar 22 16:29:23 2013 +0530 -Commit: Shantha kumar -CommitDate: Fri Mar 22 16:29:23 2013 +0530 +Author: Shantha kumar +Date: Fri Mar 22 16:29:23 2013 +0530 Tamil Translations Updated M po/ta.po commit 5ef18d0bf305fcb4ca123db46b714130f4aff2f4 -Author: Sandeep Sheshrao Shedmake -AuthorDate: Thu Mar 21 14:33:59 2013 +0530 -Commit: Sandeep Sheshrao Shedmake -CommitDate: Thu Mar 21 14:33:59 2013 +0530 +Author: Sandeep Sheshrao Shedmake +Date: Thu Mar 21 14:33:59 2013 +0530 Updated Marathi Translations M po/mr.po commit 0f7302741e9b24491667cf0339644da29df9b23d -Author: Sandeep Sheshrao Shedmake -AuthorDate: Thu Mar 21 14:13:30 2013 +0530 -Commit: Sandeep Sheshrao Shedmake -CommitDate: Thu Mar 21 14:13:30 2013 +0530 +Author: Sandeep Sheshrao Shedmake +Date: Thu Mar 21 14:13:30 2013 +0530 Updated Marathi Translations M po/mr.po commit 4d7bc1c47a4dcb66c9b0a2780e21c5123809492b -Author: Kai Takahashi -AuthorDate: Wed Mar 20 23:57:17 2013 +0900 -Commit: Jiro Matsuzawa -CommitDate: Wed Mar 20 23:57:17 2013 +0900 +Author: Kai Takahashi +Date: Wed Mar 20 23:57:17 2013 +0900 [l10n] Update Japanese translation M po/ja.po commit b6692a1e95cce136c4b1a2a509afd6f6c807dfd7 -Author: ManojKumar Giri -AuthorDate: Wed Mar 20 18:08:57 2013 +0530 -Commit: ManojKumar Giri -CommitDate: Wed Mar 20 18:08:57 2013 +0530 +Author: ManojKumar Giri +Date: Wed Mar 20 18:08:57 2013 +0530 Updated Odia Translation. M po/or.po commit ff44628a6b6fdff10bf9a9069f9291d3519c7016 -Author: Danial Behzadi -AuthorDate: Wed Mar 20 10:30:30 2013 +0330 -Commit: Arash Mousavi -CommitDate: Wed Mar 20 10:30:30 2013 +0330 +Author: Danial Behzadi +Date: Wed Mar 20 10:30:30 2013 +0330 l10n: Updated Persian translation M po/fa.po commit 7aba4bb76ac266524e8338be8e75188c28dd673f -Author: Victor Ibragimov -AuthorDate: Tue Mar 19 15:06:23 2013 -0300 -Commit: Enrico Nicoletto -CommitDate: Tue Mar 19 15:06:49 2013 -0300 +Author: Victor Ibragimov +Date: Tue Mar 19 15:06:23 2013 -0300 Updated Tajik translation @@ -635,80 +2180,64 @@ A po/tg.po commit 8ead8ddb18695c2325216755c1b5d7652fee5e51 -Author: Gabor Kelemen -AuthorDate: Tue Mar 19 17:49:55 2013 +0100 -Commit: Gabor Kelemen -CommitDate: Tue Mar 19 17:49:55 2013 +0100 +Author: Gabor Kelemen +Date: Tue Mar 19 17:49:55 2013 +0100 Updated Hungarian translation M po/hu.po commit 71874a55ba6fb4604df00b1436607f53b44dd7a5 -Author: Ihar Hrachyshka -AuthorDate: Sun Mar 17 16:46:02 2013 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sun Mar 17 16:46:02 2013 +0300 +Author: Ihar Hrachyshka +Date: Sun Mar 17 16:46:02 2013 +0300 Updated Belarusian translation. M po/be.po commit 8ce3ed7f8c3980af726d1d4e701168283d7c5a81 -Author: Changwoo Ryu -AuthorDate: Sat Mar 16 23:07:22 2013 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Mar 16 23:07:22 2013 +0900 +Author: Changwoo Ryu +Date: Sat Mar 16 23:07:22 2013 +0900 Updated Korean translation M po/ko.po commit 143d08631c52a711b82a287afc8415acd07942cc -Author: Alexandre Franke -AuthorDate: Fri Mar 15 14:59:47 2013 +0100 -Commit: Alexandre Franke -CommitDate: Fri Mar 15 14:59:47 2013 +0100 +Author: Alexandre Franke +Date: Fri Mar 15 14:59:47 2013 +0100 Update French translation M po/fr.po commit 17f89bd67c42f00e9e688c3a7319568d8aa9b369 -Author: Carles Ferrando -AuthorDate: Tue Mar 12 22:53:40 2013 +0100 -Commit: Gil Forcada -CommitDate: Tue Mar 12 22:53:40 2013 +0100 +Author: Carles Ferrando +Date: Tue Mar 12 22:53:40 2013 +0100 [l10n] Updated Catalan (Valencian) translation M po/ca@valencia.po commit f3694ce05f57d515369963e37c59fc059195c3ac -Author: Gil Forcada -AuthorDate: Tue Mar 12 22:53:35 2013 +0100 -Commit: Gil Forcada -CommitDate: Tue Mar 12 22:53:35 2013 +0100 +Author: Gil Forcada +Date: Tue Mar 12 22:53:35 2013 +0100 [l10n] Updated Catalan translation M po/ca.po commit d29d0194a0f739b854b450124a4008d3f9feca69 -Author: Mattias Põldaru -AuthorDate: Tue Mar 12 17:56:20 2013 +0200 -Commit: Priit Laes -CommitDate: Tue Mar 12 17:56:20 2013 +0200 +Author: Mattias Põldaru +Date: Tue Mar 12 17:56:20 2013 +0200 [l10n] Updated Estonian translation M po/et.po commit dc08b132d75711b95f84dbc124f65d3f6114f8d8 -Author: Colin Walters -AuthorDate: Mon Mar 11 20:56:40 2013 -0400 -Commit: Colin Walters -CommitDate: Tue Mar 12 10:44:35 2013 -0400 +Author: Colin Walters +Date: Mon Mar 11 20:56:40 2013 -0400 Increase phase timeout to 90 seconds @@ -720,100 +2249,80 @@ M gnome-session/gsm-manager.c commit 2bc6b4e4341566b15163268981df218e8fae5608 -Author: Duarte Loreto -AuthorDate: Tue Mar 12 13:31:38 2013 +0000 -Commit: Duarte Loreto -CommitDate: Tue Mar 12 13:31:38 2013 +0000 +Author: Duarte Loreto +Date: Tue Mar 12 13:31:38 2013 +0000 Updated Portuguese translation M po/pt.po commit e567bf24e20ee50d5911e20ca2298830c54fdeb6 -Author: KennethNielsen -AuthorDate: Mon Mar 11 23:28:46 2013 +0100 -Commit: KennethNielsen -CommitDate: Mon Mar 11 23:28:46 2013 +0100 +Author: KennethNielsen +Date: Mon Mar 11 23:28:46 2013 +0100 Updated Danish translation M po/da.po commit 18685f678291ba4e71b6d506677aa5719d7be5ec -Author: Andika Triwidada -AuthorDate: Mon Mar 11 16:33:56 2013 +0700 -Commit: Andika Triwidada -CommitDate: Mon Mar 11 16:33:56 2013 +0700 +Author: Andika Triwidada +Date: Mon Mar 11 16:33:56 2013 +0700 Updated Indonesian translation M po/id.po commit 0165b0f4a60248387ea6e69783f0417f3cd12d7f -Author: Bonaventura Aditya Perdana -AuthorDate: Mon Mar 11 16:23:25 2013 +0700 -Commit: Andika Triwidada -CommitDate: Mon Mar 11 16:23:25 2013 +0700 +Author: Bonaventura Aditya Perdana +Date: Mon Mar 11 16:23:25 2013 +0700 Updated Indonesian translation M po/id.po commit 605669fe976be1c1d28d93deefd2323a42f742a9 -Author: Mario Blättermann -AuthorDate: Mon Mar 11 09:18:54 2013 +0100 -Commit: Mario Blättermann -CommitDate: Mon Mar 11 09:18:54 2013 +0100 +Author: Mario Blättermann +Date: Mon Mar 11 09:18:54 2013 +0100 [l10n] Updated German translation M po/de.po commit 5b257fe69f8d625b728912160249ade2493be9b9 -Author: Baurzhan Muftakhidinov -AuthorDate: Sat Mar 9 21:17:09 2013 +0600 -Commit: Baurzhan Muftakhidinov -CommitDate: Sat Mar 9 21:17:09 2013 +0600 +Author: Baurzhan Muftakhidinov +Date: Sat Mar 9 21:17:09 2013 +0600 Updated Kazakh translation. M po/kk.po commit 690f6aa40822a27880ec826e74229c7d5a6bac59 -Author: Ville-Pekka Vainio -AuthorDate: Thu Mar 7 21:00:01 2013 +0200 -Commit: Ville-Pekka Vainio -CommitDate: Thu Mar 7 21:00:01 2013 +0200 +Author: Ville-Pekka Vainio +Date: Thu Mar 7 21:00:01 2013 +0200 Finnish translation update by Jiri Grönroos M po/fi.po -commit ba03b82ef59ee3f7091c51ed4330dbe2a4b258f3 (tag: 3.7.91) -Author: Ray Strode -AuthorDate: Tue Mar 5 23:41:53 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 23:43:48 2013 -0500 +commit ba03b82ef59ee3f7091c51ed4330dbe2a4b258f3 +Author: Ray Strode +Date: Tue Mar 5 23:41:53 2013 -0500 configure: bump to 3.7.91 M configure.ac commit 4093e9422a1964ff0410e611b63d76ae4c1d6c87 -Author: Ray Strode -AuthorDate: Tue Mar 5 23:43:36 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 23:43:48 2013 -0500 +Author: Ray Strode +Date: Tue Mar 5 23:43:36 2013 -0500 NEWS: update for release M NEWS commit d7abfce0a92a4d69a01839e2e8e4480b5239235d -Author: Ray Strode -AuthorDate: Tue Mar 5 23:36:26 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 23:37:54 2013 -0500 +Author: Ray Strode +Date: Tue Mar 5 23:36:26 2013 -0500 fail-whale: fix positioning of window @@ -826,10 +2335,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit 51d5b07a1a74b153604b47f47fec3783c30e3511 -Author: Ray Strode -AuthorDate: Tue Mar 5 23:08:58 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 23:17:38 2013 -0500 +Author: Ray Strode +Date: Tue Mar 5 23:08:58 2013 -0500 main: automatically fallback to software gl @@ -841,10 +2348,8 @@ M gnome-session/main.c commit 8a253eb715a3fe496bc8b51041dfa4b0fecbf2bd -Author: Ray Strode -AuthorDate: Tue Mar 5 22:38:24 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 23:17:38 2013 -0500 +Author: Ray Strode +Date: Tue Mar 5 22:38:24 2013 -0500 check-accelerated: only cache result if successful @@ -856,10 +2361,8 @@ M tools/gnome-session-check-accelerated.c commit 024c0fb04e075aaab4b75fc4340076abd06e0e41 -Author: Ray Strode -AuthorDate: Tue Mar 5 22:33:02 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Mar 5 22:33:02 2013 -0500 +Author: Ray Strode +Date: Tue Mar 5 22:33:02 2013 -0500 gnome.session: don't have IsRunnableHelper @@ -871,10 +2374,8 @@ M data/gnome.session.desktop.in.in commit 130721b7b26eb865a8ab6c72fa3fac1be1eb4a4d -Author: Colin Walters -AuthorDate: Tue Mar 5 14:23:11 2013 -0500 -Commit: Colin Walters -CommitDate: Tue Mar 5 14:27:14 2013 -0500 +Author: Colin Walters +Date: Tue Mar 5 14:23:11 2013 -0500 gsm-autostart-app: Remove unused GError @@ -885,70 +2386,56 @@ M gnome-session/gsm-autostart-app.c commit fa130ef30aa7b4f8e4f10e980592affed8533ce7 -Author: Nilamdyuti Goswami -AuthorDate: Tue Mar 5 18:58:36 2013 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Tue Mar 5 19:06:39 2013 +0530 +Author: Nilamdyuti Goswami +Date: Tue Mar 5 18:58:36 2013 +0530 Assamese translation updated for gnome 3.8 M po/as.po commit b9a1a836f2aa7201ec111f405979826dc39cbef9 -Author: Inaki Larranaga Murgoitio -AuthorDate: Mon Mar 4 23:05:33 2013 +0100 -Commit: dooteo -CommitDate: Mon Mar 4 23:05:33 2013 +0100 +Author: Inaki Larranaga Murgoitio +Date: Mon Mar 4 23:05:33 2013 +0100 Updated Basque language M po/eu.po commit 015b4df95da8b08905bedfbdad57b14282dea5c0 -Author: Luca Ferretti -AuthorDate: Sun Mar 3 01:38:24 2013 +0100 -Commit: Luca Ferretti -CommitDate: Sun Mar 3 01:38:24 2013 +0100 +Author: Luca Ferretti +Date: Sun Mar 3 01:38:24 2013 +0100 l10n: Updated Italian translation M po/it.po commit 853efdf1f16d840115584f9f5a66e553a7687a1c -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sat Mar 2 09:45:03 2013 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sat Mar 2 09:45:03 2013 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Sat Mar 2 09:45:03 2013 +0700 Updated Vietnamese translation M po/vi.po commit e7f6e74debb4bedd7e3f2c3d49465ea898348b8d -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sat Mar 2 09:39:18 2013 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sat Mar 2 09:39:18 2013 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Sat Mar 2 09:39:18 2013 +0700 po/vi: import from Damned Lies M po/vi.po commit 5df4e4169f4cf8a4311b6261bf1df1d1f435d0c0 -Author: Enrico Nicoletto -AuthorDate: Fri Mar 1 18:22:36 2013 -0300 -Commit: Enrico Nicoletto -CommitDate: Fri Mar 1 18:22:36 2013 -0300 +Author: Enrico Nicoletto +Date: Fri Mar 1 18:22:36 2013 -0300 Updated Brazilian Portuguese translation proofread by Rafael Ferreira M po/pt_BR.po commit 46d311c54d5e1948d7102d2c26041028ba13480f -Author: Мирослав Николић -AuthorDate: Fri Mar 1 10:38:26 2013 +0100 -Commit: Мирослав Николић -CommitDate: Fri Mar 1 10:38:26 2013 +0100 +Author: Мирослав Николић +Date: Fri Mar 1 10:38:26 2013 +0100 Updated Serbian translation @@ -956,10 +2443,8 @@ M po/sr@latin.po commit f0063b9d876a946de3c944612e1bf4f26054f582 -Author: Emilio Pozuelo Monfort -AuthorDate: Wed Feb 27 11:35:25 2013 +0100 -Commit: Emilio Pozuelo Monfort -CommitDate: Thu Feb 28 18:45:18 2013 +0100 +Author: Emilio Pozuelo Monfort +Date: Wed Feb 27 11:35:25 2013 +0100 Use pkg-config to check for X11 libraries @@ -974,10 +2459,8 @@ M tools/Makefile.am commit 3864e7b0341df18fa26168a20ffa8d9402ac114b -Author: Chao-Hsiung Liao -AuthorDate: Wed Feb 27 22:55:23 2013 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Wed Feb 27 22:55:23 2013 +0800 +Author: Chao-Hsiung Liao +Date: Wed Feb 27 22:55:23 2013 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -985,120 +2468,96 @@ M po/zh_TW.po commit e47f26a8d76727c33924c3a4ff4e00d153b401f9 -Author: Sweta Kothari -AuthorDate: Wed Feb 27 16:50:43 2013 +0530 -Commit: Sweta Kothari -CommitDate: Wed Feb 27 16:50:43 2013 +0530 +Author: Sweta Kothari +Date: Wed Feb 27 16:50:43 2013 +0530 Updated gujarati file M po/gu.po commit 749655289c6ca033408780f78f3da4199dfbebe1 -Author: Aurimas Černius -AuthorDate: Tue Feb 26 23:03:09 2013 +0200 -Commit: Aurimas Černius -CommitDate: Tue Feb 26 23:03:09 2013 +0200 +Author: Aurimas Černius +Date: Tue Feb 26 23:03:09 2013 +0200 Updated Lithuanian translation M po/lt.po commit 1d0138843c2b9390ef5f5ba0436d5587ff6fddb8 -Author: Christian Kirbach -AuthorDate: Tue Feb 26 00:28:49 2013 +0100 -Commit: Christian Kirbach -CommitDate: Tue Feb 26 00:28:49 2013 +0100 +Author: Christian Kirbach +Date: Tue Feb 26 00:28:49 2013 +0100 Updated German translation M po/de.po commit 141b0584ed4f654144cdbb7153926ff759bfc271 -Author: Kjartan Maraas -AuthorDate: Mon Feb 25 18:38:29 2013 +0100 -Commit: Kjartan Maraas -CommitDate: Mon Feb 25 18:38:29 2013 +0100 +Author: Kjartan Maraas +Date: Mon Feb 25 18:38:29 2013 +0100 Updated Norwegian bokmål translation M po/nb.po commit 353fbff284476a82ef45f154721c94b4fb00b0f8 -Author: Matej Urbančič -AuthorDate: Sun Feb 24 21:34:27 2013 +0100 -Commit: Matej Urbančič -CommitDate: Sun Feb 24 21:34:27 2013 +0100 +Author: Matej Urbančič +Date: Sun Feb 24 21:34:27 2013 +0100 Updated Slovenian translation M po/sl.po commit d87b56db663c6d0a83fe9eca3aca6740b5dc82e2 -Author: Dimitris Spingos -AuthorDate: Sun Feb 24 13:28:22 2013 +0200 -Commit: Dimitris Spingos -CommitDate: Sun Feb 24 13:28:22 2013 +0200 +Author: Dimitris Spingos +Date: Sun Feb 24 13:28:22 2013 +0200 Updated Greek translation M po/el.po commit f29429096cfae063c1158f66b7114a5d865143e6 -Author: Piotr Drąg -AuthorDate: Sun Feb 24 01:50:31 2013 +0100 -Commit: Piotr Drąg -CommitDate: Sun Feb 24 01:50:31 2013 +0100 +Author: Piotr Drąg +Date: Sun Feb 24 01:50:31 2013 +0100 Updated Polish translation M po/pl.po commit a1a1c78695acffc49083e0899d8150250fdba993 -Author: Dušan Kazik -AuthorDate: Sat Feb 23 08:03:14 2013 +0100 -Commit: Peter Mráz -CommitDate: Sat Feb 23 08:03:14 2013 +0100 +Author: Dušan Kazik +Date: Sat Feb 23 08:03:14 2013 +0100 Updated slovak translation M po/sk.po commit 5715856a682eee3bb59a0901ed9634d3dbf5b783 -Author: Yaron Shahrabani -AuthorDate: Fri Feb 22 00:01:43 2013 +0200 -Commit: Yaron Shahrabani -CommitDate: Fri Feb 22 00:01:43 2013 +0200 +Author: Yaron Shahrabani +Date: Fri Feb 22 00:01:43 2013 +0200 Updated Hebrew translation. M po/he.po commit 0eefde51742aa559e6626ddd37e78f3df51b98d1 -Author: Daniel Mustieles -AuthorDate: Thu Feb 21 16:55:47 2013 +0100 -Commit: Daniel Mustieles -CommitDate: Thu Feb 21 16:55:47 2013 +0100 +Author: Daniel Mustieles +Date: Thu Feb 21 16:55:47 2013 +0100 Updated Spanish translation M po/es.po commit 82ab10f52b9af2948f71da30990a9a0a2636366a -Author: Yuri Myasoedov -AuthorDate: Thu Feb 21 10:42:00 2013 +0400 -Commit: Yuri Myasoedov -CommitDate: Thu Feb 21 10:42:00 2013 +0400 +Author: Yuri Myasoedov +Date: Thu Feb 21 10:42:00 2013 +0400 Updated Russian translation M po/ru.po commit bb62a56264c7d087261cbc1c09a870080afa86d6 -Author: Dominique Leuenberger -AuthorDate: Tue Feb 19 21:07:36 2013 +0100 -Commit: Dominique Leuenberger -CommitDate: Wed Feb 20 23:22:09 2013 +0100 +Author: Dominique Leuenberger +Date: Tue Feb 19 21:07:36 2013 +0100 Require gnome-desktop-3.0 >= 3.7.90 @@ -1109,60 +2568,48 @@ M configure.ac commit 5323b26beecf802c2c1ad7854e3d5f4469dcf9e6 -Author: Rūdolfs Mazurs -AuthorDate: Wed Feb 20 12:08:13 2013 +0200 -Commit: Rūdolfs Mazurs -CommitDate: Wed Feb 20 12:10:45 2013 +0200 +Author: Rūdolfs Mazurs +Date: Wed Feb 20 12:08:13 2013 +0200 Updated Latvian translation M po/lv.po commit b3516a30739b496860815020c89f460e156ed6d5 -Author: Fran Diéguez -AuthorDate: Wed Feb 20 11:06:55 2013 +0100 -Commit: Fran Diéguez -CommitDate: Wed Feb 20 11:06:55 2013 +0100 +Author: Fran Diéguez +Date: Wed Feb 20 11:06:55 2013 +0100 Updated Galician translations M po/gl.po commit 6d1f9f597fc5d558d7f0b7538bdc5258ec4f7217 -Author: A S Alam -AuthorDate: Wed Feb 20 01:42:18 2013 +0000 -Commit: A S Alam -CommitDate: Wed Feb 20 01:42:18 2013 +0000 +Author: A S Alam +Date: Wed Feb 20 01:42:18 2013 +0000 Punjabi: Translation updated (aalam) M po/pa.po -commit f3ab180c4b1a9034fe88cc4eed6f1163778b91be (tag: 3.7.90) -Author: Ray Strode -AuthorDate: Tue Feb 19 13:49:46 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Feb 19 13:49:46 2013 -0500 +commit f3ab180c4b1a9034fe88cc4eed6f1163778b91be +Author: Ray Strode +Date: Tue Feb 19 13:49:46 2013 -0500 configure: bump to 3.7.90 M configure.ac commit 0daf559defd3578918182fd94cca0628d1f77cc8 -Author: Ray Strode -AuthorDate: Tue Feb 19 13:49:24 2013 -0500 -Commit: Ray Strode -CommitDate: Tue Feb 19 13:49:24 2013 -0500 +Author: Ray Strode +Date: Tue Feb 19 13:49:24 2013 -0500 NEWS: update for release M NEWS commit a0741c829c315669d131ac704047ba4e20b13048 -Author: Matthias Clasen -AuthorDate: Mon Nov 12 07:49:51 2012 -0500 -Commit: Ray Strode -CommitDate: Tue Feb 19 13:44:53 2013 -0500 +Author: Matthias Clasen +Date: Mon Nov 12 07:49:51 2012 -0500 Drop use of EggDesktopfile in GsmAutostartApp @@ -1176,10 +2623,8 @@ M gnome-session/gsm-autostart-app.c commit 42356904ef974ca8376158dddd3d36f913f793a0 -Author: Michael Chapman -AuthorDate: Wed Feb 6 00:22:00 2013 +0000 -Commit: Ray Strode -CommitDate: Tue Feb 19 13:39:26 2013 -0500 +Author: Michael Chapman +Date: Wed Feb 6 00:22:00 2013 +0000 xsmp: Re-accept clients if session shutdown is cancelled @@ -1193,10 +2638,8 @@ M gnome-session/gsm-xsmp-server.h commit 4c7e1c862c54d0c34023b4bc536c5c9c9f56eb78 -Author: Marc-Antoine Perennou -AuthorDate: Wed Jan 23 14:11:48 2013 +0100 -Commit: Ray Strode -CommitDate: Tue Feb 19 13:36:00 2013 -0500 +Author: Marc-Antoine Perennou +Date: Wed Jan 23 14:11:48 2013 +0100 provide a dummy session @@ -1208,10 +2651,8 @@ M po/POTFILES.in commit 796e1a8717d1f571b51c5c1f6846c72c923370b8 -Author: Florian Müllner -AuthorDate: Tue Feb 19 16:13:24 2013 +0100 -Commit: Florian Müllner -CommitDate: Tue Feb 19 16:15:46 2013 +0100 +Author: Florian Müllner +Date: Tue Feb 19 16:13:24 2013 +0100 presence: Don't connect to 'became-active' signal @@ -1224,20 +2665,16 @@ M gnome-session/gsm-presence.c commit f993279015372fe1d9d73193104966fddd20d938 -Author: Jasper St. Pierre -AuthorDate: Fri Feb 15 19:28:23 2013 -0500 -Commit: Jasper St. Pierre -CommitDate: Mon Feb 18 15:06:28 2013 -0500 +Author: Jasper St. Pierre +Date: Fri Feb 15 19:28:23 2013 -0500 Update git.mk M git.mk commit 6d7c73177858c3aeb2e65553b30dc536d4f1667d -Author: Florian Müllner -AuthorDate: Thu Oct 18 16:53:12 2012 +0200 -Commit: Florian Müllner -CommitDate: Mon Feb 18 20:33:12 2013 +0100 +Author: Florian Müllner +Date: Thu Oct 18 16:53:12 2012 +0200 main: Set XDG_MENU_PREFIX @@ -1247,10 +2684,8 @@ M gnome-session/main.c commit 16a2f5d9931ea1abf45aca41494c2627dd68280f -Author: Gheyret Kenji -AuthorDate: Sat Feb 16 12:22:33 2013 +0900 -Commit: Gheyret Kenji -CommitDate: Sat Feb 16 12:22:33 2013 +0900 +Author: Gheyret Kenji +Date: Sat Feb 16 12:22:33 2013 +0900 Updated Uyghur translation @@ -1259,10 +2694,8 @@ M po/ug.po commit cb06f9b6de1c10e3d3d1d1a41438d88ce0546e46 -Author: Мирослав Николић -AuthorDate: Fri Feb 15 10:27:19 2013 +0100 -Commit: Мирослав Николић -CommitDate: Fri Feb 15 10:27:19 2013 +0100 +Author: Мирослав Николић +Date: Fri Feb 15 10:27:19 2013 +0100 Updated Serbian translation @@ -1270,50 +2703,40 @@ M po/sr@latin.po commit 87a4042d300cd58268a7c6e5d6c0908ba34e9fa5 -Author: Carles Ferrando -AuthorDate: Fri Feb 15 01:22:12 2013 +0100 -Commit: Gil Forcada -CommitDate: Fri Feb 15 01:22:12 2013 +0100 +Author: Carles Ferrando +Date: Fri Feb 15 01:22:12 2013 +0100 [l10n] Updated Catalan (Valencian) translation M po/ca@valencia.po commit 4c1ab2068a352df9d18bd6bc27ba7029fa8c7536 -Author: Gil Forcada -AuthorDate: Fri Feb 15 01:21:56 2013 +0100 -Commit: Gil Forcada -CommitDate: Fri Feb 15 01:21:56 2013 +0100 +Author: Gil Forcada +Date: Fri Feb 15 01:21:56 2013 +0100 [l10n] Updated Catalan translation M po/ca.po commit 38923d6b356335bc0a0dcfff2a5f51f4f7d87315 -Author: Daniel Martinez -AuthorDate: Thu Feb 14 19:58:08 2013 +0100 -Commit: Daniel Martinez -CommitDate: Thu Feb 14 19:58:08 2013 +0100 +Author: Daniel Martinez +Date: Thu Feb 14 19:58:08 2013 +0100 Updated Aragonese translation M po/an.po commit 6a5b5e727272fcf027468bbf4de9895c079b44e1 -Author: Anish A -AuthorDate: Thu Feb 14 22:13:50 2013 +0400 -Commit: Anish A -CommitDate: Thu Feb 14 22:13:50 2013 +0400 +Author: Anish A +Date: Thu Feb 14 22:13:50 2013 +0400 Updated Malayalam Localization M po/ml.po commit 377e02494ab0e9d6b928f4872776a209e91019a8 -Author: Jasper St. Pierre -AuthorDate: Fri Jan 18 00:20:55 2013 -0500 -Commit: Bastien Nocera -CommitDate: Thu Feb 14 16:39:23 2013 +0100 +Author: Jasper St. Pierre +Date: Fri Jan 18 00:20:55 2013 -0500 gsm-presence: Update to new GnomeIdleMonitor API @@ -1322,10 +2745,8 @@ M gnome-session/gsm-presence.c commit b88481ed12c6d36e59d52ed66b24ca58ee262735 -Author: William Jon McCann -AuthorDate: Thu Feb 14 09:23:44 2013 -0500 -Commit: William Jon McCann -CommitDate: Thu Feb 14 10:07:11 2013 -0500 +Author: William Jon McCann +Date: Thu Feb 14 09:23:44 2013 -0500 Use symbolic fail icon @@ -1333,10 +2754,8 @@ M gnome-session/gsm-icon-names.h commit 9646cc98b6a204f08c1ed06d75404610251e30e7 -Author: Colin Walters -AuthorDate: Wed Feb 13 10:28:36 2013 -0500 -Commit: Colin Walters -CommitDate: Wed Feb 13 10:28:36 2013 -0500 +Author: Colin Walters +Date: Wed Feb 13 10:28:36 2013 -0500 Define UPOWER_ENABLE_DEPRECATED @@ -1346,30 +2765,24 @@ M gnome-session/gsm-logout-dialog.c commit 45b8a286b5cc45161344296e3992ba8a78eb8a4d -Author: A S Alam -AuthorDate: Sun Feb 10 23:46:53 2013 +0000 -Commit: A S Alam -CommitDate: Sun Feb 10 23:46:53 2013 +0000 +Author: A S Alam +Date: Sun Feb 10 23:46:53 2013 +0000 Punjabi: Translation updated (aalam) M po/pa.po commit aaf55164a7226eefa9bb8b06d4be39241e07dc65 -Author: Aurimas Černius -AuthorDate: Sat Feb 9 22:38:26 2013 +0200 -Commit: Aurimas Černius -CommitDate: Sat Feb 9 22:38:26 2013 +0200 +Author: Aurimas Černius +Date: Sat Feb 9 22:38:26 2013 +0200 Updated Lithuanian translation M po/lt.po commit e9764e3db2696e282521c7f01dd460416f8e6ee0 -Author: Matthias Clasen -AuthorDate: Sat Feb 9 13:15:57 2013 -0500 -Commit: Matthias Clasen -CommitDate: Sat Feb 9 13:15:57 2013 -0500 +Author: Matthias Clasen +Date: Sat Feb 9 13:15:57 2013 -0500 Hide non-working help button @@ -1381,10 +2794,8 @@ M capplet/gsm-properties-dialog.c commit 0abc8e8780cf64325f745218ffceb78d65049545 -Author: Dominique Leuenberger -AuthorDate: Wed Feb 6 19:45:32 2013 +0100 -Commit: Dominique Leuenberger -CommitDate: Thu Feb 7 07:55:45 2013 +0100 +Author: Dominique Leuenberger +Date: Wed Feb 6 19:45:32 2013 +0100 gnome-session-selector: 'Port' to Gtk3. @@ -1393,10 +2804,8 @@ M configure.ac commit 307e72370b157dece4bfb6c62e2f2d3d4e9fe733 -Author: Dominique Leuenberger -AuthorDate: Tue Feb 5 17:01:31 2013 +0100 -Commit: Dominique Leuenberger -CommitDate: Thu Feb 7 07:55:45 2013 +0100 +Author: Dominique Leuenberger +Date: Tue Feb 5 17:01:31 2013 +0100 gnome-session-selector: only install .ui and man pages when building with --enable-session-selector. @@ -1406,20 +2815,16 @@ M doc/man/Makefile.am commit 16bb28964ae409562584bcf2a7b4b82d1cdd54f2 -Author: Fran Diéguez -AuthorDate: Wed Feb 6 17:42:10 2013 +0100 -Commit: Fran Diéguez -CommitDate: Wed Feb 6 17:42:10 2013 +0100 +Author: Fran Diéguez +Date: Wed Feb 6 17:42:10 2013 +0100 Updated Galician translations M po/gl.po -commit 718a16972c7a35ab2d197eeb75cb87af1e4e0569 (tag: 3.7.4) -Author: Matthias Clasen -AuthorDate: Mon Feb 4 14:21:05 2013 -0500 -Commit: Matthias Clasen -CommitDate: Mon Feb 4 14:21:05 2013 -0500 +commit 718a16972c7a35ab2d197eeb75cb87af1e4e0569 +Author: Matthias Clasen +Date: Mon Feb 4 14:21:05 2013 -0500 3.7.4 @@ -1427,50 +2832,40 @@ M configure.ac commit 0aaea386275fd718b3fba39548b8ba120b9557af -Author: Luca Ferretti -AuthorDate: Mon Feb 4 18:21:48 2013 +0100 -Commit: Milo Casagrande -CommitDate: Mon Feb 4 18:21:48 2013 +0100 +Author: Luca Ferretti +Date: Mon Feb 4 18:21:48 2013 +0100 [l10n] Updated Italian translation. M po/it.po commit 79fed32b51ebe7716ee4cc8c7e167fd45479055b -Author: OKANO Takayoshi -AuthorDate: Sun Feb 3 14:37:59 2013 +0900 -Commit: Jiro Matsuzawa -CommitDate: Sun Feb 3 14:37:59 2013 +0900 +Author: OKANO Takayoshi +Date: Sun Feb 3 14:37:59 2013 +0900 [l10n] Update Japanese translation M po/ja.po commit 9e888b17efd5ce59c6ca53e6ed25eebb6d58e12e -Author: Piotr Drąg -AuthorDate: Sat Feb 2 22:17:07 2013 +0100 -Commit: Piotr Drąg -CommitDate: Sat Feb 2 22:17:07 2013 +0100 +Author: Piotr Drąg +Date: Sat Feb 2 22:17:07 2013 +0100 Updated Polish translation M po/pl.po commit 50a0ed60558be49b6ad8d14fdf490028979d3486 -Author: Inaki Larranaga Murgoitio -AuthorDate: Sat Feb 2 12:07:10 2013 +0100 -Commit: dooteo -CommitDate: Sat Feb 2 12:07:10 2013 +0100 +Author: Inaki Larranaga Murgoitio +Date: Sat Feb 2 12:07:10 2013 +0100 Updated Basque language M po/eu.po commit 384ce165ee4b06fee4a65e506d2a6532d59db9c7 -Author: Chao-Hsiung Liao -AuthorDate: Sat Feb 2 18:38:26 2013 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Sat Feb 2 18:38:26 2013 +0800 +Author: Chao-Hsiung Liao +Date: Sat Feb 2 18:38:26 2013 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -1478,10 +2873,8 @@ M po/zh_TW.po commit 0505aea2b43cca86afbffcda02853995228af3f4 -Author: Gheyret Kenji -AuthorDate: Sat Feb 2 11:53:19 2013 +0900 -Commit: Gheyret Kenji -CommitDate: Sat Feb 2 11:53:19 2013 +0900 +Author: Gheyret Kenji +Date: Sat Feb 2 11:53:19 2013 +0900 Updated Uyghur translation @@ -1490,20 +2883,16 @@ M po/ug.po commit 6e8c5a1c6787a7d3e66e22dadb5f509606b71c35 -Author: Daniel Mustieles -AuthorDate: Fri Feb 1 10:48:39 2013 +0100 -Commit: Daniel Mustieles -CommitDate: Fri Feb 1 10:48:39 2013 +0100 +Author: Daniel Mustieles +Date: Fri Feb 1 10:48:39 2013 +0100 Updated Spanish translation M po/es.po commit 6186a4a6f1fc1a34e188db4fe6d6e8035afea36d -Author: Matthias Clasen -AuthorDate: Thu Jan 31 16:55:14 2013 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 31 16:57:32 2013 -0500 +Author: Matthias Clasen +Date: Thu Jan 31 16:55:14 2013 -0500 Add a custom session selector @@ -1523,10 +2912,8 @@ A tools/gnome-session-selector.c commit cb5bddf092fb50272b10b76a4d0190a9afa88c7b -Author: Matthias Clasen -AuthorDate: Thu Jan 31 15:51:07 2013 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 31 16:57:32 2013 -0500 +Author: Matthias Clasen +Date: Thu Jan 31 15:51:07 2013 -0500 Add a save-session-one-shot key @@ -1539,10 +2926,8 @@ M gnome-session/gsm-session-save.c commit b733c2ee519b65c3c4eab0d0e93056412f995f3f -Author: Matthias Clasen -AuthorDate: Thu Jan 31 15:36:04 2013 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 31 16:57:31 2013 -0500 +Author: Matthias Clasen +Date: Thu Jan 31 15:36:04 2013 -0500 Allow saved-session to be a symlink @@ -1552,10 +2937,8 @@ M gnome-session/gsm-util.c commit 86cf902bedc410810d083289f269c395d2e66fd6 -Author: Bastien Nocera -AuthorDate: Thu Jan 31 22:55:27 2013 +0100 -Commit: Bastien Nocera -CommitDate: Thu Jan 31 22:55:27 2013 +0100 +Author: Bastien Nocera +Date: Thu Jan 31 22:55:27 2013 +0100 Revert "systemd: Inhibit the lid as well when suspend is inhibited" @@ -1564,10 +2947,8 @@ M gnome-session/gsm-systemd.c commit 9540eff45540ba2ce985be0c02af73a14e41d43f -Author: Bastien Nocera -AuthorDate: Thu Jan 31 18:09:33 2013 +0100 -Commit: Bastien Nocera -CommitDate: Thu Jan 31 22:08:38 2013 +0100 +Author: Bastien Nocera +Date: Thu Jan 31 18:09:33 2013 +0100 systemd: Inhibit the lid as well when suspend is inhibited @@ -1580,50 +2961,40 @@ M gnome-session/gsm-systemd.c commit 0faa2d0be2d6768ee25e70acd7709b66397274de -Author: Piotr Drąg -AuthorDate: Thu Jan 31 19:57:35 2013 +0100 -Commit: Piotr Drąg -CommitDate: Thu Jan 31 19:57:35 2013 +0100 +Author: Piotr Drąg +Date: Thu Jan 31 19:57:35 2013 +0100 Updated Polish translation M po/pl.po commit c22633484be3dc0dd8ca6f06713d4ec41ca7575b -Author: Inaki Larranaga Murgoitio -AuthorDate: Wed Jan 30 21:49:51 2013 +0100 -Commit: dooteo -CommitDate: Wed Jan 30 21:49:51 2013 +0100 +Author: Inaki Larranaga Murgoitio +Date: Wed Jan 30 21:49:51 2013 +0100 Updated Basque language M po/eu.po commit 471dbaadee4585df1e93b287c3d0b5edae4e1b5c -Author: Inaki Larranaga Murgoitio -AuthorDate: Wed Jan 30 21:40:36 2013 +0100 -Commit: dooteo -CommitDate: Wed Jan 30 21:40:36 2013 +0100 +Author: Inaki Larranaga Murgoitio +Date: Wed Jan 30 21:40:36 2013 +0100 Updated Basque language M po/eu.po commit 7592606c1363d09068e09a6c458f6540c7fbd359 -Author: Fran Diéguez -AuthorDate: Sun Jan 27 18:12:33 2013 +0100 -Commit: Fran Diéguez -CommitDate: Sun Jan 27 18:12:33 2013 +0100 +Author: Fran Diéguez +Date: Sun Jan 27 18:12:33 2013 +0100 Updated Galician translations M po/gl.po commit 08dd0d00f0475da623693b7772a2de2be21aa5d8 -Author: Marc-Antoine Perennou -AuthorDate: Wed Jan 23 14:11:12 2013 +0100 -Commit: Marc-Antoine Perennou -CommitDate: Sun Jan 27 10:01:14 2013 +0100 +Author: Marc-Antoine Perennou +Date: Wed Jan 23 14:11:12 2013 +0100 support empty session @@ -1635,40 +3006,32 @@ M gnome-session/gsm-session-fill.c commit b617a7f12d233c1372ea4c4fd2c05da83b750286 -Author: Fabio Tomat -AuthorDate: Sun Jan 27 02:55:28 2013 +0100 -Commit: Fabio Tomat -CommitDate: Sun Jan 27 02:55:28 2013 +0100 +Author: Fabio Tomat +Date: Sun Jan 27 02:55:28 2013 +0100 Updated Friulian translation M po/fur.po commit 0af6a7492853c862e5b6d3dda5ccf4bb443385f8 -Author: Piotr Drąg -AuthorDate: Sat Jan 26 23:26:49 2013 +0100 -Commit: Piotr Drąg -CommitDate: Sat Jan 26 23:26:49 2013 +0100 +Author: Piotr Drąg +Date: Sat Jan 26 23:26:49 2013 +0100 Updated POTFILES.in M po/POTFILES.in commit 38df8327be77b907ead4cc70b0c127aee90cfd4c -Author: Matej Urbančič -AuthorDate: Sat Jan 26 20:08:26 2013 +0100 -Commit: Matej Urbančič -CommitDate: Sat Jan 26 20:08:26 2013 +0100 +Author: Matej Urbančič +Date: Sat Jan 26 20:08:26 2013 +0100 Updated Slovenian translation M po/sl.po commit bb8baf27048221e31e2034f20f05c4e736eee10a -Author: Matthias Clasen -AuthorDate: Fri Jan 25 16:51:05 2013 -0500 -Commit: Matthias Clasen -CommitDate: Fri Jan 25 16:53:13 2013 -0500 +Author: Matthias Clasen +Date: Fri Jan 25 16:51:05 2013 -0500 Show the fail whale if gnome-shell can't run @@ -1681,10 +3044,8 @@ M gnome-session/main.c commit bef001f9b0fe41ef731810e6520dcead5bd55334 -Author: Matthias Clasen -AuthorDate: Fri Jan 25 16:49:59 2013 -0500 -Commit: Matthias Clasen -CommitDate: Fri Jan 25 16:52:43 2013 -0500 +Author: Matthias Clasen +Date: Fri Jan 25 16:49:59 2013 -0500 Remove the fallback session @@ -1699,20 +3060,16 @@ M data/gnome.session.desktop.in.in commit 495ee7c32525d853537121eb9d8033c7859b8a7c -Author: Bastien Nocera -AuthorDate: Fri Jan 25 17:34:09 2013 +0100 -Commit: Bastien Nocera -CommitDate: Fri Jan 25 17:34:09 2013 +0100 +Author: Bastien Nocera +Date: Fri Jan 25 17:34:09 2013 +0100 manager: Fix notification for inhibited-actions property M gnome-session/gsm-manager.c commit a0057debeccdc5331bca9bc23daa2ddedcbc6b38 -Author: Bastien Nocera -AuthorDate: Fri Jan 25 09:34:38 2013 +0100 -Commit: Bastien Nocera -CommitDate: Fri Jan 25 14:33:56 2013 +0100 +Author: Bastien Nocera +Date: Fri Jan 25 09:34:38 2013 +0100 manager: Add InhibitedActions D-Bus property @@ -1726,30 +3083,24 @@ M gnome-session/org.gnome.SessionManager.xml commit aecdecb19dea81119327e1815182be3b020d70fb -Author: Bastien Nocera -AuthorDate: Fri Jan 25 09:03:11 2013 +0100 -Commit: Bastien Nocera -CommitDate: Fri Jan 25 09:03:11 2013 +0100 +Author: Bastien Nocera +Date: Fri Jan 25 09:03:11 2013 +0100 manager: Fix typo in XML definition M gnome-session/org.gnome.SessionManager.xml commit 9ab1de3a1c049c567e53941e1ecdbc44642d6818 -Author: Bastien Nocera -AuthorDate: Fri Jan 25 09:00:38 2013 +0100 -Commit: Bastien Nocera -CommitDate: Fri Jan 25 09:00:38 2013 +0100 +Author: Bastien Nocera +Date: Fri Jan 25 09:00:38 2013 +0100 manager: Separate the Properties section in XML definition M gnome-session/org.gnome.SessionManager.xml commit 68005e5a93ce80d2742d8a7e8cfe2efaea10c7d4 -Author: Bastien Nocera -AuthorDate: Thu Jan 24 09:34:08 2013 +0100 -Commit: Bastien Nocera -CommitDate: Thu Jan 24 09:34:45 2013 +0100 +Author: Bastien Nocera +Date: Thu Jan 24 09:34:08 2013 +0100 manager: Split off GsmManagerLogoutMode enum @@ -1762,10 +3113,8 @@ M gnome-session/gsm-manager.h commit 9d8b8000f5a69c4cba35ac3ae7fb157605517726 -Author: Bastien Nocera -AuthorDate: Thu Jan 24 09:28:09 2013 +0100 -Commit: Bastien Nocera -CommitDate: Thu Jan 24 09:31:38 2013 +0100 +Author: Bastien Nocera +Date: Thu Jan 24 09:28:09 2013 +0100 client: Use the correct GsmClientEndSessionFlag type for flags @@ -1777,10 +3126,8 @@ M gnome-session/gsm-xsmp-client.c commit 4a2c33203840bc48dec1e9478872d677c908e394 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:54:26 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:02:38 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:54:26 2013 +0100 presence: Handle really short idle delays @@ -1799,10 +3146,8 @@ M gnome-session/gsm-presence.c commit abf405834d12d845910e3c732b0c815a92fb2e1d -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:53:07 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:02:38 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:53:07 2013 +0100 presence: Try to keep the same idle watch @@ -1815,10 +3160,8 @@ M gnome-session/gsm-presence.c commit a64d01db925f5b444aaf1fe6b9c5f977b59db7a9 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:50:59 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:02:38 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:50:59 2013 +0100 presence: Add better debug @@ -1827,10 +3170,8 @@ M gnome-session/gsm-presence.c commit 784163cec6883107d07c3e51ac57140b18f17d10 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:20:12 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:00:08 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:20:12 2013 +0100 presence: Simplify finalize function @@ -1839,10 +3180,8 @@ M gnome-session/gsm-presence.c commit bea1d1674c6a0b3c3ce7a565595c3f8e36c8ccca -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:19:58 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:00:08 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:19:58 2013 +0100 manager: Remove chained-up finalize function @@ -1851,10 +3190,8 @@ M gnome-session/gsm-manager.c commit 8b2b17d88322c7da9a170cdf2528d6179822ccdb -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:19:38 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:00:08 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:19:38 2013 +0100 inhibit-dialog: Remove chained-up finalize function @@ -1863,10 +3200,8 @@ M gnome-session/gsm-inhibit-dialog.c commit 036144714f80e81b8197ec22561282aa6be6ffa4 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:19:10 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 16:00:08 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:19:10 2013 +0100 fail-whale-dialog: Remove chained-up finalize function @@ -1875,10 +3210,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit a1e961c7de92734747096c6d0680362bf7f98b00 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 15:15:37 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 15:58:35 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 15:15:37 2013 +0100 presence: Remove impossible check @@ -1889,10 +3222,8 @@ M gnome-session/gsm-presence.c commit 89f6c9d82e7fb2f76e667f78dae4ec0447dae666 -Author: Bastien Nocera -AuthorDate: Wed Jan 23 13:18:05 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 14:21:21 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 13:18:05 2013 +0100 manager: Remove unused quit_request_completed() function @@ -1901,20 +3232,16 @@ M gnome-session/gsm-manager.c commit 8489852dd4e659257a4746d0a1be6b8a45787567 -Author: Bastien Nocera -AuthorDate: Sat Jan 19 15:03:13 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 14:20:41 2013 +0100 +Author: Bastien Nocera +Date: Sat Jan 19 15:03:13 2013 +0100 presence: Update default idle-timeout to match gsettings-desktop-schemas M gnome-session/gsm-presence.c commit ddd49c70496bbd843cdd001ac5fab34c237f455e -Author: Bastien Nocera -AuthorDate: Wed Jan 23 13:11:08 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 23 13:11:08 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 23 13:11:08 2013 +0100 Revert "Support automatic logout after a maximum period of idleness" @@ -1935,10 +3262,8 @@ M gnome-session/main.c commit d8a1586f67d6500bc084bd499bdf25bec378cebf -Author: Bastien Nocera -AuthorDate: Tue Jan 22 10:28:53 2013 +0100 -Commit: Bastien Nocera -CommitDate: Tue Jan 22 10:39:20 2013 +0100 +Author: Bastien Nocera +Date: Tue Jan 22 10:28:53 2013 +0100 presence: Don't reconnect to became-active every time @@ -1951,10 +3276,8 @@ M gnome-session/gsm-presence.c commit e9198a010233eeea90d08a652d21125cb903db9b -Author: Bastien Nocera -AuthorDate: Mon Jan 21 22:45:52 2013 +0100 -Commit: Bastien Nocera -CommitDate: Tue Jan 22 07:36:07 2013 +0100 +Author: Bastien Nocera +Date: Mon Jan 21 22:45:52 2013 +0100 main: Make SIGUSR2 print a line in the debug output @@ -1965,50 +3288,40 @@ M gnome-session/main.c commit 71b5aa81dfda97e5e696e57b657d980c16d8ade8 -Author: Wouter Bolsterlee -AuthorDate: Sat Jan 19 15:22:19 2013 +0100 -Commit: Wouter Bolsterlee -CommitDate: Sat Jan 19 15:22:19 2013 +0100 +Author: Wouter Bolsterlee +Date: Sat Jan 19 15:22:19 2013 +0100 Updated Dutch translation M po/nl.po commit a2d8fe280154c644b5ce8fb107808b782ca80ad0 -Author: Wouter Bolsterlee -AuthorDate: Sat Jan 19 15:16:06 2013 +0100 -Commit: Wouter Bolsterlee -CommitDate: Sat Jan 19 15:16:06 2013 +0100 +Author: Wouter Bolsterlee +Date: Sat Jan 19 15:16:06 2013 +0100 Updated Dutch translation M po/nl.po commit b5c12badb7c30ae6319e1a18f376490850250b0a -Author: Alexander Shopov -AuthorDate: Fri Jan 18 05:35:48 2013 +0200 -Commit: Alexander Shopov -CommitDate: Fri Jan 18 05:35:48 2013 +0200 +Author: Alexander Shopov +Date: Fri Jan 18 05:35:48 2013 +0200 Updated Bulgarian translation M po/bg.po commit 71ca75aaacad5a7dd143b07453e3232f675d755c -Author: Duarte Loreto -AuthorDate: Thu Jan 17 23:39:27 2013 +0000 -Commit: Duarte Loreto -CommitDate: Thu Jan 17 23:39:27 2013 +0000 +Author: Duarte Loreto +Date: Thu Jan 17 23:39:27 2013 +0000 Updated Portuguese translation and converted to New Spelling (Novo AO) M po/pt.po commit 20366cb6c32ab2f7af079b31768f6cbe51788cb6 -Author: Мирослав Николић -AuthorDate: Thu Jan 17 12:00:23 2013 +0100 -Commit: Мирослав Николић -CommitDate: Thu Jan 17 12:00:23 2013 +0100 +Author: Мирослав Николић +Date: Thu Jan 17 12:00:23 2013 +0100 Updated Serbian translation @@ -2016,10 +3329,8 @@ M po/sr@latin.po commit 52e6bf4ce6ec7b7075694a06c6e43c926975a7ec -Author: Bastien Nocera -AuthorDate: Wed Jan 16 13:32:45 2013 +0100 -Commit: Bastien Nocera -CommitDate: Wed Jan 16 16:48:02 2013 +0100 +Author: Bastien Nocera +Date: Wed Jan 16 13:32:45 2013 +0100 session: Move GsmPresenceStatus into its own file @@ -2035,10 +3346,8 @@ M gnome-session/gsm-presence.h commit 9ec4deede968ad55d18340109c5aa9f6416de13d -Author: Colin Walters -AuthorDate: Tue Jan 15 08:08:08 2013 -0500 -Commit: Colin Walters -CommitDate: Wed Jan 16 10:36:18 2013 -0500 +Author: Colin Walters +Date: Tue Jan 15 08:08:08 2013 -0500 Use sd_journal_send to log key events with MESSAGE_ID @@ -2053,20 +3362,16 @@ M gnome-session/gsm-manager.c commit f97a51017939347a64ac902fa68c9cc47953ba11 -Author: Nilamdyuti Goswami -AuthorDate: Wed Jan 16 13:05:18 2013 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Wed Jan 16 13:05:40 2013 +0530 +Author: Nilamdyuti Goswami +Date: Wed Jan 16 13:05:18 2013 +0530 Assamese translation updated M po/as.po commit f6c39b3c63e085b815904332e9ab8e54cf0ab01c -Author: Colin Walters -AuthorDate: Tue Jan 15 08:35:21 2013 -0500 -Commit: Colin Walters -CommitDate: Tue Jan 15 13:08:57 2013 -0500 +Author: Colin Walters +Date: Tue Jan 15 08:35:21 2013 -0500 configure: Fix with/have systemd confusion @@ -2076,40 +3381,32 @@ M configure.ac commit 71e027ad061966888dcd038a85c1cd9636610692 -Author: Ihar Hrachyshka -AuthorDate: Tue Jan 15 20:33:01 2013 +0300 -Commit: Ihar Hrachyshka -CommitDate: Tue Jan 15 20:33:01 2013 +0300 +Author: Ihar Hrachyshka +Date: Tue Jan 15 20:33:01 2013 +0300 Updated Belarusian translation. M po/be.po commit 379c53875d08b57d75fcbf60bea80ad0cdcb1a3d -Author: Daniel Mustieles -AuthorDate: Tue Jan 15 14:34:50 2013 +0100 -Commit: Daniel Mustieles -CommitDate: Tue Jan 15 14:34:50 2013 +0100 +Author: Daniel Mustieles +Date: Tue Jan 15 14:34:50 2013 +0100 Updated Spanish translation M po/es.po commit 62c32425698e9524d8900e0d4adf3f5a9842c6d6 -Author: Kjartan Maraas -AuthorDate: Mon Jan 14 11:12:40 2013 +0100 -Commit: Kjartan Maraas -CommitDate: Mon Jan 14 11:12:40 2013 +0100 +Author: Kjartan Maraas +Date: Mon Jan 14 11:12:40 2013 +0100 Updated Norwegian bokmål translation M po/nb.po commit 8c266685b4e61158b89dcd0e1b17890cb64f6fca -Author: Bastien Nocera -AuthorDate: Sun Jan 13 19:32:06 2013 +0100 -Commit: Bastien Nocera -CommitDate: Sun Jan 13 23:10:06 2013 +0100 +Author: Bastien Nocera +Date: Sun Jan 13 19:32:06 2013 +0100 tools: Use GRegex in _parse_kcmdline() @@ -2120,10 +3417,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 644259516fc82ec7eb0746032496627da8c8e65e -Author: Bastien Nocera -AuthorDate: Sun Jan 13 19:56:59 2013 +0100 -Commit: Bastien Nocera -CommitDate: Sun Jan 13 19:56:59 2013 +0100 +Author: Bastien Nocera +Date: Sun Jan 13 19:56:59 2013 +0100 session: Remove double-space in string @@ -2136,10 +3431,8 @@ M gnome-session/gsm-inhibit-dialog.c commit 098fad4ea1be6953f66fc457df1943a31247611a -Author: Bastien Nocera -AuthorDate: Sun Jan 13 18:30:25 2013 +0100 -Commit: Bastien Nocera -CommitDate: Sun Jan 13 19:37:41 2013 +0100 +Author: Bastien Nocera +Date: Sun Jan 13 18:30:25 2013 +0100 session: Remove RequiredProviders support @@ -2157,10 +3450,8 @@ M gnome-session/gsm-session-fill.c commit 60c02f419214af9416d58e039c6ce75b2297d6d7 -Author: Gheyret Kenji -AuthorDate: Sat Jan 12 14:21:11 2013 +0900 -Commit: Gheyret Kenji -CommitDate: Sat Jan 12 14:21:11 2013 +0900 +Author: Gheyret Kenji +Date: Sat Jan 12 14:21:11 2013 +0900 Updated Uyghur translation @@ -2169,40 +3460,32 @@ M po/ug.po commit e1abe2dbaa3d110e0f6403942da51351dd34223b -Author: Matej Urbančič -AuthorDate: Wed Jan 9 15:26:31 2013 +0100 -Commit: Matej Urbančič -CommitDate: Wed Jan 9 15:26:31 2013 +0100 +Author: Matej Urbančič +Date: Wed Jan 9 15:26:31 2013 +0100 Updated Slovenian translation M po/sl.po commit db74698ba328d7e3d9edb55e7d540cbaa343e8ff -Author: Baurzhan Muftakhidinov -AuthorDate: Sun Jan 6 20:27:36 2013 +0600 -Commit: Baurzhan Muftakhidinov -CommitDate: Sun Jan 6 20:27:36 2013 +0600 +Author: Baurzhan Muftakhidinov +Date: Sun Jan 6 20:27:36 2013 +0600 Added Kazakh language code to LINGUAS file M po/LINGUAS commit 4341dc1239aef90aeabd4529c9ff59ab8d1a3120 -Author: Baurzhan Muftakhidinov -AuthorDate: Sun Jan 6 20:24:50 2013 +0600 -Commit: Baurzhan Muftakhidinov -CommitDate: Sun Jan 6 20:24:50 2013 +0600 +Author: Baurzhan Muftakhidinov +Date: Sun Jan 6 20:24:50 2013 +0600 Added Kazakh translation A po/kk.po commit b78ce4d28d5222d2d9c8c87ea9185077a381ba7e -Author: Jorge Perez Perez -AuthorDate: Thu Jan 3 16:52:55 2013 +0100 -Commit: Daniel Martinez -CommitDate: Thu Jan 3 16:52:55 2013 +0100 +Author: Jorge Perez Perez +Date: Thu Jan 3 16:52:55 2013 +0100 Added Aragonese translation @@ -2210,110 +3493,88 @@ A po/an.po commit 446ceb662f6c0c85222f4a91c8d30460c13fd5b2 -Author: Sina Sheikholeslami -AuthorDate: Wed Dec 26 20:56:41 2012 +0330 -Commit: Arash Mousavi -CommitDate: Wed Dec 26 20:56:41 2012 +0330 +Author: Sina Sheikholeslami +Date: Wed Dec 26 20:56:41 2012 +0330 l10n: Updated Persian translation M po/fa.po commit 079bbf454b136bcc4cbbf1c5ceb12c9de63e4002 -Author: Dušan Kazik -AuthorDate: Sun Dec 23 23:03:09 2012 +0100 -Commit: Pavol Klačanský -CommitDate: Sun Dec 23 23:03:09 2012 +0100 +Author: Dušan Kazik +Date: Sun Dec 23 23:03:09 2012 +0100 Updated Slovak translation M po/sk.po commit 238535c451a8ad18603f34fd3025fbb0c6aaca78 -Author: Dušan Kazik -AuthorDate: Sun Dec 23 23:01:50 2012 +0100 -Commit: Pavol Klačanský -CommitDate: Sun Dec 23 23:01:50 2012 +0100 +Author: Dušan Kazik +Date: Sun Dec 23 23:01:50 2012 +0100 Updated Slovak translation M po/sk.po commit 065e47a1b0f07ec13f7118fced8f5c0b4417b8f4 -Author: Kjartan Maraas -AuthorDate: Fri Dec 21 16:35:39 2012 +0100 -Commit: Kjartan Maraas -CommitDate: Fri Dec 21 16:35:39 2012 +0100 +Author: Kjartan Maraas +Date: Fri Dec 21 16:35:39 2012 +0100 Updated Norwegian bokmål translation M po/nb.po commit 396915ea2f613365d87a32ad3c137423e0487897 -Author: Aurimas Černius -AuthorDate: Thu Dec 20 23:41:18 2012 +0200 -Commit: Aurimas Černius -CommitDate: Thu Dec 20 23:41:18 2012 +0200 +Author: Aurimas Černius +Date: Thu Dec 20 23:41:18 2012 +0200 Updated Lithuanian translation M po/lt.po commit eb48fbaa7ae32dd3f9bd148b40ed34624d3e5e8f -Author: Yaron Shahrabani -AuthorDate: Thu Dec 20 16:26:04 2012 +0200 -Commit: Yaron Shahrabani -CommitDate: Thu Dec 20 16:26:04 2012 +0200 +Author: Yaron Shahrabani +Date: Thu Dec 20 16:26:04 2012 +0200 Updated Hebrew translation. M po/he.po -commit eb198d1d79aeddbcab6361f8d121e4eb15037132 (tag: 3.7.3) -Author: Ray Strode -AuthorDate: Tue Dec 18 15:00:27 2012 -0500 -Commit: Ray Strode -CommitDate: Tue Dec 18 15:00:27 2012 -0500 +commit eb198d1d79aeddbcab6361f8d121e4eb15037132 +Author: Ray Strode +Date: Tue Dec 18 15:00:27 2012 -0500 NEWS: update for release M NEWS commit f13f43f5b2673e923fd8111c9964e4fc91052cc4 -Author: Mattias Põldaru -AuthorDate: Tue Dec 18 17:56:24 2012 +0200 -Commit: Priit Laes -CommitDate: Tue Dec 18 17:56:24 2012 +0200 +Author: Mattias Põldaru +Date: Tue Dec 18 17:56:24 2012 +0200 [l10n] Updated Estonian translation M po/et.po commit 0406cc5b61fe42266a227a3a4bff6bfc835e7ae5 -Author: Daniel Mustieles -AuthorDate: Sun Dec 16 20:47:50 2012 +0100 -Commit: Daniel Mustieles -CommitDate: Sun Dec 16 20:50:35 2012 +0100 +Author: Daniel Mustieles +Date: Sun Dec 16 20:47:50 2012 +0100 Updated Spanish translation M po/es.po commit 92ed38f9fbb75072cf707818edcfc334a13a0c4a -Author: Piotr Drąg -AuthorDate: Sun Dec 16 04:18:28 2012 +0100 -Commit: Piotr Drąg -CommitDate: Sun Dec 16 04:18:28 2012 +0100 +Author: Piotr Drąg +Date: Sun Dec 16 04:18:28 2012 +0100 Updated Polish translation M po/pl.po commit f18652d38f5b739dbb2086c5e6fe9629a0a49295 -Author: Janne Haapsaari -AuthorDate: Sat Dec 15 22:53:46 2012 +0200 -Commit: Colin Walters -CommitDate: Sat Dec 15 16:17:45 2012 -0500 +Author: Janne Haapsaari +Date: Sat Dec 15 22:53:46 2012 +0200 main: change exit value of --version from 1 to 0 @@ -2325,30 +3586,24 @@ M gnome-session/main.c commit b697d212887679142182ba47e950a9f8a9321458 -Author: Fran Diéguez -AuthorDate: Sat Dec 15 00:23:19 2012 +0100 -Commit: Fran Diéguez -CommitDate: Sat Dec 15 00:23:19 2012 +0100 +Author: Fran Diéguez +Date: Sat Dec 15 00:23:19 2012 +0100 Updated Galician translations M po/gl.po commit 37de4b359221d1e842aa5b3e75d0d2c818214c0f -Author: Nilamdyuti Goswami -AuthorDate: Fri Dec 14 20:07:04 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Fri Dec 14 20:07:20 2012 +0530 +Author: Nilamdyuti Goswami +Date: Fri Dec 14 20:07:04 2012 +0530 Assamese translation updated M po/as.po commit 7d0e8aed1590eaa8caa7666a388eadb8182ac244 -Author: Matthias Clasen -AuthorDate: Tue Dec 11 17:38:59 2012 -0500 -Commit: Matthias Clasen -CommitDate: Wed Dec 12 11:40:17 2012 -0500 +Author: Matthias Clasen +Date: Tue Dec 11 17:38:59 2012 -0500 Support automatic logout after a maximum period of idleness @@ -2374,10 +3629,8 @@ M gnome-session/main.c commit 04185c19ab0dd17eff0ae7e969a9e6d92ba8fee0 -Author: nick black -AuthorDate: Sat Nov 24 23:47:34 2012 -0500 -Commit: Colin Walters -CommitDate: Wed Dec 12 08:44:52 2012 -0500 +Author: nick black +Date: Sat Nov 24 23:47:34 2012 -0500 rename session-save to -quit in man page @@ -2386,10 +3639,8 @@ M doc/man/gnome-session-properties.1 commit 8b187ec5177647ee9b2a78af27e538b078941f8c -Author: Ray Strode -AuthorDate: Tue Dec 4 10:20:41 2012 -0500 -Commit: Ray Strode -CommitDate: Wed Dec 5 14:58:28 2012 -0500 +Author: Ray Strode +Date: Tue Dec 4 10:20:41 2012 -0500 manager: call complete_shutdown in better place @@ -2407,10 +3658,8 @@ M gnome-session/gsm-manager.c commit 962df1a1a0a582c4ab6caa6d84d218ac548fafca -Author: Ray Strode -AuthorDate: Wed Dec 5 10:50:40 2012 -0500 -Commit: Ray Strode -CommitDate: Wed Dec 5 14:58:28 2012 -0500 +Author: Ray Strode +Date: Wed Dec 5 10:50:40 2012 -0500 manager: when system prepared, start next phase, don't re-end current phase @@ -2426,30 +3675,24 @@ M gnome-session/gsm-manager.c commit 4075535c3a9e8b329119a954cb683cef5c3e495f -Author: Daniel Mustieles -AuthorDate: Wed Dec 5 20:08:45 2012 +0100 -Commit: Daniel Mustieles -CommitDate: Wed Dec 5 20:08:45 2012 +0100 +Author: Daniel Mustieles +Date: Wed Dec 5 20:08:45 2012 +0100 Updated Spanish translation M po/es.po commit 8a1d1d1579a8adc677f6d20f34e810f4e564a101 -Author: Fran Diéguez -AuthorDate: Tue Dec 4 13:15:12 2012 +0100 -Commit: Fran Diéguez -CommitDate: Tue Dec 4 13:15:12 2012 +0100 +Author: Fran Diéguez +Date: Tue Dec 4 13:15:12 2012 +0100 Updated Galician translations M po/gl.po -commit 6b62168488398baab871f59a40c004abf4e75e09 (688992) -Author: Ray Strode -AuthorDate: Fri Nov 30 16:09:26 2012 -0500 -Commit: Ray Strode -CommitDate: Mon Dec 3 12:36:05 2012 -0500 +commit 6b62168488398baab871f59a40c004abf4e75e09 +Author: Ray Strode +Date: Fri Nov 30 16:09:26 2012 -0500 main: disconnect shutdown_cb when manager is destroyed @@ -2467,10 +3710,8 @@ M gnome-session/main.c commit d1f88fbf42c315b73a69f16ed1c8285a06fb16c0 -Author: Jasper St. Pierre -AuthorDate: Fri Nov 30 17:55:12 2012 -0500 -Commit: Jasper St. Pierre -CommitDate: Fri Nov 30 17:55:12 2012 -0500 +Author: Jasper St. Pierre +Date: Fri Nov 30 17:55:12 2012 -0500 presence: Fix a typo @@ -2479,10 +3720,8 @@ M gnome-session/gsm-presence.c commit 2a4bf476dc08e5c434c1cd11907fc46e0bb82986 -Author: Jasper St. Pierre -AuthorDate: Fri Nov 30 17:47:34 2012 -0500 -Commit: Jasper St. Pierre -CommitDate: Fri Nov 30 17:48:06 2012 -0500 +Author: Jasper St. Pierre +Date: Fri Nov 30 17:47:34 2012 -0500 gsm-fail-whale: Stop a compiler warning @@ -2491,10 +3730,8 @@ M gnome-session/gsm-fail-whale.c commit 254a835317b7eb41e3af03d25d7e11a94969493a -Author: Jasper St. Pierre -AuthorDate: Fri Nov 30 17:27:13 2012 -0500 -Commit: Jasper St. Pierre -CommitDate: Fri Nov 30 17:48:06 2012 -0500 +Author: Jasper St. Pierre +Date: Fri Nov 30 17:27:13 2012 -0500 Don't add gnome-session-inhibit.1 to the repo @@ -2506,10 +3743,8 @@ D doc/man/gnome-session-inhibit.1 commit 92e0959782f048efc5a1fb8e9e049681cb984469 -Author: Jasper St. Pierre -AuthorDate: Mon Aug 20 00:13:45 2012 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Nov 30 17:18:33 2012 -0500 +Author: Jasper St. Pierre +Date: Mon Aug 20 00:13:45 2012 -0400 Fix issues with the GnomeIdleMonitor port @@ -2521,50 +3756,40 @@ M gnome-session/gsm-presence.c commit e89a1832de1743f582cc1ef3f816d28c3d45e99d -Author: Yaron Shahrabani -AuthorDate: Fri Nov 30 14:25:31 2012 +0200 -Commit: Yaron Shahrabani -CommitDate: Fri Nov 30 14:25:31 2012 +0200 +Author: Yaron Shahrabani +Date: Fri Nov 30 14:25:31 2012 +0200 Updated Hebrew translation. M po/he.po commit 97f2d5e8a7c4707a51be71f5e288ff4661d9e75d -Author: Shankar Prasad -AuthorDate: Fri Nov 30 17:52:45 2012 +0530 -Commit: Shankar Prasad -CommitDate: Fri Nov 30 17:52:45 2012 +0530 +Author: Shankar Prasad +Date: Fri Nov 30 17:52:45 2012 +0530 Updated kn translation M po/kn.po commit eaeb04bfb338050f492176f9e24644829d152ff7 -Author: ManojKumar Giri -AuthorDate: Wed Nov 28 20:45:16 2012 +0530 -Commit: ManojKumar Giri -CommitDate: Wed Nov 28 20:45:16 2012 +0530 +Author: ManojKumar Giri +Date: Wed Nov 28 20:45:16 2012 +0530 Updated Odia Translation with FUEL implementation. M po/or.po commit daa594a798031f7d23419635a0055e08ca87a935 -Author: Matej Urbančič -AuthorDate: Mon Nov 26 21:06:35 2012 +0100 -Commit: Matej Urbančič -CommitDate: Mon Nov 26 21:06:35 2012 +0100 +Author: Matej Urbančič +Date: Mon Nov 26 21:06:35 2012 +0100 Updated Slovenian translation M po/sl.po commit 1c84d28345289636aea23acaa24b0bd7660bbe09 -Author: Matthias Clasen -AuthorDate: Thu Nov 22 21:24:22 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 13:20:18 2012 -0500 +Author: Matthias Clasen +Date: Thu Nov 22 21:24:22 2012 -0500 Systemd: Handle polkit dialog at session end more gracefully @@ -2598,10 +3823,8 @@ M gnome-session/gsm-systemd.c commit 28dc2881afe0afdd0cdb3c34618c0593ed3ee47b -Author: Matthias Clasen -AuthorDate: Fri Nov 23 13:19:35 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 13:20:17 2012 -0500 +Author: Matthias Clasen +Date: Fri Nov 23 13:19:35 2012 -0500 Cosmetic change to debug output @@ -2610,20 +3833,16 @@ M gnome-session/gsm-manager.c commit 777be736ee6e2b76c96804088b15d2e0f962347a -Author: Nilamdyuti Goswami -AuthorDate: Fri Nov 23 16:58:41 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Fri Nov 23 16:58:41 2012 +0530 +Author: Nilamdyuti Goswami +Date: Fri Nov 23 16:58:41 2012 +0530 Assamese translation updated M po/as.po commit 8464c4af2264b36b75665b52507bcf50acfa56da -Author: Matthias Clasen -AuthorDate: Fri Nov 23 02:52:49 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 02:52:49 2012 -0500 +Author: Matthias Clasen +Date: Fri Nov 23 02:52:49 2012 -0500 Replace EggDesktopFile by GDesktopAppInfo in the inhibit dialog @@ -2636,10 +3855,8 @@ M gnome-session/gsm-inhibit-dialog.c commit 3a2d5fcad958be143b4189147d8cd3c6bad244ec -Author: Matthias Clasen -AuthorDate: Fri Nov 23 02:38:29 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 02:41:10 2012 -0500 +Author: Matthias Clasen +Date: Fri Nov 23 02:38:29 2012 -0500 Drop the fallback dialog @@ -2649,30 +3866,24 @@ M gnome-session/gsm-manager.c commit 1c798d913f900047f04a47827116938c8346b098 -Author: Matthias Clasen -AuthorDate: Fri Nov 23 02:40:52 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 02:41:10 2012 -0500 +Author: Matthias Clasen +Date: Fri Nov 23 02:40:52 2012 -0500 Drop an unnecessary include M gnome-session/gsm-client.c commit 7fb0e98606bdca0932b047f64ac4cedd6e1b763e -Author: Matthias Clasen -AuthorDate: Sun Nov 11 23:33:05 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 02:00:38 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 23:33:05 2012 -0500 Add some padding to the fallback inhibit dialog M data/gsm-inhibit-dialog.ui commit f2ae6ebe04f7fe89acbb76ff61acbb4ef0c5c5e2 -Author: Matthias Clasen -AuthorDate: Fri Nov 23 01:59:07 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:59:07 2012 -0500 +Author: Matthias Clasen +Date: Fri Nov 23 01:59:07 2012 -0500 Make the fail whale a separate program @@ -2688,10 +3899,8 @@ M gnome-session/main.c commit 9801185598cddbeafa2aefb04fcf0f722229c3bc -Author: Matthias Clasen -AuthorDate: Sun Nov 11 12:13:30 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:45:54 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 12:13:30 2012 -0500 Don't store the extensions object @@ -2701,10 +3910,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit e3e780642c4dff308b4162eecbd4442a26795539 -Author: Matthias Clasen -AuthorDate: Sun Nov 11 12:11:29 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:44:51 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 12:11:29 2012 -0500 Use gnome-session-quit to log out from the fail whale @@ -2713,10 +3920,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit e9579206afc73d74dcefd6d8f9b39e73ded9da4c -Author: Matthias Clasen -AuthorDate: Sun Nov 11 12:05:23 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:39:10 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 12:05:23 2012 -0500 Move gsm_util_get_computer_fail_icon_size where it is used @@ -2729,20 +3934,16 @@ M gnome-session/gsm-util.h commit 292475a0730d25e1ed6b1f5641900e95a95eab51 -Author: Matthias Clasen -AuthorDate: Sun Nov 11 12:01:01 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:34:35 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 12:01:01 2012 -0500 Use zenity for init errors M gnome-session/gsm-util.c commit 26f6ff837dc09aab9d9cf83881abde3fa57d3869 -Author: Matthias Clasen -AuthorDate: Sun Nov 11 18:09:26 2012 -0500 -Commit: Matthias Clasen -CommitDate: Fri Nov 23 01:31:46 2012 -0500 +Author: Matthias Clasen +Date: Sun Nov 11 18:09:26 2012 -0500 Don't initialize gtk in gnome-session-quit @@ -2751,10 +3952,8 @@ M tools/gnome-session-quit.c commit c10274e4d32a1d8c473f8f628eaebf8a7f02446d -Author: Bastien Nocera -AuthorDate: Wed Nov 21 22:32:19 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 21 23:26:19 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 21 22:32:19 2012 +0100 GsmPresence: Use GnomeIdleMonitor @@ -2772,10 +3971,8 @@ M gnome-session/gsm-presence.c commit 1f7e41421e40b020d2e01c9688b85a205cdf931f -Author: Colin Walters -AuthorDate: Wed Nov 21 09:19:13 2012 -0500 -Commit: Colin Walters -CommitDate: Wed Nov 21 17:08:02 2012 -0500 +Author: Colin Walters +Date: Wed Nov 21 09:19:13 2012 -0500 GsmPresence: Don't g_warning() when screensaver goes away @@ -2788,10 +3985,8 @@ M gnome-session/gsm-presence.c commit 854edad853880b285309259a79532bef5202514e -Author: Colin Walters -AuthorDate: Tue Nov 20 19:43:53 2012 -0500 -Commit: Colin Walters -CommitDate: Wed Nov 21 17:07:18 2012 -0500 +Author: Colin Walters +Date: Tue Nov 20 19:43:53 2012 -0500 main: Fix g_critical() on login @@ -2806,10 +4001,8 @@ M gnome-session/main.c commit a2ef87b3c5f88eb30c844eda5e2c9ba5841bd3a6 -Author: Colin Walters -AuthorDate: Tue Nov 20 18:20:55 2012 -0500 -Commit: Colin Walters -CommitDate: Tue Nov 20 18:46:16 2012 -0500 +Author: Colin Walters +Date: Tue Nov 20 18:20:55 2012 -0500 hardware-compatibility: Enable llvmpipe @@ -2821,30 +4014,24 @@ M data/hardware-compatibility commit 6df67d290f5f598697b06848044080c3e25c81b7 -Author: Daniel Mustieles -AuthorDate: Tue Nov 20 15:51:44 2012 +0100 -Commit: Daniel Mustieles -CommitDate: Tue Nov 20 15:51:44 2012 +0100 +Author: Daniel Mustieles +Date: Tue Nov 20 15:51:44 2012 +0100 Updated Spanish translation M po/es.po commit cd0002b9ebd4f430b226effe8b73fcd5e874f781 -Author: Matthias Clasen -AuthorDate: Mon Nov 19 21:46:12 2012 -0500 -Commit: Matthias Clasen -CommitDate: Mon Nov 19 21:46:12 2012 -0500 +Author: Matthias Clasen +Date: Mon Nov 19 21:46:12 2012 -0500 Post-release version bump M configure.ac -commit 8a6f00d6e5609ab4693c09bd3528673db95818d3 (tag: 3.7.2) -Author: Matthias Clasen -AuthorDate: Mon Nov 19 21:17:22 2012 -0500 -Commit: Matthias Clasen -CommitDate: Mon Nov 19 21:17:22 2012 -0500 +commit 8a6f00d6e5609ab4693c09bd3528673db95818d3 +Author: Matthias Clasen +Date: Mon Nov 19 21:17:22 2012 -0500 3.7.2 @@ -2852,10 +4039,8 @@ M configure.ac commit 2cc0b7023b78e3bd9e111c8b0a719c4d10dde5cf -Author: Colin Walters -AuthorDate: Tue Nov 13 13:05:55 2012 -0500 -Commit: Matthias Clasen -CommitDate: Mon Nov 19 20:49:37 2012 -0500 +Author: Colin Walters +Date: Tue Nov 13 13:05:55 2012 -0500 build: Add --disable-man option @@ -2874,20 +4059,16 @@ M doc/Makefile.am commit 121067a005a1bb65bdb86534274a8a8658d57f09 -Author: Matej Urbančič -AuthorDate: Thu Nov 15 13:13:21 2012 +0100 -Commit: Matej Urbančič -CommitDate: Thu Nov 15 13:13:21 2012 +0100 +Author: Matej Urbančič +Date: Thu Nov 15 13:13:21 2012 +0100 Updated Slovenian translation M po/sl.po commit 69ed18b716c73fef014086d86c038825d0724128 -Author: Bastien Nocera -AuthorDate: Tue Nov 13 16:16:38 2012 +0100 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Bastien Nocera +Date: Tue Nov 13 16:16:38 2012 +0100 gnome-session-check-accelerated: Simplify _has_extension() @@ -2896,10 +4077,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 313def1d1d20b684367c59d4b1f5b1b5ff1ea1c5 -Author: Adam Jackson -AuthorDate: Thu Aug 23 10:27:11 2012 -0400 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Adam Jackson +Date: Thu Aug 23 10:27:11 2012 -0400 gnome-session-check-accelerated: Set _GNOME_MAX_SCREEN_SIZE on the root window @@ -2912,10 +4091,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 63e765cf8da6fdfead08cd883ae903f13d8d1518 -Author: Bastien Nocera -AuthorDate: Tue Nov 13 14:48:04 2012 +0100 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Bastien Nocera +Date: Tue Nov 13 14:48:04 2012 +0100 gnome-session-check-accelerated: Use constant for specific sizes @@ -2924,10 +4101,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 97088bda14ca8f1c2fa52326e208593722931689 -Author: Bastien Nocera -AuthorDate: Tue Nov 13 14:43:11 2012 +0100 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Bastien Nocera +Date: Tue Nov 13 14:43:11 2012 +0100 gnome-session-check-accelerated: Better kcmdline parsing @@ -2936,10 +4111,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 269756ce8012a9d76e124f95b4e4dd7ff4ab5802 -Author: Bastien Nocera -AuthorDate: Tue Nov 13 14:40:24 2012 +0100 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Bastien Nocera +Date: Tue Nov 13 14:40:24 2012 +0100 gnome-session-check-accelerated: Use gbooleans for retval @@ -2951,10 +4124,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 0a8a017aecdc771fa6729b12bd2c3876cc8e6374 -Author: Bastien Nocera -AuthorDate: Tue Nov 13 14:15:55 2012 +0100 -Commit: Bastien Nocera -CommitDate: Tue Nov 13 18:29:43 2012 +0100 +Author: Bastien Nocera +Date: Tue Nov 13 14:15:55 2012 +0100 gnome-session-check-accelerated: Use glib @@ -2964,10 +4135,8 @@ M tools/gnome-session-check-accelerated-helper.c commit 59af0bd778e2a71b56d78f4b17517cbce16d2f74 -Author: Daniel Drake -AuthorDate: Mon Nov 12 15:29:13 2012 -0600 -Commit: Daniel Drake -CommitDate: Tue Nov 13 08:43:16 2012 -0600 +Author: Daniel Drake +Date: Mon Nov 12 15:29:13 2012 -0600 Reject new XSMP clients earlier in the shutdown path @@ -2986,10 +4155,8 @@ M gnome-session/main.c commit e7cbff3fb381c6d1666d148889a5e485d5e2e418 -Author: Martin Pitt -AuthorDate: Tue Nov 13 11:02:35 2012 +0100 -Commit: Martin Pitt -CommitDate: Tue Nov 13 11:07:18 2012 +0100 +Author: Martin Pitt +Date: Tue Nov 13 11:02:35 2012 +0100 GsmConsoleKit: Properly initialize upower client @@ -3005,10 +4172,8 @@ M gnome-session/gsm-consolekit.c commit 27ded0935c16ac7c5889eeda751345db4a12ce80 -Author: Colin Walters -AuthorDate: Wed Nov 7 07:27:22 2012 -0500 -Commit: Bastien Nocera -CommitDate: Mon Nov 12 09:25:05 2012 +0100 +Author: Colin Walters +Date: Wed Nov 7 07:27:22 2012 -0500 Add new SessionIsActive property @@ -3027,10 +4192,8 @@ M gnome-session/org.gnome.SessionManager.xml commit c95bb1335a8e6f56f85b3803b9d2427661c05639 -Author: Colin Walters -AuthorDate: Wed Nov 7 07:50:16 2012 -0500 -Commit: Bastien Nocera -CommitDate: Mon Nov 12 09:25:00 2012 +0100 +Author: Colin Walters +Date: Wed Nov 7 07:50:16 2012 -0500 GsmSystemd: use free() on string returned from libsystemd, not g_free() @@ -3043,70 +4206,56 @@ M gnome-session/gsm-systemd.c commit edec3fc90f6ea0ffdb685367def56c6be73c5284 -Author: Yaron Shahrabani -AuthorDate: Fri Nov 9 12:57:45 2012 +0200 -Commit: Yaron Shahrabani -CommitDate: Fri Nov 9 12:57:45 2012 +0200 +Author: Yaron Shahrabani +Date: Fri Nov 9 12:57:45 2012 +0200 Updated Hebrew translation. M po/he.po commit 24bf7b626638c4d472a59a4221b5a47475eee7e4 -Author: Matej Urbančič -AuthorDate: Thu Nov 8 21:37:30 2012 +0100 -Commit: Matej Urbančič -CommitDate: Thu Nov 8 21:37:30 2012 +0100 +Author: Matej Urbančič +Date: Thu Nov 8 21:37:30 2012 +0100 Updated Slovenian translation M po/sl.po commit 35f66f19c3b228922de44f1cc7953deb7ad69141 -Author: Piotr Drąg -AuthorDate: Wed Nov 7 21:01:13 2012 +0100 -Commit: Piotr Drąg -CommitDate: Wed Nov 7 21:01:13 2012 +0100 +Author: Piotr Drąg +Date: Wed Nov 7 21:01:13 2012 +0100 Updated POTFILES.in M po/POTFILES.in commit f9ee9c6f4fa9bc749765eb06e41a13d08645e627 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 14:13:27 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 14:13:27 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 14:13:27 2012 +0100 tools: Exit when gnome-session isn't available M tools/gnome-session-inhibit.c commit 7b191be59cd66b958ff3137c1020c066223cd489 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 13:44:33 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 14:11:01 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 13:44:33 2012 +0100 man: Update inhibit tool man page M doc/man/gnome-session-inhibit.1 commit c933724a6d7791bad4022f26a68259d747d8a14a -Author: Bastien Nocera -AuthorDate: Wed Nov 7 13:44:13 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 14:11:01 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 13:44:13 2012 +0100 man: Add rule to re-generate inhibit tool man page M doc/man/Makefile.am commit f48f42429302c1f4702dec33d2f30bd9a3310059 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 13:38:29 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 14:11:01 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 13:38:29 2012 +0100 tools: Add an inhibit-only mode @@ -3120,20 +4269,16 @@ M tools/gnome-session-inhibit.c commit 579be2bd15d512d70b675c563cf60bd0ee998c88 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 13:15:06 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 14:11:01 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 13:15:06 2012 +0100 tools: Split off waiting for the launched application M tools/gnome-session-inhibit.c commit 0f86191608e8be52accf506cc4e5ae0366faae72 -Author: Colin Walters -AuthorDate: Wed Nov 7 07:06:03 2012 -0500 -Commit: Colin Walters -CommitDate: Wed Nov 7 07:19:10 2012 -0500 +Author: Colin Walters +Date: Wed Nov 7 07:06:03 2012 -0500 Fix some compiler warnings @@ -3146,30 +4291,24 @@ M gnome-session/main.c commit 3b4b5c3c8aa96344b54e7a62157345ec220a576a -Author: Bastien Nocera -AuthorDate: Wed Nov 7 13:00:08 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 13:00:08 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 13:00:08 2012 +0100 tools: Fix build with srcdir != builddir M tools/Makefile.am commit a2636d3fafc737679f485fd03d89261d46563010 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 12:50:41 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 12:50:41 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 12:50:41 2012 +0100 tools: Use new inhibitor flags header M tools/gnome-session-inhibit.c commit f6a9ab48d29a99a1d696035a085ed8a19c33bbb8 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 12:50:12 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 12:50:12 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 12:50:12 2012 +0100 tools: Fix inhibit tool build @@ -3182,10 +4321,8 @@ M tools/gnome-session-inhibit.c commit 48fd7e6c0cea668c4378af869cfca1cee71afaf3 -Author: Bastien Nocera -AuthorDate: Wed Nov 7 12:45:01 2012 +0100 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 12:45:01 2012 +0100 +Author: Bastien Nocera +Date: Wed Nov 7 12:45:01 2012 +0100 Move inhibitor flags to a separate file @@ -3194,10 +4331,8 @@ M gnome-session/gsm-inhibitor.h commit a696ccb00acf6bdcd168c23db2cc4e33bb1455e0 -Author: Bastien Nocera -AuthorDate: Wed Oct 10 11:03:04 2012 +0200 -Commit: Bastien Nocera -CommitDate: Wed Nov 7 12:41:13 2012 +0100 +Author: Bastien Nocera +Date: Wed Oct 10 11:03:04 2012 +0200 Export locale categories through D-Bus @@ -3211,10 +4346,8 @@ M gnome-session/org.gnome.SessionManager.xml commit fcdbf2b36b184f10239ac7a81cb3c88b4c5ed477 -Author: Matthias Clasen -AuthorDate: Sat Nov 3 01:51:14 2012 -0400 -Commit: Matthias Clasen -CommitDate: Wed Nov 7 06:09:36 2012 -0500 +Author: Matthias Clasen +Date: Sat Nov 3 01:51:14 2012 -0400 Add a commandline wrapper to inhibit idle @@ -3228,10 +4361,8 @@ A tools/gnome-session-inhibit.c commit f293022393b559bb3e79eb0e2a7102cd5ef14149 -Author: Ray Strode -AuthorDate: Tue Nov 6 16:37:53 2012 -0500 -Commit: Ray Strode -CommitDate: Tue Nov 6 16:37:53 2012 -0500 +Author: Ray Strode +Date: Tue Nov 6 16:37:53 2012 -0500 doap: add walters @@ -3240,10 +4371,8 @@ M gnome-session.doap commit 5aff5ed2e24146f16c6eabbd4f39e9c9fc28dbb9 -Author: Ray Strode -AuthorDate: Tue Nov 6 15:46:42 2012 -0500 -Commit: Ray Strode -CommitDate: Tue Nov 6 15:49:14 2012 -0500 +Author: Ray Strode +Date: Tue Nov 6 15:46:42 2012 -0500 main: initialize gsm-system before acquring name @@ -3260,10 +4389,8 @@ M gnome-session/main.c commit 06c70656beb3fff1b3067f53e3ec5f23871d94b8 -Author: Colin Walters -AuthorDate: Thu Oct 25 18:42:40 2012 -0400 -Commit: Colin Walters -CommitDate: Sun Oct 28 17:53:25 2012 -0400 +Author: Colin Walters +Date: Thu Oct 25 18:42:40 2012 -0400 Drop gsm-marshal.list, use g_cclosure_marshal_generic @@ -3285,10 +4412,8 @@ M gnome-session/gsm-xsmp-client.c commit 655d9bdb797a518ae4fe78ac3a427d2e8b5a2fe5 -Author: Colin Walters -AuthorDate: Thu Oct 25 02:12:32 2012 -0400 -Commit: Colin Walters -CommitDate: Sun Oct 28 17:53:25 2012 -0400 +Author: Colin Walters +Date: Thu Oct 25 02:12:32 2012 -0400 Use g_clear_object/g_clear_pointer @@ -3308,10 +4433,8 @@ M tools/gnome-session-quit.c commit 76c7543dec2d8f4eefc6b8732c4e1d34fc39c4e0 -Author: Colin Walters -AuthorDate: Thu Oct 25 01:47:15 2012 -0400 -Commit: Colin Walters -CommitDate: Sun Oct 28 17:53:25 2012 -0400 +Author: Colin Walters +Date: Thu Oct 25 01:47:15 2012 -0400 Use g_unix_signal_add() instead of GdmSignalHandler @@ -3326,10 +4449,8 @@ M gnome-session/main.c commit 436bb1525f8f067359584e7412fb1f1b916277ed -Author: Colin Walters -AuthorDate: Thu Oct 25 18:35:56 2012 -0400 -Commit: Colin Walters -CommitDate: Sun Oct 28 17:53:25 2012 -0400 +Author: Colin Walters +Date: Thu Oct 25 18:35:56 2012 -0400 build: Require the latest GLib @@ -3341,30 +4462,24 @@ M gnome-session/test-client-dbus.c commit 8b7d76de1797ebba7dd4eaa26e73ab330e3d607f -Author: Dušan Kazik -AuthorDate: Tue Oct 23 20:45:46 2012 +0200 -Commit: Peter Mráz -CommitDate: Tue Oct 23 20:45:46 2012 +0200 +Author: Dušan Kazik +Date: Tue Oct 23 20:45:46 2012 +0200 Updated slovak translation M po/sk.po commit da2dbf76816e37fb7b3c15dc3d5990c920601949 -Author: Tom Tryfonidis -AuthorDate: Tue Oct 23 17:28:26 2012 +0300 -Commit: Tom Tryfonidis -CommitDate: Tue Oct 23 17:28:26 2012 +0300 +Author: Tom Tryfonidis +Date: Tue Oct 23 17:28:26 2012 +0300 Updated Greek translation M po/el.po commit c1d0790459b8d277fbde135b1653df84b79d5f22 -Author: Matthias Clasen -AuthorDate: Mon Oct 22 21:06:24 2012 -0400 -Commit: Matthias Clasen -CommitDate: Mon Oct 22 21:06:24 2012 -0400 +Author: Matthias Clasen +Date: Mon Oct 22 21:06:24 2012 -0400 systemd: Drop system inhibitor when necessary @@ -3376,31 +4491,25 @@ M gnome-session/gsm-systemd.c -commit 82a48adf63f48f37dbc25a6d4b063c4ef2f5cc8a (tag: 3.7.1) -Author: Ray Strode -AuthorDate: Mon Oct 22 14:07:49 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Oct 22 14:07:49 2012 -0400 +commit 82a48adf63f48f37dbc25a6d4b063c4ef2f5cc8a +Author: Ray Strode +Date: Mon Oct 22 14:07:49 2012 -0400 configure: bump to 3.7.1 M configure.ac commit 80595161deae1ce4f7d64ed210ba017c39593bef -Author: Ray Strode -AuthorDate: Mon Oct 22 14:04:57 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Oct 22 14:04:57 2012 -0400 +Author: Ray Strode +Date: Mon Oct 22 14:04:57 2012 -0400 NEWS: update for release M NEWS commit 10beb9d7603e4c9c2baef17def5bc610c42f19e2 -Author: Tim Lunn -AuthorDate: Fri Oct 19 09:51:23 2012 +1100 -Commit: Ray Strode -CommitDate: Mon Oct 22 11:19:04 2012 -0400 +Author: Tim Lunn +Date: Fri Oct 19 09:51:23 2012 +1100 Add gnome-screensaver to the fallback session @@ -3409,10 +4518,8 @@ M data/gnome-fallback.session.desktop.in.in commit 17823d20a83d960f1f3cc113cfcf31b78229bef7 -Author: Matthias Clasen -AuthorDate: Mon Oct 22 10:24:00 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Oct 22 10:25:24 2012 -0400 +Author: Matthias Clasen +Date: Mon Oct 22 10:24:00 2012 -0400 dbus: Add SessionName property to introspection @@ -3424,30 +4531,24 @@ M gnome-session/org.gnome.SessionManager.xml commit 6b11232fcc759786d04cf8a702bead3f54877342 -Author: Ray Strode -AuthorDate: Tue Sep 25 13:43:59 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Oct 15 21:02:28 2012 -0400 +Author: Ray Strode +Date: Tue Sep 25 13:43:59 2012 -0400 configure: bump to 3.6.0 M configure.ac commit 2f976d593444e448438d0a55d663d837088cdb93 -Author: Ray Strode -AuthorDate: Tue Sep 25 13:43:43 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Oct 15 21:02:28 2012 -0400 +Author: Ray Strode +Date: Tue Sep 25 13:43:43 2012 -0400 NEWS: update for release M NEWS commit e2e38fc7902d1fe3d12053b446770f917c833b69 -Author: Jürg Billeter -AuthorDate: Mon Sep 10 20:10:17 2012 +0200 -Commit: Jürg Billeter -CommitDate: Mon Oct 15 23:28:35 2012 +0200 +Author: Jürg Billeter +Date: Mon Sep 10 20:10:17 2012 +0200 gnome-session-check-accelerated: Support zaphod mode @@ -3458,20 +4559,16 @@ M tools/gnome-session-check-accelerated-helper.c commit 49d0ff885589380eb9ee300a8d377b7e597f8886 -Author: Shankar Prasad -AuthorDate: Sun Oct 14 23:23:03 2012 +0530 -Commit: Shankar Prasad -CommitDate: Sun Oct 14 23:23:03 2012 +0530 +Author: Shankar Prasad +Date: Sun Oct 14 23:23:03 2012 +0530 Updated Kannada Translations M po/kn.po commit c3e7297112bef0bfc5a241329b24c49289061bf6 -Author: Khoem Sokhem -AuthorDate: Wed Oct 3 17:36:31 2012 +0200 -Commit: Gil Forcada -CommitDate: Wed Oct 3 17:36:31 2012 +0200 +Author: Khoem Sokhem +Date: Wed Oct 3 17:36:31 2012 +0200 [l10n] Added Khmer translation @@ -3479,10 +4576,8 @@ A po/km.po commit 765827a72d276622fb41ce053582c730c71c48b4 -Author: Antoine Jacoutot -AuthorDate: Sun Sep 30 17:53:02 2012 +0200 -Commit: Antoine Jacoutot -CommitDate: Sun Sep 30 18:53:52 2012 +0200 +Author: Antoine Jacoutot +Date: Sun Sep 30 17:53:02 2012 +0200 rename some generic names to prevent redeclaration on some OS @@ -3491,10 +4586,8 @@ M tools/gnome-session-quit.c commit c8253d1094b5ede0b3f23a59b3567193c7039341 -Author: Ray Strode -AuthorDate: Fri Sep 21 16:51:22 2012 -0400 -Commit: Matthias Clasen -CommitDate: Sat Sep 29 17:47:34 2012 -0400 +Author: Ray Strode +Date: Fri Sep 21 16:51:22 2012 -0400 systemd: check for greeter by looking at class not service @@ -3510,30 +4603,24 @@ M gnome-session/gsm-systemd.c commit e3bfe89b46bc004cf830996ed1cbaae1cf6b0b61 -Author: Carles Ferrando -AuthorDate: Wed Sep 26 01:30:19 2012 +0200 -Commit: Gil Forcada -CommitDate: Wed Sep 26 01:30:19 2012 +0200 +Author: Carles Ferrando +Date: Wed Sep 26 01:30:19 2012 +0200 [l10n] Updated Catalan (Valencian) translation M po/ca@valencia.po commit cdaacc8c6863bfe592f55306be5819cf8749a1a0 -Author: Gil Forcada -AuthorDate: Wed Sep 26 01:30:06 2012 +0200 -Commit: Gil Forcada -CommitDate: Wed Sep 26 01:30:16 2012 +0200 +Author: Gil Forcada +Date: Wed Sep 26 01:30:06 2012 +0200 [l10n] Updated Catalan translation M po/ca.po commit 17b0b11985e9cc4c0023ddab75966a7ba516c4bb -Author: Matthias Clasen -AuthorDate: Sat Sep 22 11:59:27 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Sep 24 14:11:35 2012 -0400 +Author: Matthias Clasen +Date: Sat Sep 22 11:59:27 2012 -0400 Make autostart overriding more flexible @@ -3561,450 +4648,360 @@ M gnome-session/main.c commit e4847ac28409404502360319a9833f1c1d7c1078 -Author: Petr Kovar -AuthorDate: Mon Sep 24 17:41:29 2012 +0200 -Commit: Petr Kovar -CommitDate: Mon Sep 24 17:41:29 2012 +0200 +Author: Petr Kovar +Date: Mon Sep 24 17:41:29 2012 +0200 Fix Czech translation M po/cs.po commit dcf737b910bdefd5f35ba07af5652ac93708f2c6 -Author: Petr Kovar -AuthorDate: Mon Sep 24 17:39:49 2012 +0200 -Commit: Petr Kovar -CommitDate: Mon Sep 24 17:39:49 2012 +0200 +Author: Petr Kovar +Date: Mon Sep 24 17:39:49 2012 +0200 Update Czech translation M po/cs.po commit 099c8004dc244b4ab04f43e768f1f24a103cd97d -Author: Mattias Põldaru -AuthorDate: Mon Sep 24 10:46:02 2012 +0300 -Commit: Priit Laes -CommitDate: Mon Sep 24 10:46:02 2012 +0300 +Author: Mattias Põldaru +Date: Mon Sep 24 10:46:02 2012 +0300 [l10n] Updated Estonian translation M po/et.po commit f7108eaa7ddcdea333d6b103e0e3f4eddad4f1df -Author: Rūdolfs Mazurs -AuthorDate: Mon Sep 24 01:51:44 2012 +0300 -Commit: Rūdolfs Mazurs -CommitDate: Mon Sep 24 01:51:44 2012 +0300 +Author: Rūdolfs Mazurs +Date: Mon Sep 24 01:51:44 2012 +0300 Updated Latvian translation M po/lv.po commit 832e12299f8de8ba8720fef9edb0dc4bc14c4a92 -Author: Rajesh Ranjan -AuthorDate: Sun Sep 23 20:53:17 2012 +0530 -Commit: Rajesh Ranjan -CommitDate: Sun Sep 23 20:53:17 2012 +0530 +Author: Rajesh Ranjan +Date: Sun Sep 23 20:53:17 2012 +0530 hindi update M po/hi.po commit 4ed4a391d1ded9c3668f3dfd0b015954146662cc -Author: tuhaihe -AuthorDate: Sun Sep 23 02:12:39 2012 +0800 -Commit: YunQiang Su -CommitDate: Sun Sep 23 02:12:39 2012 +0800 +Author: tuhaihe +Date: Sun Sep 23 02:12:39 2012 +0800 update Simplified Chinese (zh_CN) translation M po/zh_CN.po commit e977f1adddd557973a06b57cd229371549bfe868 -Author: Runa Bhattacharjee -AuthorDate: Fri Sep 21 15:18:54 2012 +0530 -Commit: Runa Bhattacharjee -CommitDate: Fri Sep 21 15:18:54 2012 +0530 +Author: Runa Bhattacharjee +Date: Fri Sep 21 15:18:54 2012 +0530 Updated Bengali India Translation M po/bn_IN.po commit 68b36a3407bcddb24f535ab2f7b172df1affc981 -Author: Rajesh Ranjan -AuthorDate: Fri Sep 21 13:52:59 2012 +0530 -Commit: Rajesh Ranjan -CommitDate: Fri Sep 21 13:52:59 2012 +0530 +Author: Rajesh Ranjan +Date: Fri Sep 21 13:52:59 2012 +0530 hindi update M po/hi.po commit fffd01c1e4790174784009adb03eef3edc8c5106 -Author: Daniel Korostil -AuthorDate: Fri Sep 21 10:16:55 2012 +0300 -Commit: Daniel Korostil -CommitDate: Fri Sep 21 10:16:55 2012 +0300 +Author: Daniel Korostil +Date: Fri Sep 21 10:16:55 2012 +0300 Uploaded Ukranian M po/uk.po commit 97e3c1a0a72bbc6a85b8e0ab38a81e1a367876e6 -Author: Daniel Korostil -AuthorDate: Fri Sep 21 10:13:15 2012 +0300 -Commit: Daniel Korostil -CommitDate: Fri Sep 21 10:13:15 2012 +0300 +Author: Daniel Korostil +Date: Fri Sep 21 10:13:15 2012 +0300 Uploaded Ukranian M po/uk.po commit 6def5f741d174d4a22d8cac109f12565e38856ad -Author: Noriko Mizumoto -AuthorDate: Thu Sep 20 14:47:39 2012 +0900 -Commit: Jiro Matsuzawa -CommitDate: Thu Sep 20 14:47:39 2012 +0900 +Author: Noriko Mizumoto +Date: Thu Sep 20 14:47:39 2012 +0900 [l10n] Update Japanese translation M po/ja.po commit 21ecb0a25ce21c9bf4df7b4f9cde8f876624fba0 -Author: Alexander Shopov -AuthorDate: Thu Sep 20 05:56:31 2012 +0300 -Commit: Alexander Shopov -CommitDate: Thu Sep 20 05:56:31 2012 +0300 +Author: Alexander Shopov +Date: Thu Sep 20 05:56:31 2012 +0300 Updated Bulgarian translation M po/bg.po commit 699d68b29775fa50576180cc2dea9619b5549167 -Author: Ani Peter -AuthorDate: Tue Sep 18 21:14:10 2012 +0530 -Commit: Ani Peter -CommitDate: Tue Sep 18 21:14:10 2012 +0530 +Author: Ani Peter +Date: Tue Sep 18 21:14:10 2012 +0530 Updated Malayalam file M po/ml.po commit 0a577cfc61a97999c5e6d632d676eae0ec4127ad -Author: Ask H. Larsen -AuthorDate: Sun Sep 16 13:29:06 2012 +0200 -Commit: Kenneth Nielsen -CommitDate: Sun Sep 16 13:29:06 2012 +0200 +Author: Ask H. Larsen +Date: Sun Sep 16 13:29:06 2012 +0200 Updated Danish translation M po/da.po commit 0aeec2a0019f880172dbca69d5b40805ee5c48f8 -Author: Changwoo Ryu -AuthorDate: Sat Sep 15 17:18:27 2012 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Sep 15 17:18:27 2012 +0900 +Author: Changwoo Ryu +Date: Sat Sep 15 17:18:27 2012 +0900 Updated Korean translation M po/ko.po commit 2eb8c15200986f0d00e4268cba8b11ced73d48a7 -Author: Timo Jyrinki -AuthorDate: Wed Sep 12 18:49:43 2012 +0300 -Commit: Timo Jyrinki -CommitDate: Wed Sep 12 18:49:43 2012 +0300 +Author: Timo Jyrinki +Date: Wed Sep 12 18:49:43 2012 +0300 Finnish translation update by Jiri Grönroos M po/fi.po commit 8fb39e7a5e1dccea3019b2fb5d6adab8987e6bdd -Author: Ibrahim Saed -AuthorDate: Wed Sep 12 14:50:16 2012 +0100 -Commit: Abderrahim Kitouni -CommitDate: Wed Sep 12 14:50:16 2012 +0100 +Author: Ibrahim Saed +Date: Wed Sep 12 14:50:16 2012 +0100 Updated Arabic translation M po/ar.po commit 59bbf4c24e69da7e51abe6e72189dcbe21bbec92 -Author: Ihar Hrachyshka -AuthorDate: Fri Sep 7 18:03:33 2012 +0300 -Commit: Ihar Hrachyshka -CommitDate: Fri Sep 7 18:03:33 2012 +0300 +Author: Ihar Hrachyshka +Date: Fri Sep 7 18:03:33 2012 +0300 Updated Belarusian translation. M po/be.po commit 078588b53387fc65819d2b90145a0acab4b45274 -Author: Arash Mousavi -AuthorDate: Thu Sep 6 21:13:28 2012 +0430 -Commit: Arash Mousavi -CommitDate: Thu Sep 6 21:13:28 2012 +0430 +Author: Arash Mousavi +Date: Thu Sep 6 21:13:28 2012 +0430 l10n: Updated Persian translation M po/fa.po commit ce5a198b9c7df520bfbc043dfa9270310be482c3 -Author: Theppitak Karoonboonyanan -AuthorDate: Thu Sep 6 20:18:34 2012 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Thu Sep 6 20:18:34 2012 +0700 +Author: Theppitak Karoonboonyanan +Date: Thu Sep 6 20:18:34 2012 +0700 Updated Thai translation. M po/th.po -commit d65f83654bb917a67d6080572903f339db9d106e (tag: 3.5.91) -Author: Ray Strode -AuthorDate: Wed Sep 5 15:07:45 2012 -0400 -Commit: Ray Strode -CommitDate: Wed Sep 5 15:07:45 2012 -0400 +commit d65f83654bb917a67d6080572903f339db9d106e +Author: Ray Strode +Date: Wed Sep 5 15:07:45 2012 -0400 configure: bump to 3.5.91 M configure.ac commit 04977ba275e1416bd06151ad945bc82e3d99faef -Author: Ray Strode -AuthorDate: Wed Sep 5 15:07:14 2012 -0400 -Commit: Ray Strode -CommitDate: Wed Sep 5 15:07:28 2012 -0400 +Author: Ray Strode +Date: Wed Sep 5 15:07:14 2012 -0400 NEWS: update for release M NEWS commit cd1a537e091e0df3d0a2f1a3783906df28f11622 -Author: Dirgita -AuthorDate: Thu Sep 6 01:53:32 2012 +0700 -Commit: Andika Triwidada -CommitDate: Thu Sep 6 01:53:32 2012 +0700 +Author: Dirgita +Date: Thu Sep 6 01:53:32 2012 +0700 Updated Indonesian translation M po/id.po commit b0756cb3ff03df3e3e1c4c6db737bc0a01de65de -Author: Bruce Cowan -AuthorDate: Wed Sep 5 19:34:32 2012 +0100 -Commit: Bruce Cowan -CommitDate: Wed Sep 5 19:34:32 2012 +0100 +Author: Bruce Cowan +Date: Wed Sep 5 19:34:32 2012 +0100 Updated British English translation M po/en_GB.po commit 5f926677209379a65188b65fad4d85b02c501821 -Author: Claude Paroz -AuthorDate: Wed Sep 5 09:06:04 2012 +0200 -Commit: Claude Paroz -CommitDate: Wed Sep 5 09:06:04 2012 +0200 +Author: Claude Paroz +Date: Wed Sep 5 09:06:04 2012 +0200 Updated French translation M po/fr.po commit 384beeaaa6b13c0c7a3516d01e6a892a13556904 -Author: Gabor Kelemen -AuthorDate: Tue Sep 4 15:39:02 2012 +0200 -Commit: Gabor Kelemen -CommitDate: Tue Sep 4 15:39:02 2012 +0200 +Author: Gabor Kelemen +Date: Tue Sep 4 15:39:02 2012 +0200 Updated Hungarian translation M po/hu.po commit ad9b0d7c18f4dca08c84e0463c8a3bcc0f44a32f -Author: Fábio Nogueira -AuthorDate: Tue Sep 4 08:53:21 2012 -0400 -Commit: Og B. Maciel -CommitDate: Tue Sep 4 08:53:21 2012 -0400 +Author: Fábio Nogueira +Date: Tue Sep 4 08:53:21 2012 -0400 Updated Brazilian Portuguese translation. M po/pt_BR.po commit 31f823850f63df1b16b3308f15871902ca2658bd -Author: Muhammet Kara -AuthorDate: Tue Sep 4 06:42:51 2012 +0300 -Commit: Muhammet Kara -CommitDate: Tue Sep 4 06:42:51 2012 +0300 +Author: Muhammet Kara +Date: Tue Sep 4 06:42:51 2012 +0300 [l10n]Updated Turkish translation M po/tr.po commit ea9b677b200c5da4b454df2ffc27b910aa7f1f2e -Author: Piotr Drąg -AuthorDate: Tue Sep 4 00:14:45 2012 +0200 -Commit: Piotr Drąg -CommitDate: Tue Sep 4 00:14:45 2012 +0200 +Author: Piotr Drąg +Date: Tue Sep 4 00:14:45 2012 +0200 Updated Polish translation M po/pl.po commit ff4fd8b87201497516cc392edd483a6889dfb966 -Author: Luca Ferretti -AuthorDate: Sun Sep 2 22:41:28 2012 +0200 -Commit: Luca Ferretti -CommitDate: Sun Sep 2 22:41:28 2012 +0200 +Author: Luca Ferretti +Date: Sun Sep 2 22:41:28 2012 +0200 Updated Italian translation M po/it.po commit 9974d55ced19a5a554a0c4712cacb367b5b12041 -Author: Daniel Nylander -AuthorDate: Sun Sep 2 20:54:05 2012 +0200 -Commit: Daniel Nylander -CommitDate: Sun Sep 2 20:54:05 2012 +0200 +Author: Daniel Nylander +Date: Sun Sep 2 20:54:05 2012 +0200 Updated Swedish translation M po/sv.po commit 412792b527dc76d6c5f121b0095f5b390194bc58 -Author: Dr.T.Vasudevan -AuthorDate: Sun Sep 2 17:06:34 2012 +0530 -Commit: Dr.T.Vasudevan -CommitDate: Sun Sep 2 17:06:34 2012 +0530 +Author: Dr.T.Vasudevan +Date: Sun Sep 2 17:06:34 2012 +0530 updated Tamil translation M po/ta.po commit a0ae37101c7547a2db865db826fd5e3994634ae9 -Author: Duarte Loreto -AuthorDate: Sat Sep 1 01:31:07 2012 +0100 -Commit: Duarte Loreto -CommitDate: Sat Sep 1 01:31:07 2012 +0100 +Author: Duarte Loreto +Date: Sat Sep 1 01:31:07 2012 +0100 Updated Portuguese translation M po/pt.po commit b83bedbcdad2800297e4816bb822d4c858fed77f -Author: Aurimas Černius -AuthorDate: Wed Aug 29 23:32:13 2012 +0300 -Commit: Aurimas Černius -CommitDate: Wed Aug 29 23:32:13 2012 +0300 +Author: Aurimas Černius +Date: Wed Aug 29 23:32:13 2012 +0300 Updated Lithuanian translation M po/lt.po commit 55732d72f4a723dd2d35d92438a4f44a285bccc7 -Author: Nilamdyuti Goswami -AuthorDate: Tue Aug 28 00:15:37 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Tue Aug 28 00:16:03 2012 +0530 +Author: Nilamdyuti Goswami +Date: Tue Aug 28 00:15:37 2012 +0530 Implemented FUEL entries to Assamese translation M po/as.po commit 0e4680298326950b446b22425631988e687055f2 -Author: Tobias Endrigkeit -AuthorDate: Thu Aug 23 19:32:04 2012 +0200 -Commit: Christian Kirbach -CommitDate: Thu Aug 23 19:32:04 2012 +0200 +Author: Tobias Endrigkeit +Date: Thu Aug 23 19:32:04 2012 +0200 Updated German translation M po/de.po commit b4d262e9fceafd189d97e42634c6943e43a81243 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Thu Aug 23 13:07:25 2012 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Thu Aug 23 13:07:25 2012 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Thu Aug 23 13:07:25 2012 +0700 Updated Vietnamese translation M po/vi.po commit 87149e10edc25dc4485a0143d71bae175e9e7cb9 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Thu Aug 23 13:05:21 2012 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Thu Aug 23 13:05:21 2012 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Thu Aug 23 13:05:21 2012 +0700 po/vi: imported from Damned Lies M po/vi.po commit 94e1a04e24e6dff117d8c1d8666f18502e16d754 -Author: Piotr Drąg -AuthorDate: Thu Aug 23 03:40:31 2012 +0200 -Commit: Piotr Drąg -CommitDate: Thu Aug 23 03:40:31 2012 +0200 +Author: Piotr Drąg +Date: Thu Aug 23 03:40:31 2012 +0200 Updated Polish translation M po/pl.po commit b89260cb9c2717fe7a91587155cfdee2a34b12cf -Author: A S Alam -AuthorDate: Wed Aug 22 08:52:01 2012 +0530 -Commit: A S Alam -CommitDate: Wed Aug 22 08:52:01 2012 +0530 +Author: A S Alam +Date: Wed Aug 22 08:52:01 2012 +0530 update Punjabi Translation M po/pa.po commit dfd0f98ffdc596d3e9f647e58a7e2ee5e39fce5c -Author: Fran Diéguez -AuthorDate: Fri Aug 17 23:29:43 2012 +0200 -Commit: Fran Diéguez -CommitDate: Fri Aug 17 23:29:43 2012 +0200 +Author: Fran Diéguez +Date: Fri Aug 17 23:29:43 2012 +0200 Updated Galician translations M po/gl.po commit ba3c50bd1807f146482431e290187d40745e18ef -Author: Sandeep Sheshrao Shedmake -AuthorDate: Thu Aug 16 12:39:35 2012 +0530 -Commit: Sandeep Sheshrao Shedmake -CommitDate: Thu Aug 16 12:39:35 2012 +0530 +Author: Sandeep Sheshrao Shedmake +Date: Thu Aug 16 12:39:35 2012 +0530 Updated Marathi Translations M po/mr.po -commit 363ed60a71229ec1183cd89024ee3ade536ceef0 (tag: 3.5.5) -Author: Ray Strode -AuthorDate: Mon Aug 6 17:36:14 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Aug 6 17:46:10 2012 -0400 +commit 363ed60a71229ec1183cd89024ee3ade536ceef0 +Author: Ray Strode +Date: Mon Aug 6 17:36:14 2012 -0400 configure: bump to 3.5.5 M configure.ac commit da62e812d0b1aa105129f3ea95204363562cc5a8 -Author: Ray Strode -AuthorDate: Mon Aug 6 17:37:49 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Aug 6 17:46:10 2012 -0400 +Author: Ray Strode +Date: Mon Aug 6 17:37:49 2012 -0400 NEWS: update for release M NEWS commit 8baf35dcf989da7faa0dda48e0bbc5aa65ce4f07 -Author: Marc-Antoine Perennou -AuthorDate: Tue Jun 19 12:11:37 2012 +0200 -Commit: Ray Strode -CommitDate: Mon Aug 6 16:43:23 2012 -0400 +Author: Marc-Antoine Perennou +Date: Tue Jun 19 12:11:37 2012 +0200 make gconf support optional @@ -4016,80 +5013,64 @@ M gnome-session/gsm-autostart-app.c commit 2c62fe1966a4f6e7b0f34e82b69792a2f7aa62d9 -Author: Nilamdyuti Goswami -AuthorDate: Fri Aug 3 15:14:55 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Fri Aug 3 15:15:37 2012 +0530 +Author: Nilamdyuti Goswami +Date: Fri Aug 3 15:14:55 2012 +0530 Assamese translation updated M po/as.po commit 4516732c856dc26e86957627693bd8810712cb69 -Author: Aleksej Kabanov -AuthorDate: Thu Aug 2 00:02:13 2012 +0400 -Commit: Yuri Myasoedov -CommitDate: Thu Aug 2 00:02:13 2012 +0400 +Author: Aleksej Kabanov +Date: Thu Aug 2 00:02:13 2012 +0400 Updated Russian translation M po/ru.po commit 2925af8bdadda965ba964eb45c367e43e35fe11e -Author: Sweta Kothari -AuthorDate: Mon Jul 30 12:28:13 2012 +0530 -Commit: Sweta Kothari -CommitDate: Mon Jul 30 12:28:13 2012 +0530 +Author: Sweta Kothari +Date: Mon Jul 30 12:28:13 2012 +0530 Updated gujarati file M po/gu.po commit 680d6b83ef0aa7f4224d57178d5041742c7ceed0 -Author: Fran Diéguez -AuthorDate: Mon Jul 30 03:22:19 2012 +0200 -Commit: Fran Diéguez -CommitDate: Mon Jul 30 03:22:19 2012 +0200 +Author: Fran Diéguez +Date: Mon Jul 30 03:22:19 2012 +0200 Updated Galician translations M po/gl.po commit 997f49dbc4d3de7cb250f18508beb4466574a684 -Author: Kjartan Maraas -AuthorDate: Wed Jul 25 12:57:33 2012 +0200 -Commit: Kjartan Maraas -CommitDate: Wed Jul 25 12:57:33 2012 +0200 +Author: Kjartan Maraas +Date: Wed Jul 25 12:57:33 2012 +0200 Updated Norwegian bokmål translation M po/nb.po commit 341f7fe04fbcdd1d1386d84532bade2c6258e760 -Author: Yaron Shahrabani -AuthorDate: Tue Jul 24 22:34:38 2012 +0300 -Commit: Yaron Shahrabani -CommitDate: Tue Jul 24 22:34:38 2012 +0300 +Author: Yaron Shahrabani +Date: Tue Jul 24 22:34:38 2012 +0300 Updated Hebrew translation. M po/he.po commit eec0996fda7cbeaf9c6a6dc5f67f3bcf5e9f6239 -Author: Tom Tryfonidis -AuthorDate: Tue Jul 24 12:02:13 2012 +0300 -Commit: Tom Tryfonidis -CommitDate: Tue Jul 24 12:02:13 2012 +0300 +Author: Tom Tryfonidis +Date: Tue Jul 24 12:02:13 2012 +0300 Updated Greek translation M po/el.po commit f2dc1f1f775901073b4df82b9a874fa8939423d9 -Author: Мирослав Николић -AuthorDate: Mon Jul 23 23:31:10 2012 +0200 -Commit: Мирослав Николић -CommitDate: Mon Jul 23 23:31:10 2012 +0200 +Author: Мирослав Николић +Date: Mon Jul 23 23:31:10 2012 +0200 Updated Serbian translation @@ -4097,20 +5078,16 @@ M po/sr@latin.po commit 1f44781bec7251eb196eb141bf51b97cebbd66bf -Author: Ray Strode -AuthorDate: Thu Jul 19 17:35:34 2012 -0400 -Commit: Ray Strode -CommitDate: Thu Jul 19 17:35:34 2012 -0400 +Author: Ray Strode +Date: Thu Jul 19 17:35:34 2012 -0400 systemd: be more careful when the login session fails to register M gnome-session/gsm-systemd.c commit 1ca922c7c694ddf69ff08397bcb819453a18b41c -Author: Robert Ancell -AuthorDate: Thu Jul 19 14:04:39 2012 +1200 -Commit: Ray Strode -CommitDate: Thu Jul 19 15:32:31 2012 -0400 +Author: Robert Ancell +Date: Thu Jul 19 14:04:39 2012 +1200 configure: Require glib-2.0 >= 2.33.4 for g_spawn_check_exit_status @@ -4119,10 +5096,8 @@ M configure.ac commit 3b89785c9de6ad169476cdb13a98dad2fcfc040b -Author: Ray Strode -AuthorDate: Thu Jul 19 14:32:22 2012 -0400 -Commit: Ray Strode -CommitDate: Thu Jul 19 14:32:22 2012 -0400 +Author: Ray Strode +Date: Thu Jul 19 14:32:22 2012 -0400 xsmp-server: s/EEXIST/ENOENT/ @@ -4131,30 +5106,24 @@ M gnome-session/gsm-xsmp-server.c commit dcd02a75d419247e2dd1b3dfc944f1ac15a0559b -Author: Ray Strode -AuthorDate: Thu Jul 19 13:48:07 2012 -0400 -Commit: Ray Strode -CommitDate: Thu Jul 19 13:48:54 2012 -0400 +Author: Ray Strode +Date: Thu Jul 19 13:48:07 2012 -0400 xsmp-server: make error message more clear M gnome-session/gsm-xsmp-server.c commit f0df8cc860d763133473f93a4f010b1c4fb9d481 -Author: Matej Urbančič -AuthorDate: Thu Jul 19 10:10:40 2012 +0200 -Commit: Matej Urbančič -CommitDate: Thu Jul 19 10:10:40 2012 +0200 +Author: Matej Urbančič +Date: Thu Jul 19 10:10:40 2012 +0200 Updated Slovenian translation M po/sl.po commit 7c48336f582ee6d7e17d1aa6cde8b1b898eb6f2b -Author: Chao-Hsiung Liao -AuthorDate: Wed Jul 18 19:32:17 2012 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Wed Jul 18 19:32:17 2012 +0800 +Author: Chao-Hsiung Liao +Date: Wed Jul 18 19:32:17 2012 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -4162,61 +5131,49 @@ M po/zh_TW.po commit 3a7f77b6488b6c64ab5bbd4922976a245003a007 -Author: Sasi Bhushan Boddepalli -AuthorDate: Tue Jul 17 17:37:57 2012 +0530 -Commit: Sasi Bhushan Boddepalli -CommitDate: Tue Jul 17 17:37:57 2012 +0530 +Author: Sasi Bhushan Boddepalli +Date: Tue Jul 17 17:37:57 2012 +0530 Updated Telugu Translation M po/te.po commit cf0ec291612e7173d19beb98cd567b4271b6edfc -Author: Daniel Mustieles -AuthorDate: Tue Jul 17 12:04:31 2012 +0200 -Commit: Daniel Mustieles -CommitDate: Tue Jul 17 12:04:31 2012 +0200 +Author: Daniel Mustieles +Date: Tue Jul 17 12:04:31 2012 +0200 Updated Spanish translation M po/es.po commit c4e4b2f782d812138ed3a11f9cf6c86d040c1870 -Author: Chao-Hsiung Liao -AuthorDate: Tue Jul 17 15:07:31 2012 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Tue Jul 17 15:07:31 2012 +0800 +Author: Chao-Hsiung Liao +Date: Tue Jul 17 15:07:31 2012 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) M po/zh_HK.po M po/zh_TW.po -commit 3140a99798352a22a4928fea071867709dd19175 (tag: 3.5.4) -Author: Ray Strode -AuthorDate: Mon Jul 16 23:18:01 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 23:18:01 2012 -0400 +commit 3140a99798352a22a4928fea071867709dd19175 +Author: Ray Strode +Date: Mon Jul 16 23:18:01 2012 -0400 NEWS: update for release M NEWS commit 6e3c00a7a9e3d73fadcf5fce1c7dd8d2fcd58070 -Author: Ray Strode -AuthorDate: Mon Jul 16 23:11:40 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 23:11:40 2012 -0400 +Author: Ray Strode +Date: Mon Jul 16 23:11:40 2012 -0400 configure: bump to 3.5.4 M configure.ac commit 0e7f6876c17c3b6737a3a7612446df08177c5680 -Author: Ray Strode -AuthorDate: Mon Jul 16 22:59:14 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 22:59:14 2012 -0400 +Author: Ray Strode +Date: Mon Jul 16 22:59:14 2012 -0400 shell: fix duplicate dialog issue @@ -4231,10 +5188,8 @@ M gnome-session/gsm-shell.c commit e79b73a308bb086f6ef9f95eeeebc211f1f70343 -Author: Ray Strode -AuthorDate: Mon Jul 16 22:16:26 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 22:16:26 2012 -0400 +Author: Ray Strode +Date: Mon Jul 16 22:16:26 2012 -0400 manager: treat non-0 exit status for required components as fail @@ -4251,10 +5206,8 @@ M gnome-session/gsm-manager.c commit ccc1f9326755c080b637b5379858ab7dfe8bfe51 -Author: Nathan Williams -AuthorDate: Mon Jul 16 21:58:45 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 22:00:22 2012 -0400 +Author: Nathan Williams +Date: Mon Jul 16 21:58:45 2012 -0400 properties: fix typo in UI @@ -4269,10 +5222,8 @@ M data/session-properties.ui commit db422c67df5d6f428aaf56fd2832653b1fd6b2ff -Author: Colin Walters -AuthorDate: Tue Jul 10 11:41:49 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jul 16 21:49:36 2012 -0400 +Author: Colin Walters +Date: Tue Jul 10 11:41:49 2012 -0400 process-helper: Use g_spawn_check_exit_status @@ -4284,40 +5235,32 @@ M gnome-session/gsm-process-helper.c commit b6e93f46ed9c8d192f5f4816a13e825ff5e18c70 -Author: Daniel Mustieles -AuthorDate: Mon Jul 16 16:44:13 2012 +0200 -Commit: Daniel Mustieles -CommitDate: Mon Jul 16 16:44:13 2012 +0200 +Author: Daniel Mustieles +Date: Mon Jul 16 16:44:13 2012 +0200 Updated Spanish translation M po/es.po commit e5343a36e86346e78cb9cfd8573824d5b4c4f905 -Author: Ihar Hrachyshka -AuthorDate: Sun Jul 15 11:38:16 2012 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sun Jul 15 11:38:16 2012 +0300 +Author: Ihar Hrachyshka +Date: Sun Jul 15 11:38:16 2012 +0300 Updated Belarusian translation. M po/be.po commit 043f0697cf6fa2ccf65fdf2c5560b08d2009ccbe -Author: Nilamdyuti Goswami -AuthorDate: Fri Jul 13 18:18:20 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Fri Jul 13 18:18:53 2012 +0530 +Author: Nilamdyuti Goswami +Date: Fri Jul 13 18:18:20 2012 +0530 Assamese translation updated M po/as.po commit 026b16aa636b7cc4f6ec2e38b9416e40e3598aba -Author: Мирослав Николић -AuthorDate: Thu Jul 12 09:17:28 2012 +0200 -Commit: Мирослав Николић -CommitDate: Thu Jul 12 09:17:28 2012 +0200 +Author: Мирослав Николић +Date: Thu Jul 12 09:17:28 2012 +0200 Updated Serbian translation @@ -4325,90 +5268,72 @@ M po/sr@latin.po commit 3dd1c5a823376a2498fcd3d8a7b874c0a91e57f7 -Author: Sasi Bhushan Boddepalli -AuthorDate: Wed Jul 11 12:50:36 2012 +0530 -Commit: Sasi Bhushan Boddepalli -CommitDate: Wed Jul 11 12:50:36 2012 +0530 +Author: Sasi Bhushan Boddepalli +Date: Wed Jul 11 12:50:36 2012 +0530 Updated Telugu Translation M po/te.po commit c7dd9e0777bb4224b0add7142988fcb750135151 -Author: Djavan Fagundes -AuthorDate: Tue Jul 10 19:19:32 2012 -0300 -Commit: Djavan Fagundes -CommitDate: Tue Jul 10 19:19:32 2012 -0300 +Author: Djavan Fagundes +Date: Tue Jul 10 19:19:32 2012 -0300 Updated Brazilian Portuguese translation M po/pt_BR.po commit a115d46bd880f24e6bbb10ef15d1bb21194ca86e -Author: Yaron Shahrabani -AuthorDate: Tue Jul 10 23:53:59 2012 +0300 -Commit: Yaron Shahrabani -CommitDate: Tue Jul 10 23:53:59 2012 +0300 +Author: Yaron Shahrabani +Date: Tue Jul 10 23:53:59 2012 +0300 Updated Hebrew translation. M po/he.po commit d69cb36189347af4955c2a6655b5bc67cc805108 -Author: Matej Urbančič -AuthorDate: Tue Jul 10 09:36:44 2012 +0200 -Commit: Matej Urbančič -CommitDate: Tue Jul 10 09:36:44 2012 +0200 +Author: Matej Urbančič +Date: Tue Jul 10 09:36:44 2012 +0200 Updated Slovenian translation M po/sl.po commit 6b4f329e44404a4227fd33495ec75b07cbe8359e -Author: Matej Urbančič -AuthorDate: Tue Jul 10 09:35:44 2012 +0200 -Commit: Matej Urbančič -CommitDate: Tue Jul 10 09:35:44 2012 +0200 +Author: Matej Urbančič +Date: Tue Jul 10 09:35:44 2012 +0200 Updated Slovenian translation M po/sl.po commit 07e69365a375456e1268c220d6b75f76fcc954e2 -Author: Matej Urbančič -AuthorDate: Tue Jul 10 08:39:00 2012 +0200 -Commit: Matej Urbančič -CommitDate: Tue Jul 10 08:39:00 2012 +0200 +Author: Matej Urbančič +Date: Tue Jul 10 08:39:00 2012 +0200 Updated Slovenian translation M po/sl.po commit 55e9bb2348f0ab6bf94227deb25d91567fe9220a -Author: Kjartan Maraas -AuthorDate: Mon Jul 9 15:18:34 2012 +0200 -Commit: Kjartan Maraas -CommitDate: Mon Jul 9 15:18:34 2012 +0200 +Author: Kjartan Maraas +Date: Mon Jul 9 15:18:34 2012 +0200 Updated Norwegian bokmål translation M po/nb.po commit 668b3162b430cfaf42459dc57e91275bb3b7b836 -Author: Fran Diéguez -AuthorDate: Mon Jul 9 14:46:24 2012 +0200 -Commit: Fran Diéguez -CommitDate: Mon Jul 9 14:46:24 2012 +0200 +Author: Fran Diéguez +Date: Mon Jul 9 14:46:24 2012 +0200 Updated Galician translations M po/gl.po commit 1e58e945280ea4a0285cd95fb011c8cd912fe9d9 -Author: Matthias Clasen -AuthorDate: Mon Jul 9 00:36:59 2012 -0400 -Commit: Matthias Clasen -CommitDate: Mon Jul 9 00:36:59 2012 -0400 +Author: Matthias Clasen +Date: Mon Jul 9 00:36:59 2012 -0400 Minor man page updates @@ -4419,30 +5344,24 @@ M doc/man/gnome-session.1 commit 102f6b9deee8ab699f580c845dfe78b59a2cf738 -Author: Matthias Clasen -AuthorDate: Mon Jul 9 00:28:06 2012 -0400 -Commit: Matthias Clasen -CommitDate: Mon Jul 9 00:30:47 2012 -0400 +Author: Matthias Clasen +Date: Mon Jul 9 00:28:06 2012 -0400 Fix a reference in the gnome-session man page M doc/man/gnome-session.1 commit f043079e55c078ed63ef1589b93299ec8b841b71 -Author: Bruno Brouard -AuthorDate: Sun Jul 8 12:28:58 2012 +0200 -Commit: Bruno Brouard -CommitDate: Sun Jul 8 12:28:58 2012 +0200 +Author: Bruno Brouard +Date: Sun Jul 8 12:28:58 2012 +0200 Updated French translation M po/fr.po commit 3cc2619f53fb13a8ea2a32405ab3ad9476725572 -Author: Matthias Clasen -AuthorDate: Sat Jul 7 20:58:56 2012 -0400 -Commit: Matthias Clasen -CommitDate: Sat Jul 7 23:19:35 2012 -0400 +Author: Matthias Clasen +Date: Sat Jul 7 20:58:56 2012 -0400 Add system inhibitors @@ -4460,10 +5379,8 @@ M gnome-session/gsm-systemd.c commit 2e69a0cba171f6dfe762147f2c690f157664ad45 -Author: Matthias Clasen -AuthorDate: Fri Jun 1 00:51:20 2012 -0400 -Commit: Matthias Clasen -CommitDate: Sat Jul 7 23:16:36 2012 -0400 +Author: Matthias Clasen +Date: Fri Jun 1 00:51:20 2012 -0400 Move suspend API to GsmSystem @@ -4477,10 +5394,8 @@ M gnome-session/gsm-systemd.c commit 634ea36389e95115e3588bdb4e3d4655feb64490 -Author: Matthias Clasen -AuthorDate: Sat Jul 7 20:58:26 2012 -0400 -Commit: Matthias Clasen -CommitDate: Sat Jul 7 23:16:36 2012 -0400 +Author: Matthias Clasen +Date: Sat Jul 7 20:58:26 2012 -0400 Update systemd dependencies @@ -4490,10 +5405,8 @@ M configure.ac commit 9ab2645b2b2c6eac7bd194543d7f9d3f3ab6ebcd -Author: Matthias Clasen -AuthorDate: Fri Jun 1 00:22:56 2012 -0400 -Commit: Matthias Clasen -CommitDate: Sat Jul 7 23:15:51 2012 -0400 +Author: Matthias Clasen +Date: Fri Jun 1 00:22:56 2012 -0400 Simplify systemd implementation @@ -4503,10 +5416,8 @@ M gnome-session/gsm-systemd.c commit 03f69091b71ad66c1559701efce643b15d0eaed4 -Author: Giovanni Campagna -AuthorDate: Sun Jun 3 17:25:38 2012 +0200 -Commit: Giovanni Campagna -CommitDate: Sat Jul 7 18:09:40 2012 +0200 +Author: Giovanni Campagna +Date: Sun Jun 3 17:25:38 2012 +0200 GsmManager: add a command for showing a reboot dialog @@ -4524,10 +5435,8 @@ M tools/gnome-session-quit.c commit 70725a0c337e2be114631f6f77821c0aba3f0e74 -Author: Hans de Goede -AuthorDate: Fri Jun 22 08:40:59 2012 +0200 -Commit: Adel Gadllah -CommitDate: Fri Jul 6 09:16:31 2012 +0200 +Author: Hans de Goede +Date: Fri Jun 22 08:40:59 2012 +0200 Add an automount-inhibit flag @@ -4564,30 +5473,24 @@ M gnome-session/org.gnome.SessionManager.xml commit 7691ebeb2e8a7e2182f9e338e95f9702f962d6ba -Author: Tom Tryfonidis -AuthorDate: Fri Jun 29 01:27:24 2012 +0300 -Commit: Tom Tryfonidis -CommitDate: Fri Jun 29 01:27:24 2012 +0300 +Author: Tom Tryfonidis +Date: Fri Jun 29 01:27:24 2012 +0300 Updated Greek translation M po/el.po commit cb736d7cb746e89d0249bec2dcd39e89bb6e212a -Author: Nilamdyuti Goswami -AuthorDate: Wed Jun 27 21:53:20 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Wed Jun 27 21:53:55 2012 +0530 +Author: Nilamdyuti Goswami +Date: Wed Jun 27 21:53:20 2012 +0530 Assamese translation reviewed M po/as.po -commit 5bfbd5c477b890bd792f7b058eff13815497d8bd (tag: 3.5.2) -Author: Ray Strode -AuthorDate: Thu Jun 14 15:08:47 2012 -0400 -Commit: Ray Strode -CommitDate: Thu Jun 14 15:11:49 2012 -0400 +commit 5bfbd5c477b890bd792f7b058eff13815497d8bd +Author: Ray Strode +Date: Thu Jun 14 15:08:47 2012 -0400 xsmp-server: guard against EINTR on IceLockAuthFile @@ -4603,10 +5506,8 @@ M gnome-session/gsm-xsmp-server.c commit 31e505ad41ead9cd1b3338aeda05b09106b18cf4 -Author: Ray Strode -AuthorDate: Mon Jun 4 18:45:24 2012 -0400 -Commit: Ray Strode -CommitDate: Thu Jun 14 15:11:49 2012 -0400 +Author: Ray Strode +Date: Mon Jun 4 18:45:24 2012 -0400 configure: bump to 3.5.2 @@ -4615,20 +5516,16 @@ M configure.ac commit 902c26941382b4c436572f7c5221ce5558a292c5 -Author: Ray Strode -AuthorDate: Mon Jun 4 18:49:25 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jun 4 18:49:34 2012 -0400 +Author: Ray Strode +Date: Mon Jun 4 18:49:25 2012 -0400 NEWS: update for release M NEWS commit fea0dafe9a8db4fed50db0cf9a27db94d4fb45cd -Author: Ray Strode -AuthorDate: Mon Jun 4 18:27:39 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jun 4 18:30:31 2012 -0400 +Author: Ray Strode +Date: Mon Jun 4 18:27:39 2012 -0400 main: fail if we can't get a connection to the session bus @@ -4641,10 +5538,8 @@ M gnome-session/main.c commit 34c380508516f8a2f81b68d189b24fedb05870ea -Author: William Jon McCann -AuthorDate: Mon Jun 4 18:19:46 2012 -0400 -Commit: Ray Strode -CommitDate: Mon Jun 4 18:24:45 2012 -0400 +Author: William Jon McCann +Date: Mon Jun 4 18:19:46 2012 -0400 main: exit gracefully when disconnected from the session bus @@ -4656,10 +5551,8 @@ M gnome-session/main.c commit c6e23f8783d229fbd0f845427f9c9c1965a03924 -Author: Vincent Untz -AuthorDate: Fri Mar 23 17:05:09 2012 +0100 -Commit: Ray Strode -CommitDate: Mon Jun 4 18:07:23 2012 -0400 +Author: Vincent Untz +Date: Fri Mar 23 17:05:09 2012 +0100 gsm: Consider that a required component that exits with 1 has crashed @@ -4669,11 +5562,9 @@ M gnome-session/gsm-manager.c -commit 67d74de13eb7bbceb6b0c22b653052a670119ea3 (origin/gnome-3-4, gnome-3-4) -Author: Vincent Untz -AuthorDate: Mon Jun 4 17:29:06 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 4 17:29:06 2012 +0200 +commit 67d74de13eb7bbceb6b0c22b653052a670119ea3 +Author: Vincent Untz +Date: Mon Jun 4 17:29:06 2012 +0200 misc: Remove myself from maintainers @@ -4683,10 +5574,8 @@ M gnome-session.doap commit 52bff5a6b0e609f3b59d92f85897113b970ae119 -Author: Vincent Untz -AuthorDate: Mon Jun 4 17:27:23 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 4 17:27:23 2012 +0200 +Author: Vincent Untz +Date: Mon Jun 4 17:27:23 2012 +0200 misc: Add Ray as co-maintainer @@ -4696,10 +5585,8 @@ M gnome-session.doap commit 12ffa57b4395bec23e4a2b6da0ad7d293d3304c3 -Author: Colin Walters -AuthorDate: Thu May 17 14:28:10 2012 -0400 -Commit: Colin Walters -CommitDate: Fri May 18 14:13:27 2012 -0400 +Author: Colin Walters +Date: Thu May 17 14:28:10 2012 -0400 configure: Check for new enough version of systemd-login @@ -4710,20 +5597,16 @@ M configure.ac commit ce9e5da40aacfd6dc70dcdb3fc367cff746ded78 -Author: Dirgita -AuthorDate: Thu May 17 22:32:51 2012 +0700 -Commit: Andika Triwidada -CommitDate: Thu May 17 22:32:51 2012 +0700 +Author: Dirgita +Date: Thu May 17 22:32:51 2012 +0700 [l10n] Updated Indonesian translation M po/id.po commit de1e5bb1d1624d28e9d9db3cd5fe62afb14b3bdb -Author: Piotr Drąg -AuthorDate: Tue May 15 19:23:28 2012 +0200 -Commit: Piotr Drąg -CommitDate: Tue May 15 19:23:28 2012 +0200 +Author: Piotr Drąg +Date: Tue May 15 19:23:28 2012 +0200 Remove markup from translatable string in .ui file @@ -4732,30 +5615,24 @@ M data/gsm-inhibit-dialog.ui commit 4545b9dcbef088534d8122694bc5d5103525e6d6 -Author: Vincent Untz -AuthorDate: Mon May 14 15:37:06 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon May 14 15:37:06 2012 +0200 +Author: Vincent Untz +Date: Mon May 14 15:37:06 2012 +0200 release: post-release bump to 3.4.3 M configure.ac -commit 6c6cbd0d4ddd02b1778b57af806b8bcd534ee6df (tag: 3.4.2) -Author: Vincent Untz -AuthorDate: Mon May 14 15:36:58 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon May 14 15:36:58 2012 +0200 +commit 6c6cbd0d4ddd02b1778b57af806b8bcd534ee6df +Author: Vincent Untz +Date: Mon May 14 15:36:58 2012 +0200 release: 3.4.2 M NEWS commit 52d4195e209f8da4c162e9f37f790be58ba2f54f -Author: Jeremy Bicha -AuthorDate: Sun May 6 20:50:27 2012 -0400 -Commit: Vincent Untz -CommitDate: Mon May 14 15:31:47 2012 +0200 +Author: Jeremy Bicha +Date: Sun May 6 20:50:27 2012 -0400 capplet: Add Unity to OnlyShowIn in .desktop file @@ -4764,10 +5641,8 @@ M data/session-properties.desktop.in.in commit 6090e602477e3c139fadf234d95549211d390aa1 -Author: Michael Biebl -AuthorDate: Wed Apr 25 02:34:16 2012 +0200 -Commit: Michael Biebl -CommitDate: Wed Apr 25 02:35:45 2012 +0200 +Author: Michael Biebl +Date: Wed Apr 25 02:34:16 2012 +0200 build: require stable libupower-glib API @@ -4777,20 +5652,16 @@ M gnome-session/Makefile.am commit fe6830287cc098ad93b26c295d002b7fd682df52 -Author: Takayuki KUSANO -AuthorDate: Tue Apr 24 01:02:13 2012 +0900 -Commit: Takayuki KUSANO -CommitDate: Tue Apr 24 01:02:13 2012 +0900 +Author: Takayuki KUSANO +Date: Tue Apr 24 01:02:13 2012 +0900 Updated Japanese translation. M po/ja.po commit d3a42e8c6e512ec8c1dcf387b13c620c733484bf -Author: Yurek Hinz -AuthorDate: Mon Apr 16 19:19:18 2012 +0200 -Commit: Piotr Drąg -CommitDate: Mon Apr 16 19:19:18 2012 +0200 +Author: Yurek Hinz +Date: Mon Apr 16 19:19:18 2012 +0200 Added Kashubian translation @@ -4798,70 +5669,56 @@ A po/csb.po commit 0f9f7ae21378be221e814f6393cd11041d3b25d2 -Author: Vincent Untz -AuthorDate: Mon Apr 16 13:48:18 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon Apr 16 13:48:18 2012 +0200 +Author: Vincent Untz +Date: Mon Apr 16 13:48:18 2012 +0200 release: post-release bump to 3.4.2 M configure.ac -commit fa7d798267b4ef2dfe2915c8ad90f4e0e2e4f183 (tag: 3.4.1) -Author: Vincent Untz -AuthorDate: Mon Apr 16 13:47:48 2012 +0200 -Commit: Vincent Untz -CommitDate: Mon Apr 16 13:47:48 2012 +0200 +commit fa7d798267b4ef2dfe2915c8ad90f4e0e2e4f183 +Author: Vincent Untz +Date: Mon Apr 16 13:47:48 2012 +0200 release: 3.4.1 M NEWS commit cc66a4056187d7e4a619d140fe661c3fd55dc147 -Author: Wolfgang Stöggl -AuthorDate: Sat Apr 14 20:19:41 2012 +0200 -Commit: Mario Blättermann -CommitDate: Sat Apr 14 20:19:41 2012 +0200 +Author: Wolfgang Stöggl +Date: Sat Apr 14 20:19:41 2012 +0200 [l10n] Updated German translation M po/de.po commit beaa05394ebebecb5c32a23e020f2d5b69216eb3 -Author: Bruce Cowan -AuthorDate: Fri Apr 13 13:24:02 2012 +0100 -Commit: Bruce Cowan -CommitDate: Fri Apr 13 13:24:02 2012 +0100 +Author: Bruce Cowan +Date: Fri Apr 13 13:24:02 2012 +0100 Updated British English translation M po/en_GB.po commit 1e3fb0d13eeb11f44937ad427f374650ba33816c -Author: Carles Ferrando -AuthorDate: Tue Apr 10 23:23:58 2012 +0200 -Commit: Gil Forcada -CommitDate: Tue Apr 10 23:23:58 2012 +0200 +Author: Carles Ferrando +Date: Tue Apr 10 23:23:58 2012 +0200 [l10n]Updated Catalan (Valencian) translation M po/ca@valencia.po commit 867eb4a98fee676b46b206b68db7fcb51fd96622 -Author: Jordi Serratosa -AuthorDate: Tue Apr 10 23:23:56 2012 +0200 -Commit: Gil Forcada -CommitDate: Tue Apr 10 23:23:56 2012 +0200 +Author: Jordi Serratosa +Date: Tue Apr 10 23:23:56 2012 +0200 [l10n] Fixes on Catalan translation M po/ca.po commit 5dc795f32bf7eae5c12d36cd289cf9b9f6438255 -Author: Matthias Clasen -AuthorDate: Thu Apr 5 22:00:17 2012 -0400 -Commit: Matthias Clasen -CommitDate: Thu Apr 5 22:04:09 2012 -0400 +Author: Matthias Clasen +Date: Thu Apr 5 22:00:17 2012 -0400 Fix some problems in the systemd code @@ -4879,70 +5736,56 @@ M gnome-session/gsm-systemd.c commit 7de885b2d028c77b83a419f9f1b9469f7644669c -Author: Milo Casagrande -AuthorDate: Thu Apr 5 13:51:49 2012 +0200 -Commit: Milo Casagrande -CommitDate: Thu Apr 5 13:51:49 2012 +0200 +Author: Milo Casagrande +Date: Thu Apr 5 13:51:49 2012 +0200 [l10n] Updated Italian translation M po/it.po commit fdd1663ded74267b27c9412bd36661be4e501763 -Author: Gabor Kelemen -AuthorDate: Wed Apr 4 15:44:41 2012 +0200 -Commit: Gabor Kelemen -CommitDate: Wed Apr 4 15:44:41 2012 +0200 +Author: Gabor Kelemen +Date: Wed Apr 4 15:44:41 2012 +0200 Updated Hungarian translation M po/hu.po commit c5a1e804a433098ac4c0e01adfe2b5086971a425 -Author: Sandeep Sheshrao Shedmake -AuthorDate: Mon Apr 2 10:27:21 2012 +0530 -Commit: Sandeep Sheshrao Shedmake -CommitDate: Mon Apr 2 10:27:21 2012 +0530 +Author: Sandeep Sheshrao Shedmake +Date: Mon Apr 2 10:27:21 2012 +0530 Updated Marathi Translations M po/mr.po commit 393d1b33fd9e7db67695727c5301d56302fc645b -Author: Arash Mousavi -AuthorDate: Sat Mar 31 15:57:27 2012 +0430 -Commit: Arash Mousavi -CommitDate: Sat Mar 31 15:57:27 2012 +0430 +Author: Arash Mousavi +Date: Sat Mar 31 15:57:27 2012 +0430 Updated Persian Translations M po/fa.po commit f024ef80b3633a9ccd3ddc20ce21614a8a8d200c -Author: Kjartan Maraas -AuthorDate: Thu Mar 29 09:51:23 2012 +0200 -Commit: Kjartan Maraas -CommitDate: Thu Mar 29 09:51:23 2012 +0200 +Author: Kjartan Maraas +Date: Thu Mar 29 09:51:23 2012 +0200 Updated Norwegian bokmål translation M po/nb.po commit e52cfd6921b46497f14fc7a1b8a73d098faffe55 -Author: Reşat SABIQ -AuthorDate: Wed Mar 28 00:42:55 2012 -0500 -Commit: Reşat SABIQ -CommitDate: Wed Mar 28 00:44:48 2012 -0500 +Author: Reşat SABIQ +Date: Wed Mar 28 00:42:55 2012 -0500 Updated Crimean Tatar (Crimean Turkish) translation M po/crh.po commit 2b2567f6a90c18a0dc11cf936256dce79f9b8c83 -Author: Vincent Untz -AuthorDate: Fri Mar 23 17:09:26 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:34:28 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 17:09:26 2012 +0100 gsm: Pass signal id in "died" signal of GsmApp @@ -4954,10 +5797,8 @@ M gnome-session/gsm-manager.c commit 97dd8abb2e91ace479154b74077e7c86f5bc2ca0 -Author: Vincent Untz -AuthorDate: Fri Mar 23 17:06:56 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:34:17 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 17:06:56 2012 +0100 gsm: Remove duplicated code @@ -4966,10 +5807,8 @@ M gnome-session/gsm-manager.c commit 35c9e37483c1c734fdff673b3899f8723b6b0af5 -Author: Vincent Untz -AuthorDate: Fri Mar 23 16:59:08 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:33:45 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 16:59:08 2012 +0100 gsm: Pass exit code in "exited" signal of GsmApp @@ -4981,10 +5820,8 @@ M gnome-session/gsm-manager.c commit f31f37ec0ce59b5f7abe332fe55997c7e9722752 -Author: Vincent Untz -AuthorDate: Fri Mar 23 16:56:53 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:33:34 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 16:56:53 2012 +0100 gsm: Stop disconnecting "registered" signal for GsmApp @@ -4997,10 +5834,8 @@ M gnome-session/gsm-manager.c commit 16abf44d44b640d62204fd4e4a55c9ec648f5aa5 -Author: Vincent Untz -AuthorDate: Fri Mar 23 16:54:52 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:33:04 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 16:54:52 2012 +0100 gsm: Share code to restart an app @@ -5009,10 +5844,8 @@ M gnome-session/gsm-manager.c commit 85e507ec95a67cec735b99db2921e78522f12294 -Author: Vincent Untz -AuthorDate: Fri Mar 23 16:51:38 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:32:36 2012 +0200 +Author: Vincent Untz +Date: Fri Mar 23 16:51:38 2012 +0100 gsm: Properly move to next phase if an app dies on startup @@ -5026,30 +5859,24 @@ M gnome-session/gsm-manager.c commit 51ead67057d11fedb3a70a6a5964832b2455c799 -Author: Vincent Untz -AuthorDate: Tue Mar 27 10:31:07 2012 +0200 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:31:07 2012 +0200 +Author: Vincent Untz +Date: Tue Mar 27 10:31:07 2012 +0200 release: post-release bump to 3.4.1 M configure.ac -commit 94b23b81bfaf8a6e97c20c5034706c13a6c48362 (tag: 3.4.0) -Author: Vincent Untz -AuthorDate: Tue Mar 27 10:30:43 2012 +0200 -Commit: Vincent Untz -CommitDate: Tue Mar 27 10:30:43 2012 +0200 +commit 94b23b81bfaf8a6e97c20c5034706c13a6c48362 +Author: Vincent Untz +Date: Tue Mar 27 10:30:43 2012 +0200 release: 3.4.0 M NEWS commit b582d9684ebe11d2aa1217907a938927ec33e2ef -Author: Мирослав Николић -AuthorDate: Tue Mar 27 09:26:33 2012 +0200 -Commit: Мирослав Николић -CommitDate: Tue Mar 27 09:26:33 2012 +0200 +Author: Мирослав Николић +Date: Tue Mar 27 09:26:33 2012 +0200 Updated Serbian translation @@ -5057,10 +5884,8 @@ M po/sr@latin.po commit 8ad2ab8ad2715b9eab804209a0843f5e898855d1 -Author: Chao-Hsiung Liao -AuthorDate: Tue Mar 27 12:06:08 2012 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Tue Mar 27 12:06:08 2012 +0800 +Author: Chao-Hsiung Liao +Date: Tue Mar 27 12:06:08 2012 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -5068,300 +5893,240 @@ M po/zh_TW.po commit d2bbf2606b1938b29a29218eca154d41f65f87e1 -Author: Aurimas Černius -AuthorDate: Mon Mar 26 22:39:07 2012 +0300 -Commit: Aurimas Černius -CommitDate: Mon Mar 26 22:39:07 2012 +0300 +Author: Aurimas Černius +Date: Mon Mar 26 22:39:07 2012 +0300 Updated Lithuanian translation M po/lt.po commit 9fda27099c6d28e4bba5c139001f2ee74922cfe1 -Author: Changwoo Ryu -AuthorDate: Tue Mar 27 01:33:54 2012 +0900 -Commit: Changwoo Ryu -CommitDate: Tue Mar 27 01:33:54 2012 +0900 +Author: Changwoo Ryu +Date: Tue Mar 27 01:33:54 2012 +0900 Updated Korean translation M po/ko.po commit e96ccb521f3452d13e8620f27f85e8fd232ba339 -Author: A S Alam -AuthorDate: Mon Mar 26 17:20:42 2012 +0530 -Commit: A S Alam -CommitDate: Mon Mar 26 17:20:42 2012 +0530 +Author: A S Alam +Date: Mon Mar 26 17:20:42 2012 +0530 update Punjabi Translation M po/pa.po commit eabb701c03e8cc0777396e0bef672f1b42cddc99 -Author: Mattias Põldaru -AuthorDate: Mon Mar 26 14:35:09 2012 +0300 -Commit: Priit Laes -CommitDate: Mon Mar 26 14:35:09 2012 +0300 +Author: Mattias Põldaru +Date: Mon Mar 26 14:35:09 2012 +0300 [l10n] Updated Estonian translation M po/et.po commit c87de57722d86c0e485f8d1b682c756f0aa08d4a -Author: Sweta Kothari -AuthorDate: Mon Mar 26 17:10:25 2012 +0530 -Commit: Sweta Kothari -CommitDate: Mon Mar 26 17:10:25 2012 +0530 +Author: Sweta Kothari +Date: Mon Mar 26 17:10:25 2012 +0530 Updated Gujarati Translations M po/gu.po commit 03b33abc800a998a7bf8e0bd4e41fd89c0a52df0 -Author: Reşat SABIQ -AuthorDate: Mon Mar 26 02:48:25 2012 -0500 -Commit: Reşat SABIQ -CommitDate: Mon Mar 26 02:48:25 2012 -0500 +Author: Reşat SABIQ +Date: Mon Mar 26 02:48:25 2012 -0500 Updated Crimean Tatar (Crimean Turkish) translation M po/crh.po commit fd514f3a0924641a35da04e8eda7cb9e771e5c4e -Author: Ask H. Larsen -AuthorDate: Sun Mar 25 22:40:39 2012 +0200 -Commit: Kenneth Nielsen -CommitDate: Sun Mar 25 22:40:39 2012 +0200 +Author: Ask H. Larsen +Date: Sun Mar 25 22:40:39 2012 +0200 Updated Danish translation M po/da.po commit b0002a14eaf86c356ad57f95fabf9d63675387c1 -Author: Alexander Shopov -AuthorDate: Sun Mar 25 19:20:35 2012 +0300 -Commit: Alexander Shopov -CommitDate: Sun Mar 25 19:20:35 2012 +0300 +Author: Alexander Shopov +Date: Sun Mar 25 19:20:35 2012 +0300 Updated Bulgarian translation M po/bg.po commit e973c3c0de099a280baef9812f26713b4bc816f5 -Author: Rudolfs Mazurs -AuthorDate: Sun Mar 25 15:42:16 2012 +0300 -Commit: Peteris Krisjanis -CommitDate: Sun Mar 25 15:42:16 2012 +0300 +Author: Rudolfs Mazurs +Date: Sun Mar 25 15:42:16 2012 +0300 Updated Latvian translation. M po/lv.po commit b5f73a8eab30ef31c54bcfcadf21e74f88cab61a -Author: Daniel Nylander -AuthorDate: Sat Mar 24 18:54:34 2012 +0100 -Commit: Daniel Nylander -CommitDate: Sat Mar 24 18:54:34 2012 +0100 +Author: Daniel Nylander +Date: Sat Mar 24 18:54:34 2012 +0100 Updated Swedish translation M po/sv.po commit a4e7424673a953b9cbebb3f1a304af6f76085349 -Author: Ihar Hrachyshka -AuthorDate: Sat Mar 24 20:42:09 2012 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sat Mar 24 20:42:09 2012 +0300 +Author: Ihar Hrachyshka +Date: Sat Mar 24 20:42:09 2012 +0300 Updated Belarusian translation. M po/be.po commit 93e55397a84e991ed15ae1b268969f7063bd362f -Author: Yaron Shahrabani -AuthorDate: Sat Mar 24 19:33:43 2012 +0200 -Commit: Yaron Shahrabani -CommitDate: Sat Mar 24 19:33:43 2012 +0200 +Author: Yaron Shahrabani +Date: Sat Mar 24 19:33:43 2012 +0200 Updated Hebrew translation. M po/he.po commit 781b9ad63a010c35d5966f14b4dfa4a186651afe -Author: Bruno Brouard -AuthorDate: Sat Mar 24 14:44:19 2012 +0100 -Commit: Bruno Brouard -CommitDate: Sat Mar 24 14:44:19 2012 +0100 +Author: Bruno Brouard +Date: Sat Mar 24 14:44:19 2012 +0100 Updated French translation M po/fr.po commit 5f9ed61b66d37926414a61d99b01f077e44935e7 -Author: Duarte Loreto -AuthorDate: Sat Mar 24 12:03:37 2012 +0000 -Commit: Duarte Loreto -CommitDate: Sat Mar 24 12:03:37 2012 +0000 +Author: Duarte Loreto +Date: Sat Mar 24 12:03:37 2012 +0000 Updated Portuguese translation M po/pt.po commit 0350d658eb2a61c5fc4c1342b40ef9bb5cf2e1b9 -Author: Yuri Myasoedov -AuthorDate: Sat Mar 24 12:09:28 2012 +0400 -Commit: Yuri Myasoedov -CommitDate: Sat Mar 24 12:09:28 2012 +0400 +Author: Yuri Myasoedov +Date: Sat Mar 24 12:09:28 2012 +0400 Updated Russian translation M po/ru.po commit 948e22af63d8eb6a77b82c818e3370e8c7978146 -Author: Marek Černocký -AuthorDate: Sat Mar 24 09:07:20 2012 +0100 -Commit: Marek Černocký -CommitDate: Sat Mar 24 09:07:20 2012 +0100 +Author: Marek Černocký +Date: Sat Mar 24 09:07:20 2012 +0100 Updated Czech translation M po/cs.po commit fe204494b16c65270bbd18463cf42d97228cae3e -Author: Daniel Korostil -AuthorDate: Sat Mar 24 09:59:50 2012 +0200 -Commit: Daniel Korostil -CommitDate: Sat Mar 24 09:59:50 2012 +0200 +Author: Daniel Korostil +Date: Sat Mar 24 09:59:50 2012 +0200 Uploaded Ukranian M po/uk.po commit 08ee76b9c58612c5db70b09927c962cea3afb14d -Author: Carles Ferrando -AuthorDate: Sat Mar 24 01:41:31 2012 +0100 -Commit: Gil Forcada -CommitDate: Sat Mar 24 01:41:31 2012 +0100 +Author: Carles Ferrando +Date: Sat Mar 24 01:41:31 2012 +0100 [l10n]Updated Catalan (Valencian) translation M po/ca@valencia.po commit 14a4c3670946bfd7523d14285b884a06efb1c4f2 -Author: Gil Forcada -AuthorDate: Sat Mar 24 01:41:28 2012 +0100 -Commit: Gil Forcada -CommitDate: Sat Mar 24 01:41:28 2012 +0100 +Author: Gil Forcada +Date: Sat Mar 24 01:41:28 2012 +0100 [l10n] Updated Catalan translation M po/ca.po commit 09c54cea2b5bb1c105854fb835113497283cd12f -Author: Fran Diéguez -AuthorDate: Fri Mar 23 23:47:56 2012 +0100 -Commit: Fran Diéguez -CommitDate: Fri Mar 23 23:47:56 2012 +0100 +Author: Fran Diéguez +Date: Fri Mar 23 23:47:56 2012 +0100 Updated Galician translations M po/gl.po commit 2fd7d253a7a2354775d7849fb759a883f69ea207 -Author: Djavan Fagundes -AuthorDate: Wed Mar 21 05:50:58 2012 -0300 -Commit: Djavan Fagundes -CommitDate: Wed Mar 21 05:50:58 2012 -0300 +Author: Djavan Fagundes +Date: Wed Mar 21 05:50:58 2012 -0300 Updated Brazilian Portuguese translation M po/pt_BR.po commit 9868b819b0ad179292b1d516b49ef1941acf639b -Author: Matej Urbančič -AuthorDate: Fri Mar 23 18:45:29 2012 +0100 -Commit: Matej Urbančič -CommitDate: Fri Mar 23 18:45:29 2012 +0100 +Author: Matej Urbančič +Date: Fri Mar 23 18:45:29 2012 +0100 Updated Slovenian translation M po/sl.po commit a3244fd35d40fafcf1b475ed46b566d08c023f88 -Author: Wylmer Wang -AuthorDate: Fri Mar 23 16:45:16 2012 +0000 -Commit: Automatic Mirroring -CommitDate: Fri Mar 23 16:45:16 2012 +0000 +Author: Wylmer Wang +Date: Fri Mar 23 16:45:16 2012 +0000 Update Simplified Chinese translation. M po/zh_CN.po commit 8034e3b8c5e208be5f8cebe0f033f514f99c5d1f -Author: Sasi Bhushan -AuthorDate: Fri Mar 23 21:36:42 2012 +0530 -Commit: Sasi Bhushan Boddepalli -CommitDate: Fri Mar 23 21:36:42 2012 +0530 +Author: Sasi Bhushan +Date: Fri Mar 23 21:36:42 2012 +0530 Udated Telugu Translations M po/te.po commit 3ee8228955ffe90d68b9131dc49a00792e70b5a6 -Author: Piotr Drąg -AuthorDate: Fri Mar 23 16:14:26 2012 +0100 -Commit: Piotr Drąg -CommitDate: Fri Mar 23 16:14:26 2012 +0100 +Author: Piotr Drąg +Date: Fri Mar 23 16:14:26 2012 +0100 Updated Polish translation M po/pl.po commit 1dcbc3f74300077bf2e87f34c093631b02c44a05 -Author: Mattias Põldaru -AuthorDate: Fri Mar 23 16:11:53 2012 +0200 -Commit: Priit Laes -CommitDate: Fri Mar 23 16:11:53 2012 +0200 +Author: Mattias Põldaru +Date: Fri Mar 23 16:11:53 2012 +0200 [l10n] Updated Estonian translation M po/et.po commit d60fa6a1db29fb8fbce08a29e0aecf3273b60426 -Author: Nilamdyuti Goswami -AuthorDate: Fri Mar 23 18:29:16 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Fri Mar 23 18:29:47 2012 +0530 +Author: Nilamdyuti Goswami +Date: Fri Mar 23 18:29:16 2012 +0530 Assamese translation updated M po/as.po commit d509dc6925e6fd9e0676c076b4331ae56cd9f66f -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Fri Mar 23 19:05:12 2012 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Fri Mar 23 19:05:12 2012 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Fri Mar 23 19:05:12 2012 +0700 Updated Vietnamese translation M po/vi.po commit eece89eafd7361d5edbfe9544917f429eafee4f4 -Author: Daniel Mustieles -AuthorDate: Fri Mar 23 11:09:49 2012 +0100 -Commit: Daniel Mustieles -CommitDate: Fri Mar 23 11:09:49 2012 +0100 +Author: Daniel Mustieles +Date: Fri Mar 23 11:09:49 2012 +0100 Updated Spanish translation M po/es.po commit 1313fbbcb1505b14d40b331a6949e11860852ba2 -Author: Jasper St. Pierre -AuthorDate: Mon Mar 19 20:22:19 2012 -0400 -Commit: Jasper St. Pierre -CommitDate: Mon Mar 19 20:23:44 2012 -0400 +Author: Jasper St. Pierre +Date: Mon Mar 19 20:22:19 2012 -0400 manager: Fix compile warning @@ -5370,10 +6135,8 @@ M gnome-session/gsm-manager.c commit ad6d425e99fe72658a7d0d7840d17a3c542729f4 -Author: Jasper St. Pierre -AuthorDate: Sat Mar 17 04:25:25 2012 -0400 -Commit: Jasper St. Pierre -CommitDate: Mon Mar 19 20:23:44 2012 -0400 +Author: Jasper St. Pierre +Date: Sat Mar 17 04:25:25 2012 -0400 fail-whale: Don't use deprecated API @@ -5382,10 +6145,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit 5d4e07d6cf157dcc911e94b04c3d96000572b395 -Author: Jasper St. Pierre -AuthorDate: Fri Mar 9 13:47:49 2012 -0500 -Commit: Jasper St. Pierre -CommitDate: Mon Mar 19 20:20:38 2012 -0400 +Author: Jasper St. Pierre +Date: Fri Mar 9 13:47:49 2012 -0500 shell-extensions: Don't show toggle switches for extensions @@ -5403,20 +6164,16 @@ M gnome-session/main.c commit c84706e9558811dab0c5f987e336ca3e8948b35d -Author: Vincent Untz -AuthorDate: Mon Mar 19 14:01:26 2012 +0100 -Commit: Vincent Untz -CommitDate: Mon Mar 19 14:01:26 2012 +0100 +Author: Vincent Untz +Date: Mon Mar 19 14:01:26 2012 +0100 release: post-release bump to 3.4.0 M configure.ac -commit 05f29cd81ccf6c38caef0b08d91e7cf89faf2b53 (tag: 3.3.92) -Author: Vincent Untz -AuthorDate: Mon Mar 19 14:01:20 2012 +0100 -Commit: Vincent Untz -CommitDate: Mon Mar 19 14:01:20 2012 +0100 +commit 05f29cd81ccf6c38caef0b08d91e7cf89faf2b53 +Author: Vincent Untz +Date: Mon Mar 19 14:01:20 2012 +0100 release: 3.3.92 @@ -5424,20 +6181,16 @@ M configure.ac commit 8f26e275fd5dbfe9fd9749ffab548838c80a170b -Author: Yuri Myasoedov -AuthorDate: Sun Mar 18 20:18:13 2012 +0400 -Commit: Yuri Myasoedov -CommitDate: Sun Mar 18 20:18:13 2012 +0400 +Author: Yuri Myasoedov +Date: Sun Mar 18 20:18:13 2012 +0400 Fixed Russian translation M po/ru.po commit 8282c0eda41f6453f7533aadd188ab132b19c0b9 -Author: Jasper St. Pierre -AuthorDate: Fri Mar 9 13:48:42 2012 -0500 -Commit: Vincent Untz -CommitDate: Wed Mar 14 12:28:19 2012 +0100 +Author: Jasper St. Pierre +Date: Fri Mar 9 13:48:42 2012 -0500 shell-extensions: Fix memory leak @@ -5446,10 +6199,8 @@ M gnome-session/gsm-shell-extensions.c commit 4d3d4f67c6022d9f0d540a3f25f730b088288d92 -Author: Ray Strode -AuthorDate: Fri Mar 9 10:41:07 2012 -0500 -Commit: Ray Strode -CommitDate: Fri Mar 9 10:41:07 2012 -0500 +Author: Ray Strode +Date: Fri Mar 9 10:41:07 2012 -0500 systemd: add better error reporting @@ -5465,40 +6216,32 @@ M gnome-session/gsm-systemd.c commit 0cae82a7c1a9c5d2e4363603ecb957ddafe86b74 -Author: Nilamdyuti Goswami -AuthorDate: Mon Mar 5 20:55:52 2012 +0530 -Commit: Nilamdyuti Goswami -CommitDate: Mon Mar 5 20:55:52 2012 +0530 +Author: Nilamdyuti Goswami +Date: Mon Mar 5 20:55:52 2012 +0530 Assamese translation completed M po/as.po commit 4cbae019d61c6e93adb0b4e56058a5180cb9ecf3 -Author: Mattias Põldaru -AuthorDate: Tue Feb 28 20:51:26 2012 +0200 -Commit: Priit Laes -CommitDate: Tue Feb 28 20:51:26 2012 +0200 +Author: Mattias Põldaru +Date: Tue Feb 28 20:51:26 2012 +0200 [l10n] Updated Estonian translation M po/et.po commit ce300a61e584c0c93721bef8658a3494e44e8c80 -Author: Vincent Untz -AuthorDate: Wed Feb 22 15:10:32 2012 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 22 15:10:32 2012 +0100 +Author: Vincent Untz +Date: Wed Feb 22 15:10:32 2012 +0100 build: Generate ChangeLog on make dist M Makefile.am commit 97d6cd942b45981a0e2a1ec1a62684c612e5ef17 -Author: Vincent Untz -AuthorDate: Wed Feb 22 15:02:38 2012 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 22 15:02:38 2012 +0100 +Author: Vincent Untz +Date: Wed Feb 22 15:02:38 2012 +0100 build: Update git.mk and ignore generated tarballs @@ -5506,40 +6249,32 @@ M git.mk commit af46c743edd5ae120a48a19f93285d63367d2dc3 -Author: Vincent Untz -AuthorDate: Tue Feb 21 10:44:51 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 21 10:44:51 2012 +0100 +Author: Vincent Untz +Date: Tue Feb 21 10:44:51 2012 +0100 release: post-release bump to 3.3.91 M configure.ac -commit 02ee9030061d1d20cd24891c085cc38ee67d9289 (tag: 3.3.90) -Author: Vincent Untz -AuthorDate: Tue Feb 21 10:44:45 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 21 10:44:45 2012 +0100 +commit 02ee9030061d1d20cd24891c085cc38ee67d9289 +Author: Vincent Untz +Date: Tue Feb 21 10:44:45 2012 +0100 release: 3.3.90 M NEWS commit d78b71511f6fbf9a037422c7cf6645e4b0907bc7 -Author: Ryan Lortie -AuthorDate: Fri Feb 10 17:01:19 2012 -0500 -Commit: Ryan Lortie -CommitDate: Fri Feb 10 17:01:19 2012 -0500 +Author: Ryan Lortie +Date: Fri Feb 10 17:01:19 2012 -0500 fix obvious typo M gnome-session/gsm-system.c commit 14f124cb990c5a0612c94e105603fea8ec5338ff -Author: Matthias Clasen -AuthorDate: Thu Feb 9 23:32:23 2012 -0500 -Commit: Matthias Clasen -CommitDate: Thu Feb 9 23:32:59 2012 -0500 +Author: Matthias Clasen +Date: Thu Feb 9 23:32:23 2012 -0500 Fix the GsmSystem type registration @@ -5550,20 +6285,16 @@ M gnome-session/gsm-system.c commit b81a00bc2ba67ea73871c2efc0d08ea17b055305 -Author: Vincent Untz -AuthorDate: Tue Feb 7 08:26:21 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 7 08:26:21 2012 +0100 +Author: Vincent Untz +Date: Tue Feb 7 08:26:21 2012 +0100 release: post-release bump to 3.3.90 M configure.ac -commit 270f8e1b951c6cc11bef77a36e8729f49e80b192 (tag: 3.3.5) -Author: Vincent Untz -AuthorDate: Tue Feb 7 08:26:15 2012 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 7 08:26:15 2012 +0100 +commit 270f8e1b951c6cc11bef77a36e8729f49e80b192 +Author: Vincent Untz +Date: Tue Feb 7 08:26:15 2012 +0100 release: 3.3.5 @@ -5571,10 +6302,8 @@ M configure.ac commit 5e5b6f93b50349ceec93865ce8868214466d164d -Author: Vincent Untz -AuthorDate: Thu Feb 2 15:50:06 2012 +0100 -Commit: Vincent Untz -CommitDate: Thu Feb 2 15:50:06 2012 +0100 +Author: Vincent Untz +Date: Thu Feb 2 15:50:06 2012 +0100 build: Clarify configure output when systemd is used @@ -5583,10 +6312,8 @@ M configure.ac commit 079398edaa989b3356e253d23103965784bf51a6 -Author: Ray Strode -AuthorDate: Mon Jan 30 15:28:43 2012 -0500 -Commit: Ray Strode -CommitDate: Mon Jan 30 15:28:43 2012 -0500 +Author: Ray Strode +Date: Mon Jan 30 15:28:43 2012 -0500 systemd: add better error handling @@ -5602,10 +6329,8 @@ M gnome-session/gsm-systemd.c commit 371d254a38ab04b9e88530c2eca5837293f90a97 -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:21:31 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:21:31 2012 -0500 Add a systemd implementation of GsmSystem @@ -5617,10 +6342,8 @@ A gnome-session/gsm-systemd.h commit 7e8dd200bdbf3c5c4ef25c55816f7ac2ed62616e -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:17:20 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:17:20 2012 -0500 Implement GsmSystem in GsmConsolekit @@ -5630,10 +6353,8 @@ M gnome-session/gsm-consolekit.h commit 62df42e33cef8b537f5cb6217d5fbc981492c2c9 -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:16:37 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:16:37 2012 -0500 Use GsmSystem instead of GsmConsolekit @@ -5644,10 +6365,8 @@ M gnome-session/gsm-session-fill.c commit 7082c67a6e31b19662bfe12a48710f408994a14b -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:15:25 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:15:25 2012 -0500 Add a GsmSystem interface @@ -5658,10 +6377,8 @@ A gnome-session/gsm-system.h commit 088bf40453bda3897aa76b924f9044151f5baaee -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:01:49 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:01:49 2012 -0500 Add a --enable-systemd configure option @@ -5673,10 +6390,8 @@ M configure.ac commit f7dfc5ffea22635e19f363d0d147ed86dced5370 -Author: Matthias Clasen -AuthorDate: Tue Jan 24 18:00:05 2012 -0500 -Commit: Matthias Clasen -CommitDate: Tue Jan 24 18:27:53 2012 -0500 +Author: Matthias Clasen +Date: Tue Jan 24 18:00:05 2012 -0500 GsmConsolekit: make api more uniform @@ -5694,20 +6409,16 @@ M gnome-session/gsm-session-fill.c commit 2b39cce7682ecb08e09a489c7c343b4400f2b3e1 -Author: Hideki Yamane -AuthorDate: Mon Jan 23 13:31:08 2012 +0900 -Commit: Jiro Matsuzawa -CommitDate: Mon Jan 23 13:31:08 2012 +0900 +Author: Hideki Yamane +Date: Mon Jan 23 13:31:08 2012 +0900 [l10n] Update Japanese translation M po/ja.po commit 6aaf2ff522cffdf886faf4dfef8f0d881118c0c6 -Author: Matthias Clasen -AuthorDate: Wed Jan 4 19:47:43 2012 -0500 -Commit: Vincent Untz -CommitDate: Mon Jan 16 14:03:13 2012 +0100 +Author: Matthias Clasen +Date: Wed Jan 4 19:47:43 2012 -0500 gsm: Drop the unused property GsmConsoleKit::is-connected @@ -5718,10 +6429,8 @@ M gnome-session/gsm-consolekit.c commit e3151d516dbf187b93eb19ea03a4fab27e4a07f8 -Author: Matthias Clasen -AuthorDate: Mon Dec 26 22:06:12 2011 -0500 -Commit: Vincent Untz -CommitDate: Mon Jan 16 13:58:16 2012 +0100 +Author: Matthias Clasen +Date: Mon Dec 26 22:06:12 2011 -0500 gsm: Don't export gsm_consolekit_get_current_session_type @@ -5736,10 +6445,8 @@ M gnome-session/gsm-logout-dialog.c commit 5bf657e1327ccdd6068e3d7ececbe4818e767c1f -Author: Matthias Clasen -AuthorDate: Mon Dec 26 22:40:24 2011 -0500 -Commit: Vincent Untz -CommitDate: Mon Jan 16 13:54:59 2012 +0100 +Author: Matthias Clasen +Date: Mon Dec 26 22:40:24 2011 -0500 gsm: Don't leak a reference to the GsmConsolekit singleton @@ -5748,60 +6455,48 @@ M gnome-session/gsm-manager.c commit 1a56c0ddc63dfd4607e432990ee0d18872284449 -Author: Muhammet Kara -AuthorDate: Wed Jan 4 10:15:16 2012 +0200 -Commit: Muhammet Kara -CommitDate: Wed Jan 4 10:15:16 2012 +0200 +Author: Muhammet Kara +Date: Wed Jan 4 10:15:16 2012 +0200 [l10n]Updated Turkish translation M po/tr.po commit 0662a4b96973716eaa980c5915ce3be8d1df8a63 -Author: Andreas N -AuthorDate: Mon Dec 26 17:04:53 2011 +0100 -Commit: Åsmund Skjæveland -CommitDate: Mon Dec 26 17:04:53 2011 +0100 +Author: Andreas N +Date: Mon Dec 26 17:04:53 2011 +0100 Updated Norwegian Nynorsk translation M po/nn.po commit 9e8572719ab5fec69474cf43053351949abcac84 -Author: Vincent Untz -AuthorDate: Tue Dec 20 09:45:30 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Dec 20 09:45:30 2011 +0100 +Author: Vincent Untz +Date: Tue Dec 20 09:45:30 2011 +0100 build: Create xz tarballs M configure.ac commit fa00cce4ab51e09d11097fbf16be7188a3c537db -Author: Vincent Untz -AuthorDate: Tue Dec 20 09:19:48 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Dec 20 09:19:48 2011 +0100 +Author: Vincent Untz +Date: Tue Dec 20 09:19:48 2011 +0100 release: post-release bump to 3.3.4 M configure.ac -commit 1da9a898e1a4d017334b62733c09d822502f9d31 (tag: 3.3.3) -Author: Vincent Untz -AuthorDate: Tue Dec 20 09:19:41 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Dec 20 09:19:41 2011 +0100 +commit 1da9a898e1a4d017334b62733c09d822502f9d31 +Author: Vincent Untz +Date: Tue Dec 20 09:19:41 2011 +0100 release: 3.3.3 M NEWS commit 29eee98f67efded080f6fad238d63a13aadee92b -Author: Vincent Untz -AuthorDate: Mon Dec 19 10:49:00 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Dec 19 10:49:00 2011 +0100 +Author: Vincent Untz +Date: Mon Dec 19 10:49:00 2011 +0100 data: Add regexps to blacklist pre-r300 radeon @@ -5813,70 +6508,56 @@ M data/hardware-compatibility commit 652a68fd484c0869955c41abe656787054fdab15 -Author: Vincent Untz -AuthorDate: Mon Nov 21 14:05:18 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 21 14:05:18 2011 +0100 +Author: Vincent Untz +Date: Mon Nov 21 14:05:18 2011 +0100 release: post-release bump to 3.3.3 M configure.ac -commit be1ac0a5fe1675b625809ca0f5bf17753b7da71a (tag: 3.3.2) -Author: Vincent Untz -AuthorDate: Mon Nov 21 14:05:07 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 21 14:05:07 2011 +0100 +commit be1ac0a5fe1675b625809ca0f5bf17753b7da71a +Author: Vincent Untz +Date: Mon Nov 21 14:05:07 2011 +0100 release: 3.3.2 M NEWS commit 571db285cbb202954744231fc42327561d937cc8 -Author: Kristjan SCHMIDT -AuthorDate: Sun Nov 13 16:54:14 2011 +0100 -Commit: Kristjan SCHMIDT -CommitDate: Sun Nov 13 16:54:14 2011 +0100 +Author: Kristjan SCHMIDT +Date: Sun Nov 13 16:54:14 2011 +0100 Updated Esperanto translation M po/eo.po commit b7db5c55424a3ce0b0c4d24cb02862402a70ff29 -Author: Vincent Untz -AuthorDate: Tue Oct 25 21:37:36 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Oct 25 21:38:33 2011 +0200 +Author: Vincent Untz +Date: Tue Oct 25 21:37:36 2011 +0200 data: Fix regexp for Intel 830-865 hardware blacklisting M data/hardware-compatibility commit 1080699b182000e1755a99dc01d9fbb55c6b711b -Author: Muhammet Kara -AuthorDate: Mon Oct 24 21:42:40 2011 +0300 -Commit: Muhammet Kara -CommitDate: Mon Oct 24 21:42:40 2011 +0300 +Author: Muhammet Kara +Date: Mon Oct 24 21:42:40 2011 +0300 Updated Turkish translation M po/tr.po commit 5c368cc14d3a1d1838a786a1dd9e6318f66948d2 -Author: Vincent Untz -AuthorDate: Mon Oct 24 14:08:34 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Oct 24 14:08:34 2011 +0200 +Author: Vincent Untz +Date: Mon Oct 24 14:08:34 2011 +0200 release: post-release bump to 3.3.2 M configure.ac -commit 59539181a11375ed9438b4e8be71f95d9db95ba5 (tag: 3.3.1) -Author: Vincent Untz -AuthorDate: Mon Oct 24 14:08:28 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Oct 24 14:08:28 2011 +0200 +commit 59539181a11375ed9438b4e8be71f95d9db95ba5 +Author: Vincent Untz +Date: Mon Oct 24 14:08:28 2011 +0200 release: 3.3.1 @@ -5884,20 +6565,16 @@ M configure.ac commit cf55ec446f01ba5ed5e34edcef08de83f332d43f -Author: Ihar Hrachyshka -AuthorDate: Mon Oct 24 01:30:59 2011 +0300 -Commit: Ihar Hrachyshka -CommitDate: Mon Oct 24 01:30:59 2011 +0300 +Author: Ihar Hrachyshka +Date: Mon Oct 24 01:30:59 2011 +0300 Updated Belarusian translation. M po/be.po commit 5762becdbb2a308647067e0e09617b3f91f0ac0e -Author: Vincent Untz -AuthorDate: Wed Oct 19 14:36:57 2011 +0200 -Commit: Vincent Untz -CommitDate: Wed Oct 19 14:40:37 2011 +0200 +Author: Vincent Untz +Date: Wed Oct 19 14:36:57 2011 +0200 data: Blacklist Intel 830-865 hardware @@ -5906,10 +6583,8 @@ M data/hardware-compatibility commit 50b121a7737a13bde1195d1aea215ff8789f65fd -Author: Vincent Untz -AuthorDate: Wed Oct 19 14:27:25 2011 +0200 -Commit: Vincent Untz -CommitDate: Wed Oct 19 14:40:33 2011 +0200 +Author: Vincent Untz +Date: Wed Oct 19 14:27:25 2011 +0200 tools: Use whitelist/blacklist regexps when evaluating renderer @@ -5923,10 +6598,8 @@ M tools/gnome-session-check-accelerated-helper.c commit a8ccac0ef5074229b562b90dc8dcf183c0440395 -Author: Vincent Untz -AuthorDate: Wed Oct 19 13:14:50 2011 +0200 -Commit: Vincent Untz -CommitDate: Wed Oct 19 14:39:31 2011 +0200 +Author: Vincent Untz +Date: Wed Oct 19 13:14:50 2011 +0200 tools: Look at gnome.fallback argument in kernel boot line @@ -5936,30 +6609,24 @@ M tools/gnome-session-check-accelerated-helper.c commit 70ff3bb3cd07cefe61756239cc478aeabb5498ae -Author: Vincent Untz -AuthorDate: Sun Oct 16 15:20:57 2011 +0200 -Commit: Vincent Untz -CommitDate: Sun Oct 16 15:20:57 2011 +0200 +Author: Vincent Untz +Date: Sun Oct 16 15:20:57 2011 +0200 release: post-release bump to 3.2.2 M configure.ac -commit 6b44f19d78717e3be3522cc15448f75285095ff2 (tag: 3.2.1) -Author: Vincent Untz -AuthorDate: Sun Oct 16 15:20:50 2011 +0200 -Commit: Vincent Untz -CommitDate: Sun Oct 16 15:20:50 2011 +0200 +commit 6b44f19d78717e3be3522cc15448f75285095ff2 +Author: Vincent Untz +Date: Sun Oct 16 15:20:50 2011 +0200 release: 3.2.1 M NEWS commit 8ac1644772f3fb87364b3a4a36af7c594fff8a9f -Author: Brian Cameron -AuthorDate: Fri Oct 7 11:23:07 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Oct 7 11:23:20 2011 +0200 +Author: Brian Cameron +Date: Fri Oct 7 11:23:07 2011 +0200 gsm: Fix crash on Solaris because of bad comparison @@ -5968,10 +6635,8 @@ M gnome-session/gsm-shell-extensions.c commit be627c10409129408e135925d5dd83ae2d554fa0 -Author: Rodrigo Moya -AuthorDate: Thu Oct 6 12:11:09 2011 +0200 -Commit: Rodrigo Moya -CommitDate: Thu Oct 6 12:11:09 2011 +0200 +Author: Rodrigo Moya +Date: Thu Oct 6 12:11:09 2011 +0200 gsm: Refuse to install an idle timeout of 0 seconds @@ -5983,50 +6648,40 @@ M gnome-session/gsm-presence.c commit b453733edd7302246f26fcecb9f71ae7cffe7436 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sat Oct 1 20:23:53 2011 +1000 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sat Oct 1 20:23:53 2011 +1000 +Author: Nguyễn Thái Ngọc Duy +Date: Sat Oct 1 20:23:53 2011 +1000 Updated Vietnamese translation M po/vi.po commit a4c70998e65cf344d1712e7ee9d5fa52f0f3eb97 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sat Oct 1 20:21:13 2011 +1000 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sat Oct 1 20:21:13 2011 +1000 +Author: Nguyễn Thái Ngọc Duy +Date: Sat Oct 1 20:21:13 2011 +1000 po/vi: import from Damned Lies M po/vi.po commit 970df465ecc78df14174a82e4c02d272d890eaf6 -Author: Tiffany Antopolski -AuthorDate: Fri Sep 30 18:07:01 2011 +0200 -Commit: Kristjan SCHMIDT -CommitDate: Fri Sep 30 18:07:01 2011 +0200 +Author: Tiffany Antopolski +Date: Fri Sep 30 18:07:01 2011 +0200 Updated Esperanto translation M po/eo.po commit 3a866bc6f4df218bfa8d4f5a90163ba70fe8d145 -Author: Dexter Morgan -AuthorDate: Wed Sep 28 01:54:18 2011 +0200 -Commit: Olav Vitters -CommitDate: Wed Sep 28 01:54:18 2011 +0200 +Author: Dexter Morgan +Date: Wed Sep 28 01:54:18 2011 +0200 fix string format M gnome-session/gsm-manager.c commit bd68c04cf4502e7c97ac79c6a73ff4c6da56317b -Author: Chao-Hsiung Liao -AuthorDate: Mon Sep 26 23:03:57 2011 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Mon Sep 26 23:03:57 2011 +0800 +Author: Chao-Hsiung Liao +Date: Mon Sep 26 23:03:57 2011 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -6034,150 +6689,120 @@ M po/zh_TW.po commit 90f21ed69a91fbd1b3b93416c412c7d6f8d492e7 -Author: Carles Ferrando -AuthorDate: Mon Sep 26 14:25:06 2011 +0200 -Commit: Gil Forcada -CommitDate: Mon Sep 26 14:25:06 2011 +0200 +Author: Carles Ferrando +Date: Mon Sep 26 14:25:06 2011 +0200 [l10n]Updated Catalan (Valencian) translation M po/ca@valencia.po commit b24f5444e8340d43da87ec261abd1880ccd27b0d -Author: Vincent Untz -AuthorDate: Mon Sep 26 11:08:30 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 26 11:08:30 2011 +0200 +Author: Vincent Untz +Date: Mon Sep 26 11:08:30 2011 +0200 release: post-release bump to 3.2.1 M configure.ac -commit d320943f9b01e8d9ac769ab0f1d2f3365675b68b (tag: 3.2.0) -Author: Vincent Untz -AuthorDate: Mon Sep 26 11:08:23 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 26 11:08:23 2011 +0200 +commit d320943f9b01e8d9ac769ab0f1d2f3365675b68b +Author: Vincent Untz +Date: Mon Sep 26 11:08:23 2011 +0200 release: 3.2.0 M NEWS commit 776d900a8f1b05a05f109c997c3065906d9ed323 -Author: Petr Kovar -AuthorDate: Mon Sep 26 00:34:19 2011 +0200 -Commit: Petr Kovar -CommitDate: Mon Sep 26 00:34:19 2011 +0200 +Author: Petr Kovar +Date: Mon Sep 26 00:34:19 2011 +0200 Update Czech translation M po/cs.po commit 5089f724336bbc8e42d5ac9ee28f62e9fbe3aefd -Author: Andika Triwidada -AuthorDate: Sun Sep 25 15:31:25 2011 +0700 -Commit: Andika Triwidada -CommitDate: Sun Sep 25 15:31:25 2011 +0700 +Author: Andika Triwidada +Date: Sun Sep 25 15:31:25 2011 +0700 Updated Indonesian translation M po/id.po commit 562edb76dd5a0b03e2a863c01487d9adf103fba1 -Author: Aurimas Černius -AuthorDate: Sat Sep 24 15:35:34 2011 +0300 -Commit: Aurimas Černius -CommitDate: Sat Sep 24 15:35:34 2011 +0300 +Author: Aurimas Černius +Date: Sat Sep 24 15:35:34 2011 +0300 Updated Lithuanian translation M po/lt.po commit 17fe833114174b48abb585907548e9a2e25c4961 -Author: Inaki Larranaga Murgoitio -AuthorDate: Fri Sep 23 18:06:58 2011 +0200 -Commit: dooteo -CommitDate: Fri Sep 23 18:06:58 2011 +0200 +Author: Inaki Larranaga Murgoitio +Date: Fri Sep 23 18:06:58 2011 +0200 Updated Basque language M po/eu.po commit b07eadcb6c764ce70495e237693852009a4bb28d -Author: Tommi Vainikainen -AuthorDate: Fri Sep 23 16:49:30 2011 +0300 -Commit: Tommi Vainikainen -CommitDate: Fri Sep 23 16:49:30 2011 +0300 +Author: Tommi Vainikainen +Date: Fri Sep 23 16:49:30 2011 +0300 Updated Finnish translation M po/fi.po commit 511d613ea2db3aa1251b6559da22db300be4878c -Author: Changwoo Ryu -AuthorDate: Fri Sep 23 05:14:48 2011 +0900 -Commit: Changwoo Ryu -CommitDate: Fri Sep 23 05:14:48 2011 +0900 +Author: Changwoo Ryu +Date: Fri Sep 23 05:14:48 2011 +0900 Updated Korean translation M po/ko.po commit 8f694f91716368248ef480763ad391475061b822 -Author: ipraveen -AuthorDate: Thu Sep 22 20:29:58 2011 +0530 -Commit: ipraveen -CommitDate: Thu Sep 22 20:35:31 2011 +0530 +Author: ipraveen +Date: Thu Sep 22 20:29:58 2011 +0530 Updated Telugu Translation M po/te.po commit a6f03095effa765ff6c9ea53e79ce07a4b921d22 -Author: Nilamdyuti Goswami -AuthorDate: Thu Sep 22 12:28:14 2011 +0200 -Commit: Andre Klapper -CommitDate: Thu Sep 22 12:28:14 2011 +0200 +Author: Nilamdyuti Goswami +Date: Thu Sep 22 12:28:14 2011 +0200 Update Assamese translation M po/as.po commit 2a67c61d4701b83a9f64b88f52f970fe2077c7c9 -Author: Sweta Kothari -AuthorDate: Thu Sep 22 14:27:12 2011 +0530 -Commit: Sweta Kothari -CommitDate: Thu Sep 22 14:27:12 2011 +0530 +Author: Sweta Kothari +Date: Thu Sep 22 14:27:12 2011 +0530 Updated Gujarati Translations M po/gu.po commit 3c4d634bf9b27fc963ad2bd7b3b62f7ea3dcbe3b -Author: Flemming Christensen -AuthorDate: Wed Sep 21 09:33:48 2011 +0200 -Commit: Kenneth Nielsen -CommitDate: Wed Sep 21 09:33:48 2011 +0200 +Author: Flemming Christensen +Date: Wed Sep 21 09:33:48 2011 +0200 Updated Danish translation M po/da.po commit c2760029a4202c2f7a89d0084152d1c46111feb6 -Author: Gabor Kelemen -AuthorDate: Wed Sep 21 03:25:57 2011 +0200 -Commit: Gabor Kelemen -CommitDate: Wed Sep 21 03:25:57 2011 +0200 +Author: Gabor Kelemen +Date: Wed Sep 21 03:25:57 2011 +0200 Updated Hungarian translation M po/hu.po commit 82f49c3d4878fd3199f63f01a9264378e4814aee -Author: Мирослав Николић -AuthorDate: Tue Sep 20 21:52:43 2011 +0200 -Commit: Miloš Popović -CommitDate: Tue Sep 20 21:52:43 2011 +0200 +Author: Мирослав Николић +Date: Tue Sep 20 21:52:43 2011 +0200 Updated Serbian translation @@ -6185,40 +6810,32 @@ M po/sr@latin.po commit f762772d71c0c9bdf975a1adc6593aa715abd385 -Author: Daniel Korostil -AuthorDate: Tue Sep 20 15:24:15 2011 +0300 -Commit: Daniel Korostil -CommitDate: Tue Sep 20 15:24:15 2011 +0300 +Author: Daniel Korostil +Date: Tue Sep 20 15:24:15 2011 +0300 Uploaded Ukranian M po/uk.po commit 0844b198f95b6a41d8d3cd07e23c42f6ed312c24 -Author: Vincent Untz -AuthorDate: Mon Sep 19 23:43:45 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 19 23:43:45 2011 +0200 +Author: Vincent Untz +Date: Mon Sep 19 23:43:45 2011 +0200 release: post-release bump to 3.2.0 M configure.ac -commit f11e9c917c498a455413a8d0fbb1d444d4c5edd8 (tag: 3.1.92) -Author: Vincent Untz -AuthorDate: Mon Sep 19 23:43:35 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 19 23:43:35 2011 +0200 +commit f11e9c917c498a455413a8d0fbb1d444d4c5edd8 +Author: Vincent Untz +Date: Mon Sep 19 23:43:35 2011 +0200 release: 3.1.92 M NEWS commit fd9fec86836a808570dc1d109b05819fbad56d25 -Author: Vincent Untz -AuthorDate: Mon Sep 19 23:33:37 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 19 23:36:07 2011 +0200 +Author: Vincent Untz +Date: Mon Sep 19 23:33:37 2011 +0200 gsm: Add gsm_consolekit_is_current_session_login() utility function @@ -6231,130 +6848,104 @@ M gnome-session/gsm-session-fill.c commit 6c86c7373fa9c068dc71c9422dbdc9da9d2d9684 -Author: Joan Duran -AuthorDate: Mon Sep 19 00:31:06 2011 +0200 -Commit: Gil Forcada -CommitDate: Mon Sep 19 00:31:06 2011 +0200 +Author: Joan Duran +Date: Mon Sep 19 00:31:06 2011 +0200 [l10n]Updated Catalan translation M po/ca.po commit 35eb5a6ec68abff58acc05f24aaef7e1fa386fac -Author: Ihar Hrachyshka -AuthorDate: Sun Sep 18 19:14:57 2011 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sun Sep 18 19:15:15 2011 +0300 +Author: Ihar Hrachyshka +Date: Sun Sep 18 19:14:57 2011 +0300 Updated Belarusian translation (some fixes after manual testing). M po/be.po commit a7b82b004daa5f89d176f7cb8ac9bec665949c0c -Author: Mario Blättermann -AuthorDate: Sun Sep 18 15:27:30 2011 +0200 -Commit: Mario Blättermann -CommitDate: Sun Sep 18 15:27:30 2011 +0200 +Author: Mario Blättermann +Date: Sun Sep 18 15:27:30 2011 +0200 [l10n] Updated German translation M po/de.po commit d57f039c17c46e811a59cc4c9f05c71fab9180d4 -Author: Alexander Shopov -AuthorDate: Sun Sep 18 10:51:28 2011 +0300 -Commit: Alexander Shopov -CommitDate: Sun Sep 18 10:51:28 2011 +0300 +Author: Alexander Shopov +Date: Sun Sep 18 10:51:28 2011 +0300 Updated Bulgarian translation M po/bg.po commit 2b19cef70759ce1a4d4cef348fcfd976bd5cd332 -Author: Matej Urbančič -AuthorDate: Sat Sep 17 10:55:06 2011 +0200 -Commit: Matej Urbančič -CommitDate: Sat Sep 17 10:55:06 2011 +0200 +Author: Matej Urbančič +Date: Sat Sep 17 10:55:06 2011 +0200 Updated Slovenian translation M po/sl.po commit 4199397c39a1d2417702dfa7c82fe0805fc571dc -Author: Yinghua Wang -AuthorDate: Sat Sep 17 14:06:27 2011 +0800 -Commit: YunQiang Su -CommitDate: Sat Sep 17 14:06:27 2011 +0800 +Author: Yinghua Wang +Date: Sat Sep 17 14:06:27 2011 +0800 update Simplified Chinese (zh_CN) translation M po/zh_CN.po commit 11c4a355102350d42043801fe59816be9403e6ac -Author: Theppitak Karoonboonyanan -AuthorDate: Sat Sep 17 12:09:36 2011 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Sat Sep 17 12:10:11 2011 +0700 +Author: Theppitak Karoonboonyanan +Date: Sat Sep 17 12:09:36 2011 +0700 Updated Thai translation. M po/th.po commit a891df025b760dbd81008e58e14794bbace8d363 -Author: Jiro Matsuzawa -AuthorDate: Sat Sep 17 13:09:32 2011 +0900 -Commit: Jiro Matsuzawa -CommitDate: Sat Sep 17 13:09:32 2011 +0900 +Author: Jiro Matsuzawa +Date: Sat Sep 17 13:09:32 2011 +0900 Updated Japanese translation M po/ja.po commit 8c053c18e032a5ccb17b96ec8a044baee4484aa1 -Author: Antonio Fernandes C. Neto -AuthorDate: Fri Sep 16 09:14:31 2011 -0400 -Commit: Og B. Maciel -CommitDate: Fri Sep 16 09:14:31 2011 -0400 +Author: Antonio Fernandes C. Neto +Date: Fri Sep 16 09:14:31 2011 -0400 Updated Brazilian Portuguese translation. M po/pt_BR.po commit 7562cf871adc840124ab96f635d85be63e35a518 -Author: Anass Ahmed -AuthorDate: Fri Sep 16 13:46:39 2011 +0100 -Commit: Abderrahim Kitouni -CommitDate: Fri Sep 16 13:46:39 2011 +0100 +Author: Anass Ahmed +Date: Fri Sep 16 13:46:39 2011 +0100 Updated Arabic translation M po/ar.po commit 53dc95eca70eeb26ff19fb16da8cce5370d5b90d -Author: Martin Srebotnjak -AuthorDate: Thu Sep 15 22:36:47 2011 +0200 -Commit: Matej Urbančič -CommitDate: Thu Sep 15 22:36:47 2011 +0200 +Author: Martin Srebotnjak +Date: Thu Sep 15 22:36:47 2011 +0200 Updated Slovenian translation M po/sl.po commit 8e1d51b15c3ab72a3d2863bac99f7b6628004dee -Author: dmustieles -AuthorDate: Wed Sep 14 17:41:28 2011 +0200 -Commit: dmustieles -CommitDate: Wed Sep 14 17:41:28 2011 +0200 +Author: dmustieles +Date: Wed Sep 14 17:41:28 2011 +0200 Updated Spanish translation M po/es.po commit d3a308236b197171ebaea79e5c12e986e0c92173 -Author: Matthias Clasen -AuthorDate: Tue Sep 13 09:30:08 2011 -0400 -Commit: Matthias Clasen -CommitDate: Tue Sep 13 09:31:19 2011 -0400 +Author: Matthias Clasen +Date: Tue Sep 13 09:30:08 2011 -0400 GsmFailWhaleDialog: chain up in finalize @@ -6364,10 +6955,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit a11d6fe2b07524f061f8e9c6cda428906e9cb53e -Author: Matthias Clasen -AuthorDate: Fri Sep 9 17:15:39 2011 -0400 -Commit: Matthias Clasen -CommitDate: Tue Sep 13 09:31:19 2011 -0400 +Author: Matthias Clasen +Date: Fri Sep 9 17:15:39 2011 -0400 Fail whale: Don't offer logout on the login screen @@ -6379,80 +6968,64 @@ M gnome-session/gsm-manager.c commit f548342034cab6182ee91525a25896ed07134929 -Author: Claude Paroz -AuthorDate: Mon Sep 12 20:03:02 2011 +0200 -Commit: Claude Paroz -CommitDate: Mon Sep 12 20:03:02 2011 +0200 +Author: Claude Paroz +Date: Mon Sep 12 20:03:02 2011 +0200 Updated French translation M po/fr.po commit 9684c8072c0ca90d18fe8c6508bb57678be8668c -Author: Dr.T.Vasudevan -AuthorDate: Mon Sep 12 21:49:41 2011 +0530 -Commit: Dr.T.Vasudevan -CommitDate: Mon Sep 12 21:49:41 2011 +0530 +Author: Dr.T.Vasudevan +Date: Mon Sep 12 21:49:41 2011 +0530 updated Tamil translation M po/ta.po commit dba5f07e45c5761994616f567385d048be352b77 -Author: Rudolfs Mazurs -AuthorDate: Sun Sep 11 21:52:49 2011 +0300 -Commit: Peteris Krisjanis -CommitDate: Sun Sep 11 21:52:49 2011 +0300 +Author: Rudolfs Mazurs +Date: Sun Sep 11 21:52:49 2011 +0300 Updated Latvian translation. M po/lv.po commit b9cee0328f9328293aef5eb4ab90ae6f35a0aba4 -Author: Duarte Loreto -AuthorDate: Sat Sep 10 23:46:26 2011 +0100 -Commit: Duarte Loreto -CommitDate: Sat Sep 10 23:46:26 2011 +0100 +Author: Duarte Loreto +Date: Sat Sep 10 23:46:26 2011 +0100 Updated Portuguese translation M po/pt.po commit 714405e0dd73b7c5fe2218b90f26cc8a3e9695d7 -Author: Bruce Cowan -AuthorDate: Fri Sep 9 13:02:39 2011 +0100 -Commit: Bruce Cowan -CommitDate: Fri Sep 9 13:02:39 2011 +0100 +Author: Bruce Cowan +Date: Fri Sep 9 13:02:39 2011 +0100 Updated British English translation M po/en_GB.po commit ca757c93fddec80a95257fd163f65e01c3ffcd5d -Author: Yaron Shahrabani -AuthorDate: Fri Sep 9 13:22:16 2011 +0300 -Commit: Yaron Shahrabani -CommitDate: Fri Sep 9 13:22:16 2011 +0300 +Author: Yaron Shahrabani +Date: Fri Sep 9 13:22:16 2011 +0300 Updated Hebrew translation. M po/he.po commit 2c3b11458afd4066de5012391cd845d3694e64a7 -Author: Yaron Shahrabani -AuthorDate: Fri Sep 9 13:19:16 2011 +0300 -Commit: Yaron Shahrabani -CommitDate: Fri Sep 9 13:19:16 2011 +0300 +Author: Yaron Shahrabani +Date: Fri Sep 9 13:19:16 2011 +0300 Updated Hebrew translation. M po/he.po commit ae8fa537262d6bec9c7eaa5a963cba98ec4e2136 -Author: Vincent Untz -AuthorDate: Fri Sep 9 09:54:14 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Sep 9 09:57:22 2011 +0200 +Author: Vincent Untz +Date: Fri Sep 9 09:54:14 2011 +0200 gsm: Disconnect all dbus clients when dbus is disconnected @@ -6471,10 +7044,8 @@ M gnome-session/gsm-manager.c commit 67dd879fbe62bc28d3bbc48b88c3842e2cb827e8 -Author: Vincent Untz -AuthorDate: Fri Sep 9 09:51:54 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Sep 9 09:57:22 2011 +0200 +Author: Vincent Untz +Date: Fri Sep 9 09:51:54 2011 +0200 gsm: Never mark as handled the Disconnected signal from dbus @@ -6486,70 +7057,56 @@ M gnome-session/gsm-shell.c commit 81bff9b419e997294d57e50d08d634862902bb11 -Author: Luca Ferretti -AuthorDate: Thu Sep 8 23:10:39 2011 +0200 -Commit: Luca Ferretti -CommitDate: Thu Sep 8 23:10:49 2011 +0200 +Author: Luca Ferretti +Date: Thu Sep 8 23:10:39 2011 +0200 l10n: Updated Italian translation M po/it.po commit 59572360db6dd4190a44e99b91870569aeaa3f72 -Author: Piotr Drąg -AuthorDate: Thu Sep 8 22:25:25 2011 +0200 -Commit: Piotr Drąg -CommitDate: Thu Sep 8 22:25:25 2011 +0200 +Author: Piotr Drąg +Date: Thu Sep 8 22:25:25 2011 +0200 Updated Polish translation M po/pl.po commit 82f228b3072b98c9a69fa8e8954102cc48a46f7f -Author: Luca Ferretti -AuthorDate: Thu Sep 8 22:03:36 2011 +0200 -Commit: Luca Ferretti -CommitDate: Thu Sep 8 22:03:49 2011 +0200 +Author: Luca Ferretti +Date: Thu Sep 8 22:03:36 2011 +0200 l10n: Updated Italian translation M po/it.po commit 59242276e95ca9e6cdd2b99afe4279a9339efe67 -Author: A S Alam -AuthorDate: Thu Sep 8 21:58:01 2011 +0530 -Commit: A S Alam -CommitDate: Thu Sep 8 21:58:01 2011 +0530 +Author: A S Alam +Date: Thu Sep 8 21:58:01 2011 +0530 update PunjabiTranslation M po/pa.po commit 4c5da28a08dbcddf34490a264cba1f8ff48bd4d4 -Author: Ihar Hrachyshka -AuthorDate: Wed Sep 7 01:52:38 2011 +0300 -Commit: Ihar Hrachyshka -CommitDate: Wed Sep 7 01:52:38 2011 +0300 +Author: Ihar Hrachyshka +Date: Wed Sep 7 01:52:38 2011 +0300 Updated Belarusian translation. M po/be.po commit 74fcc90ad7dc64483d55e52a1507e824b97cbe71 -Author: Arash Mousavi -AuthorDate: Tue Sep 6 23:26:44 2011 +0430 -Commit: Arash Mousavi -CommitDate: Tue Sep 6 23:26:44 2011 +0430 +Author: Arash Mousavi +Date: Tue Sep 6 23:26:44 2011 +0430 Updated Persian translation M po/fa.po commit 42918b4a0eaafb59654c1566f9b6715d22f256ea -Author: Chao-Hsiung Liao -AuthorDate: Tue Sep 6 19:30:34 2011 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Tue Sep 6 19:30:34 2011 +0800 +Author: Chao-Hsiung Liao +Date: Tue Sep 6 19:30:34 2011 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -6557,40 +7114,32 @@ M po/zh_TW.po commit 1e7c5373e8f006ba9823c07f4486da71ac0687f7 -Author: Wouter Bolsterlee -AuthorDate: Tue Sep 6 01:08:01 2011 +0200 -Commit: Wouter Bolsterlee -CommitDate: Tue Sep 6 01:08:01 2011 +0200 +Author: Wouter Bolsterlee +Date: Tue Sep 6 01:08:01 2011 +0200 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit ae7a42a8c5d6662c69dbfa76f992119125525944 -Author: Vincent Untz -AuthorDate: Mon Sep 5 09:02:29 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 5 09:02:29 2011 +0200 +Author: Vincent Untz +Date: Mon Sep 5 09:02:29 2011 +0200 release: post-release bump to 3.1.92 M configure.ac -commit bfc54caa9967d35960b4246c9b3ce8d7014fea41 (tag: 3.1.91) -Author: Vincent Untz -AuthorDate: Mon Sep 5 09:02:23 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 5 09:02:23 2011 +0200 +commit bfc54caa9967d35960b4246c9b3ce8d7014fea41 +Author: Vincent Untz +Date: Mon Sep 5 09:02:23 2011 +0200 release: 3.1.91 M NEWS commit 2701a9ae583fa27d23902e6b5d006213bda5c461 -Author: Matthias Clasen -AuthorDate: Sun Sep 4 17:15:37 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sun Sep 4 17:15:37 2011 -0400 +Author: Matthias Clasen +Date: Sun Sep 4 17:15:37 2011 -0400 Add a translator comment @@ -6599,50 +7148,40 @@ M gnome-session/main.c commit cbd3ab515f553ca8cbbb6b4419d43e8efdd307a6 -Author: Fran Dieguez -AuthorDate: Sun Sep 4 19:59:39 2011 +0200 -Commit: Fran Dieguez -CommitDate: Sun Sep 4 19:59:39 2011 +0200 +Author: Fran Dieguez +Date: Sun Sep 4 19:59:39 2011 +0200 Updated galician translations M po/gl.po commit 2e69ba5e2f5ca5824b120afb34003134de8ec435 -Author: Ihar Hrachyshka -AuthorDate: Fri Sep 2 21:19:08 2011 +0300 -Commit: Ihar Hrachyshka -CommitDate: Fri Sep 2 21:19:08 2011 +0300 +Author: Ihar Hrachyshka +Date: Fri Sep 2 21:19:08 2011 +0300 Updated Belarusian translation. M po/be.po commit bb34a9f279ad0f74a53a76f28609c4efb3be3f3b -Author: Daniel Nylander -AuthorDate: Thu Sep 1 12:34:09 2011 +0200 -Commit: Daniel Nylander -CommitDate: Thu Sep 1 12:34:09 2011 +0200 +Author: Daniel Nylander +Date: Thu Sep 1 12:34:09 2011 +0200 Updated Swedish translation M po/sv.po commit fd812396d77c96bd4469f66617c753d5ea238b51 -Author: Kjartan Maraas -AuthorDate: Thu Sep 1 08:08:05 2011 +0200 -Commit: Kjartan Maraas -CommitDate: Thu Sep 1 08:08:05 2011 +0200 +Author: Kjartan Maraas +Date: Thu Sep 1 08:08:05 2011 +0200 Added Norwegian bokmål translation M po/nb.po commit b2ad0abf2263b4af044388035df8993db9223a1b -Author: Owen W. Taylor -AuthorDate: Tue Aug 30 14:46:00 2011 -0400 -Commit: Owen W. Taylor -CommitDate: Tue Aug 30 14:46:32 2011 -0400 +Author: Owen W. Taylor +Date: Tue Aug 30 14:46:00 2011 -0400 Fix usage of %lld for 64-bit formats @@ -6651,60 +7190,48 @@ M gnome-session/gs-idle-monitor.c commit 13e180f18286086aef3ae9bd546983dadb72b033 -Author: Matthias Clasen -AuthorDate: Mon Aug 29 21:10:08 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Aug 29 21:10:08 2011 -0400 +Author: Matthias Clasen +Date: Mon Aug 29 21:10:08 2011 -0400 Post-release version bump M configure.ac -commit d3725ca1fc614b2f08f0b3c6526af1cb8cbe15ba (tag: 3.1.90) -Author: Matthias Clasen -AuthorDate: Mon Aug 29 20:54:11 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Aug 29 20:54:11 2011 -0400 +commit d3725ca1fc614b2f08f0b3c6526af1cb8cbe15ba +Author: Matthias Clasen +Date: Mon Aug 29 20:54:11 2011 -0400 Update NEWS for 3.1.90 M NEWS commit 496d0ba9492999979739e6f8b8820e14d169355f -Author: Stas Solovey -AuthorDate: Mon Aug 29 20:17:45 2011 +0400 -Commit: Yuri Myasoedov -CommitDate: Mon Aug 29 20:17:45 2011 +0400 +Author: Stas Solovey +Date: Mon Aug 29 20:17:45 2011 +0400 Fixed and updated Russian translation M po/ru.po commit 8ad6eea1796a77197b1c9a1da6060af4a9873d20 -Author: Piotr Drąg -AuthorDate: Mon Aug 29 16:42:19 2011 +0200 -Commit: Piotr Drąg -CommitDate: Mon Aug 29 16:42:19 2011 +0200 +Author: Piotr Drąg +Date: Mon Aug 29 16:42:19 2011 +0200 Updated POTFILES.in M po/POTFILES.in commit de30297e831633d38c482ede0e0cb0295d775515 -Author: Jorge González -AuthorDate: Mon Aug 29 13:04:16 2011 +0200 -Commit: Jorge González -CommitDate: Mon Aug 29 13:04:16 2011 +0200 +Author: Jorge González +Date: Mon Aug 29 13:04:16 2011 +0200 Updated Spanish translation M po/es.po commit e5711e50faa5cd2ed127e2fed0d249f0ee6d90e8 -Author: Matthias Clasen -AuthorDate: Sun Aug 28 16:54:43 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sun Aug 28 16:56:17 2011 -0400 +Author: Matthias Clasen +Date: Sun Aug 28 16:54:43 2011 -0400 Add AM_PROG_CC_C_O @@ -6715,10 +7242,8 @@ M configure.ac commit 093d319757e6131734622103f70f46687ac1a625 -Author: William Jon McCann -AuthorDate: Sun Apr 3 21:23:59 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sun Aug 28 16:50:03 2011 -0400 +Author: William Jon McCann +Date: Sun Apr 3 21:23:59 2011 -0400 Remove calls to gconf-sanity-check @@ -6733,10 +7258,8 @@ M gnome-session/main.c commit 44995eb51e295d09f49849d32b76577fd4c09e94 -Author: Matthias Clasen -AuthorDate: Sun Aug 28 16:46:34 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sun Aug 28 16:47:43 2011 -0400 +Author: Matthias Clasen +Date: Sun Aug 28 16:46:34 2011 -0400 Fail whale: respect lockdown @@ -6752,50 +7275,40 @@ M gnome-session/main.c commit 8c6000d7404dbf2735234ab4018f15fb1f1e975e -Author: Kjartan Maraas -AuthorDate: Sun Aug 28 19:23:30 2011 +0200 -Commit: Kjartan Maraas -CommitDate: Sun Aug 28 19:23:30 2011 +0200 +Author: Kjartan Maraas +Date: Sun Aug 28 19:23:30 2011 +0200 Updated Norwegian bokmål translation M po/nb.po commit 0ce12012a03de67353f175e0c582f776eef61ca4 -Author: Fran Dieguez -AuthorDate: Sun Aug 28 18:07:11 2011 +0200 -Commit: Fran Dieguez -CommitDate: Sun Aug 28 18:07:11 2011 +0200 +Author: Fran Dieguez +Date: Sun Aug 28 18:07:11 2011 +0200 Updated galician translations M po/gl.po commit e1a0557f4b5b9a12bcdb9f2819ccfc30e1888a5e -Author: Abduxukur Abdurixit -AuthorDate: Sun Aug 28 16:39:31 2011 +0200 -Commit: Abduxukur Abdurixit -CommitDate: Sun Aug 28 16:39:31 2011 +0200 +Author: Abduxukur Abdurixit +Date: Sun Aug 28 16:39:31 2011 +0200 Added UG translation M po/ug.po commit 009b0478c1a804527c6022d9b051fb057eb0b302 -Author: Jorge González -AuthorDate: Sun Aug 28 10:08:44 2011 +0200 -Commit: Jorge González -CommitDate: Sun Aug 28 10:08:44 2011 +0200 +Author: Jorge González +Date: Sun Aug 28 10:08:44 2011 +0200 Updated Spanish translation M po/es.po commit b59d358796343f81b31d4a398998faedd20b8f4b -Author: Matthias Clasen -AuthorDate: Sat Aug 27 00:39:12 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sat Aug 27 00:41:10 2011 -0400 +Author: Matthias Clasen +Date: Sat Aug 27 00:39:12 2011 -0400 Add an IsSessionRunning method @@ -6811,10 +7324,8 @@ M gnome-session/org.gnome.SessionManager.xml commit 592963b43389265af273a8928badd10f75ced492 -Author: Matthias Clasen -AuthorDate: Sat Aug 27 00:38:13 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sat Aug 27 00:41:10 2011 -0400 +Author: Matthias Clasen +Date: Sat Aug 27 00:38:13 2011 -0400 Silence a compiler warning @@ -6823,10 +7334,8 @@ M gnome-session/gsm-shell-extensions.c commit a29df19614f890d638422410313b26624535bdd6 -Author: Matthias Clasen -AuthorDate: Sat Aug 27 00:19:35 2011 -0400 -Commit: Matthias Clasen -CommitDate: Sat Aug 27 00:19:35 2011 -0400 +Author: Matthias Clasen +Date: Sat Aug 27 00:19:35 2011 -0400 Include config.h @@ -6835,10 +7344,8 @@ M gnome-session/gsm-shell-extensions.c commit 14fa54c0f2b86b93e00c53fe931cc81769112e05 -Author: Jasper St. Pierre -AuthorDate: Fri Aug 26 17:13:33 2011 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Aug 26 19:00:52 2011 -0400 +Author: Jasper St. Pierre +Date: Fri Aug 26 17:13:33 2011 -0400 gsm: Only show extensions UI when gnome-shell crashes @@ -6852,10 +7359,8 @@ M gnome-session/main.c commit 0b80e1ac1f2d2cc6be09390d344676d7610e432d -Author: Jasper St. Pierre -AuthorDate: Wed Aug 17 02:23:22 2011 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Aug 26 18:59:33 2011 -0400 +Author: Jasper St. Pierre +Date: Wed Aug 17 02:23:22 2011 -0400 gsm: Add a UI to the fail whale for enabling and disabling Shell Extensions @@ -6867,10 +7372,8 @@ M gnome-session/gsm-fail-whale-dialog.c commit aadad2377c841570b90a409c0a9ae51429cfff6c -Author: Jasper St. Pierre -AuthorDate: Wed Aug 17 01:13:52 2011 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Aug 26 11:54:24 2011 -0400 +Author: Jasper St. Pierre +Date: Wed Aug 17 01:13:52 2011 -0400 gsm: Add a new system to get information and frob Shell Extensions @@ -6885,10 +7388,8 @@ A gnome-session/gsm-shell-extensions.h commit f41c07f6a95a5a22891db45681afeb05bef669c5 -Author: Jasper St. Pierre -AuthorDate: Wed Aug 17 06:09:03 2011 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Aug 26 10:57:25 2011 -0400 +Author: Jasper St. Pierre +Date: Wed Aug 17 06:09:03 2011 -0400 gsm: Add debug mode to fail whale dialog @@ -6902,10 +7403,8 @@ M gnome-session/main.c commit edbf310a825a48f7d7eb10a2dfbd91525aeb83de -Author: Jasper St. Pierre -AuthorDate: Tue Aug 16 13:03:26 2011 -0400 -Commit: Jasper St. Pierre -CommitDate: Fri Aug 26 10:53:48 2011 -0400 +Author: Jasper St. Pierre +Date: Tue Aug 16 13:03:26 2011 -0400 gsm: Add a flag to show the fail whale dialog on request @@ -6915,60 +7414,48 @@ M gnome-session/main.c commit b9a51ac12ff940eb27afcbde917c1dc62c0116e7 -Author: Paul Seyfert -AuthorDate: Fri Aug 19 13:29:22 2011 +0200 -Commit: Mario Blättermann -CommitDate: Fri Aug 19 13:29:22 2011 +0200 +Author: Paul Seyfert +Date: Fri Aug 19 13:29:22 2011 +0200 [l10n] Updated German translation M po/de.po commit 83954409c88d2c9ca014eb5e87024d2f7297cd11 -Author: Andika Triwidada -AuthorDate: Thu Aug 18 15:03:26 2011 +0700 -Commit: Andika Triwidada -CommitDate: Thu Aug 18 15:03:26 2011 +0700 +Author: Andika Triwidada +Date: Thu Aug 18 15:03:26 2011 +0700 Updated Indonesian translation M po/id.po commit 1c55519983f6cc9bc6e1b199a5a331f0fa6ec1ca -Author: Fran Dieguez -AuthorDate: Tue Aug 16 19:10:51 2011 +0200 -Commit: Fran Dieguez -CommitDate: Tue Aug 16 19:10:51 2011 +0200 +Author: Fran Dieguez +Date: Tue Aug 16 19:10:51 2011 +0200 Updated Galician translations M po/gl.po commit 12efb0fb8740bf23fa5f9cee32be52d952b1a44c -Author: Theppitak Karoonboonyanan -AuthorDate: Sat Aug 13 16:25:52 2011 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Sat Aug 13 16:25:52 2011 +0700 +Author: Theppitak Karoonboonyanan +Date: Sat Aug 13 16:25:52 2011 +0700 Updated Thai translation. M po/th.po commit 9207a72d4b9c446eaf846f3bb746f0402cebcdb8 -Author: Vincent Untz -AuthorDate: Fri Aug 12 11:36:37 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 12 11:36:37 2011 +0200 +Author: Vincent Untz +Date: Fri Aug 12 11:36:37 2011 +0200 release: post-release bump to 3.1.90 M configure.ac -commit afb8942ec038b0ee1662b619cc95e7953ef6f6c4 (tag: 3.1.5) -Author: Vincent Untz -AuthorDate: Fri Aug 12 11:36:30 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 12 11:36:30 2011 +0200 +commit afb8942ec038b0ee1662b619cc95e7953ef6f6c4 +Author: Vincent Untz +Date: Fri Aug 12 11:36:30 2011 +0200 release: 3.1.5 @@ -6976,10 +7463,8 @@ M configure.ac commit 70b1ccfa82f79767baaa29bf1834d7d24594ed8f -Author: Vincent Untz -AuthorDate: Fri Aug 12 10:30:48 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 12 10:31:54 2011 +0200 +Author: Vincent Untz +Date: Fri Aug 12 10:30:48 2011 +0200 capplet: Respect OnlyShowIn and NotShowIn keys @@ -6996,10 +7481,8 @@ M capplet/gsp-keyfile.h commit 0e45c5c15d0ffedf90af3ea401288d6a0f758383 -Author: Vincent Untz -AuthorDate: Fri Aug 12 10:07:28 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 12 10:07:28 2011 +0200 +Author: Vincent Untz +Date: Fri Aug 12 10:07:28 2011 +0200 capplet: Do not pretend we need the egg code here @@ -7007,10 +7490,8 @@ M capplet/gsm-properties-dialog.c commit 28247060fe3daa6b9238531ddb50a7130647e9ec -Author: Vincent Untz -AuthorDate: Fri Aug 12 09:55:30 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 12 09:55:30 2011 +0200 +Author: Vincent Untz +Date: Fri Aug 12 09:55:30 2011 +0200 gsm: Support XDG_CURRENT_DESKTOP @@ -7026,140 +7507,112 @@ M gnome-session/gsm-util.h commit 3eb83dd179c59970574f271e85213af05cbf9bca -Author: Piotr Drąg -AuthorDate: Thu Aug 11 22:23:07 2011 +0200 -Commit: Piotr Drąg -CommitDate: Thu Aug 11 22:23:58 2011 +0200 +Author: Piotr Drąg +Date: Thu Aug 11 22:23:07 2011 +0200 Updated Polish translation M po/pl.po commit 245d291c830bd245d90b34d759c6a10836f85d9b -Author: Alexander Shopov -AuthorDate: Thu Aug 11 22:31:38 2011 +0300 -Commit: Alexander Shopov -CommitDate: Thu Aug 11 22:31:38 2011 +0300 +Author: Alexander Shopov +Date: Thu Aug 11 22:31:38 2011 +0300 Updated Bulgarian translation M po/bg.po commit bafa078dbc41df851fc5ac31acb9aeca3892cbb2 -Author: Kjartan Maraas -AuthorDate: Wed Aug 10 15:20:32 2011 +0200 -Commit: Kjartan Maraas -CommitDate: Wed Aug 10 15:20:32 2011 +0200 +Author: Kjartan Maraas +Date: Wed Aug 10 15:20:32 2011 +0200 Updated Norwegian bokmål translation M po/nb.po commit 31277c9812c5b6e02b44cfab4ce5934e52d249f2 -Author: Yaron Shahrabani -AuthorDate: Sat Aug 6 15:54:04 2011 +0300 -Commit: Yaron Shahrabani -CommitDate: Sat Aug 6 15:54:04 2011 +0300 +Author: Yaron Shahrabani +Date: Sat Aug 6 15:54:04 2011 +0300 Updated Hebrew translation. M po/he.po commit 75636a82a5326f5e3c28b90ec76c2d26f7ed0bea -Author: Daniel Nylander -AuthorDate: Wed Aug 3 09:16:40 2011 +0200 -Commit: Daniel Nylander -CommitDate: Wed Aug 3 09:16:40 2011 +0200 +Author: Daniel Nylander +Date: Wed Aug 3 09:16:40 2011 +0200 Updated Swedish translation M po/sv.po commit 7b1a807da7ce3f5b502fe9d5bc6b08d478bbb2b4 -Author: Ihar Hrachyshka -AuthorDate: Sun Jul 24 19:21:35 2011 +0300 -Commit: Ihar Hrachyshka -CommitDate: Sun Jul 24 19:21:35 2011 +0300 +Author: Ihar Hrachyshka +Date: Sun Jul 24 19:21:35 2011 +0300 Updated Belarusian translation. M po/be.po commit 657b4d29c758935e3a187d92fbcfc614614e6f80 -Author: Jorge González -AuthorDate: Sat Jul 23 14:31:01 2011 +0200 -Commit: Jorge González -CommitDate: Sat Jul 23 14:31:01 2011 +0200 +Author: Jorge González +Date: Sat Jul 23 14:31:01 2011 +0200 Updated Spanish translation M po/es.po commit 1fdcea9cffb96180a4e5064f0280fc8a06ca2a99 -Author: Vincent Untz -AuthorDate: Fri Jul 22 18:17:33 2011 +0200 -Commit: Vincent Untz -CommitDate: Fri Jul 22 18:18:46 2011 +0200 +Author: Vincent Untz +Date: Fri Jul 22 18:17:33 2011 +0200 gsm: Fix --help to mention arguments for options that have one M gnome-session/main.c commit 0312a63142f50d2597f0a1eea8a7dbb4f7d8e516 -Author: Tommi Vainikainen -AuthorDate: Tue Jul 19 08:44:26 2011 +0300 -Commit: Tommi Vainikainen -CommitDate: Tue Jul 19 08:44:26 2011 +0300 +Author: Tommi Vainikainen +Date: Tue Jul 19 08:44:26 2011 +0300 Updated Finnish translation M po/fi.po commit 1fb96a443dd490be807e6e793e2c9e2d642b4dcb -Author: Marek Černocký -AuthorDate: Sat Jul 16 01:22:05 2011 +0200 -Commit: Marek Černocký -CommitDate: Sat Jul 16 01:22:05 2011 +0200 +Author: Marek Černocký +Date: Sat Jul 16 01:22:05 2011 +0200 Updated Czech translation M po/cs.po commit 954b5c8e3982c4534833a3c23380b97bc23e5bc4 -Author: Rudolfs Mazurs -AuthorDate: Tue Jul 12 18:39:41 2011 +0300 -Commit: Peteris Krisjanis -CommitDate: Tue Jul 12 18:39:41 2011 +0300 +Author: Rudolfs Mazurs +Date: Tue Jul 12 18:39:41 2011 +0300 Updated Latvian translation. M po/lv.po commit 3b800bd368a3919f13710f5c0ef806faeed8e673 -Author: Vincent Untz -AuthorDate: Mon Jul 4 16:51:14 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Jul 4 16:51:14 2011 +0200 +Author: Vincent Untz +Date: Mon Jul 4 16:51:14 2011 +0200 release: post-release bump to 3.1.4 M configure.ac -commit 366ff0642f8012fd43487c8fa93e0aa86c685d86 (tag: 3.1.3) -Author: Vincent Untz -AuthorDate: Mon Jul 4 16:51:05 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Jul 4 16:51:05 2011 +0200 +commit 366ff0642f8012fd43487c8fa93e0aa86c685d86 +Author: Vincent Untz +Date: Mon Jul 4 16:51:05 2011 +0200 release: 3.1.3 M NEWS commit 399f3af4a9b402401379fb0bd57feeac2eba6751 -Author: Vincent Untz -AuthorDate: Sat Jul 2 10:21:11 2011 +0200 -Commit: Vincent Untz -CommitDate: Sat Jul 2 10:22:32 2011 +0200 +Author: Vincent Untz +Date: Sat Jul 2 10:21:11 2011 +0200 gsm: Fix various warnings about unused variables @@ -7171,20 +7624,16 @@ M gnome-session/test-inhibit.c commit c7592d41ed490fde458272a6c489c456445d600d -Author: Vincent Untz -AuthorDate: Sat Jul 2 10:07:37 2011 +0200 -Commit: Vincent Untz -CommitDate: Sat Jul 2 10:22:32 2011 +0200 +Author: Vincent Untz +Date: Sat Jul 2 10:07:37 2011 +0200 capplet: Remove useless variable M capplet/gsm-app-dialog.c commit 9a78872b026951d597c888a6b0ff68de5f8e4855 -Author: Vincent Untz -AuthorDate: Sat Jul 2 10:06:17 2011 +0200 -Commit: Vincent Untz -CommitDate: Sat Jul 2 10:22:32 2011 +0200 +Author: Vincent Untz +Date: Sat Jul 2 10:06:17 2011 +0200 build: Remove artificial librsvg dependency @@ -7195,20 +7644,16 @@ M gnome-session/gsm-manager.c commit 90563d68d18afcd394427a5cb2b6ee781afdd57d -Author: Muhammet Kara -AuthorDate: Sun Jun 26 16:32:03 2011 +0300 -Commit: Muhammet Kara -CommitDate: Sun Jun 26 16:32:03 2011 +0300 +Author: Muhammet Kara +Date: Sun Jun 26 16:32:03 2011 +0300 Updated Turkish translation M po/tr.po commit 01c7f952b0b05bd32c1338c593098148324ebc1c -Author: Мирослав Николић -AuthorDate: Sat Jun 25 00:16:09 2011 +0200 -Commit: Милош Поповић -CommitDate: Sat Jun 25 00:17:22 2011 +0200 +Author: Мирослав Николић +Date: Sat Jun 25 00:16:09 2011 +0200 Updated Serbian translation @@ -7216,20 +7661,16 @@ M po/sr@latin.po commit bf3aae448865a386b40393a674d5d8adb7bdfaa4 -Author: Daniel Nylander -AuthorDate: Mon Jun 20 09:12:48 2011 +0200 -Commit: Daniel Nylander -CommitDate: Mon Jun 20 09:12:48 2011 +0200 +Author: Daniel Nylander +Date: Mon Jun 20 09:12:48 2011 +0200 Updated Swedish translation M po/sv.po commit d68888fa10d5f4bce63d33712f546667d260425d -Author: Vincent Untz -AuthorDate: Tue Jun 14 15:10:03 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 14 15:10:03 2011 +0200 +Author: Vincent Untz +Date: Tue Jun 14 15:10:03 2011 +0200 build: Modernize build system a bit @@ -7246,20 +7687,16 @@ M configure.ac commit db1ec037533c96df953268330dce712050714840 -Author: Vincent Untz -AuthorDate: Tue Jun 14 13:49:29 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 14 13:49:29 2011 +0200 +Author: Vincent Untz +Date: Tue Jun 14 13:49:29 2011 +0200 release: post-release bump to 3.1.3 M configure.ac -commit c2f90b8f93d5371250049491aeb75230b8dfd5cd (tag: 3.1.2) -Author: Vincent Untz -AuthorDate: Tue Jun 14 13:49:24 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 14 13:49:24 2011 +0200 +commit c2f90b8f93d5371250049491aeb75230b8dfd5cd +Author: Vincent Untz +Date: Tue Jun 14 13:49:24 2011 +0200 release: 3.1.2 @@ -7267,40 +7704,32 @@ M configure.ac commit 8d72359dec298fa92bdf8e4d05c88e7627623dad -Author: Matej Urbančič -AuthorDate: Sat Jun 11 17:38:44 2011 +0200 -Commit: Matej Urbančič -CommitDate: Sat Jun 11 17:38:44 2011 +0200 +Author: Matej Urbančič +Date: Sat Jun 11 17:38:44 2011 +0200 Updated Slovenian translation M po/sl.po commit 8db29991a5bfd74f9a7550c3d67bd3a6b83b5eec -Author: Kjartan Maraas -AuthorDate: Thu Jun 9 14:44:46 2011 +0200 -Commit: Kjartan Maraas -CommitDate: Thu Jun 9 14:46:02 2011 +0200 +Author: Kjartan Maraas +Date: Thu Jun 9 14:44:46 2011 +0200 Updated Norwegian bokmål translation M po/nb.po commit b9fa0c8c9ff57f704d83dfd1f7b4ae0c19280edf -Author: Kjartan Maraas -AuthorDate: Tue Mar 29 11:35:39 2011 +0200 -Commit: Kjartan Maraas -CommitDate: Thu Jun 9 14:46:02 2011 +0200 +Author: Kjartan Maraas +Date: Tue Mar 29 11:35:39 2011 +0200 Add missing #include M capplet/gsp-app.c commit a1489d49290df0ba3812134a45d2311d46db6999 -Author: Adam Jackson -AuthorDate: Tue Jun 7 14:44:42 2011 -0400 -Commit: Adam Jackson -CommitDate: Tue Jun 7 14:44:42 2011 -0400 +Author: Adam Jackson +Date: Tue Jun 7 14:44:42 2011 -0400 gnome-session-check-accelerated: Refuse to work in zaphod mode @@ -7309,50 +7738,40 @@ M tools/gnome-session-check-accelerated-helper.c commit 85940956b44676bb53130da1601958f156b9a4fe -Author: Fran Diéguez -AuthorDate: Mon Jun 6 11:16:02 2011 +0200 -Commit: Fran Diéguez -CommitDate: Mon Jun 6 11:16:02 2011 +0200 +Author: Fran Diéguez +Date: Mon Jun 6 11:16:02 2011 +0200 Updated Galician translations M po/gl.po commit 0d7bf291644e42dd09f654eb4ee35d2ad6130c3e -Author: Yaron Shahrabani -AuthorDate: Sat Jun 4 13:53:28 2011 +0300 -Commit: Yaron Shahrabani -CommitDate: Sat Jun 4 13:53:28 2011 +0300 +Author: Yaron Shahrabani +Date: Sat Jun 4 13:53:28 2011 +0300 Updated Hebrew translation. M po/he.po commit 9927cab2ab77ead7ff45389f06b66f6db2688a0e -Author: Carles Ferrando -AuthorDate: Sun May 29 18:34:30 2011 +0200 -Commit: Gil Forcada -CommitDate: Sun May 29 18:34:30 2011 +0200 +Author: Carles Ferrando +Date: Sun May 29 18:34:30 2011 +0200 [l10n]Updated Catalan (Valencian) translation M po/ca@valencia.po commit e9633de751e6ba3f8354c3e3b10576cc8b7c1dd5 -Author: Daniel Mustieles -AuthorDate: Thu May 26 20:26:55 2011 +0200 -Commit: Daniel Mustieles -CommitDate: Thu May 26 20:26:55 2011 +0200 +Author: Daniel Mustieles +Date: Thu May 26 20:26:55 2011 +0200 Updated Spanish translation M po/es.po commit ebf9afaa10c7903694df5b2fee635a6dde5213a6 -Author: Vincent Untz -AuthorDate: Thu May 26 12:36:35 2011 +0200 -Commit: Vincent Untz -CommitDate: Thu May 26 12:36:35 2011 +0200 +Author: Vincent Untz +Date: Thu May 26 12:36:35 2011 +0200 gsm: Add gtk-doc comments for two GsmClient functions @@ -7362,20 +7781,16 @@ M gnome-session/gsm-client.c commit 9f25b7599ba016f8da7275afa4c3f8e194678734 -Author: Vincent Untz -AuthorDate: Thu May 26 12:29:22 2011 +0200 -Commit: Vincent Untz -CommitDate: Thu May 26 12:29:22 2011 +0200 +Author: Vincent Untz +Date: Thu May 26 12:29:22 2011 +0200 gsm: Do not uselessly duplicate a string M gnome-session/gsm-xsmp-client.c commit 35a9945ae1339297de2e0eeff543e876186dea6e -Author: Vincent Untz -AuthorDate: Thu May 26 12:26:55 2011 +0200 -Commit: Vincent Untz -CommitDate: Thu May 26 12:26:55 2011 +0200 +Author: Vincent Untz +Date: Thu May 26 12:26:55 2011 +0200 gsm: Do not assume XSMP clients set the SmProgram property @@ -7389,10 +7804,8 @@ M gnome-session/gsm-xsmp-client.c commit 7e0f36901093412ea9b904c58fea39c1d73fee0b -Author: Vincent Untz -AuthorDate: Thu May 26 11:22:08 2011 +0200 -Commit: Vincent Untz -CommitDate: Thu May 26 11:22:08 2011 +0200 +Author: Vincent Untz +Date: Thu May 26 11:22:08 2011 +0200 egg: Update smclient code from libegg @@ -7402,10 +7815,8 @@ M egg/eggsmclient.c commit 408d50cfc33d0619efa13812a4ea01a281d5f836 -Author: Chris Wilson -AuthorDate: Tue Jan 11 19:47:55 2011 +0000 -Commit: Vincent Untz -CommitDate: Thu May 26 11:16:14 2011 +0200 +Author: Chris Wilson +Date: Tue Jan 11 19:47:55 2011 +0000 gsm: Replace "Reboot Anyway" with "Restart Anyway" @@ -7417,10 +7828,8 @@ M gnome-session/gsm-inhibit-dialog.c commit 861313503a741f0129611ca005cf6d7c27124b54 -Author: Christopher Halse Rogers -AuthorDate: Thu May 26 11:09:14 2011 +0200 -Commit: Vincent Untz -CommitDate: Thu May 26 11:09:14 2011 +0200 +Author: Christopher Halse Rogers +Date: Thu May 26 11:09:14 2011 +0200 gsm: Fix race condition in idle monitor @@ -7445,100 +7854,80 @@ M gnome-session/gs-idle-monitor.c commit 39830ce7d5f14d4206fae99fa817a590e7a5cc7b -Author: Vincent Untz -AuthorDate: Mon May 23 23:13:06 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon May 23 23:13:06 2011 +0200 +Author: Vincent Untz +Date: Mon May 23 23:13:06 2011 +0200 release: post-release bump to 3.0.3 M configure.ac -commit c0bc1ab875f54f0ad262db1c7a2e201adcf0b0e9 (tag: 3.0.2) -Author: Vincent Untz -AuthorDate: Mon May 23 23:12:58 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon May 23 23:12:58 2011 +0200 +commit c0bc1ab875f54f0ad262db1c7a2e201adcf0b0e9 +Author: Vincent Untz +Date: Mon May 23 23:12:58 2011 +0200 release: 3.0.2 M NEWS commit 5b134ff66f44b0b6d876123bc2510e13418adc5f -Author: Abduxukur Abdurixit -AuthorDate: Mon May 2 07:25:06 2011 +0200 -Commit: Abduxukur Abdurixit -CommitDate: Mon May 2 07:25:06 2011 +0200 +Author: Abduxukur Abdurixit +Date: Mon May 2 07:25:06 2011 +0200 Added UG translation M po/ug.po commit 718a055ee0ba74c0eb13e4d37e12b09f870b848d -Author: Kristjan SCHMIDT -AuthorDate: Wed Apr 27 19:54:32 2011 +0200 -Commit: Kristjan SCHMIDT -CommitDate: Wed Apr 27 19:54:32 2011 +0200 +Author: Kristjan SCHMIDT +Date: Wed Apr 27 19:54:32 2011 +0200 Updated Esperanto translation M po/eo.po commit 8c0d358315cefccf622a092a72571ba2a1da77be -Author: Kristjan SCHMIDT -AuthorDate: Wed Apr 27 19:49:29 2011 +0200 -Commit: Kristjan SCHMIDT -CommitDate: Wed Apr 27 19:49:29 2011 +0200 +Author: Kristjan SCHMIDT +Date: Wed Apr 27 19:49:29 2011 +0200 Updated Esperanto translation M po/eo.po commit a3cd2b5a3b2cd94cda7d4b04b35ff747cebb82fa -Author: Vincent Untz -AuthorDate: Tue Apr 26 09:15:58 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Apr 26 09:15:58 2011 +0200 +Author: Vincent Untz +Date: Tue Apr 26 09:15:58 2011 +0200 release: post-release bump to 3.0.2 M configure.ac -commit b33ad6e4b1976f004237d51d70c383cf580730fd (tag: 3.0.1) -Author: Vincent Untz -AuthorDate: Tue Apr 26 09:15:52 2011 +0200 -Commit: Vincent Untz -CommitDate: Tue Apr 26 09:15:52 2011 +0200 +commit b33ad6e4b1976f004237d51d70c383cf580730fd +Author: Vincent Untz +Date: Tue Apr 26 09:15:52 2011 +0200 release: 3.0.1 M NEWS commit b689e2052d8810bacb0fba823211292c2fcf7688 -Author: Theppitak Karoonboonyanan -AuthorDate: Mon Apr 25 20:14:50 2011 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Mon Apr 25 20:14:50 2011 +0700 +Author: Theppitak Karoonboonyanan +Date: Mon Apr 25 20:14:50 2011 +0700 Updated Thai translation. M po/th.po commit c077752e003bcd881d42d6bd5da7e68fe63b84c0 -Author: Arash Mousavi -AuthorDate: Sat Apr 23 20:57:45 2011 +0430 -Commit: Arash Mousavi -CommitDate: Sat Apr 23 20:57:45 2011 +0430 +Author: Arash Mousavi +Date: Sat Apr 23 20:57:45 2011 +0430 Updated Persian translation M po/fa.po commit 5805aaf36c6349d306c4c1777c9b302985d9caca -Author: Lê Trường An -AuthorDate: Mon Apr 18 19:21:51 2011 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Mon Apr 18 19:21:51 2011 +0700 +Author: Lê Trường An +Date: Mon Apr 18 19:21:51 2011 +0700 Updated Vietnamese translation @@ -7547,210 +7936,168 @@ M po/vi.po commit b4ad871c06f3bf1602d9d7d14f60dff45980c568 -Author: Vincent Untz -AuthorDate: Mon Apr 4 23:15:43 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Apr 4 23:15:43 2011 +0200 +Author: Vincent Untz +Date: Mon Apr 4 23:15:43 2011 +0200 release: post-release bump to 3.0.1 M configure.ac -commit f15ba3d3a66860676813a4d92e465be174eca3fa (tag: 3.0.0) -Author: Vincent Untz -AuthorDate: Mon Apr 4 23:15:35 2011 +0200 -Commit: Vincent Untz -CommitDate: Mon Apr 4 23:15:35 2011 +0200 +commit f15ba3d3a66860676813a4d92e465be174eca3fa +Author: Vincent Untz +Date: Mon Apr 4 23:15:35 2011 +0200 release: 3.0.0 M NEWS commit bc098ac0fa08d7d31e01092b9e658e83c5732f3a -Author: Jamil Ahmed -AuthorDate: Tue Apr 5 01:35:08 2011 +0600 -Commit: Jamil Ahmed -CommitDate: Tue Apr 5 01:35:08 2011 +0600 +Author: Jamil Ahmed +Date: Tue Apr 5 01:35:08 2011 +0600 Updated Bengali translation M po/bn.po commit fb1c94266bf4702a7ae0b2957083e8362a615cc6 -Author: Jamil Ahmed -AuthorDate: Mon Apr 4 15:36:11 2011 +0600 -Commit: Jamil Ahmed -CommitDate: Mon Apr 4 15:36:11 2011 +0600 +Author: Jamil Ahmed +Date: Mon Apr 4 15:36:11 2011 +0600 Updated Bengali translation M po/bn.po commit 99365e3676228e232afdd446a20578f5ff075a10 -Author: Jordi Serratosa -AuthorDate: Sun Apr 3 23:52:08 2011 +0200 -Commit: Gil Forcada -CommitDate: Sun Apr 3 23:52:17 2011 +0200 +Author: Jordi Serratosa +Date: Sun Apr 3 23:52:08 2011 +0200 [l10n]Fixes on Catalan translation M po/ca.po commit 74de85bfbc783216a6720bf4792e6dbe08c47d76 -Author: Wolfgang Stöggl -AuthorDate: Sun Apr 3 21:06:34 2011 +0200 -Commit: Wolfgang Stöggl -CommitDate: Sun Apr 3 21:06:34 2011 +0200 +Author: Wolfgang Stöggl +Date: Sun Apr 3 21:06:34 2011 +0200 [l10n] Updated German translation, umlauts fixed M po/de.po commit b2c1a4f65f54374fa3619a93c7b4e8d77db70aeb -Author: Petr Kovar -AuthorDate: Sun Apr 3 16:42:21 2011 +0200 -Commit: Petr Kovar -CommitDate: Sun Apr 3 16:42:21 2011 +0200 +Author: Petr Kovar +Date: Sun Apr 3 16:42:21 2011 +0200 Update Czech translation M po/cs.po commit 264e34e3aa2462789976cbb2ae107f087e6cad15 -Author: Dr.T.Vasudevan -AuthorDate: Sun Apr 3 09:04:54 2011 +0530 -Commit: Dr.T.Vasudevan -CommitDate: Sun Apr 3 09:04:54 2011 +0530 +Author: Dr.T.Vasudevan +Date: Sun Apr 3 09:04:54 2011 +0530 Updated Tamil translation M po/ta.po commit 0ac91b6bfd528b40300fc3c943518d6909f53938 -Author: Simos Xenitellis -AuthorDate: Sat Apr 2 17:38:30 2011 +0300 -Commit: Simos Xenitellis -CommitDate: Sat Apr 2 17:38:30 2011 +0300 +Author: Simos Xenitellis +Date: Sat Apr 2 17:38:30 2011 +0300 l10n: Updated Greek translation for gnome-session M po/el.po commit cb880ef504cdd3f5baaeb5ae5a0f7d90ed9c292c -Author: Michael Kotsarinis -AuthorDate: Sat Apr 2 17:33:55 2011 +0300 -Commit: Simos Xenitellis -CommitDate: Sat Apr 2 17:33:55 2011 +0300 +Author: Michael Kotsarinis +Date: Sat Apr 2 17:33:55 2011 +0300 l10n: Updated Greek translation for gnome-session M po/el.po commit f59a20d4b6977edc14e3d9dc815415bdccba4f1c -Author: Changwoo Ryu -AuthorDate: Sat Apr 2 19:49:33 2011 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Apr 2 19:49:33 2011 +0900 +Author: Changwoo Ryu +Date: Sat Apr 2 19:49:33 2011 +0900 Updated Korean translation M po/ko.po commit 68802f88b9cc4f0722456d8ac3c0b57c6b241a84 -Author: Friedel Wolff -AuthorDate: Sat Apr 2 10:24:59 2011 +0200 -Commit: Friedel Wolff -CommitDate: Sat Apr 2 10:24:59 2011 +0200 +Author: Friedel Wolff +Date: Sat Apr 2 10:24:59 2011 +0200 Remove previous msgid Afrikaans (af) M po/af.po commit 25dae40f8a7cf53452bcf08c93ac82ec59d3fc8f -Author: Friedel Wolff -AuthorDate: Sat Apr 2 10:24:16 2011 +0200 -Commit: Friedel Wolff -CommitDate: Sat Apr 2 10:24:16 2011 +0200 +Author: Friedel Wolff +Date: Sat Apr 2 10:24:16 2011 +0200 Updated translation for Afrikaans (af) M po/af.po commit 71e0ca755ead1d472877905b5ceaee9c8662b619 -Author: Gintautas Miliauskas -AuthorDate: Fri Apr 1 22:24:20 2011 +0200 -Commit: Gintautas Miliauskas -CommitDate: Fri Apr 1 22:24:20 2011 +0200 +Author: Gintautas Miliauskas +Date: Fri Apr 1 22:24:20 2011 +0200 Updated Lithuanian translation. M po/lt.po commit 5c98b7419e0efdbca56dd891029fdbc44dc9df22 -Author: Gabor Kelemen -AuthorDate: Fri Apr 1 14:27:04 2011 +0200 -Commit: Gabor Kelemen -CommitDate: Fri Apr 1 14:27:04 2011 +0200 +Author: Gabor Kelemen +Date: Fri Apr 1 14:27:04 2011 +0200 Updated Hungarian translation M po/hu.po commit 74eb926eee93acfa4fc0843c10b847d42994c8d8 -Author: Inaki Larranaga Murgoitio -AuthorDate: Thu Mar 31 16:17:59 2011 +0200 -Commit: dooteo -CommitDate: Thu Mar 31 16:17:59 2011 +0200 +Author: Inaki Larranaga Murgoitio +Date: Thu Mar 31 16:17:59 2011 +0200 Updated Basque language M po/eu.po commit 7a04802795278514f32a21bebaa0502851a74ea9 -Author: Inaki Larranaga Murgoitio -AuthorDate: Thu Mar 31 16:10:19 2011 +0200 -Commit: dooteo -CommitDate: Thu Mar 31 16:10:19 2011 +0200 +Author: Inaki Larranaga Murgoitio +Date: Thu Mar 31 16:10:19 2011 +0200 Updated Basque language M po/eu.po commit 9b2d0a8e21d6cf16d2e73e53754275a57b68e730 -Author: Kris Thomsen -AuthorDate: Wed Mar 30 23:00:37 2011 +0200 -Commit: Kenneth Nielsen -CommitDate: Wed Mar 30 23:00:37 2011 +0200 +Author: Kris Thomsen +Date: Wed Mar 30 23:00:37 2011 +0200 Updated Danish translation M po/da.po commit e991702196cd466544c37fb975d9979b0a7b4119 -Author: Joan Duran -AuthorDate: Wed Mar 30 21:25:53 2011 +0200 -Commit: Gil Forcada -CommitDate: Wed Mar 30 21:25:53 2011 +0200 +Author: Joan Duran +Date: Wed Mar 30 21:25:53 2011 +0200 [l10n]Updated Catalan translation M po/ca.po commit 5fe5014e2006a2ed842cffbc00cc24d06cf8772e -Author: Bruce Cowan -AuthorDate: Wed Mar 30 15:02:58 2011 +0100 -Commit: Bruce Cowan -CommitDate: Wed Mar 30 15:02:58 2011 +0100 +Author: Bruce Cowan +Date: Wed Mar 30 15:02:58 2011 +0100 Updated British English translation M po/en_GB.po commit df3abfc850e1b505e1fece6bbd1a8411b7a76f05 -Author: Vincent Untz -AuthorDate: Wed Mar 30 13:15:41 2011 +0530 -Commit: Vincent Untz -CommitDate: Wed Mar 30 13:17:33 2011 +0530 +Author: Vincent Untz +Date: Wed Mar 30 13:15:41 2011 +0530 schema: Change path of GSettings schema @@ -7761,40 +8108,32 @@ M data/org.gnome.SessionManager.gschema.xml.in commit 8ae53599b187c79db3e89b33b4f84be0d4c50bf5 -Author: Friedel Wolff -AuthorDate: Tue Mar 29 23:14:55 2011 +0200 -Commit: Friedel Wolff -CommitDate: Tue Mar 29 23:34:13 2011 +0200 +Author: Friedel Wolff +Date: Tue Mar 29 23:14:55 2011 +0200 Updated translation for Afrikaans (af) M po/af.po commit 9f9500440cfce5105b203b59a8f391761fde0839 -Author: Dirgita -AuthorDate: Tue Mar 29 23:26:13 2011 +0700 -Commit: Andika Triwidada -CommitDate: Tue Mar 29 23:27:03 2011 +0700 +Author: Dirgita +Date: Tue Mar 29 23:26:13 2011 +0700 Updated Indonesian translation M po/id.po commit cd98babd74fe53fb7be9c0e16c37870f767e6b87 -Author: Aron Xu -AuthorDate: Tue Mar 29 16:16:02 2011 +0000 -Commit: Aron Xu -CommitDate: Tue Mar 29 16:16:02 2011 +0000 +Author: Aron Xu +Date: Tue Mar 29 16:16:02 2011 +0000 Update Simplified Chinese translation. M po/zh_CN.po commit 18444a0c9c0cb21ce01d5931aeefca6f0bac8712 -Author: Chao-Hsiung Liao -AuthorDate: Tue Mar 29 21:28:30 2011 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Tue Mar 29 21:28:30 2011 +0800 +Author: Chao-Hsiung Liao +Date: Tue Mar 29 21:28:30 2011 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -7802,30 +8141,24 @@ M po/zh_TW.po commit 0da598df093c3af40f29b44f0fb4e686e48f57f1 -Author: Duarte Loreto -AuthorDate: Tue Mar 29 00:35:47 2011 +0100 -Commit: Duarte Loreto -CommitDate: Tue Mar 29 00:35:47 2011 +0100 +Author: Duarte Loreto +Date: Tue Mar 29 00:35:47 2011 +0100 Updated Portuguese translation M po/pt.po commit 0a30ba36ec42d3476e96255c923e8d134d440642 -Author: Matthias Clasen -AuthorDate: Mon Mar 28 19:07:39 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 28 19:07:39 2011 -0400 +Author: Matthias Clasen +Date: Mon Mar 28 19:07:39 2011 -0400 Back to the future M configure.ac -commit aefbfc27e2b08738bb485b57f8544159c972c2a5 (tag: 2.91.4) -Author: Matthias Clasen -AuthorDate: Mon Mar 28 19:03:08 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 28 19:03:08 2011 -0400 +commit aefbfc27e2b08738bb485b57f8544159c972c2a5 +Author: Matthias Clasen +Date: Mon Mar 28 19:03:08 2011 -0400 2.91.94 @@ -7833,20 +8166,16 @@ M configure.ac commit fcfab9de25cd6d5608310a9a4f8ae4b3d835c7f1 -Author: Matthias Clasen -AuthorDate: Mon Mar 28 18:58:42 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 28 18:58:42 2011 -0400 +Author: Matthias Clasen +Date: Mon Mar 28 18:58:42 2011 -0400 Fix an unclosed comment from the last commit, breaking the build M gnome-session/gsm-manager.c commit 916dc2958953844b048cbcd35ef5b1686ea1b743 -Author: Colin Walters -AuthorDate: Fri Mar 25 15:30:01 2011 -0400 -Commit: Colin Walters -CommitDate: Mon Mar 28 17:07:17 2011 -0400 +Author: Colin Walters +Date: Fri Mar 25 15:30:01 2011 -0400 gsm-manager.c: Bump phase timeout to 30 seconds @@ -7858,150 +8187,120 @@ M gnome-session/gsm-manager.c commit a76fd3fa9470b58b9d6f0c8a09a822a46b742aaa -Author: Piotr Drąg -AuthorDate: Mon Mar 28 20:24:37 2011 +0200 -Commit: Piotr Drąg -CommitDate: Mon Mar 28 20:24:37 2011 +0200 +Author: Piotr Drąg +Date: Mon Mar 28 20:24:37 2011 +0200 Updated Polish translation M po/pl.po commit 5f7389d1c3e9449a91271d1f40629fa4d6571ccb -Author: Rudolfs Mazurs -AuthorDate: Mon Mar 28 01:13:22 2011 +0300 -Commit: Peteris Krisjanis -CommitDate: Mon Mar 28 01:13:22 2011 +0300 +Author: Rudolfs Mazurs +Date: Mon Mar 28 01:13:22 2011 +0300 Updated Latvian translation. M po/lv.po commit d14ca625aec894c62b19f2c2d34b0f54ae88df0c -Author: Rodrigo Padula de Oliveira -AuthorDate: Sun Mar 27 17:43:23 2011 -0400 -Commit: Og B. Maciel -CommitDate: Sun Mar 27 17:43:23 2011 -0400 +Author: Rodrigo Padula de Oliveira +Date: Sun Mar 27 17:43:23 2011 -0400 Updated Brazilian Portuguese translation. Reviewed by Flamarion Jorge. M po/pt_BR.po commit 7aeb0a1acbc96e60cb37753a2a48da4a869887e0 -Author: Bruno Brouard -AuthorDate: Sun Mar 27 22:07:24 2011 +0200 -Commit: Bruno Brouard -CommitDate: Sun Mar 27 22:07:24 2011 +0200 +Author: Bruno Brouard +Date: Sun Mar 27 22:07:24 2011 +0200 Updated French translation M po/fr.po commit b104077b0d3a1a2e4a1342571a2c1dac96c1e50d -Author: Abduxukur Abdurixit -AuthorDate: Sun Mar 27 19:55:35 2011 +0200 -Commit: Abduxukur Abdurixit -CommitDate: Sun Mar 27 19:55:35 2011 +0200 +Author: Abduxukur Abdurixit +Date: Sun Mar 27 19:55:35 2011 +0200 Added UG translation M po/ug.po commit e2f8fdd7670f0d5fec5a2ad48f616e8ea67f53e0 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sun Mar 27 15:48:30 2011 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sun Mar 27 15:48:30 2011 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Sun Mar 27 15:48:30 2011 +0700 Updated Vietnamese translation M po/vi.po commit bb821037277c67b1e32fcb4c1dd8c091ab743c72 -Author: Nguyễn Thái Ngọc Duy -AuthorDate: Sun Mar 27 15:43:09 2011 +0700 -Commit: Nguyễn Thái Ngọc Duy -CommitDate: Sun Mar 27 15:43:09 2011 +0700 +Author: Nguyễn Thái Ngọc Duy +Date: Sun Mar 27 15:43:09 2011 +0700 po/vi.po: import from Damned Lies M po/vi.po commit c41ecba41586325e0d49f158e5249c7ea47b285a -Author: Yuri Myasoedov -AuthorDate: Sat Mar 26 21:22:55 2011 +0300 -Commit: Yuri Myasoedov -CommitDate: Sat Mar 26 21:22:55 2011 +0300 +Author: Yuri Myasoedov +Date: Sat Mar 26 21:22:55 2011 +0300 Updated Russian translation M po/ru.po commit d676f17ac664ea74cdbbd1fe8d8f3c023f4fa49f -Author: Khaled Hosny -AuthorDate: Sat Mar 26 17:49:42 2011 +0200 -Commit: Khaled Hosny -CommitDate: Sat Mar 26 17:49:42 2011 +0200 +Author: Khaled Hosny +Date: Sat Mar 26 17:49:42 2011 +0200 Updated Arabic translation M po/ar.po commit 817deb2c434b81eea8a1dd7f84d05e6824fe2e90 -Author: Takayuki KUSANO -AuthorDate: Sat Mar 26 23:24:07 2011 +0900 -Commit: Takayuki KUSANO -CommitDate: Sat Mar 26 23:24:07 2011 +0900 +Author: Takayuki KUSANO +Date: Sat Mar 26 23:24:07 2011 +0900 Updated Japanese translation. M po/ja.po commit 700467d166f5b2449f09eccccc7f76e788f183fe -Author: Wouter Bolsterlee -AuthorDate: Sat Mar 26 11:52:54 2011 +0100 -Commit: Wouter Bolsterlee -CommitDate: Sat Mar 26 11:52:54 2011 +0100 +Author: Wouter Bolsterlee +Date: Sat Mar 26 11:52:54 2011 +0100 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit f386f79ff52fc0ccf7879f2ec390f9a0aa45b1a3 -Author: Yaron Shahrabani -AuthorDate: Sat Mar 26 09:40:19 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Sat Mar 26 09:40:19 2011 +0200 +Author: Yaron Shahrabani +Date: Sat Mar 26 09:40:19 2011 +0200 Updated Hebrew translation M po/he.po commit 55402a8aa3571593beb919a5ea51fe4faad38d51 -Author: Christian Kirbach -AuthorDate: Sat Mar 26 07:50:41 2011 +0100 -Commit: Wolfgang Stöggl -CommitDate: Sat Mar 26 07:50:41 2011 +0100 +Author: Christian Kirbach +Date: Sat Mar 26 07:50:41 2011 +0100 Updated German translation M po/de.po commit 94965cc3f60770e1d06aa320189e85863f67c500 -Author: Christian Kirbach -AuthorDate: Sat Mar 26 07:45:15 2011 +0100 -Commit: Wolfgang Stöggl -CommitDate: Sat Mar 26 07:45:15 2011 +0100 +Author: Christian Kirbach +Date: Sat Mar 26 07:45:15 2011 +0100 Updated German translation M po/de.po commit aba935a2a8892fb09146fcd73281cff2ee609f22 -Author: Matthias Clasen -AuthorDate: Fri Mar 25 20:30:43 2011 -0400 -Commit: Matthias Clasen -CommitDate: Fri Mar 25 20:30:43 2011 -0400 +Author: Matthias Clasen +Date: Fri Mar 25 20:30:43 2011 -0400 Fix a typo in the 'fail whale' dialog @@ -8020,110 +8319,88 @@ M po/uk.po commit fb43612f2de65e71765374267da6cde7484868b4 -Author: Yaron Shahrabani -AuthorDate: Sat Mar 26 01:10:14 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Sat Mar 26 01:10:14 2011 +0200 +Author: Yaron Shahrabani +Date: Sat Mar 26 01:10:14 2011 +0200 Updated Hebrew translation. M po/he.po commit 5cc956dd631bd64c2df2a64911d870bef898de80 -Author: Wouter Bolsterlee -AuthorDate: Fri Mar 25 21:59:40 2011 +0100 -Commit: Wouter Bolsterlee -CommitDate: Fri Mar 25 21:59:40 2011 +0100 +Author: Wouter Bolsterlee +Date: Fri Mar 25 21:59:40 2011 +0100 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit 1a4e2377651c3d6f69426068860e3ed9174401b2 -Author: Rodrigo Padula de Oliveira -AuthorDate: Fri Mar 25 15:00:51 2011 -0300 -Commit: Djavan Fagundes -CommitDate: Fri Mar 25 15:00:51 2011 -0300 +Author: Rodrigo Padula de Oliveira +Date: Fri Mar 25 15:00:51 2011 -0300 Updated Brazilian Portuguese translation M po/pt_BR.po commit 66cd79ac59524444af42682298fa28be1aa1c2fd -Author: Kjartan Maraas -AuthorDate: Fri Mar 25 14:37:09 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Fri Mar 25 14:37:09 2011 +0100 +Author: Kjartan Maraas +Date: Fri Mar 25 14:37:09 2011 +0100 Updated Norwegian bokmål translation M po/nb.po commit 8dfdfc5098f8a69be3c9a1422328f39f95b6aff8 -Author: A S Alam -AuthorDate: Fri Mar 25 08:34:14 2011 +0530 -Commit: A S Alam -CommitDate: Fri Mar 25 08:34:14 2011 +0530 +Author: A S Alam +Date: Fri Mar 25 08:34:14 2011 +0530 update tranlation for Punjabi by A S Alam M po/pa.po commit c5d2b22cdacfc0de7ef829d193396dd5e2d687ae -Author: Daniel Korostil -AuthorDate: Fri Mar 25 00:25:36 2011 +0200 -Commit: Daniel Korostil -CommitDate: Fri Mar 25 00:25:36 2011 +0200 +Author: Daniel Korostil +Date: Fri Mar 25 00:25:36 2011 +0200 Uploaded Ukranian M po/uk.po commit 86040715cafd25e44ffdd234d2c70ad59266e5fb -Author: Daniel Nylander -AuthorDate: Thu Mar 24 20:57:31 2011 +0100 -Commit: Daniel Nylander -CommitDate: Thu Mar 24 20:57:31 2011 +0100 +Author: Daniel Nylander +Date: Thu Mar 24 20:57:31 2011 +0100 Updated Swedish translation M po/sv.po commit 5a7ee5c90be5b042aa0359425cdfd9c9a96545a5 -Author: Ray Strode -AuthorDate: Tue Mar 22 21:36:35 2011 +0100 -Commit: Ray Strode -CommitDate: Wed Mar 23 18:40:48 2011 -0400 +Author: Ray Strode +Date: Tue Mar 22 21:36:35 2011 +0100 release: post-release bump to 3.0.0 M configure.ac -commit 1dd8ad6a2a199c143d6d69e683aea8382f30b8ab (tag: 2.91.93) -Author: Ray Strode -AuthorDate: Wed Mar 23 18:30:47 2011 -0400 -Commit: Ray Strode -CommitDate: Wed Mar 23 18:30:47 2011 -0400 +commit 1dd8ad6a2a199c143d6d69e683aea8382f30b8ab +Author: Ray Strode +Date: Wed Mar 23 18:30:47 2011 -0400 release: 2.91.93 M NEWS commit aae2e25213215bb6f50668169099c29608d2f78b -Author: Ray Strode -AuthorDate: Wed Mar 23 18:26:20 2011 -0400 -Commit: Ray Strode -CommitDate: Wed Mar 23 18:26:20 2011 -0400 +Author: Ray Strode +Date: Wed Mar 23 18:26:20 2011 -0400 release: pre-release drop to 2.91.93 M configure.ac commit 3e66149916912ccbd07d3981730ddc16673fd9c8 -Author: Ray Strode -AuthorDate: Mon Mar 21 14:03:55 2011 -0400 -Commit: Ray Strode -CommitDate: Wed Mar 23 18:22:39 2011 -0400 +Author: Ray Strode +Date: Mon Mar 21 14:03:55 2011 -0400 manager: port to latest shell api @@ -8139,100 +8416,80 @@ M gnome-session/gsm-shell.h commit bbbe4c2e180e13c844688e1a958984faf6893dbc -Author: Jorge González -AuthorDate: Wed Mar 23 18:51:32 2011 +0100 -Commit: Jorge González -CommitDate: Wed Mar 23 18:51:32 2011 +0100 +Author: Jorge González +Date: Wed Mar 23 18:51:32 2011 +0100 Updated Spanish translation M po/es.po commit d93093c72b143ef8130c939c5940847214599396 -Author: Krasimir Chonov -AuthorDate: Wed Mar 23 11:29:49 2011 +0200 -Commit: Alexander Shopov -CommitDate: Wed Mar 23 11:29:49 2011 +0200 +Author: Krasimir Chonov +Date: Wed Mar 23 11:29:49 2011 +0200 Updated Bulgarian translation M po/bg.po commit df9e3106055f0e514edcb81402c528172dd275d6 -Author: Daniel Șerbănescu -AuthorDate: Wed Mar 23 01:41:02 2011 +0100 -Commit: Lucian Adrian Grijincu -CommitDate: Wed Mar 23 01:41:02 2011 +0100 +Author: Daniel Șerbănescu +Date: Wed Mar 23 01:41:02 2011 +0100 Updated Romanian translation M po/ro.po commit 36a9980d2881369b6b97b89881093041b79ad532 -Author: Luca Ferretti -AuthorDate: Tue Mar 22 22:20:18 2011 +0100 -Commit: Luca Ferretti -CommitDate: Tue Mar 22 22:20:18 2011 +0100 +Author: Luca Ferretti +Date: Tue Mar 22 22:20:18 2011 +0100 Updated Italian translation M po/it.po commit 2b02f43e3d1c2446fe6dfb3d983236392fc2f0a6 -Author: Matej Urbančič -AuthorDate: Tue Mar 22 22:04:49 2011 +0100 -Commit: Matej Urbančič -CommitDate: Tue Mar 22 22:04:49 2011 +0100 +Author: Matej Urbančič +Date: Tue Mar 22 22:04:49 2011 +0100 Updated Slovenian translation M po/sl.po commit 3299606ed8b8507729d4dbe1b6698d22505b8c85 -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:36:35 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:36:35 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 21:36:35 2011 +0100 release: post-release bump to 3.0.0 M configure.ac -commit 6aaff2c1a4c5dc17dbb36f40a7198a62c1874f11 (tag: 2.91.92) -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:36:19 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:36:19 2011 +0100 +commit 6aaff2c1a4c5dc17dbb36f40a7198a62c1874f11 +Author: Vincent Untz +Date: Tue Mar 22 21:36:19 2011 +0100 release: 2.91.92 M NEWS commit e7e7f35ad80ddb02bd72927a866c07d4847e3208 -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:34:35 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:34:35 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 21:34:35 2011 +0100 gsm: Ship gsm-icon-names.h to fix build M gnome-session/Makefile.am commit bf74d31acf9be30ab758b309d5a44893b92f538a -Author: Fran Diéguez -AuthorDate: Tue Mar 22 21:21:04 2011 +0100 -Commit: Fran Diéguez -CommitDate: Tue Mar 22 21:21:04 2011 +0100 +Author: Fran Diéguez +Date: Tue Mar 22 21:21:04 2011 +0100 Updated Galician translations M po/gl.po commit aed66bd05f9a5b5ab982082117b8de1ad211d7ac -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:14:08 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:14:08 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 21:14:08 2011 +0100 gsm: Use "Log out" instead of "Close" for button in fatal error dialog @@ -8243,10 +8500,8 @@ M gnome-session/gsm-util.c commit c6a29dc93da9cf78641adb1d78df36defb3861db -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:09:05 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:10:17 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 21:09:05 2011 +0100 gsm: Make fatal errors exit after error dialog during initialization @@ -8258,10 +8513,8 @@ M gnome-session/gsm-util.c commit dec2bf24d71ccb660ab7ca8e6d924e3b81259070 -Author: Ray Strode -AuthorDate: Tue Mar 22 15:56:05 2011 -0400 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:03:34 2011 +0100 +Author: Ray Strode +Date: Tue Mar 22 15:56:05 2011 -0400 gsm: make gconf failure non-fatal @@ -8275,10 +8528,8 @@ M gnome-session/gsm-gconf.c commit f806a096f07b539777a28e33db341fb848b0d598 -Author: Vincent Untz -AuthorDate: Tue Mar 22 21:00:36 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 21:00:36 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 21:00:36 2011 +0100 gsm: Cleanup past two commits @@ -8290,10 +8541,8 @@ M gnome-session/gsm-manager.c commit b9aa675ef083256e5aca12ac448c6a84a8f620d6 -Author: Colin Walters -AuthorDate: Tue Mar 22 20:34:47 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 20:34:47 2011 +0100 +Author: Colin Walters +Date: Tue Mar 22 20:34:47 2011 +0100 gsm-manager/gsm-app: Fix restart logic @@ -8309,10 +8558,8 @@ M gnome-session/gsm-manager.c commit 4df48234f85f0a4cb617be7dc4dbf925fcc996f6 -Author: Colin Walters -AuthorDate: Tue Mar 22 14:19:49 2011 -0400 -Commit: Vincent Untz -CommitDate: Tue Mar 22 20:31:06 2011 +0100 +Author: Colin Walters +Date: Tue Mar 22 14:19:49 2011 -0400 gsm-manager: Improve the experience when required components fail @@ -8328,10 +8575,8 @@ M gnome-session/gsm-manager.h commit c6aa04195c75350033107f472b826fb078da8666 -Author: Ray Strode -AuthorDate: Tue Mar 22 13:29:09 2011 -0400 -Commit: Ray Strode -CommitDate: Tue Mar 22 14:33:47 2011 -0400 +Author: Ray Strode +Date: Tue Mar 22 13:29:09 2011 -0400 shell: drop has_open_dialog state variable @@ -8345,10 +8590,8 @@ M gnome-session/gsm-shell.c commit 1ff1a167dd89046bbbc00f2594a1af310742a25b -Author: Ray Strode -AuthorDate: Tue Mar 22 12:53:53 2011 -0400 -Commit: Ray Strode -CommitDate: Tue Mar 22 14:32:53 2011 -0400 +Author: Ray Strode +Date: Tue Mar 22 12:53:53 2011 -0400 shell: listen for 'Closed' signal @@ -8373,10 +8616,8 @@ M gnome-session/gsm-shell.h commit fa30b73948c50c2493e19565b4e3b14b40f985e1 -Author: Vincent Untz -AuthorDate: Tue Mar 22 19:11:49 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 19:11:49 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 19:11:49 2011 +0100 gsm: Support disable-user-switching lockdown setting in logout dialog @@ -8385,10 +8626,8 @@ M gnome-session/gsm-logout-dialog.c commit 899fe6b1628cd2d86931632f72512bca04d2aeaf -Author: Vincent Untz -AuthorDate: Tue Mar 22 19:01:42 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 19:01:42 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 19:01:42 2011 +0100 gsm: Enforce disable-user-switching lockdown setting @@ -8398,10 +8637,8 @@ M gnome-session/gsm-manager.c commit e5ceda53eda8860123dc93098f40b03909dae84e -Author: Vincent Untz -AuthorDate: Tue Mar 22 18:54:29 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 18:54:29 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 18:54:29 2011 +0100 gsm: Fix error string @@ -8411,10 +8648,8 @@ M gnome-session/gsm-manager.c commit 962d6014d85f2551b1e9cb3900d1f2c3cb0a5bc8 -Author: Vincent Untz -AuthorDate: Tue Mar 22 18:27:58 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 18:27:58 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 18:27:58 2011 +0100 gsm: Move all icon names to gsm-icon-names.h with defines @@ -8429,10 +8664,8 @@ M gnome-session/gsm-xsmp-client.c commit 66dbc4d171e49b58932bb3151b06ebda1fc8e4ca -Author: Ray Strode -AuthorDate: Tue Mar 22 10:50:57 2011 -0400 -Commit: Vincent Untz -CommitDate: Tue Mar 22 18:16:41 2011 +0100 +Author: Ray Strode +Date: Tue Mar 22 10:50:57 2011 -0400 shell: don't leak inhibitor list on updates @@ -8453,10 +8686,8 @@ M gnome-session/gsm-shell.c commit fcdca87b80646c1a1617fe68f0c1c38515a54281 -Author: Vincent Untz -AuthorDate: Tue Mar 22 17:58:46 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 17:58:46 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 17:58:46 2011 +0100 gsm: Use "computer-fail" icon from theme instead of our own sad-computer @@ -8469,10 +8700,8 @@ M gnome-session/gsm-util.h commit cbe3d42b3595567ad60fdfbabbd37afcc74808aa -Author: Vincent Untz -AuthorDate: Tue Mar 22 17:36:05 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 17:36:05 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 17:36:05 2011 +0100 build: Require glib 2.28.0 @@ -8481,10 +8710,8 @@ M configure.ac commit e8759ab5a06fbfe5faf81805c56f61e604572bfa -Author: Vincent Untz -AuthorDate: Tue Mar 22 16:33:05 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 16:33:05 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 16:33:05 2011 +0100 gsm: Remove saved session if auto-save-session is set to false @@ -8498,10 +8725,8 @@ M gnome-session/gsm-session-save.h commit b49de741bf73afd564728df4bffff6b4d6974e36 -Author: Vincent Untz -AuthorDate: Tue Mar 22 16:04:48 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 16:04:48 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 16:04:48 2011 +0100 sessions: Explicitly require gnome-shell/gnome-panel @@ -8512,10 +8737,8 @@ M data/gnome.session.desktop.in.in commit cc2560d9570077bcd1e0152b50462b4eb4e35eb8 -Author: Vincent Untz -AuthorDate: Tue Mar 22 15:55:02 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 16:00:43 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 15:55:02 2011 +0100 gsm: Use app-id when saving session instead of startup-id for .desktop @@ -8534,20 +8757,16 @@ M gnome-session/gsm-session-save.c commit c8ddd51c4ae4f145bfd830ff1d5ccea844d0548a -Author: Vincent Untz -AuthorDate: Tue Mar 22 15:12:35 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 15:12:35 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 15:12:35 2011 +0100 gsm: Move auto_save_is_enabled() check to maybe_save_session() M gnome-session/gsm-manager.c commit 044def3fce18480e8b3e7a6ad6c38bad253ce64e -Author: Vincent Untz -AuthorDate: Tue Mar 22 14:58:06 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 14:58:06 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 14:58:06 2011 +0100 gsm: Mark a provider as required if it came from autostart/saved session @@ -8558,20 +8777,16 @@ M gnome-session/gsm-manager.c commit 6bd6703fadd36b05bc2fa88913be52c82f5cdf80 -Author: Vincent Untz -AuthorDate: Tue Mar 22 14:52:51 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 14:52:51 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 14:52:51 2011 +0100 gsm: Remove unused variable M gnome-session/gsm-manager.c commit 98767400d9dffaa795151bf5f96146beaabd865f -Author: Vincent Untz -AuthorDate: Tue Mar 22 14:50:04 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 14:50:04 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 14:50:04 2011 +0100 gsm: Keep required/provides state of app if already appended @@ -8582,20 +8797,16 @@ M gnome-session/gsm-manager.c commit a359ce1d9b7520ac9b2fc2c7afebcd6f6d2e8c17 -Author: Vincent Untz -AuthorDate: Tue Mar 22 14:35:09 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 14:35:09 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 14:35:09 2011 +0100 gsm: Add more details to a debug message M gnome-session/gsm-manager.c commit 71b0fe1ddbb7d61c1e36ebd1c6c5d195b354a311 -Author: Vincent Untz -AuthorDate: Tue Mar 22 13:45:50 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:45:50 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 13:45:50 2011 +0100 gsm: Remember Provides defined in session definition but not in .desktop @@ -8608,10 +8819,8 @@ M gnome-session/gsm-manager.c commit f436a357396ed54544de801ac018461f616e14e7 -Author: Vincent Untz -AuthorDate: Tue Mar 22 13:15:21 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:15:21 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 13:15:21 2011 +0100 gsm: Do not add autostart apps providing a service already provided @@ -8622,10 +8831,8 @@ M gnome-session/gsm-manager.c commit 6eafe805d2b5880cc020586c7d155ad30fe958d2 -Author: Vincent Untz -AuthorDate: Tue Mar 22 13:14:26 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:14:26 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 13:14:26 2011 +0100 gsm: Add gsm_app_provides() to get list of Provides defined in .desktop @@ -8637,10 +8844,8 @@ M gnome-session/gsm-autostart-app.c commit 69cad093b1d32392078233166edac5180dabaf8a -Author: Vincent Untz -AuthorDate: Tue Mar 22 12:57:46 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:00:56 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 12:57:46 2011 +0100 gsm: Reorder how we fill session, to start with required components @@ -8654,10 +8859,8 @@ M gnome-session/gsm-session-fill.c commit d754aa829542f944e2899db939b6d15ad9751780 -Author: Vincent Untz -AuthorDate: Tue Mar 22 12:44:25 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:00:56 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 12:44:25 2011 +0100 gsm: Force common code path to look for .desktop files in directories @@ -8673,10 +8876,8 @@ M gnome-session/gsm-xsmp-client.c commit f27aa0a8de70b993cd77a828e81fa88f98b270fb -Author: Vincent Untz -AuthorDate: Tue Mar 22 12:03:57 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:00:56 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 12:03:57 2011 +0100 doc: Fix gnome-session-quit man page @@ -8686,20 +8887,16 @@ M doc/man/gnome-session-quit.1 commit 06a4d5122ce8fb13a787fba509dbab0da71870a1 -Author: Vincent Untz -AuthorDate: Tue Mar 22 11:58:35 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:00:56 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 11:58:35 2011 +0100 doc: Document session definition format in man page M doc/man/gnome-session.1 commit 22b1affed9d62ad1ad79806115fea50e511113f8 -Author: Vincent Untz -AuthorDate: Tue Mar 22 11:33:03 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 13:00:56 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 11:33:03 2011 +0100 gsm: Update format for .session files @@ -8719,20 +8916,16 @@ M gnome-session/gsm-session-fill.c commit 64611a022260e8162a8388cfbdd92df6ae64369c -Author: Kjartan Maraas -AuthorDate: Tue Mar 22 10:53:36 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Tue Mar 22 10:53:36 2011 +0100 +Author: Kjartan Maraas +Date: Tue Mar 22 10:53:36 2011 +0100 Updated Norwegian bokmål translation M po/nb.po commit cc8a3cdad278e0646c9b53b091ba7988acc501eb -Author: Ray Strode -AuthorDate: Mon Mar 21 13:54:38 2011 -0400 -Commit: Ray Strode -CommitDate: Mon Mar 21 22:07:21 2011 -0400 +Author: Ray Strode +Date: Mon Mar 21 13:54:38 2011 -0400 manager: drop request-privileges stuff @@ -8748,10 +8941,8 @@ M gnome-session/gsm-manager.c commit 107cfa7a4f6f43698407772e31472d742bdb219f -Author: Vincent Untz -AuthorDate: Tue Mar 22 00:47:24 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 22 00:50:00 2011 +0100 +Author: Vincent Untz +Date: Tue Mar 22 00:47:24 2011 +0100 gsm: Also support disable-log-out for Shutdown/CanShutdown dbus methods @@ -8761,10 +8952,8 @@ M gnome-session/gsm-manager.c commit 1e3e0b475cfd352d4abe7ace4ee5a40be04a8b42 -Author: Ray Strode -AuthorDate: Mon Mar 21 08:31:37 2011 -0400 -Commit: Vincent Untz -CommitDate: Tue Mar 22 00:50:00 2011 +0100 +Author: Ray Strode +Date: Mon Mar 21 08:31:37 2011 -0400 manager: honor disable-log-out lockdown configuration @@ -8781,150 +8970,120 @@ M gnome-session/gsm-manager.h commit 90ff5bba8a2446d481f0efbdf150360a2706fe9d -Author: Yuri Myasoedov -AuthorDate: Mon Mar 21 22:54:55 2011 +0300 -Commit: Yuri Myasoedov -CommitDate: Mon Mar 21 22:54:55 2011 +0300 +Author: Yuri Myasoedov +Date: Mon Mar 21 22:54:55 2011 +0300 Updated Russian translation M po/ru.po commit a249a5689f6b22ec38467eace98058daf9d29f1c -Author: Amitakhya Phukan -AuthorDate: Mon Mar 21 12:03:39 2011 +0530 -Commit: Amitakhya Phukan -CommitDate: Mon Mar 21 12:03:39 2011 +0530 +Author: Amitakhya Phukan +Date: Mon Mar 21 12:03:39 2011 +0530 Updated Assamese translations M po/as.po commit 09df0434ab33ed11e90df8ed925db3931437de4c -Author: Duarte Loreto -AuthorDate: Mon Mar 21 00:04:04 2011 +0000 -Commit: Duarte Loreto -CommitDate: Mon Mar 21 00:04:04 2011 +0000 +Author: Duarte Loreto +Date: Mon Mar 21 00:04:04 2011 +0000 Updated Portuguese translation M po/pt.po commit 6443cfe5251f243f2e4db3ea83b648d9a80d8ece -Author: Sense Hofstede -AuthorDate: Sun Mar 20 20:11:51 2011 +0100 -Commit: Sense Hofstede -CommitDate: Sun Mar 20 20:11:51 2011 +0100 +Author: Sense Hofstede +Date: Sun Mar 20 20:11:51 2011 +0100 Updated Frisian translations M po/fy.po commit 37feac0ce68563124ae7b211faae9a586cdfe021 -Author: Fran Diéguez -AuthorDate: Sun Mar 20 19:04:15 2011 +0100 -Commit: Fran Diéguez -CommitDate: Sun Mar 20 19:04:15 2011 +0100 +Author: Fran Diéguez +Date: Sun Mar 20 19:04:15 2011 +0100 Updated Galician translations M po/gl.po commit ec69cd1b9f390486d37c7b83d345fe883119ac99 -Author: Fran Diéguez -AuthorDate: Sun Mar 20 18:53:27 2011 +0100 -Commit: Fran Diéguez -CommitDate: Sun Mar 20 18:53:27 2011 +0100 +Author: Fran Diéguez +Date: Sun Mar 20 18:53:27 2011 +0100 Updated Galician translations M po/gl.po commit 46c9b1625b90f7dd16df61113baefceb52160d45 -Author: Sense Hofstede -AuthorDate: Sun Mar 20 16:54:08 2011 +0100 -Commit: Sense Hofstede -CommitDate: Sun Mar 20 16:54:08 2011 +0100 +Author: Sense Hofstede +Date: Sun Mar 20 16:54:08 2011 +0100 Updated Frisian translation M po/fy.po commit 93fb68034c920d871812ff57a9ff87128ac5a7c1 -Author: Rudolfs Mazurs -AuthorDate: Sun Mar 20 15:39:51 2011 +0200 -Commit: Peteris Krisjanis -CommitDate: Sun Mar 20 15:39:51 2011 +0200 +Author: Rudolfs Mazurs +Date: Sun Mar 20 15:39:51 2011 +0200 Updated Latvian translation. M po/lv.po commit 5d14cdc07a567bf0df800358d627828a65c0a468 -Author: Andika Triwidada -AuthorDate: Sun Mar 20 17:34:02 2011 +0700 -Commit: Andika Triwidada -CommitDate: Sun Mar 20 17:34:45 2011 +0700 +Author: Andika Triwidada +Date: Sun Mar 20 17:34:02 2011 +0700 Updated Indonesian translation M po/id.po commit b127a42ad82d0e7f52313ffd2e2cc4189ec707fc -Author: Daniel Nylander -AuthorDate: Sun Mar 20 00:27:09 2011 +0100 -Commit: Daniel Nylander -CommitDate: Sun Mar 20 00:27:09 2011 +0100 +Author: Daniel Nylander +Date: Sun Mar 20 00:27:09 2011 +0100 Updated Swedish translation M po/sv.po commit a439de87e2c23344c81669efa9a013609e4920ae -Author: Bruno Brouard -AuthorDate: Sat Mar 19 23:26:27 2011 +0100 -Commit: Bruno Brouard -CommitDate: Sat Mar 19 23:26:27 2011 +0100 +Author: Bruno Brouard +Date: Sat Mar 19 23:26:27 2011 +0100 Updated French translation M po/fr.po commit b0c050a1ab03a5a34f8090e006b49e16aa96a004 -Author: Piotr Drąg -AuthorDate: Sat Mar 19 16:22:26 2011 +0100 -Commit: Piotr Drąg -CommitDate: Sat Mar 19 16:22:26 2011 +0100 +Author: Piotr Drąg +Date: Sat Mar 19 16:22:26 2011 +0100 Updated Polish translation M po/pl.po commit 7a03897fe1c19f1f94de24a723b30d4a6f1f41e9 -Author: Changwoo Ryu -AuthorDate: Sat Mar 19 23:14:20 2011 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Mar 19 23:14:20 2011 +0900 +Author: Changwoo Ryu +Date: Sat Mar 19 23:14:20 2011 +0900 Updated Korean translation M po/ko.po commit 8d0dc0073c99b7f834705d74fe8dc612f3f4477c -Author: Jorge González -AuthorDate: Sat Mar 19 14:50:44 2011 +0100 -Commit: Jorge González -CommitDate: Sat Mar 19 14:50:44 2011 +0100 +Author: Jorge González +Date: Sat Mar 19 14:50:44 2011 +0100 Updated Spanish translation M po/es.po commit 984c0ac441a58c04ac36aec7ea7e11f71610cbcc -Author: Милош Поповић -AuthorDate: Sat Mar 19 12:01:48 2011 +0100 -Commit: Милош Поповић -CommitDate: Sat Mar 19 12:01:48 2011 +0100 +Author: Милош Поповић +Date: Sat Mar 19 12:01:48 2011 +0100 Updated Serbian translation @@ -8932,10 +9091,8 @@ M po/sr@latin.po commit 6b05df82527fdbc2e05d51f79573ffbd15f78828 -Author: Miroslav Nikolić -AuthorDate: Sat Mar 19 11:55:56 2011 +0100 -Commit: Милош Поповић -CommitDate: Sat Mar 19 11:55:56 2011 +0100 +Author: Miroslav Nikolić +Date: Sat Mar 19 11:55:56 2011 +0100 Updated Serbian translation @@ -8943,50 +9100,40 @@ M po/sr@latin.po commit 2db0af388409a40708b1cf1492e91c4c13f5aa7f -Author: Daniel Korostil -AuthorDate: Sat Mar 19 10:38:43 2011 +0200 -Commit: Daniel Korostil -CommitDate: Sat Mar 19 10:38:43 2011 +0200 +Author: Daniel Korostil +Date: Sat Mar 19 10:38:43 2011 +0200 Uploaded Ukranian M po/uk.po commit 3a5f484bdeecfe8cd1cc700e5ab3a4cb432d8dce -Author: Gabor Kelemen -AuthorDate: Sat Mar 19 02:46:41 2011 +0100 -Commit: Gabor Kelemen -CommitDate: Sat Mar 19 02:46:41 2011 +0100 +Author: Gabor Kelemen +Date: Sat Mar 19 02:46:41 2011 +0100 Updated Hungarian translation M po/hu.po commit a193974901635ed369533be21ac230f51cf34efd -Author: Khaled Hosny -AuthorDate: Sat Mar 19 02:46:58 2011 +0200 -Commit: Khaled Hosny -CommitDate: Sat Mar 19 02:46:58 2011 +0200 +Author: Khaled Hosny +Date: Sat Mar 19 02:46:58 2011 +0200 Updated Arabic translation M po/ar.po commit 1e0944d53010db573284a09c7196732dd4e03562 -Author: Andrej Žnidaršič -AuthorDate: Fri Mar 18 21:27:36 2011 +0100 -Commit: Matej Urbančič -CommitDate: Fri Mar 18 21:27:36 2011 +0100 +Author: Andrej Žnidaršič +Date: Fri Mar 18 21:27:36 2011 +0100 Updated Slovenian translation M po/sl.po commit a18e2a2df8d921d2b6caccde03025d6a8e7624db -Author: Colin Walters -AuthorDate: Fri Mar 18 15:12:23 2011 -0400 -Commit: Colin Walters -CommitDate: Fri Mar 18 15:39:22 2011 -0400 +Author: Colin Walters +Date: Fri Mar 18 15:12:23 2011 -0400 Consistently translate component failure message @@ -8997,10 +9144,8 @@ M po/POTFILES.in commit c0f87685af13fd49e3fbcf07e7f9045b60a7e72b -Author: Colin Walters -AuthorDate: Fri Mar 18 15:12:03 2011 -0400 -Commit: Colin Walters -CommitDate: Fri Mar 18 15:38:44 2011 -0400 +Author: Colin Walters +Date: Fri Mar 18 15:12:03 2011 -0400 gsm-fail-whale-dialog: Fix height request @@ -9011,20 +9156,16 @@ M gnome-session/gsm-fail-whale-dialog.c commit 39242dc576ee61034fdb81ae893b6c9e7ac7a2ca -Author: Gabor Kelemen -AuthorDate: Fri Mar 18 17:22:28 2011 +0100 -Commit: Gabor Kelemen -CommitDate: Fri Mar 18 17:22:28 2011 +0100 +Author: Gabor Kelemen +Date: Fri Mar 18 17:22:28 2011 +0100 Updated Hungarian translation M po/hu.po commit 13226af8eabf01a7683c325c9dd2cc36236e4b75 -Author: Vincent Untz -AuthorDate: Fri Mar 18 15:25:37 2011 +0100 -Commit: Vincent Untz -CommitDate: Fri Mar 18 15:25:37 2011 +0100 +Author: Vincent Untz +Date: Fri Mar 18 15:25:37 2011 +0100 gsm: Cleanup previous commits... @@ -9035,70 +9176,56 @@ M gnome-session/gsm-manager.c commit 23a01422fffe9e8b812f8d93ec2d822d6acb13b7 -Author: Khaled Hosny -AuthorDate: Thu Mar 17 22:51:17 2011 +0200 -Commit: Khaled Hosny -CommitDate: Thu Mar 17 22:51:17 2011 +0200 +Author: Khaled Hosny +Date: Thu Mar 17 22:51:17 2011 +0200 Updated Arabic translation M po/ar.po commit 76d42b38b4b98ae8b123248a7c3be5e315da1e90 -Author: Andre Klapper -AuthorDate: Thu Mar 17 21:46:27 2011 +0100 -Commit: Andre Klapper -CommitDate: Thu Mar 17 21:46:27 2011 +0100 +Author: Andre Klapper +Date: Thu Mar 17 21:46:27 2011 +0100 Add a translator comment as discussed on gnome-i18n mailing list M gnome-session/gsm-manager.c commit e60d7f1eb3fce5b02c725b23d07082aa960c4baf -Author: Daniel Nylander -AuthorDate: Thu Mar 17 21:37:56 2011 +0100 -Commit: Daniel Nylander -CommitDate: Thu Mar 17 21:37:56 2011 +0100 +Author: Daniel Nylander +Date: Thu Mar 17 21:37:56 2011 +0100 Updated Swedish translation M po/sv.po commit 9dc1a58f47b2a59a351597d2f608ecf130c3b8a6 -Author: Daniel Mustieles -AuthorDate: Thu Mar 17 20:30:36 2011 +0100 -Commit: Daniel Mustieles -CommitDate: Thu Mar 17 20:30:36 2011 +0100 +Author: Daniel Mustieles +Date: Thu Mar 17 20:30:36 2011 +0100 Updated Spanish translation M po/es.po commit d011770f8b235b91db6969ff54665f5f18ca549c -Author: Matej Urbančič -AuthorDate: Thu Mar 17 19:52:13 2011 +0100 -Commit: Matej Urbančič -CommitDate: Thu Mar 17 19:52:13 2011 +0100 +Author: Matej Urbančič +Date: Thu Mar 17 19:52:13 2011 +0100 Updated Slovenian translation M po/sl.po commit 2e0b08bffedee3aa88bcb41aff4d582560d0b8ac -Author: Daniel Korostil -AuthorDate: Thu Mar 17 19:58:43 2011 +0200 -Commit: Daniel Korostil -CommitDate: Thu Mar 17 19:58:43 2011 +0200 +Author: Daniel Korostil +Date: Thu Mar 17 19:58:43 2011 +0200 Uploaded Ukranian M po/uk.po commit 2e92bb08bd7b700ae5e385e07292f37b307a36a5 -Author: Colin Walters -AuthorDate: Sun Mar 13 16:57:31 2011 -0400 -Commit: Colin Walters -CommitDate: Thu Mar 17 12:07:49 2011 -0400 +Author: Colin Walters +Date: Sun Mar 13 16:57:31 2011 -0400 Add "Try Recovery" option to fail whale @@ -9113,10 +9240,8 @@ M gnome-session/gsm-manager.h commit 9a4ff4b674fb7b63fd361eeedd4925ad84c67686 -Author: Colin Walters -AuthorDate: Thu Mar 10 18:56:39 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Mar 17 12:07:49 2011 -0400 +Author: Colin Walters +Date: Thu Mar 10 18:56:39 2011 -0500 Handle required component failure by showing fail whale @@ -9130,10 +9255,8 @@ M gnome-session/gsm-session-fill.c commit c01831c0dea7f6728106ae12090b248f37ad1feb -Author: Colin Walters -AuthorDate: Thu Mar 10 16:14:14 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Mar 17 12:07:49 2011 -0400 +Author: Colin Walters +Date: Thu Mar 10 16:14:14 2011 -0500 gsm-manager: Add comment with historical context @@ -9142,10 +9265,8 @@ M gnome-session/gsm-manager.c commit a2fedc4dc0e655a13f43d205c4982fa142bf67d6 -Author: Colin Walters -AuthorDate: Thu Mar 10 09:54:54 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Mar 17 12:07:48 2011 -0400 +Author: Colin Walters +Date: Thu Mar 10 09:54:54 2011 -0500 Add "fail whale" dialog, will be shown on component failure @@ -9161,20 +9282,16 @@ M gnome-session/gsm-logout-dialog.c commit 2676795df387a8f02debdb749a3d8ffa95aaf6d8 -Author: Kjartan Maraas -AuthorDate: Thu Mar 17 09:59:15 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Thu Mar 17 09:59:15 2011 +0100 +Author: Kjartan Maraas +Date: Thu Mar 17 09:59:15 2011 +0100 Updated Norwegian bokmål translation M po/nb.po commit b48a9f89be99390f8333dbde959037ba37e3bc58 -Author: William Jon McCann -AuthorDate: Wed Mar 16 23:35:25 2011 -0400 -Commit: William Jon McCann -CommitDate: Wed Mar 16 23:35:25 2011 -0400 +Author: William Jon McCann +Date: Wed Mar 16 23:35:25 2011 -0400 switch to using seconds for idle time @@ -9183,150 +9300,120 @@ M gnome-session/gsm-manager.c commit 2eabf107604706fedd731abc268bccd34219bb0c -Author: Yaron Shahrabani -AuthorDate: Wed Mar 16 17:02:55 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Wed Mar 16 17:02:55 2011 +0200 +Author: Yaron Shahrabani +Date: Wed Mar 16 17:02:55 2011 +0200 Updated Hebrew translation. M po/he.po commit 9a0c8f0b5d91d3a216987a8299eb7fe02279d407 -Author: Duarte Loreto -AuthorDate: Wed Mar 16 00:10:02 2011 +0000 -Commit: Duarte Loreto -CommitDate: Wed Mar 16 00:10:02 2011 +0000 +Author: Duarte Loreto +Date: Wed Mar 16 00:10:02 2011 +0000 Updated Portuguese translation M po/pt.po commit 17821aead4a942c23438db0c0d43652cb85708d6 -Author: Wouter Bolsterlee -AuthorDate: Tue Mar 15 22:23:37 2011 +0100 -Commit: Wouter Bolsterlee -CommitDate: Tue Mar 15 22:24:13 2011 +0100 +Author: Wouter Bolsterlee +Date: Tue Mar 15 22:23:37 2011 +0100 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit 74fdd957eeefafb8763c6b283da80ac28ee59eae -Author: Ivar Smolin -AuthorDate: Tue Mar 15 17:15:51 2011 +0200 -Commit: Priit Laes -CommitDate: Tue Mar 15 17:15:51 2011 +0200 +Author: Ivar Smolin +Date: Tue Mar 15 17:15:51 2011 +0200 [l10n] Updated Estonian translation M po/et.po commit d36c9fca0d23fb673d7d4ddcf7b0d2c79739b56b -Author: Andrej Žnidaršič -AuthorDate: Tue Mar 15 16:09:18 2011 +0100 -Commit: Matej Urbančič -CommitDate: Tue Mar 15 16:09:18 2011 +0100 +Author: Andrej Žnidaršič +Date: Tue Mar 15 16:09:18 2011 +0100 Updated Slovenian translation M po/sl.po commit 5e97f774b224fe2886a1eed3ffcac7eb2bb72af7 -Author: Piotr Drąg -AuthorDate: Tue Mar 15 14:01:30 2011 +0100 -Commit: Piotr Drąg -CommitDate: Tue Mar 15 14:01:30 2011 +0100 +Author: Piotr Drąg +Date: Tue Mar 15 14:01:30 2011 +0100 Updated Polish translation M po/pl.po commit 59fb60ced6537ab67652b8c7b4f167a8da135592 -Author: Lucian Adrian Grijincu -AuthorDate: Tue Mar 15 12:35:41 2011 +0100 -Commit: Lucian Adrian Grijincu -CommitDate: Tue Mar 15 12:35:50 2011 +0100 +Author: Lucian Adrian Grijincu +Date: Tue Mar 15 12:35:41 2011 +0100 Updated Romanian translation M po/ro.po commit f395fb3d490be996b8aa5ff25a94f863ccd250be -Author: Lucian Adrian Grijincu -AuthorDate: Tue Mar 15 12:35:07 2011 +0100 -Commit: Lucian Adrian Grijincu -CommitDate: Tue Mar 15 12:35:50 2011 +0100 +Author: Lucian Adrian Grijincu +Date: Tue Mar 15 12:35:07 2011 +0100 Updated Romanian translation M po/ro.po commit 17e21bc87b53cb8c05c35809f40407ac6363fde1 -Author: Daniel Korostil -AuthorDate: Tue Mar 15 06:35:27 2011 +0200 -Commit: Daniel Korostil -CommitDate: Tue Mar 15 06:35:27 2011 +0200 +Author: Daniel Korostil +Date: Tue Mar 15 06:35:27 2011 +0200 Uploaded Ukranian M po/uk.po commit c6bbfa797386885d7230d128502b03c5df1feb2b -Author: Gabor Kelemen -AuthorDate: Tue Mar 15 04:26:42 2011 +0100 -Commit: Gabor Kelemen -CommitDate: Tue Mar 15 04:26:42 2011 +0100 +Author: Gabor Kelemen +Date: Tue Mar 15 04:26:42 2011 +0100 Updated Hungarian translation M po/hu.po commit f53870759374060135d4815b54ccb13d7bb1f7ac -Author: Fran Diéguez -AuthorDate: Tue Mar 15 01:33:46 2011 +0100 -Commit: Fran Diéguez -CommitDate: Tue Mar 15 01:33:46 2011 +0100 +Author: Fran Diéguez +Date: Tue Mar 15 01:33:46 2011 +0100 Updated Galician translations M po/gl.po commit d008875cf57a790798c243bb136b27176bb64646 -Author: Daniel Nylander -AuthorDate: Tue Mar 15 00:09:36 2011 +0100 -Commit: Daniel Nylander -CommitDate: Tue Mar 15 00:09:36 2011 +0100 +Author: Daniel Nylander +Date: Tue Mar 15 00:09:36 2011 +0100 Updated Swedish translation M po/sv.po commit 66810adad747a1fbd6714a62817c227254ac7a4f -Author: Daniel Mustieles -AuthorDate: Mon Mar 14 22:03:57 2011 +0100 -Commit: Daniel Mustieles -CommitDate: Mon Mar 14 22:03:57 2011 +0100 +Author: Daniel Mustieles +Date: Mon Mar 14 22:03:57 2011 +0100 Updated Spanish translation M po/es.po commit 8bdfe9e49297bfce3f82708001c7918d21fb55c9 -Author: Flamarion Jorge -AuthorDate: Mon Mar 14 11:49:36 2011 -0300 -Commit: Djavan Fagundes -CommitDate: Mon Mar 14 11:49:36 2011 -0300 +Author: Flamarion Jorge +Date: Mon Mar 14 11:49:36 2011 -0300 Updated Brazilian Portuguese translation M po/pt_BR.po commit ce2968402f20087cec2c5d9f4fc5eb7bbfb25903 -Author: Matthias Clasen -AuthorDate: Mon Mar 14 09:22:00 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 14 09:23:01 2011 -0400 +Author: Matthias Clasen +Date: Mon Mar 14 09:22:00 2011 -0400 gnome-session-check-accelerated: Avoid double checking @@ -9339,30 +9426,24 @@ M tools/gnome-session-check-accelerated.c commit bde1abd31529cbcc1c5bb80d4baaf4a799767882 -Author: Daniel Șerbănescu -AuthorDate: Mon Mar 14 13:47:16 2011 +0100 -Commit: Lucian Adrian Grijincu -CommitDate: Mon Mar 14 13:47:16 2011 +0100 +Author: Daniel Șerbănescu +Date: Mon Mar 14 13:47:16 2011 +0100 Updated Romanian translation M po/ro.po commit e0a65f4bfb8bb77ddef22ff3eb9aa9f885f172c9 -Author: Khaled Hosny -AuthorDate: Mon Mar 14 14:27:27 2011 +0200 -Commit: Khaled Hosny -CommitDate: Mon Mar 14 14:27:27 2011 +0200 +Author: Khaled Hosny +Date: Mon Mar 14 14:27:27 2011 +0200 Updated Arabic translation M po/ar.po commit aa8f8ec3395350ec5d0d3f9bea618f6188c356dc -Author: Matthias Clasen -AuthorDate: Mon Mar 14 06:44:53 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 14 06:44:53 2011 -0400 +Author: Matthias Clasen +Date: Mon Mar 14 06:44:53 2011 -0400 Add a full stop @@ -9371,10 +9452,8 @@ M gnome-session/gsm-manager.c commit 7039030ca360f844ec6d042b2e625630f12412ce -Author: Matthias Clasen -AuthorDate: Mon Mar 14 06:42:38 2011 -0400 -Commit: Matthias Clasen -CommitDate: Mon Mar 14 06:42:38 2011 -0400 +Author: Matthias Clasen +Date: Mon Mar 14 06:42:38 2011 -0400 Improve the wording of the fallback dialog @@ -9385,20 +9464,16 @@ M gnome-session/gsm-manager.c commit ac1a3a240bf08779fb920b0e123c79494c1bf32d -Author: Bruce Cowan -AuthorDate: Sat Mar 12 18:16:21 2011 +0000 -Commit: Bruce Cowan -CommitDate: Sat Mar 12 18:16:21 2011 +0000 +Author: Bruce Cowan +Date: Sat Mar 12 18:16:21 2011 +0000 Updated British English translation M po/en_GB.po commit 0e10923053fdc99f5da997c5d2a26e8a9bcce41b -Author: Colin Walters -AuthorDate: Thu Mar 10 10:08:00 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Mar 10 10:08:00 2011 -0500 +Author: Colin Walters +Date: Thu Mar 10 10:08:00 2011 -0500 gsm-session-fill: Fix error message to include session name @@ -9407,50 +9482,40 @@ M gnome-session/gsm-session-fill.c commit 248e3bc0fc47e2db69b3ddba0d75033620c61102 -Author: Piotr Drąg -AuthorDate: Wed Mar 9 20:25:02 2011 +0100 -Commit: Piotr Drąg -CommitDate: Wed Mar 9 20:25:02 2011 +0100 +Author: Piotr Drąg +Date: Wed Mar 9 20:25:02 2011 +0100 Updated Polish translation M po/pl.po commit 86d8df6cc552e375c896ed0f7f8dae2d5915b5eb -Author: Matthias Clasen -AuthorDate: Wed Mar 9 11:50:57 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 11:50:57 2011 -0500 +Author: Matthias Clasen +Date: Wed Mar 9 11:50:57 2011 -0500 Back up M configure.ac -commit 74e31ef1436319bd5587ef6b077c9341c0e9892d (tag: 2.91.91.3) -Author: Matthias Clasen -AuthorDate: Wed Mar 9 11:46:37 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 11:46:37 2011 -0500 +commit 74e31ef1436319bd5587ef6b077c9341c0e9892d +Author: Matthias Clasen +Date: Wed Mar 9 11:46:37 2011 -0500 Update M NEWS commit 8367d907c1c46c2642a0b07bf2cfb51331f54195 -Author: Matthias Clasen -AuthorDate: Wed Mar 9 11:46:12 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 11:46:12 2011 -0500 +Author: Matthias Clasen +Date: Wed Mar 9 11:46:12 2011 -0500 Back down M configure.ac commit 18462165c81e1cc8049650f09575318c565f37c1 -Author: Matthias Clasen -AuthorDate: Wed Mar 9 11:44:59 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 11:44:59 2011 -0500 +Author: Matthias Clasen +Date: Wed Mar 9 11:44:59 2011 -0500 Fix a bug when lauching gnome-session-check-accelerated-helper @@ -9460,40 +9525,32 @@ M tools/gnome-session-check-accelerated.c commit 0fbff68b057d93e61e38105e978eb3497c5f35df -Author: Matthias Clasen -AuthorDate: Wed Mar 9 11:02:13 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 11:02:13 2011 -0500 +Author: Matthias Clasen +Date: Wed Mar 9 11:02:13 2011 -0500 Back up to 2.91.92 M configure.ac -commit 046bc894bddbb550106b3f8023186dd2cffe3ce4 (tag: 2.91.91.2) -Author: Matthias Clasen -AuthorDate: Wed Mar 9 10:54:19 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 10:54:19 2011 -0500 +commit 046bc894bddbb550106b3f8023186dd2cffe3ce4 +Author: Matthias Clasen +Date: Wed Mar 9 10:54:19 2011 -0500 Updates M NEWS commit 4af5e647404319c28686a4bc719ec8cc2bb2c821 -Author: Matthias Clasen -AuthorDate: Wed Mar 9 10:53:45 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Mar 9 10:53:45 2011 -0500 +Author: Matthias Clasen +Date: Wed Mar 9 10:53:45 2011 -0500 Back down to 2.91.91.2 M configure.ac commit c0840a766a02ba3f920bc810c938e6c6d13e897c -Author: Colin Walters -AuthorDate: Thu Mar 3 18:55:16 2011 -0500 -Commit: Colin Walters -CommitDate: Wed Mar 9 10:03:21 2011 -0500 +Author: Colin Walters +Date: Thu Mar 3 18:55:16 2011 -0500 gsm-process-helper: Give useful error data @@ -9521,50 +9578,40 @@ M gnome-session/test-process-helper.c commit e629d060e0a553c340d0a55f42f8a3bfda75338b -Author: Matthias Clasen -AuthorDate: Tue Mar 8 17:45:39 2011 -0500 -Commit: Matthias Clasen -CommitDate: Tue Mar 8 17:45:39 2011 -0500 +Author: Matthias Clasen +Date: Tue Mar 8 17:45:39 2011 -0500 Back up to 2.91.92 M configure.ac -commit 9a5c05ce149aa40a8c8e8dd4a3bcebd60418c15b (tag: 2.91.91.1) -Author: Matthias Clasen -AuthorDate: Tue Mar 8 17:39:14 2011 -0500 -Commit: Matthias Clasen -CommitDate: Tue Mar 8 17:39:14 2011 -0500 +commit 9a5c05ce149aa40a8c8e8dd4a3bcebd60418c15b +Author: Matthias Clasen +Date: Tue Mar 8 17:39:14 2011 -0500 Fix linking with pedantic linkers M tools/Makefile.am commit b1ab3eafea6db29c18d0c643f50a88c943acd41e -Author: Matthias Clasen -AuthorDate: Tue Mar 8 17:24:05 2011 -0500 -Commit: Matthias Clasen -CommitDate: Tue Mar 8 17:24:05 2011 -0500 +Author: Matthias Clasen +Date: Tue Mar 8 17:24:05 2011 -0500 Update NEWS M NEWS commit c71155625f26f07ef3ccdda114aa057b3a1ad4cc -Author: Matthias Clasen -AuthorDate: Tue Mar 8 17:23:04 2011 -0500 -Commit: Matthias Clasen -CommitDate: Tue Mar 8 17:23:04 2011 -0500 +Author: Matthias Clasen +Date: Tue Mar 8 17:23:04 2011 -0500 Back down to 2.91.91.1 M configure.ac commit 01217f38addd7ea47e121fc5e31eb2a35a54f9f8 -Author: Matthias Clasen -AuthorDate: Tue Mar 8 14:04:05 2011 -0500 -Commit: Matthias Clasen -CommitDate: Tue Mar 8 14:04:05 2011 -0500 +Author: Matthias Clasen +Date: Tue Mar 8 14:04:05 2011 -0500 Return 0 on success @@ -9573,90 +9620,72 @@ M tools/gnome-session-check-accelerated.c commit 195176657fa9dde1b2bcc1dfd7d46796c2da109f -Author: Manoj Kumar Giri -AuthorDate: Mon Mar 7 16:46:47 2011 +0530 -Commit: Manoj Kumar Giri -CommitDate: Mon Mar 7 16:46:47 2011 +0530 +Author: Manoj Kumar Giri +Date: Mon Mar 7 16:46:47 2011 +0530 Updated Oriya Translation M po/or.po commit 72256e903bd44018815a80d5a68582fe5ce63a18 -Author: Vincent Untz -AuthorDate: Mon Mar 7 00:01:01 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Mar 7 00:01:01 2011 +0100 +Author: Vincent Untz +Date: Mon Mar 7 00:01:01 2011 +0100 release: post-release bump to 2.91.92 M configure.ac -commit ba167fb22e46e0942b16d342bcd26799cd762301 (tag: 2.91.91) -Author: Vincent Untz -AuthorDate: Mon Mar 7 00:00:55 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Mar 7 00:00:55 2011 +0100 +commit ba167fb22e46e0942b16d342bcd26799cd762301 +Author: Vincent Untz +Date: Mon Mar 7 00:00:55 2011 +0100 release: 2.91.91 M NEWS commit 7bbd1fcb43f892a09aad65cf1b74fa29b38c2a9d -Author: David Planella -AuthorDate: Sun Mar 6 22:22:20 2011 +0100 -Commit: Gil Forcada -CommitDate: Sun Mar 6 22:22:20 2011 +0100 +Author: David Planella +Date: Sun Mar 6 22:22:20 2011 +0100 [l10n] Updated Catalan translation M po/ca.po commit db7903f9438cfd3c47dda9d65ca84ec5591a44fe -Author: Pavol Šimo -AuthorDate: Sun Mar 6 17:46:41 2011 +0100 -Commit: Pavol Šimo -CommitDate: Sun Mar 6 17:46:41 2011 +0100 +Author: Pavol Šimo +Date: Sun Mar 6 17:46:41 2011 +0100 Updated Slovak translation M po/sk.po commit 6528cc48071975f945db76053b3324cde11ba496 -Author: Khaled Hosny -AuthorDate: Sun Mar 6 15:35:09 2011 +0200 -Commit: Khaled Hosny -CommitDate: Sun Mar 6 15:35:09 2011 +0200 +Author: Khaled Hosny +Date: Sun Mar 6 15:35:09 2011 +0200 Updated Arabic translation M po/ar.po commit 201ef329f2aa2a7715bb319b266294eec97a5926 -Author: Daniel Korostil -AuthorDate: Fri Mar 4 17:00:49 2011 +0200 -Commit: Daniel Korostil -CommitDate: Fri Mar 4 17:00:49 2011 +0200 +Author: Daniel Korostil +Date: Fri Mar 4 17:00:49 2011 +0200 Uploaded Ukranian M po/uk.po commit d05fceeefab3af71a40e7a2e12a7eb41f13310c5 -Author: Rudolfs Mazurs -AuthorDate: Fri Mar 4 00:43:21 2011 +0200 -Commit: Peteris Krisjanis -CommitDate: Fri Mar 4 00:43:21 2011 +0200 +Author: Rudolfs Mazurs +Date: Fri Mar 4 00:43:21 2011 +0200 Updated Latvian translation. M po/lv.po commit ffe98dd102abd4b39732cae69fc35ed3b0522604 -Author: Colin Walters -AuthorDate: Mon Feb 28 10:03:13 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Mar 3 16:55:24 2011 -0500 +Author: Colin Walters +Date: Mon Feb 28 10:03:13 2011 -0500 gnome-session-check-accelerated: Set X property _GNOME_SESSION_ACCELERATED @@ -9681,30 +9710,24 @@ A tools/gnome-session-check-accelerated.c commit 68c1927aee83020156e00b79928870aaa8c40bc5 -Author: A S Alam -AuthorDate: Thu Mar 3 08:23:31 2011 +0530 -Commit: A S Alam -CommitDate: Thu Mar 3 08:23:31 2011 +0530 +Author: A S Alam +Date: Thu Mar 3 08:23:31 2011 +0530 update Punjabi Translation by A S Alam M po/pa.po commit 51d1473c3e8ffc1328b4bde2c3e8e9415ddccd4d -Author: Kjartan Maraas -AuthorDate: Wed Mar 2 20:32:04 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Wed Mar 2 20:32:04 2011 +0100 +Author: Kjartan Maraas +Date: Wed Mar 2 20:32:04 2011 +0100 Updated Norwegian bokmål translation M po/nb.po commit 7260541a114d52f1de735e0ba123979c53ccab44 -Author: Vincent Untz -AuthorDate: Wed Mar 2 18:44:13 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Mar 2 18:45:05 2011 +0100 +Author: Vincent Untz +Date: Wed Mar 2 18:44:13 2011 +0100 Rename org.gnome.SessionManager.gschema.migrate to gnome-session.convert @@ -9714,20 +9737,16 @@ R100 data/org.gnome.SessionManager.gschema.migrate data/gnome-session.convert commit 2e875d3d011b24005d807d96be167414c4a6d6ac -Author: Bruno Brouard -AuthorDate: Wed Mar 2 13:41:48 2011 +0100 -Commit: Bruno Brouard -CommitDate: Wed Mar 2 13:41:48 2011 +0100 +Author: Bruno Brouard +Date: Wed Mar 2 13:41:48 2011 +0100 Updated French translation M po/fr.po commit 6c6810669b35168ed4c74c4c8e615ea768622796 -Author: Lucas Rocha -AuthorDate: Tue Mar 1 17:43:54 2011 +0000 -Commit: Lucas Rocha -CommitDate: Tue Mar 1 17:43:54 2011 +0000 +Author: Lucas Rocha +Date: Tue Mar 1 17:43:54 2011 +0000 Remove my name from list of maintainers @@ -9737,10 +9756,8 @@ M gnome-session.doap commit 6131a4cfba214b89d0197510a4f4cab33a160bfd -Author: Matthias Clasen -AuthorDate: Mon Feb 28 19:43:32 2011 -0500 -Commit: Matthias Clasen -CommitDate: Mon Feb 28 19:43:32 2011 -0500 +Author: Matthias Clasen +Date: Mon Feb 28 19:43:32 2011 -0500 gsm_manager_get does not return a reference @@ -9750,10 +9767,8 @@ M gnome-session/gsm-autostart-app.c commit 9d0ee2ef615e27d3b612b36a0b7d2916d6759b32 -Author: Colin Walters -AuthorDate: Mon Feb 28 12:12:18 2011 -0500 -Commit: Colin Walters -CommitDate: Mon Feb 28 12:12:18 2011 -0500 +Author: Colin Walters +Date: Mon Feb 28 12:12:18 2011 -0500 Remove GTK2 compilation option @@ -9764,10 +9779,8 @@ M configure.ac commit f6a20af48ac40bb02c763da53c793008c42a64d6 -Author: Colin Walters -AuthorDate: Mon Feb 28 10:25:15 2011 -0500 -Commit: Colin Walters -CommitDate: Mon Feb 28 10:25:15 2011 -0500 +Author: Colin Walters +Date: Mon Feb 28 10:25:15 2011 -0500 Increase is-accelerated runnable helper timeout @@ -9781,70 +9794,56 @@ M gnome-session/gsm-session-fill.c commit 4d1f6b096900a117d20be1d163d3701e8ececff3 -Author: Yaron Shahrabani -AuthorDate: Sun Feb 27 23:07:41 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Sun Feb 27 23:07:41 2011 +0200 +Author: Yaron Shahrabani +Date: Sun Feb 27 23:07:41 2011 +0200 Updated Hebrew translation. M po/he.po commit 7227dec7afa2cf764e3bc1e9fc1802a69b74dc36 -Author: Ivar Smolin -AuthorDate: Sun Feb 27 19:20:56 2011 +0200 -Commit: Priit Laes -CommitDate: Sun Feb 27 19:20:56 2011 +0200 +Author: Ivar Smolin +Date: Sun Feb 27 19:20:56 2011 +0200 [l10n] Updated Estonian translation M po/et.po commit 3ae2c358655006c4bf692572303a1055c0e865be -Author: Daniel Nylander -AuthorDate: Sun Feb 27 17:54:35 2011 +0100 -Commit: Daniel Nylander -CommitDate: Sun Feb 27 17:54:35 2011 +0100 +Author: Daniel Nylander +Date: Sun Feb 27 17:54:35 2011 +0100 Updated Swedish translation M po/sv.po commit e82df3f67f70820cdcc4b9628b03c8f9e4d05aff -Author: Changwoo Ryu -AuthorDate: Sun Feb 27 17:55:12 2011 +0900 -Commit: Changwoo Ryu -CommitDate: Sun Feb 27 17:55:12 2011 +0900 +Author: Changwoo Ryu +Date: Sun Feb 27 17:55:12 2011 +0900 Updated Korean translation M po/ko.po commit 3cd96587721a1d6a1b652bba73289e7a6c888a90 -Author: Daniel Mustieles -AuthorDate: Sat Feb 26 12:23:23 2011 +0100 -Commit: Daniel Mustieles -CommitDate: Sat Feb 26 12:23:23 2011 +0100 +Author: Daniel Mustieles +Date: Sat Feb 26 12:23:23 2011 +0100 Updated Spanish translation M po/es.po commit 3e2cb3e932a9f87b2d995b0dd2d3716d2853147d -Author: Matej Urbančič -AuthorDate: Fri Feb 25 20:18:35 2011 +0100 -Commit: Matej Urbančič -CommitDate: Fri Feb 25 20:18:35 2011 +0100 +Author: Matej Urbančič +Date: Fri Feb 25 20:18:35 2011 +0100 Updated Slovenian translation M po/sl.po commit bd5578317a6818d9b104d1acd839387fd5dc8e6a -Author: Ray Strode -AuthorDate: Fri Feb 25 09:45:19 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 25 10:10:35 2011 -0500 +Author: Ray Strode +Date: Fri Feb 25 09:45:19 2011 -0500 shell: fix cancel button in logout dialog @@ -9860,10 +9859,8 @@ M gnome-session/gsm-shell.c commit 8663860ff44b9a5e441e4909a49eee4cfa08378d -Author: William Jon McCann -AuthorDate: Thu Feb 24 17:38:13 2011 -0500 -Commit: William Jon McCann -CommitDate: Thu Feb 24 17:56:03 2011 -0500 +Author: William Jon McCann +Date: Thu Feb 24 17:38:13 2011 -0500 rename gnome-session-save to gnome-session-quit @@ -9877,10 +9874,8 @@ R059 tools/gnome-session-save.c tools/gnome-session-quit.c commit cba6e372e3f9130b22d7d614d376c3c9ae898ce7 -Author: Colin Walters -AuthorDate: Tue Feb 22 15:23:14 2011 -0500 -Commit: Colin Walters -CommitDate: Thu Feb 24 14:55:26 2011 -0500 +Author: Colin Walters +Date: Tue Feb 22 15:23:14 2011 -0500 main: Better error message on not-found session @@ -9892,10 +9887,8 @@ M gnome-session/main.c commit a4d8da2de02b3815441f8bdc9281dccdeba3c2dc -Author: Vincent Untz -AuthorDate: Thu Feb 24 01:01:31 2011 +0100 -Commit: Vincent Untz -CommitDate: Thu Feb 24 01:01:58 2011 +0100 +Author: Vincent Untz +Date: Thu Feb 24 01:01:31 2011 +0100 gsm: Move a define @@ -9905,20 +9898,16 @@ M gnome-session/gsm-manager.c commit ed9acae10a2e7e6363e3a3e691a75cabc67fe5a9 -Author: Khaled Hosny -AuthorDate: Wed Feb 23 18:40:24 2011 +0200 -Commit: Khaled Hosny -CommitDate: Wed Feb 23 18:40:24 2011 +0200 +Author: Khaled Hosny +Date: Wed Feb 23 18:40:24 2011 +0200 Updated Arabic translation M po/ar.po commit 4c6feb42ad7d3fd5f290f613cfd21fc12823d0d2 -Author: Vincent Untz -AuthorDate: Wed Feb 23 16:44:30 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 23 16:44:50 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 23 16:44:30 2011 +0100 gsm: Fix typo in fallback dialog @@ -9927,40 +9916,32 @@ M gnome-session/gsm-manager.c commit 27008ed3db201fdc31b47571b4b721f3b22680cd -Author: Ivar Smolin -AuthorDate: Wed Feb 23 13:36:01 2011 +0200 -Commit: Priit Laes -CommitDate: Wed Feb 23 13:36:01 2011 +0200 +Author: Ivar Smolin +Date: Wed Feb 23 13:36:01 2011 +0200 [l10n] Updated Estonian translation M po/et.po commit c7d97c675b03840a38916d4f8a472f8138f7a74e -Author: Alexander Shopov -AuthorDate: Wed Feb 23 07:50:44 2011 +0200 -Commit: Alexander Shopov -CommitDate: Wed Feb 23 07:50:44 2011 +0200 +Author: Alexander Shopov +Date: Wed Feb 23 07:50:44 2011 +0200 Updated Bulgarian translation M po/bg.po commit 1fde73507d561079669c1c6ad09bca9094ce8792 -Author: Vincent Untz -AuthorDate: Wed Feb 23 01:56:14 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 23 01:56:14 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 23 01:56:14 2011 +0100 release: post-release bump to 2.91.91 M configure.ac -commit a3ac120330776d9378329879b9c9ec8eb9643590 (tag: 2.91.90.1) -Author: Vincent Untz -AuthorDate: Wed Feb 23 01:56:08 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 23 01:56:08 2011 +0100 +commit a3ac120330776d9378329879b9c9ec8eb9643590 +Author: Vincent Untz +Date: Wed Feb 23 01:56:08 2011 +0100 release: 2.91.90.1 @@ -9968,10 +9949,8 @@ M configure.ac commit 0b71e3d369d1b922541c0f0fe764e576b54a8f1d -Author: Colin Walters -AuthorDate: Tue Feb 22 14:57:58 2011 -0500 -Commit: Colin Walters -CommitDate: Tue Feb 22 14:59:16 2011 -0500 +Author: Colin Walters +Date: Tue Feb 22 14:57:58 2011 -0500 manager: Handle session name being NULL from gdm @@ -9980,80 +9959,64 @@ M gnome-session/gsm-manager.c commit 8f9778ff429c29fc0aa16def9968fe7ff6bdcccd -Author: Runa Bhattacharjee -AuthorDate: Tue Feb 22 15:23:20 2011 +0530 -Commit: Runa Bhattacharjee -CommitDate: Tue Feb 22 15:23:20 2011 +0530 +Author: Runa Bhattacharjee +Date: Tue Feb 22 15:23:20 2011 +0530 Updated Bengali India Translation M po/bn_IN.po commit 222a6c2576725a8e32b48d01aacd00e92c79bb55 -Author: Vincent Untz -AuthorDate: Tue Feb 22 00:01:03 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 22 00:01:03 2011 +0100 +Author: Vincent Untz +Date: Tue Feb 22 00:01:03 2011 +0100 release: post-release bump to 2.91.91 M configure.ac -commit 95aa91bc6d2c07b7e017d070e123db95b47dc68f (tag: 2.91.90) -Author: Vincent Untz -AuthorDate: Tue Feb 22 00:00:57 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 22 00:00:57 2011 +0100 +commit 95aa91bc6d2c07b7e017d070e123db95b47dc68f +Author: Vincent Untz +Date: Tue Feb 22 00:00:57 2011 +0100 release: 2.91.90 M NEWS commit 778dd6617d9500b96d8c2370a129e23043a3090a -Author: Yaron Shahrabani -AuthorDate: Mon Feb 21 09:29:55 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Mon Feb 21 09:29:55 2011 +0200 +Author: Yaron Shahrabani +Date: Mon Feb 21 09:29:55 2011 +0200 Updated Hebrew translation. M po/he.po commit ea94a0cf4364a3110e56cad77aff7e9d4a6bb07c -Author: Matej Urbančič -AuthorDate: Sun Feb 20 14:03:53 2011 +0100 -Commit: Matej Urbančič -CommitDate: Sun Feb 20 14:03:53 2011 +0100 +Author: Matej Urbančič +Date: Sun Feb 20 14:03:53 2011 +0100 Updated Slovenian translation M po/sl.po commit 5865584ec2c9a77bf9a92003b3e27aa581c6e73e -Author: Kjartan Maraas -AuthorDate: Sun Feb 20 12:13:06 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Sun Feb 20 12:13:06 2011 +0100 +Author: Kjartan Maraas +Date: Sun Feb 20 12:13:06 2011 +0100 Updated Norwegian bokmål translation. M po/nb.po commit d194ca8932503d89c8e5b2748a634025f5ba368b -Author: Jorge González -AuthorDate: Sat Feb 19 12:46:27 2011 +0100 -Commit: Jorge González -CommitDate: Sat Feb 19 12:46:27 2011 +0100 +Author: Jorge González +Date: Sat Feb 19 12:46:27 2011 +0100 Updated Spanish translation M po/es.po commit 3f238fe67647ea8bfe26701a36d6372021572249 -Author: Ray Strode -AuthorDate: Thu Feb 17 18:09:43 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 18:09:43 2011 -0500 shell: update dialog as inhibitors change @@ -10063,10 +10026,8 @@ M gnome-session/gsm-shell.c commit b0f4b0510d97f4b702413b1956ddfe51254e1bd1 -Author: Ray Strode -AuthorDate: Thu Feb 17 18:06:46 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 18:06:46 2011 -0500 shell: drop unused parameter to open function @@ -10075,10 +10036,8 @@ M gnome-session/gsm-shell.h commit f8fb3ad12a8a7eb4a4609ac9c2889c5c8f3db908 -Author: Ray Strode -AuthorDate: Thu Feb 17 16:21:58 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 16:21:58 2011 -0500 manager: add some phase checking paranoia @@ -10093,10 +10052,8 @@ M gnome-session/gsm-manager.c commit 6f0f9f0b55eb8b95f94415400ba6ecf5a8a773ad -Author: Ray Strode -AuthorDate: Thu Feb 17 16:12:55 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 16:12:55 2011 -0500 manager: clean up shell signal connection code @@ -10109,10 +10066,8 @@ M gnome-session/gsm-manager.c commit ff337d253a475a79337e0f610e4d6027095721f4 -Author: Ray Strode -AuthorDate: Thu Feb 17 16:07:04 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 16:07:04 2011 -0500 manager: honor no confirmation logout mode for shell @@ -10126,10 +10081,8 @@ M gnome-session/gsm-manager.c commit d7adaa9111d0f42d11225c7e29a7ee1d37d74d2f -Author: Ray Strode -AuthorDate: Thu Feb 17 15:37:57 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 15:37:57 2011 -0500 manager: track full details of logout request @@ -10155,10 +10108,8 @@ M gnome-session/gsm-manager.c commit 14e39d6aaed4a34448fe264a8393e3527522c4d2 -Author: Ray Strode -AuthorDate: Thu Feb 17 14:52:04 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Feb 18 11:30:06 2011 -0500 +Author: Ray Strode +Date: Thu Feb 17 14:52:04 2011 -0500 manager: don't show inhibitor dialog if no inhibitors @@ -10171,10 +10122,8 @@ M gnome-session/gsm-manager.c commit 6454e7b0a994777ebe4c10fbc49087a231f66c05 -Author: William Jon McCann -AuthorDate: Thu Feb 17 17:55:11 2011 -0500 -Commit: William Jon McCann -CommitDate: Thu Feb 17 17:56:46 2011 -0500 +Author: William Jon McCann +Date: Thu Feb 17 17:55:11 2011 -0500 Mark session-name as read only @@ -10183,20 +10132,16 @@ M gnome-session/gsm-manager.c commit 457c92b483cea2514125a3ce1d800f8a03113dde -Author: Khaled Hosny -AuthorDate: Thu Feb 17 19:42:38 2011 +0200 -Commit: Khaled Hosny -CommitDate: Thu Feb 17 19:42:38 2011 +0200 +Author: Khaled Hosny +Date: Thu Feb 17 19:42:38 2011 +0200 Updated Arabic translation M po/ar.po commit 85975ceb221b6137814ed695438cbf93ddd4ab0c -Author: Alexander Larsson -AuthorDate: Thu Feb 17 14:11:19 2011 +0100 -Commit: Alexander Larsson -CommitDate: Thu Feb 17 17:12:01 2011 +0100 +Author: Alexander Larsson +Date: Thu Feb 17 14:11:19 2011 +0100 Store svg compressed @@ -10208,20 +10153,16 @@ M gnome-session/gsm-manager.c commit ff349aa2da1b7437f58e9950f2a28468fcfc1225 -Author: Kjartan Maraas -AuthorDate: Thu Feb 17 14:03:53 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Thu Feb 17 14:03:53 2011 +0100 +Author: Kjartan Maraas +Date: Thu Feb 17 14:03:53 2011 +0100 Updated Norwegian bokmål translation. M po/nb.po commit bad81e27574fcf8d1623cdc6d07cc7bf4b08b12e -Author: Alexander Larsson -AuthorDate: Thu Feb 17 11:46:41 2011 +0100 -Commit: Alexander Larsson -CommitDate: Thu Feb 17 13:36:21 2011 +0100 +Author: Alexander Larsson +Date: Thu Feb 17 11:46:41 2011 +0100 Show a dialog after login the first time we fall back to gnome-fallback @@ -10238,40 +10179,32 @@ M gnome-session/gsm-manager.c commit 70669f60c82431c0b1193fc60d3dae8b51318c3b -Author: Sweta Kothari -AuthorDate: Thu Feb 17 13:11:48 2011 +0530 -Commit: Sweta Kothari -CommitDate: Thu Feb 17 13:11:48 2011 +0530 +Author: Sweta Kothari +Date: Thu Feb 17 13:11:48 2011 +0530 Updated Gujarati Translations M po/gu.po commit 25b4a9e701bf8f4221d41665b2c049576d7b1187 -Author: Alexander Shopov -AuthorDate: Wed Feb 16 22:47:42 2011 +0200 -Commit: Alexander Shopov -CommitDate: Wed Feb 16 22:47:42 2011 +0200 +Author: Alexander Shopov +Date: Wed Feb 16 22:47:42 2011 +0200 Updated Bulgarian translation M po/bg.po commit 3f6b9b6409c8d3d589084765d16c67a7a13cae95 -Author: Matthias Clasen -AuthorDate: Wed Feb 16 13:21:04 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Feb 16 13:21:04 2011 -0500 +Author: Matthias Clasen +Date: Wed Feb 16 13:21:04 2011 -0500 Fix the build M gnome-session/gsm-manager.c commit 9e07c6fa9ca2535316ac249e190e8b4f382e0527 -Author: Matthias Clasen -AuthorDate: Tue Feb 15 13:45:32 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Feb 16 12:22:05 2011 -0500 +Author: Matthias Clasen +Date: Tue Feb 15 13:45:32 2011 -0500 Avoid a warning from the fallback property @@ -10280,10 +10213,8 @@ M gnome-session/gsm-manager.c commit 52d19775daa22f48d0c11688efbd0dbd647fb58f -Author: Matthias Clasen -AuthorDate: Wed Feb 16 12:01:54 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Feb 16 12:01:54 2011 -0500 +Author: Matthias Clasen +Date: Wed Feb 16 12:01:54 2011 -0500 Make notification-daemon a required part of the fallback session @@ -10292,20 +10223,16 @@ M data/gnome-fallback.session.desktop.in.in commit 13803738bd514553eb86919979fb69e09ddf68c8 -Author: Alexander Larsson -AuthorDate: Wed Feb 16 17:21:29 2011 +0100 -Commit: Alexander Larsson -CommitDate: Wed Feb 16 17:21:29 2011 +0100 +Author: Alexander Larsson +Date: Wed Feb 16 17:21:29 2011 +0100 Use gsm_manager_get instead of gsm_manager_new to get the manager M gnome-session/gsm-autostart-app.c commit 02a34d8405b271678697569c439ec2aa3cc5895c -Author: Alexander Larsson -AuthorDate: Wed Feb 16 17:21:11 2011 +0100 -Commit: Alexander Larsson -CommitDate: Wed Feb 16 17:21:11 2011 +0100 +Author: Alexander Larsson +Date: Wed Feb 16 17:21:11 2011 +0100 Add gsm_manager_get() to get the manager singleton @@ -10313,10 +10240,8 @@ M gnome-session/gsm-manager.h commit 58ebdfac223e6246323a6fcc452221a7581ed868 -Author: Alexander Larsson -AuthorDate: Wed Feb 16 14:36:37 2011 +0100 -Commit: Alexander Larsson -CommitDate: Wed Feb 16 17:14:01 2011 +0100 +Author: Alexander Larsson +Date: Wed Feb 16 14:36:37 2011 +0100 Support autostart conditions that depend on the current session @@ -10336,10 +10261,8 @@ M gnome-session/gsm-autostart-app.c commit 3de35f663d1a3cb188fe662ca8aed0fa5af1ebeb -Author: Alexander Larsson -AuthorDate: Wed Feb 16 12:25:15 2011 +0100 -Commit: Alexander Larsson -CommitDate: Wed Feb 16 17:13:55 2011 +0100 +Author: Alexander Larsson +Date: Wed Feb 16 12:25:15 2011 +0100 Make the current session name a property on the session manager @@ -10353,10 +10276,8 @@ M gnome-session/gsm-session-fill.c commit 71cc0cde1a3fe81639ad86dde11ee4b2be42955e -Author: Alexander Larsson -AuthorDate: Mon Feb 14 16:29:13 2011 +0100 -Commit: Alexander Larsson -CommitDate: Mon Feb 14 16:29:13 2011 +0100 +Author: Alexander Larsson +Date: Mon Feb 14 16:29:13 2011 +0100 Use "session-name" property which specifies which session to use @@ -10377,30 +10298,24 @@ M gnome-session/gsm-session-fill.c commit e5e3a4cbc6ec4b9697e1c8a7cf02151a3d6659b3 -Author: Gil Forcada -AuthorDate: Sat Feb 12 00:25:08 2011 +0100 -Commit: Gil Forcada -CommitDate: Sat Feb 12 00:25:08 2011 +0100 +Author: Gil Forcada +Date: Sat Feb 12 00:25:08 2011 +0100 [l10n] Updated Catalan translation M po/ca.po commit 918cbc83d17f21b37a4b4aaba588dd2abe9c2990 -Author: Wouter Bolsterlee -AuthorDate: Fri Feb 11 23:11:10 2011 +0100 -Commit: Wouter Bolsterlee -CommitDate: Fri Feb 11 23:11:10 2011 +0100 +Author: Wouter Bolsterlee +Date: Fri Feb 11 23:11:10 2011 +0100 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit dab1547fee33704624bd9b40882d59eef5587827 -Author: Vincent Untz -AuthorDate: Tue Feb 8 08:53:18 2011 +0100 -Commit: Vincent Untz -CommitDate: Tue Feb 8 08:53:18 2011 +0100 +Author: Vincent Untz +Date: Tue Feb 8 08:53:18 2011 +0100 gsm: screensaver schemas moved to gsettings-desktop-schemas @@ -10409,10 +10324,8 @@ M gnome-session/gsm-manager.c commit 559ae7984759a8e2b696f8e84383aa9195112812 -Author: Vincent Untz -AuthorDate: Wed Feb 2 04:09:36 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 04:09:36 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 04:09:36 2011 +0100 gsm: Do not even care about error message in gsm_shell_init() @@ -10423,30 +10336,24 @@ M gnome-session/gsm-shell.c commit 13b7b47f26646592785b9a4facf13b0e404d19ae -Author: Vincent Untz -AuthorDate: Wed Feb 2 04:08:01 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 04:08:01 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 04:08:01 2011 +0100 gsm: Add some debug message in gsm-shell.c M gnome-session/gsm-shell.c commit b032b2689ee1d55e2c8c856edf0c8490a895adbc -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:58:41 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:58:41 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 03:58:41 2011 +0100 gsm: Fix description of a property M gnome-session/gsm-shell.c commit 2a7b9286e511f0592c05090acb8aa1d25a463768 -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:51:49 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:51:49 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 03:51:49 2011 +0100 gsm: Use g_settings_bind_with_mapping() to keep idle-delay in sync @@ -10456,20 +10363,16 @@ M gnome-session/gsm-manager.c commit ef30fc6c2ee72a2de8d014cd3a30c6e0fbf6da25 -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:49:42 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:49:42 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 03:49:42 2011 +0100 release: post-release bump to 2.91.90 M configure.ac -commit 67cb5053c264be4731c2922e431750090bbc851d (tag: 2.91.6) -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:49:37 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:49:37 2011 +0100 +commit 67cb5053c264be4731c2922e431750090bbc851d +Author: Vincent Untz +Date: Wed Feb 2 03:49:37 2011 +0100 release: 2.91.6 @@ -10477,10 +10380,8 @@ M configure.ac commit 178f9042c101d717d5664fb63d3507bbfed60186 -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:20:43 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:20:43 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 03:20:43 2011 +0100 gsm: Simplify gsettings code @@ -10490,10 +10391,8 @@ M gnome-session/gsm-manager.c commit 11d9ec5976671e54714a4667e5ca45c925c0d762 -Author: Vincent Untz -AuthorDate: Wed Feb 2 03:11:09 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 03:11:09 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 03:11:09 2011 +0100 capplet: Use g_settings_bind() to simplify code @@ -10502,40 +10401,32 @@ M capplet/gsm-properties-dialog.c commit 85f69aab79858b13f8838b7868b724e264eda82b -Author: Vincent Untz -AuthorDate: Wed Feb 2 02:42:12 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 02:42:12 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 02:42:12 2011 +0100 gsm: When checking for required components, abort on the first missing M gnome-session/gsm-session-fill.c commit d560ee0d428b7f2dfb2dee4b6aec5741c404a241 -Author: Vincent Untz -AuthorDate: Wed Feb 2 02:35:35 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 02:35:35 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 02:35:35 2011 +0100 gsm: Remove duplicate debug message M gnome-session/gsm-session-fill.c commit b4900b634f4aca8b87c4b98442d72554f13087a3 -Author: Vincent Untz -AuthorDate: Wed Feb 2 02:34:28 2011 +0100 -Commit: Vincent Untz -CommitDate: Wed Feb 2 02:34:28 2011 +0100 +Author: Vincent Untz +Date: Wed Feb 2 02:34:28 2011 +0100 gsm: Code beautification M gnome-session/gsm-session-fill.c commit 2e538e02100d7b76acabc6ba6e234b1c8b50d99e -Author: Ray Strode -AuthorDate: Tue Feb 1 13:58:37 2011 -0500 -Commit: Ray Strode -CommitDate: Tue Feb 1 13:58:37 2011 -0500 +Author: Ray Strode +Date: Tue Feb 1 13:58:37 2011 -0500 gsm: drop desktop schema @@ -10547,20 +10438,16 @@ D data/org.gnome.desktop.session.gschema.xml.in commit d26b7787917ac7c20b71377c79f86b88d343516e -Author: Ivar Smolin -AuthorDate: Tue Feb 1 19:36:02 2011 +0200 -Commit: Priit Laes -CommitDate: Tue Feb 1 19:36:02 2011 +0200 +Author: Ivar Smolin +Date: Tue Feb 1 19:36:02 2011 +0200 [l10n] Updated Estonian translation M po/et.po commit 5a472935e9fc23ac2d946b72a2d5eea150148b67 -Author: Vincent Untz -AuthorDate: Mon Jan 31 12:32:30 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Jan 31 12:32:30 2011 +0100 +Author: Vincent Untz +Date: Mon Jan 31 12:32:30 2011 +0100 capplet: Fix build warning @@ -10569,20 +10456,16 @@ M capplet/gsm-properties-dialog.c commit b1adda256147810818bfb1753db6965e72ca18bb -Author: Vincent Untz -AuthorDate: Mon Jan 31 12:31:05 2011 +0100 -Commit: Vincent Untz -CommitDate: Mon Jan 31 12:31:05 2011 +0100 +Author: Vincent Untz +Date: Mon Jan 31 12:31:05 2011 +0100 gsm: Do not use deprecated gdk_app_launch_context_new() M gnome-session/gsm-manager.c commit 2c9448bbe456dd2b29e42952151ff15baf5d733f -Author: Ray Strode -AuthorDate: Fri Jan 28 15:54:27 2011 -0500 -Commit: Ray Strode -CommitDate: Fri Jan 28 15:54:27 2011 -0500 +Author: Ray Strode +Date: Fri Jan 28 15:54:27 2011 -0500 shell: don't scream if shell isn't around @@ -10592,10 +10475,8 @@ M gnome-session/gsm-shell.c commit c7d579a374e6942f6f5b8ce5eda246e5bffb8ca5 -Author: Vincent Untz -AuthorDate: Fri Jan 28 09:27:15 2011 +0100 -Commit: Vincent Untz -CommitDate: Fri Jan 28 09:27:15 2011 +0100 +Author: Vincent Untz +Date: Fri Jan 28 09:27:15 2011 +0100 build: Remove leftovers from DEFAULT_WM forgotten in 5f114bde @@ -10603,20 +10484,16 @@ M data/gnome-fallback.session.desktop.in.in commit 0a8d6882e011eb6978c6b10fa93aa051b0bb18d2 -Author: Matthias Clasen -AuthorDate: Thu Jan 27 16:07:51 2011 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 27 16:07:51 2011 -0500 +Author: Matthias Clasen +Date: Thu Jan 27 16:07:51 2011 -0500 Fix a warning message M gnome-session/gsm-session-fill.c commit ef3dae97b7fdd53bc9cabb1c1010acecc4b45ae0 -Author: Matthias Clasen -AuthorDate: Thu Jan 27 15:57:39 2011 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 27 15:57:39 2011 -0500 +Author: Matthias Clasen +Date: Thu Jan 27 15:57:39 2011 -0500 Remove gnome-wm man page @@ -10627,10 +10504,8 @@ D doc/man/gnome-wm.1 commit d77392333122e8a4177d9e58088706920ea94181 -Author: Matthias Clasen -AuthorDate: Wed Jan 26 21:45:16 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Jan 26 21:47:10 2011 -0500 +Author: Matthias Clasen +Date: Wed Jan 26 21:45:16 2011 -0500 Use fallback session if required components are missing @@ -10641,40 +10516,32 @@ M gnome-session/gsm-session-fill.c commit 6afeeb5de842b1cbba6399fdc48952363c60e810 -Author: Fran Diéguez -AuthorDate: Thu Jan 27 03:34:41 2011 +0100 -Commit: Fran Diéguez -CommitDate: Thu Jan 27 03:35:10 2011 +0100 +Author: Fran Diéguez +Date: Thu Jan 27 03:34:41 2011 +0100 QA of Galician translations M po/gl.po commit afc4fcb5fca869f168b7e172d1e4265f48625cb8 -Author: Kjartan Maraas -AuthorDate: Wed Jan 26 12:12:16 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Wed Jan 26 12:12:16 2011 +0100 +Author: Kjartan Maraas +Date: Wed Jan 26 12:12:16 2011 +0100 Updated Norwegian bokmål translation. M po/nb.po commit 9594f7f67cdab0ea14a03ed5c3f90ee8fea7ef90 -Author: Matej Urbančič -AuthorDate: Mon Jan 24 21:48:59 2011 +0100 -Commit: Matej Urbančič -CommitDate: Mon Jan 24 21:48:59 2011 +0100 +Author: Matej Urbančič +Date: Mon Jan 24 21:48:59 2011 +0100 Updated Slovenian translation M po/sl.po commit 1f9ed4829f56826b05c9d4f9fbab8fb7bca53e8c -Author: Ray Strode -AuthorDate: Tue Oct 26 17:04:51 2010 -0400 -Commit: Ray Strode -CommitDate: Mon Jan 24 13:09:24 2011 -0500 +Author: Ray Strode +Date: Tue Oct 26 17:04:51 2010 -0400 shell: add support for shell logout/shutdown dialog @@ -10691,10 +10558,8 @@ A gnome-session/gsm-shell.h commit 5f50ada8a0ddb39d56c73a4c813e9ce135251e23 -Author: Ray Strode -AuthorDate: Mon Jan 24 13:04:13 2011 -0500 -Commit: Ray Strode -CommitDate: Mon Jan 24 13:04:13 2011 -0500 +Author: Ray Strode +Date: Mon Jan 24 13:04:13 2011 -0500 build: fix typo in CLEANFILES @@ -10703,10 +10568,8 @@ M data/Makefile.am commit 93c66fece3ee439e9d4bf55ab7455c0321dbe8e2 -Author: Ray Strode -AuthorDate: Mon Jan 17 19:13:07 2011 -0500 -Commit: Ray Strode -CommitDate: Mon Jan 24 09:41:49 2011 -0500 +Author: Ray Strode +Date: Mon Jan 17 19:13:07 2011 -0500 gsm, capplet: move from gconf to gsettings @@ -10729,70 +10592,56 @@ M gnome-session/gsm-manager.c commit 80b5b15d68e4bc80d19d924bcadfeac5263cf8d2 -Author: Khaled Hosny -AuthorDate: Sun Jan 23 14:38:41 2011 +0200 -Commit: Khaled Hosny -CommitDate: Sun Jan 23 14:38:41 2011 +0200 +Author: Khaled Hosny +Date: Sun Jan 23 14:38:41 2011 +0200 Updated Arabic translation M po/ar.po commit dff5a0436c1052b7e689160dc7bb5b140ca1c3ba -Author: Yaron Shahrabani -AuthorDate: Sun Jan 23 02:59:50 2011 +0200 -Commit: Yaron Shahrabani -CommitDate: Sun Jan 23 02:59:50 2011 +0200 +Author: Yaron Shahrabani +Date: Sun Jan 23 02:59:50 2011 +0200 Updated Hebrew translation. M po/he.po commit 18946d96d1c3caa05be22e212f4fd2d24a19d470 -Author: Daniel Nylander -AuthorDate: Sat Jan 22 14:16:14 2011 +0100 -Commit: Daniel Nylander -CommitDate: Sat Jan 22 14:16:14 2011 +0100 +Author: Daniel Nylander +Date: Sat Jan 22 14:16:14 2011 +0100 Updated Swedish translation M po/sv.po commit 2c68cb5597e9f7243492852a6b7e811de173d3c1 -Author: David Planella -AuthorDate: Sat Jan 22 13:34:55 2011 +0100 -Commit: David Planella -CommitDate: Sat Jan 22 13:34:55 2011 +0100 +Author: David Planella +Date: Sat Jan 22 13:34:55 2011 +0100 Updated Catalan translation M po/ca.po commit 5f3ffaf38d136afcb2a6e2687b757cf20b9a3c19 -Author: Kjartan Maraas -AuthorDate: Thu Jan 20 19:24:01 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Thu Jan 20 19:24:01 2011 +0100 +Author: Kjartan Maraas +Date: Thu Jan 20 19:24:01 2011 +0100 Remove gnome-wm.* leftovers M po/POTFILES.in commit cb3b8e81a415885a496a53eb989bd0b5f8e9eeef -Author: Kjartan Maraas -AuthorDate: Thu Jan 20 19:23:42 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Thu Jan 20 19:23:42 2011 +0100 +Author: Kjartan Maraas +Date: Thu Jan 20 19:23:42 2011 +0100 Updated Norwegian bokmål translation M po/nb.po commit 5f114bde4d4c37d2bd895f18df78bc2ba8355c32 -Author: Matthias Clasen -AuthorDate: Thu Jan 20 10:07:58 2011 -0500 -Commit: Matthias Clasen -CommitDate: Thu Jan 20 10:07:58 2011 -0500 +Author: Matthias Clasen +Date: Thu Jan 20 10:07:58 2011 -0500 Drop gnome-wm script @@ -10805,50 +10654,40 @@ D data/gnome-wm.desktop.in.in commit 078ad57e32adddbee29d9bbbfec1f9ccd63ed2eb -Author: Fran Diéguez -AuthorDate: Wed Jan 19 23:49:44 2011 +0100 -Commit: Fran Diéguez -CommitDate: Wed Jan 19 23:49:44 2011 +0100 +Author: Fran Diéguez +Date: Wed Jan 19 23:49:44 2011 +0100 Updated Galician translations M po/gl.po commit 67d17d735b3e4be9d0a0423a3c48d090b07f3acc -Author: Jorge González -AuthorDate: Wed Jan 19 21:26:22 2011 +0100 -Commit: Jorge González -CommitDate: Wed Jan 19 21:26:22 2011 +0100 +Author: Jorge González +Date: Wed Jan 19 21:26:22 2011 +0100 Updated Spanish translation M po/es.po commit 9579aab70dbae973cded235dcd41bc881f8928f0 -Author: Jorge González -AuthorDate: Wed Jan 19 21:25:39 2011 +0100 -Commit: Jorge González -CommitDate: Wed Jan 19 21:25:39 2011 +0100 +Author: Jorge González +Date: Wed Jan 19 21:25:39 2011 +0100 Updated Spanish translation M po/es.po commit e9caec6fd1bc269d5998465bb9d7fb067c67f4ec -Author: Jorge González -AuthorDate: Wed Jan 19 21:25:18 2011 +0100 -Commit: Jorge González -CommitDate: Wed Jan 19 21:25:18 2011 +0100 +Author: Jorge González +Date: Wed Jan 19 21:25:18 2011 +0100 Updated Spanish translation M po/es.po commit c9cdc9131f75657d9f9dad63184bf43f2a3b5fe7 -Author: Matthias Clasen -AuthorDate: Wed Jan 19 15:02:16 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Jan 19 15:02:16 2011 -0500 +Author: Matthias Clasen +Date: Wed Jan 19 15:02:16 2011 -0500 Rename 'Classic GNOME' to 'GNOME fallback' @@ -10860,10 +10699,8 @@ M po/POTFILES.in commit 6b9e86c07a5a3dd73a6457afd9d6e4388150422b -Author: Matthias Clasen -AuthorDate: Wed Jan 19 14:58:27 2011 -0500 -Commit: Matthias Clasen -CommitDate: Wed Jan 19 14:58:27 2011 -0500 +Author: Matthias Clasen +Date: Wed Jan 19 14:58:27 2011 -0500 Don't run nautilus by default @@ -10874,10 +10711,8 @@ M data/gnome.session.desktop.in.in commit d2adb9d3e932473afb164840530595ede6997a8a -Author: Matthias Clasen -AuthorDate: Sun Jan 16 11:02:04 2011 -0500 -Commit: Matthias Clasen -CommitDate: Sun Jan 16 11:02:04 2011 -0500 +Author: Matthias Clasen +Date: Sun Jan 16 11:02:04 2011 -0500 Don't use internal GTK+ api @@ -10888,10 +10723,8 @@ M capplet/gsm-properties-dialog.c commit 2bd1975803f1d7e03a7f98881e8332a2330c4146 -Author: Vincent Untz -AuthorDate: Fri Jan 14 08:44:52 2011 +0100 -Commit: Vincent Untz -CommitDate: Fri Jan 14 08:47:35 2011 +0100 +Author: Vincent Untz +Date: Fri Jan 14 08:44:52 2011 +0100 tools: Do not consider Gallium's softpipe and llvmpipe as accelerated @@ -10905,50 +10738,40 @@ M tools/gnome-session-is-accelerated.c commit e99cf457281dde402dbf7aa9e85697ded35a5458 -Author: Alexander Shopov -AuthorDate: Wed Jan 12 23:32:21 2011 +0200 -Commit: Alexander Shopov -CommitDate: Wed Jan 12 23:32:21 2011 +0200 +Author: Alexander Shopov +Date: Wed Jan 12 23:32:21 2011 +0200 Updated Bulgarian translation M po/bg.po commit e67d4bf8d00dcd7ef2b8eafebcb0227fd1b5ad4f -Author: Khaled Hosny -AuthorDate: Wed Jan 12 11:39:54 2011 +0200 -Commit: Khaled Hosny -CommitDate: Wed Jan 12 11:39:54 2011 +0200 +Author: Khaled Hosny +Date: Wed Jan 12 11:39:54 2011 +0200 Updated Arabic translation M po/ar.po commit 2d34922330470d20cb63d607a219336f271f5364 -Author: Andika Triwidada -AuthorDate: Tue Jan 11 15:34:34 2011 +0700 -Commit: Andika Triwidada -CommitDate: Tue Jan 11 15:34:34 2011 +0700 +Author: Andika Triwidada +Date: Tue Jan 11 15:34:34 2011 +0700 Updated Indonesian translation M po/id.po commit a62ce22005652f88dfd43ff97858d9e44713b24e -Author: Wouter Bolsterlee -AuthorDate: Sat Jan 8 18:45:54 2011 +0100 -Commit: Wouter Bolsterlee -CommitDate: Sat Jan 8 18:45:54 2011 +0100 +Author: Wouter Bolsterlee +Date: Sat Jan 8 18:45:54 2011 +0100 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit 3c0ddac0a62135e8ce7d5cdbfa9bbbbc4c629443 -Author: Chao-Hsiung Liao -AuthorDate: Fri Jan 7 09:38:05 2011 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Fri Jan 7 09:38:05 2011 +0800 +Author: Chao-Hsiung Liao +Date: Fri Jan 7 09:38:05 2011 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -10956,90 +10779,72 @@ M po/zh_TW.po commit 1ebedc175e6e2eb7b8af47b478cf9b268e26fd61 -Author: Gabor Kelemen -AuthorDate: Mon Jan 3 11:17:42 2011 +0100 -Commit: Gabor Kelemen -CommitDate: Mon Jan 3 11:17:42 2011 +0100 +Author: Gabor Kelemen +Date: Mon Jan 3 11:17:42 2011 +0100 Updated Hungarian translation M po/hu.po commit 8382aafc0e4093c314594b3632ae629552ae2b75 -Author: Kjartan Maraas -AuthorDate: Sun Jan 2 19:18:15 2011 +0100 -Commit: Kjartan Maraas -CommitDate: Sun Jan 2 19:18:15 2011 +0100 +Author: Kjartan Maraas +Date: Sun Jan 2 19:18:15 2011 +0100 Updated Norwegian bokmål translation from Torstein Adolf Winterseth M po/nb.po commit 7dd60e01c88d2d92b0706bea8b19f7d9d7abed30 -Author: Daniel Nylander -AuthorDate: Wed Dec 29 15:51:07 2010 +0100 -Commit: Daniel Nylander -CommitDate: Wed Dec 29 15:51:07 2010 +0100 +Author: Daniel Nylander +Date: Wed Dec 29 15:51:07 2010 +0100 Updated Swedish translation M po/sv.po commit deb58a8aff0b875f26eda1d536f17c15b766158a -Author: Daniel Nylander -AuthorDate: Wed Dec 29 15:38:55 2010 +0100 -Commit: Daniel Nylander -CommitDate: Wed Dec 29 15:38:55 2010 +0100 +Author: Daniel Nylander +Date: Wed Dec 29 15:38:55 2010 +0100 Updated Swedish translation M po/sv.po commit 5f7a36bfe672c31d0b29497f80daa4d3cd8be0b9 -Author: Matej Urbančič -AuthorDate: Tue Dec 28 22:34:12 2010 +0100 -Commit: Matej Urbančič -CommitDate: Tue Dec 28 22:34:12 2010 +0100 +Author: Matej Urbančič +Date: Tue Dec 28 22:34:12 2010 +0100 Updated Slovenian translation M po/sl.po commit 09337cc27ab641f27d7de9210187a2c7852042fd -Author: Gheyret T.Kenji -AuthorDate: Thu Dec 23 19:07:38 2010 +0100 -Commit: Abduxukur Abdurixit -CommitDate: Thu Dec 23 19:07:38 2010 +0100 +Author: Gheyret T.Kenji +Date: Thu Dec 23 19:07:38 2010 +0100 Added UG translation M po/ug.po commit cbce4760c63c5a42300b5ed7fdd1b7dca19bf619 -Author: Vincent Untz -AuthorDate: Thu Dec 23 16:32:28 2010 +0100 -Commit: Vincent Untz -CommitDate: Thu Dec 23 16:32:28 2010 +0100 +Author: Vincent Untz +Date: Thu Dec 23 16:32:28 2010 +0100 build: Change GETTEXT_PACKAGE to gnome-session-3.0 M configure.ac commit 2201e7362b761a2273c759bbdfce45ae34e3c4e9 -Author: Vincent Untz -AuthorDate: Thu Dec 23 11:32:42 2010 +0100 -Commit: Vincent Untz -CommitDate: Thu Dec 23 11:32:42 2010 +0100 +Author: Vincent Untz +Date: Thu Dec 23 11:32:42 2010 +0100 release: post-release bump to 2.91.5 M configure.ac -commit 5a20e32c4962fd25fcc960bb0cf530c4a808fba3 (tag: GNOME_SESSION_2_91_4) -Author: Vincent Untz -AuthorDate: Thu Dec 23 11:32:35 2010 +0100 -Commit: Vincent Untz -CommitDate: Thu Dec 23 11:32:35 2010 +0100 +commit 5a20e32c4962fd25fcc960bb0cf530c4a808fba3 +Author: Vincent Untz +Date: Thu Dec 23 11:32:35 2010 +0100 release: 2.91.4 @@ -11047,10 +10852,8 @@ M configure.ac commit 96f2f79e9f43168b4e8681665ceec970f9c7b98c -Author: Vincent Untz -AuthorDate: Thu Dec 23 11:13:18 2010 +0100 -Commit: Vincent Untz -CommitDate: Thu Dec 23 11:13:18 2010 +0100 +Author: Vincent Untz +Date: Thu Dec 23 11:13:18 2010 +0100 gsm: Fix previous commit (c1008ee0) @@ -11059,20 +10862,16 @@ M gnome-session/gsm-manager.c commit c1008ee0e31b9ada5ebf4854988687394281693b -Author: Matthias Clasen -AuthorDate: Wed Dec 22 12:00:56 2010 -0500 -Commit: Matthias Clasen -CommitDate: Wed Dec 22 12:00:56 2010 -0500 +Author: Matthias Clasen +Date: Wed Dec 22 12:00:56 2010 -0500 Don't use gdk_spawn to launch gdmflexiserver M gnome-session/gsm-manager.c commit 627e9520a713d44e26172e3a07b568b851a7ffcb -Author: Matthias Clasen -AuthorDate: Wed Dec 22 10:21:52 2010 -0500 -Commit: Matthias Clasen -CommitDate: Wed Dec 22 10:27:05 2010 -0500 +Author: Matthias Clasen +Date: Wed Dec 22 10:21:52 2010 -0500 Fix the build with recent GTK+ @@ -11082,160 +10881,128 @@ M egg/eggsmclient-xsmp.c commit e0a593f465f0d76837a823081550e48816ef984e -Author: Mahyar Moghimi -AuthorDate: Tue Dec 21 14:48:32 2010 +0330 -Commit: Mahyar Moghimi -CommitDate: Tue Dec 21 14:48:32 2010 +0330 +Author: Mahyar Moghimi +Date: Tue Dec 21 14:48:32 2010 +0330 Updating Persian translation M po/fa.po commit 9a79ea59c3d71b441144e498add15c3a95c92137 -Author: Ivar Smolin -AuthorDate: Mon Dec 20 14:25:56 2010 +0200 -Commit: Priit Laes -CommitDate: Mon Dec 20 14:25:56 2010 +0200 +Author: Ivar Smolin +Date: Mon Dec 20 14:25:56 2010 +0200 [l10n] Updated Estonian translation M po/et.po commit c8f6f15cce8c6651c5f31ccabeebb690d57753a9 -Author: Kjartan Maraas -AuthorDate: Sun Dec 12 22:02:47 2010 +0100 -Commit: Kjartan Maraas -CommitDate: Sun Dec 12 22:02:47 2010 +0100 +Author: Kjartan Maraas +Date: Sun Dec 12 22:02:47 2010 +0100 Updated Norwegian bokmål translation M po/nb.po commit a9812395e88d0d4bbbc3d387018089270cc16992 -Author: Ivar Smolin -AuthorDate: Sun Dec 12 13:17:14 2010 +0200 -Commit: Priit Laes -CommitDate: Sun Dec 12 13:17:14 2010 +0200 +Author: Ivar Smolin +Date: Sun Dec 12 13:17:14 2010 +0200 [l10n] Updated Estonian translation M po/et.po commit e6fcf322a449b3c4cc5a4369ebf78b82ca75d5e2 -Author: Matej Urbančič -AuthorDate: Sat Dec 11 20:41:02 2010 +0100 -Commit: Matej Urbančič -CommitDate: Sat Dec 11 20:41:02 2010 +0100 +Author: Matej Urbančič +Date: Sat Dec 11 20:41:02 2010 +0100 Updated Slovenian translation M po/sl.po commit 3f4e2dd9f9fae6901d6571ce77964e971957f65c -Author: Jorge González -AuthorDate: Sat Dec 11 16:30:44 2010 +0100 -Commit: Jorge González -CommitDate: Sat Dec 11 16:30:44 2010 +0100 +Author: Jorge González +Date: Sat Dec 11 16:30:44 2010 +0100 Updated Spanish translation M po/es.po commit ac52139c41868657d4447ff80000253bf5fc02b7 -Author: Fran Diéguez -AuthorDate: Fri Dec 10 23:49:54 2010 +0100 -Commit: Fran Diéguez -CommitDate: Fri Dec 10 23:49:54 2010 +0100 +Author: Fran Diéguez +Date: Fri Dec 10 23:49:54 2010 +0100 Updated Galician translations M po/gl.po commit f01b8560e56411f34f1d7c29dba660d7a75c7d49 -Author: Yaron Shahrabani -AuthorDate: Thu Dec 9 16:00:42 2010 +0200 -Commit: Yaron Shahrabani -CommitDate: Thu Dec 9 16:00:42 2010 +0200 +Author: Yaron Shahrabani +Date: Thu Dec 9 16:00:42 2010 +0200 Updated Hebrew translation. M po/he.po commit 18839336d46638ab3c756acea4f4c069625bd674 -Author: Matthias Clasen -AuthorDate: Wed Dec 8 12:00:40 2010 -0500 -Commit: Matthias Clasen -CommitDate: Wed Dec 8 12:00:40 2010 -0500 +Author: Matthias Clasen +Date: Wed Dec 8 12:00:40 2010 -0500 Update POTFILES.in to make make check work M po/POTFILES.in commit 18467c516f481f647aca929f2a618d2bfe489dbf -Author: Kjartan Maraas -AuthorDate: Mon Dec 6 18:56:58 2010 +0100 -Commit: Kjartan Maraas -CommitDate: Mon Dec 6 18:56:58 2010 +0100 +Author: Kjartan Maraas +Date: Mon Dec 6 18:56:58 2010 +0100 Updated Norwegian bokmål translation M po/nb.po commit 735e6513938e03ec3b62d53d1c71aadd34e6ecca -Author: Ivar Smolin -AuthorDate: Mon Dec 6 17:27:12 2010 +0200 -Commit: Priit Laes -CommitDate: Mon Dec 6 17:27:12 2010 +0200 +Author: Ivar Smolin +Date: Mon Dec 6 17:27:12 2010 +0200 [l10n] Updated Estonian translation M po/et.po commit 757a5a92721fb8bc81b3efebc2294810746eaf38 -Author: Yaron Shahrabani -AuthorDate: Mon Dec 6 14:38:32 2010 +0200 -Commit: Yaron Shahrabani -CommitDate: Mon Dec 6 14:38:32 2010 +0200 +Author: Yaron Shahrabani +Date: Mon Dec 6 14:38:32 2010 +0200 Updated Hebrew translation. M po/he.po commit bf06cfac662cec1ea0475414645b1c4e5af5f08c -Author: Matthias Clasen -AuthorDate: Mon Dec 6 00:52:54 2010 -0500 -Commit: Matthias Clasen -CommitDate: Mon Dec 6 00:52:54 2010 -0500 +Author: Matthias Clasen +Date: Mon Dec 6 00:52:54 2010 -0500 Remove nonexisting data/gnome-session.schemas.in.in from POTFILES.in M po/POTFILES.in commit ce7828bbd9446fd08edfaca9815b76c1314b99ed -Author: Matthias Clasen -AuthorDate: Thu Dec 2 18:05:48 2010 -0500 -Commit: Matthias Clasen -CommitDate: Thu Dec 2 18:05:48 2010 -0500 +Author: Matthias Clasen +Date: Thu Dec 2 18:05:48 2010 -0500 Fix build with current GTK+ M gnome-session/test-inhibit.c commit 402afb93ca0ddeff6ae857f728678316ccfac8c8 -Author: Cosimo Cecchi -AuthorDate: Tue Nov 30 17:04:48 2010 +0100 -Commit: Cosimo Cecchi -CommitDate: Tue Nov 30 17:04:48 2010 +0100 +Author: Cosimo Cecchi +Date: Tue Nov 30 17:04:48 2010 +0100 build: don't forget to link gnome-session-is-accelerated to Xlib M tools/Makefile.am commit e8ca44654d728e1d1abb2da553aa7b2e6259d0b1 -Author: Vincent Untz -AuthorDate: Mon Nov 29 23:26:22 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 23:26:22 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 23:26:22 2010 +0100 gsm: Remove a timeout when ending a phase @@ -11244,10 +11011,8 @@ M gnome-session/gsm-manager.c commit 6fd301895a39fc32f302ea3fced74fc03e5c75c9 -Author: Vincent Untz -AuthorDate: Mon Nov 29 22:47:00 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 22:47:00 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 22:47:00 2010 +0100 capplet: Also give the dialog a reasonable width @@ -11259,10 +11024,8 @@ M capplet/gsm-properties-dialog.c commit 8c4cdd5304929d19a27f876eb9cb5bbb67a4d59f -Author: Vincent Untz -AuthorDate: Mon Nov 29 22:44:03 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 22:44:03 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 22:44:03 2010 +0100 capplet: Give the dialog a reasonable default height @@ -11271,10 +11034,8 @@ M capplet/gsm-properties-dialog.c commit b3375fa652b236d0c81079a3513ba2a11f22eee9 -Author: Ricardo Cruz -AuthorDate: Mon Nov 29 22:42:31 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 22:42:31 2010 +0100 +Author: Ricardo Cruz +Date: Mon Nov 29 22:42:31 2010 +0100 capplet: Fix inline search @@ -11286,20 +11047,16 @@ M capplet/gsm-properties-dialog.c commit a907ca8cdfbd07d4b752a5d04c1210b6b468f68f -Author: Vincent Untz -AuthorDate: Mon Nov 29 19:38:15 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 19:38:15 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 19:38:15 2010 +0100 doc: Fix small issues in gnome-session man page M doc/man/gnome-session.1 commit a4133fcb08dc72b581a82a7754f712a82b07c5f7 -Author: Vincent Untz -AuthorDate: Mon Nov 29 19:31:30 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 19:31:30 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 19:31:30 2010 +0100 data: Change gnome.session to start GNOME Shell @@ -11311,10 +11068,8 @@ M data/gnome.session.desktop.in.in commit f8d340652f597cfef6e06aef1e271ab7fde24f27 -Author: Vincent Untz -AuthorDate: Mon Nov 29 19:31:02 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 19:31:02 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 19:31:02 2010 +0100 tools: Add a gnome-session-is-accelerated helper tool @@ -11326,10 +11081,8 @@ A tools/gnome-session-is-accelerated.c commit 8e6713f15a2819dd7bdd8a9a33ec2314633ff2d6 -Author: Vincent Untz -AuthorDate: Mon Nov 29 19:28:07 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 19:28:07 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 19:28:07 2010 +0100 gsm: Make it possible for a .session file to define a fallback session @@ -11351,10 +11104,8 @@ A gnome-session/test-process-helper.c commit 30da8bec52103eb812439ddc03dcdb9ff47d34a9 -Author: Vincent Untz -AuthorDate: Mon Nov 29 19:06:30 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 19:26:55 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 19:06:30 2010 +0100 gsm: Move the definition of a session from gconf to .desktop-like files @@ -11378,20 +11129,16 @@ M gnome-session/main.c commit f415130f0de6cdc13d9433632d5ee1554a242103 -Author: Vincent Untz -AuthorDate: Mon Nov 29 15:14:31 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 15:14:31 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 15:14:31 2010 +0100 capplet: Remove useless define M capplet/gsm-properties-dialog.c commit 378f502047022b263d14bbbec213ad442e5ad822 -Author: Vincent Untz -AuthorDate: Mon Nov 29 15:13:50 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 15:13:50 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 15:13:50 2010 +0100 gsm, capplet: Do not define IS_STRING_EMPTY in multiple places @@ -11408,10 +11155,8 @@ M gnome-session/gsm-xsmp-client.c commit f20859108a0c699aed4a0fe6640930f45e308aad -Author: Vincent Untz -AuthorDate: Mon Nov 29 15:03:57 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 15:03:57 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 15:03:57 2010 +0100 gsm: Move the code filling the autostart apps to gsm-session-fill.[ch] @@ -11421,10 +11166,8 @@ M gnome-session/main.c commit 4b561b5ea22b62804ce92102f841bc55cdb4a1f2 -Author: Vincent Untz -AuthorDate: Mon Nov 29 15:03:32 2010 +0100 -Commit: Vincent Untz -CommitDate: Mon Nov 29 15:03:32 2010 +0100 +Author: Vincent Untz +Date: Mon Nov 29 15:03:32 2010 +0100 gsm: Add gsm_manager_get_failsafe() @@ -11432,20 +11175,16 @@ M gnome-session/gsm-manager.h commit d90e9bbc4937658eb6b661df1eff90ed6d81238e -Author: Theppitak Karoonboonyanan -AuthorDate: Sun Nov 28 16:45:06 2010 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Sun Nov 28 16:45:06 2010 +0700 +Author: Theppitak Karoonboonyanan +Date: Sun Nov 28 16:45:06 2010 +0700 Updated Thai translation. M po/th.po commit c3e3ebdb1603757adcf1d8848d61037337741df5 -Author: William Jon McCann -AuthorDate: Sat Nov 20 21:03:16 2010 -0500 -Commit: William Jon McCann -CommitDate: Sat Nov 20 21:12:05 2010 -0500 +Author: William Jon McCann +Date: Sat Nov 20 21:03:16 2010 -0500 Add an application restart limit @@ -11459,20 +11198,16 @@ M gnome-session/gsm-manager.c commit 37c5e901488117753a19d72dfd1eeecca5a03f39 -Author: Gheyret T.Kenji -AuthorDate: Sat Nov 20 11:46:40 2010 +0100 -Commit: Abduxukur Abdurixit -CommitDate: Sat Nov 20 11:46:40 2010 +0100 +Author: Gheyret T.Kenji +Date: Sat Nov 20 11:46:40 2010 +0100 Added UG translation M po/ug.po commit 2776d9d3cad158955ee7355f0d3da47071d77769 -Author: Javier Jardón -AuthorDate: Wed Nov 17 05:51:54 2010 +0100 -Commit: Javier Jardón -CommitDate: Wed Nov 17 05:51:54 2010 +0100 +Author: Javier Jardón +Date: Wed Nov 17 05:51:54 2010 +0100 build: Update autotools configuration @@ -11483,10 +11218,8 @@ M configure.ac commit 5b87d78f1b4b8759a57d0935d5423ebf153d80d8 -Author: Cosimo Cecchi -AuthorDate: Mon Nov 15 17:36:10 2010 +0100 -Commit: Cosimo Cecchi -CommitDate: Mon Nov 15 17:37:52 2010 +0100 +Author: Cosimo Cecchi +Date: Mon Nov 15 17:36:10 2010 +0100 session-properties: fix notebook expand @@ -11498,70 +11231,56 @@ M capplet/gsm-properties-dialog.c commit 588005584fa91e0d7a45f04c6556ec54aa223739 -Author: Yasumichi Akahoshi -AuthorDate: Mon Nov 15 20:48:33 2010 +0900 -Commit: Takayuki KUSANO -CommitDate: Mon Nov 15 20:48:51 2010 +0900 +Author: Yasumichi Akahoshi +Date: Mon Nov 15 20:48:33 2010 +0900 Updated Japanese translation. M po/ja.po commit e6686b8a4ed4f9b318f048a43faf1b98c61aefba -Author: Lucian Adrian Grijincu -AuthorDate: Sun Nov 14 21:35:53 2010 +0200 -Commit: Lucian Adrian Grijincu -CommitDate: Sun Nov 14 21:35:53 2010 +0200 +Author: Lucian Adrian Grijincu +Date: Sun Nov 14 21:35:53 2010 +0200 Updated Romanian translation M po/ro.po commit c17a9abd5f43f84953398f005b692a2e4ccd67a4 -Author: Daniel Șerbănescu -AuthorDate: Sun Nov 14 21:31:30 2010 +0200 -Commit: Lucian Adrian Grijincu -CommitDate: Sun Nov 14 21:31:30 2010 +0200 +Author: Daniel Șerbănescu +Date: Sun Nov 14 21:31:30 2010 +0200 Updated Romanian translation M po/ro.po commit 348c240a4469881766342c0ce7c00cbf76d56e5f -Author: Lucian Adrian Grijincu -AuthorDate: Sun Nov 14 21:31:05 2010 +0200 -Commit: Lucian Adrian Grijincu -CommitDate: Sun Nov 14 21:31:05 2010 +0200 +Author: Lucian Adrian Grijincu +Date: Sun Nov 14 21:31:05 2010 +0200 Updated Romanian translation M po/ro.po commit e72eb8c9b4456d0d34b297f959a4dea3f57c9e64 -Author: Gheyret T.Kenji -AuthorDate: Sat Nov 13 22:25:51 2010 +0100 -Commit: Abduxukur Abdurixit -CommitDate: Sat Nov 13 22:25:51 2010 +0100 +Author: Gheyret T.Kenji +Date: Sat Nov 13 22:25:51 2010 +0100 Added UG translation M po/ug.po commit 6d82c5925df9e8e2c0bb0d88b9438d491fce34ee -Author: Ville-Pekka Vainio -AuthorDate: Tue Nov 9 15:26:01 2010 +0200 -Commit: Ville-Pekka Vainio -CommitDate: Tue Nov 9 15:28:40 2010 +0200 +Author: Ville-Pekka Vainio +Date: Tue Nov 9 15:26:01 2010 +0200 Updated Finnish translation M po/fi.po commit 8e6afcf1789c02692cf3b1ff3ee0a792d57e17a3 -Author: Ray Strode -AuthorDate: Sun Nov 7 12:32:17 2010 -0500 -Commit: Ray Strode -CommitDate: Sun Nov 7 14:42:23 2010 -0500 +Author: Ray Strode +Date: Sun Nov 7 12:32:17 2010 -0500 manager: remove client from query clients list on disconnect @@ -11582,10 +11301,8 @@ M gnome-session/gsm-manager.c commit bf1b6e8843b5e72d4f5a62a34eb322b82e33c2df -Author: Ray Strode -AuthorDate: Sun Nov 7 11:49:33 2010 -0500 -Commit: Ray Strode -CommitDate: Sun Nov 7 14:42:17 2010 -0500 +Author: Ray Strode +Date: Sun Nov 7 11:49:33 2010 -0500 manager: don't ever show inhibitor dialog if logout is forced @@ -11598,10 +11315,8 @@ M gnome-session/gsm-manager.c commit 172db15097c84e4d3c93bfcc4d51eed6c7d25e3d -Author: Matthias Clasen -AuthorDate: Fri Nov 5 08:19:52 2010 -0400 -Commit: Matthias Clasen -CommitDate: Fri Nov 5 08:19:52 2010 -0400 +Author: Matthias Clasen +Date: Fri Nov 5 08:19:52 2010 -0400 Don't use allow-shrink property @@ -11611,30 +11326,24 @@ M gnome-session/gsm-inhibit-dialog.c commit 4fd6096618cd04710abab66ca42c52084980df7f -Author: Reşat SABIQ -AuthorDate: Thu Nov 4 19:12:49 2010 -0500 -Commit: Reşat SABIQ -CommitDate: Thu Nov 4 19:16:48 2010 -0500 +Author: Reşat SABIQ +Date: Thu Nov 4 19:12:49 2010 -0500 Minor update for Crimean Tatar/Turkish translation M po/crh.po commit c2f08d0342f78309892db5a2d1ba016651d98daa -Author: Reşat SABIQ -AuthorDate: Thu Nov 4 19:05:54 2010 -0500 -Commit: Reşat SABIQ -CommitDate: Thu Nov 4 19:16:33 2010 -0500 +Author: Reşat SABIQ +Date: Thu Nov 4 19:05:54 2010 -0500 Updated Crimean Tatar (Crimean Turkish) translation M po/crh.po commit 84a733203e076142a960005eaf0ac602521470fb -Author: William Jon McCann -AuthorDate: Mon Nov 1 19:42:17 2010 -0400 -Commit: William Jon McCann -CommitDate: Mon Nov 1 19:42:17 2010 -0400 +Author: William Jon McCann +Date: Mon Nov 1 19:42:17 2010 -0400 [session-properties] set NoDisplay=true for the session properties dialog @@ -11646,20 +11355,16 @@ M data/session-properties.desktop.in.in commit a26144b5ec8a2d502dc0cabd269fb18a43b85ddd -Author: Carles Ferrando -AuthorDate: Fri Oct 29 01:20:14 2010 +0100 -Commit: Gil Forcada -CommitDate: Fri Oct 29 01:20:30 2010 +0100 +Author: Carles Ferrando +Date: Fri Oct 29 01:20:14 2010 +0100 Updated Catalan (Valencian) translation M po/ca@valencia.po commit 2f56ee1acfdbe0158408317b29a2fb81dc5c960b -Author: Bastien Nocera -AuthorDate: Thu Oct 21 12:16:30 2010 +0100 -Commit: Bastien Nocera -CommitDate: Mon Oct 25 15:30:42 2010 +0100 +Author: Bastien Nocera +Date: Thu Oct 21 12:16:30 2010 +0100 [gsm] Add autostart condition through GSettings @@ -11668,90 +11373,72 @@ M gnome-session/gsm-autostart-app.c commit 008a18d5705896cdb60d01fbc0e038c161dc34a0 -Author: Gheyret T.Kenji -AuthorDate: Thu Oct 21 18:39:31 2010 +0200 -Commit: Abduxukur Abdurixit -CommitDate: Thu Oct 21 18:39:31 2010 +0200 +Author: Gheyret T.Kenji +Date: Thu Oct 21 18:39:31 2010 +0200 Added UG translation M po/ug.po commit c1015ae40a9703b6e630975d531668b68de7ac2b -Author: Vincent Untz -AuthorDate: Sat Oct 9 11:48:53 2010 +0200 -Commit: Vincent Untz -CommitDate: Sat Oct 9 11:49:51 2010 +0200 +Author: Vincent Untz +Date: Sat Oct 9 11:48:53 2010 +0200 build: Update git.mk from pango M git.mk commit 6524444a8296d3dba5d2e4442b99d2365031a13c -Author: Changwoo Ryu -AuthorDate: Sat Oct 9 05:20:16 2010 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Oct 9 05:20:25 2010 +0900 +Author: Changwoo Ryu +Date: Sat Oct 9 05:20:16 2010 +0900 Updated Korean translation M po/ko.po commit 2a2d22ed7023f6ed82ed2fc5625dc1ec521881e6 -Author: Ivar Smolin -AuthorDate: Thu Oct 7 11:17:50 2010 +0300 -Commit: Priit Laes -CommitDate: Thu Oct 7 11:17:50 2010 +0300 +Author: Ivar Smolin +Date: Thu Oct 7 11:17:50 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit 33ffc207f4f87cc04fa9344627b7fa296b19a1e2 -Author: Sense Hofstede -AuthorDate: Tue Oct 5 22:25:50 2010 +0200 -Commit: Sense Hofstede -CommitDate: Tue Oct 5 22:28:36 2010 +0200 +Author: Sense Hofstede +Date: Tue Oct 5 22:25:50 2010 +0200 Updated Frisian translations M po/fy.po commit 6469537c76efa71ad440b3a99a8d2e24a61cca1f -Author: Vincent Untz -AuthorDate: Tue Oct 5 00:05:23 2010 +0200 -Commit: Vincent Untz -CommitDate: Tue Oct 5 00:05:23 2010 +0200 +Author: Vincent Untz +Date: Tue Oct 5 00:05:23 2010 +0200 release: post-release bump to 2.91.1 M configure.ac -commit 5e8b1d325943691149a7d06488efda063d9d6fb3 (tag: GNOME_SESSION_2_91_0) -Author: Vincent Untz -AuthorDate: Tue Oct 5 00:05:16 2010 +0200 -Commit: Vincent Untz -CommitDate: Tue Oct 5 00:05:16 2010 +0200 +commit 5e8b1d325943691149a7d06488efda063d9d6fb3 +Author: Vincent Untz +Date: Tue Oct 5 00:05:16 2010 +0200 release: 2.91.0 M NEWS commit ad1803ba68389e6346090030ea9ffb93e3e9d2f6 -Author: Vincent Untz -AuthorDate: Mon Oct 4 23:59:29 2010 +0200 -Commit: Vincent Untz -CommitDate: Mon Oct 4 23:59:29 2010 +0200 +Author: Vincent Untz +Date: Mon Oct 4 23:59:29 2010 +0200 gsm: Update for gdk_error_trap_*() API changes M gnome-session/gsm-inhibit-dialog.c commit 37b429054d90ac5ed15e9a17e33dc7439c150bb1 -Author: Fernando Herrera -AuthorDate: Sun Oct 3 19:39:32 2010 +0200 -Commit: Vincent Untz -CommitDate: Mon Oct 4 23:48:19 2010 +0200 +Author: Fernando Herrera +Date: Sun Oct 3 19:39:32 2010 +0200 Fix build with gtk+ 3 @@ -11760,30 +11447,24 @@ M gnome-session/gsm-inhibit-dialog.c commit 4540f64cbb4bc3a4ca4606787ca5f59f5208d568 -Author: Žygimantas Beručka -AuthorDate: Fri Oct 1 20:11:42 2010 +0200 -Commit: Žygimantas Beručka -CommitDate: Fri Oct 1 20:11:59 2010 +0200 +Author: Žygimantas Beručka +Date: Fri Oct 1 20:11:42 2010 +0200 Updated Lithuanian translation M po/lt.po commit 8947ca9eb6f56574f353454e0cd4b22c1a652f79 -Author: Gil Forcada -AuthorDate: Wed Sep 29 23:33:20 2010 +0200 -Commit: Gil Forcada -CommitDate: Wed Sep 29 23:33:37 2010 +0200 +Author: Gil Forcada +Date: Wed Sep 29 23:33:20 2010 +0200 Updated Catalan translation M po/ca.po commit afce85b272186c99d3d810fea286855df9b26b88 -Author: Vincent Untz -AuthorDate: Mon Sep 27 12:34:35 2010 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 27 12:35:03 2010 +0200 +Author: Vincent Untz +Date: Mon Sep 27 12:34:35 2010 +0200 misc: Rename --enable-deprecations to --enable-deprecation-flags @@ -11794,60 +11475,48 @@ M configure.ac commit b1855cbf148c83f867bf55fc090af3ecaee8bd18 -Author: Damyan Ivanov -AuthorDate: Sun Sep 26 17:51:43 2010 +0300 -Commit: Alexander Shopov -CommitDate: Sun Sep 26 17:53:03 2010 +0300 +Author: Damyan Ivanov +Date: Sun Sep 26 17:51:43 2010 +0300 Updated Bulgarian translation M po/bg.po commit 5decce9dee908a44f3571e001ed1332030e2dacd -Author: Gabor Kelemen -AuthorDate: Thu Sep 23 16:09:51 2010 +0200 -Commit: Gabor Kelemen -CommitDate: Thu Sep 23 16:10:04 2010 +0200 +Author: Gabor Kelemen +Date: Thu Sep 23 16:09:51 2010 +0200 Fix a mistranslation M po/hu.po commit 1cd67223880236ee5d1ace2b940b461d6f888120 -Author: Khaled Hosny -AuthorDate: Thu Sep 23 14:35:54 2010 +0300 -Commit: Khaled Hosny -CommitDate: Thu Sep 23 14:35:54 2010 +0300 +Author: Khaled Hosny +Date: Thu Sep 23 14:35:54 2010 +0300 Updated Arabic translation M po/ar.po commit 317efe4f9b7d9f8255f206435dd00e5478803780 -Author: Petr Kovar -AuthorDate: Thu Sep 23 00:17:51 2010 +0200 -Commit: Petr Kovar -CommitDate: Thu Sep 23 00:18:19 2010 +0200 +Author: Petr Kovar +Date: Thu Sep 23 00:17:51 2010 +0200 Update Czech translation M po/cs.po commit abfa647b235308e91f7ebf530907e3c9af5523f5 -Author: Daniel S. Koda -AuthorDate: Tue Sep 21 16:28:17 2010 -0300 -Commit: Djavan Fagundes -CommitDate: Tue Sep 21 16:28:17 2010 -0300 +Author: Daniel S. Koda +Date: Tue Sep 21 16:28:17 2010 -0300 Updated Brazilian Portuguese translation M po/pt_BR.po commit 3cfe1f378263dad42c7dcc36af4675085991ff08 -Author: Ray Strode -AuthorDate: Tue Sep 21 14:35:52 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:42:17 2010 -0400 +Author: Ray Strode +Date: Tue Sep 21 14:35:52 2010 -0400 all: Drop gtk_dialog_set_has_separator () calls @@ -11860,10 +11529,8 @@ M gnome-session/gsm-inhibit-dialog.c commit fa73f94f992cde97ea1fe84e04fd896c0085855d -Author: Vincent Untz -AuthorDate: Tue Sep 21 14:28:37 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:41:59 2010 -0400 +Author: Vincent Untz +Date: Tue Sep 21 14:28:37 2010 -0400 all: Drop GTK_DISPLAY () calls @@ -11875,20 +11542,16 @@ M gnome-session/gsm-inhibit-dialog.c commit d5a9bd7aeb3032f0c3c921a0680eb2b25ac36d32 -Author: Ray Strode -AuthorDate: Tue Sep 21 14:26:22 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:41:59 2010 -0400 +Author: Ray Strode +Date: Tue Sep 21 14:26:22 2010 -0400 build: use gtk3 by default M configure.ac commit b3c7638d835ffcc3e5e36ec2bdd9f961ee79235b -Author: Ray Strode -AuthorDate: Tue Sep 21 14:22:27 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:41:59 2010 -0400 +Author: Ray Strode +Date: Tue Sep 21 14:22:27 2010 -0400 build: Up required gtk versions @@ -11897,10 +11560,8 @@ M configure.ac commit 8b77e723680ec495e57ff6643961869400d2901e -Author: Ray Strode -AuthorDate: Tue Sep 21 14:25:00 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:41:59 2010 -0400 +Author: Ray Strode +Date: Tue Sep 21 14:25:00 2010 -0400 build: add AM_PROG_CC_C_O to configure @@ -11909,20 +11570,16 @@ M configure.ac commit 0627d658cc8b8ca90c6d878a469a30818f472726 -Author: Ray Strode -AuthorDate: Tue Sep 21 14:22:07 2010 -0400 -Commit: Ray Strode -CommitDate: Tue Sep 21 14:39:26 2010 -0400 +Author: Ray Strode +Date: Tue Sep 21 14:22:07 2010 -0400 release: bump version to 2.91.0 M configure.ac commit 44ec4e3f38e733ad676fc3872574459ac2a0900f -Author: Vincent Untz -AuthorDate: Mon Sep 20 17:40:40 2010 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 20 17:42:10 2010 +0200 +Author: Vincent Untz +Date: Mon Sep 20 17:40:40 2010 +0200 build: Update all Makefile.am to more recent standards @@ -11940,10 +11597,8 @@ M tools/Makefile.am commit 7f355e7c79e14e107de8c82f2f3ec5502ecb3db5 -Author: Vincent Untz -AuthorDate: Mon Sep 20 17:38:21 2010 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 20 17:42:10 2010 +0200 +Author: Vincent Untz +Date: Mon Sep 20 17:38:21 2010 +0200 misc: Update instructions for commit messages @@ -11952,80 +11607,64 @@ M ChangeLog commit 919492a7b1539c0d961d78b4f2d2e385e93b3775 -Author: A S Alam -AuthorDate: Sun Sep 19 08:36:54 2010 +0530 -Commit: A S Alam -CommitDate: Sun Sep 19 08:36:54 2010 +0530 +Author: A S Alam +Date: Sun Sep 19 08:36:54 2010 +0530 update for Punjabi M po/pa.po commit 9c7038375b17aa154092778addb8e3479327fd44 -Author: Timo Jyrinki -AuthorDate: Fri Sep 17 18:28:55 2010 +0300 -Commit: Timo Jyrinki -CommitDate: Fri Sep 17 18:28:55 2010 +0300 +Author: Timo Jyrinki +Date: Fri Sep 17 18:28:55 2010 +0300 Updated Finnish translation by Jiri Grönroos. M po/fi.po commit bd246c96a6dc8ed2527a593ac8af03c049c68f46 -Author: Andika Triwidada -AuthorDate: Fri Sep 17 14:05:25 2010 +0700 -Commit: Andika Triwidada -CommitDate: Fri Sep 17 14:06:16 2010 +0700 +Author: Andika Triwidada +Date: Fri Sep 17 14:05:25 2010 +0700 Updated Indonesian translation M po/id.po commit 36843a37e8e504b41633e06f6e05edc227dfa5f6 -Author: Kenneth Nielsen -AuthorDate: Wed Sep 15 21:40:24 2010 +0200 -Commit: Kenneth Nielsen -CommitDate: Wed Sep 15 21:40:24 2010 +0200 +Author: Kenneth Nielsen +Date: Wed Sep 15 21:40:24 2010 +0200 Updated Danish translation M po/da.po commit a58b6ce034ad3e1804cab56acfe9d56d76ae149e -Author: Takayuki KUSANO -AuthorDate: Mon Sep 13 01:54:30 2010 +0900 -Commit: Takayuki KUSANO -CommitDate: Mon Sep 13 01:54:30 2010 +0900 +Author: Takayuki KUSANO +Date: Mon Sep 13 01:54:30 2010 +0900 Updated Japanese translation. M po/ja.po commit a8a07483553a6d8e4cf463bf74ef12910b57d94f -Author: Mario Blättermann -AuthorDate: Sun Sep 12 16:07:05 2010 +0200 -Commit: Mario Blättermann -CommitDate: Sun Sep 12 16:07:05 2010 +0200 +Author: Mario Blättermann +Date: Sun Sep 12 16:07:05 2010 +0200 [i18n] Updated German translation M po/de.po commit 88d2581f585b2617fcf95301a07bec1c9f3a0119 -Author: Wouter Bolsterlee -AuthorDate: Sun Sep 12 15:08:21 2010 +0200 -Commit: Wouter Bolsterlee -CommitDate: Sun Sep 12 15:08:21 2010 +0200 +Author: Wouter Bolsterlee +Date: Sun Sep 12 15:08:21 2010 +0200 Updated Dutch translation by Wouter Bolsterlee M po/nl.po commit 86899d53b41f883f2a72d4070a46337dbe6d7d0a -Author: Vincent Untz -AuthorDate: Fri Sep 10 02:11:28 2010 +0200 -Commit: Vincent Untz -CommitDate: Fri Sep 10 02:11:28 2010 +0200 +Author: Vincent Untz +Date: Fri Sep 10 02:11:28 2010 +0200 [doc] Update man pages @@ -12035,10 +11674,8 @@ M doc/man/gnome-wm.1 commit 74469b73fd20c7fae912c49c0d347c3d141282e1 -Author: Vincent Untz -AuthorDate: Wed Sep 8 19:20:59 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 8 19:21:52 2010 +0200 +Author: Vincent Untz +Date: Wed Sep 8 19:20:59 2010 +0200 [misc] Update AUTHORS, HACKING, README @@ -12054,10 +11691,8 @@ M autogen.sh commit e33ef0b4a8a4ce87aac014eb090b689fa88f351a -Author: Vincent Untz -AuthorDate: Wed Sep 8 17:48:24 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 8 19:21:52 2010 +0200 +Author: Vincent Untz +Date: Wed Sep 8 17:48:24 2010 +0200 [misc] Update license files to latest text @@ -12069,10 +11704,8 @@ D COPYING.LIB commit c9aaf778a4ec1eb70be889e59a317548ba28027d -Author: Vincent Untz -AuthorDate: Wed Sep 8 17:09:42 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 8 19:21:52 2010 +0200 +Author: Vincent Untz +Date: Wed Sep 8 17:09:42 2010 +0200 [build] Rename configure.in to configure.ac @@ -12080,30 +11713,24 @@ R100 configure.in configure.ac commit 1a0e576b88f65104dfb34434559cafdf67e38693 -Author: Aron Xu -AuthorDate: Wed Sep 8 10:54:15 2010 +0800 -Commit: Aron Xu -CommitDate: Wed Sep 8 10:54:15 2010 +0800 +Author: Aron Xu +Date: Wed Sep 8 10:54:15 2010 +0800 Update Simplified Chinese translation. M po/zh_CN.po commit fdab784586113986de188fb405bb5aa7e279b634 -Author: Gabor Kelemen -AuthorDate: Mon Sep 6 14:50:20 2010 +0200 -Commit: Gabor Kelemen -CommitDate: Mon Sep 6 14:50:20 2010 +0200 +Author: Gabor Kelemen +Date: Mon Sep 6 14:50:20 2010 +0200 Updated Hungarian translation M po/hu.po commit 6e25cce91c5f81033bc9d51e5dead757742dc9e2 -Author: Chao-Hsiung Liao -AuthorDate: Sun Sep 5 19:29:38 2010 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Sun Sep 5 19:29:38 2010 +0800 +Author: Chao-Hsiung Liao +Date: Sun Sep 5 19:29:38 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -12111,150 +11738,120 @@ M po/zh_TW.po commit 529a46fa69fb91bee4aeca8fe6be9ee388dd9f90 -Author: Duarte Loreto -AuthorDate: Sun Sep 5 01:08:05 2010 +0100 -Commit: Duarte Loreto -CommitDate: Sun Sep 5 01:08:05 2010 +0100 +Author: Duarte Loreto +Date: Sun Sep 5 01:08:05 2010 +0100 Updated Portuguese translation M po/pt.po commit d8cc2472b16f7ad8936276e176047e5467b5f7b3 -Author: Piotr Drąg -AuthorDate: Sat Sep 4 19:41:20 2010 +0200 -Commit: Tomasz Dominikowski -CommitDate: Sat Sep 4 19:41:20 2010 +0200 +Author: Piotr Drąg +Date: Sat Sep 4 19:41:20 2010 +0200 Updated Polish translation M po/pl.po commit e331231648025004db9b4c0816a94f8dc7164688 -Author: Michael Kotsarinis -AuthorDate: Sat Sep 4 18:44:13 2010 +0300 -Commit: Kostas Papadimas -CommitDate: Sat Sep 4 18:44:13 2010 +0300 +Author: Michael Kotsarinis +Date: Sat Sep 4 18:44:13 2010 +0300 Updated Greek translation M po/el.po commit 89a7bae1fa97ffbdfc20d622eddd8f8535e787f3 -Author: Claude Paroz -AuthorDate: Sat Sep 4 13:14:26 2010 +0200 -Commit: Claude Paroz -CommitDate: Sat Sep 4 13:14:26 2010 +0200 +Author: Claude Paroz +Date: Sat Sep 4 13:14:26 2010 +0200 Updated French translation M po/fr.po commit 3663e72f355a1519af217bd4f484d9112763bb95 -Author: Jorge González -AuthorDate: Sat Sep 4 09:39:12 2010 +0200 -Commit: Jorge González -CommitDate: Sat Sep 4 09:39:12 2010 +0200 +Author: Jorge González +Date: Sat Sep 4 09:39:12 2010 +0200 Updated Spanish translation M po/es.po commit 7ffec543b35add62262bd76a300c47a6aacb6941 -Author: Matej Urbančič -AuthorDate: Fri Sep 3 18:34:25 2010 +0200 -Commit: Matej Urbančič -CommitDate: Fri Sep 3 18:34:25 2010 +0200 +Author: Matej Urbančič +Date: Fri Sep 3 18:34:25 2010 +0200 Updated Slovenian translation M po/sl.po commit 57ba79842cd0eadd451c4c58d719056c39ab33af -Author: drtv -AuthorDate: Fri Sep 3 19:57:00 2010 +0530 -Commit: drtv -CommitDate: Fri Sep 3 19:57:00 2010 +0530 +Author: drtv +Date: Fri Sep 3 19:57:00 2010 +0530 Updated Tamil translation M po/ta.po commit 0d25b88b9ef6c7e8386a886ed6071fcb52104145 -Author: Daniel Nylander -AuthorDate: Fri Sep 3 01:19:58 2010 +0200 -Commit: Daniel Nylander -CommitDate: Fri Sep 3 01:19:58 2010 +0200 +Author: Daniel Nylander +Date: Fri Sep 3 01:19:58 2010 +0200 Updated Swedish translation M po/sv.po commit 8683f58caff10d8f70b620d639717ac4632f5dd2 -Author: Luca Ferretti -AuthorDate: Thu Sep 2 23:12:56 2010 +0200 -Commit: Luca Ferretti -CommitDate: Thu Sep 2 23:12:56 2010 +0200 +Author: Luca Ferretti +Date: Thu Sep 2 23:12:56 2010 +0200 Updated Italian translation M po/it.po commit c6901e01e177fc50f955fd9f8e2462919c873f69 -Author: Yaron Shahrabani -AuthorDate: Thu Sep 2 18:00:19 2010 +0300 -Commit: Yaron Shahrabani -CommitDate: Thu Sep 2 18:00:19 2010 +0300 +Author: Yaron Shahrabani +Date: Thu Sep 2 18:00:19 2010 +0300 Updated Hebrew translation. M po/he.po commit b74087af1656d7a4a5cc11ae81f7d94726d24ccc -Author: Kjartan Maraas -AuthorDate: Thu Sep 2 11:32:30 2010 +0200 -Commit: Kjartan Maraas -CommitDate: Thu Sep 2 11:32:30 2010 +0200 +Author: Kjartan Maraas +Date: Thu Sep 2 11:32:30 2010 +0200 Updated Norwegian bokmål translation M po/nb.po commit f6af7655644de5f8ee96472274af376a19c1cfe2 -Author: Mattias Põldaru -AuthorDate: Thu Sep 2 11:14:05 2010 +0300 -Commit: Priit Laes -CommitDate: Thu Sep 2 11:14:05 2010 +0300 +Author: Mattias Põldaru +Date: Thu Sep 2 11:14:05 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit 520e2203902132921220a32e437a2b3be421e418 -Author: Fran Diéguez -AuthorDate: Wed Sep 1 11:07:24 2010 +0200 -Commit: Fran Diéguez -CommitDate: Wed Sep 1 11:07:24 2010 +0200 +Author: Fran Diéguez +Date: Wed Sep 1 11:07:24 2010 +0200 Updated Galician translations M po/gl.po commit bd2222611d82d464d45abbb87f6eb639b575467e -Author: Philip Withnall -AuthorDate: Wed Sep 1 09:30:53 2010 +0100 -Commit: Philip Withnall -CommitDate: Wed Sep 1 09:30:53 2010 +0100 +Author: Philip Withnall +Date: Wed Sep 1 09:30:53 2010 +0100 Update British English translation M po/en_GB.po commit 00663fa2ef04bd1393280fcf71ec32c31ba839b7 -Author: Philip Withnall -AuthorDate: Sun Apr 25 17:44:56 2010 +0100 -Commit: Philip Withnall -CommitDate: Wed Sep 1 09:29:41 2010 +0100 +Author: Philip Withnall +Date: Sun Apr 25 17:44:56 2010 +0100 Miscellaneous string fixes @@ -12268,40 +11865,32 @@ M gnome-session/main.c commit b0d735c099a89f448b6bf85939f8b3ed95b8e212 -Author: Gabor Kelemen -AuthorDate: Sun Aug 29 15:28:34 2010 +0200 -Commit: Gabor Kelemen -CommitDate: Sun Aug 29 15:28:34 2010 +0200 +Author: Gabor Kelemen +Date: Sun Aug 29 15:28:34 2010 +0200 Updated Hungarian translation M po/hu.po commit 7c2a07ae4d8368dd952eba7729b21d7e74d34657 -Author: Bruno Brouard -AuthorDate: Thu Aug 26 15:06:56 2010 +0200 -Commit: Bruno Brouard -CommitDate: Thu Aug 26 15:06:56 2010 +0200 +Author: Bruno Brouard +Date: Thu Aug 26 15:06:56 2010 +0200 Updated French translation M po/fr.po commit bc48d837211feb16326a6c0c7391c7fb8399ab99 -Author: Alexander Shopov -AuthorDate: Tue Aug 24 15:06:52 2010 +0300 -Commit: Alexander Shopov -CommitDate: Tue Aug 24 15:06:52 2010 +0300 +Author: Alexander Shopov +Date: Tue Aug 24 15:06:52 2010 +0300 Updated Bulgarian translation M po/bg.po commit d4eb2839ba780a7647616581fa45649e9e2a63e5 -Author: Милош Поповић -AuthorDate: Tue Aug 24 05:39:07 2010 +0200 -Commit: Милош Поповић -CommitDate: Tue Aug 24 05:39:07 2010 +0200 +Author: Милош Поповић +Date: Tue Aug 24 05:39:07 2010 +0200 Updated Serbian translation @@ -12309,10 +11898,8 @@ M po/sr@latin.po commit b1558edcc266d283ab93c4584b81caabcb86d164 -Author: Chao-Hsiung Liao -AuthorDate: Sat Aug 21 20:41:02 2010 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Sat Aug 21 20:41:02 2010 +0800 +Author: Chao-Hsiung Liao +Date: Sat Aug 21 20:41:02 2010 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -12320,40 +11907,32 @@ M po/zh_TW.po commit f9a7008256cd6f3110fe46474378487236df1580 -Author: Khaled Hosny -AuthorDate: Thu Aug 19 21:18:14 2010 +0200 -Commit: Khaled Hosny -CommitDate: Thu Aug 19 21:18:14 2010 +0200 +Author: Khaled Hosny +Date: Thu Aug 19 21:18:14 2010 +0200 Updated Arabic translation M po/ar.po commit f4f3b73676471020148af2431419ee51f3bb1c80 -Author: Pavol Šimo -AuthorDate: Wed Aug 18 22:26:26 2010 +0200 -Commit: Pavol Šimo -CommitDate: Wed Aug 18 22:26:26 2010 +0200 +Author: Pavol Šimo +Date: Wed Aug 18 22:26:26 2010 +0200 Updated Slovak translation M po/sk.po commit 4559d6d1ec91f053dae1ece23c217264afee0e5f -Author: David Planella -AuthorDate: Sat Aug 14 00:36:06 2010 +0200 -Commit: Gil Forcada -CommitDate: Sat Aug 14 00:36:06 2010 +0200 +Author: David Planella +Date: Sat Aug 14 00:36:06 2010 +0200 Updated Catalan translation M po/ca.po commit ea2fab23e885e6dc7a842eafec456f56cec21771 -Author: Gheyret T.Kenji -AuthorDate: Wed Aug 11 17:58:09 2010 +0200 -Commit: Abduxukur Abdurixit -CommitDate: Wed Aug 11 17:58:09 2010 +0200 +Author: Gheyret T.Kenji +Date: Wed Aug 11 17:58:09 2010 +0200 Added UG translation @@ -12361,30 +11940,24 @@ A po/ug.po commit d99b40e0aa04f61430a66a61b9b07d3c9cb34be0 -Author: Dirgita -AuthorDate: Thu Aug 5 03:09:07 2010 +0700 -Commit: Andika Triwidada -CommitDate: Thu Aug 5 03:09:07 2010 +0700 +Author: Dirgita +Date: Thu Aug 5 03:09:07 2010 +0700 Updated Indonesian translation M po/id.po commit 720a4cdcef952b596c5e6213609190896212649d -Author: Vincent Untz -AuthorDate: Wed Aug 4 13:43:08 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed Aug 4 13:43:08 2010 +0200 +Author: Vincent Untz +Date: Wed Aug 4 13:43:08 2010 +0200 [release] post-release bump to 2.31.90 M configure.in -commit 7b9d4c0bbff2365e941d6c408ebed6038bd99865 (tag: GNOME_SESSION_2_31_6) -Author: Vincent Untz -AuthorDate: Wed Aug 4 13:42:49 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed Aug 4 13:42:49 2010 +0200 +commit 7b9d4c0bbff2365e941d6c408ebed6038bd99865 +Author: Vincent Untz +Date: Wed Aug 4 13:42:49 2010 +0200 [release] 2.31.6 @@ -12392,100 +11965,80 @@ M configure.in commit 064d688586de0f4a9b26986bc74622510e6a3c03 -Author: A S Alam -AuthorDate: Wed Aug 4 14:37:38 2010 +0530 -Commit: A S Alam -CommitDate: Wed Aug 4 14:37:38 2010 +0530 +Author: A S Alam +Date: Wed Aug 4 14:37:38 2010 +0530 update Punjabi Translation by A S Alam M po/pa.po commit 592b3bdd8be24f0b70ed73170361d01b3b17a896 -Author: Pablo Castellano -AuthorDate: Tue Aug 3 19:50:18 2010 +0200 -Commit: Pablo Castellano -CommitDate: Tue Aug 3 19:50:18 2010 +0200 +Author: Pablo Castellano +Date: Tue Aug 3 19:50:18 2010 +0200 Update git.mk from pango M git.mk commit 7aa0ed06669e06211c86c5c29efe24edbc5d0b73 -Author: Sweta Kothari -AuthorDate: Mon Aug 2 17:19:14 2010 +0530 -Commit: Sweta Kothari -CommitDate: Mon Aug 2 17:19:14 2010 +0530 +Author: Sweta Kothari +Date: Mon Aug 2 17:19:14 2010 +0530 Updated Gujarati Translations M po/gu.po commit c0718c6915a3e90f39fa46dfd6eb449215085e44 -Author: Sweta Kothari -AuthorDate: Mon Aug 2 17:11:46 2010 +0530 -Commit: Sweta Kothari -CommitDate: Mon Aug 2 17:11:46 2010 +0530 +Author: Sweta Kothari +Date: Mon Aug 2 17:11:46 2010 +0530 Updated Gujarati Translations M po/gu.po commit 09e441c16c8771efbfc7df8905a27ef67b547ec4 -Author: Sweta Kothari -AuthorDate: Mon Aug 2 16:59:14 2010 +0530 -Commit: Sweta Kothari -CommitDate: Mon Aug 2 16:59:14 2010 +0530 +Author: Sweta Kothari +Date: Mon Aug 2 16:59:14 2010 +0530 Updated Gujarati Translations M po/gu.po commit deb83c6b9f50ff046b7ad8dd8b91496f4718c9f4 -Author: Runa Bhattacharjee -AuthorDate: Fri Jul 30 16:30:42 2010 +0530 -Commit: Runa Bhattacharjee -CommitDate: Fri Jul 30 16:30:42 2010 +0530 +Author: Runa Bhattacharjee +Date: Fri Jul 30 16:30:42 2010 +0530 Updated Bengali India Translation M po/bn_IN.po commit 3d647925db820966113bbc27e5e616ece535ca7a -Author: Mattias Põldaru -AuthorDate: Thu Jul 29 00:14:35 2010 +0300 -Commit: Priit Laes -CommitDate: Thu Jul 29 00:14:35 2010 +0300 +Author: Mattias Põldaru +Date: Thu Jul 29 00:14:35 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit 6e527bf69e5cfd9f2ac1b683e93163ef0fa539fc -Author: Frédéric Péters -AuthorDate: Wed Jul 28 16:30:49 2010 +0200 -Commit: Frédéric Péters -CommitDate: Wed Jul 28 16:30:49 2010 +0200 +Author: Frédéric Péters +Date: Wed Jul 28 16:30:49 2010 +0200 New configure flag to switch GTK+ version M configure.in commit 6fbfe74bc8d07aeb8cb9498f754567fad6c0f19f -Author: Daniel Nylander -AuthorDate: Sun Jul 25 17:50:58 2010 +0200 -Commit: Daniel Nylander -CommitDate: Sun Jul 25 17:50:58 2010 +0200 +Author: Daniel Nylander +Date: Sun Jul 25 17:50:58 2010 +0200 Updated Swedish translation M po/sv.po commit cda5b398f5c4043923d2c7a784e2294ae96a2079 -Author: Paolo Borelli -AuthorDate: Sat Jul 24 18:03:44 2010 +0200 -Commit: Paolo Borelli -CommitDate: Sat Jul 24 18:06:01 2010 +0200 +Author: Paolo Borelli +Date: Sat Jul 24 18:03:44 2010 +0200 Remove the splash program @@ -12507,80 +12060,64 @@ D splash/splash-window.h commit f9a005d12d6450e1ecb4f1ddb0639122a3dfb893 -Author: Aron Xu -AuthorDate: Sat Jul 24 18:41:24 2010 +0800 -Commit: Aron Xu -CommitDate: Sat Jul 24 18:41:24 2010 +0800 +Author: Aron Xu +Date: Sat Jul 24 18:41:24 2010 +0800 Update Simplified Chinese translation. M po/zh_CN.po commit 927a682ba9a1ff083ef89fc0c601369b806b96c5 -Author: Matej Urbančič -AuthorDate: Thu Jul 22 14:45:47 2010 +0200 -Commit: Matej Urbančič -CommitDate: Thu Jul 22 14:45:47 2010 +0200 +Author: Matej Urbančič +Date: Thu Jul 22 14:45:47 2010 +0200 Updated Slovenian translation M po/sl.po commit 781b1718341bfbd8c62de5a3671f1ac028a9e55b -Author: Sandeep Shedmake -AuthorDate: Thu Jul 22 14:33:10 2010 +0530 -Commit: Sandeep Shedmake -CommitDate: Thu Jul 22 14:33:10 2010 +0530 +Author: Sandeep Shedmake +Date: Thu Jul 22 14:33:10 2010 +0530 Updated Marathi Translations M po/mr.po commit 507b90ead1abb4bd2426472f622c8795e6309261 -Author: Fran Diéguez -AuthorDate: Tue Jul 20 13:01:40 2010 +0200 -Commit: Fran Diéguez -CommitDate: Tue Jul 20 13:01:40 2010 +0200 +Author: Fran Diéguez +Date: Tue Jul 20 13:01:40 2010 +0200 Updated Galician translations M po/gl.po commit a30fb62dc03815ad97aa4da42b8fa2e77e21156a -Author: Kjartan Maraas -AuthorDate: Mon Jul 19 23:05:44 2010 +0200 -Commit: Kjartan Maraas -CommitDate: Mon Jul 19 23:05:44 2010 +0200 +Author: Kjartan Maraas +Date: Mon Jul 19 23:05:44 2010 +0200 Updated Norwegian bokmål translation M po/nb.po commit 5eef3be0fece8df500438db800506ec2a7a5b7ce -Author: Mario Blättermann -AuthorDate: Sun Jul 18 18:42:27 2010 +0200 -Commit: Mario Blättermann -CommitDate: Sun Jul 18 18:42:27 2010 +0200 +Author: Mario Blättermann +Date: Sun Jul 18 18:42:27 2010 +0200 [i18n] Updated German translation M po/de.po commit b747c92cb72879259e6ad675c5a5f9229610a791 -Author: Jorge González -AuthorDate: Sun Jul 18 12:11:51 2010 +0200 -Commit: Jorge González -CommitDate: Sun Jul 18 12:11:51 2010 +0200 +Author: Jorge González +Date: Sun Jul 18 12:11:51 2010 +0200 Updated Spanish translation M po/es.po commit 429cf11b939b17f9698c77a5d1b0cedb715b128a -Author: Sense Hofstede -AuthorDate: Sun Jul 18 01:03:20 2010 +0200 -Commit: Sense Hofstede -CommitDate: Sun Jul 18 01:03:20 2010 +0200 +Author: Sense Hofstede +Date: Sun Jul 18 01:03:20 2010 +0200 Updated Frisian translation and added it to the LINGUAS file @@ -12588,80 +12125,64 @@ A po/fy.po commit 5e59606e13403e1ca4bf45de7c4c1358916f1d8c -Author: Yaron Shahrabani -AuthorDate: Thu Jul 15 17:27:18 2010 +0300 -Commit: Yaron Shahrabani -CommitDate: Thu Jul 15 17:27:18 2010 +0300 +Author: Yaron Shahrabani +Date: Thu Jul 15 17:27:18 2010 +0300 Updated Hebrew translation. M po/he.po commit 6eac9beab881e70e8a7ef4b4308a30edb1045da0 -Author: Vincent Untz -AuthorDate: Thu Jul 15 14:54:19 2010 +0200 -Commit: Vincent Untz -CommitDate: Thu Jul 15 14:54:19 2010 +0200 +Author: Vincent Untz +Date: Thu Jul 15 14:54:19 2010 +0200 Fix description of auto_save_session key M data/gnome-session.schemas.in.in commit c6e36fa4f8a1991c5f35c2ef3150da1edfc30dbd -Author: Matej Urbančič -AuthorDate: Wed Jul 14 15:02:34 2010 +0200 -Commit: Matej Urbančič -CommitDate: Wed Jul 14 15:02:34 2010 +0200 +Author: Matej Urbančič +Date: Wed Jul 14 15:02:34 2010 +0200 Updated Slovenian translation M po/sl.po commit e0702c0c23d1645546f5ce0c2436731fed640111 -Author: Fran Diéguez -AuthorDate: Wed Jul 14 11:28:44 2010 +0200 -Commit: Fran Diéguez -CommitDate: Wed Jul 14 11:28:44 2010 +0200 +Author: Fran Diéguez +Date: Wed Jul 14 11:28:44 2010 +0200 Updated Galician translations M po/gl.po commit c7ded57f7c89489609365ed0d65e67598aeca321 -Author: Aron Xu -AuthorDate: Tue Jul 13 23:22:32 2010 +0800 -Commit: Aron Xu -CommitDate: Tue Jul 13 23:22:32 2010 +0800 +Author: Aron Xu +Date: Tue Jul 13 23:22:32 2010 +0800 Complete Simplified Chinese translation. M po/zh_CN.po commit 2886b1c0ad3405345b3788f4ad60cf6ce609bfbf -Author: Kjartan Maraas -AuthorDate: Tue Jul 13 15:16:08 2010 +0200 -Commit: Kjartan Maraas -CommitDate: Tue Jul 13 15:16:08 2010 +0200 +Author: Kjartan Maraas +Date: Tue Jul 13 15:16:08 2010 +0200 Updated Norwegian bokmål translation M po/nb.po commit 034671ad6465a8b82f71892a2caf2109bb8759e2 -Author: Yaron Shahrabani -AuthorDate: Tue Jul 13 03:27:27 2010 +0300 -Commit: Yaron Shahrabani -CommitDate: Tue Jul 13 03:27:27 2010 +0300 +Author: Yaron Shahrabani +Date: Tue Jul 13 03:27:27 2010 +0300 Updated Hebrew translation. M po/he.po commit 75935773a6c5b0f7d93ca4fb9a032baa9f7dfa40 -Author: Richard Hughes -AuthorDate: Mon Jul 12 14:07:02 2010 +0100 -Commit: Richard Hughes -CommitDate: Mon Jul 12 14:14:51 2010 +0100 +Author: Richard Hughes +Date: Mon Jul 12 14:07:02 2010 +0100 Port gnome-session to upower @@ -12673,60 +12194,48 @@ M gnome-session/gsm-manager.c commit e07a7744b066b8ca87c73daad61a658e0aada1e4 -Author: Ivar Smolin -AuthorDate: Mon Jul 12 08:21:46 2010 +0300 -Commit: Priit Laes -CommitDate: Mon Jul 12 08:21:46 2010 +0300 +Author: Ivar Smolin +Date: Mon Jul 12 08:21:46 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit b709a17ea90e46b0cda07ce9cf51e9620da1065b -Author: Frédéric Péters -AuthorDate: Sun Jul 11 18:54:43 2010 +0200 -Commit: Frédéric Péters -CommitDate: Sun Jul 11 18:54:43 2010 +0200 +Author: Frédéric Péters +Date: Sun Jul 11 18:54:43 2010 +0200 Fixed spelling error in schema description (GNOME bug 608044) M data/gnome-session.schemas.in.in commit 4e9d782a2bb16453ba51748abb3d9c740dfc1dd5 -Author: Mattias Põldaru -AuthorDate: Mon Jul 5 13:24:21 2010 +0300 -Commit: Priit Laes -CommitDate: Mon Jul 5 13:24:21 2010 +0300 +Author: Mattias Põldaru +Date: Mon Jul 5 13:24:21 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit c74ff5fc411cc24e355696180f7015a1792cd12e -Author: Ivar Smolin -AuthorDate: Sat Jul 3 00:57:50 2010 +0300 -Commit: Priit Laes -CommitDate: Sat Jul 3 00:57:50 2010 +0300 +Author: Ivar Smolin +Date: Sat Jul 3 00:57:50 2010 +0300 [l10n] Updated Estonian translation M po/et.po commit 7905778e3095fe71cc943c7d6cc09bafcd1b43ad -Author: Matthias Clasen -AuthorDate: Fri Jul 2 14:24:46 2010 -0400 -Commit: Matthias Clasen -CommitDate: Fri Jul 2 14:24:46 2010 -0400 +Author: Matthias Clasen +Date: Fri Jul 2 14:24:46 2010 -0400 Remove the compat directory M Makefile.am commit cc5252dd1eecdfca2bc75bebd7868bc251e9378b -Author: Vincent Untz -AuthorDate: Fri Jul 2 12:06:58 2010 +0200 -Commit: Vincent Untz -CommitDate: Fri Jul 2 12:06:58 2010 +0200 +Author: Vincent Untz +Date: Fri Jul 2 12:06:58 2010 +0200 [compat] Drop compatibility tool that set GTK+ 1.x environment variable @@ -12741,10 +12250,8 @@ M po/POTFILES.skip commit 3db1316234f1bf30b515dfec793b0d5231294894 -Author: Vincent Untz -AuthorDate: Fri Jul 2 12:04:30 2010 +0200 -Commit: Vincent Untz -CommitDate: Fri Jul 2 12:04:30 2010 +0200 +Author: Vincent Untz +Date: Fri Jul 2 12:04:30 2010 +0200 [all] Build against GTK+ 3.0 @@ -12753,60 +12260,48 @@ M configure.in commit ec867487f2d3ae90f23ddb40b26c117114fb2a69 -Author: Vincent Untz -AuthorDate: Fri Jul 2 12:04:17 2010 +0200 -Commit: Vincent Untz -CommitDate: Fri Jul 2 12:04:17 2010 +0200 +Author: Vincent Untz +Date: Fri Jul 2 12:04:17 2010 +0200 [gsm] Fix a GSeal issue M gnome-session/gsm-inhibit-dialog.c commit 73092531a626d102ef138ed6e371f25c491e12b6 -Author: Kristjan Schmidt -AuthorDate: Fri Jun 25 04:56:57 2010 +0200 -Commit: Kristjan Schmidt -CommitDate: Fri Jun 25 04:56:57 2010 +0200 +Author: Kristjan Schmidt +Date: Fri Jun 25 04:56:57 2010 +0200 Updated Esperanto translation M po/eo.po commit 41622c5a16bb763ae12aeb9588b78e3ea27955bf -Author: Matej Urbančič -AuthorDate: Thu Jun 17 09:55:27 2010 +0200 -Commit: Matej Urbančič -CommitDate: Thu Jun 17 09:55:27 2010 +0200 +Author: Matej Urbančič +Date: Thu Jun 17 09:55:27 2010 +0200 Updated Slovenian translation M po/sl.po commit 20126b1712d4a653892ec8ea4a77367ca6c6ca9d -Author: Rudols Mazurs -AuthorDate: Sun Jun 13 23:10:58 2010 +0300 -Commit: Peteris Krisjanis -CommitDate: Sun Jun 13 23:10:58 2010 +0300 +Author: Rudols Mazurs +Date: Sun Jun 13 23:10:58 2010 +0300 Updated Latvian translation. M po/lv.po commit 18556b851b421e33b9128a546aaecee435a8683e -Author: Vincent Untz -AuthorDate: Wed May 26 19:34:30 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed May 26 19:34:30 2010 +0200 +Author: Vincent Untz +Date: Wed May 26 19:34:30 2010 +0200 [release] post-release bump to 2.31.3 M configure.in -commit b0816562c5e1a9538ad732484cc973e7bfe06c69 (tag: GNOME_SESSION_2_31_2) -Author: Vincent Untz -AuthorDate: Wed May 26 19:34:21 2010 +0200 -Commit: Vincent Untz -CommitDate: Wed May 26 19:34:21 2010 +0200 +commit b0816562c5e1a9538ad732484cc973e7bfe06c69 +Author: Vincent Untz +Date: Wed May 26 19:34:21 2010 +0200 [release] 2.31.2 @@ -12814,20 +12309,16 @@ M configure.in commit 2d009213933907ddd8b36df854af2a53ad8b993a -Author: Gil Forcada -AuthorDate: Sat May 22 23:25:26 2010 +0200 -Commit: Gil Forcada -CommitDate: Sat May 22 23:25:26 2010 +0200 +Author: Gil Forcada +Date: Sat May 22 23:25:26 2010 +0200 Minor fix in Catalan translation M po/ca.po commit 017b5eeb7d6ab64db3b1db2a22136237bd765af7 -Author: Colin Walters -AuthorDate: Fri May 7 11:22:43 2010 -0400 -Commit: Colin Walters -CommitDate: Thu May 20 10:36:04 2010 -0400 +Author: Colin Walters +Date: Fri May 7 11:22:43 2010 -0400 [GsmClient] Export _stop method @@ -12838,30 +12329,24 @@ M gnome-session/org.gnome.SessionManager.Client.xml commit a55dee623bea7b89d2751416ab8abb4a67ccf439 -Author: Thomas Thurman -AuthorDate: Wed May 12 18:40:56 2010 -0400 -Commit: Thomas Thurman -CommitDate: Wed May 12 18:40:56 2010 -0400 +Author: Thomas Thurman +Date: Wed May 12 18:40:56 2010 -0400 Updated Shavian transliteration M po/en@shaw.po commit b4a83d8919f198c0290a3d55cf84a7bfb9cf67cd -Author: Manoj Kumar Giri -AuthorDate: Wed May 12 12:56:09 2010 +0530 -Commit: Manoj Kumar Giri -CommitDate: Wed May 12 12:56:09 2010 +0530 +Author: Manoj Kumar Giri +Date: Wed May 12 12:56:09 2010 +0530 Updated Oriya Translation M po/or.po commit b7926c7bada91a333e2c49da83808589191b8a8f -Author: Colin Walters -AuthorDate: Fri May 7 11:10:42 2010 -0400 -Commit: Colin Walters -CommitDate: Fri May 7 11:11:55 2010 -0400 +Author: Colin Walters +Date: Fri May 7 11:10:42 2010 -0400 Explicitly add -lXext -lXau to linker line @@ -12874,120 +12359,96 @@ M gnome-session/Makefile.am commit ebc46cd63293c2a1626e6992897f59f6ff6df024 -Author: Philip Withnall -AuthorDate: Sun Apr 25 17:41:46 2010 +0100 -Commit: Philip Withnall -CommitDate: Sun Apr 25 17:41:46 2010 +0100 +Author: Philip Withnall +Date: Sun Apr 25 17:41:46 2010 +0100 Updated British English translation M po/en_GB.po commit 8b17c2f887effd3f0e8688ddcd56b2538dec2232 -Author: Carles Ferrando -AuthorDate: Wed Apr 21 23:23:13 2010 +0200 -Commit: Gil Forcada -CommitDate: Wed Apr 21 23:23:13 2010 +0200 +Author: Carles Ferrando +Date: Wed Apr 21 23:23:13 2010 +0200 Updated Catalan (Valencian) translation M po/ca@valencia.po commit 386f2afaed3ffb586fb314acb245c9bcc937f45a -Author: Shankar Prasad -AuthorDate: Wed Apr 21 14:38:01 2010 +0530 -Commit: Shankar Prasad -CommitDate: Wed Apr 21 14:38:01 2010 +0530 +Author: Shankar Prasad +Date: Wed Apr 21 14:38:01 2010 +0530 Updated Kannada translations M po/kn.po commit d6b863a61a5824d4ffc0e44ec0e11dc54a556949 -Author: Sandeep Shedmake -AuthorDate: Tue Apr 13 14:46:53 2010 +0530 -Commit: Sandeep Shedmake -CommitDate: Tue Apr 13 14:47:14 2010 +0530 +Author: Sandeep Shedmake +Date: Tue Apr 13 14:46:53 2010 +0530 Updated Marathi Translations M po/mr.po commit 81b9cbd0bf3cc1bc2c544e5b15720a1293b7040e -Author: Andika Triwidada -AuthorDate: Sun Apr 11 18:42:13 2010 +0700 -Commit: Andika Triwidada -CommitDate: Sun Apr 11 18:42:13 2010 +0700 +Author: Andika Triwidada +Date: Sun Apr 11 18:42:13 2010 +0700 Updated Indonesian translation M po/id.po commit 87d796fad29c3301242a7a16c48103b4efabc870 -Author: Timo Jyrinki -AuthorDate: Thu Apr 1 09:58:23 2010 +0300 -Commit: Timo Jyrinki -CommitDate: Thu Apr 1 09:58:23 2010 +0300 +Author: Timo Jyrinki +Date: Thu Apr 1 09:58:23 2010 +0300 term change in Finnish translation M po/fi.po commit 9fa098a4322fefc9887d8f857a466b89b3dc8d12 -Author: Wouter Bolsterlee -AuthorDate: Tue Mar 30 17:45:58 2010 +0200 -Commit: Wouter Bolsterlee -CommitDate: Tue Mar 30 17:45:58 2010 +0200 +Author: Wouter Bolsterlee +Date: Tue Mar 30 17:45:58 2010 +0200 Dutch translation updated by Wouter Bolsterlee M po/nl.po commit 52bc1a5769c3aefb471ad65d5cf52beee46ae0e4 -Author: Vincent Untz -AuthorDate: Tue Mar 30 02:07:31 2010 +0200 -Commit: Vincent Untz -CommitDate: Tue Mar 30 02:07:31 2010 +0200 +Author: Vincent Untz +Date: Tue Mar 30 02:07:31 2010 +0200 [release] post-release bump to 2.30.1 M configure.in -commit 9b17734eec3c4ade67638780a0f54cb273bf7647 (tag: GNOME_SESSION_2_30_0) -Author: Vincent Untz -AuthorDate: Tue Mar 30 02:07:20 2010 +0200 -Commit: Vincent Untz -CommitDate: Tue Mar 30 02:07:20 2010 +0200 +commit 9b17734eec3c4ade67638780a0f54cb273bf7647 +Author: Vincent Untz +Date: Tue Mar 30 02:07:20 2010 +0200 [release] 2.30.0 M NEWS commit bd05e991743d388c2fe7970a4284d0dca0784cc0 -Author: Jamil Ahmed -AuthorDate: Sun Mar 28 01:25:48 2010 +0600 -Commit: Jamil Ahmed -CommitDate: Sun Mar 28 01:25:48 2010 +0600 +Author: Jamil Ahmed +Date: Sun Mar 28 01:25:48 2010 +0600 Updated Bengali translation M po/bn.po commit 8a2ae10957b14a28789e15c86a4f644922e33ab0 -Author: Inaki Larranaga Murgoitio -AuthorDate: Tue Mar 23 16:22:05 2010 +0100 -Commit: dooteo -CommitDate: Tue Mar 23 16:22:05 2010 +0100 +Author: Inaki Larranaga Murgoitio +Date: Tue Mar 23 16:22:05 2010 +0100 Updated Basque language M po/eu.po commit ca3009e5bbcbf0da3162eea00055ec9b661a58c7 -Author: Miloš Popović -AuthorDate: Mon Mar 22 23:50:50 2010 +0100 -Commit: Miloš Popović -CommitDate: Mon Mar 22 23:50:50 2010 +0100 +Author: Miloš Popović +Date: Mon Mar 22 23:50:50 2010 +0100 Updated Serbian translations @@ -12995,50 +12456,40 @@ M po/sr@latin.po commit d2ce94290fd088b5daa9cec82f69eba9915c14a8 -Author: Changwoo Ryu -AuthorDate: Sat Mar 13 23:59:25 2010 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Mar 13 23:59:25 2010 +0900 +Author: Changwoo Ryu +Date: Sat Mar 13 23:59:25 2010 +0900 Translated Korean translation M po/ko.po commit c3611b2c7ba8e80f56ce5750bec5f748dfb9b032 -Author: Vincent Untz -AuthorDate: Tue Mar 9 13:36:26 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 13:36:26 2010 +0100 +Author: Vincent Untz +Date: Tue Mar 9 13:36:26 2010 +0100 [build] Do not use [] but @<:@ and @:>@ for default values in configure M configure.in commit 385bf595a97e08bc8ac3081b20fad357a264e2d7 -Author: Vincent Untz -AuthorDate: Tue Mar 9 13:09:10 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 13:09:10 2010 +0100 +Author: Vincent Untz +Date: Tue Mar 9 13:09:10 2010 +0100 [build] Add more information to configure summary M configure.in commit 843f4efafcc942e81f86fec78730b8c55328fad5 -Author: Vincent Untz -AuthorDate: Tue Mar 9 01:47:57 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 01:47:57 2010 +0100 +Author: Vincent Untz +Date: Tue Mar 9 01:47:57 2010 +0100 [release] post-release bump to 2.30.0 M configure.in -commit ba19aa1de06ed8faf94fa423c6c04aec548f709b (tag: GNOME_SESSION_2_29_92) -Author: Vincent Untz -AuthorDate: Tue Mar 9 01:47:40 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 01:47:40 2010 +0100 +commit ba19aa1de06ed8faf94fa423c6c04aec548f709b +Author: Vincent Untz +Date: Tue Mar 9 01:47:40 2010 +0100 [release] 2.29.92 @@ -13046,10 +12497,8 @@ M configure.in commit b0dc999e0b45355314616321dbb6cb71e729fc9d -Author: Romain Perier -AuthorDate: Mon Feb 1 19:41:57 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 01:29:50 2010 +0100 +Author: Romain Perier +Date: Mon Feb 1 19:41:57 2010 +0100 [gsm] Delay the creation of the GsmXSMPClient until it really exists @@ -13075,10 +12524,8 @@ M gnome-session/gsm-xsmp-server.c commit 5198aa08d2b77204cd8bf669a64f2e044d9a9e0d -Author: Halton Huo -AuthorDate: Tue Mar 9 00:34:34 2010 +0100 -Commit: Vincent Untz -CommitDate: Tue Mar 9 00:34:34 2010 +0100 +Author: Halton Huo +Date: Tue Mar 9 00:34:34 2010 +0100 [gsm] Log out on SIGTERM and SIGINT @@ -13090,10 +12537,8 @@ M gnome-session/main.c commit 1dd9a320b769360de1d8da6a436524187c55913e -Author: Vincent Untz -AuthorDate: Sun Mar 7 12:35:54 2010 +0100 -Commit: Vincent Untz -CommitDate: Sun Mar 7 12:36:27 2010 +0100 +Author: Vincent Untz +Date: Sun Mar 7 12:35:54 2010 +0100 [build] Remove unneeded LIBGNOMEUI_REQUIRED from configure.in @@ -13102,60 +12547,48 @@ M configure.in commit b98ebe9c0eba15c6c64171e8611b8ea3e5e7039e -Author: Changwoo Ryu -AuthorDate: Sat Mar 6 12:07:30 2010 +0900 -Commit: Changwoo Ryu -CommitDate: Sat Mar 6 12:07:30 2010 +0900 +Author: Changwoo Ryu +Date: Sat Mar 6 12:07:30 2010 +0900 Updated Korean translation M po/ko.po commit d242aa30b636fb281644816a005b46e4f0966379 -Author: Torstein Adolf Winterseth -AuthorDate: Sat Feb 27 13:36:53 2010 +0100 -Commit: Åsmund Skjæveland -CommitDate: Sat Feb 27 13:36:53 2010 +0100 +Author: Torstein Adolf Winterseth +Date: Sat Feb 27 13:36:53 2010 +0100 Updated Norwegian Nynorsk translation M po/nn.po commit 65ea7a19199ef7932ed2e2599ba79569d88ee3ad -Author: Piotr Drąg -AuthorDate: Thu Feb 25 13:39:47 2010 +0100 -Commit: Tomasz Dominikowski -CommitDate: Thu Feb 25 13:39:47 2010 +0100 +Author: Piotr Drąg +Date: Thu Feb 25 13:39:47 2010 +0100 Updated Polish translation M po/pl.po commit 36aadda22d003d6931c480f3cec05e02861c8672 -Author: Fran Diéguez -AuthorDate: Mon Feb 15 18:36:44 2010 +0100 -Commit: Ignacio Casal Quinteiro -CommitDate: Mon Feb 15 18:36:44 2010 +0100 +Author: Fran Diéguez +Date: Mon Feb 15 18:36:44 2010 +0100 Updated Galician Translation M po/gl.po commit e8037c4a0d9c4fe2e0c1f6232fceb591d4cdd4ba -Author: Vincent Untz -AuthorDate: Wed Jan 27 16:30:11 2010 +0100 -Commit: Vincent Untz -CommitDate: Wed Jan 27 16:30:11 2010 +0100 +Author: Vincent Untz +Date: Wed Jan 27 16:30:11 2010 +0100 [release] post-release bump to 2.29.90 M configure.in -commit 6d7f23ddc7f3037ee1a1fa4558c4e47c7405c5e0 (tag: GNOME_SESSION_2_29_6) -Author: Vincent Untz -AuthorDate: Wed Jan 27 16:30:04 2010 +0100 -Commit: Vincent Untz -CommitDate: Wed Jan 27 16:30:04 2010 +0100 +commit 6d7f23ddc7f3037ee1a1fa4558c4e47c7405c5e0 +Author: Vincent Untz +Date: Wed Jan 27 16:30:04 2010 +0100 [release] 2.29.6 @@ -13163,10 +12596,8 @@ M configure.in commit b2214df90d82cf5b588858b1a145e26d0f7c8b87 -Author: Romain Perier -AuthorDate: Wed Jan 27 16:18:34 2010 +0100 -Commit: Vincent Untz -CommitDate: Wed Jan 27 16:18:34 2010 +0100 +Author: Romain Perier +Date: Wed Jan 27 16:18:34 2010 +0100 [gsm] Check that the XSMP connection exists when stopping a client @@ -13179,20 +12610,16 @@ M gnome-session/gsm-xsmp-client.c commit 43488b8026b8f3ea5cafef956b85c47dd8503f5c -Author: Amitakhya Phukan -AuthorDate: Fri Jan 8 18:11:53 2010 +0530 -Commit: Amitakhya Phukan -CommitDate: Fri Jan 8 18:11:53 2010 +0530 +Author: Amitakhya Phukan +Date: Fri Jan 8 18:11:53 2010 +0530 updated assamese translations M po/as.po commit c1e06e09f2580f9edd75f2d3609062d52c84b6f6 -Author: Javier Jardón -AuthorDate: Sat Aug 29 19:54:39 2009 +0200 -Commit: Javier Jardón -CommitDate: Tue Dec 8 18:36:41 2009 +0100 +Author: Javier Jardón +Date: Sat Aug 29 19:54:39 2009 +0200 Use accessor functions instead direct access. Second patch @@ -13206,20 +12633,16 @@ M gnome-session/gsm-logout-dialog.c commit ce37f60501ae4c584160074eee25f1dd4b09a6e9 -Author: Vincent Untz -AuthorDate: Tue Dec 1 15:38:41 2009 +0100 -Commit: Vincent Untz -CommitDate: Tue Dec 1 15:39:09 2009 +0100 +Author: Vincent Untz +Date: Tue Dec 1 15:38:41 2009 +0100 [build] Remove unneeded PolicyKit status line from configure M configure.in commit 89e84c4f0d762a1b0c256ec7d50caa53ceaaeab5 -Author: Vincent Untz -AuthorDate: Tue Dec 1 15:38:18 2009 +0100 -Commit: Vincent Untz -CommitDate: Tue Dec 1 15:39:09 2009 +0100 +Author: Vincent Untz +Date: Tue Dec 1 15:38:18 2009 +0100 [build] Install the helpers in libexecdir, not libdir @@ -13227,40 +12650,32 @@ M splash/Makefile.am commit b0d8270dd060d13456216323474d3eebb8228a23 -Author: Aron Xu -AuthorDate: Mon Nov 30 22:14:27 2009 +0800 -Commit: Aron Xu -CommitDate: Mon Nov 30 22:14:27 2009 +0800 +Author: Aron Xu +Date: Mon Nov 30 22:14:27 2009 +0800 Updated Simplified Chinese translation. M po/zh_CN.po commit 9df12477fb7f6759d671ab59e4d325917983acd6 -Author: Nikos Charonitakis -AuthorDate: Mon Nov 23 19:58:14 2009 +0200 -Commit: Nikos Charonitakis -CommitDate: Mon Nov 23 19:58:14 2009 +0200 +Author: Nikos Charonitakis +Date: Mon Nov 23 19:58:14 2009 +0200 Updated Greek translation M po/el.po commit ae9fa656f62d4384d1c0b722e4f0d7bb661f181c -Author: Nils-Christoph Fiedler -AuthorDate: Sun Nov 15 12:32:02 2009 +0100 -Commit: Mario Blättermann -CommitDate: Sun Nov 15 12:32:02 2009 +0100 +Author: Nils-Christoph Fiedler +Date: Sun Nov 15 12:32:02 2009 +0100 Updated Low German translation M po/nds.po commit 44321b7a2a5a00e3ace81d56fe828b40ac0fb704 -Author: Thomas Thurman -AuthorDate: Sat Nov 14 07:02:45 2009 +0000 -Commit: Thomas Thurman -CommitDate: Sat Nov 14 07:02:45 2009 +0000 +Author: Thomas Thurman +Date: Sat Nov 14 07:02:45 2009 +0000 Shavian translation @@ -13268,20 +12683,16 @@ A po/en@shaw.po commit a60500d55c063ab11056606e595b3bb667d0e2b9 -Author: Matej Urbančič -AuthorDate: Mon Oct 26 14:46:58 2009 +0100 -Commit: Matej Urbančič -CommitDate: Mon Oct 26 14:46:58 2009 +0100 +Author: Matej Urbančič +Date: Mon Oct 26 14:46:58 2009 +0100 Updated Slovenian translation M po/sl.po commit aec5d7b87483573d9d661bc62a1f321d88c26931 -Author: Nils-Christoph Fiedler -AuthorDate: Thu Oct 22 19:54:25 2009 +0200 -Commit: Mario Blättermann -CommitDate: Thu Oct 22 19:54:25 2009 +0200 +Author: Nils-Christoph Fiedler +Date: Thu Oct 22 19:54:25 2009 +0200 Added Low German translation @@ -13289,40 +12700,32 @@ A po/nds.po commit 4d9ba012a52d373ad1605ae49ef31b7a3c98fbba -Author: Reşat SABIQ -AuthorDate: Mon Oct 19 03:54:04 2009 -0500 -Commit: Reşat SABIQ -CommitDate: Mon Oct 19 03:54:04 2009 -0500 +Author: Reşat SABIQ +Date: Mon Oct 19 03:54:04 2009 -0500 Updated Crimean Tatar (Crimean Turkish) translation M po/crh.po commit 1dd03e69fa49f7c43ff4d2ef7caa3cf26672d108 -Author: Carlos Jose Pereira -AuthorDate: Fri Oct 16 09:27:00 2009 -0400 -Commit: Og B. Maciel -CommitDate: Fri Oct 16 09:27:00 2009 -0400 +Author: Carlos Jose Pereira +Date: Fri Oct 16 09:27:00 2009 -0400 Updated Brazilian Portuguese translation. M po/pt_BR.po commit 71ca07351900846974684f342a913d0c1c952ee9 -Author: Leonid Kanter -AuthorDate: Mon Oct 12 13:12:07 2009 +0300 -Commit: Leonid Kanter -CommitDate: Mon Oct 12 13:12:07 2009 +0300 +Author: Leonid Kanter +Date: Mon Oct 12 13:12:07 2009 +0300 Updated Russian translation by M po/ru.po commit dd9df169196441717498ac09ee8c437fb552116e -Author: Vincent Untz -AuthorDate: Sun Oct 11 16:32:53 2009 -0400 -Commit: Vincent Untz -CommitDate: Sun Oct 11 17:08:29 2009 -0400 +Author: Vincent Untz +Date: Sun Oct 11 16:32:53 2009 -0400 [capplet] Destroy the main window on close to ensure changes are saved @@ -13335,10 +12738,8 @@ M capplet/main.c commit e97edcc49e77f38589155c3f65490cda5968e2bd -Author: Matthias Clasen -AuthorDate: Mon Oct 5 13:43:45 2009 -0400 -Commit: Matthias Clasen -CommitDate: Mon Oct 5 13:43:45 2009 -0400 +Author: Matthias Clasen +Date: Mon Oct 5 13:43:45 2009 -0400 Add diagnostic output for exit phase timeout @@ -13348,80 +12749,64 @@ M gnome-session/gsm-manager.c commit d90b939286251b9fff6d849cfbcce2eb3681ca9f -Author: Vincent Untz -AuthorDate: Thu Oct 1 12:49:04 2009 +0200 -Commit: Vincent Untz -CommitDate: Thu Oct 1 12:49:04 2009 +0200 +Author: Vincent Untz +Date: Thu Oct 1 12:49:04 2009 +0200 [gsm] Fix typo in error message M gnome-session/gsm-dbus-client.c commit a393e8ac06281a5f477dabf1a180212fac716181 -Author: Vincent Untz -AuthorDate: Mon Sep 21 18:24:18 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 21 18:24:18 2009 +0200 +Author: Vincent Untz +Date: Mon Sep 21 18:24:18 2009 +0200 [release] post-release bump to 2.28.1 M configure.in -commit 57061e91e301fde7df8a6b344ff634d01ea799b0 (tag: GNOME_SESSION_2_28_0) -Author: Vincent Untz -AuthorDate: Mon Sep 21 18:24:12 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Sep 21 18:24:12 2009 +0200 +commit 57061e91e301fde7df8a6b344ff634d01ea799b0 +Author: Vincent Untz +Date: Mon Sep 21 18:24:12 2009 +0200 [release] 2.28.0 M NEWS commit d8a98ec612ae92195e6e5f83a7437e2114cc0a1a -Author: Shankar Prasad -AuthorDate: Mon Sep 21 10:33:08 2009 +0530 -Commit: Shankar Prasad -CommitDate: Mon Sep 21 10:33:08 2009 +0530 +Author: Shankar Prasad +Date: Mon Sep 21 10:33:08 2009 +0530 Updated Kannada(kn) translation M po/kn.po commit 393d31d4240818effd9e8b4e7e84f8cdeba61a83 -Author: Petr Kovar -AuthorDate: Mon Sep 21 05:40:46 2009 +0200 -Commit: Petr Kovar -CommitDate: Mon Sep 21 05:40:46 2009 +0200 +Author: Petr Kovar +Date: Mon Sep 21 05:40:46 2009 +0200 Updated Czech translation M po/cs.po commit 4f244500a55e24ca6a76e8a2d0694b8ba3b52aad -Author: David Planella -AuthorDate: Sun Sep 20 19:44:38 2009 +0200 -Commit: Gil Forcada -CommitDate: Sun Sep 20 19:44:38 2009 +0200 +Author: David Planella +Date: Sun Sep 20 19:44:38 2009 +0200 Updated Catalan translation M po/ca.po commit f00c5c89f740a73c359da7f00c2b64b52cbb9629 -Author: Amitakhya Phukan -AuthorDate: Sun Sep 20 17:16:19 2009 +0530 -Commit: Amitakhya Phukan -CommitDate: Sun Sep 20 17:16:19 2009 +0530 +Author: Amitakhya Phukan +Date: Sun Sep 20 17:16:19 2009 +0530 Updating Assamese translations M po/as.po commit 7f926064e9fcb9ee166b1fc525b9cc0ecb9d11db -Author: Rajesh Ranjan -AuthorDate: Fri Sep 18 18:00:51 2009 +0530 -Commit: Rajesh Ranjan -CommitDate: Fri Sep 18 18:00:51 2009 +0530 +Author: Rajesh Ranjan +Date: Fri Sep 18 18:00:51 2009 +0530 maithili update @@ -13429,100 +12814,80 @@ A po/mai.po commit 8d026c65c3de5562fe6dc9a8a1f73a24443bbc36 -Author: Manoj Kumar Giri -AuthorDate: Fri Sep 18 16:28:57 2009 +0530 -Commit: Manoj Kumar Giri -CommitDate: Fri Sep 18 16:28:57 2009 +0530 +Author: Manoj Kumar Giri +Date: Fri Sep 18 16:28:57 2009 +0530 Upadated Oriya Translation M po/or.po commit 122e494284b7ff4f6d4c5029c2768bca2152e7cf -Author: krishnababu k -AuthorDate: Thu Sep 17 21:30:59 2009 +0530 -Commit: krishnababu k -CommitDate: Thu Sep 17 21:32:11 2009 +0530 +Author: krishnababu k +Date: Thu Sep 17 21:30:59 2009 +0530 Updated Telugu Translation M po/te.po commit 926772088c805f53566995d9e44c9c0fb52ee04f -Author: Maxim V. Dziumanenko -AuthorDate: Thu Sep 17 14:32:04 2009 +0300 -Commit: Maxim V. Dziumanenko -CommitDate: Thu Sep 17 14:32:04 2009 +0300 +Author: Maxim V. Dziumanenko +Date: Thu Sep 17 14:32:04 2009 +0300 Added Ukrainian translation M po/uk.po commit 888f226793f5cc15d86eb0e77ac91e34212ab2ab -Author: Denis ARNAUD -AuthorDate: Thu Sep 17 12:30:09 2009 +0200 -Commit: Denis ARNAUD -CommitDate: Thu Sep 17 12:30:18 2009 +0200 +Author: Denis ARNAUD +Date: Thu Sep 17 12:30:09 2009 +0200 Updated breton translation M po/br.po commit feccedd3869e77e8a892d5139748577b802f444f -Author: Matej Urbančič -AuthorDate: Wed Sep 16 13:29:48 2009 +0200 -Commit: Matej Urbančič -CommitDate: Wed Sep 16 13:29:48 2009 +0200 +Author: Matej Urbančič +Date: Wed Sep 16 13:29:48 2009 +0200 Updated Slovenian translation M po/sl.po commit b278c47cf6f1aa3e5b5d167b7c57a9859843149d -Author: André Gondim -AuthorDate: Wed Sep 16 08:21:45 2009 -0300 -Commit: Rodrigo L. M. Flores -CommitDate: Wed Sep 16 08:21:45 2009 -0300 +Author: André Gondim +Date: Wed Sep 16 08:21:45 2009 -0300 Corrected a translation error and some access keys in Brazilian Portuguese translation M po/pt_BR.po commit 7485e72f3f9f47e4b91b3498379e7e5979179060 -Author: Rajesh Ranjan -AuthorDate: Wed Sep 16 12:49:11 2009 +0530 -Commit: Rajesh Ranjan -CommitDate: Wed Sep 16 12:49:11 2009 +0530 +Author: Rajesh Ranjan +Date: Wed Sep 16 12:49:11 2009 +0530 hindi update by Rajesh Ranjan M po/hi.po commit 2174a00f29a620ec12de07fcbed62c9f02067655 -Author: Gintautas Miliauskas -AuthorDate: Tue Sep 15 02:08:16 2009 +0300 -Commit: Gintautas Miliauskas -CommitDate: Tue Sep 15 02:08:16 2009 +0300 +Author: Gintautas Miliauskas +Date: Tue Sep 15 02:08:16 2009 +0300 Updated Lithuanian translation. M po/lt.po commit 57a21a6049084fff173e7cb5ca1b165f01681409 -Author: Wolfgang Stöggl -AuthorDate: Mon Sep 14 19:54:32 2009 +0200 -Commit: Christian Kirbach -CommitDate: Mon Sep 14 19:54:32 2009 +0200 +Author: Wolfgang Stöggl +Date: Mon Sep 14 19:54:32 2009 +0200 Updated German translation M po/de.po commit fc11487acb6584f7c9deb705e8bdf46aeee0aa75 -Author: Richard Hughes -AuthorDate: Mon Sep 14 16:35:46 2009 +0100 -Commit: Richard Hughes -CommitDate: Mon Sep 14 16:36:26 2009 +0100 +Author: Richard Hughes +Date: Mon Sep 14 16:35:46 2009 +0100 Ensure we lock the screen before we hibernate or suspend if the user has the screensaver lock enabled @@ -13531,30 +12896,24 @@ M gnome-session/gsm-manager.c commit 5d8c11c1175c61884df2cbfa63f66b0814015441 -Author: Lucian Adrian Grijincu -AuthorDate: Sun Sep 13 22:30:28 2009 +0300 -Commit: Dumitru Mișu Moldovan -CommitDate: Sun Sep 13 22:30:28 2009 +0300 +Author: Lucian Adrian Grijincu +Date: Sun Sep 13 22:30:28 2009 +0300 Updated Romanian translation M po/ro.po commit f3a9e755e467fb910cb4c0b7d85d31a660a637a7 -Author: Ask H. Larsen -AuthorDate: Sun Sep 13 03:31:02 2009 +0200 -Commit: Kenneth Nielsen -CommitDate: Sun Sep 13 03:31:02 2009 +0200 +Author: Ask H. Larsen +Date: Sun Sep 13 03:31:02 2009 +0200 Updated Danish translation M po/da.po commit 1576d7c0c411c99cb42d86d7a18a2f8ae869548b -Author: Chao-Hsiung Liao -AuthorDate: Sun Sep 13 06:38:47 2009 +0800 -Commit: Chao-Hsiung Liao -CommitDate: Sun Sep 13 06:38:47 2009 +0800 +Author: Chao-Hsiung Liao +Date: Sun Sep 13 06:38:47 2009 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) @@ -13562,40 +12921,32 @@ M po/zh_TW.po commit 9fc05a540dfb0ecd518af51ee3aae06040769268 -Author: Philip Withnall -AuthorDate: Sat Sep 12 23:27:17 2009 +0100 -Commit: Philip Withnall -CommitDate: Sat Sep 12 23:27:17 2009 +0100 +Author: Philip Withnall +Date: Sat Sep 12 23:27:17 2009 +0100 Updated British English translation M po/en_GB.po commit 9e32a7083f9661afe84a1593b62313ea5f56ade5 -Author: Ani -AuthorDate: Sat Sep 12 18:26:32 2009 +0530 -Commit: Ani -CommitDate: Sat Sep 12 18:26:32 2009 +0530 +Author: Ani +Date: Sat Sep 12 18:26:32 2009 +0530 Updaeted Malayalam Translations M po/ml.po commit dbbc988276713c2bdb4d048ac265a931e0c290d3 -Author: Sandeep Shedmake -AuthorDate: Sat Sep 12 14:46:19 2009 +0530 -Commit: Sandeep Shedmake -CommitDate: Sat Sep 12 14:46:19 2009 +0530 +Author: Sandeep Shedmake +Date: Sat Sep 12 14:46:19 2009 +0530 Updated Marathi Translations M po/mr.po commit fe03014165616980c3a5680003b0c511d9671fc3 -Author: Miloš Popović -AuthorDate: Fri Sep 11 11:56:35 2009 +0000 -Commit: Miloš Popović -CommitDate: Fri Sep 11 11:56:35 2009 +0000 +Author: Miloš Popović +Date: Fri Sep 11 11:56:35 2009 +0000 Updated Serbian translation @@ -13603,70 +12954,56 @@ M po/sr@latin.po commit 3224de605c7c563554e3b9d95518d3f9bd2f6d33 -Author: A S Alam -AuthorDate: Thu Sep 10 06:54:12 2009 +0530 -Commit: A S Alam -CommitDate: Thu Sep 10 06:54:12 2009 +0530 +Author: A S Alam +Date: Thu Sep 10 06:54:12 2009 +0530 updating for Punjabi M po/pa.po commit 50ba8e6b979989723afd2b932dd1334727eabea5 -Author: Vincent Untz -AuthorDate: Wed Sep 9 13:17:25 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 9 13:17:25 2009 +0200 +Author: Vincent Untz +Date: Wed Sep 9 13:17:25 2009 +0200 [gsm] Remove dead code, add missing return value, fix bad GError usage M gnome-session/gsm-consolekit.c commit 1a6d85ab7d0132cd18dbf7d7f86d73c9b4fe092b -Author: Vincent Untz -AuthorDate: Wed Sep 9 02:21:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 9 02:21:07 2009 +0200 +Author: Vincent Untz +Date: Wed Sep 9 02:21:07 2009 +0200 [release] post-release bump to 2.28.0 M configure.in -commit e351999e23467f2aab28a586feb6e5c4b7f666e3 (tag: GNOME_SESSION_2_27_92) -Author: Vincent Untz -AuthorDate: Wed Sep 9 02:20:56 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Sep 9 02:20:56 2009 +0200 +commit e351999e23467f2aab28a586feb6e5c4b7f666e3 +Author: Vincent Untz +Date: Wed Sep 9 02:20:56 2009 +0200 [release] 2.27.92 M NEWS commit 2b6d56f1ecb731c2589b3691588039e203a96547 -Author: Gabor Kelemen -AuthorDate: Wed Sep 9 00:07:35 2009 +0200 -Commit: Gabor Kelemen -CommitDate: Wed Sep 9 00:07:35 2009 +0200 +Author: Gabor Kelemen +Date: Wed Sep 9 00:07:35 2009 +0200 Hungarian translation updated M po/hu.po commit fe9491caab410adc4fd67e0aa41cc99250e0c144 -Author: Takayuki KUSANO -AuthorDate: Tue Sep 8 21:55:24 2009 +0900 -Commit: Takayuki KUSANO -CommitDate: Tue Sep 8 21:55:24 2009 +0900 +Author: Takayuki KUSANO +Date: Tue Sep 8 21:55:24 2009 +0900 Updated Japanese translation M po/ja.po commit f9c9d15a8e52f33ead6bdb152cdb7f1625888e94 -Author: Tomasz Dominikowski -AuthorDate: Mon Sep 7 19:27:40 2009 +0200 -Commit: Tomasz Dominikowski -CommitDate: Mon Sep 7 19:27:40 2009 +0200 +Author: Tomasz Dominikowski +Date: Mon Sep 7 19:27:40 2009 +0200 Updated Polish translation @@ -13674,30 +13011,24 @@ M po/pl.po commit a0bbbc47f744e0a05e5e2a0fd30b4b0e6c6e89c4 -Author: Ivar Smolin -AuthorDate: Sat Sep 5 09:09:23 2009 +0300 -Commit: Priit Laes -CommitDate: Sat Sep 5 09:09:23 2009 +0300 +Author: Ivar Smolin +Date: Sat Sep 5 09:09:23 2009 +0300 Updating Estonian translation M po/et.po commit 8cd3e07f63ff3550c76b81b14d366c3d9bdf1d3e -Author: Jamil Ahmed -AuthorDate: Sat Sep 5 02:27:05 2009 +0700 -Commit: Jamil Ahmed -CommitDate: Sat Sep 5 02:27:05 2009 +0700 +Author: Jamil Ahmed +Date: Sat Sep 5 02:27:05 2009 +0700 Updated Bengali translation M po/bn.po commit 5ff4c7c066e0f4d7146fff1ed236558bde074088 -Author: Lucas Rocha -AuthorDate: Mon Aug 24 23:46:59 2009 +0100 -Commit: Lucas Rocha -CommitDate: Wed Sep 2 20:02:52 2009 +0100 +Author: Lucas Rocha +Date: Mon Aug 24 23:46:59 2009 +0100 [compat] Remove at-spi-registryd wrapper @@ -13710,120 +13041,96 @@ M configure.in commit 3754f3ec17da34e058bfb5d098c8cbf9f5e3f0ad -Author: Alexander Nyakhaychyk -AuthorDate: Wed Sep 2 16:21:14 2009 +0300 -Commit: Alexander Nyakhaychyk -CommitDate: Wed Sep 2 16:21:14 2009 +0300 +Author: Alexander Nyakhaychyk +Date: Wed Sep 2 16:21:14 2009 +0300 Updated Belarusian translation M po/be.po commit e904a861bddc1f62123d32db626993e57cabb2e4 -Author: Baris Cicek -AuthorDate: Sun Aug 30 20:24:20 2009 +0300 -Commit: Baris Cicek -CommitDate: Sun Aug 30 20:24:20 2009 +0300 +Author: Baris Cicek +Date: Sun Aug 30 20:24:20 2009 +0300 Updated Turkish translation. M po/tr.po commit 12b002b62d7a4fe7fe3026a2585089039905097f -Author: Claude Paroz -AuthorDate: Fri Aug 28 15:48:21 2009 +0200 -Commit: Claude Paroz -CommitDate: Fri Aug 28 15:48:21 2009 +0200 +Author: Claude Paroz +Date: Fri Aug 28 15:48:21 2009 +0200 Updated French translation M po/fr.po commit b7f6fd3fd93de97718c54ce6703118fba99a5661 -Author: Runa Bhattacharjee -AuthorDate: Fri Aug 28 12:12:48 2009 +0530 -Commit: Runa Bhattacharjee -CommitDate: Fri Aug 28 12:12:48 2009 +0530 +Author: Runa Bhattacharjee +Date: Fri Aug 28 12:12:48 2009 +0530 Updated Bengali India Translations M po/bn_IN.po commit eb4d414fdfaf10120b9b327104d0a7dd07eaec05 -Author: Inaki Larranaga Murgoitio -AuthorDate: Wed Aug 26 21:07:10 2009 +0200 -Commit: dooteo -CommitDate: Wed Aug 26 21:07:10 2009 +0200 +Author: Inaki Larranaga Murgoitio +Date: Wed Aug 26 21:07:10 2009 +0200 Updated Basque language M po/eu.po commit f062559b171d77c2e5cd2ec54cb7dae70466d032 -Author: Denis Arnaud -AuthorDate: Wed Aug 26 14:50:39 2009 +0200 -Commit: Denis Arnaud -CommitDate: Wed Aug 26 14:50:39 2009 +0200 +Author: Denis Arnaud +Date: Wed Aug 26 14:50:39 2009 +0200 Updated breton translation M po/br.po commit 645cf60db649965a46afbbfec079d51817592716 -Author: Denis Arnaud -AuthorDate: Wed Aug 26 12:49:24 2009 +0200 -Commit: Denis Arnaud -CommitDate: Wed Aug 26 12:49:45 2009 +0200 +Author: Denis Arnaud +Date: Wed Aug 26 12:49:24 2009 +0200 Updated breton translation A po/br.po commit 777700f26deceef8745db78eab2f2cbbaa086467 -Author: Denis Arnaud -AuthorDate: Wed Aug 26 12:48:31 2009 +0200 -Commit: Denis Arnaud -CommitDate: Wed Aug 26 12:49:45 2009 +0200 +Author: Denis Arnaud +Date: Wed Aug 26 12:48:31 2009 +0200 Added br in LINGUAS M po/LINGUAS commit 6a3d758c2fedee32dc5b478911fb000a5b4363c2 -Author: Duarte Loreto -AuthorDate: Wed Aug 26 09:11:03 2009 +0100 -Commit: Duarte Loreto -CommitDate: Wed Aug 26 09:11:03 2009 +0100 +Author: Duarte Loreto +Date: Wed Aug 26 09:11:03 2009 +0100 Updated Portuguese translation M po/pt.po commit 7d91624fc898ad03c2cfb6d9508fabf3ce89bd38 -Author: Tomasz Dominikowski -AuthorDate: Tue Aug 25 18:40:37 2009 +0200 -Commit: Tomasz Dominikowski -CommitDate: Tue Aug 25 18:41:13 2009 +0200 +Author: Tomasz Dominikowski +Date: Tue Aug 25 18:40:37 2009 +0200 Updated Polish translation M po/pl.po commit ce52f2ed48759be7c8dd25b1994fc748259ff028 -Author: Vincent Untz -AuthorDate: Tue Aug 25 16:17:59 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Aug 25 16:17:59 2009 +0200 +Author: Vincent Untz +Date: Tue Aug 25 16:17:59 2009 +0200 [release] post-release bump to 2.27.92 M configure.in -commit 768f1c1af4e3da64939a322fcd15ef98273690e4 (tag: GNOME_SESSION_2_27_91) -Author: Vincent Untz -AuthorDate: Tue Aug 25 16:17:45 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Aug 25 16:17:45 2009 +0200 +commit 768f1c1af4e3da64939a322fcd15ef98273690e4 +Author: Vincent Untz +Date: Tue Aug 25 16:17:45 2009 +0200 [release] 2.27.91 @@ -13831,10 +13138,8 @@ M configure.in commit eca200b0f083ab9cf72c2887b83f86f3c79619a2 -Author: Matthias Clasen -AuthorDate: Tue Aug 25 16:08:17 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Aug 25 16:08:17 2009 +0200 +Author: Matthias Clasen +Date: Tue Aug 25 16:08:17 2009 +0200 [gsm] Port to PolicyKit 1 @@ -13848,10 +13153,8 @@ M gnome-session/gsm-consolekit.c commit e9c3b2a962729693b3e5a14f1bc5ca02b82e7bbd -Author: Frédéric Péters -AuthorDate: Sat Aug 22 13:45:39 2009 +0200 -Commit: Lucas Rocha -CommitDate: Mon Aug 24 23:19:02 2009 +0100 +Author: Frédéric Péters +Date: Sat Aug 22 13:45:39 2009 +0200 Remove deprecated Encoding key from desktop files @@ -13860,90 +13163,72 @@ M data/session-properties.desktop.in.in commit dfd2c46f52a6ee2d1d5cbc60388559105c0f258e -Author: Sweta Kothari -AuthorDate: Mon Aug 24 15:27:38 2009 +0530 -Commit: Sweta Kothari -CommitDate: Mon Aug 24 15:27:38 2009 +0530 +Author: Sweta Kothari +Date: Mon Aug 24 15:27:38 2009 +0530 Updated Gujarati Translations M po/gu.po commit c29bd528eacb737867bfaa52bcea2fafe3c2fff0 -Author: Theppitak Karoonboonyanan -AuthorDate: Sun Aug 23 16:25:38 2009 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Sun Aug 23 16:25:38 2009 +0700 +Author: Theppitak Karoonboonyanan +Date: Sun Aug 23 16:25:38 2009 +0700 Updated Thai translation. M po/th.po commit 1c0b7888e83a7083c3c7126a11314d9eea5e95d1 -Author: Theppitak Karoonboonyanan -AuthorDate: Sun Aug 23 13:46:27 2009 +0700 -Commit: Theppitak Karoonboonyanan -CommitDate: Sun Aug 23 13:46:27 2009 +0700 +Author: Theppitak Karoonboonyanan +Date: Sun Aug 23 13:46:27 2009 +0700 Updated Thai translation. M po/th.po commit 120976efccd718f144336a9fee2f436339ca62f4 -Author: Changwoo Ryu -AuthorDate: Sun Aug 23 05:56:28 2009 +0900 -Commit: Changwoo Ryu -CommitDate: Sun Aug 23 05:56:28 2009 +0900 +Author: Changwoo Ryu +Date: Sun Aug 23 05:56:28 2009 +0900 Update Korean translation M po/ko.po commit 1d78d6ab57b1a89e00c2eb8c452ccc82cd8fca20 -Author: Antón Méixome -AuthorDate: Wed Aug 19 16:21:34 2009 +0200 -Commit: Ignacio Casal Quinteiro -CommitDate: Wed Aug 19 16:21:34 2009 +0200 +Author: Antón Méixome +Date: Wed Aug 19 16:21:34 2009 +0200 Updated Galician Translation M po/gl.po commit 3baa870c367015748f15d84b800a651d89db0505 -Author: Alexander Shopov -AuthorDate: Fri Aug 14 08:19:22 2009 +0300 -Commit: Alexander Shopov -CommitDate: Fri Aug 14 08:19:22 2009 +0300 +Author: Alexander Shopov +Date: Fri Aug 14 08:19:22 2009 +0300 Updated Bulgarian translation M po/bg.po commit dc6890f037daff1d4634df257fbd356fc70a4644 -Author: Luca Ferretti -AuthorDate: Thu Aug 13 10:43:35 2009 +0200 -Commit: Luca Ferretti -CommitDate: Thu Aug 13 10:43:35 2009 +0200 +Author: Luca Ferretti +Date: Thu Aug 13 10:43:35 2009 +0200 Updated Italian translation M po/it.po commit 1bd6ae745008a4a92fccf3a701c006a464229ca6 -Author: Manoj Kumar Giri -AuthorDate: Wed Aug 12 17:23:21 2009 +0530 -Commit: Manoj Kumar Giri -CommitDate: Wed Aug 12 17:23:21 2009 +0530 +Author: Manoj Kumar Giri +Date: Wed Aug 12 17:23:21 2009 +0530 Updated Oriya Translation M po/or.po commit cd07d6d4276d0f3d1f400ae1577bc7d6e7d4b51c -Author: Javier Jardón -AuthorDate: Tue Aug 11 00:51:57 2009 +0100 -Commit: Lucas Rocha -CommitDate: Tue Aug 11 00:51:57 2009 +0100 +Author: Javier Jardón +Date: Tue Aug 11 00:51:57 2009 +0100 [all] Use accessor functions instead direct access @@ -13959,20 +13244,16 @@ M splash/splash-window.c commit cf6581a048a95cde191794b3405aa697b94e3e83 -Author: Antón Méixome -AuthorDate: Mon Aug 10 17:24:56 2009 +0200 -Commit: Gil Forcada -CommitDate: Mon Aug 10 17:24:56 2009 +0200 +Author: Antón Méixome +Date: Mon Aug 10 17:24:56 2009 +0200 Updated Galician translation M po/gl.po commit 32c5b09440d65a73a2b5e59b9347bdb7732661b5 -Author: Oskar Wallgren -AuthorDate: Fri Aug 7 12:40:13 2009 +0200 -Commit: Vincent Untz -CommitDate: Fri Aug 7 12:40:13 2009 +0200 +Author: Oskar Wallgren +Date: Fri Aug 7 12:40:13 2009 +0200 [gsm] Fix typo in debug message @@ -13981,70 +13262,56 @@ M gnome-session/gsm-session-save.c commit d7ac0d3844457b1c4616430e80ed47cba34dbbf5 -Author: Khaled Hosny -AuthorDate: Wed Aug 5 21:09:38 2009 +0300 -Commit: Khaled Hosny -CommitDate: Wed Aug 5 21:09:38 2009 +0300 +Author: Khaled Hosny +Date: Wed Aug 5 21:09:38 2009 +0300 Updated Arabic translation M po/ar.po commit 4ba46a7b25bc1248b2c9a1fb89b7dfe949e7c992 -Author: Kjartan Maraas -AuthorDate: Mon Aug 3 00:07:18 2009 +0200 -Commit: Kjartan Maraas -CommitDate: Mon Aug 3 00:07:18 2009 +0200 +Author: Kjartan Maraas +Date: Mon Aug 3 00:07:18 2009 +0200 Updated Norwegian bokmål translation. M po/nb.po commit cbcaa228f0036dfbfe10d177f429a67b054969b4 -Author: Djavan Fagundes -AuthorDate: Sat Aug 1 15:16:05 2009 -0400 -Commit: Og B. Maciel -CommitDate: Sat Aug 1 15:16:05 2009 -0400 +Author: Djavan Fagundes +Date: Sat Aug 1 15:16:05 2009 -0400 Updated Brazilian Portuguese translation. M po/pt_BR.po commit 7a1da980b0b1d050126a65efbaf0b0513327b896 -Author: Seán de Búrca -AuthorDate: Fri Jul 31 18:29:05 2009 -0600 -Commit: Seán de Búrca -CommitDate: Fri Jul 31 18:29:05 2009 -0600 +Author: Seán de Búrca +Date: Fri Jul 31 18:29:05 2009 -0600 Updated Irish translation M po/ga.po commit fea641b3be892be65b0c7ef2628268b0998c6408 -Author: Vincent Untz -AuthorDate: Thu Jul 30 13:38:25 2009 +0200 -Commit: Vincent Untz -CommitDate: Thu Jul 30 13:38:25 2009 +0200 +Author: Vincent Untz +Date: Thu Jul 30 13:38:25 2009 +0200 [gsm] Fix typo in commit 397cca3a that creates at stupid bug M gnome-session/gsm-presence.c commit 5f30f0376a45ecff4a22da481f992881e9565e2a -Author: Vincent Untz -AuthorDate: Wed Jul 29 14:06:50 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 14:06:50 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 14:06:50 2009 +0200 [build] Do not install gnome-splash.png unless --enable-splash is used M data/Makefile.am commit dbb0556ebd10d51926f2e21f14924c5505fd10f4 -Author: Vincent Untz -AuthorDate: Wed Jul 29 13:46:12 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 13:46:12 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 13:46:12 2009 +0200 [splash] Install desktop file in $(sysconfdir)/xdg/autostart @@ -14053,50 +13320,40 @@ M splash/Makefile.am commit 066e38e76365cbaaded52e3447fb87030e1556e7 -Author: Vincent Untz -AuthorDate: Wed Jul 29 04:20:47 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 04:20:47 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 04:20:47 2009 +0200 [release] post-release bump to 2.27.90 M configure.in -commit 0d92308a064b4680aad21dcd178c62e4b8e3fd17 (tag: GNOME_SESSION_2_27_5) -Author: Vincent Untz -AuthorDate: Wed Jul 29 04:20:34 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 04:20:34 2009 +0200 +commit 0d92308a064b4680aad21dcd178c62e4b8e3fd17 +Author: Vincent Untz +Date: Wed Jul 29 04:20:34 2009 +0200 [release] 2.27.5 M NEWS commit 2c6f43e38c739cd12bab1e22e7b17cccf90f6b30 -Author: Vincent Untz -AuthorDate: Wed Jul 29 04:17:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 04:17:07 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 04:17:07 2009 +0200 [build] Update POTFILES.skip M po/POTFILES.skip commit 3f3a5e3c5012b99c06b7c61513b0b792764f3740 -Author: Vincent Untz -AuthorDate: Wed Jul 29 04:13:53 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 04:13:53 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 04:13:53 2009 +0200 [build] Update POTFILES.in M po/POTFILES.in commit 5952b7a9efc11b631910688b531ed8176f89440a -Author: Richard Hughes -AuthorDate: Wed Jul 22 12:43:50 2009 +0100 -Commit: Vincent Untz -CommitDate: Wed Jul 29 03:50:50 2009 +0200 +Author: Richard Hughes +Date: Wed Jul 22 12:43:50 2009 +0100 [gsm] Port from gnome-power-manager to DeviceKit-power @@ -14108,10 +13365,8 @@ D gnome-session/gsm-power-manager.h commit 13fe15fc1ef8a08874ff7c61f1944ae55b0111ce -Author: Vincent Untz -AuthorDate: Tue Jun 30 15:48:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 02:36:09 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 30 15:48:07 2009 +0200 [gsm] Do not exit when the system bus restarts @@ -14123,20 +13378,16 @@ M gnome-session/gsm-consolekit.c commit c19a4e5b580e49d771dae0e653e32d422dd8fd9a -Author: Vincent Untz -AuthorDate: Wed Jul 29 00:08:36 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 00:09:18 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 29 00:08:36 2009 +0200 [misc] Update commit guidelines for referencing bugs M ChangeLog commit 397cca3a9e5a197860a819a4648bf5bd56969afd -Author: Vincent Untz -AuthorDate: Mon Jul 27 18:27:59 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 29 00:09:18 2009 +0200 +Author: Vincent Untz +Date: Mon Jul 27 18:27:59 2009 +0200 [gsm] Properly handle the case where the idle monitor doesn't exist @@ -14146,10 +13397,8 @@ M gnome-session/gsm-presence.c commit e6acbfbd0ecd32e371a7664622ad6c262878816a -Author: William Jon McCann -AuthorDate: Thu Jul 23 15:10:30 2009 -0400 -Commit: William Jon McCann -CommitDate: Thu Jul 23 15:10:30 2009 -0400 +Author: William Jon McCann +Date: Thu Jul 23 15:10:30 2009 -0400 Add Presence interface to the documentation @@ -14158,30 +13407,24 @@ M doc/dbus/gnome-session.xml.in commit 872421f8387ee00f53c617fae147394667ebec23 -Author: Daniel Nylander -AuthorDate: Wed Jul 22 13:53:07 2009 +0200 -Commit: Daniel Nylander -CommitDate: Wed Jul 22 13:53:07 2009 +0200 +Author: Daniel Nylander +Date: Wed Jul 22 13:53:07 2009 +0200 Updated Swedish translation M po/sv.po commit 8b7d16e9f70f0cfc2795b6506812f0da7cc435f4 -Author: Yaron Sharabani -AuthorDate: Wed Jul 22 01:14:05 2009 +0300 -Commit: Yair Hershkovitz -CommitDate: Wed Jul 22 01:14:05 2009 +0300 +Author: Yaron Sharabani +Date: Wed Jul 22 01:14:05 2009 +0300 Updated Hebrew translation M po/he.po commit e6327dde5743f38e37a29d7a5d44f13346a31900 -Author: Vincent Untz -AuthorDate: Tue Jul 21 19:33:45 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 19:33:45 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 19:33:45 2009 +0200 [build] Set m4/ as macro dir @@ -14189,10 +13432,8 @@ M configure.in commit c466244f609bdcc220b43aa5f7db81afb74a954f -Author: Vincent Untz -AuthorDate: Tue Jul 21 18:47:47 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 18:47:47 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 18:47:47 2009 +0200 [build] Remove shave scripts @@ -14200,10 +13441,8 @@ D shave.in commit 1538f59bd47e3755fbb6fbf93c77c16541cb5bc1 -Author: Vincent Untz -AuthorDate: Tue Jul 21 18:43:43 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 18:43:43 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 18:43:43 2009 +0200 [build] Add --enable-splash configure option to build splash @@ -14213,20 +13452,16 @@ M configure.in commit 9d4f73747615c2134141ec43c2165df7265433e5 -Author: Vincent Untz -AuthorDate: Tue Jul 21 18:37:48 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 18:37:48 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 18:37:48 2009 +0200 [build] Fix make clean and distcheck after --with-default-wm change M data/Makefile.am commit 0d206e3ef18617c2bc7d9da2b5ca5024ea503a8f -Author: Vincent Untz -AuthorDate: Tue Jul 21 18:29:56 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 18:29:56 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 18:29:56 2009 +0200 [build] Use silent-rules instead of shave for quiet build @@ -14239,10 +13474,8 @@ M splash/Makefile.am commit 61e46f29f0f23a119d665f5d670821137cbdcbf5 -Author: Vincent Untz -AuthorDate: Tue Jul 21 18:11:09 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 18:11:09 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 18:11:09 2009 +0200 [build,gnome-wm] Add --with-default-wm configure option @@ -14257,10 +13490,8 @@ R099 data/gnome-session.schemas.in data/gnome-session.schemas.in.in commit 0831c925b675f84a4258c1b9ebb6c46d1dadca13 -Author: Vincent Untz -AuthorDate: Tue Jul 21 15:57:02 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jul 21 15:58:21 2009 +0200 +Author: Vincent Untz +Date: Tue Jul 21 15:57:02 2009 +0200 [gnome-wm] Prefer compiz-manager over compiz when available @@ -14270,60 +13501,48 @@ M data/gnome-wm commit 1a6c20518ea3492698c1a2bf328313f2295259e7 -Author: Ivar Smolin -AuthorDate: Mon Jul 20 15:03:49 2009 +0300 -Commit: Priit Laes -CommitDate: Mon Jul 20 15:03:49 2009 +0300 +Author: Ivar Smolin +Date: Mon Jul 20 15:03:49 2009 +0300 Updating Estonian translation M po/et.po commit 2efadd90181bd72942ad1df5e6b606cf985e25b4 -Author: Ilkka Tuohela -AuthorDate: Sun Jul 19 10:34:02 2009 +0300 -Commit: Ilkka Tuohela -CommitDate: Sun Jul 19 10:34:02 2009 +0300 +Author: Ilkka Tuohela +Date: Sun Jul 19 10:34:02 2009 +0300 Updated Finnish translation M po/fi.po commit 46bb8740501ac67aa1e07fb15ed9f858a495bd34 -Author: drtvasudevan -AuthorDate: Sat Jul 18 21:38:37 2009 +0530 -Commit: drtvasudevan -CommitDate: Sat Jul 18 21:39:00 2009 +0530 +Author: drtvasudevan +Date: Sat Jul 18 21:38:37 2009 +0530 Updated Tamil translation M po/ta.po commit f570f18609b9f3894604cc96a9ee6e68b37a4ec8 -Author: Jorge González -AuthorDate: Sat Jul 18 13:48:25 2009 +0200 -Commit: Jorge González -CommitDate: Sat Jul 18 13:48:25 2009 +0200 +Author: Jorge González +Date: Sat Jul 18 13:48:25 2009 +0200 Updated Spanish translation M po/es.po commit 34c9b79ca20548db1f4384269d351b548701fef5 -Author: Vincent Untz -AuthorDate: Wed Jul 15 17:11:08 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 15 17:11:08 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 15 17:11:08 2009 +0200 [release] post-release bump to 2.27.5 M configure.in -commit 32a806bf3c1f7d81bfd661e150ca06dfe8d7ff3b (tag: GNOME_SESSION_2_27_4) -Author: Vincent Untz -AuthorDate: Wed Jul 15 17:11:00 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 15 17:11:00 2009 +0200 +commit 32a806bf3c1f7d81bfd661e150ca06dfe8d7ff3b +Author: Vincent Untz +Date: Wed Jul 15 17:11:00 2009 +0200 [release] 2.27.4 @@ -14331,20 +13550,16 @@ M configure.in commit 7bec6b76763a2516aa724df3eec0791fc106fbc6 -Author: Vincent Untz -AuthorDate: Wed Jul 15 17:07:29 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 15 17:07:29 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 15 17:07:29 2009 +0200 [build] Update POTFILES.in M po/POTFILES.in commit 24c38dd23c9d22a0bc281b02d2925c0a9ee165e1 -Author: Caolan McNamara -AuthorDate: Wed Jul 15 00:47:01 2009 +0100 -Commit: Lucas Rocha -CommitDate: Wed Jul 15 00:47:01 2009 +0100 +Author: Caolan McNamara +Date: Wed Jul 15 00:47:01 2009 +0100 [gsm] Return RESTART_IF_RUNNING if restart is undefined @@ -14354,10 +13569,8 @@ M gnome-session/gsm-xsmp-client.c commit a26ad805370ff9b84e4c3c954985bd10264fa97a -Author: Caolan McNamara -AuthorDate: Wed Jul 15 00:46:33 2009 +0100 -Commit: Lucas Rocha -CommitDate: Wed Jul 15 00:46:33 2009 +0100 +Author: Caolan McNamara +Date: Wed Jul 15 00:46:33 2009 +0100 [gsm] Honour the SmRestartNever SmRestartStyleHint @@ -14366,10 +13579,8 @@ M gnome-session/gsm-xsmp-client.c commit 81d38cee8f0b624b0ad665f9812179923b2826f0 -Author: Matthias Clasen -AuthorDate: Tue Jul 14 21:36:58 2009 +0100 -Commit: Lucas Rocha -CommitDate: Tue Jul 14 21:36:58 2009 +0100 +Author: Matthias Clasen +Date: Tue Jul 14 21:36:58 2009 +0100 [gsm] avoid pointless warnings @@ -14378,80 +13589,64 @@ M gnome-session/gs-idle-monitor.c commit 071f8e0de56613a4901cd50b89a542d4329c4f1d -Author: Mark Krapivner -AuthorDate: Sat Jul 4 19:13:47 2009 +0300 -Commit: Mark Krapivner -CommitDate: Sat Jul 4 19:13:47 2009 +0300 +Author: Mark Krapivner +Date: Sat Jul 4 19:13:47 2009 +0300 Updated Hebrew translation M po/he.po commit a2a64c847464413394206a421407aec2b34b1171 -Author: Ivar Smolin -AuthorDate: Thu Jul 2 05:25:57 2009 +0300 -Commit: Priit Laes -CommitDate: Thu Jul 2 05:25:57 2009 +0300 +Author: Ivar Smolin +Date: Thu Jul 2 05:25:57 2009 +0300 Updating Estonian translation M po/et.po commit cd0174971ab40569d8e2ef7e2987f7db5ceb7a7d -Author: Maxim V. Dziumanenko -AuthorDate: Wed Jul 1 23:13:07 2009 +0300 -Commit: Maxim V. Dziumanenko -CommitDate: Wed Jul 1 23:13:07 2009 +0300 +Author: Maxim V. Dziumanenko +Date: Wed Jul 1 23:13:07 2009 +0300 Updated Ukrainian translation M po/uk.po commit 07bb95dae388b8f8706551a3287ace391c8b1446 -Author: Vincent Untz -AuthorDate: Wed Jul 1 14:43:29 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jul 1 15:11:24 2009 +0200 +Author: Vincent Untz +Date: Wed Jul 1 14:43:29 2009 +0200 [build] Fix distclean M doc/dbus/Makefile.am commit 88417d33170b0d64f902847b30f0990dbc0d7f6a -Author: Jorge Gonzalez -AuthorDate: Tue Jun 30 20:38:01 2009 +0200 -Commit: Jorge Gonzalez -CommitDate: Tue Jun 30 20:38:01 2009 +0200 +Author: Jorge Gonzalez +Date: Tue Jun 30 20:38:01 2009 +0200 Updated Spanish translation M po/es.po commit 0c05b13b39e4ae67f24f813bcefa421aa93d33fd -Author: Vincent Untz -AuthorDate: Tue Jun 30 00:31:45 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 30 00:31:45 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 30 00:31:45 2009 +0200 [gsm] Also emit GsmConsoleKit signals when CK is not available M gnome-session/gsm-consolekit.c commit 3fb4606db4ca80375a7114bb01672da06c1c6cce -Author: Vincent Untz -AuthorDate: Tue Jun 30 00:31:17 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 30 00:31:17 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 30 00:31:17 2009 +0200 [gsm] Make Restart and Stop code paths more similar M gnome-session/gsm-consolekit.c commit d7d117a764619eddfa1243cdb78fe079b12f2592 -Author: Bill Nottingham -AuthorDate: Tue Jun 30 00:21:01 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 30 00:21:01 2009 +0200 +Author: Bill Nottingham +Date: Tue Jun 30 00:21:01 2009 +0200 [gsm] Make gnome-session exit properly on reboot/shutdown @@ -14463,10 +13658,8 @@ M gnome-session/gsm-consolekit.c commit 52c9e79663be6a99e75a4ac8bb95c0a4e46aa4ed -Author: Daniel Macks -AuthorDate: Tue Jun 30 00:05:13 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 30 00:05:13 2009 +0200 +Author: Daniel Macks +Date: Tue Jun 30 00:05:13 2009 +0200 [build] Add missing includes @@ -14477,30 +13670,24 @@ M gnome-session/gs-idle-monitor.c commit 20d7de29b6ca2d319503014feab099a492171794 -Author: Jon Nettleton -AuthorDate: Mon Jun 29 23:51:02 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 23:51:02 2009 +0200 +Author: Jon Nettleton +Date: Mon Jun 29 23:51:02 2009 +0200 [gnome-wm] Add mutter support M data/gnome-wm commit 4b169b5cf3513cafbb874064011a3cd31261fe29 -Author: Vincent Untz -AuthorDate: Mon Jun 29 23:46:55 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 23:46:55 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 29 23:46:55 2009 +0200 [egg] Update smclient code from libegg M egg/eggdesktopfile.c commit bab0c77807041c52131bf7d70103ba3893fea9a2 -Author: Alexis Ballier -AuthorDate: Fri Jun 26 21:42:41 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 23:29:43 2009 +0200 +Author: Alexis Ballier +Date: Fri Jun 26 21:42:41 2009 +0200 [build] Fix build on systems without execinfo @@ -14517,10 +13704,8 @@ M gnome-session/gdm-signal-handler.c commit 6532e037e0f0a6d4db3d846fbdbd9da27f941d4c -Author: Vincent Untz -AuthorDate: Mon Jun 29 23:01:32 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 23:01:32 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 29 23:01:32 2009 +0200 [build] Correctly use CFLAGS and LIBS for SM/ICE build flags @@ -14531,10 +13716,8 @@ M egg/Makefile.am commit fb300d7c90c5de17ca6249d2c806e86299a48b3f -Author: Vincent Untz -AuthorDate: Mon Jun 29 22:58:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 22:58:33 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 29 22:58:07 2009 +0200 [egg] Update smclient code from libegg @@ -14544,10 +13727,8 @@ M egg/eggsmclient.c commit f0be9f71bca86c111d31794bdb3ef3ba792838db -Author: Vincent Untz -AuthorDate: Wed Jun 24 23:44:41 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 22:58:33 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 23:44:41 2009 +0200 [gsm] Use defines for GKeyFile keys we use @@ -14559,10 +13740,8 @@ M gnome-session/gsm-xsmp-client.c commit 9b405c1516d41839383ae19cbef288eb4c22e3a8 -Author: Vincent Untz -AuthorDate: Wed Jun 24 23:41:32 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 29 22:58:33 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 23:41:32 2009 +0200 [gsm] Load default apps after saved and autostart apps @@ -14573,50 +13752,40 @@ M gnome-session/main.c commit 2e89b36f7a1fd83735a31505f917b0b3737914e9 -Author: Jorge Gonzalez -AuthorDate: Sat Jun 27 15:01:55 2009 +0200 -Commit: Jorge Gonzalez -CommitDate: Sat Jun 27 15:01:55 2009 +0200 +Author: Jorge Gonzalez +Date: Sat Jun 27 15:01:55 2009 +0200 Updated Spanish translation M po/es.po commit 085ed86f44976aa6af98d28a13d794d60d526493 -Author: Mattias Põldaru -AuthorDate: Thu Jun 25 14:18:29 2009 +0300 -Commit: Priit Laes -CommitDate: Thu Jun 25 14:18:29 2009 +0300 +Author: Mattias Põldaru +Date: Thu Jun 25 14:18:29 2009 +0300 Updating Estonian translation M po/et.po commit 4c5ae995285ae866db4ad17dfc7b1cae0783db5b -Author: Vincent Untz -AuthorDate: Wed Jun 24 01:19:00 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jun 24 01:19:00 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 01:19:00 2009 +0200 [capplet] Plug leaks M capplet/gsp-app.c commit 08b1fa271219aebf72f321abb3196b320690d9ed -Author: Vincent Untz -AuthorDate: Wed Jun 24 01:18:39 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jun 24 01:18:46 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 01:18:39 2009 +0200 [capplet] Also compare Icon key when comparing user/system files M capplet/gsp-app.c commit c34f21bb728900637b0d0236192e700a48e772ef -Author: Vincent Untz -AuthorDate: Wed Jun 24 01:11:52 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jun 24 01:11:52 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 01:11:52 2009 +0200 [capplet] Make the icon and text sensitive/insensitive @@ -14625,10 +13794,8 @@ M capplet/gsm-properties-dialog.c commit 29205aec38469c54a099552f82b3932a15b3d039 -Author: Vincent Untz -AuthorDate: Wed Jun 24 00:48:23 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Jun 24 00:48:23 2009 +0200 +Author: Vincent Untz +Date: Wed Jun 24 00:48:23 2009 +0200 [capplet] Make the treeview a drag source @@ -14643,10 +13810,8 @@ M capplet/gsp-app.h commit a8014dc330b8b6e8b7e1028534a30bca588f3a25 -Author: Vincent Untz -AuthorDate: Tue Jun 23 23:24:15 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 23:46:38 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 23:24:15 2009 +0200 [capplet] Fix bug where editing an app and quickly exiting didn't work @@ -14660,10 +13825,8 @@ M capplet/gsp-app.c commit 4829dafee3f3a76564b4ac4f4d23d81ff43e05a2 -Author: Vincent Untz -AuthorDate: Tue Jun 23 18:05:37 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 18:05:37 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 18:05:37 2009 +0200 [capplet] Make GspApp use GIcon and get rid of the pixbuf/icon-name @@ -14676,10 +13839,8 @@ M capplet/gsp-app.h commit 377b5885d0cfb5920e72f8e7d88aed62c995c54b -Author: Vincent Untz -AuthorDate: Tue Jun 23 17:53:56 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 17:53:56 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 17:53:56 2009 +0200 [capplet] Fix crash when the user file becomes identical to system one @@ -14690,10 +13851,8 @@ M capplet/gsp-app-manager.c commit 760db1b13b6f3b917a4544347192675ae5c83639 -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:55:47 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:57:37 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:55:47 2009 +0200 [capplet] Stop drag_data_received signal after handling the drop @@ -14703,30 +13862,24 @@ M capplet/gsm-properties-dialog.c commit 6d88b68e6e242795d6073eddcc520483599b38ad -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:50:51 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:52:21 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:50:51 2009 +0200 [capplet] Use gtk_selection_data_get_uris() to simplify code M capplet/gsm-properties-dialog.c commit ba292b37844994d0a71de2e779837221d6f9f238 -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:43:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:43:07 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:43:07 2009 +0200 [capplet] Use gtk_drag_dest_add_uri_targets() to simplify code M capplet/gsm-properties-dialog.c commit 863e6a05dbc1be0d4145acc44a81daba04a782b6 -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:27:48 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:27:48 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:27:48 2009 +0200 [capplet] Make g-s-p return 0 when using --version @@ -14735,10 +13888,8 @@ M capplet/main.c commit 5285037eb9a022581e4921b13c7d1ed032afb045 -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:26:47 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:26:47 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:26:47 2009 +0200 [capplet,gsm] Use the right translation domain for GtkBuilder @@ -14747,10 +13898,8 @@ M gnome-session/gsm-inhibit-dialog.c commit 4c87949443e9c9bc525484ef6a5713c4fd1410e4 -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:17:39 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:17:39 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:17:39 2009 +0200 [capplet] Make GspApp independent of GTK+ @@ -14762,10 +13911,8 @@ M capplet/gsp-app.h commit 64b2dfa36a1b5865906106f0059a185768b859af -Author: Vincent Untz -AuthorDate: Tue Jun 23 14:07:09 2009 +0200 -Commit: Vincent Untz -CommitDate: Tue Jun 23 14:07:09 2009 +0200 +Author: Vincent Untz +Date: Tue Jun 23 14:07:09 2009 +0200 [capplet] Make it clear that some GstApp API is private @@ -14775,10 +13922,8 @@ M capplet/gsp-app.h commit 5c6c3e8f8ee6599bf124cf976ce4d339cfeabe71 -Author: Vincent Untz -AuthorDate: Mon Jun 22 19:55:02 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 22 19:55:02 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 22 19:55:02 2009 +0200 [gsm] Do not print NULL on error @@ -14788,10 +13933,8 @@ M gnome-session/gsm-autostart-app.c commit 20e6c0d459351926261b232cfbaf4d704bf997da -Author: Vincent Untz -AuthorDate: Mon Jun 22 01:16:02 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 22 01:16:02 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 22 01:16:02 2009 +0200 [capplet] Add help button to the capplet @@ -14799,10 +13942,8 @@ M capplet/main.c commit 3c6baf8ac65200db0d40f547b27b0301bd114962 -Author: Vincent Untz -AuthorDate: Mon Jun 22 01:14:09 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Jun 22 01:14:09 2009 +0200 +Author: Vincent Untz +Date: Mon Jun 22 01:14:09 2009 +0200 [capplet,gsm] Port to GtkBuilder and remove glade dependency @@ -14822,10 +13963,8 @@ M po/POTFILES.in commit fe9f11b9bfefb3f12b048118a003b1c5ca6a9d38 -Author: Vincent Untz -AuthorDate: Sun Jun 21 17:09:21 2009 +0200 -Commit: Vincent Untz -CommitDate: Sun Jun 21 17:09:21 2009 +0200 +Author: Vincent Untz +Date: Sun Jun 21 17:09:21 2009 +0200 [capplet] Big rework of the code to clean it up, fix bugs, etc. @@ -14854,20 +13993,16 @@ A capplet/gsp-keyfile.h commit 60d5b4828baec090a4e83bb910c107e38d4230b6 -Author: Mark Krapivner -AuthorDate: Fri Jun 12 11:41:14 2009 +0300 -Commit: Mark Krapivner -CommitDate: Fri Jun 12 11:41:14 2009 +0300 +Author: Mark Krapivner +Date: Fri Jun 12 11:41:14 2009 +0300 Updated Hebrew translation M po/he.po commit b5a4e9cba002172fe017b78abfd9214b02657074 -Author: Matthias Clasen -AuthorDate: Tue May 26 10:53:04 2009 -0400 -Commit: Matthias Clasen -CommitDate: Tue May 26 10:53:04 2009 -0400 +Author: Matthias Clasen +Date: Tue May 26 10:53:04 2009 -0400 Generate docs for the presence API @@ -14876,90 +14011,72 @@ M doc/dbus/Makefile.am commit 48aa21662245926b7066979c5104f02c565cd7f3 -Author: Ask H. Larsen -AuthorDate: Wed May 13 00:23:43 2009 +0200 -Commit: Kenneth Nielsen -CommitDate: Wed May 13 00:23:43 2009 +0200 +Author: Ask H. Larsen +Date: Wed May 13 00:23:43 2009 +0200 "Updated Danish translation" M po/da.po commit fb334aa4b9d4ddcbcf1d3b7880e55035b570634d -Author: krishnababu k -AuthorDate: Mon May 11 14:10:33 2009 +0530 -Commit: krishnababu k -CommitDate: Mon May 11 14:10:33 2009 +0530 +Author: krishnababu k +Date: Mon May 11 14:10:33 2009 +0530 Updated Telugu translation M po/te.po commit 7268ccc98c497118b97db7201552e68df82224ee -Author: krishnababu k -AuthorDate: Mon May 11 14:08:58 2009 +0530 -Commit: krishnababu k -CommitDate: Mon May 11 14:08:58 2009 +0530 +Author: krishnababu k +Date: Mon May 11 14:08:58 2009 +0530 Updated Telugu translation M po/te.po commit 3d5f0b48a2871c9f5450f02667dee8ed4307823d -Author: Jorge Gonzalez -AuthorDate: Tue May 5 08:08:45 2009 +0200 -Commit: Jorge Gonzalez -CommitDate: Tue May 5 08:08:45 2009 +0200 +Author: Jorge Gonzalez +Date: Tue May 5 08:08:45 2009 +0200 Updated Spanish translation M po/es.po commit 937a20dbcfa3c80c5551147f5ed726a6b34b944d -Author: Jorge Gonzalez -AuthorDate: Tue May 5 07:46:36 2009 +0200 -Commit: Jorge Gonzalez -CommitDate: Tue May 5 07:46:36 2009 +0200 +Author: Jorge Gonzalez +Date: Tue May 5 07:46:36 2009 +0200 Updated Spanish translation M po/es.po commit 8b9df401a100a24e03360515ffbe81e62cbbee53 -Author: Christian Kirbach -AuthorDate: Mon May 4 23:22:53 2009 +0200 -Commit: Christian Kirbach -CommitDate: Mon May 4 23:26:32 2009 +0200 +Author: Christian Kirbach +Date: Mon May 4 23:22:53 2009 +0200 [master] Updated German translation. M po/de.po commit f5e6fd5f6703e44b628cc471d3bc5961a71b3e27 -Author: Ivar Smolin -AuthorDate: Sun May 3 11:59:10 2009 +0300 -Commit: Priit Laes -CommitDate: Sun May 3 11:59:10 2009 +0300 +Author: Ivar Smolin +Date: Sun May 3 11:59:10 2009 +0300 Updating Estonian translation M po/et.po commit d98b4054ebbc0161f37b313324661bde444c39e7 -Author: Vincent Untz -AuthorDate: Sat May 2 02:23:59 2009 +0200 -Commit: Vincent Untz -CommitDate: Sat May 2 02:23:59 2009 +0200 +Author: Vincent Untz +Date: Sat May 2 02:23:59 2009 +0200 Update commit messages guidelines M ChangeLog commit 23c94651ce9ae5297db2cdb9ac084b57652d08b8 -Author: Vincent Untz -AuthorDate: Mon Apr 27 00:32:07 2009 +0200 -Commit: Vincent Untz -CommitDate: Sat May 2 02:21:36 2009 +0200 +Author: Vincent Untz +Date: Mon Apr 27 00:32:07 2009 +0200 Update MAINTAINERCLEANFILES @@ -14969,20 +14086,16 @@ M Makefile.am commit 099f9d7d333d5b6a9a83f64315f0997e07bacf3b -Author: Vincent Untz -AuthorDate: Mon Apr 27 00:31:26 2009 +0200 -Commit: Vincent Untz -CommitDate: Sat May 2 02:21:35 2009 +0200 +Author: Vincent Untz +Date: Mon Apr 27 00:31:26 2009 +0200 Update git.mk from pango M git.mk commit bfeb69db2ee8bd08a5184a35fa17b78072e65975 -Author: Vincent Untz -AuthorDate: Fri Apr 24 04:41:57 2009 +0200 -Commit: Vincent Untz -CommitDate: Sat May 2 02:21:35 2009 +0200 +Author: Vincent Untz +Date: Fri Apr 24 04:41:57 2009 +0200 Use git.mk from pango to autogenerate .gitignore files @@ -15007,10 +14120,8 @@ M tools/Makefile.am commit 64c0b0d52f7740a3a23e1849e6cb57422359a7cb -Author: gheet -AuthorDate: Thu Apr 30 17:39:48 2009 +0100 -Commit: gheet -CommitDate: Thu Apr 30 17:39:48 2009 +0100 +Author: gheet +Date: Thu Apr 30 17:39:48 2009 +0100 Modified a g_debug for on_client_end_session_response() not to crash when a null pointer is encountered on Solaris. bugzilla #580824 comment#7. @@ -15018,10 +14129,8 @@ M gnome-session/gsm-manager.c commit 25604393fccdc2359bbd3c82fb088bbdc296fb89 -Author: Vincent Untz -AuthorDate: Mon Apr 27 01:10:41 2009 +0200 -Commit: Vincent Untz -CommitDate: Mon Apr 27 01:10:41 2009 +0200 +Author: Vincent Untz +Date: Mon Apr 27 01:10:41 2009 +0200 Remove .cvsignore files @@ -15030,30 +14139,24 @@ D po/.cvsignore commit bf17890d6d5714405e68c7e5b01656f7c9289ad6 -Author: Vincent Untz -AuthorDate: Sun Apr 26 12:25:38 2009 +0200 -Commit: Vincent Untz -CommitDate: Sun Apr 26 12:25:38 2009 +0200 +Author: Vincent Untz +Date: Sun Apr 26 12:25:38 2009 +0200 Fix doap file to have mail address as URL (mailto:) M gnome-session.doap commit e1912704cda45033484d63898ca1c4be25ff3d43 -Author: Ivar Smolin -AuthorDate: Sat Apr 25 18:18:29 2009 +0300 -Commit: Priit Laes -CommitDate: Sat Apr 25 18:18:29 2009 +0300 +Author: Ivar Smolin +Date: Sat Apr 25 18:18:29 2009 +0300 Updating Estonian translation M po/et.po commit 357034cee626d345dc3f931847aa3414cec2bb8a -Author: Vincent Untz -AuthorDate: Fri Apr 24 04:02:48 2009 +0200 -Commit: Vincent Untz -CommitDate: Fri Apr 24 04:13:19 2009 +0200 +Author: Vincent Untz +Date: Fri Apr 24 04:02:48 2009 +0200 Use shave to improve build log readability @@ -15069,20 +14172,16 @@ M splash/Makefile.am commit b754b094b85b85f437fc55d8a51d694abb5041a2 -Author: Vincent Untz -AuthorDate: Fri Apr 24 03:24:50 2009 +0200 -Commit: Vincent Untz -CommitDate: Fri Apr 24 04:13:19 2009 +0200 +Author: Vincent Untz +Date: Fri Apr 24 03:24:50 2009 +0200 Make autogen.sh more modern. M autogen.sh commit 0ca3f5f4dec579f5943368fda55aa1597932b394 -Author: Matthias Clasen -AuthorDate: Thu Apr 23 21:45:41 2009 -0400 -Commit: Matthias Clasen -CommitDate: Thu Apr 23 21:45:41 2009 -0400 +Author: Matthias Clasen +Date: Thu Apr 23 21:45:41 2009 -0400 Reduce GConf roundtrips @@ -15092,10 +14191,8 @@ M gnome-session/gsm-autostart-app.c commit 06bb9270b1797485267bad78042ef39ec91c8282 -Author: Matthias Clasen -AuthorDate: Thu Apr 23 21:42:59 2009 -0400 -Commit: Matthias Clasen -CommitDate: Thu Apr 23 21:42:59 2009 -0400 +Author: Matthias Clasen +Date: Thu Apr 23 21:42:59 2009 -0400 Reduce GConf roundtrips @@ -15105,20 +14202,16 @@ M gnome-session/gsm-manager.c commit 8a339a5ea3f8791dac95343f0c91c72f6bdb4dc8 -Author: Vincent Untz -AuthorDate: Wed Apr 22 17:28:38 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Apr 22 17:29:53 2009 +0200 +Author: Vincent Untz +Date: Wed Apr 22 17:28:38 2009 +0200 Add doap file A gnome-session.doap commit c635fd9ff78e2e07973a3c855d067e326d648503 -Author: Vincent Untz -AuthorDate: Wed Apr 22 17:27:30 2009 +0200 -Commit: Vincent Untz -CommitDate: Wed Apr 22 17:29:53 2009 +0200 +Author: Vincent Untz +Date: Wed Apr 22 17:27:30 2009 +0200 Rename ChangeLog files to ChangeLog.pre-git @@ -15127,10 +14220,8 @@ R100 po/ChangeLog po/ChangeLog.pre-git commit d75edd1fedbfeb174352c30316ceff9338b4ee82 -Author: Miquel Esplà -AuthorDate: Tue Apr 21 15:10:41 2009 +0200 -Commit: Gil Forcada -CommitDate: Tue Apr 21 15:10:41 2009 +0200 +Author: Miquel Esplà +Date: Tue Apr 21 15:10:41 2009 +0200 Added Valencian-Catalan translation @@ -15138,20 +14229,16 @@ A po/ca@valencia.po commit ddf79a3e99ddecb8298a7d7ec0d664c8d99086ab -Author: Khaled Hosny -AuthorDate: Sat Apr 18 22:19:09 2009 +0200 -Commit: Khaled Hosny -CommitDate: Sat Apr 18 22:19:09 2009 +0200 +Author: Khaled Hosny +Date: Sat Apr 18 22:19:09 2009 +0200 Updated Arabic translation M po/ar.po commit 41f6df6ffd8ea0f1ea4b83b524ea0c6e41767ec3 -Author: Vincent Untz -AuthorDate: Tue Apr 14 16:33:36 2009 +0000 -Commit: Vincent Untz -CommitDate: Tue Apr 14 16:33:36 2009 +0000 +Author: Vincent Untz +Date: Tue Apr 14 16:33:36 2009 +0000 post-release bump to 2.26.2 diff -Nru gnome-session-3.9.90/config.guess gnome-session-3.14.0/config.guess --- gnome-session-3.9.90/config.guess 2013-03-19 17:22:45.000000000 +0000 +++ gnome-session-3.14.0/config.guess 2014-09-22 14:19:24.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -26,7 +24,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -136,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -809,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -857,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -884,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -955,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1235,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1338,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 < header file. */ #undef HAVE_MEMORY_H +/* Define if we have an older upower */ +#undef HAVE_OLD_UPOWER + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -72,9 +75,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the header file. */ -#undef HAVE_X11_XTRANS_XTRANS_H - /* Have the Render X extension */ #undef HAVE_XRENDER @@ -84,13 +84,13 @@ /* Have the XTest extension library */ #undef HAVE_XTEST +/* Have the X Transport library */ +#undef HAVE_XTRANS + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -Nru gnome-session-3.9.90/config.sub gnome-session-3.14.0/config.sub --- gnome-session-3.9.90/config.sub 2013-03-19 17:22:45.000000000 +0000 +++ gnome-session-3.14.0/config.sub 2014-09-22 14:19:24.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012, 2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -70,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -2012, 2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -256,12 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -269,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -286,20 +283,22 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -327,7 +326,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -369,13 +368,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -384,6 +383,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,18 +403,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -796,7 +800,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -824,6 +828,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -832,7 +840,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1354,7 +1362,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1369,14 +1377,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1500,9 +1508,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1551,6 +1556,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; diff -Nru gnome-session-3.9.90/configure gnome-session-3.14.0/configure --- gnome-session-3.9.90/configure 2013-08-20 14:50:05.000000000 +0000 +++ gnome-session-3.14.0/configure 2014-09-22 14:19:23.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-session 3.9.90. +# Generated by GNU Autoconf 2.69 for gnome-session 3.14.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-session' PACKAGE_TARNAME='gnome-session' -PACKAGE_VERSION='3.9.90' -PACKAGE_STRING='gnome-session 3.9.90' +PACKAGE_VERSION='3.14.0' +PACKAGE_STRING='gnome-session 3.14.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session' PACKAGE_URL='' @@ -637,6 +637,9 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAVE_XTRANS +XTRANS_LIBS +XTRANS_CFLAGS EXECINFO_LIBS GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -726,6 +729,10 @@ X11_CFLAGS SESSION_PROPERTIES_LIBS SESSION_PROPERTIES_CFLAGS +HAVE_OLD_UPOWER_FALSE +HAVE_OLD_UPOWER_TRUE +UPOWER_LIBS +UPOWER_CFLAGS GNOME_SESSION_LIBS GNOME_SESSION_CFLAGS GTK3_LIBS @@ -883,6 +890,7 @@ enable_man enable_nls enable_schemas_compile +with_xtrans enable_ipv6 ' ac_precious_vars='build_alias @@ -907,6 +915,8 @@ GTK3_LIBS GNOME_SESSION_CFLAGS GNOME_SESSION_LIBS +UPOWER_CFLAGS +UPOWER_LIBS SESSION_PROPERTIES_CFLAGS SESSION_PROPERTIES_LIBS X11_CFLAGS @@ -930,7 +940,9 @@ XTEST_CFLAGS XTEST_LIBS XRENDER_CFLAGS -XRENDER_LIBS' +XRENDER_LIBS +XTRANS_CFLAGS +XTRANS_LIBS' # Initialize some variables set by options. @@ -1471,7 +1483,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gnome-session 3.9.90 to adapt to many kinds of systems. +\`configure' configures gnome-session 3.14.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1541,7 +1553,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-session 3.9.90:";; + short | recursive ) echo "Configuration of gnome-session 3.14.0:";; esac cat <<\_ACEOF @@ -1587,6 +1599,8 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). + --without-xtrans Build without xtrans support (results in ICE + listening on remote TCP ports) Some influential environment variables: CC C compiler command @@ -1618,6 +1632,9 @@ C compiler flags for GNOME_SESSION, overriding pkg-config GNOME_SESSION_LIBS linker flags for GNOME_SESSION, overriding pkg-config + UPOWER_CFLAGS + C compiler flags for UPOWER, overriding pkg-config + UPOWER_LIBS linker flags for UPOWER, overriding pkg-config SESSION_PROPERTIES_CFLAGS C compiler flags for SESSION_PROPERTIES, overriding pkg-config SESSION_PROPERTIES_LIBS @@ -1656,6 +1673,9 @@ C compiler flags for XRENDER, overriding pkg-config XRENDER_LIBS linker flags for XRENDER, overriding pkg-config + XTRANS_CFLAGS + C compiler flags for XTRANS, overriding pkg-config + XTRANS_LIBS linker flags for XTRANS, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1723,7 +1743,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-session configure 3.9.90 +gnome-session configure 3.14.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2092,7 +2112,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-session $as_me 3.9.90, which was +It was created by gnome-session $as_me 3.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2446,7 +2466,7 @@ -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2961,7 +2981,7 @@ # Define the identity of the package. PACKAGE='gnome-session' - VERSION='3.9.90' + VERSION='3.14.0' cat >>confdefs.h <<_ACEOF @@ -3128,6 +3148,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : @@ -3958,6 +4019,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4150,131 +4270,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # Extract the first word of "glib-genmarshal", so it can be a program name with args. set dummy glib-genmarshal; ac_word=$2 @@ -6849,7 +6844,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6867,7 +6862,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6886,7 +6884,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -12093,6 +12094,8 @@ -Werror=missing-include-dirs \ " + additional_flags="" + case "$enable_compile_warnings" in no) warning_flags= @@ -12100,11 +12103,8 @@ minimum) warning_flags="-Wall" ;; - yes) - warning_flags="$base_warn_flags $base_error_flags" - ;; - maximum|error) - warning_flags="$base_warn_flags $base_error_flags" + yes|maximum|error) + warning_flags="$base_warn_flags $base_error_flags $additional_flags" ;; *) as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 @@ -12201,7 +12201,7 @@ DBUS_GLIB_REQUIRED=0.76 UPOWER_REQUIRED=0.9.0 JSON_GLIB_REQUIRED=0.10 -GNOME_DESKTOP_REQUIRED=3.7.90 +GNOME_DESKTOP_REQUIRED=3.9.91 # Check whether --enable-session-selector was given. if test "${enable_session_selector+set}" = set; then : @@ -12600,17 +12600,13 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED - gtk+-3.0 >= \$GTK3_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED - upower-glib >= \$UPOWER_REQUIRED json-glib-1.0 >= \$JSON_GLIB_REQUIRED gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED ") 2>&5 @@ -12619,9 +12615,7 @@ test $ac_status = 0; }; then pkg_cv_GNOME_SESSION_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED " 2>/dev/null` @@ -12638,17 +12632,13 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED - gtk+-3.0 >= \$GTK3_REQUIRED dbus-glib-1 >= \$DBUS_GLIB_REQUIRED - upower-glib >= \$UPOWER_REQUIRED json-glib-1.0 >= \$JSON_GLIB_REQUIRED gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED ") 2>&5 @@ -12657,9 +12647,7 @@ test $ac_status = 0; }; then pkg_cv_GNOME_SESSION_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED " 2>/dev/null` @@ -12685,18 +12673,14 @@ if test $_pkg_short_errors_supported = yes; then GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED " 2>&1` else GNOME_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED " 2>&1` @@ -12706,9 +12690,7 @@ as_fn_error $? "Package requirements (glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED ) were not met: @@ -12746,6 +12728,93 @@ pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER" >&5 +$as_echo_n "checking for UPOWER... " >&6; } + +if test -n "$UPOWER_CFLAGS"; then + pkg_cv_UPOWER_CFLAGS="$UPOWER_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_UPOWER_CFLAGS=`$PKG_CONFIG --cflags "upower-glib < 0.99.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$UPOWER_LIBS"; then + pkg_cv_UPOWER_LIBS="$UPOWER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"upower-glib < 0.99.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_UPOWER_LIBS=`$PKG_CONFIG --libs "upower-glib < 0.99.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + UPOWER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1` + else + UPOWER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "upower-glib < 0.99.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$UPOWER_PKG_ERRORS" >&5 + + have_old_upower=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_old_upower=no +else + UPOWER_CFLAGS=$pkg_cv_UPOWER_CFLAGS + UPOWER_LIBS=$pkg_cv_UPOWER_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_old_upower=yes +fi +if test x$have_old_upower = xyes; then : + + +$as_echo "#define HAVE_OLD_UPOWER 1" >>confdefs.h + + +fi + if test x$have_old_upower = xyes; then + HAVE_OLD_UPOWER_TRUE= + HAVE_OLD_UPOWER_FALSE='#' +else + HAVE_OLD_UPOWER_TRUE='#' + HAVE_OLD_UPOWER_FALSE= +fi + + + +pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SESSION_PROPERTIES" >&5 $as_echo_n "checking for SESSION_PROPERTIES... " >&6; } @@ -15560,7 +15629,7 @@ gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) %.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@ all-am: $(gsettings_SCHEMAS:.xml=.valid) uninstall-am: uninstall-gsettings-schemas @@ -15787,21 +15856,110 @@ fi -oCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $X_CFLAGS" -for ac_header in X11/Xtrans/Xtrans.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "X11/Xtrans/Xtrans.h" "ac_cv_header_X11_Xtrans_Xtrans_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_Xtrans_Xtrans_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_X11_XTRANS_XTRANS_H 1 -_ACEOF +# Check whether --with-xtrans was given. +if test "${with_xtrans+set}" = set; then : + withval=$with_xtrans; +else + with_xtrans=yes fi -done +if test "$with_xtrans" != "no"; then : + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTRANS" >&5 +$as_echo_n "checking for XTRANS... " >&6; } + +if test -n "$XTRANS_CFLAGS"; then + pkg_cv_XTRANS_CFLAGS="$XTRANS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtrans\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xtrans") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XTRANS_CFLAGS=`$PKG_CONFIG --cflags "xtrans" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$XTRANS_LIBS"; then + pkg_cv_XTRANS_LIBS="$XTRANS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xtrans\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xtrans") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XTRANS_LIBS=`$PKG_CONFIG --libs "xtrans" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XTRANS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xtrans" 2>&1` + else + XTRANS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xtrans" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XTRANS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (xtrans) were not met: + +$XTRANS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables XTRANS_CFLAGS +and XTRANS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables XTRANS_CFLAGS +and XTRANS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + XTRANS_CFLAGS=$pkg_cv_XTRANS_CFLAGS + XTRANS_LIBS=$pkg_cv_XTRANS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_XTRANS 1" >>confdefs.h + +fi +fi -CFLAGS="$oCFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable ipv6" >&5 $as_echo_n "checking whether to enable ipv6... " >&6; } @@ -15903,7 +16061,7 @@ fi fi -ac_config_files="$ac_config_files Makefile capplet/Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile data/session-properties.desktop.in data/org.gnome.SessionManager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile egg/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile data/org.gnome.SessionManager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -16046,6 +16204,10 @@ as_fn_error $? "conditional \"BUILD_SESSION_SELECTOR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_OLD_UPOWER_TRUE}" && test -z "${HAVE_OLD_UPOWER_FALSE}"; then + as_fn_error $? "conditional \"HAVE_OLD_UPOWER\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16463,7 +16625,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-session $as_me 3.9.90, which was +This file was extended by gnome-session $as_me 3.14.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16529,7 +16691,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-session config.status 3.9.90 +gnome-session config.status 3.14.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16941,13 +17103,11 @@ "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "capplet/Makefile") CONFIG_FILES="$CONFIG_FILES capplet/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/dbus/Makefile") CONFIG_FILES="$CONFIG_FILES doc/dbus/Makefile" ;; "doc/dbus/gnome-session.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus/gnome-session.xml" ;; "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/session-properties.desktop.in") CONFIG_FILES="$CONFIG_FILES data/session-properties.desktop.in" ;; "data/org.gnome.SessionManager.gschema.xml") CONFIG_FILES="$CONFIG_FILES data/org.gnome.SessionManager.gschema.xml" ;; "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; "data/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/16x16/Makefile" ;; @@ -16956,7 +17116,6 @@ "data/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/32x32/Makefile" ;; "data/icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/48x48/Makefile" ;; "data/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/scalable/Makefile" ;; - "egg/Makefile") CONFIG_FILES="$CONFIG_FILES egg/Makefile" ;; "gnome-session/Makefile") CONFIG_FILES="$CONFIG_FILES gnome-session/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; @@ -18367,6 +18526,7 @@ XRender support: ${have_xrender} XSync support: ${have_xsync} XTest support: ${have_xtest} + Legacy UPower backend: ${have_old_upower} Build Docbook: ${enable_docbook_docs} Build manpages: ${enable_man} diff -Nru gnome-session-3.9.90/configure.ac gnome-session-3.14.0/configure.ac --- gnome-session-3.9.90/configure.ac 2013-08-20 14:45:55.000000000 +0000 +++ gnome-session-3.14.0/configure.ac 2014-09-22 14:19:08.000000000 +0000 @@ -1,5 +1,5 @@ AC_INIT([gnome-session], - [3.9.90], + [3.14.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session]) AC_CONFIG_SRCDIR([gnome-session]) @@ -38,7 +38,7 @@ DBUS_GLIB_REQUIRED=0.76 UPOWER_REQUIRED=0.9.0 JSON_GLIB_REQUIRED=0.10 -GNOME_DESKTOP_REQUIRED=3.7.90 +GNOME_DESKTOP_REQUIRED=3.9.91 AC_ARG_ENABLE(session-selector, AS_HELP_STRING([--enable-session-selector], [enable building a custom session selector dialog]), @@ -63,13 +63,19 @@ PKG_CHECK_MODULES(GNOME_SESSION, glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED - upower-glib >= $UPOWER_REQUIRED json-glib-1.0 >= $JSON_GLIB_REQUIRED gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED ) +dnl We can only support old upower +dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383 +PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no) +AS_IF([test x$have_old_upower = xyes], [ + AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower]) +]) +AM_CONDITIONAL(HAVE_OLD_UPOWER, test x$have_old_upower = xyes) + PKG_CHECK_MODULES(SESSION_PROPERTIES, glib-2.0 >= $GLIB_REQUIRED gtk+-3.0 >= $GTK3_REQUIRED @@ -261,12 +267,18 @@ AC_SUBST(EXECINFO_LIBS) dnl ==================================================================== -dnl Check for newish X interface +dnl Check for X transport interface - allows to disable ICE Transports +dnl See also https://bugzilla.gnome.org/show_bug.cgi?id=725100 dnl ==================================================================== -oCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $X_CFLAGS" -AC_CHECK_HEADERS(X11/Xtrans/Xtrans.h) -CFLAGS="$oCFLAGS" +AC_ARG_WITH([xtrans], + [AS_HELP_STRING([--without-xtrans], + [Build without xtrans support (results in ICE listening on remote TCP ports)])], + [], + [with_xtrans=yes]) +AS_IF([test "$with_xtrans" != "no"], + [PKG_CHECK_MODULES(XTRANS, xtrans, + [AC_DEFINE(HAVE_XTRANS, 1, [Have the X Transport library])])]) +AC_SUBST(HAVE_XTRANS) dnl ==================================================================== dnl Code for checking whether IPv6 is enabled on the system.... @@ -316,13 +328,11 @@ AC_CONFIG_FILES([ Makefile -capplet/Makefile doc/Makefile doc/dbus/Makefile doc/dbus/gnome-session.xml doc/man/Makefile data/Makefile -data/session-properties.desktop.in data/org.gnome.SessionManager.gschema.xml data/icons/Makefile data/icons/16x16/Makefile @@ -331,7 +341,6 @@ data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile -egg/Makefile gnome-session/Makefile tools/Makefile po/Makefile.in @@ -367,6 +376,7 @@ XRender support: ${have_xrender} XSync support: ${have_xsync} XTest support: ${have_xtest} + Legacy UPower backend: ${have_old_upower} Build Docbook: ${enable_docbook_docs} Build manpages: ${enable_man} diff -Nru gnome-session-3.9.90/data/gnome.desktop.in gnome-session-3.14.0/data/gnome.desktop.in --- gnome-session-3.9.90/data/gnome.desktop.in 2012-12-12 18:26:59.000000000 +0000 +++ gnome-session-3.14.0/data/gnome.desktop.in 2014-07-18 20:50:42.000000000 +0000 @@ -5,3 +5,4 @@ TryExec=gnome-session Icon= Type=Application +DesktopNames=GNOME diff -Nru gnome-session-3.9.90/data/gnome-wayland.desktop.in gnome-session-3.14.0/data/gnome-wayland.desktop.in --- gnome-session-3.9.90/data/gnome-wayland.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.14.0/data/gnome-wayland.desktop.in 2014-07-18 20:50:42.000000000 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +_Name=GNOME on Wayland +_Comment=This session logs you into GNOME, using Wayland +Exec=gnome-session --session=gnome-wayland +TryExec=gnome-session +Icon= +Type=Application +DesktopNames=GNOME diff -Nru gnome-session-3.9.90/data/gnome-wayland.session.desktop.in.in gnome-session-3.14.0/data/gnome-wayland.session.desktop.in.in --- gnome-session-3.9.90/data/gnome-wayland.session.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.14.0/data/gnome-wayland.session.desktop.in.in 2014-06-25 18:06:33.000000000 +0000 @@ -0,0 +1,3 @@ +[GNOME Session] +_Name=GNOME on Wayland +RequiredComponents=gnome-shell-wayland;gnome-settings-daemon; diff -Nru gnome-session-3.9.90/data/gsm-inhibit-dialog.ui gnome-session-3.14.0/data/gsm-inhibit-dialog.ui --- gnome-session-3.9.90/data/gsm-inhibit-dialog.ui 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/data/gsm-inhibit-dialog.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ - - - - - - True - 6 - vertical - 6 - - - True - 0 - Some programs are still running: - True - - - - - - False - False - 0 - - - - - True - True - automatic - automatic - in - - - True - True - False - False - False - - - - - False - False - 1 - - - - - True - 0 - 0 - 18 - Waiting for the program to finish. Interrupting the program may cause you to lose work. - True - - - 2 - - - - diff -Nru gnome-session-3.9.90/data/hardware-compatibility gnome-session-3.14.0/data/hardware-compatibility --- gnome-session-3.9.90/data/hardware-compatibility 2013-08-06 19:29:54.000000000 +0000 +++ gnome-session-3.14.0/data/hardware-compatibility 2014-06-25 18:06:33.000000000 +0000 @@ -27,3 +27,6 @@ # Gallium has softpipe; we explicitly enable llvmpipe -softpipe + +# nouveau vieux NV25 doesn't work too well +-Mesa DRI nv25 diff -Nru gnome-session-3.9.90/data/icons/16x16/Makefile.in gnome-session-3.14.0/data/icons/16x16/Makefile.in --- gnome-session-3.9.90/data/icons/16x16/Makefile.in 2013-08-20 14:50:05.000000000 +0000 +++ gnome-session-3.14.0/data/icons/16x16/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/22x22/Makefile.in gnome-session-3.14.0/data/icons/22x22/Makefile.in --- gnome-session-3.9.90/data/icons/22x22/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/22x22/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/24x24/Makefile.in gnome-session-3.14.0/data/icons/24x24/Makefile.in --- gnome-session-3.9.90/data/icons/24x24/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/24x24/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/32x32/Makefile.in gnome-session-3.14.0/data/icons/32x32/Makefile.in --- gnome-session-3.9.90/data/icons/32x32/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/32x32/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/48x48/Makefile.in gnome-session-3.14.0/data/icons/48x48/Makefile.in --- gnome-session-3.9.90/data/icons/48x48/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/48x48/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/Makefile.in gnome-session-3.14.0/data/icons/Makefile.in --- gnome-session-3.9.90/data/icons/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -228,6 +228,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -295,6 +296,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -309,6 +312,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/icons/scalable/Makefile.in gnome-session-3.14.0/data/icons/scalable/Makefile.in --- gnome-session-3.9.90/data/icons/scalable/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/data/icons/scalable/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -198,6 +198,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -265,6 +266,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -279,6 +282,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/data/Makefile.am gnome-session-3.14.0/data/Makefile.am --- gnome-session-3.9.90/data/Makefile.am 2013-07-30 19:01:01.000000000 +0000 +++ gnome-session-3.14.0/data/Makefile.am 2014-06-25 18:06:33.000000000 +0000 @@ -2,8 +2,7 @@ uidir = $(pkgdatadir) ui_DATA = \ - session-properties.ui \ - gsm-inhibit-dialog.ui + session-properties.ui if BUILD_SESSION_SELECTOR ui_DATA += session-selector.ui @@ -21,12 +20,12 @@ xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) -desktopdir = $(datadir)/applications -desktop_in_files = session-properties.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +wayland_sessiondir = $(datadir)/wayland-sessions +wayland_session_in_files = gnome-wayland.desktop.in +wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop) sessiondir = $(datadir)/gnome-session/sessions -session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in +session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in) session_DATA = $(session_in_files:.session.desktop.in=.session) @@ -49,6 +48,7 @@ EXTRA_DIST = \ $(xsession_in_files) \ $(session_in_in_files) \ + $(wayland_session_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) \ session-selector.ui \ gnome-custom-session.desktop.in \ @@ -58,11 +58,11 @@ CLEANFILES = \ $(gsettings_SCHEMAS) \ $(xsession_DATA) \ - $(desktop_DATA) \ + $(wayland_session_DATA) \ $(session_DATA) DISTCLEANFILES = \ $(gsettings_SCHEMAS) \ - $(desktop_in_files) + $(wayland_session_in_files) -include $(top_srcdir)/git.mk diff -Nru gnome-session-3.9.90/data/Makefile.in gnome-session-3.14.0/data/Makefile.in --- gnome-session-3.9.90/data/Makefile.in 2013-08-20 14:50:05.000000000 +0000 +++ gnome-session-3.14.0/data/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -82,7 +82,6 @@ @BUILD_SESSION_SELECTOR_TRUE@am__append_2 = gnome-custom-session.desktop.in subdir = data DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/session-properties.desktop.in.in \ $(srcdir)/org.gnome.SessionManager.gschema.xml.in \ $(dist_migration_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -94,8 +93,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = session-properties.desktop.in \ - org.gnome.SessionManager.gschema.xml +CONFIG_CLEAN_FILES = org.gnome.SessionManager.gschema.xml CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -151,12 +149,12 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(hwcompatdir)" \ - "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(uidir)" \ +am__installdirs = "$(DESTDIR)$(migrationdir)" \ + "$(DESTDIR)$(hwcompatdir)" "$(DESTDIR)$(sessiondir)" \ + "$(DESTDIR)$(uidir)" "$(DESTDIR)$(wayland_sessiondir)" \ "$(DESTDIR)$(xsessiondir)" -DATA = $(desktop_DATA) $(dist_migration_DATA) $(hwcompat_DATA) \ - $(session_DATA) $(ui_DATA) $(xsession_DATA) +DATA = $(dist_migration_DATA) $(hwcompat_DATA) $(session_DATA) \ + $(ui_DATA) $(wayland_session_DATA) $(xsession_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -268,6 +266,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -335,6 +334,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -349,6 +350,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -406,17 +409,17 @@ top_srcdir = @top_srcdir@ SUBDIRS = icons uidir = $(pkgdatadir) -ui_DATA = session-properties.ui gsm-inhibit-dialog.ui $(am__append_1) +ui_DATA = session-properties.ui $(am__append_1) hwcompatdir = $(pkgdatadir) hwcompat_DATA = hardware-compatibility xsessiondir = $(datadir)/xsessions xsession_in_files = gnome.desktop.in $(am__append_2) xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) -desktopdir = $(datadir)/applications -desktop_in_files = session-properties.desktop.in -desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +wayland_sessiondir = $(datadir)/wayland-sessions +wayland_session_in_files = gnome-wayland.desktop.in +wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop) sessiondir = $(datadir)/gnome-session/sessions -session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in +session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in) session_DATA = $(session_in_files:.session.desktop.in=.session) gsettings_SCHEMAS = org.gnome.SessionManager.gschema.xml @@ -425,6 +428,7 @@ EXTRA_DIST = \ $(xsession_in_files) \ $(session_in_in_files) \ + $(wayland_session_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) \ session-selector.ui \ gnome-custom-session.desktop.in \ @@ -434,12 +438,12 @@ CLEANFILES = \ $(gsettings_SCHEMAS) \ $(xsession_DATA) \ - $(desktop_DATA) \ + $(wayland_session_DATA) \ $(session_DATA) DISTCLEANFILES = \ $(gsettings_SCHEMAS) \ - $(desktop_in_files) + $(wayland_session_in_files) all: all-recursive @@ -474,8 +478,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -session-properties.desktop.in: $(top_builddir)/config.status $(srcdir)/session-properties.desktop.in.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ org.gnome.SessionManager.gschema.xml: $(top_builddir)/config.status $(srcdir)/org.gnome.SessionManager.gschema.xml.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -484,27 +486,6 @@ clean-libtool: -rm -rf .libs _libs -install-desktopDATA: $(desktop_DATA) - @$(NORMAL_INSTALL) - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ - done - -uninstall-desktopDATA: - @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-dist_migrationDATA: $(dist_migration_DATA) @$(NORMAL_INSTALL) @list='$(dist_migration_DATA)'; test -n "$(migrationdir)" || list=; \ @@ -589,6 +570,27 @@ @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) +install-wayland_sessionDATA: $(wayland_session_DATA) + @$(NORMAL_INSTALL) + @list='$(wayland_session_DATA)'; test -n "$(wayland_sessiondir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(wayland_sessiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(wayland_sessiondir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(wayland_sessiondir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(wayland_sessiondir)" || exit $$?; \ + done + +uninstall-wayland_sessionDATA: + @$(NORMAL_UNINSTALL) + @list='$(wayland_session_DATA)'; test -n "$(wayland_sessiondir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(wayland_sessiondir)'; $(am__uninstall_files_from_dir) install-xsessionDATA: $(xsession_DATA) @$(NORMAL_INSTALL) @list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \ @@ -770,7 +772,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(hwcompatdir)" "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(xsessiondir)"; do \ + for dir in "$(DESTDIR)$(migrationdir)" "$(DESTDIR)$(hwcompatdir)" "$(DESTDIR)$(sessiondir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(wayland_sessiondir)" "$(DESTDIR)$(xsessiondir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -825,8 +827,8 @@ info-am: -install-data-am: install-desktopDATA install-dist_migrationDATA \ - install-hwcompatDATA install-sessionDATA install-uiDATA \ +install-data-am: install-dist_migrationDATA install-hwcompatDATA \ + install-sessionDATA install-uiDATA install-wayland_sessionDATA \ install-xsessionDATA install-dvi: install-dvi-recursive @@ -871,9 +873,9 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-dist_migrationDATA \ - uninstall-hwcompatDATA uninstall-sessionDATA uninstall-uiDATA \ - uninstall-xsessionDATA +uninstall-am: uninstall-dist_migrationDATA uninstall-hwcompatDATA \ + uninstall-sessionDATA uninstall-uiDATA \ + uninstall-wayland_sessionDATA uninstall-xsessionDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -882,18 +884,18 @@ ctags-am distclean distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am \ - install-desktopDATA install-dist_migrationDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-hwcompatDATA install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sessionDATA install-strip \ - install-uiDATA install-xsessionDATA installcheck \ + install-dist_migrationDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-hwcompatDATA install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-sessionDATA install-strip install-uiDATA \ + install-wayland_sessionDATA install-xsessionDATA installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-desktopDATA \ - uninstall-dist_migrationDATA uninstall-hwcompatDATA \ - uninstall-sessionDATA uninstall-uiDATA uninstall-xsessionDATA + uninstall-am uninstall-dist_migrationDATA \ + uninstall-hwcompatDATA uninstall-sessionDATA uninstall-uiDATA \ + uninstall-wayland_sessionDATA uninstall-xsessionDATA %.session.desktop.in: %.session.desktop.in.in Makefile diff -Nru gnome-session-3.9.90/data/session-properties.desktop.in.in gnome-session-3.14.0/data/session-properties.desktop.in.in --- gnome-session-3.9.90/data/session-properties.desktop.in.in 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/data/session-properties.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -[Desktop Entry] -_Name=Startup Applications -_Comment=Choose what applications to start when you log in -Exec=gnome-session-properties -Icon=session-properties -Terminal=false -Type=Application -StartupNotify=true -Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings; -OnlyShowIn=GNOME;Unity; -NoDisplay=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-session -X-GNOME-Bugzilla-Component=gnome-session-properties -X-GNOME-Bugzilla-Version=@VERSION@ diff -Nru gnome-session-3.9.90/debian/changelog gnome-session-3.14.0/debian/changelog --- gnome-session-3.9.90/debian/changelog 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/changelog 2014-10-31 08:20:49.000000000 +0000 @@ -1,3 +1,142 @@ +gnome-session (3.14.0-2ubuntu1) vivid; urgency=medium + + * Merge from Debian, Remaining Changes: + - debian/control.in: + + Recommend session-migration + * don't depend on xwayland + - debian/gnome-session.install: Don't install wayland session for now + since its not yet possible to run it + - Split ubuntu-session out of gnome-session. + - Add upstart user session + - debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm: + Moved registering gnome-session binary as a session manager to + gnome-session-bin package + - don't install defaults.list (installed by desktop-file-utils in ubuntu): + debian/gnome-session-common.dirs and gnome-session-common.install + - debian/patches/22_support_autostart_delay.patch: + Bugzilla patch to support adding a delay to autostart apps, using + a "X-GNOME-Autostart-Delay" key in the desktop file + - debian/patches/50_ubuntu_sessions.patch: + + Add Ubuntu session + + gnome-shell.desktop adds --session=gnome now that the "ubuntu" session + is the default. Use TryExec to test if gnome-shell is installed. + - debian/patches/51_remove_session_saving_from_gui.patch: + add GNOME_SESSION_SAVE environment variable for people wanting to + use the save session still, knowing that it can break your system + if used unwisely (LP: #771896) + - debian/patches/52_xdg_current_desktop.patch: + Set XDG_CURRENT_DESKTOP inside gnome-session based on a + new key 'DesktopName' in gnome-session .desktop files. + - debian/patches/53_add_sessionmigration.patch, debian/control: + recommends and launch the session-migration if present at the start + of the session. This sync tool is running different session migration + scripts that can be provided in various desktop packages. + - debian/patches/95_dbus_request_shutdown.patch: + Add "RequestShutdown" and "RequestReboot" DBus methods to allow other + applications to shutdown or reboot the machine via the session manager. + - debian/patches/103_kill_the_fail_whale.patch: + Kill the Fail Whale as it tends to be more annoying than helpful + * debian/patches/revert_remove_gnome_session_properties.patch + * Dropped Changes: + * debian/patches/52_xdg_current_desktop.patch: Dropped Upsream includes a + fallback to set this now. + * Remove patches that have been disabled since 3.8 + + -- Tim Lunn Fri, 31 Oct 2014 09:19:52 +0100 + +gnome-session (3.14.0-2) unstable; urgency=medium + + * Update debian/defaults.list to catch up with times: + - Drop swfdec-player which is long gone. + - Update File-Roller to new .desktop file name. + - Update GEdit to new .desktop file name. + - Update Font Viewer to new .desktop file name. + - Update Nautilus to new .desktop file name. + - Update Totem to new .desktop file name. + (Closes: #763595) + Note: This breaks the defaults for those who install the new + gnome-session-common and keep their << 3.14 application + packages (partial upgrades). + + -- Andreas Henriksson Wed, 01 Oct 2014 16:11:51 +0200 + +gnome-session (3.14.0-1) unstable; urgency=medium + + * New upstream release. + * Upload to unstable. + + -- Andreas Henriksson Mon, 22 Sep 2014 20:42:37 +0200 + +gnome-session (3.13.3-1) experimental; urgency=medium + + [ Andreas Henriksson ] + * New upstream development release. + + [ Josselin Mouette ] + * Fix typos in defaults.list. Closes: #759429. + + -- Andreas Henriksson Fri, 05 Sep 2014 15:09:51 -0700 + +gnome-session (3.12.1-4) experimental; urgency=medium + + * gnome-session: Install wayland session files. + * gnome-session-bin: add xwayland dependency on linux-any. + + -- Andreas Henriksson Sat, 02 Aug 2014 17:22:46 +0200 + +gnome-session (3.12.1-3) unstable; urgency=medium + + [ Laurent Bigonville ] + * debian/control.in: Recommends libpam-systemd instead of systemd on linux + architectures and add recommends against consolekit on non linux arch. + Also move the Recommends to the arch any package. + + [ Andreas Henriksson ] + * Drop build-dependency on libupower-glib-dev (<< 0.99.0) [!linux-any] + - This can no longer be fulfilled anyway. + * Upload to unstable. + + -- Andreas Henriksson Mon, 14 Jul 2014 23:57:59 +0200 + +gnome-session (3.12.1-2) experimental; urgency=medium + + * Enable systemd support on linux architectures only + + -- Laurent Bigonville Sun, 04 May 2014 15:02:14 +0200 + +gnome-session (3.12.1-1) experimental; urgency=medium + + * New upstream release + + -- Sjoerd Simons Sun, 27 Apr 2014 18:03:58 +0200 + +gnome-session (3.12.0-1) experimental; urgency=medium + + * New upstream release. + * Require upower build-dependency to be lower then 0.99.x and + only on non-linux. + - The new upower 0.99.x does not implement the used interfaces. + - Functionality is available via logind. + * Drop installing /usr/share/applications + - new upstream no longer ships gnome-session-properties + * Bump build-dependency on libglib2.0-dev to >= 2.39.90 + - using g_subprocess requires a recent glib. + * Bump Standards-Version to 3.9.5 + + -- Andreas Henriksson Wed, 26 Mar 2014 22:51:00 +0100 + +gnome-session (3.10.1-1) experimental; urgency=low + + * New upstream release + * debian/patches/13_display_session_properties.patch + + Dropped. gnome-session-properties has been dropped upstream + * debian/rules, debian/control.in: Explicitely enabled systemd support and + recommend systemd for logind. Recommends is enough as gnome-session should + fall back to consolekit + * debian/control.in: Update build-depends + + -- Sjoerd Simons Fri, 01 Nov 2013 23:04:59 +0100 + gnome-session (3.9.90-0ubuntu16) utopic; urgency=medium * set GNOME_SHELL_SESSION_MODE for gnome-classic sessions (LP: #1381297) @@ -136,6 +275,34 @@ -- Jeremy Bicha Mon, 26 Aug 2013 08:47:31 -0400 +gnome-session (3.8.4-3) unstable; urgency=medium + + * debian/control.in: + +Break gdm3 < 3.8. Closes: #726498. + + -- Emilio Pozuelo Monfort Sat, 26 Oct 2013 16:12:19 +0200 + +gnome-session (3.8.4-2) unstable; urgency=low + + * Upload to unstable. + + -- Emilio Pozuelo Monfort Sun, 13 Oct 2013 17:27:19 +0200 + +gnome-session (3.8.4-1) experimental; urgency=low + + [ Jeremy Bicha ] + * New upstream release + * debian/control.in: + - Don't recommend gnome-power-manager + * Completely drop gnome-session-fallback (moved to gnome-panel source) + + [ Michael Biebl ] + * Drop Build-Depends on libnotify-dev. No longer necessary after + debian/patches/04_fallback_warning_notify.patch has been removed. + * Bump Standards-Version to 3.9.4. No further changes. + + -- Michael Biebl Fri, 11 Oct 2013 17:07:46 +0200 + gnome-session (3.8.2.1-1ubuntu5) saucy; urgency=low * debian/patches/50_ubuntu_sessions.patch: diff -Nru gnome-session-3.9.90/debian/control gnome-session-3.14.0/debian/control --- gnome-session-3.9.90/debian/control 2014-10-15 10:18:27.000000000 +0000 +++ gnome-session-3.14.0/debian/control 2014-10-31 08:20:49.000000000 +0000 @@ -7,25 +7,20 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers -Standards-Version: 3.9.3 +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Laurent Bigonville , Sjoerd Simons +Standards-Version: 3.9.5 Build-Depends: cdbs (>= 0.4.41), dh-autoreconf, debhelper (>= 8), gnome-pkg-tools (>= 0.13), gnome-common, intltool (>= 0.40.6), - libglib2.0-dev (>= 2.34.0), + libglib2.0-dev (>= 2.39.90), libgtk-3-dev (>= 2.90.7), - libupower-glib-dev (>= 0.9.0), libdbus-glib-1-dev (>= 0.76), libjson-glib-dev (>= 0.10), - libnotify-dev (>= 0.7), - libgnome-desktop-3-dev (>= 3.7.90), + libgnome-desktop-3-dev (>= 3.9.91), libsm-dev, - libsystemd-daemon-dev, - libsystemd-journal-dev, - libsystemd-login-dev (>= 183), libice-dev, libx11-dev, libxt-dev, @@ -37,13 +32,17 @@ libxrender-dev, xmlto, xsltproc, - xtrans-dev + xtrans-dev, + libsystemd-login-dev (>= 183) [linux-any], + libsystemd-daemon-dev [linux-any], + libsystemd-journal-dev [linux-any] Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu Package: gnome-session Architecture: all Depends: ${misc:Depends}, gnome-settings-daemon (>= 3.0), + gnome-shell (>= 3.0), gnome-session-bin (>= ${binary:Version}), gnome-session-bin (<< ${gnome:NextVersion}), gnome-session-common (= ${binary:Version}) @@ -92,8 +91,11 @@ ${misc:Depends}, dbus-x11, gsettings-desktop-schemas, - upower (>= 0.9.0) + upower (>= 0.9.0), +# xwayland [linux-any] +Recommends: libpam-systemd [linux-any], consolekit [!linux-any] Conflicts: gnome-session (<< 3.9.90-0ubuntu8) +Breaks: gdm (<< 3.8) Description: GNOME Session Manager - Minimal runtime The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at diff -Nru gnome-session-3.9.90/debian/control.in gnome-session-3.14.0/debian/control.in --- gnome-session-3.9.90/debian/control.in 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/control.in 2014-10-31 08:20:49.000000000 +0000 @@ -4,24 +4,19 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 Build-Depends: cdbs (>= 0.4.41), dh-autoreconf, debhelper (>= 8), gnome-pkg-tools (>= 0.13), gnome-common, intltool (>= 0.40.6), - libglib2.0-dev (>= 2.34.0), + libglib2.0-dev (>= 2.39.90), libgtk-3-dev (>= 2.90.7), - libupower-glib-dev (>= 0.9.0), libdbus-glib-1-dev (>= 0.76), libjson-glib-dev (>= 0.10), - libnotify-dev (>= 0.7), - libgnome-desktop-3-dev (>= 3.7.90), + libgnome-desktop-3-dev (>= 3.9.91), libsm-dev, - libsystemd-daemon-dev, - libsystemd-journal-dev, - libsystemd-login-dev (>= 183), libice-dev, libx11-dev, libxt-dev, @@ -33,13 +28,17 @@ libxrender-dev, xmlto, xsltproc, - xtrans-dev + xtrans-dev, + libsystemd-login-dev (>= 183) [linux-any], + libsystemd-daemon-dev [linux-any], + libsystemd-journal-dev [linux-any] Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/gnome-session/ubuntu Package: gnome-session Architecture: all Depends: ${misc:Depends}, gnome-settings-daemon (>= 3.0), + gnome-shell (>= 3.0), gnome-session-bin (>= ${binary:Version}), gnome-session-bin (<< ${gnome:NextVersion}), gnome-session-common (= ${binary:Version}) @@ -88,8 +87,11 @@ ${misc:Depends}, dbus-x11, gsettings-desktop-schemas, - upower (>= 0.9.0) + upower (>= 0.9.0), +# xwayland [linux-any] +Recommends: libpam-systemd [linux-any], consolekit [!linux-any] Conflicts: gnome-session (<< 3.9.90-0ubuntu8) +Breaks: gdm (<< 3.8) Description: GNOME Session Manager - Minimal runtime The GNOME Session Manager is in charge of starting the core components of the GNOME desktop, and applications that should be launched at diff -Nru gnome-session-3.9.90/debian/defaults.list gnome-session-3.14.0/debian/defaults.list --- gnome-session-3.9.90/debian/defaults.list 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/defaults.list 2014-10-31 08:20:49.000000000 +0000 @@ -64,84 +64,84 @@ application/mbox=evolution.desktop message/rfc822=evolution.desktop x-scheme-handler/mailto=evolution.desktop -application/x-7z-compressed=file-roller.desktop -application/x-7z-compressed-tar=file-roller.desktop -application/x-ace=file-roller.desktop -application/x-alz=file-roller.desktop -application/x-ar=file-roller.desktop -application/x-arj=file-roller.desktop -application/x-bzip=file-roller.desktop -application/x-bzip-compressed-tar=file-roller.desktop -application/x-bzip1=file-roller.desktop -application/x-bzip1-compressed-tar=file-roller.desktop -application/x-cabinet=file-roller.desktop -application/x-cd-image=file-roller.desktop -application/x-compress=file-roller.desktop -application/x-compressed-tar=file-roller.desktop -application/x-cpio=file-roller.desktop -application/x-deb=file-roller.desktop -application/x-ear=file-roller.desktop -application/x-gtar=file-roller.desktop -application/x-gzip=file-roller.desktop -application/x-java-archive=file-roller.desktop -application/x-lha=file-roller.desktop -application/x-lhz=file-roller.desktop -application/x-lzip=file-roller.desktop -application/x-lzip-compressed-tar=file-roller.desktop -application/x-lzma=file-roller.desktop -application/x-lzma-compressed-tar=file-roller.desktop -application/x-lzop=file-roller.desktop -application/x-lzop-compressed-tar=file-roller.desktop -application/x-rar=file-roller.desktop -application/x-rar-compressed=file-roller.desktop -application/x-rpm=file-roller.desktop -application/x-rzip=file-roller.desktop -application/x-tar=file-roller.desktop -application/x-tarz=file-roller.desktop -application/x-stuffit=file-roller.desktop -application/x-war=file-roller.desktop -application/x-xz=file-roller.desktop -application/x-xz-compressed-tar=file-roller.desktop -application/x-zip=file-roller.desktop -application/x-zip-compressed=file-roller.desktop -application/x-zoo=file-roller.desktop -application/zip=file-roller.desktop -multipart/x-zip=file-roller.desktop -text/plain=gedit.desktop -text/css=gedit.desktop -text/javascript=gedit.desktop -text/mathml=gedit.desktop -text/x-c++hdr=gedit.desktop -text/x-c++src=gedit.desktop -text/x-csrc=gedit.desktop -text/x-chdr=gedit.desktop -text/x-dtd=gedit.desktop -text/x-java=gedit.desktop -text/x-javascript=gedit.desktop -text/x-makefile=gedit.desktop -text/x-moc=gedit.desktop -text/x-pascal=gedit.desktop -text/x-patch=gedit.desktop -text/x-perl=gedit.desktop -text/x-php=gedit.desktop -text/x-python=gedit.desktop -text/x-sql=gedit.desktop -text/x-tcl=gedit.desktop -text/x-tex=gedit.desktop -text/xml=gedit.desktop -application/javascript=gedit.desktop -application/x-cgi=gedit.desktop -application/x-javascript=gedit.desktop -application/x-perl=gedit.desktop -application/x-php=gedit.desktop -application/x-python=gedit.desktop -application/x-shellscript=gedit.desktop -application/xml=gedit.desktop -application/xml-dtd=gedit.desktop -application/x-font-ttf=gnome-font-viewer.desktop -application/x-font-pcf=gnome-font-viewer.desktop -application/x-font-type1=gnome-font-viewer.desktop -application/x-font-otf=gnome-font-viewer.desktop +application/x-7z-compressed=org.gnome.FileRoller.desktop +application/x-7z-compressed-tar=org.gnome.FileRoller.desktop +application/x-ace=org.gnome.FileRoller.desktop +application/x-alz=org.gnome.FileRoller.desktop +application/x-ar=org.gnome.FileRoller.desktop +application/x-arj=org.gnome.FileRoller.desktop +application/x-bzip=org.gnome.FileRoller.desktop +application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-bzip1=org.gnome.FileRoller.desktop +application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop +application/x-cabinet=org.gnome.FileRoller.desktop +application/x-cd-image=org.gnome.FileRoller.desktop +application/x-compress=org.gnome.FileRoller.desktop +application/x-compressed-tar=org.gnome.FileRoller.desktop +application/x-cpio=org.gnome.FileRoller.desktop +application/x-deb=org.gnome.FileRoller.desktop +application/x-ear=org.gnome.FileRoller.desktop +application/x-gtar=org.gnome.FileRoller.desktop +application/x-gzip=org.gnome.FileRoller.desktop +application/x-java-archive=org.gnome.FileRoller.desktop +application/x-lha=org.gnome.FileRoller.desktop +application/x-lhz=org.gnome.FileRoller.desktop +application/x-lzip=org.gnome.FileRoller.desktop +application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop +application/x-lzma=org.gnome.FileRoller.desktop +application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop +application/x-lzop=org.gnome.FileRoller.desktop +application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop +application/x-rar=org.gnome.FileRoller.desktop +application/x-rar-compressed=org.gnome.FileRoller.desktop +application/x-rpm=org.gnome.FileRoller.desktop +application/x-rzip=org.gnome.FileRoller.desktop +application/x-tar=org.gnome.FileRoller.desktop +application/x-tarz=org.gnome.FileRoller.desktop +application/x-stuffit=org.gnome.FileRoller.desktop +application/x-war=org.gnome.FileRoller.desktop +application/x-xz=org.gnome.FileRoller.desktop +application/x-xz-compressed-tar=org.gnome.FileRoller.desktop +application/x-zip=org.gnome.FileRoller.desktop +application/x-zip-compressed=org.gnome.FileRoller.desktop +application/x-zoo=org.gnome.FileRoller.desktop +application/zip=org.gnome.FileRoller.desktop +multipart/x-zip=org.gnome.FileRoller.desktop +text/plain=org.gnome.gedit.desktop +text/css=org.gnome.gedit.desktop +text/javascript=org.gnome.gedit.desktop +text/mathml=org.gnome.gedit.desktop +text/x-c++hdr=org.gnome.gedit.desktop +text/x-c++src=org.gnome.gedit.desktop +text/x-csrc=org.gnome.gedit.desktop +text/x-chdr=org.gnome.gedit.desktop +text/x-dtd=org.gnome.gedit.desktop +text/x-java=org.gnome.gedit.desktop +text/x-javascript=org.gnome.gedit.desktop +text/x-makefile=org.gnome.gedit.desktop +text/x-moc=org.gnome.gedit.desktop +text/x-pascal=org.gnome.gedit.desktop +text/x-patch=org.gnome.gedit.desktop +text/x-perl=org.gnome.gedit.desktop +text/x-php=org.gnome.gedit.desktop +text/x-python=org.gnome.gedit.desktop +text/x-sql=org.gnome.gedit.desktop +text/x-tcl=org.gnome.gedit.desktop +text/x-tex=org.gnome.gedit.desktop +text/xml=org.gnome.gedit.desktop +application/javascript=org.gnome.gedit.desktop +application/x-cgi=org.gnome.gedit.desktop +application/x-javascript=org.gnome.gedit.desktop +application/x-perl=org.gnome.gedit.desktop +application/x-php=org.gnome.gedit.desktop +application/x-python=org.gnome.gedit.desktop +application/x-shellscript=org.gnome.gedit.desktop +application/xml=org.gnome.gedit.desktop +application/xml-dtd=org.gnome.gedit.desktop +application/x-font-ttf=org.gnome.font-viewer.desktop +application/x-font-pcf=org.gnome.font-viewer.desktop +application/x-font-type1=org.gnome.font-viewer.desktop +application/x-font-otf=org.gnome.font-viewer.desktop application/x-gnumeric=gnumeric.desktop application/tab-separated-values=gnumeric.desktop text/tab-separated-values=gnumeric.desktop @@ -218,130 +218,128 @@ application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop x-content/software=nautilus-autorun-software.desktop -inode/directory=nautilus.desktop -application/x-gnome-saved-search=nautilus.desktop +inode/directory=org.gnome.Nautilus.desktop +application/x-gnome-saved-search=org.gnome.Nautilus.desktop x-content/audio-player=rhythmbox.desktop x-content/audio-cdda=sound-juicer.desktop -application/x-shockwave-flash=swfdec-player.desktop -application/futuresplash=swfdec-player.desktop -application/mxf=totem.desktop -application/ogg=totem.desktop -application/ram=totem.desktop -application/sdp=totem.desktop -application/smil=totem.desktop -application/smil+xml=totem.desktop -application/vnd.ms-wpl=totem.desktop -application/vnd.rn-realmedia=totem.desktop -application/x-extension-m4a=totem.desktop -application/x-extension-mp4=totem.desktop -application/x-flac=totem.desktop -application/x-flash-video=totem.desktop -application/x-matroska=totem.desktop -application/x-netshow-channel=totem.desktop -application/x-ogg=totem.desktop -application/x-quicktime-media-link=totem.desktop -application/x-quicktimeplayer=totem.desktop -application/x-shorten=totem.desktop -application/x-smil=totem.desktop -application/xspf+xml=totem.desktop -audio/3gpp=totem.desktop -audio/ac3=totem.desktop -audio/AMR=totem.desktop -audio/AMR-WB=totem.desktop -audio/basic=totem.desktop -audio/flac=totem.desktop -audio/midi=totem.desktop -audio/mp4=totem.desktop -audio/mpeg=totem.desktop -audio/mpegurl=totem.desktop -audio/ogg=totem.desktop -audio/prs.sid=totem.desktop -audio/vnd.rn-realaudio=totem.desktop -audio/x-ape=totem.desktop -audio/x-flac=totem.desktop -audio/x-gsm=totem.desktop -audio/x-it=totem.desktop -audio/x-m4a=totem.desktop -audio/x-matroska=totem.desktop -audio/x-mod=totem.desktop -audio/x-mp3=totem.desktop -audio/x-mpeg=totem.desktop -audio/x-mpegurl=totem.desktop -audio/x-ms-asf=totem.desktop -audio/x-ms-asx=totem.desktop -audio/x-ms-wax=totem.desktop -audio/x-ms-wma=totem.desktop -audio/x-musepack=totem.desktop -audio/x-pn-aiff=totem.desktop -audio/x-pn-au=totem.desktop -audio/x-pn-realaudio=totem.desktop -audio/x-pn-realaudio-plugin=totem.desktop -audio/x-pn-wav=totem.desktop -audio/x-pn-windows-acm=totem.desktop -audio/x-realaudio=totem.desktop -audio/x-real-audio=totem.desktop -audio/x-sbc=totem.desktop -audio/x-scpls=totem.desktop -audio/x-speex=totem.desktop -audio/x-tta=totem.desktop -audio/x-vorbis=totem.desktop -audio/x-vorbis+ogg=totem.desktop -audio/x-wav=totem.desktop -audio/x-wavpack=totem.desktop -audio/x-xm=totem.desktop -image/vnd.rn-realpix=totem.desktop -image/x-pict=totem.desktop -misc/ultravox=totem.desktop -text/google-video-pointer=totem.desktop -text/x-google-video-pointer=totem.desktop -video/3gpp=totem.desktop -video/dv=totem.desktop -video/fli=totem.desktop -video/flv=totem.desktop -video/mp2t=totem.desktop -video/mp4=totem.desktop -video/mp4v-es=totem.desktop -video/mpeg=totem.desktop -video/msvideo=totem.desktop -video/ogg=totem.desktop -video/quicktime=totem.desktop -video/vivo=totem.desktop -video/vnd.divx=totem.desktop -video/vnd.rn-realvideo=totem.desktop -video/vnd.vivo=totem.desktop -video/webm=totem.desktop -video/x-anim=totem.desktop -video/x-avi=totem.desktop -video/x-flc=totem.desktop -video/x-fli=totem.desktop -video/x-flic=totem.desktop -video/x-flv=totem.desktop -video/x-m4v=totem.desktop -video/x-matroska=totem.desktop -video/x-mpeg=totem.desktop -video/x-ms-asf=totem.desktop -video/x-ms-asx=totem.desktop -video/x-msvideo=totem.desktop -video/x-ms-wm=totem.desktop -video/x-ms-wmv=totem.desktop -video/x-ms-wmx=totem.desktop -video/x-ms-wvx=totem.desktop -video/x-nsv=totem.desktop -video/x-ogm+ogg=totem.desktop -video/x-theora+ogg=totem.desktop -video/x-totem-stream=totem.desktop -x-content/video-dvd=totem.desktop -x-content/video-vcd=totem.desktop -x-content/video-svcd=totem.desktop -x-scheme-handler/pnm=totem.desktop -x-scheme-handler/mms=totem.desktop -x-scheme-handler/net=totem.desktop -x-scheme-handler/rtp=totem.desktop -x-scheme-handler/rtsp=totem.desktop -x-scheme-handler/mmsh=totem.desktop -x-scheme-handler/uvox=totem.desktop -x-scheme-handler/icy=totem.desktop -x-scheme-handler/icyx=totem.desktop +application/mxf=org.gnome.Totem.desktop +application/ogg=org.gnome.Totem.desktop +application/ram=org.gnome.Totem.desktop +application/sdp=org.gnome.Totem.desktop +application/smil=org.gnome.Totem.desktop +application/smil+xml=org.gnome.Totem.desktop +application/vnd.ms-wpl=org.gnome.Totem.desktop +application/vnd.rn-realmedia=org.gnome.Totem.desktop +application/x-extension-m4a=org.gnome.Totem.desktop +application/x-extension-mp4=org.gnome.Totem.desktop +application/x-flac=org.gnome.Totem.desktop +application/x-flash-video=org.gnome.Totem.desktop +application/x-matroska=org.gnome.Totem.desktop +application/x-netshow-channel=org.gnome.Totem.desktop +application/x-ogg=org.gnome.Totem.desktop +application/x-quicktime-media-link=org.gnome.Totem.desktop +application/x-quicktimeplayer=org.gnome.Totem.desktop +application/x-shorten=org.gnome.Totem.desktop +application/x-smil=org.gnome.Totem.desktop +application/xspf+xml=org.gnome.Totem.desktop +audio/3gpp=org.gnome.Totem.desktop +audio/ac3=org.gnome.Totem.desktop +audio/AMR=org.gnome.Totem.desktop +audio/AMR-WB=org.gnome.Totem.desktop +audio/basic=org.gnome.Totem.desktop +audio/flac=org.gnome.Totem.desktop +audio/midi=org.gnome.Totem.desktop +audio/mp4=org.gnome.Totem.desktop +audio/mpeg=org.gnome.Totem.desktop +audio/mpegurl=org.gnome.Totem.desktop +audio/ogg=org.gnome.Totem.desktop +audio/prs.sid=org.gnome.Totem.desktop +audio/vnd.rn-realaudio=org.gnome.Totem.desktop +audio/x-ape=org.gnome.Totem.desktop +audio/x-flac=org.gnome.Totem.desktop +audio/x-gsm=org.gnome.Totem.desktop +audio/x-it=org.gnome.Totem.desktop +audio/x-m4a=org.gnome.Totem.desktop +audio/x-matroska=org.gnome.Totem.desktop +audio/x-mod=org.gnome.Totem.desktop +audio/x-mp3=org.gnome.Totem.desktop +audio/x-mpeg=org.gnome.Totem.desktop +audio/x-mpegurl=org.gnome.Totem.desktop +audio/x-ms-asf=org.gnome.Totem.desktop +audio/x-ms-asx=org.gnome.Totem.desktop +audio/x-ms-wax=org.gnome.Totem.desktop +audio/x-ms-wma=org.gnome.Totem.desktop +audio/x-musepack=org.gnome.Totem.desktop +audio/x-pn-aiff=org.gnome.Totem.desktop +audio/x-pn-au=org.gnome.Totem.desktop +audio/x-pn-realaudio=org.gnome.Totem.desktop +audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop +audio/x-pn-wav=org.gnome.Totem.desktop +audio/x-pn-windows-acm=org.gnome.Totem.desktop +audio/x-realaudio=org.gnome.Totem.desktop +audio/x-real-audio=org.gnome.Totem.desktop +audio/x-sbc=org.gnome.Totem.desktop +audio/x-scpls=org.gnome.Totem.desktop +audio/x-speex=org.gnome.Totem.desktop +audio/x-tta=org.gnome.Totem.desktop +audio/x-vorbis=org.gnome.Totem.desktop +audio/x-vorbis+ogg=org.gnome.Totem.desktop +audio/x-wav=org.gnome.Totem.desktop +audio/x-wavpack=org.gnome.Totem.desktop +audio/x-xm=org.gnome.Totem.desktop +image/vnd.rn-realpix=org.gnome.Totem.desktop +image/x-pict=org.gnome.Totem.desktop +misc/ultravox=org.gnome.Totem.desktop +text/google-video-pointer=org.gnome.Totem.desktop +text/x-google-video-pointer=org.gnome.Totem.desktop +video/3gpp=org.gnome.Totem.desktop +video/dv=org.gnome.Totem.desktop +video/fli=org.gnome.Totem.desktop +video/flv=org.gnome.Totem.desktop +video/mp2t=org.gnome.Totem.desktop +video/mp4=org.gnome.Totem.desktop +video/mp4v-es=org.gnome.Totem.desktop +video/mpeg=org.gnome.Totem.desktop +video/msvideo=org.gnome.Totem.desktop +video/ogg=org.gnome.Totem.desktop +video/quicktime=org.gnome.Totem.desktop +video/vivo=org.gnome.Totem.desktop +video/vnd.divx=org.gnome.Totem.desktop +video/vnd.rn-realvideo=org.gnome.Totem.desktop +video/vnd.vivo=org.gnome.Totem.desktop +video/webm=org.gnome.Totem.desktop +video/x-anim=org.gnome.Totem.desktop +video/x-avi=org.gnome.Totem.desktop +video/x-flc=org.gnome.Totem.desktop +video/x-fli=org.gnome.Totem.desktop +video/x-flic=org.gnome.Totem.desktop +video/x-flv=org.gnome.Totem.desktop +video/x-m4v=org.gnome.Totem.desktop +video/x-matroska=org.gnome.Totem.desktop +video/x-mpeg=org.gnome.Totem.desktop +video/x-ms-asf=org.gnome.Totem.desktop +video/x-ms-asx=org.gnome.Totem.desktop +video/x-msvideo=org.gnome.Totem.desktop +video/x-ms-wm=org.gnome.Totem.desktop +video/x-ms-wmv=org.gnome.Totem.desktop +video/x-ms-wmx=org.gnome.Totem.desktop +video/x-ms-wvx=org.gnome.Totem.desktop +video/x-nsv=org.gnome.Totem.desktop +video/x-ogm+ogg=org.gnome.Totem.desktop +video/x-theora+ogg=org.gnome.Totem.desktop +video/x-totem-stream=org.gnome.Totem.desktop +x-content/video-dvd=org.gnome.Totem.desktop +x-content/video-vcd=org.gnome.Totem.desktop +x-content/video-svcd=org.gnome.Totem.desktop +x-scheme-handler/pnm=org.gnome.Totem.desktop +x-scheme-handler/mms=org.gnome.Totem.desktop +x-scheme-handler/net=org.gnome.Totem.desktop +x-scheme-handler/rtp=org.gnome.Totem.desktop +x-scheme-handler/rtsp=org.gnome.Totem.desktop +x-scheme-handler/mmsh=org.gnome.Totem.desktop +x-scheme-handler/uvox=org.gnome.Totem.desktop +x-scheme-handler/icy=org.gnome.Totem.desktop +x-scheme-handler/icyx=org.gnome.Totem.desktop x-scheme-handler/ghelp=yelp.desktop x-scheme-handler/help=yelp.desktop x-scheme-handler/info=yelp.desktop diff -Nru gnome-session-3.9.90/debian/gnome-session-common.dirs gnome-session-3.14.0/debian/gnome-session-common.dirs --- gnome-session-3.9.90/debian/gnome-session-common.dirs 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.14.0/debian/gnome-session-common.dirs 2014-10-31 08:20:49.000000000 +0000 @@ -0,0 +1 @@ +usr/share/gnome/applications diff -Nru gnome-session-3.9.90/debian/gnome-session-common.install gnome-session-3.14.0/debian/gnome-session-common.install --- gnome-session-3.9.90/debian/gnome-session-common.install 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/gnome-session-common.install 2014-10-31 08:20:49.000000000 +0000 @@ -3,3 +3,4 @@ usr/share/locale debian/55gnome-session_gnomerc etc/X11/Xsession.d #debian/defaults.list etc/gnome + diff -Nru gnome-session-3.9.90/debian/gnome-session.install gnome-session-3.14.0/debian/gnome-session.install --- gnome-session-3.9.90/debian/gnome-session.install 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/gnome-session.install 2014-10-31 08:20:49.000000000 +0000 @@ -1,3 +1,5 @@ usr/share/doc usr/share/xsessions/gnome.desktop usr/share/gnome-session/sessions/gnome.session +#usr/share/gnome-session/sessions/gnome-wayland.session +#usr/share/wayland-sessions/gnome-wayland.desktop diff -Nru gnome-session-3.9.90/debian/patches/01_gnome-wm.patch gnome-session-3.14.0/debian/patches/01_gnome-wm.patch --- gnome-session-3.9.90/debian/patches/01_gnome-wm.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/01_gnome-wm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Index: gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in -=================================================================== ---- gnome-session-3.0.0.orig/data/gnome-fallback.session.desktop.in.in 2011-04-20 21:19:19.751604438 +0200 -+++ gnome-session-3.0.0/data/gnome-fallback.session.desktop.in.in 2011-04-20 21:19:24.495627620 +0200 -@@ -2,5 +2,5 @@ - _Name=GNOME fallback - RequiredComponents=gnome-panel;gnome-settings-daemon; - RequiredProviders=windowmanager;notifications; --DefaultProvider-windowmanager=metacity -+DefaultProvider-windowmanager=gnome-wm - DefaultProvider-notifications=notification-daemon diff -Nru gnome-session-3.9.90/debian/patches/02_fallback_desktop.patch gnome-session-3.14.0/debian/patches/02_fallback_desktop.patch --- gnome-session-3.9.90/debian/patches/02_fallback_desktop.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/02_fallback_desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Index: gnome-session-3.0.2/data/gnome-fallback.desktop.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gnome-session-3.0.2/data/gnome-fallback.desktop.in 2011-11-04 20:06:03.653307488 +0100 -@@ -0,0 +1,7 @@ -+[Desktop Entry] -+_Name=GNOME Classic -+_Comment=This session logs you into GNOME -+Exec=gnome-session-fallback -+TryExec=gnome-session -+Icon= -+Type=Application diff -Nru gnome-session-3.9.90/debian/patches/03_fallback_desktop_makefile.patch gnome-session-3.14.0/debian/patches/03_fallback_desktop_makefile.patch --- gnome-session-3.9.90/debian/patches/03_fallback_desktop_makefile.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/03_fallback_desktop_makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: gnome-session-3.4.0/data/Makefile.am -=================================================================== ---- gnome-session-3.4.0.orig/data/Makefile.am 2011-10-21 16:35:39.000000000 +0200 -+++ gnome-session-3.4.0/data/Makefile.am 2012-04-06 23:20:36.422851504 +0200 -@@ -9,7 +9,7 @@ - hwcompat_DATA = hardware-compatibility - - xsessiondir = $(datadir)/xsessions --xsession_in_files = gnome.desktop.in -+xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in - xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) - - desktopdir = $(datadir)/applications diff -Nru gnome-session-3.9.90/debian/patches/101_screen_lock_on_suspend.patch gnome-session-3.14.0/debian/patches/101_screen_lock_on_suspend.patch --- gnome-session-3.9.90/debian/patches/101_screen_lock_on_suspend.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/101_screen_lock_on_suspend.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -Description: Use the same logic as gnome-power-manager for deciding the "screen lock on suspend" policy. This restores the Jaunty behaviour rather than just using the screensaver settings, which is surprising for users -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=598118 -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/karmic/+source/gnome-session/+bug/446191 - -Index: gnome-session-2.32.1/gnome-session/gsm-manager.c -=================================================================== ---- gnome-session-2.32.1.orig/gnome-session/gsm-manager.c 2010-12-06 13:26:17.733212002 +0100 -+++ gnome-session-2.32.1/gnome-session/gsm-manager.c 2010-12-06 13:26:17.829212002 +0100 -@@ -85,6 +85,9 @@ - #define KEY_AUTOSAVE KEY_GNOME_SESSION_DIR "/auto_save_session" - - #define KEY_SLEEP_LOCK "/apps/gnome-screensaver/lock_enabled" -+#define KEY_SLEEP_LOCK_USE_SCREENSAVER "/apps/gnome-power-manager/lock/use_screensaver_settings" -+#define GPM_CONF_LOCK_ON_SUSPEND "/apps/gnome-power-manager/lock/suspend" -+#define GPM_CONF_LOCK_ON_HIBERNATE "/apps/gnome-power-manager/lock/hibernate" - - typedef enum - { -@@ -975,18 +978,33 @@ - } - - static gboolean --sleep_lock_is_enabled (GsmManager *manager) -+sleep_lock_is_enabled (GsmManager *manager, -+ const gchar *policy) - { -- GError *error; -- gboolean enable_lock; -+ GError *error; -+ gboolean enable_lock; -+ gboolean use_ss_setting; -+ const gchar *real_policy; - - error = NULL; -+ use_ss_setting = gconf_client_get_bool (manager->priv->gconf_client, -+ KEY_SLEEP_LOCK_USE_SCREENSAVER, &error); -+ if (error) { -+ g_warning ("Error retrieving configuration key '%s': %s", -+ KEY_SLEEP_LOCK_USE_SCREENSAVER, error->message); -+ g_error_free (error); -+ -+ use_ss_setting = FALSE; -+ } -+ -+ real_policy = (use_ss_setting ? KEY_SLEEP_LOCK : policy); -+ - enable_lock = gconf_client_get_bool (manager->priv->gconf_client, -- KEY_SLEEP_LOCK, &error); -+ real_policy, &error); - - if (error) { - g_warning ("Error retrieving configuration key '%s': %s", -- KEY_SLEEP_LOCK, error->message); -+ real_policy, error->message); - g_error_free (error); - - /* If we fail to query gconf key, just enable locking */ -@@ -997,13 +1015,14 @@ - } - - static void --manager_perhaps_lock (GsmManager *manager) -+manager_perhaps_lock (GsmManager *manager, -+ const gchar *policy) - { - GError *error; - gboolean ret; - - /* only lock if gnome-screensaver is set to lock */ -- if (!sleep_lock_is_enabled (manager)) { -+ if (!sleep_lock_is_enabled (manager, policy)) { - return; - } - -@@ -1035,7 +1054,7 @@ - if (can_hibernate) { - - /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -+ manager_perhaps_lock (manager, GPM_CONF_LOCK_ON_HIBERNATE); - - error = NULL; - ret = up_client_hibernate_sync (manager->priv->up_client, NULL, &error); -@@ -1059,7 +1078,7 @@ - if (can_suspend) { - - /* lock the screen before we suspend */ -- manager_perhaps_lock (manager); -+ manager_perhaps_lock (manager, GPM_CONF_LOCK_ON_SUSPEND); - - error = NULL; - ret = up_client_suspend_sync (manager->priv->up_client, NULL, &error); diff -Nru gnome-session-3.9.90/debian/patches/10_session_save.patch gnome-session-3.14.0/debian/patches/10_session_save.patch --- gnome-session-3.9.90/debian/patches/10_session_save.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/10_session_save.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,536 +0,0 @@ -Based on the patch in GNOME #575544 - -Index: gnome-session-3.0.0/gnome-session/gsm-manager.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c 2011-03-30 09:47:33.000000000 +0200 -+++ gnome-session-3.0.0/gnome-session/gsm-manager.c 2011-04-20 21:13:32.237905522 +0200 -@@ -79,6 +79,7 @@ - * let's make this fairly long. - */ - #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ -+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 - - #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" - #define GDM_FLEXISERVER_ARGS "--startnew Standard" -@@ -1405,6 +1406,69 @@ query_end_session_complete (GsmManager * - - } - -+static gboolean -+_client_request_save (GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ gboolean ret; -+ GError *error; -+ -+ error = NULL; -+ ret = gsm_client_request_save (client, data->flags, &error); -+ if (ret) { -+ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client)); -+ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients, -+ client); -+ } else if (error) { -+ g_debug ("GsmManager: unable to query client: %s", error->message); -+ g_error_free (error); -+ } -+ -+ return FALSE; -+} -+ -+static gboolean -+_client_request_save_helper (const char *id, -+ GsmClient *client, -+ ClientEndSessionData *data) -+{ -+ return _client_request_save (client, data); -+} -+ -+static void -+query_save_session_complete (GsmManager *manager) -+{ -+ GError *error = NULL; -+ -+ if (g_slist_length (manager->priv->next_query_clients) > 0) { -+ ClientEndSessionData data; -+ -+ data.manager = manager; -+ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST; -+ -+ g_slist_foreach (manager->priv->next_query_clients, -+ (GFunc)_client_request_save, -+ &data); -+ -+ g_slist_free (manager->priv->next_query_clients); -+ manager->priv->next_query_clients = NULL; -+ -+ return; -+ } -+ -+ if (manager->priv->query_timeout_id > 0) { -+ g_source_remove (manager->priv->query_timeout_id); -+ manager->priv->query_timeout_id = 0; -+ } -+ -+ gsm_session_save (manager->priv->clients, &error); -+ -+ if (error) { -+ g_warning ("Error saving session: %s", error->message); -+ g_error_free (error); -+ } -+} -+ - static guint32 - generate_cookie (void) - { -@@ -1485,6 +1549,21 @@ _on_query_end_session_timeout (GsmManage - return FALSE; - } - -+static gboolean -+_on_query_save_session_timeout (GsmManager *manager) -+{ -+ manager->priv->query_timeout_id = 0; -+ -+ g_debug ("GsmManager: query to save session timed out"); -+ -+ g_slist_free (manager->priv->query_clients); -+ manager->priv->query_clients = NULL; -+ -+ query_save_session_complete (manager); -+ -+ return FALSE; -+} -+ - static void - do_phase_query_end_session (GsmManager *manager) - { -@@ -2160,13 +2239,32 @@ _handle_client_end_session_response (Gsm - gboolean cancel, - const char *reason) - { -- /* just ignore if received outside of shutdown */ -- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) { -+ /* just ignore if we are not yet running */ -+ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) { - return; - } - - g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :""); - -+ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) { -+ /* Ignore responses when no requests were sent */ -+ if (manager->priv->query_clients == NULL) { -+ return; -+ } -+ -+ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client); -+ -+ if (do_last) { -+ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients, -+ client); -+ } -+ -+ if (manager->priv->query_clients == NULL) { -+ query_save_session_complete (manager); -+ } -+ return; -+ } -+ - if (cancel) { - cancel_end_session (manager); - return; -@@ -2281,6 +2379,15 @@ on_xsmp_client_logout_request (GsmXSMPCl - } - - static void -+on_xsmp_client_save_request (GsmXSMPClient *client, -+ gboolean show_dialog, -+ GsmManager *manager) -+{ -+ g_debug ("GsmManager: save_request"); -+ gsm_manager_save_session (manager, NULL); -+} -+ -+static void - on_store_client_added (GsmStore *store, - const char *id, - GsmManager *manager) -@@ -2301,6 +2408,10 @@ on_store_client_added (GsmStore *store - "logout-request", - G_CALLBACK (on_xsmp_client_logout_request), - manager); -+ g_signal_connect (client, -+ "save-request", -+ G_CALLBACK (on_xsmp_client_save_request), -+ manager); - } - - g_signal_connect (client, -@@ -3324,6 +3435,41 @@ gsm_manager_shutdown (GsmManager *manage - } - - gboolean -+gsm_manager_save_session (GsmManager *manager, -+ GError **error) -+{ -+ ClientEndSessionData data; -+ -+ g_debug ("GsmManager: SaveSession called"); -+ -+ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); -+ -+ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { -+ g_set_error (error, -+ GSM_MANAGER_ERROR, -+ GSM_MANAGER_ERROR_NOT_IN_RUNNING, -+ "SaveSession interface is only available during the Running phase"); -+ return FALSE; -+ } -+ -+ data.manager = manager; -+ data.flags = 0; -+ gsm_store_foreach (manager->priv->clients, -+ (GsmStoreFunc)_client_request_save_helper, -+ &data); -+ -+ if (manager->priv->query_clients) { -+ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT, -+ (GSourceFunc)_on_query_save_session_timeout, -+ manager); -+ return TRUE; -+ } else { -+ g_debug ("GsmManager: Nothing to save"); -+ return FALSE; -+ } -+} -+ -+gboolean - gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error) -Index: gnome-session-3.0.0/gnome-session/gsm-manager.h -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.h 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-manager.h 2011-04-20 21:12:54.057718875 +0200 -@@ -164,6 +164,9 @@ gboolean gsm_manager_is_inhib - gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); - -+gboolean gsm_manager_save_session (GsmManager *manager, -+ GError **error); -+ - gboolean gsm_manager_can_shutdown (GsmManager *manager, - gboolean *shutdown_available, - GError **error); -Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.c 2011-04-20 21:12:54.057718875 +0200 -@@ -68,6 +68,7 @@ enum { - enum { - REGISTER_REQUEST, - LOGOUT_REQUEST, -+ SAVE_REQUEST, - LAST_SIGNAL - }; - -@@ -501,6 +502,30 @@ xsmp_cancel_end_session (GsmClient *clie - return TRUE; - } - -+static gboolean -+xsmp_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ GsmXSMPClient *xsmp = (GsmXSMPClient *) client; -+ -+ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description); -+ -+ if (xsmp->priv->conn == NULL) { -+ g_set_error (error, -+ GSM_CLIENT_ERROR, -+ GSM_CLIENT_ERROR_NOT_REGISTERED, -+ "Client is not registered"); -+ return FALSE; -+ } -+ -+ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST) -+ xsmp_save_yourself_phase2 (client); -+ else -+ do_save_yourself (xsmp, SmSaveLocal, FALSE); -+ -+ return TRUE; -+} - static char * - get_desktop_file_path (GsmXSMPClient *client) - { -@@ -970,6 +995,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien - object_class->get_property = gsm_xsmp_client_get_property; - object_class->set_property = gsm_xsmp_client_set_property; - -+ client_class->impl_request_save = xsmp_request_save; - client_class->impl_save = xsmp_save; - client_class->impl_stop = xsmp_stop; - client_class->impl_query_end_session = xsmp_query_end_session; -@@ -997,6 +1023,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien - NULL, - NULL, - g_cclosure_marshal_VOID__BOOLEAN, -+ G_TYPE_NONE, -+ 1, G_TYPE_BOOLEAN); -+ -+ signals[SAVE_REQUEST] = -+ g_signal_new ("save-request", -+ G_OBJECT_CLASS_TYPE (object_class), -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request), -+ NULL, -+ NULL, -+ g_cclosure_marshal_VOID__BOOLEAN, - G_TYPE_NONE, - 1, G_TYPE_BOOLEAN); - -Index: gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-xsmp-client.h 2010-02-09 14:22:01.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-xsmp-client.h 2011-04-20 21:12:54.061718891 +0200 -@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass - char **client_id); - gboolean (*logout_request) (GsmXSMPClient *client, - gboolean prompt); -- -+ gboolean (*save_request) (GsmXSMPClient *client, -+ gboolean prompt); - - void (*saved_state) (GsmXSMPClient *client); - -Index: gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/org.gnome.SessionManager.xml 2010-02-09 14:22:01.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/org.gnome.SessionManager.xml 2011-04-20 21:12:54.061718891 +0200 -@@ -256,6 +256,14 @@ - - - -+ -+ -+ -+ Request to save session -+ -+ -+ -+ - - - -Index: gnome-session-3.0.0/capplet/gsm-properties-dialog.c -=================================================================== ---- gnome-session-3.0.0.orig/capplet/gsm-properties-dialog.c 2011-03-22 21:31:42.000000000 +0100 -+++ gnome-session-3.0.0/capplet/gsm-properties-dialog.c 2011-04-20 21:12:54.061718891 +0200 -@@ -33,6 +33,12 @@ - #include "gsm-util.h" - #include "gsp-app.h" - #include "gsp-app-manager.h" -+#include -+#include -+ -+#define GSM_SERVICE_DBUS "org.gnome.SessionManager" -+#define GSM_PATH_DBUS "/org/gnome/SessionManager" -+#define GSM_INTERFACE_DBUS "org.gnome.SessionManager" - - #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) - -@@ -43,6 +49,7 @@ - #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" - #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" - #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" -+#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label" - #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" - - #define STARTUP_APP_ICON "system-run" -@@ -455,10 +462,64 @@ on_row_activated (GtkTreeView *t - } - - static void -+session_saved_message (GsmPropertiesDialog *dialog, -+ const char *msg, -+ gboolean is_error) -+{ -+ GtkLabel *label; -+ gchar *markup; -+ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME)); -+ if (is_error) -+ markup = g_markup_printf_escaped ("%s", msg); -+ else -+ markup = g_markup_escape_text (msg, -1); -+ gtk_label_set_markup (label, markup); -+ g_free (markup); -+} -+ -+static void -+session_saved_cb (DBusGProxy *proxy, -+ DBusGProxyCall *call_id, -+ void *user_data) -+{ -+ gboolean res; -+ GsmPropertiesDialog *dialog = user_data; -+ -+ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID); -+ if (res) -+ session_saved_message (dialog, _("Your session has been saved."), FALSE); -+ else -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ -+ g_object_unref (proxy); -+} -+ -+static void - on_save_session_clicked (GtkWidget *widget, - GsmPropertiesDialog *dialog) - { -- g_debug ("Session saving is not implemented yet!"); -+ DBusGConnection *conn; -+ DBusGProxy *proxy; -+ DBusGProxyCall *call; -+ -+ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL); -+ if (conn == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE); -+ return; -+ } -+ -+ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS); -+ if (proxy == NULL) { -+ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE); -+ return; -+ } -+ -+ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID); -+ if (call == NULL) { -+ session_saved_message (dialog, _("Failed to save session"), TRUE); -+ g_object_unref (proxy); -+ return; -+ } - } - - static void -Index: gnome-session-3.0.0/configure.ac -=================================================================== ---- gnome-session-3.0.0.orig/configure.ac 2011-03-30 09:47:33.000000000 +0200 -+++ gnome-session-3.0.0/configure.ac 2011-04-20 21:12:54.061718891 +0200 -@@ -63,6 +63,7 @@ PKG_CHECK_MODULES(GNOME_SESSION, - PKG_CHECK_MODULES(SESSION_PROPERTIES, - glib-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK3_REQUIRED -+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED - ) - - PKG_CHECK_MODULES(SM, sm) -Index: gnome-session-3.0.0/gnome-session/gsm-client.h -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-client.h 2010-02-09 14:22:01.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-client.h 2011-04-20 21:12:54.061718891 +0200 -@@ -92,6 +92,9 @@ struct _GsmClientClass - GError **error); - gboolean (*impl_stop) (GsmClient *client, - GError **error); -+ gboolean (*impl_request_save) (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile * (*impl_save) (GsmClient *client, - GError **error); - }; -@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_ - - void gsm_client_disconnected (GsmClient *client); - -+gboolean gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error); - GKeyFile *gsm_client_save (GsmClient *client, - GError **error); - /* exported to bus */ -Index: gnome-session-3.0.0/gnome-session/gsm-dbus-client.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-dbus-client.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-dbus-client.c 2011-04-20 21:12:54.061718891 +0200 -@@ -412,6 +412,19 @@ gsm_dbus_client_finalize (GObject *objec - G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object); - } - -+static gboolean -+dbus_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_debug ("GsmDBusClient: sending save request to client with id %s", -+ gsm_client_peek_id (client)); -+ -+ /* FIXME: The protocol does not support this */ -+ -+ return FALSE; -+} -+ - static GKeyFile * - dbus_client_save (GsmClient *client, - GError **error) -@@ -664,6 +677,7 @@ gsm_dbus_client_class_init (GsmDBusClien - object_class->set_property = gsm_dbus_client_set_property; - object_class->dispose = gsm_dbus_client_dispose; - -+ client_class->impl_request_save = dbus_client_request_save; - client_class->impl_save = dbus_client_save; - client_class->impl_stop = dbus_client_stop; - client_class->impl_query_end_session = dbus_client_query_end_session; -Index: gnome-session-3.0.0/gnome-session/gsm-client.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-client.c 2010-02-09 14:22:01.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-client.c 2011-04-20 21:12:54.061718891 +0200 -@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie - g_signal_emit (client, signals[DISCONNECTED], 0); - } - -+gboolean -+gsm_client_request_save (GsmClient *client, -+ guint flags, -+ GError **error) -+{ -+ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE); -+ -+ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error); -+} -+ - GKeyFile * - gsm_client_save (GsmClient *client, - GError **error) -Index: gnome-session-3.0.0/data/session-properties.ui -=================================================================== ---- gnome-session-3.0.0.orig/data/session-properties.ui 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/data/session-properties.ui 2011-04-20 21:12:54.061718891 +0200 -@@ -148,6 +148,7 @@ - True - - -+ True - True - True - -@@ -191,6 +192,17 @@ - 1 - - -+ -+ -+ True -+ True -+ -+ -+ False -+ False -+ 2 -+ -+ - - - 1 diff -Nru gnome-session-3.9.90/debian/patches/12_no_gdm_fallback.patch gnome-session-3.14.0/debian/patches/12_no_gdm_fallback.patch --- gnome-session-3.9.90/debian/patches/12_no_gdm_fallback.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/12_no_gdm_fallback.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -Debian #572085 - -Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it -will not be attempted anyway. - -Index: gnome-session-3.5.4/gnome-session/gsm-manager.c -=================================================================== ---- gnome-session-3.5.4.orig/gnome-session/gsm-manager.c 2012-07-19 13:41:23.511406643 +1200 -+++ gnome-session-3.5.4/gnome-session/gsm-manager.c 2012-07-19 13:41:50.227405715 +1200 -@@ -492,7 +492,7 @@ - g_signal_connect (manager->priv->system, - "request-completed", - G_CALLBACK (quit_request_completed), -- GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT)); -+ GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE)); - gsm_system_attempt_restart (manager->priv->system); - break; - case GSM_MANAGER_LOGOUT_REBOOT_GDM: -@@ -506,7 +506,7 @@ - g_signal_connect (manager->priv->system, - "request-completed", - G_CALLBACK (quit_request_completed), -- GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN)); -+ GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE)); - gsm_system_attempt_stop (manager->priv->system); - break; - case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: diff -Nru gnome-session-3.9.90/debian/patches/13_display_session_properties.patch gnome-session-3.14.0/debian/patches/13_display_session_properties.patch --- gnome-session-3.9.90/debian/patches/13_display_session_properties.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/13_display_session_properties.patch 2014-10-31 08:20:49.000000000 +0000 @@ -4,11 +4,11 @@ the builtian search. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=683814 -Index: gnome-session-3.4.2.1/data/session-properties.desktop.in.in +Index: gnome-session/data/gnome-session-properties.desktop.in.in =================================================================== ---- gnome-session-3.4.2.1.orig/data/session-properties.desktop.in.in 2012-05-17 20:26:07.000000000 +0200 -+++ gnome-session-3.4.2.1/data/session-properties.desktop.in.in 2012-08-07 01:08:23.755210722 +0200 -@@ -8,7 +8,6 @@ +--- gnome-session.orig/data/gnome-session-properties.desktop.in.in ++++ gnome-session/data/gnome-session-properties.desktop.in.in +@@ -8,7 +8,6 @@ Type=Application StartupNotify=true Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings; OnlyShowIn=GNOME;Unity; diff -Nru gnome-session-3.9.90/debian/patches/50_ubuntu_sessions.patch gnome-session-3.14.0/debian/patches/50_ubuntu_sessions.patch --- gnome-session-3.9.90/debian/patches/50_ubuntu_sessions.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/50_ubuntu_sessions.patch 2014-10-31 08:20:49.000000000 +0000 @@ -4,9 +4,11 @@ (TryExec enables to show them or not depends on the package installed) Forwarded: Not needed ---- a/data/gnome.desktop.in -+++ b/data/gnome.desktop.in -@@ -1,7 +1,8 @@ +Index: gnome-session/data/gnome.desktop.in +=================================================================== +--- gnome-session.orig/data/gnome.desktop.in ++++ gnome-session/data/gnome.desktop.in +@@ -1,8 +1,9 @@ [Desktop Entry] _Name=GNOME _Comment=This session logs you into GNOME @@ -16,10 +18,13 @@ +TryExec=gnome-shell Icon= Type=Application + DesktopNames=GNOME +X-LightDM-DesktopName=GNOME ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -13,7 +13,7 @@ +Index: gnome-session/data/Makefile.am +=================================================================== +--- gnome-session.orig/data/Makefile.am ++++ gnome-session/data/Makefile.am +@@ -12,7 +12,7 @@ hwcompatdir = $(pkgdatadir) hwcompat_DATA = hardware-compatibility xsessiondir = $(datadir)/xsessions @@ -28,25 +33,29 @@ if BUILD_SESSION_SELECTOR xsession_in_files += gnome-custom-session.desktop.in -@@ -26,7 +26,7 @@ +@@ -29,7 +29,7 @@ desktop_in_files = gnome-session-propert desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) sessiondir = $(datadir)/gnome-session/sessions --session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in -+session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in ubuntu.session.desktop.in.in +-session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in ++session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in ubuntu.session.desktop.in.in session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in) session_DATA = $(session_in_files:.session.desktop.in=.session) +Index: gnome-session/data/ubuntu.session.desktop.in.in +=================================================================== --- /dev/null -+++ b/data/ubuntu.session.desktop.in.in ++++ gnome-session/data/ubuntu.session.desktop.in.in @@ -0,0 +1,4 @@ +[GNOME Session] +_Name=Ubuntu -+RequiredComponents=unity-settings-daemon; ++RequiredComponents=unity-settings-daemon;compiz; +DesktopName=Unity +Index: gnome-session/data/ubuntu.desktop.in +=================================================================== --- /dev/null -+++ b/data/ubuntu.desktop.in -@@ -0,0 +1,8 @@ ++++ gnome-session/data/ubuntu.desktop.in +@@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=Ubuntu +_Comment=This session logs you into Ubuntu @@ -54,4 +63,5 @@ +TryExec=unity +Icon= +Type=Application ++DesktopNames=Unity +X-LightDM-DesktopName=Unity diff -Nru gnome-session-3.9.90/debian/patches/52_xdg_current_desktop.patch gnome-session-3.14.0/debian/patches/52_xdg_current_desktop.patch --- gnome-session-3.9.90/debian/patches/52_xdg_current_desktop.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/52_xdg_current_desktop.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -Index: gnome-session-3.7.4/gnome-session/gsm-session-fill.c -=================================================================== ---- gnome-session-3.7.4.orig/gnome-session/gsm-session-fill.c 2013-02-07 18:04:28.954708097 -0500 -+++ gnome-session-3.7.4/gnome-session/gsm-session-fill.c 2013-02-07 18:04:28.946708097 -0500 -@@ -31,6 +31,7 @@ - #define GSM_KEYFILE_SESSION_GROUP "GNOME Session" - #define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper" - #define GSM_KEYFILE_FALLBACK_KEY "FallbackSession" -+#define GSM_KEYFILE_DESKTOP_NAME_KEY "DesktopName" - #define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents" - - /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */ -@@ -315,6 +316,24 @@ - return keyfile; - } - -+static void -+set_xdg_current_desktop (GKeyFile *keyfile) -+{ -+ char *value; -+ -+ value = g_key_file_get_string (keyfile, -+ GSM_KEYFILE_SESSION_GROUP, GSM_KEYFILE_DESKTOP_NAME_KEY, -+ NULL); -+ -+ if (!IS_STRING_EMPTY (value)) { -+ gsm_util_setenv ("XDG_CURRENT_DESKTOP", value); -+ } -+ else { -+ gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME"); -+ } -+ g_free (value); -+} -+ - gboolean - gsm_session_fill (GsmManager *manager, - const char *session) -@@ -332,6 +351,8 @@ - - g_free (actual_session); - -+ set_xdg_current_desktop (keyfile); -+ - load_standard_apps (manager, keyfile); - - g_key_file_free (keyfile); diff -Nru gnome-session-3.9.90/debian/patches/80_new_upstream_session_dialog.patch gnome-session-3.14.0/debian/patches/80_new_upstream_session_dialog.patch --- gnome-session-3.9.90/debian/patches/80_new_upstream_session_dialog.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/80_new_upstream_session_dialog.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,699 +0,0 @@ -Description: change the logout dialog to the opensuse proposal. -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=507101 -Author: Vincent Untz - -Index: gnome-session-3.0.0/gnome-session/gsm-manager.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-manager.c 2011-05-24 10:17:22.244968980 +0200 -+++ gnome-session-3.0.0/gnome-session/gsm-manager.c 2011-05-24 10:17:22.284969173 +0200 -@@ -3050,7 +3050,8 @@ - - display = gtk_widget_get_display (GTK_WIDGET (logout_dialog)); - -- gtk_widget_destroy (GTK_WIDGET (logout_dialog)); -+ if (response_id != GTK_RESPONSE_HELP) -+ gtk_widget_destroy (GTK_WIDGET (logout_dialog)); - - /* In case of dialog cancel, switch user, hibernate and - * suspend, we just perform the respective action and return, -@@ -3060,6 +3061,10 @@ - case GTK_RESPONSE_NONE: - case GTK_RESPONSE_DELETE_EVENT: - break; -+ case GTK_RESPONSE_HELP: -+ gsm_util_help_display (GTK_WINDOW (logout_dialog), -+ "gosgetstarted-73"); -+ break; - case GSM_LOGOUT_RESPONSE_SWITCH_USER: - request_switch_user (display, manager); - break; -Index: gnome-session-3.0.0/gnome-session/gsm-util.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-util.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-util.c 2011-05-24 10:17:22.284969173 +0200 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -519,3 +520,86 @@ - - return icon_size; - } -+ -+void -+gsm_util_help_display (GtkWindow *parent, -+ const char *link_id) -+{ -+ GError *error = NULL; -+ const char *lang; -+ char *uri = NULL; -+ gboolean found; -+ -+ int i; -+ -+ const char * const * langs = g_get_language_names (); -+ -+ uri = NULL; -+ found = FALSE; -+ -+ for (i = 0; langs[i]; i++) { -+ lang = langs[i]; -+ if (strchr (lang, '.')) { -+ continue; -+ } -+ -+ uri = g_build_filename (DATADIR, -+ "/gnome/help/user-guide/", -+ lang, -+ "/user-guide.xml", -+ NULL); -+ -+ if (g_file_test (uri, G_FILE_TEST_EXISTS)) { -+ found = TRUE; -+ break; -+ } -+ } -+ -+ if (found) { -+ GAppInfo *app_info; -+ char *command; -+ -+ if (link_id) { -+ command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL); -+ } else { -+ command = g_strconcat ("gnome-open ghelp://", uri, NULL); -+ } -+ -+ app_info = g_app_info_create_from_commandline (command, "gnome-open",G_APP_INFO_CREATE_NONE, &error); -+ g_free (command); -+ -+ if (error == NULL && app_info != NULL) { -+ GdkScreen *screen; -+ GdkAppLaunchContext *context; -+ -+ screen = gtk_widget_get_screen (GTK_WIDGET (parent)); -+ context = gdk_display_get_app_launch_context (gdk_screen_get_display (screen)); -+ g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (context), &error); -+ -+ g_object_unref (context); -+ g_object_unref (app_info); -+ } -+ } -+ -+ if (!found || error != NULL) { -+ GtkWidget *d; -+ const char *errmsg; -+ -+ if (!found) -+ errmsg = _("Cannot find help."); -+ else { -+ errmsg = error->message; -+ g_error_free (error); -+ } -+ -+ d = gtk_message_dialog_new (parent, -+ GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, -+ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, -+ "%s", errmsg); -+ gtk_widget_show (GTK_WIDGET (d)); -+ g_signal_connect (d, "response", -+ G_CALLBACK (gtk_widget_destroy), NULL); -+ } -+ -+ g_free (uri); -+} -Index: gnome-session-3.0.0/gnome-session/Makefile.am -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/Makefile.am 2011-03-22 21:36:21.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/Makefile.am 2011-05-24 10:17:22.288969198 +0200 -@@ -94,6 +94,10 @@ - gsm-util.c \ - gsm-util.h - -+libgsmutil_la_CPPFLAGS = \ -+ $(AM_CPPFLAGS) \ -+ -DDATADIR=\""$(datadir)"\" -+ - libgsmutil_la_LIBADD = \ - $(GNOME_SESSION_LIBS) - -Index: gnome-session-3.0.0/gnome-session/gsm-logout-dialog.c -=================================================================== ---- gnome-session-3.0.0.orig/gnome-session/gsm-logout-dialog.c 2011-03-22 21:31:43.000000000 +0100 -+++ gnome-session-3.0.0/gnome-session/gsm-logout-dialog.c 2011-05-24 10:29:39.732625980 +0200 -@@ -43,6 +43,14 @@ - #define LOCKDOWN_SCHEMA "org.gnome.desktop.lockdown" - #define KEY_DISABLE_USER_SWITCHING "disable-user-switching" - -+#define GSM_ICON_LOGOUT "system-log-out" -+#define GSM_ICON_SWITCH "system-users" -+#define GSM_ICON_SHUTDOWN "system-shutdown" -+#define GSM_ICON_REBOOT "view-refresh" -+/* TODO: use gpm icons? */ -+#define GSM_ICON_HIBERNATE "drive-harddisk" -+#define GSM_ICON_SLEEP "gnome-session-sleep" -+ - typedef enum { - GSM_DIALOG_LOGOUT_TYPE_LOGOUT, - GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN -@@ -50,11 +58,12 @@ - - struct _GsmLogoutDialogPrivate - { -- GsmDialogLogoutType type; -- - UpClient *up_client; - GsmConsolekit *consolekit; - -+ GtkWidget *info_label; -+ GtkWidget *cancel_button; -+ - int timeout; - unsigned int timeout_id; - -@@ -63,7 +72,8 @@ - - static GsmLogoutDialog *current_dialog = NULL; - --static void gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog); -+static void gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog, -+ int seconds); - - static void gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog, - gpointer data); -@@ -71,43 +81,10 @@ - static void gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, - gpointer data); - --enum { -- PROP_0, -- PROP_MESSAGE_TYPE --}; -- --G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_MESSAGE_DIALOG); -- --static void --gsm_logout_dialog_set_property (GObject *object, -- guint prop_id, -- const GValue *value, -- GParamSpec *pspec) --{ -- switch (prop_id) { -- case PROP_MESSAGE_TYPE: -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -+static void gsm_logout_set_info_text (GsmLogoutDialog *logout_dialog, -+ int seconds); - --static void --gsm_logout_dialog_get_property (GObject *object, -- guint prop_id, -- GValue *value, -- GParamSpec *pspec) --{ -- switch (prop_id) { -- case PROP_MESSAGE_TYPE: -- g_value_set_enum (value, GTK_MESSAGE_WARNING); -- break; -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); -- break; -- } --} -+G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_DIALOG); - - static void - gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass) -@@ -116,18 +93,6 @@ - - gobject_class = G_OBJECT_CLASS (klass); - -- /* This is a workaround to avoid a stupid crash: libgnomeui -- * listens for the "show" signal on all GtkMessageDialog and -- * gets the "message-type" of the dialogs. We will crash when -- * it accesses this property if we don't override it since we -- * didn't define it. */ -- gobject_class->set_property = gsm_logout_dialog_set_property; -- gobject_class->get_property = gsm_logout_dialog_get_property; -- -- g_object_class_override_property (gobject_class, -- PROP_MESSAGE_TYPE, -- "message-type"); -- - g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); - } - -@@ -139,11 +104,22 @@ - logout_dialog->priv->timeout_id = 0; - logout_dialog->priv->timeout = 0; - logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; -+ logout_dialog->priv->info_label = NULL; - -- gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); -+ gtk_window_set_resizable (GTK_WINDOW (logout_dialog), FALSE); - gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_stick (GTK_WINDOW (logout_dialog)); - -+ /* use HIG spacings */ -+ gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), 12); -+ gtk_container_set_border_width (GTK_CONTAINER (logout_dialog), 6); -+ -+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_HELP, -+ GTK_RESPONSE_HELP); -+ logout_dialog->priv->cancel_button = -+ gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); -+ - logout_dialog->priv->up_client = up_client_new (); - - logout_dialog->priv->consolekit = gsm_get_consolekit (); -@@ -239,38 +215,26 @@ - static void - gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, gpointer user_data) - { -- gsm_logout_dialog_set_timeout (logout_dialog); --} -+ gsm_logout_set_info_text (logout_dialog, AUTOMATIC_ACTION_TIMEOUT); - --static gboolean --gsm_logout_dialog_timeout (gpointer data) --{ -- GsmLogoutDialog *logout_dialog; -- char *seconds_warning; -- char *secondary_text; -- int seconds_to_show; -- static char *session_type = NULL; -- -- logout_dialog = (GsmLogoutDialog *) data; -- -- if (!logout_dialog->priv->timeout) { -- gtk_dialog_response (GTK_DIALOG (logout_dialog), -- logout_dialog->priv->default_response); -- -- return FALSE; -- } -+ if (logout_dialog->priv->default_response != GTK_RESPONSE_CANCEL) -+ gsm_logout_dialog_set_timeout (logout_dialog, -+ AUTOMATIC_ACTION_TIMEOUT); -+} - -- if (logout_dialog->priv->timeout <= 30) { -- seconds_to_show = logout_dialog->priv->timeout; -- } else { -- seconds_to_show = (logout_dialog->priv->timeout/10) * 10; - -- if (logout_dialog->priv->timeout % 10) -- seconds_to_show += 10; -- } -+static void -+gsm_logout_set_info_text (GsmLogoutDialog *logout_dialog, -+ int seconds_to_show) -+{ -+ const char *seconds_warning; -+ char *secondary_text; -+ char *buf; -+ char *markup; -+ static char *session_type = NULL; - -- switch (logout_dialog->priv->type) { -- case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: -+ switch (logout_dialog->priv->default_response) { -+ case GSM_LOGOUT_RESPONSE_LOGOUT: - /* This string is shared with gsm-fail-whale-dialog.c */ - seconds_warning = ngettext ("You will be automatically logged " - "out in %d second.", -@@ -279,7 +243,7 @@ - seconds_to_show); - break; - -- case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: -+ case GSM_LOGOUT_RESPONSE_SHUTDOWN: - seconds_warning = ngettext ("This system will be automatically " - "shut down in %d second.", - "This system will be automatically " -@@ -287,6 +251,10 @@ - seconds_to_show); - break; - -+ case GTK_RESPONSE_CANCEL: -+ seconds_warning = ""; -+ break; -+ - default: - g_assert_not_reached (); - } -@@ -321,25 +289,50 @@ - secondary_text = g_strdup (seconds_warning); - } - -- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog), -- secondary_text, -- seconds_to_show, -- NULL); -+ buf = g_strdup_printf (secondary_text, seconds_to_show); -+ markup = g_markup_printf_escaped ("%s", buf); -+ g_free (buf); -+ gtk_label_set_markup (GTK_LABEL (logout_dialog->priv->info_label), -+ markup); -+ g_free (markup); -+} - -- logout_dialog->priv->timeout--; -+static gboolean -+gsm_logout_dialog_timeout (gpointer data) -+{ -+ GsmLogoutDialog *logout_dialog; -+ int seconds_to_show; -+ -+ logout_dialog = (GsmLogoutDialog *) data; -+ -+ if (!logout_dialog->priv->timeout) { -+ gtk_dialog_response (GTK_DIALOG (logout_dialog), -+ logout_dialog->priv->default_response); -+ -+ return FALSE; -+ } -+ -+ if (logout_dialog->priv->timeout <= 30) { -+ seconds_to_show = logout_dialog->priv->timeout; -+ } else { -+ seconds_to_show = (logout_dialog->priv->timeout/10) * 10; -+ -+ if (logout_dialog->priv->timeout % 10) -+ seconds_to_show += 10; -+ } - -- g_free (secondary_text); -+ gsm_logout_set_info_text (logout_dialog, seconds_to_show); -+ -+ logout_dialog->priv->timeout--; - - return TRUE; - } - - static void --gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog) -+gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog, -+ int seconds) - { -- logout_dialog->priv->timeout = AUTOMATIC_ACTION_TIMEOUT; -- -- /* Sets the secondary text */ -- gsm_logout_dialog_timeout (logout_dialog); -+ logout_dialog->priv->timeout = seconds; - - if (logout_dialog->priv->timeout_id != 0) { - g_source_remove (logout_dialog->priv->timeout_id); -@@ -351,14 +344,120 @@ - } - - static GtkWidget * -+gsm_logout_tile_new (const char *icon_name, -+ const char *title, -+ const char *description) -+{ -+ GtkWidget *button; -+ GtkWidget *alignment; -+ GtkWidget *hbox; -+ GtkWidget *vbox; -+ GtkWidget *image; -+ GtkWidget *label; -+ char *markup; -+ -+ g_assert (title != NULL); -+ -+ button = GTK_WIDGET (gtk_button_new ()); -+ gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); -+ -+ alignment = gtk_alignment_new (0, 0.5, 0, 0); -+ gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 6); -+ gtk_container_add (GTK_CONTAINER (button), alignment); -+ -+ hbox = gtk_hbox_new (FALSE, 12); -+ gtk_container_add (GTK_CONTAINER (alignment), hbox); -+ if (icon_name != NULL) { -+ image = gtk_image_new_from_icon_name (icon_name, -+ GTK_ICON_SIZE_DIALOG); -+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); -+ } -+ -+ vbox = gtk_vbox_new (FALSE, 2); -+ -+ markup = g_markup_printf_escaped ("%s", -+ title); -+ label = gtk_label_new (markup); -+ g_free (markup); -+ -+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); -+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); -+ -+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -+ -+ if (description != NULL) { -+ gchar *markup; -+ GdkColor *color; -+ GtkWidget *label; -+ GtkStyle *style; -+ -+ style = gtk_widget_get_style (GTK_WIDGET (button)); -+ color = &style->fg[GTK_STATE_INSENSITIVE]; -+ markup = g_markup_printf_escaped ("%s", -+ color->red, -+ color->green, -+ color->blue, -+ description); -+ label = gtk_label_new (markup); -+ g_free (markup); -+ -+ gtk_label_set_use_markup (GTK_LABEL (label), TRUE); -+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE); -+ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); -+ -+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); -+ } -+ -+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); -+ -+ return button; -+} -+ -+static void -+gsm_logout_tile_clicked (GtkWidget *tile, -+ gpointer response_p) -+{ -+ GtkWidget *dialog; -+ -+ dialog = gtk_widget_get_toplevel (tile); -+ g_assert (GTK_IS_DIALOG (dialog)); -+ gtk_dialog_response (GTK_DIALOG (dialog), -+ GPOINTER_TO_UINT (response_p)); -+} -+ -+static GtkWidget * -+gsm_logout_append_tile (GtkWidget *vbox, -+ unsigned int response, -+ const char *icon_name, -+ const char *title, -+ const char *description) -+{ -+ GtkWidget *tile; -+ -+ tile = gsm_logout_tile_new (icon_name, title, description); -+ gtk_box_pack_start (GTK_BOX (vbox), tile, TRUE, TRUE, 0); -+ gtk_widget_show_all (tile); -+ -+ g_signal_connect (tile, -+ "clicked", -+ G_CALLBACK (gsm_logout_tile_clicked), -+ GUINT_TO_POINTER (response)); -+ -+ return tile; -+} -+ -+static GtkWidget * - gsm_get_dialog (GsmDialogLogoutType type, - GdkScreen *screen, - guint32 activate_time) - { - GsmLogoutDialog *logout_dialog; -- GtkWidget *dialog_image; -- const char *primary_text; -+ GtkWidget *vbox; -+ GtkWidget *tile; - const char *icon_name; -+ const char *title; - - if (current_dialog != NULL) { - gtk_widget_destroy (GTK_WIDGET (current_dialog)); -@@ -368,83 +467,119 @@ - - current_dialog = logout_dialog; - -- gtk_window_set_title (GTK_WINDOW (logout_dialog), ""); -- -- logout_dialog->priv->type = type; -+ vbox = gtk_vbox_new (FALSE, 12); -+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), vbox, -+ FALSE, FALSE, 0); -+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); -+ gtk_widget_show (vbox); - - icon_name = NULL; -- primary_text = NULL; -+ title = NULL; - - switch (type) { - case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: - icon_name = GSM_ICON_LOGOUT; -- primary_text = _("Log out of this system now?"); -+ title = _("Log Out of the Session"); - - logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_LOGOUT; - -- if (gsm_logout_supports_switch_user (logout_dialog)) { -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -+ -+ gsm_logout_append_tile (vbox, GSM_LOGOUT_RESPONSE_LOGOUT, -+ GSM_ICON_LOGOUT, _("_Log Out"), -+ _("Ends your session and logs you " -+ "out.")); -+ -+ tile = gsm_logout_append_tile (vbox, -+ GSM_LOGOUT_RESPONSE_SWITCH_USER, -+ GSM_ICON_SWITCH, - _("_Switch User"), -- GSM_LOGOUT_RESPONSE_SWITCH_USER); -+ _("Suspends your session, " -+ "allowing another user to " -+ "log in and use the " -+ "computer.")); -+ if (!gsm_logout_supports_switch_user (logout_dialog)) { -+ gtk_widget_set_sensitive (tile, FALSE); - } - -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- GTK_STOCK_CANCEL, -- GTK_RESPONSE_CANCEL); -- -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("_Log Out"), -- GSM_LOGOUT_RESPONSE_LOGOUT); -- - break; - case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: - icon_name = GSM_ICON_SHUTDOWN; -- primary_text = _("Shut down this system now?"); -+ title = _("Shut Down the Computer"); - - logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_SHUTDOWN; - -- if (gsm_logout_supports_system_suspend (logout_dialog)) { -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("S_uspend"), -- GSM_LOGOUT_RESPONSE_SLEEP); -+ tile = gsm_logout_append_tile (vbox, -+ GSM_LOGOUT_RESPONSE_SHUTDOWN, -+ GSM_ICON_SHUTDOWN, -+ _("_Shut Down"), -+ _("Ends your session and turns " -+ "off the computer.")); -+ if (!gsm_logout_supports_shutdown (logout_dialog)) { -+ gtk_widget_set_sensitive (tile, FALSE); -+ /* If shutdown is not available, let's just fallback -+ * on cancel as the default action. We could fallback -+ * on reboot first, then suspend and then hibernate -+ * but it's not that useful, really */ -+ logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; - } - -- if (gsm_logout_supports_system_hibernate (logout_dialog)) { -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("_Hibernate"), -- GSM_LOGOUT_RESPONSE_HIBERNATE); -+ tile = gsm_logout_append_tile (vbox, -+ GSM_LOGOUT_RESPONSE_REBOOT, -+ GSM_ICON_REBOOT, _("_Restart"), -+ _("Ends your session and " -+ "restarts the computer.")); -+ if (!gsm_logout_supports_reboot (logout_dialog)) { -+ gtk_widget_set_sensitive (tile, FALSE); - } - -- if (gsm_logout_supports_reboot (logout_dialog)) { -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("_Restart"), -- GSM_LOGOUT_RESPONSE_REBOOT); -+ /* We don't set those options insensitive if they are no -+ * supported (like we do for shutdown/restart) since some -+ * hardware just don't support suspend/hibernate. So we -+ * don't show those options in this case. */ -+ if (gsm_logout_supports_system_suspend (logout_dialog)) { -+ gsm_logout_append_tile (vbox, -+ GSM_LOGOUT_RESPONSE_SLEEP, -+ GSM_ICON_SLEEP, _("S_uspend"), -+ _("Suspends your session " -+ "quickly, using minimal " -+ "power while the computer " -+ "stands by.")); - } - -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- GTK_STOCK_CANCEL, -- GTK_RESPONSE_CANCEL); -- -- if (gsm_logout_supports_shutdown (logout_dialog)) { -- gtk_dialog_add_button (GTK_DIALOG (logout_dialog), -- _("_Shut Down"), -- GSM_LOGOUT_RESPONSE_SHUTDOWN); -+ if (gsm_logout_supports_system_hibernate (logout_dialog)) { -+ gsm_logout_append_tile (vbox, -+ GSM_LOGOUT_RESPONSE_HIBERNATE, -+ GSM_ICON_HIBERNATE, -+ _("_Hibernate"), -+ _("Suspends your session, " -+ "using no power until the " -+ "computer is restarted.")); - } -+ - break; - default: - g_assert_not_reached (); - } - -- dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); -+ logout_dialog->priv->info_label = gtk_label_new (""); -+ gtk_label_set_line_wrap (GTK_LABEL (logout_dialog->priv->info_label), -+ TRUE); -+ gtk_box_pack_start (GTK_BOX (vbox), logout_dialog->priv->info_label, -+ TRUE, TRUE, 0); -+ gtk_widget_show (logout_dialog->priv->info_label); - -- gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image), -- icon_name, GTK_ICON_SIZE_DIALOG); - gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); -- gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); -- gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); -+ gtk_window_set_title (GTK_WINDOW (logout_dialog), title); -+ gtk_window_set_position (GTK_WINDOW (logout_dialog), -+ GTK_WIN_POS_CENTER_ALWAYS); - - gtk_dialog_set_default_response (GTK_DIALOG (logout_dialog), - logout_dialog->priv->default_response); -+ /* Note that focus is on the widget for the default response by default -+ * (since they're the first widget, except when it's Cancel */ -+ if (logout_dialog->priv->default_response == GTK_RESPONSE_CANCEL) -+ gtk_window_set_focus (GTK_WINDOW (logout_dialog), -+ logout_dialog->priv->cancel_button); - - gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen); - diff -Nru gnome-session-3.9.90/debian/patches/95_dbus_request_shutdown.patch gnome-session-3.14.0/debian/patches/95_dbus_request_shutdown.patch --- gnome-session-3.9.90/debian/patches/95_dbus_request_shutdown.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/95_dbus_request_shutdown.patch 2014-10-31 08:20:49.000000000 +0000 @@ -2,11 +2,9 @@ other applications to shutdown or reboot the machine via the session manager Author: Chris Coulson -Index: gnome-session-3.7.3/gnome-session/gsm-manager.c -=================================================================== ---- gnome-session-3.7.3.orig/gnome-session/gsm-manager.c 2013-01-07 12:51:02.026999067 +1300 -+++ gnome-session-3.7.3/gnome-session/gsm-manager.c 2013-01-07 12:51:02.022999066 +1300 -@@ -3664,6 +3664,48 @@ +--- a/gnome-session/gsm-manager.c ++++ b/gnome-session/gsm-manager.c +@@ -3116,6 +3116,48 @@ } gboolean @@ -52,14 +50,12 @@ +} + +gboolean - gsm_manager_shutdown (GsmManager *manager, - GError **error) + gsm_manager_shutdown (GsmManager *manager, + DBusGMethodInvocation *context) { -Index: gnome-session-3.7.3/gnome-session/gsm-manager.h -=================================================================== ---- gnome-session-3.7.3.orig/gnome-session/gsm-manager.h 2013-01-07 12:51:02.026999067 +1300 -+++ gnome-session-3.7.3/gnome-session/gsm-manager.h 2013-01-07 12:51:02.022999066 +1300 -@@ -160,7 +160,10 @@ +--- a/gnome-session/gsm-manager.h ++++ b/gnome-session/gsm-manager.h +@@ -159,7 +159,10 @@ guint flags, gboolean *is_inhibited, GError *error); @@ -69,13 +65,11 @@ +gboolean gsm_manager_request_reboot (GsmManager *manager, + GError **error); gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); + DBusGMethodInvocation *context); gboolean gsm_manager_reboot (GsmManager *manager, -Index: gnome-session-3.7.3/gnome-session/org.gnome.SessionManager.xml -=================================================================== ---- gnome-session-3.7.3.orig/gnome-session/org.gnome.SessionManager.xml 2013-01-07 12:51:02.026999067 +1300 -+++ gnome-session-3.7.3/gnome-session/org.gnome.SessionManager.xml 2013-01-07 12:51:02.022999066 +1300 -@@ -346,6 +346,23 @@ +--- a/gnome-session/org.gnome.SessionManager.xml ++++ b/gnome-session/org.gnome.SessionManager.xml +@@ -348,6 +348,23 @@ diff -Nru gnome-session-3.9.90/debian/patches/git_fix_wrong_unref_call.patch gnome-session-3.14.0/debian/patches/git_fix_wrong_unref_call.patch --- gnome-session-3.9.90/debian/patches/git_fix_wrong_unref_call.patch 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/git_fix_wrong_unref_call.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Subject: shell: unref correct proxy on destroy - -gsm-shell.c tries to automatically clear it's reference to the -EndSessionDialog proxy when the proxy is destroyed. - -It accidentally unrefs the wrong object though. This commit -fixes that by changing the open coded unref+nullify to g_clear_object - -I believe this will address this crasher: - -https://retrace.fedoraproject.org/faf/problems/1214348/ - -https://bugzilla.gnome.org/show_bug.cgi?id=709221 ---- -diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c -index 450ca40..1c7f053 100644 ---- a/gnome-session/gsm-shell.c -+++ b/gnome-session/gsm-shell.c -@@ -534,11 +534,7 @@ static void - on_end_session_dialog_proxy_destroyed (DBusGProxy *proxy, - GsmShell *shell) - { -- /* FIXME - is this right? */ -- if (shell->priv->end_session_dialog_proxy != NULL) { -- g_object_unref (shell->priv->proxy); -- shell->priv->end_session_dialog_proxy = NULL; -- } -+ g_clear_object (&shell->priv->end_session_dialog_proxy); - } - - static gboolean - diff -Nru gnome-session-3.9.90/debian/patches/revert_remove_gnome_session_properties.patch gnome-session-3.14.0/debian/patches/revert_remove_gnome_session_properties.patch --- gnome-session-3.9.90/debian/patches/revert_remove_gnome_session_properties.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/revert_remove_gnome_session_properties.patch 2014-10-31 08:20:49.000000000 +0000 @@ -0,0 +1,3992 @@ +From 172a7377d00be077c96e9951941c070d491b0b4b Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Fri, 31 Oct 2014 09:23:49 +1100 +Subject: [PATCH] Revert "Remove gnome-session-properties" + +This reverts commit ea285af9962313ee2675fff27d3a852bb61e936a. +--- + Makefile.am | 1 + + capplet/Makefile.am | 31 + + capplet/gsm-app-dialog.c | 540 +++++++++++++ + capplet/gsm-app-dialog.h | 66 ++ + capplet/gsm-properties-dialog.c | 774 +++++++++++++++++++ + capplet/gsm-properties-dialog.h | 57 ++ + capplet/gsp-app-manager.c | 593 ++++++++++++++ + capplet/gsp-app-manager.h | 81 ++ + capplet/gsp-app.c | 1102 +++++++++++++++++++++++++++ + capplet/gsp-app.h | 108 +++ + capplet/gsp-keyfile.c | 201 +++++ + capplet/gsp-keyfile.h | 65 ++ + capplet/main.c | 108 +++ + configure.ac | 2 + + data/Makefile.am | 6 + + data/gnome-session-properties.desktop.in.in | 15 + + doc/man/Makefile.am | 1 + + doc/man/gnome-session-properties.1 | 24 + + po/POTFILES.in | 5 + + 19 files changed, 3780 insertions(+) + create mode 100644 capplet/Makefile.am + create mode 100644 capplet/gsm-app-dialog.c + create mode 100644 capplet/gsm-app-dialog.h + create mode 100644 capplet/gsm-properties-dialog.c + create mode 100644 capplet/gsm-properties-dialog.h + create mode 100644 capplet/gsp-app-manager.c + create mode 100644 capplet/gsp-app-manager.h + create mode 100644 capplet/gsp-app.c + create mode 100644 capplet/gsp-app.h + create mode 100644 capplet/gsp-keyfile.c + create mode 100644 capplet/gsp-keyfile.h + create mode 100644 capplet/main.c + create mode 100644 data/gnome-session-properties.desktop.in.in + create mode 100644 doc/man/gnome-session-properties.1 + +Index: gnome-session/Makefile.am +=================================================================== +--- gnome-session.orig/Makefile.am ++++ gnome-session/Makefile.am +@@ -1,5 +1,6 @@ + SUBDIRS = \ + gnome-session \ ++ capplet \ + tools \ + data \ + doc \ +Index: gnome-session/capplet/Makefile.am +=================================================================== +--- /dev/null ++++ gnome-session/capplet/Makefile.am +@@ -0,0 +1,31 @@ ++bin_PROGRAMS = gnome-session-properties ++ ++AM_CPPFLAGS = \ ++ $(SESSION_PROPERTIES_CFLAGS) \ ++ $(GCONF_CFLAGS) \ ++ -I$(top_srcdir)/gnome-session \ ++ -DLOCALE_DIR=\""$(datadir)/locale"\" \ ++ -DGTKBUILDER_DIR=\""$(pkgdatadir)"\" \ ++ $(DISABLE_DEPRECATED_CFLAGS) ++ ++AM_CFLAGS = $(WARN_CFLAGS) ++ ++gnome_session_properties_SOURCES = \ ++ main.c \ ++ gsm-properties-dialog.h \ ++ gsm-properties-dialog.c \ ++ gsm-app-dialog.h \ ++ gsm-app-dialog.c \ ++ gsp-app.h \ ++ gsp-app.c \ ++ gsp-app-manager.h \ ++ gsp-app-manager.c \ ++ gsp-keyfile.h \ ++ gsp-keyfile.c ++ ++gnome_session_properties_LDADD = \ ++ $(SESSION_PROPERTIES_LIBS) \ ++ $(top_builddir)/gnome-session/libgsmutil.la \ ++ $(GCONF_LIBS) ++ ++-include $(top_srcdir)/git.mk +Index: gnome-session/capplet/gsm-app-dialog.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsm-app-dialog.c +@@ -0,0 +1,540 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++ ++#include "gsm-util.h" ++ ++#include "gsm-app-dialog.h" ++ ++#define GTKBUILDER_FILE "session-properties.ui" ++ ++#define CAPPLET_NAME_ENTRY_WIDGET_NAME "session_properties_name_entry" ++#define CAPPLET_COMMAND_ENTRY_WIDGET_NAME "session_properties_command_entry" ++#define CAPPLET_COMMENT_ENTRY_WIDGET_NAME "session_properties_comment_entry" ++#define CAPPLET_BROWSE_WIDGET_NAME "session_properties_browse_button" ++ ++ ++#define GSM_APP_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogPrivate)) ++ ++struct GsmAppDialogPrivate ++{ ++ GtkWidget *name_entry; ++ GtkWidget *command_entry; ++ GtkWidget *comment_entry; ++ GtkWidget *browse_button; ++ char *name; ++ char *command; ++ char *comment; ++}; ++ ++static void gsm_app_dialog_class_init (GsmAppDialogClass *klass); ++static void gsm_app_dialog_init (GsmAppDialog *app_dialog); ++static void gsm_app_dialog_finalize (GObject *object); ++ ++enum { ++ PROP_0, ++ PROP_NAME, ++ PROP_COMMAND, ++ PROP_COMMENT ++}; ++ ++G_DEFINE_TYPE (GsmAppDialog, gsm_app_dialog, GTK_TYPE_DIALOG) ++ ++static char * ++make_exec_uri (const char *exec) ++{ ++ GString *str; ++ const char *c; ++ ++ if (exec == NULL) { ++ return g_strdup (""); ++ } ++ ++ if (strchr (exec, ' ') == NULL) { ++ return g_strdup (exec); ++ } ++ ++ str = g_string_new_len (NULL, strlen (exec)); ++ ++ str = g_string_append_c (str, '"'); ++ for (c = exec; *c != '\0'; c++) { ++ /* FIXME: GKeyFile will add an additional backslach so we'll ++ * end up with toto\\" instead of toto\" ++ * We could use g_key_file_set_value(), but then we don't ++ * benefit from the other escaping that glib is doing... ++ */ ++ if (*c == '"') { ++ str = g_string_append (str, "\\\""); ++ } else { ++ str = g_string_append_c (str, *c); ++ } ++ } ++ str = g_string_append_c (str, '"'); ++ ++ return g_string_free (str, FALSE); ++} ++ ++static void ++on_browse_button_clicked (GtkWidget *widget, ++ GsmAppDialog *dialog) ++{ ++ GtkWidget *chooser; ++ int response; ++ ++ chooser = gtk_file_chooser_dialog_new ("", ++ GTK_WINDOW (dialog), ++ GTK_FILE_CHOOSER_ACTION_OPEN, ++ GTK_STOCK_CANCEL, ++ GTK_RESPONSE_CANCEL, ++ GTK_STOCK_OPEN, ++ GTK_RESPONSE_ACCEPT, ++ NULL); ++ ++ gtk_window_set_transient_for (GTK_WINDOW (chooser), ++ GTK_WINDOW (dialog)); ++ ++ gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser), TRUE); ++ ++ gtk_window_set_title (GTK_WINDOW (chooser), _("Select Command")); ++ ++ gtk_widget_show (chooser); ++ ++ response = gtk_dialog_run (GTK_DIALOG (chooser)); ++ ++ if (response == GTK_RESPONSE_ACCEPT) { ++ char *text; ++ char *uri; ++ ++ text = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser)); ++ ++ uri = make_exec_uri (text); ++ ++ g_free (text); ++ ++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), uri); ++ ++ g_free (uri); ++ } ++ ++ gtk_widget_destroy (chooser); ++} ++ ++static void ++on_entry_activate (GtkEntry *entry, ++ GsmAppDialog *dialog) ++{ ++ gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); ++} ++ ++static void ++setup_dialog (GsmAppDialog *dialog) ++{ ++ GtkWidget *content_area; ++ GtkWidget *widget; ++ GtkBuilder *xml; ++ GError *error; ++ ++ xml = gtk_builder_new (); ++ gtk_builder_set_translation_domain (xml, GETTEXT_PACKAGE); ++ ++ error = NULL; ++ if (!gtk_builder_add_from_file (xml, ++ GTKBUILDER_DIR "/" GTKBUILDER_FILE, ++ &error)) { ++ if (error) { ++ g_warning ("Could not load capplet UI file: %s", ++ error->message); ++ g_error_free (error); ++ } else { ++ g_warning ("Could not load capplet UI file."); ++ } ++ } ++ ++ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); ++ widget = GTK_WIDGET (gtk_builder_get_object (xml, "main-table")); ++ gtk_container_add (GTK_CONTAINER (content_area), widget); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); ++ gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); ++ ++ g_object_set (dialog, ++ "allow-shrink", FALSE, ++ "allow-grow", FALSE, ++ NULL); ++ ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); ++ ++ if (dialog->priv->name == NULL ++ && dialog->priv->command == NULL ++ && dialog->priv->comment == NULL) { ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Add Startup Program")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ GTK_STOCK_ADD, GTK_RESPONSE_OK); ++ } else { ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Startup Program")); ++ gtk_dialog_add_button (GTK_DIALOG (dialog), ++ GTK_STOCK_SAVE, GTK_RESPONSE_OK); ++ } ++ ++ dialog->priv->name_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_NAME_ENTRY_WIDGET_NAME)); ++ g_signal_connect (dialog->priv->name_entry, ++ "activate", ++ G_CALLBACK (on_entry_activate), ++ dialog); ++ if (dialog->priv->name != NULL) { ++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->name_entry), dialog->priv->name); ++ } ++ ++ dialog->priv->browse_button = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_BROWSE_WIDGET_NAME)); ++ g_signal_connect (dialog->priv->browse_button, ++ "clicked", ++ G_CALLBACK (on_browse_button_clicked), ++ dialog); ++ ++ dialog->priv->command_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMAND_ENTRY_WIDGET_NAME)); ++ g_signal_connect (dialog->priv->command_entry, ++ "activate", ++ G_CALLBACK (on_entry_activate), ++ dialog); ++ if (dialog->priv->command != NULL) { ++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->command_entry), dialog->priv->command); ++ } ++ ++ dialog->priv->comment_entry = GTK_WIDGET (gtk_builder_get_object (xml, CAPPLET_COMMENT_ENTRY_WIDGET_NAME)); ++ g_signal_connect (dialog->priv->comment_entry, ++ "activate", ++ G_CALLBACK (on_entry_activate), ++ dialog); ++ if (dialog->priv->comment != NULL) { ++ gtk_entry_set_text (GTK_ENTRY (dialog->priv->comment_entry), dialog->priv->comment); ++ } ++ ++ if (xml != NULL) { ++ g_object_unref (xml); ++ } ++} ++ ++static GObject * ++gsm_app_dialog_constructor (GType type, ++ guint n_construct_app, ++ GObjectConstructParam *construct_app) ++{ ++ GsmAppDialog *dialog; ++ ++ dialog = GSM_APP_DIALOG (G_OBJECT_CLASS (gsm_app_dialog_parent_class)->constructor (type, ++ n_construct_app, ++ construct_app)); ++ ++ setup_dialog (dialog); ++ ++ gtk_widget_show_all (GTK_WIDGET (dialog)); ++ ++ return G_OBJECT (dialog); ++} ++ ++static void ++gsm_app_dialog_dispose (GObject *object) ++{ ++ GsmAppDialog *dialog; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSM_IS_APP_DIALOG (object)); ++ ++ dialog = GSM_APP_DIALOG (object); ++ ++ g_free (dialog->priv->name); ++ dialog->priv->name = NULL; ++ g_free (dialog->priv->command); ++ dialog->priv->command = NULL; ++ g_free (dialog->priv->comment); ++ dialog->priv->comment = NULL; ++ ++ G_OBJECT_CLASS (gsm_app_dialog_parent_class)->dispose (object); ++} ++ ++static void ++gsm_app_dialog_set_name (GsmAppDialog *dialog, ++ const char *name) ++{ ++ g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); ++ ++ g_free (dialog->priv->name); ++ ++ dialog->priv->name = g_strdup (name); ++ g_object_notify (G_OBJECT (dialog), "name"); ++} ++ ++static void ++gsm_app_dialog_set_command (GsmAppDialog *dialog, ++ const char *name) ++{ ++ g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); ++ ++ g_free (dialog->priv->command); ++ ++ dialog->priv->command = g_strdup (name); ++ g_object_notify (G_OBJECT (dialog), "command"); ++} ++ ++static void ++gsm_app_dialog_set_comment (GsmAppDialog *dialog, ++ const char *name) ++{ ++ g_return_if_fail (GSM_IS_APP_DIALOG (dialog)); ++ ++ g_free (dialog->priv->comment); ++ ++ dialog->priv->comment = g_strdup (name); ++ g_object_notify (G_OBJECT (dialog), "comment"); ++} ++ ++const char * ++gsm_app_dialog_get_name (GsmAppDialog *dialog) ++{ ++ g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); ++ return gtk_entry_get_text (GTK_ENTRY (dialog->priv->name_entry)); ++} ++ ++const char * ++gsm_app_dialog_get_command (GsmAppDialog *dialog) ++{ ++ g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); ++ return gtk_entry_get_text (GTK_ENTRY (dialog->priv->command_entry)); ++} ++ ++const char * ++gsm_app_dialog_get_comment (GsmAppDialog *dialog) ++{ ++ g_return_val_if_fail (GSM_IS_APP_DIALOG (dialog), NULL); ++ return gtk_entry_get_text (GTK_ENTRY (dialog->priv->comment_entry)); ++} ++ ++static void ++gsm_app_dialog_set_property (GObject *object, ++ guint prop_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ GsmAppDialog *dialog = GSM_APP_DIALOG (object); ++ ++ switch (prop_id) { ++ case PROP_NAME: ++ gsm_app_dialog_set_name (dialog, g_value_get_string (value)); ++ break; ++ case PROP_COMMAND: ++ gsm_app_dialog_set_command (dialog, g_value_get_string (value)); ++ break; ++ case PROP_COMMENT: ++ gsm_app_dialog_set_comment (dialog, g_value_get_string (value)); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsm_app_dialog_get_property (GObject *object, ++ guint prop_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ GsmAppDialog *dialog = GSM_APP_DIALOG (object); ++ ++ switch (prop_id) { ++ case PROP_NAME: ++ g_value_set_string (value, dialog->priv->name); ++ break; ++ case PROP_COMMAND: ++ g_value_set_string (value, dialog->priv->command); ++ break; ++ case PROP_COMMENT: ++ g_value_set_string (value, dialog->priv->comment); ++ break; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); ++ break; ++ } ++} ++ ++static void ++gsm_app_dialog_class_init (GsmAppDialogClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->get_property = gsm_app_dialog_get_property; ++ object_class->set_property = gsm_app_dialog_set_property; ++ object_class->constructor = gsm_app_dialog_constructor; ++ object_class->dispose = gsm_app_dialog_dispose; ++ object_class->finalize = gsm_app_dialog_finalize; ++ ++ g_object_class_install_property (object_class, ++ PROP_NAME, ++ g_param_spec_string ("name", ++ "name", ++ "name", ++ NULL, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); ++ g_object_class_install_property (object_class, ++ PROP_COMMAND, ++ g_param_spec_string ("command", ++ "command", ++ "command", ++ NULL, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); ++ g_object_class_install_property (object_class, ++ PROP_COMMENT, ++ g_param_spec_string ("comment", ++ "comment", ++ "comment", ++ NULL, ++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); ++ ++ g_type_class_add_private (klass, sizeof (GsmAppDialogPrivate)); ++} ++ ++static void ++gsm_app_dialog_init (GsmAppDialog *dialog) ++{ ++ ++ dialog->priv = GSM_APP_DIALOG_GET_PRIVATE (dialog); ++} ++ ++static void ++gsm_app_dialog_finalize (GObject *object) ++{ ++ GsmAppDialog *dialog; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSM_IS_APP_DIALOG (object)); ++ ++ dialog = GSM_APP_DIALOG (object); ++ ++ g_return_if_fail (dialog->priv != NULL); ++ ++ G_OBJECT_CLASS (gsm_app_dialog_parent_class)->finalize (object); ++} ++ ++GtkWidget * ++gsm_app_dialog_new (const char *name, ++ const char *command, ++ const char *comment) ++{ ++ GObject *object; ++ ++ object = g_object_new (GSM_TYPE_APP_DIALOG, ++ "name", name, ++ "command", command, ++ "comment", comment, ++ NULL); ++ ++ return GTK_WIDGET (object); ++} ++ ++gboolean ++gsm_app_dialog_run (GsmAppDialog *dialog, ++ char **name_p, ++ char **command_p, ++ char **comment_p) ++{ ++ gboolean retval; ++ ++ retval = FALSE; ++ ++ while (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { ++ const char *name; ++ const char *exec; ++ const char *comment; ++ const char *error_msg; ++ GError *error; ++ char **argv; ++ int argc; ++ ++ name = gsm_app_dialog_get_name (GSM_APP_DIALOG (dialog)); ++ exec = gsm_app_dialog_get_command (GSM_APP_DIALOG (dialog)); ++ comment = gsm_app_dialog_get_comment (GSM_APP_DIALOG (dialog)); ++ ++ error = NULL; ++ error_msg = NULL; ++ ++ if (gsm_util_text_is_blank (exec)) { ++ error_msg = _("The startup command cannot be empty"); ++ } else { ++ if (!g_shell_parse_argv (exec, &argc, &argv, &error)) { ++ if (error != NULL) { ++ error_msg = error->message; ++ } else { ++ error_msg = _("The startup command is not valid"); ++ } ++ } ++ } ++ ++ if (error_msg != NULL) { ++ GtkWidget *msgbox; ++ ++ msgbox = gtk_message_dialog_new (GTK_WINDOW (dialog), ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ "%s", error_msg); ++ ++ if (error != NULL) { ++ g_error_free (error); ++ } ++ ++ gtk_dialog_run (GTK_DIALOG (msgbox)); ++ ++ gtk_widget_destroy (msgbox); ++ ++ continue; ++ } ++ ++ if (gsm_util_text_is_blank (name)) { ++ name = argv[0]; ++ } ++ ++ if (name_p) { ++ *name_p = g_strdup (name); ++ } ++ ++ g_strfreev (argv); ++ ++ if (command_p) { ++ *command_p = g_strdup (exec); ++ } ++ ++ if (comment_p) { ++ *comment_p = g_strdup (comment); ++ } ++ ++ retval = TRUE; ++ break; ++ } ++ ++ gtk_widget_destroy (GTK_WIDGET (dialog)); ++ ++ return retval; ++} +Index: gnome-session/capplet/gsm-app-dialog.h +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsm-app-dialog.h +@@ -0,0 +1,66 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __GSM_APP_DIALOG_H ++#define __GSM_APP_DIALOG_H ++ ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSM_TYPE_APP_DIALOG (gsm_app_dialog_get_type ()) ++#define GSM_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_APP_DIALOG, GsmAppDialog)) ++#define GSM_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_APP_DIALOG, GsmAppDialogClass)) ++#define GSM_IS_APP_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_APP_DIALOG)) ++#define GSM_IS_APP_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_APP_DIALOG)) ++#define GSM_APP_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_APP_DIALOG, GsmAppDialogClass)) ++ ++typedef struct GsmAppDialogPrivate GsmAppDialogPrivate; ++ ++typedef struct ++{ ++ GtkDialog parent; ++ GsmAppDialogPrivate *priv; ++} GsmAppDialog; ++ ++typedef struct ++{ ++ GtkDialogClass parent_class; ++} GsmAppDialogClass; ++ ++GType gsm_app_dialog_get_type (void); ++ ++GtkWidget * gsm_app_dialog_new (const char *name, ++ const char *command, ++ const char *comment); ++ ++gboolean gsm_app_dialog_run (GsmAppDialog *dialog, ++ char **name_p, ++ char **command_p, ++ char **comment_p); ++ ++const char * gsm_app_dialog_get_name (GsmAppDialog *dialog); ++const char * gsm_app_dialog_get_command (GsmAppDialog *dialog); ++const char * gsm_app_dialog_get_comment (GsmAppDialog *dialog); ++ ++G_END_DECLS ++ ++#endif /* __GSM_APP_DIALOG_H */ +Index: gnome-session/capplet/gsm-properties-dialog.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsm-properties-dialog.c +@@ -0,0 +1,774 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2007 Vincent Untz. ++ * Copyright (C) 2008 Lucas Rocha. ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++ ++#include "gsm-properties-dialog.h" ++#include "gsm-app-dialog.h" ++#include "gsm-util.h" ++#include "gsp-app.h" ++#include "gsp-app-manager.h" ++ ++#define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate)) ++ ++#define GTKBUILDER_FILE "session-properties.ui" ++ ++#define CAPPLET_TREEVIEW_WIDGET_NAME "session_properties_treeview" ++#define CAPPLET_ADD_WIDGET_NAME "session_properties_add_button" ++#define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button" ++#define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button" ++#define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button" ++#define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle" ++ ++#define STARTUP_APP_ICON "system-run" ++ ++#define SPC_SETTINGS_SCHEMA "org.gnome.SessionManager" ++#define SPC_SETTINGS_AUTOSAVE_KEY "auto-save-session" ++ ++struct GsmPropertiesDialogPrivate ++{ ++ GtkBuilder *xml; ++ GtkListStore *list_store; ++ GtkTreeModel *tree_filter; ++ ++ GtkTreeView *treeview; ++ GtkWidget *add_button; ++ GtkWidget *delete_button; ++ GtkWidget *edit_button; ++ ++ GSettings *settings; ++ ++ GspAppManager *manager; ++}; ++ ++enum { ++ STORE_COL_VISIBLE = 0, ++ STORE_COL_ENABLED, ++ STORE_COL_GICON, ++ STORE_COL_DESCRIPTION, ++ STORE_COL_APP, ++ STORE_COL_SEARCH, ++ NUMBER_OF_COLUMNS ++}; ++ ++static void gsm_properties_dialog_class_init (GsmPropertiesDialogClass *klass); ++static void gsm_properties_dialog_init (GsmPropertiesDialog *properties_dialog); ++static void gsm_properties_dialog_finalize (GObject *object); ++ ++G_DEFINE_TYPE (GsmPropertiesDialog, gsm_properties_dialog, GTK_TYPE_DIALOG) ++ ++static gboolean ++find_by_app (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ GspApp *app) ++{ ++ GspApp *iter_app = NULL; ++ ++ if (!gtk_tree_model_get_iter_first (model, iter)) { ++ return FALSE; ++ } ++ ++ do { ++ gtk_tree_model_get (model, iter, ++ STORE_COL_APP, &iter_app, ++ -1); ++ ++ if (iter_app == app) { ++ g_object_unref (iter_app); ++ return TRUE; ++ } ++ } while (gtk_tree_model_iter_next (model, iter)); ++ ++ return FALSE; ++} ++ ++static void ++_fill_iter_from_app (GtkListStore *list_store, ++ GtkTreeIter *iter, ++ GspApp *app) ++{ ++ gboolean hidden; ++ gboolean display; ++ gboolean enabled; ++ gboolean shown; ++ GIcon *icon; ++ const char *description; ++ const char *app_name; ++ ++ hidden = gsp_app_get_hidden (app); ++ display = gsp_app_get_display (app); ++ enabled = gsp_app_get_enabled (app); ++ shown = gsp_app_get_shown (app); ++ icon = gsp_app_get_icon (app); ++ description = gsp_app_get_description (app); ++ app_name = gsp_app_get_name (app); ++ ++ if (G_IS_THEMED_ICON (icon)) { ++ GtkIconTheme *theme; ++ const char * const *icon_names; ++ ++ theme = gtk_icon_theme_get_default (); ++ icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon)); ++ if (icon_names[0] == NULL || ++ !gtk_icon_theme_has_icon (theme, icon_names[0])) { ++ g_object_unref (icon); ++ icon = NULL; ++ } ++ } else if (G_IS_FILE_ICON (icon)) { ++ GFile *iconfile; ++ ++ iconfile = g_file_icon_get_file (G_FILE_ICON (icon)); ++ if (!g_file_query_exists (iconfile, NULL)) { ++ g_object_unref (icon); ++ icon = NULL; ++ } ++ } ++ ++ if (icon == NULL) { ++ icon = g_themed_icon_new (STARTUP_APP_ICON); ++ } ++ ++ gtk_list_store_set (list_store, iter, ++ STORE_COL_VISIBLE, !hidden && shown && display, ++ STORE_COL_ENABLED, enabled, ++ STORE_COL_GICON, icon, ++ STORE_COL_DESCRIPTION, description, ++ STORE_COL_APP, app, ++ STORE_COL_SEARCH, app_name, ++ -1); ++ g_object_unref (icon); ++} ++ ++static void ++_app_changed (GsmPropertiesDialog *dialog, ++ GspApp *app) ++{ ++ GtkTreeIter iter; ++ ++ if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store), ++ &iter, app)) { ++ return; ++ } ++ ++ _fill_iter_from_app (dialog->priv->list_store, &iter, app); ++} ++ ++static void ++append_app (GsmPropertiesDialog *dialog, ++ GspApp *app) ++{ ++ GtkTreeIter iter; ++ ++ gtk_list_store_append (dialog->priv->list_store, &iter); ++ _fill_iter_from_app (dialog->priv->list_store, &iter, app); ++ ++ g_signal_connect_swapped (app, "changed", ++ G_CALLBACK (_app_changed), dialog); ++} ++ ++static void ++_app_added (GsmPropertiesDialog *dialog, ++ GspApp *app, ++ GspAppManager *manager) ++{ ++ append_app (dialog, app); ++} ++ ++static void ++_app_removed (GsmPropertiesDialog *dialog, ++ GspApp *app, ++ GspAppManager *manager) ++{ ++ GtkTreeIter iter; ++ ++ if (!find_by_app (GTK_TREE_MODEL (dialog->priv->list_store), ++ &iter, app)) { ++ return; ++ } ++ ++ g_signal_handlers_disconnect_by_func (app, ++ _app_changed, ++ dialog); ++ gtk_list_store_remove (dialog->priv->list_store, &iter); ++} ++ ++static void ++populate_model (GsmPropertiesDialog *dialog) ++{ ++ GSList *apps; ++ GSList *l; ++ ++ apps = gsp_app_manager_get_apps (dialog->priv->manager); ++ for (l = apps; l != NULL; l = l->next) { ++ append_app (dialog, GSP_APP (l->data)); ++ } ++ g_slist_free (apps); ++} ++ ++static void ++on_selection_changed (GtkTreeSelection *selection, ++ GsmPropertiesDialog *dialog) ++{ ++ gboolean sel; ++ ++ sel = gtk_tree_selection_get_selected (selection, NULL, NULL); ++ ++ gtk_widget_set_sensitive (dialog->priv->edit_button, sel); ++ gtk_widget_set_sensitive (dialog->priv->delete_button, sel); ++} ++ ++static void ++on_startup_enabled_toggled (GtkCellRendererToggle *cell_renderer, ++ char *path, ++ GsmPropertiesDialog *dialog) ++{ ++ GtkTreeIter iter; ++ GspApp *app; ++ gboolean active; ++ ++ if (!gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, path)) { ++ return; ++ } ++ ++ app = NULL; ++ gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, ++ STORE_COL_APP, &app, ++ -1); ++ ++ active = gtk_cell_renderer_toggle_get_active (cell_renderer); ++ active = !active; ++ ++ if (app) { ++ gsp_app_set_enabled (app, active); ++ g_object_unref (app); ++ } ++} ++ ++static void ++on_drag_data_received (GtkWidget *widget, ++ GdkDragContext *drag_context, ++ gint x, ++ gint y, ++ GtkSelectionData *data, ++ guint info, ++ guint time, ++ GsmPropertiesDialog *dialog) ++{ ++ gboolean dnd_success; ++ ++ dnd_success = FALSE; ++ ++ if (data != NULL) { ++ char **filenames; ++ int i; ++ ++ filenames = gtk_selection_data_get_uris (data); ++ ++ for (i = 0; filenames[i] && filenames[i][0]; i++) { ++ /* Return success if at least one file succeeded */ ++ gboolean file_success; ++ file_success = gsp_app_copy_desktop_file (filenames[i]); ++ dnd_success = dnd_success || file_success; ++ } ++ ++ g_strfreev (filenames); ++ } ++ ++ gtk_drag_finish (drag_context, dnd_success, FALSE, time); ++ g_signal_stop_emission_by_name (widget, "drag_data_received"); ++} ++ ++static void ++on_drag_begin (GtkWidget *widget, ++ GdkDragContext *context, ++ GsmPropertiesDialog *dialog) ++{ ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ GspApp *app; ++ ++ gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget), &path, NULL); ++ gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, path); ++ gtk_tree_path_free (path); ++ ++ gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, ++ STORE_COL_APP, &app, ++ -1); ++ ++ if (app) { ++ g_object_set_data_full (G_OBJECT (context), "gsp-app", ++ g_object_ref (app), g_object_unref); ++ g_object_unref (app); ++ } ++ ++} ++ ++static void ++on_drag_data_get (GtkWidget *widget, ++ GdkDragContext *context, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time, ++ GsmPropertiesDialog *dialog) ++{ ++ GspApp *app; ++ ++ app = g_object_get_data (G_OBJECT (context), "gsp-app"); ++ if (app) { ++ const char *uris[2]; ++ char *uri; ++ ++ uri = g_filename_to_uri (gsp_app_get_path (app), NULL, NULL); ++ ++ uris[0] = uri; ++ uris[1] = NULL; ++ gtk_selection_data_set_uris (selection_data, (char **) uris); ++ ++ g_free (uri); ++ } ++} ++ ++static void ++on_add_app_clicked (GtkWidget *widget, ++ GsmPropertiesDialog *dialog) ++{ ++ GtkWidget *add_dialog; ++ char *name; ++ char *exec; ++ char *comment; ++ ++ add_dialog = gsm_app_dialog_new (NULL, NULL, NULL); ++ gtk_window_set_transient_for (GTK_WINDOW (add_dialog), ++ GTK_WINDOW (dialog)); ++ ++ if (gsm_app_dialog_run (GSM_APP_DIALOG (add_dialog), ++ &name, &exec, &comment)) { ++ gsp_app_create (name, comment, exec); ++ g_free (name); ++ g_free (exec); ++ g_free (comment); ++ } ++} ++ ++static void ++on_delete_app_clicked (GtkWidget *widget, ++ GsmPropertiesDialog *dialog) ++{ ++ GtkTreeSelection *selection; ++ GtkTreeIter iter; ++ GspApp *app; ++ ++ selection = gtk_tree_view_get_selection (dialog->priv->treeview); ++ ++ if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) { ++ return; ++ } ++ ++ app = NULL; ++ gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, ++ STORE_COL_APP, &app, ++ -1); ++ ++ if (app) { ++ gsp_app_delete (app); ++ g_object_unref (app); ++ } ++} ++ ++static void ++on_edit_app_clicked (GtkWidget *widget, ++ GsmPropertiesDialog *dialog) ++{ ++ GtkTreeSelection *selection; ++ GtkTreeIter iter; ++ GspApp *app; ++ ++ selection = gtk_tree_view_get_selection (dialog->priv->treeview); ++ ++ if (!gtk_tree_selection_get_selected (selection, NULL, &iter)) { ++ return; ++ } ++ ++ app = NULL; ++ gtk_tree_model_get (GTK_TREE_MODEL (dialog->priv->tree_filter), ++ &iter, ++ STORE_COL_APP, &app, ++ -1); ++ ++ if (app) { ++ GtkWidget *edit_dialog; ++ char *name; ++ char *exec; ++ char *comment; ++ ++ edit_dialog = gsm_app_dialog_new (gsp_app_get_name (app), ++ gsp_app_get_exec (app), ++ gsp_app_get_comment (app)); ++ gtk_window_set_transient_for (GTK_WINDOW (edit_dialog), ++ GTK_WINDOW (dialog)); ++ ++ if (gsm_app_dialog_run (GSM_APP_DIALOG (edit_dialog), ++ &name, &exec, &comment)) { ++ gsp_app_update (app, name, comment, exec); ++ g_free (name); ++ g_free (exec); ++ g_free (comment); ++ } ++ ++ g_object_unref (app); ++ } ++} ++ ++static void ++on_row_activated (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GtkTreeViewColumn *column, ++ GsmPropertiesDialog *dialog) ++{ ++ on_edit_app_clicked (NULL, dialog); ++} ++ ++static void ++on_save_session_clicked (GtkWidget *widget, ++ GsmPropertiesDialog *dialog) ++{ ++ g_debug ("Session saving is not implemented yet!"); ++} ++ ++static void ++setup_dialog (GsmPropertiesDialog *dialog) ++{ ++ GtkTreeView *treeview; ++ GtkWidget *button; ++ GtkTreeModel *tree_filter; ++ GtkTreeViewColumn *column; ++ GtkCellRenderer *renderer; ++ GtkTreeSelection *selection; ++ GtkTargetList *targetlist; ++ ++ gtk_dialog_add_buttons (GTK_DIALOG (dialog), ++ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, ++ NULL); ++ ++ dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS, ++ G_TYPE_BOOLEAN, ++ G_TYPE_BOOLEAN, ++ G_TYPE_ICON, ++ G_TYPE_STRING, ++ G_TYPE_OBJECT, ++ G_TYPE_STRING); ++ tree_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (dialog->priv->list_store), ++ NULL); ++ g_object_unref (dialog->priv->list_store); ++ dialog->priv->tree_filter = tree_filter; ++ ++ gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (tree_filter), ++ STORE_COL_VISIBLE); ++ ++ treeview = GTK_TREE_VIEW (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_TREEVIEW_WIDGET_NAME)); ++ dialog->priv->treeview = treeview; ++ ++ gtk_tree_view_set_model (treeview, tree_filter); ++ g_object_unref (tree_filter); ++ ++ gtk_tree_view_set_headers_visible (treeview, FALSE); ++ g_signal_connect (treeview, ++ "row-activated", ++ G_CALLBACK (on_row_activated), ++ dialog); ++ ++ selection = gtk_tree_view_get_selection (treeview); ++ gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); ++ g_signal_connect (selection, ++ "changed", ++ G_CALLBACK (on_selection_changed), ++ dialog); ++ ++ /* CHECKBOX COLUMN */ ++ renderer = gtk_cell_renderer_toggle_new (); ++ column = gtk_tree_view_column_new_with_attributes (_("Enabled"), ++ renderer, ++ "active", STORE_COL_ENABLED, ++ NULL); ++ gtk_tree_view_append_column (treeview, column); ++ g_signal_connect (renderer, ++ "toggled", ++ G_CALLBACK (on_startup_enabled_toggled), ++ dialog); ++ ++ /* ICON COLUMN */ ++ renderer = gtk_cell_renderer_pixbuf_new (); ++ column = gtk_tree_view_column_new_with_attributes (_("Icon"), ++ renderer, ++ "gicon", STORE_COL_GICON, ++ "sensitive", STORE_COL_ENABLED, ++ NULL); ++ g_object_set (renderer, ++ "stock-size", GSM_PROPERTIES_ICON_SIZE, ++ NULL); ++ gtk_tree_view_append_column (treeview, column); ++ ++ /* NAME COLUMN */ ++ renderer = gtk_cell_renderer_text_new (); ++ column = gtk_tree_view_column_new_with_attributes (_("Program"), ++ renderer, ++ "markup", STORE_COL_DESCRIPTION, ++ "sensitive", STORE_COL_ENABLED, ++ NULL); ++ g_object_set (renderer, ++ "ellipsize", PANGO_ELLIPSIZE_END, ++ NULL); ++ gtk_tree_view_append_column (treeview, column); ++ ++ ++ gtk_tree_view_column_set_sort_column_id (column, STORE_COL_DESCRIPTION); ++ gtk_tree_view_set_search_column (treeview, STORE_COL_SEARCH); ++ gtk_tree_view_set_rules_hint (treeview, TRUE); ++ ++ gtk_tree_view_enable_model_drag_source (treeview, ++ GDK_BUTTON1_MASK|GDK_BUTTON2_MASK, ++ NULL, 0, ++ GDK_ACTION_COPY); ++ gtk_drag_source_add_uri_targets (GTK_WIDGET (treeview)); ++ ++ gtk_drag_dest_set (GTK_WIDGET (treeview), ++ GTK_DEST_DEFAULT_ALL, ++ NULL, 0, ++ GDK_ACTION_COPY); ++ ++ gtk_drag_dest_add_uri_targets (GTK_WIDGET (treeview)); ++ /* we don't want to accept drags coming from this widget */ ++ targetlist = gtk_drag_dest_get_target_list (GTK_WIDGET (treeview)); ++ if (targetlist != NULL) { ++ GtkTargetEntry *targets; ++ gint n_targets; ++ gint i; ++ ++ targets = gtk_target_table_new_from_list (targetlist, &n_targets); ++ for (i = 0; i < n_targets; i++) ++ targets[i].flags = GTK_TARGET_OTHER_WIDGET; ++ ++ targetlist = gtk_target_list_new (targets, n_targets); ++ gtk_drag_dest_set_target_list (GTK_WIDGET (treeview), targetlist); ++ gtk_target_list_unref (targetlist); ++ ++ gtk_target_table_free (targets, n_targets); ++ } ++ ++ g_signal_connect (treeview, "drag_begin", ++ G_CALLBACK (on_drag_begin), ++ dialog); ++ g_signal_connect (treeview, "drag_data_get", ++ G_CALLBACK (on_drag_data_get), ++ dialog); ++ g_signal_connect (treeview, "drag_data_received", ++ G_CALLBACK (on_drag_data_received), ++ dialog); ++ ++ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dialog->priv->list_store), ++ STORE_COL_DESCRIPTION, ++ GTK_SORT_ASCENDING); ++ ++ ++ button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_ADD_WIDGET_NAME)); ++ dialog->priv->add_button = button; ++ g_signal_connect (button, ++ "clicked", ++ G_CALLBACK (on_add_app_clicked), ++ dialog); ++ ++ button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_DELETE_WIDGET_NAME)); ++ dialog->priv->delete_button = button; ++ g_signal_connect (button, ++ "clicked", ++ G_CALLBACK (on_delete_app_clicked), ++ dialog); ++ ++ button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_EDIT_WIDGET_NAME)); ++ dialog->priv->edit_button = button; ++ g_signal_connect (button, ++ "clicked", ++ G_CALLBACK (on_edit_app_clicked), ++ dialog); ++ ++ button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_REMEMBER_WIDGET_NAME)); ++ g_settings_bind (dialog->priv->settings, SPC_SETTINGS_AUTOSAVE_KEY, ++ button, "active", G_SETTINGS_BIND_DEFAULT); ++ ++ button = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ CAPPLET_SAVE_WIDGET_NAME)); ++ g_signal_connect (button, ++ "clicked", ++ G_CALLBACK (on_save_session_clicked), ++ dialog); ++ ++ dialog->priv->manager = gsp_app_manager_get (); ++ gsp_app_manager_fill (dialog->priv->manager); ++ g_signal_connect_swapped (dialog->priv->manager, "added", ++ G_CALLBACK (_app_added), dialog); ++ g_signal_connect_swapped (dialog->priv->manager, "removed", ++ G_CALLBACK (_app_removed), dialog); ++ ++ populate_model (dialog); ++} ++ ++static GObject * ++gsm_properties_dialog_constructor (GType type, ++ guint n_construct_properties, ++ GObjectConstructParam *construct_properties) ++{ ++ GsmPropertiesDialog *dialog; ++ ++ dialog = GSM_PROPERTIES_DIALOG (G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->constructor (type, ++ n_construct_properties, ++ construct_properties)); ++ ++ setup_dialog (dialog); ++ ++ gtk_widget_show (GTK_WIDGET (dialog)); ++ ++ return G_OBJECT (dialog); ++} ++ ++static void ++gsm_properties_dialog_dispose (GObject *object) ++{ ++ GsmPropertiesDialog *dialog; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object)); ++ ++ dialog = GSM_PROPERTIES_DIALOG (object); ++ ++ if (dialog->priv->xml != NULL) { ++ g_object_unref (dialog->priv->xml); ++ dialog->priv->xml = NULL; ++ } ++ ++ if (dialog->priv->settings != NULL) { ++ g_object_unref (dialog->priv->settings); ++ dialog->priv->settings = NULL; ++ } ++ ++ G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->dispose (object); ++ ++ /* it's important to do this after chaining to the parent dispose ++ * method because we want to make sure the treeview has been disposed ++ * and removed all its references to GspApp objects */ ++ if (dialog->priv->manager != NULL) { ++ g_object_unref (dialog->priv->manager); ++ dialog->priv->manager = NULL; ++ } ++} ++ ++static void ++gsm_properties_dialog_class_init (GsmPropertiesDialogClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->constructor = gsm_properties_dialog_constructor; ++ object_class->dispose = gsm_properties_dialog_dispose; ++ object_class->finalize = gsm_properties_dialog_finalize; ++ ++ g_type_class_add_private (klass, sizeof (GsmPropertiesDialogPrivate)); ++} ++ ++static void ++gsm_properties_dialog_init (GsmPropertiesDialog *dialog) ++{ ++ GtkWidget *content_area; ++ GtkWidget *widget; ++ GError *error; ++ ++ dialog->priv = GSM_PROPERTIES_DIALOG_GET_PRIVATE (dialog); ++ ++ dialog->priv->settings = g_settings_new (SPC_SETTINGS_SCHEMA); ++ ++ dialog->priv->xml = gtk_builder_new (); ++ gtk_builder_set_translation_domain (dialog->priv->xml, GETTEXT_PACKAGE); ++ ++ error = NULL; ++ if (!gtk_builder_add_from_file (dialog->priv->xml, ++ GTKBUILDER_DIR "/" GTKBUILDER_FILE, ++ &error)) { ++ if (error) { ++ g_warning ("Could not load capplet UI file: %s", ++ error->message); ++ g_error_free (error); ++ } else { ++ g_warning ("Could not load capplet UI file."); ++ } ++ } ++ ++ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); ++ widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, ++ "main-notebook")); ++ gtk_box_pack_start (GTK_BOX (content_area), widget, TRUE, TRUE, 0); ++ ++ gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 450); ++ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); ++ gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); ++ gtk_box_set_spacing (GTK_BOX (content_area), 2); ++ gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Startup Applications Preferences")); ++} ++ ++static void ++gsm_properties_dialog_finalize (GObject *object) ++{ ++ GsmPropertiesDialog *dialog; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSM_IS_PROPERTIES_DIALOG (object)); ++ ++ dialog = GSM_PROPERTIES_DIALOG (object); ++ ++ g_return_if_fail (dialog->priv != NULL); ++ ++ G_OBJECT_CLASS (gsm_properties_dialog_parent_class)->finalize (object); ++} ++ ++GtkWidget * ++gsm_properties_dialog_new (void) ++{ ++ GObject *object; ++ ++ object = g_object_new (GSM_TYPE_PROPERTIES_DIALOG, ++ NULL); ++ ++ return GTK_WIDGET (object); ++} +Index: gnome-session/capplet/gsm-properties-dialog.h +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsm-properties-dialog.h +@@ -0,0 +1,57 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __GSM_PROPERTIES_DIALOG_H ++#define __GSM_PROPERTIES_DIALOG_H ++ ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSM_TYPE_PROPERTIES_DIALOG (gsm_properties_dialog_get_type ()) ++#define GSM_PROPERTIES_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialog)) ++#define GSM_PROPERTIES_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass)) ++#define GSM_IS_PROPERTIES_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_PROPERTIES_DIALOG)) ++#define GSM_IS_PROPERTIES_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_PROPERTIES_DIALOG)) ++#define GSM_PROPERTIES_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogClass)) ++ ++typedef struct GsmPropertiesDialogPrivate GsmPropertiesDialogPrivate; ++ ++typedef struct ++{ ++ GtkDialog parent; ++ GsmPropertiesDialogPrivate *priv; ++} GsmPropertiesDialog; ++ ++typedef struct ++{ ++ GtkDialogClass parent_class; ++} GsmPropertiesDialogClass; ++ ++GType gsm_properties_dialog_get_type (void); ++ ++GtkWidget * gsm_properties_dialog_new (void); ++ ++#define GSM_PROPERTIES_ICON_SIZE GTK_ICON_SIZE_LARGE_TOOLBAR ++ ++G_END_DECLS ++ ++#endif /* __GSM_PROPERTIES_DIALOG_H */ +Index: gnome-session/capplet/gsp-app-manager.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-app-manager.c +@@ -0,0 +1,593 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2007, 2009 Vincent Untz. ++ * Copyright (C) 2008 Lucas Rocha. ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#include ++ ++#include "gsm-util.h" ++#include "gsp-app.h" ++ ++#include "gsp-app-manager.h" ++ ++static GspAppManager *manager = NULL; ++ ++typedef struct { ++ char *dir; ++ int index; ++ GFileMonitor *monitor; ++} GspXdgDir; ++ ++struct _GspAppManagerPrivate { ++ GSList *apps; ++ GSList *dirs; ++}; ++ ++#define GSP_APP_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP_MANAGER, GspAppManagerPrivate)) ++ ++ ++enum { ++ ADDED, ++ REMOVED, ++ LAST_SIGNAL ++}; ++ ++static guint gsp_app_manager_signals[LAST_SIGNAL] = { 0 }; ++ ++ ++G_DEFINE_TYPE (GspAppManager, gsp_app_manager, G_TYPE_OBJECT) ++ ++static void gsp_app_manager_dispose (GObject *object); ++static void gsp_app_manager_finalize (GObject *object); ++static void _gsp_app_manager_app_unref (GspApp *app, ++ GspAppManager *manager); ++static void _gsp_app_manager_app_removed (GspAppManager *manager, ++ GspApp *app); ++ ++static GspXdgDir * ++_gsp_xdg_dir_new (const char *dir, ++ int index) ++{ ++ GspXdgDir *xdgdir; ++ ++ xdgdir = g_slice_new (GspXdgDir); ++ ++ xdgdir->dir = g_strdup (dir); ++ xdgdir->index = index; ++ xdgdir->monitor = NULL; ++ ++ return xdgdir; ++} ++ ++static void ++_gsp_xdg_dir_free (GspXdgDir *xdgdir) ++{ ++ if (xdgdir->dir) { ++ g_free (xdgdir->dir); ++ xdgdir->dir = NULL; ++ } ++ ++ if (xdgdir->monitor) { ++ g_file_monitor_cancel (xdgdir->monitor); ++ g_object_unref (xdgdir->monitor); ++ xdgdir->monitor = NULL; ++ } ++ ++ g_slice_free (GspXdgDir, xdgdir); ++} ++ ++static void ++gsp_app_manager_class_init (GspAppManagerClass *class) ++{ ++ GObjectClass *gobject_class = G_OBJECT_CLASS (class); ++ ++ gobject_class->dispose = gsp_app_manager_dispose; ++ gobject_class->finalize = gsp_app_manager_finalize; ++ ++ gsp_app_manager_signals[ADDED] = ++ g_signal_new ("added", ++ G_TYPE_FROM_CLASS (gobject_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GspAppManagerClass, ++ added), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__OBJECT, ++ G_TYPE_NONE, 1, G_TYPE_OBJECT); ++ ++ gsp_app_manager_signals[REMOVED] = ++ g_signal_new ("removed", ++ G_TYPE_FROM_CLASS (gobject_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GspAppManagerClass, ++ removed), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__OBJECT, ++ G_TYPE_NONE, 1, G_TYPE_OBJECT); ++ ++ g_type_class_add_private (class, sizeof (GspAppManagerPrivate)); ++} ++ ++static void ++gsp_app_manager_init (GspAppManager *manager) ++{ ++ manager->priv = GSP_APP_MANAGER_GET_PRIVATE (manager); ++ ++ memset (manager->priv, 0, sizeof (GspAppManagerPrivate)); ++} ++ ++static void ++gsp_app_manager_dispose (GObject *object) ++{ ++ GspAppManager *manager; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSP_IS_APP_MANAGER (object)); ++ ++ manager = GSP_APP_MANAGER (object); ++ ++ /* we unref GspApp objects in dispose since they might need to ++ * reference us during their dispose/finalize */ ++ g_slist_foreach (manager->priv->apps, ++ (GFunc) _gsp_app_manager_app_unref, manager); ++ g_slist_free (manager->priv->apps); ++ manager->priv->apps = NULL; ++ ++ G_OBJECT_CLASS (gsp_app_manager_parent_class)->dispose (object); ++} ++ ++static void ++gsp_app_manager_finalize (GObject *object) ++{ ++ GspAppManager *manager; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSP_IS_APP_MANAGER (object)); ++ ++ manager = GSP_APP_MANAGER (object); ++ ++ g_slist_foreach (manager->priv->dirs, ++ (GFunc) _gsp_xdg_dir_free, NULL); ++ g_slist_free (manager->priv->dirs); ++ manager->priv->dirs = NULL; ++ ++ G_OBJECT_CLASS (gsp_app_manager_parent_class)->finalize (object); ++ ++ manager = NULL; ++} ++ ++static void ++_gsp_app_manager_emit_added (GspAppManager *manager, ++ GspApp *app) ++{ ++ g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[ADDED], ++ 0, app); ++} ++ ++static void ++_gsp_app_manager_emit_removed (GspAppManager *manager, ++ GspApp *app) ++{ ++ g_signal_emit (G_OBJECT (manager), gsp_app_manager_signals[REMOVED], ++ 0, app); ++} ++ ++/* ++ * Directories ++ */ ++ ++static int ++gsp_app_manager_get_dir_index (GspAppManager *manager, ++ const char *dir) ++{ ++ GSList *l; ++ GspXdgDir *xdgdir; ++ ++ g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), -1); ++ g_return_val_if_fail (dir != NULL, -1); ++ ++ for (l = manager->priv->dirs; l != NULL; l = l->next) { ++ xdgdir = l->data; ++ if (strcmp (dir, xdgdir->dir) == 0) { ++ return xdgdir->index; ++ } ++ } ++ ++ return -1; ++} ++ ++const char * ++gsp_app_manager_get_dir (GspAppManager *manager, ++ unsigned int index) ++{ ++ GSList *l; ++ GspXdgDir *xdgdir; ++ ++ g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); ++ ++ for (l = manager->priv->dirs; l != NULL; l = l->next) { ++ xdgdir = l->data; ++ if (index == xdgdir->index) { ++ return xdgdir->dir; ++ } ++ } ++ ++ return NULL; ++} ++ ++static int ++_gsp_app_manager_find_dir_with_basename (GspAppManager *manager, ++ const char *basename, ++ int minimum_index) ++{ ++ GSList *l; ++ GspXdgDir *xdgdir; ++ char *path; ++ GKeyFile *keyfile; ++ int result = -1; ++ ++ path = NULL; ++ keyfile = g_key_file_new (); ++ ++ for (l = manager->priv->dirs; l != NULL; l = l->next) { ++ xdgdir = l->data; ++ ++ if (xdgdir->index <= minimum_index) { ++ continue; ++ } ++ ++ g_free (path); ++ path = g_build_filename (xdgdir->dir, basename, NULL); ++ if (!g_file_test (path, G_FILE_TEST_EXISTS)) { ++ continue; ++ } ++ ++ if (!g_key_file_load_from_file (keyfile, path, ++ G_KEY_FILE_NONE, NULL)) { ++ continue; ++ } ++ ++ /* the file exists and is readable */ ++ if (result == -1) { ++ result = xdgdir->index; ++ } else { ++ result = MIN (result, xdgdir->index); ++ } ++ } ++ ++ g_key_file_free (keyfile); ++ g_free (path); ++ ++ return result; ++} ++ ++static void ++_gsp_app_manager_handle_delete (GspAppManager *manager, ++ GspApp *app, ++ const char *basename, ++ int index) ++{ ++ unsigned int position; ++ unsigned int system_position; ++ ++ position = gsp_app_get_xdg_position (app); ++ system_position = gsp_app_get_xdg_system_position (app); ++ ++ if (system_position < index) { ++ /* it got deleted, but we don't even care about it */ ++ return; ++ } ++ ++ if (index < position) { ++ /* it got deleted, but in a position earlier than the current ++ * one. This happens when the user file was changed and became ++ * identical to the system file; in this case, the user file is ++ * simply removed. */ ++ g_assert (index == 0); ++ return; ++ } ++ ++ if (position == index && ++ (system_position == index || system_position == G_MAXUINT)) { ++ /* the file used by the user was deleted, and there's no other ++ * file in system directories. So it really got deleted. */ ++ _gsp_app_manager_app_removed (manager, app); ++ return; ++ } ++ ++ if (system_position == index) { ++ /* then we know that position != index; we just hae to tell ++ * GspApp if there's still a system directory containing this ++ * basename */ ++ int new_system; ++ ++ new_system = _gsp_app_manager_find_dir_with_basename (manager, ++ basename, ++ index); ++ if (new_system < 0) { ++ gsp_app_set_xdg_system_position (app, G_MAXUINT); ++ } else { ++ gsp_app_set_xdg_system_position (app, new_system); ++ } ++ ++ return; ++ } ++ ++ if (position == index) { ++ /* then we know that system_position != G_MAXUINT; we need to ++ * tell GspApp to change position to system_position */ ++ const char *dir; ++ ++ dir = gsp_app_manager_get_dir (manager, system_position); ++ if (dir) { ++ char *path; ++ ++ path = g_build_filename (dir, basename, NULL); ++ gsp_app_reload_at (app, path, ++ (unsigned int) system_position); ++ g_free (path); ++ } else { ++ _gsp_app_manager_app_removed (manager, app); ++ } ++ ++ return; ++ } ++ ++ g_assert_not_reached (); ++} ++ ++static gboolean ++gsp_app_manager_xdg_dir_monitor (GFileMonitor *monitor, ++ GFile *child, ++ GFile *other_file, ++ GFileMonitorEvent flags, ++ gpointer data) ++{ ++ GspAppManager *manager; ++ GspApp *old_app; ++ GspApp *app; ++ GFile *parent; ++ char *basename; ++ char *dir; ++ char *path; ++ int index; ++ ++ manager = GSP_APP_MANAGER (data); ++ ++ basename = g_file_get_basename (child); ++ if (!g_str_has_suffix (basename, ".desktop")) { ++ /* not a desktop file, we can ignore */ ++ g_free (basename); ++ return TRUE; ++ } ++ old_app = gsp_app_manager_find_app_with_basename (manager, basename); ++ ++ parent = g_file_get_parent (child); ++ dir = g_file_get_path (parent); ++ g_object_unref (parent); ++ ++ index = gsp_app_manager_get_dir_index (manager, dir); ++ if (index < 0) { ++ /* not a directory we know; should never happen, though */ ++ g_free (dir); ++ return TRUE; ++ } ++ ++ path = g_file_get_path (child); ++ ++ switch (flags) { ++ case G_FILE_MONITOR_EVENT_CHANGED: ++ case G_FILE_MONITOR_EVENT_CREATED: ++ /* we just do as if it was a new file: GspApp is clever enough ++ * to do the right thing */ ++ app = gsp_app_new (path, (unsigned int) index); ++ ++ /* we didn't have this app before, so add it */ ++ if (old_app == NULL && app != NULL) { ++ gsp_app_manager_add (manager, app); ++ g_object_unref (app); ++ } ++ /* else: it was just updated, GspApp took care of ++ * sending the event */ ++ break; ++ case G_FILE_MONITOR_EVENT_DELETED: ++ if (!old_app) { ++ /* it got deleted, but we don't know about it, so ++ * nothing to do */ ++ break; ++ } ++ ++ _gsp_app_manager_handle_delete (manager, old_app, ++ basename, index); ++ break; ++ default: ++ break; ++ } ++ ++ g_free (path); ++ g_free (dir); ++ g_free (basename); ++ ++ return TRUE; ++} ++ ++/* ++ * Initialization ++ */ ++ ++static void ++_gsp_app_manager_fill_from_dir (GspAppManager *manager, ++ GspXdgDir *xdgdir) ++{ ++ GFile *file; ++ GDir *dir; ++ const char *name; ++ ++ file = g_file_new_for_path (xdgdir->dir); ++ xdgdir->monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, ++ NULL, NULL); ++ g_object_unref (file); ++ ++ if (xdgdir->monitor) { ++ g_signal_connect (xdgdir->monitor, "changed", ++ G_CALLBACK (gsp_app_manager_xdg_dir_monitor), ++ manager); ++ } ++ ++ dir = g_dir_open (xdgdir->dir, 0, NULL); ++ if (!dir) { ++ return; ++ } ++ ++ while ((name = g_dir_read_name (dir))) { ++ GspApp *app; ++ char *desktop_file_path; ++ ++ if (!g_str_has_suffix (name, ".desktop")) { ++ continue; ++ } ++ ++ desktop_file_path = g_build_filename (xdgdir->dir, name, NULL); ++ app = gsp_app_new (desktop_file_path, xdgdir->index); ++ ++ if (app != NULL) { ++ gsp_app_manager_add (manager, app); ++ g_object_unref (app); ++ } ++ ++ g_free (desktop_file_path); ++ } ++ ++ g_dir_close (dir); ++} ++ ++void ++gsp_app_manager_fill (GspAppManager *manager) ++{ ++ char **autostart_dirs; ++ int i; ++ ++ if (manager->priv->apps != NULL) ++ return; ++ ++ autostart_dirs = gsm_util_get_autostart_dirs (); ++ /* we always assume that the first directory is the user one */ ++ g_assert (g_str_has_prefix (autostart_dirs[0], ++ g_get_user_config_dir ())); ++ ++ for (i = 0; autostart_dirs[i] != NULL; i++) { ++ GspXdgDir *xdgdir; ++ ++ if (gsp_app_manager_get_dir_index (manager, ++ autostart_dirs[i]) >= 0) { ++ continue; ++ } ++ ++ xdgdir = _gsp_xdg_dir_new (autostart_dirs[i], i); ++ manager->priv->dirs = g_slist_prepend (manager->priv->dirs, ++ xdgdir); ++ ++ _gsp_app_manager_fill_from_dir (manager, xdgdir); ++ } ++ ++ g_strfreev (autostart_dirs); ++} ++ ++/* ++ * App handling ++ */ ++ ++static void ++_gsp_app_manager_app_unref (GspApp *app, ++ GspAppManager *manager) ++{ ++ g_signal_handlers_disconnect_by_func (app, ++ _gsp_app_manager_app_removed, ++ manager); ++ g_object_unref (app); ++} ++ ++static void ++_gsp_app_manager_app_removed (GspAppManager *manager, ++ GspApp *app) ++{ ++ _gsp_app_manager_emit_removed (manager, app); ++ manager->priv->apps = g_slist_remove (manager->priv->apps, app); ++ _gsp_app_manager_app_unref (app, manager); ++} ++ ++void ++gsp_app_manager_add (GspAppManager *manager, ++ GspApp *app) ++{ ++ g_return_if_fail (GSP_IS_APP_MANAGER (manager)); ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ manager->priv->apps = g_slist_prepend (manager->priv->apps, ++ g_object_ref (app)); ++ g_signal_connect_swapped (app, "removed", ++ G_CALLBACK (_gsp_app_manager_app_removed), ++ manager); ++ _gsp_app_manager_emit_added (manager, app); ++} ++ ++GspApp * ++gsp_app_manager_find_app_with_basename (GspAppManager *manager, ++ const char *basename) ++{ ++ GSList *l; ++ GspApp *app; ++ ++ g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); ++ g_return_val_if_fail (basename != NULL, NULL); ++ ++ for (l = manager->priv->apps; l != NULL; l = l->next) { ++ app = GSP_APP (l->data); ++ if (strcmp (basename, gsp_app_get_basename (app)) == 0) ++ return app; ++ } ++ ++ return NULL; ++} ++ ++/* ++ * Singleton ++ */ ++ ++GspAppManager * ++gsp_app_manager_get (void) ++{ ++ if (manager == NULL) { ++ manager = g_object_new (GSP_TYPE_APP_MANAGER, NULL); ++ return manager; ++ } else { ++ return g_object_ref (manager); ++ } ++} ++ ++GSList * ++gsp_app_manager_get_apps (GspAppManager *manager) ++{ ++ g_return_val_if_fail (GSP_IS_APP_MANAGER (manager), NULL); ++ ++ return g_slist_copy (manager->priv->apps); ++} +Index: gnome-session/capplet/gsp-app-manager.h +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-app-manager.h +@@ -0,0 +1,81 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2007, 2009 Vincent Untz. ++ * Copyright (C) 2008 Lucas Rocha. ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __GSP_APP_MANAGER_H ++#define __GSP_APP_MANAGER_H ++ ++#include ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSP_TYPE_APP_MANAGER (gsp_app_manager_get_type ()) ++#define GSP_APP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSP_TYPE_APP_MANAGER, GspAppManager)) ++#define GSP_APP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSP_TYPE_APP_MANAGER, GspAppManagerClass)) ++#define GSP_IS_APP_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSP_TYPE_APP_MANAGER)) ++#define GSP_IS_APP_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSP_TYPE_APP_MANAGER)) ++#define GSP_APP_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSP_TYPE_APP_MANAGER, GspAppManagerClass)) ++ ++typedef struct _GspAppManager GspAppManager; ++typedef struct _GspAppManagerClass GspAppManagerClass; ++ ++typedef struct _GspAppManagerPrivate GspAppManagerPrivate; ++ ++struct _GspAppManagerClass ++{ ++ GObjectClass parent_class; ++ ++ void (* added) (GspAppManager *manager, ++ GspApp *app); ++ void (* removed) (GspAppManager *manager, ++ GspApp *app); ++}; ++ ++struct _GspAppManager ++{ ++ GObject parent_instance; ++ ++ GspAppManagerPrivate *priv; ++}; ++ ++GType gsp_app_manager_get_type (void); ++ ++GspAppManager *gsp_app_manager_get (void); ++ ++void gsp_app_manager_fill (GspAppManager *manager); ++ ++GSList *gsp_app_manager_get_apps (GspAppManager *manager); ++ ++GspApp *gsp_app_manager_find_app_with_basename (GspAppManager *manager, ++ const char *basename); ++ ++const char *gsp_app_manager_get_dir (GspAppManager *manager, ++ unsigned int index); ++ ++void gsp_app_manager_add (GspAppManager *manager, ++ GspApp *app); ++ ++G_END_DECLS ++ ++#endif /* __GSP_APP_MANAGER_H */ +Index: gnome-session/capplet/gsp-app.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-app.c +@@ -0,0 +1,1129 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2007, 2009 Vincent Untz. ++ * Copyright (C) 2008 Lucas Rocha. ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++ ++#include ++#include ++ ++#include "gsm-app-dialog.h" ++#include "gsm-properties-dialog.h" ++#include "gsm-util.h" ++#include "gsp-app-manager.h" ++#include "gsp-keyfile.h" ++ ++#include "gsp-app.h" ++ ++#define GSP_APP_SAVE_DELAY 2 ++ ++#define GSP_ASP_SAVE_MASK_HIDDEN 0x0001 ++#define GSP_ASP_SAVE_MASK_ENABLED 0x0002 ++#define GSP_ASP_SAVE_MASK_NAME 0x0004 ++#define GSP_ASP_SAVE_MASK_EXEC 0x0008 ++#define GSP_ASP_SAVE_MASK_COMMENT 0x0010 ++#define GSP_ASP_SAVE_MASK_NO_DISPLAY 0x0020 ++#define GSP_ASP_SAVE_MASK_ALL 0xffff ++ ++struct _GspAppPrivate { ++ char *basename; ++ char *path; ++ ++ gboolean hidden; ++ gboolean no_display; ++ gboolean enabled; ++ gboolean shown; ++ ++ char *name; ++ char *exec; ++ char *comment; ++ char *icon; ++ ++ GIcon *gicon; ++ char *description; ++ ++ /* position of the directory in the XDG environment variable */ ++ unsigned int xdg_position; ++ /* position of the first system directory in the XDG env var containing ++ * this autostart app too (G_MAXUINT means none) */ ++ unsigned int xdg_system_position; ++ ++ unsigned int save_timeout; ++ /* mask of what has changed */ ++ unsigned int save_mask; ++ /* path that contains the original file that needs to be saved */ ++ char *old_system_path; ++ /* after writing to file, we skip the next file monitor event of type ++ * CHANGED */ ++ gboolean skip_next_monitor_event; ++}; ++ ++#define GSP_APP_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSP_TYPE_APP, GspAppPrivate)) ++ ++ ++enum { ++ CHANGED, ++ REMOVED, ++ LAST_SIGNAL ++}; ++ ++static guint gsp_app_signals[LAST_SIGNAL] = { 0 }; ++ ++ ++G_DEFINE_TYPE (GspApp, gsp_app, G_TYPE_OBJECT) ++ ++static void gsp_app_dispose (GObject *object); ++static void gsp_app_finalize (GObject *object); ++static gboolean _gsp_app_save (gpointer data); ++ ++ ++static gboolean ++_gsp_str_equal (const char *a, ++ const char *b) ++{ ++ if (g_strcmp0 (a, b) == 0) { ++ return TRUE; ++ } ++ ++ if (a && !b && a[0] == '\0') { ++ return TRUE; ++ } ++ ++ if (b && !a && b[0] == '\0') { ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++ ++static void ++gsp_app_class_init (GspAppClass *class) ++{ ++ GObjectClass *gobject_class = G_OBJECT_CLASS (class); ++ ++ gobject_class->dispose = gsp_app_dispose; ++ gobject_class->finalize = gsp_app_finalize; ++ ++ gsp_app_signals[CHANGED] = ++ g_signal_new ("changed", ++ G_TYPE_FROM_CLASS (gobject_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GspAppClass, ++ changed), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ ++ gsp_app_signals[REMOVED] = ++ g_signal_new ("removed", ++ G_TYPE_FROM_CLASS (gobject_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (GspAppClass, ++ removed), ++ NULL, ++ NULL, ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ ++ g_type_class_add_private (class, sizeof (GspAppPrivate)); ++} ++ ++static void ++gsp_app_init (GspApp *app) ++{ ++ app->priv = GSP_APP_GET_PRIVATE (app); ++ ++ memset (app->priv, 0, sizeof (GspAppPrivate)); ++ app->priv->xdg_position = G_MAXUINT; ++ app->priv->xdg_system_position = G_MAXUINT; ++} ++ ++static void ++_gsp_app_free_reusable_data (GspApp *app) ++{ ++ if (app->priv->path) { ++ g_free (app->priv->path); ++ app->priv->path = NULL; ++ } ++ ++ if (app->priv->name) { ++ g_free (app->priv->name); ++ app->priv->name = NULL; ++ } ++ ++ if (app->priv->exec) { ++ g_free (app->priv->exec); ++ app->priv->exec = NULL; ++ } ++ ++ if (app->priv->comment) { ++ g_free (app->priv->comment); ++ app->priv->comment = NULL; ++ } ++ ++ if (app->priv->icon) { ++ g_free (app->priv->icon); ++ app->priv->icon = NULL; ++ } ++ ++ if (app->priv->gicon) { ++ g_object_unref (app->priv->gicon); ++ app->priv->gicon = NULL; ++ } ++ ++ if (app->priv->description) { ++ g_free (app->priv->description); ++ app->priv->description = NULL; ++ } ++ ++ if (app->priv->old_system_path) { ++ g_free (app->priv->old_system_path); ++ app->priv->old_system_path = NULL; ++ } ++} ++ ++static void ++gsp_app_dispose (GObject *object) ++{ ++ GspApp *app; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSP_IS_APP (object)); ++ ++ app = GSP_APP (object); ++ ++ /* we save in dispose since we might need to reference GspAppManager */ ++ if (app->priv->save_timeout) { ++ g_source_remove (app->priv->save_timeout); ++ app->priv->save_timeout = 0; ++ ++ /* save now */ ++ _gsp_app_save (app); ++ } ++ ++ G_OBJECT_CLASS (gsp_app_parent_class)->dispose (object); ++} ++ ++static void ++gsp_app_finalize (GObject *object) ++{ ++ GspApp *app; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (GSP_IS_APP (object)); ++ ++ app = GSP_APP (object); ++ ++ if (app->priv->basename) { ++ g_free (app->priv->basename); ++ app->priv->basename = NULL; ++ } ++ ++ _gsp_app_free_reusable_data (app); ++ ++ G_OBJECT_CLASS (gsp_app_parent_class)->finalize (object); ++} ++ ++static void ++_gsp_app_emit_changed (GspApp *app) ++{ ++ g_signal_emit (G_OBJECT (app), gsp_app_signals[CHANGED], 0); ++} ++ ++static void ++_gsp_app_emit_removed (GspApp *app) ++{ ++ g_signal_emit (G_OBJECT (app), gsp_app_signals[REMOVED], 0); ++} ++ ++static void ++_gsp_app_update_description (GspApp *app) ++{ ++ const char *primary; ++ const char *secondary; ++ ++ if (!gsm_util_text_is_blank (app->priv->name)) { ++ primary = app->priv->name; ++ } else if (!gsm_util_text_is_blank (app->priv->exec)) { ++ primary = app->priv->exec; ++ } else { ++ primary = _("No name"); ++ } ++ ++ if (!gsm_util_text_is_blank (app->priv->comment)) { ++ secondary = app->priv->comment; ++ } else { ++ secondary = _("No description"); ++ } ++ ++ g_free (app->priv->description); ++ app->priv->description = g_markup_printf_escaped ("%s\n%s", ++ primary, ++ secondary); ++} ++ ++/* ++ * Saving ++ */ ++ ++static void ++_gsp_ensure_user_autostart_dir (void) ++{ ++ char *dir; ++ ++ dir = g_build_filename (g_get_user_config_dir (), "autostart", NULL); ++ g_mkdir_with_parents (dir, S_IRWXU); ++ ++ g_free (dir); ++} ++ ++static char * ++_gsp_get_current_desktop () ++{ ++ static char *current_desktop = NULL; ++ ++ /* Support XDG_CURRENT_DESKTOP environment variable; this can be used ++ * to abuse gnome-session in non-GNOME desktops. */ ++ if (!current_desktop) { ++ const char *desktop; ++ ++ desktop = g_getenv ("XDG_CURRENT_DESKTOP"); ++ ++ /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it ++ * was not set */ ++ if (!desktop || desktop[0] == '\0') ++ current_desktop = g_strdup ("GNOME"); ++ else ++ current_desktop = g_strdup (desktop); ++ } ++ ++ /* Using "*" means skipping desktop-related checks */ ++ if (g_strcmp0 (current_desktop, "*") == 0) ++ return NULL; ++ ++ return current_desktop; ++} ++ ++static gboolean ++_gsp_app_user_equal_system (GspApp *app, ++ char **system_path) ++{ ++ GspAppManager *manager; ++ const char *system_dir; ++ char *path; ++ char *str; ++ GKeyFile *keyfile; ++ ++ manager = gsp_app_manager_get (); ++ system_dir = gsp_app_manager_get_dir (manager, ++ app->priv->xdg_system_position); ++ g_object_unref (manager); ++ if (!system_dir) { ++ return FALSE; ++ } ++ ++ path = g_build_filename (system_dir, app->priv->basename, NULL); ++ ++ keyfile = g_key_file_new (); ++ if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) { ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ ++ if (gsp_key_file_get_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_HIDDEN, ++ FALSE) != app->priv->hidden || ++ gsp_key_file_get_boolean (keyfile, ++ GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, ++ TRUE) != app->priv->enabled || ++ gsp_key_file_get_shown (keyfile, ++ _gsp_get_current_desktop ()) != app->priv->shown) { ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ ++ if (gsp_key_file_get_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, ++ FALSE) != app->priv->no_display) { ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ ++ str = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NAME); ++ if (!_gsp_str_equal (str, app->priv->name)) { ++ g_free (str); ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ g_free (str); ++ ++ str = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_COMMENT); ++ if (!_gsp_str_equal (str, app->priv->comment)) { ++ g_free (str); ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ g_free (str); ++ ++ str = gsp_key_file_get_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_EXEC); ++ if (!_gsp_str_equal (str, app->priv->exec)) { ++ g_free (str); ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ g_free (str); ++ ++ str = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_ICON); ++ if (!_gsp_str_equal (str, app->priv->icon)) { ++ g_free (str); ++ g_free (path); ++ g_key_file_free (keyfile); ++ return FALSE; ++ } ++ g_free (str); ++ ++ g_key_file_free (keyfile); ++ ++ *system_path = path; ++ ++ return TRUE; ++} ++ ++static inline void ++_gsp_app_save_done_success (GspApp *app) ++{ ++ app->priv->save_mask = 0; ++ ++ if (app->priv->old_system_path) { ++ g_free (app->priv->old_system_path); ++ app->priv->old_system_path = NULL; ++ } ++} ++ ++static gboolean ++_gsp_app_save (gpointer data) ++{ ++ GspApp *app; ++ char *use_path; ++ GKeyFile *keyfile; ++ GError *error; ++ ++ app = GSP_APP (data); ++ ++ /* first check if removing the data from the user dir and using the ++ * data from the system dir is enough -- this helps us keep clean the ++ * user config dir by removing unneeded files */ ++ if (_gsp_app_user_equal_system (app, &use_path)) { ++ if (g_file_test (app->priv->path, G_FILE_TEST_EXISTS)) { ++ g_remove (app->priv->path); ++ } ++ ++ g_free (app->priv->path); ++ app->priv->path = use_path; ++ ++ app->priv->xdg_position = app->priv->xdg_system_position; ++ ++ _gsp_app_save_done_success (app); ++ return FALSE; ++ } ++ ++ if (app->priv->old_system_path) ++ use_path = app->priv->old_system_path; ++ else ++ use_path = app->priv->path; ++ ++ keyfile = g_key_file_new (); ++ ++ error = NULL; ++ g_key_file_load_from_file (keyfile, use_path, ++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, ++ &error); ++ ++ if (error) { ++ g_error_free (error); ++ gsp_key_file_populate (keyfile); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_HIDDEN) { ++ gsp_key_file_set_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_HIDDEN, ++ app->priv->hidden); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NO_DISPLAY) { ++ gsp_key_file_set_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, ++ app->priv->no_display); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_ENABLED) { ++ gsp_key_file_set_boolean (keyfile, ++ GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, ++ app->priv->enabled); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_NAME) { ++ gsp_key_file_set_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NAME, ++ app->priv->name); ++ gsp_key_file_ensure_C_key (keyfile, G_KEY_FILE_DESKTOP_KEY_NAME); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_COMMENT) { ++ gsp_key_file_set_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_COMMENT, ++ app->priv->comment); ++ gsp_key_file_ensure_C_key (keyfile, G_KEY_FILE_DESKTOP_KEY_COMMENT); ++ } ++ ++ if (app->priv->save_mask & GSP_ASP_SAVE_MASK_EXEC) { ++ gsp_key_file_set_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_EXEC, ++ app->priv->exec); ++ } ++ ++ _gsp_ensure_user_autostart_dir (); ++ if (gsp_key_file_to_file (keyfile, app->priv->path, NULL)) { ++ app->priv->skip_next_monitor_event = TRUE; ++ _gsp_app_save_done_success (app); ++ } else { ++ g_warning ("Could not save %s file", app->priv->path); ++ } ++ ++ g_key_file_free (keyfile); ++ ++ app->priv->save_timeout = 0; ++ return FALSE; ++} ++ ++static void ++_gsp_app_queue_save (GspApp *app) ++{ ++ if (app->priv->save_timeout) { ++ g_source_remove (app->priv->save_timeout); ++ app->priv->save_timeout = 0; ++ } ++ ++ /* if the file was not in the user directory, then we'll create a copy ++ * there */ ++ if (app->priv->xdg_position != 0) { ++ app->priv->xdg_position = 0; ++ ++ if (app->priv->old_system_path == NULL) { ++ app->priv->old_system_path = app->priv->path; ++ /* if old_system_path was not NULL, then it means we ++ * tried to save and we failed; in that case, we want ++ * to try again and use the old file as a basis again */ ++ } ++ ++ app->priv->path = g_build_filename (g_get_user_config_dir (), ++ "autostart", ++ app->priv->basename, NULL); ++ } ++ ++ app->priv->save_timeout = g_timeout_add_seconds (GSP_APP_SAVE_DELAY, ++ _gsp_app_save, ++ app); ++} ++ ++/* ++ * Accessors ++ */ ++ ++const char * ++gsp_app_get_basename (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->basename; ++} ++ ++const char * ++gsp_app_get_path (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->path; ++} ++ ++gboolean ++gsp_app_get_hidden (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), FALSE); ++ ++ return app->priv->hidden; ++} ++ ++gboolean ++gsp_app_get_display (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), FALSE); ++ ++ return !app->priv->no_display; ++} ++ ++gboolean ++gsp_app_get_enabled (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), FALSE); ++ ++ return app->priv->enabled; ++} ++ ++void ++gsp_app_set_enabled (GspApp *app, ++ gboolean enabled) ++{ ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ if (enabled == app->priv->enabled) { ++ return; ++ } ++ ++ app->priv->enabled = enabled; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; ++ ++ _gsp_app_queue_save (app); ++ _gsp_app_emit_changed (app); ++} ++ ++gboolean ++gsp_app_get_shown (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), FALSE); ++ ++ return app->priv->shown; ++} ++ ++const char * ++gsp_app_get_name (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->name; ++} ++ ++const char * ++gsp_app_get_exec (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->exec; ++} ++ ++const char * ++gsp_app_get_comment (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->comment; ++} ++ ++GIcon * ++gsp_app_get_icon (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ if (app->priv->gicon) { ++ return g_object_ref (app->priv->gicon); ++ } else { ++ return NULL; ++ } ++} ++ ++unsigned int ++gsp_app_get_xdg_position (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), G_MAXUINT); ++ ++ return app->priv->xdg_position; ++} ++ ++unsigned int ++gsp_app_get_xdg_system_position (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), G_MAXUINT); ++ ++ return app->priv->xdg_system_position; ++} ++ ++void ++gsp_app_set_xdg_system_position (GspApp *app, ++ unsigned int position) ++{ ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ app->priv->xdg_system_position = position; ++} ++ ++const char * ++gsp_app_get_description (GspApp *app) ++{ ++ g_return_val_if_fail (GSP_IS_APP (app), NULL); ++ ++ return app->priv->description; ++} ++ ++/* ++ * High-level edition ++ */ ++ ++void ++gsp_app_update (GspApp *app, ++ const char *name, ++ const char *comment, ++ const char *exec) ++{ ++ gboolean changed; ++ ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ changed = FALSE; ++ ++ if (!_gsp_str_equal (name, app->priv->name)) { ++ changed = TRUE; ++ g_free (app->priv->name); ++ app->priv->name = g_strdup (name); ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_NAME; ++ } ++ ++ if (!_gsp_str_equal (comment, app->priv->comment)) { ++ changed = TRUE; ++ g_free (app->priv->comment); ++ app->priv->comment = g_strdup (comment); ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_COMMENT; ++ } ++ ++ if (changed) { ++ _gsp_app_update_description (app); ++ } ++ ++ if (!_gsp_str_equal (exec, app->priv->exec)) { ++ changed = TRUE; ++ g_free (app->priv->exec); ++ app->priv->exec = g_strdup (exec); ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_EXEC; ++ } ++ ++ if (changed) { ++ _gsp_app_queue_save (app); ++ _gsp_app_emit_changed (app); ++ } ++} ++ ++void ++gsp_app_delete (GspApp *app) ++{ ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ if (app->priv->xdg_position == 0 && ++ app->priv->xdg_system_position == G_MAXUINT) { ++ /* exists in user directory only */ ++ if (app->priv->save_timeout) { ++ g_source_remove (app->priv->save_timeout); ++ app->priv->save_timeout = 0; ++ } ++ ++ if (g_file_test (app->priv->path, G_FILE_TEST_EXISTS)) { ++ g_remove (app->priv->path); ++ } ++ ++ /* for extra safety */ ++ app->priv->hidden = TRUE; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; ++ ++ _gsp_app_emit_removed (app); ++ } else { ++ /* also exists in system directory, so we have to keep a file ++ * in the user directory */ ++ app->priv->hidden = TRUE; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; ++ ++ _gsp_app_queue_save (app); ++ _gsp_app_emit_changed (app); ++ } ++} ++ ++/* ++ * New autostart app ++ */ ++ ++void ++gsp_app_reload_at (GspApp *app, ++ const char *path, ++ unsigned int xdg_position) ++{ ++ g_return_if_fail (GSP_IS_APP (app)); ++ ++ app->priv->xdg_position = G_MAXUINT; ++ gsp_app_new (path, xdg_position); ++} ++ ++GspApp * ++gsp_app_new (const char *path, ++ unsigned int xdg_position) ++{ ++ GspAppManager *manager; ++ GspApp *app; ++ GKeyFile *keyfile; ++ char *basename; ++ gboolean new; ++ ++ basename = g_path_get_basename (path); ++ ++ manager = gsp_app_manager_get (); ++ app = gsp_app_manager_find_app_with_basename (manager, basename); ++ g_object_unref (manager); ++ ++ new = (app == NULL); ++ ++ if (!new) { ++ if (app->priv->xdg_position == xdg_position) { ++ if (app->priv->skip_next_monitor_event) { ++ app->priv->skip_next_monitor_event = FALSE; ++ return NULL; ++ } ++ /* else: the file got changed but not by us, we'll ++ * update our data from disk */ ++ } ++ ++ if (app->priv->xdg_position < xdg_position || ++ app->priv->save_timeout != 0) { ++ /* we don't really care about this file, since we ++ * already have something with a higher priority, or ++ * we're going to write something in the user config ++ * anyway. ++ * Note: xdg_position >= 1 so it's a system dir */ ++ app->priv->xdg_system_position = MIN (xdg_position, ++ app->priv->xdg_system_position); ++ return NULL; ++ } ++ } ++ ++ keyfile = g_key_file_new (); ++ if (!g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL)) { ++ g_key_file_free (keyfile); ++ g_free (basename); ++ return NULL; ++ } ++ ++ if (new) { ++ app = g_object_new (GSP_TYPE_APP, NULL); ++ app->priv->basename = basename; ++ } else { ++ g_free (basename); ++ _gsp_app_free_reusable_data (app); ++ } ++ ++ app->priv->path = g_strdup (path); ++ ++ app->priv->hidden = gsp_key_file_get_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_HIDDEN, ++ FALSE); ++ app->priv->no_display = gsp_key_file_get_boolean (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, ++ FALSE); ++ app->priv->enabled = gsp_key_file_get_boolean (keyfile, ++ GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED, ++ TRUE); ++ app->priv->shown = gsp_key_file_get_shown (keyfile, ++ _gsp_get_current_desktop ()); ++ ++ app->priv->name = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_NAME); ++ app->priv->exec = gsp_key_file_get_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_EXEC); ++ app->priv->comment = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_COMMENT); ++ ++ if (gsm_util_text_is_blank (app->priv->name)) { ++ g_free (app->priv->name); ++ app->priv->name = g_strdup (app->priv->exec); ++ } ++ ++ app->priv->icon = gsp_key_file_get_locale_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_ICON); ++ ++ if (app->priv->icon) { ++ /* look at icon and see if it's a themed icon or not */ ++ if (g_path_is_absolute (app->priv->icon)) { ++ GFile *iconfile; ++ ++ iconfile = g_file_new_for_path (app->priv->icon); ++ app->priv->gicon = g_file_icon_new (iconfile); ++ g_object_unref (iconfile); ++ } else { ++ app->priv->gicon = g_themed_icon_new (app->priv->icon); ++ } ++ } else { ++ app->priv->gicon = NULL; ++ } ++ ++ g_key_file_free (keyfile); ++ ++ _gsp_app_update_description (app); ++ ++ if (xdg_position > 0) { ++ g_assert (xdg_position <= app->priv->xdg_system_position); ++ app->priv->xdg_system_position = xdg_position; ++ } ++ /* else we keep the old value (which is G_MAXUINT if it wasn't set) */ ++ app->priv->xdg_position = xdg_position; ++ ++ g_assert (!new || app->priv->save_timeout == 0); ++ app->priv->save_timeout = 0; ++ app->priv->old_system_path = NULL; ++ app->priv->skip_next_monitor_event = FALSE; ++ ++ if (!new) { ++ _gsp_app_emit_changed (app); ++ } ++ ++ return app; ++} ++ ++static char * ++_gsp_find_free_basename (const char *suggested_basename) ++{ ++ GspAppManager *manager; ++ char *base_path; ++ char *filename; ++ char *basename; ++ int i; ++ ++ if (g_str_has_suffix (suggested_basename, ".desktop")) { ++ char *basename_no_ext; ++ ++ basename_no_ext = g_strndup (suggested_basename, ++ strlen (suggested_basename) - strlen (".desktop")); ++ base_path = g_build_filename (g_get_user_config_dir (), ++ "autostart", ++ basename_no_ext, NULL); ++ g_free (basename_no_ext); ++ } else { ++ base_path = g_build_filename (g_get_user_config_dir (), ++ "autostart", ++ suggested_basename, NULL); ++ } ++ ++ filename = g_strdup_printf ("%s.desktop", base_path); ++ basename = g_path_get_basename (filename); ++ ++ manager = gsp_app_manager_get (); ++ ++ i = 1; ++#define _GSP_FIND_MAX_TRY 10000 ++ while (gsp_app_manager_find_app_with_basename (manager, ++ basename) != NULL && ++ g_file_test (filename, G_FILE_TEST_EXISTS) && ++ i < _GSP_FIND_MAX_TRY) { ++ g_free (filename); ++ g_free (basename); ++ ++ filename = g_strdup_printf ("%s-%d.desktop", base_path, i); ++ basename = g_path_get_basename (filename); ++ ++ i++; ++ } ++ ++ g_object_unref (manager); ++ ++ g_free (base_path); ++ g_free (filename); ++ ++ if (i == _GSP_FIND_MAX_TRY) { ++ g_free (basename); ++ return NULL; ++ } ++ ++ return basename; ++} ++ ++void ++gsp_app_create (const char *name, ++ const char *comment, ++ const char *exec) ++{ ++ GspAppManager *manager; ++ GspApp *app; ++ char *basename; ++ char **argv; ++ int argc; ++ ++ g_return_if_fail (!gsm_util_text_is_blank (exec)); ++ ++ if (!g_shell_parse_argv (exec, &argc, &argv, NULL)) { ++ return; ++ } ++ ++ basename = _gsp_find_free_basename (argv[0]); ++ g_strfreev (argv); ++ if (basename == NULL) { ++ return; ++ } ++ ++ app = g_object_new (GSP_TYPE_APP, NULL); ++ ++ app->priv->basename = basename; ++ app->priv->path = g_build_filename (g_get_user_config_dir (), ++ "autostart", ++ app->priv->basename, NULL); ++ ++ app->priv->hidden = FALSE; ++ app->priv->no_display = FALSE; ++ app->priv->enabled = TRUE; ++ app->priv->shown = TRUE; ++ ++ if (!gsm_util_text_is_blank (name)) { ++ app->priv->name = g_strdup (name); ++ } else { ++ app->priv->name = g_strdup (exec); ++ } ++ app->priv->exec = g_strdup (exec); ++ app->priv->comment = g_strdup (comment); ++ app->priv->icon = NULL; ++ ++ app->priv->gicon = NULL; ++ _gsp_app_update_description (app); ++ ++ /* by definition */ ++ app->priv->xdg_position = 0; ++ app->priv->xdg_system_position = G_MAXUINT; ++ ++ app->priv->save_timeout = 0; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_ALL; ++ app->priv->old_system_path = NULL; ++ app->priv->skip_next_monitor_event = FALSE; ++ ++ _gsp_app_queue_save (app); ++ ++ manager = gsp_app_manager_get (); ++ gsp_app_manager_add (manager, app); ++ g_object_unref (app); ++ g_object_unref (manager); ++} ++ ++gboolean ++gsp_app_copy_desktop_file (const char *uri) ++{ ++ GspAppManager *manager; ++ GspApp *app; ++ GFile *src_file; ++ char *src_basename; ++ char *dst_basename; ++ char *dst_path; ++ GFile *dst_file; ++ gboolean changed; ++ ++ g_return_val_if_fail (uri != NULL, FALSE); ++ ++ src_file = g_file_new_for_uri (uri); ++ src_basename = g_file_get_basename (src_file); ++ ++ if (src_basename == NULL) { ++ g_object_unref (src_file); ++ return FALSE; ++ } ++ ++ dst_basename = _gsp_find_free_basename (src_basename); ++ g_free (src_basename); ++ ++ if (dst_basename == NULL) { ++ g_object_unref (src_file); ++ return FALSE; ++ } ++ ++ dst_path = g_build_filename (g_get_user_config_dir (), ++ "autostart", ++ dst_basename, NULL); ++ g_free (dst_basename); ++ ++ dst_file = g_file_new_for_path (dst_path); ++ ++ _gsp_ensure_user_autostart_dir (); ++ if (!g_file_copy (src_file, dst_file, G_FILE_COPY_NONE, ++ NULL, NULL, NULL, NULL)) { ++ g_object_unref (src_file); ++ g_object_unref (dst_file); ++ g_free (dst_path); ++ return FALSE; ++ } ++ ++ g_object_unref (src_file); ++ g_object_unref (dst_file); ++ ++ app = gsp_app_new (dst_path, 0); ++ if (!app) { ++ g_remove (dst_path); ++ g_free (dst_path); ++ return FALSE; ++ } ++ ++ g_free (dst_path); ++ ++ changed = FALSE; ++ if (app->priv->hidden) { ++ changed = TRUE; ++ app->priv->hidden = FALSE; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_HIDDEN; ++ } ++ ++ if (app->priv->no_display) { ++ changed = TRUE; ++ app->priv->no_display = FALSE; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_NO_DISPLAY; ++ } ++ ++ if (!app->priv->enabled) { ++ changed = TRUE; ++ app->priv->enabled = TRUE; ++ app->priv->save_mask |= GSP_ASP_SAVE_MASK_ENABLED; ++ } ++ ++ if (changed) { ++ _gsp_app_queue_save (app); ++ } ++ ++ manager = gsp_app_manager_get (); ++ gsp_app_manager_add (manager, app); ++ g_object_unref (app); ++ g_object_unref (manager); ++ ++ return TRUE; ++} +Index: gnome-session/capplet/gsp-app.h +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-app.h +@@ -0,0 +1,108 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2007, 2009 Vincent Untz. ++ * Copyright (C) 2008 Lucas Rocha. ++ * Copyright (C) 2008 William Jon McCann ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ */ ++ ++#ifndef __GSP_APP_H ++#define __GSP_APP_H ++ ++#include ++#include ++ ++G_BEGIN_DECLS ++ ++#define GSP_TYPE_APP (gsp_app_get_type ()) ++#define GSP_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSP_TYPE_APP, GspApp)) ++#define GSP_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSP_TYPE_APP, GspAppClass)) ++#define GSP_IS_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSP_TYPE_APP)) ++#define GSP_IS_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSP_TYPE_APP)) ++#define GSP_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSP_TYPE_APP, GspAppClass)) ++ ++typedef struct _GspApp GspApp; ++typedef struct _GspAppClass GspAppClass; ++ ++typedef struct _GspAppPrivate GspAppPrivate; ++ ++struct _GspAppClass ++{ ++ GObjectClass parent_class; ++ ++ void (* changed) (GspApp *app); ++ void (* removed) (GspApp *app); ++}; ++ ++struct _GspApp ++{ ++ GObject parent_instance; ++ ++ GspAppPrivate *priv; ++}; ++ ++GType gsp_app_get_type (void); ++ ++void gsp_app_create (const char *name, ++ const char *comment, ++ const char *exec); ++void gsp_app_update (GspApp *app, ++ const char *name, ++ const char *comment, ++ const char *exec); ++ ++gboolean gsp_app_copy_desktop_file (const char *uri); ++ ++void gsp_app_delete (GspApp *app); ++ ++const char *gsp_app_get_basename (GspApp *app); ++const char *gsp_app_get_path (GspApp *app); ++ ++gboolean gsp_app_get_hidden (GspApp *app); ++gboolean gsp_app_get_display (GspApp *app); ++ ++gboolean gsp_app_get_enabled (GspApp *app); ++void gsp_app_set_enabled (GspApp *app, ++ gboolean enabled); ++ ++gboolean gsp_app_get_shown (GspApp *app); ++ ++const char *gsp_app_get_name (GspApp *app); ++const char *gsp_app_get_exec (GspApp *app); ++const char *gsp_app_get_comment (GspApp *app); ++ ++const char *gsp_app_get_description (GspApp *app); ++GIcon *gsp_app_get_icon (GspApp *app); ++ ++/* private interface for GspAppManager only */ ++ ++GspApp *gsp_app_new (const char *path, ++ unsigned int xdg_position); ++ ++void gsp_app_reload_at (GspApp *app, ++ const char *path, ++ unsigned int xdg_position); ++ ++unsigned int gsp_app_get_xdg_position (GspApp *app); ++unsigned int gsp_app_get_xdg_system_position (GspApp *app); ++void gsp_app_set_xdg_system_position (GspApp *app, ++ unsigned int position); ++ ++G_END_DECLS ++ ++#endif /* __GSP_APP_H */ +Index: gnome-session/capplet/gsp-keyfile.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-keyfile.c +@@ -0,0 +1,201 @@ ++/* ++ * gsp-keyfile.c: GKeyFile extensions ++ * ++ * Copyright (C) 2008, 2009 Novell, Inc. ++ * ++ * Based on code from panel-keyfile.c (from gnome-panel) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ * Authors: ++ * Vincent Untz ++ */ ++ ++#include ++ ++#include ++ ++#include "gsp-keyfile.h" ++ ++void ++gsp_key_file_populate (GKeyFile *keyfile) ++{ ++ gsp_key_file_set_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_TYPE, ++ "Application"); ++ ++ gsp_key_file_set_string (keyfile, ++ G_KEY_FILE_DESKTOP_KEY_EXEC, ++ "/bin/false"); ++} ++ ++//FIXME: kill this when bug #309224 is fixed ++gboolean ++gsp_key_file_to_file (GKeyFile *keyfile, ++ const gchar *path, ++ GError **error) ++{ ++ GError *write_error; ++ gchar *data; ++ gsize length; ++ gboolean res; ++ ++ g_return_val_if_fail (keyfile != NULL, FALSE); ++ g_return_val_if_fail (path != NULL, FALSE); ++ ++ write_error = NULL; ++ data = g_key_file_to_data (keyfile, &length, &write_error); ++ ++ if (write_error) { ++ g_propagate_error (error, write_error); ++ return FALSE; ++ } ++ ++ res = g_file_set_contents (path, data, length, &write_error); ++ g_free (data); ++ ++ if (write_error) { ++ g_propagate_error (error, write_error); ++ return FALSE; ++ } ++ ++ return res; ++} ++ ++gboolean ++gsp_key_file_get_boolean (GKeyFile *keyfile, ++ const gchar *key, ++ gboolean default_value) ++{ ++ GError *error; ++ gboolean retval; ++ ++ error = NULL; ++ retval = g_key_file_get_boolean (keyfile, G_KEY_FILE_DESKTOP_GROUP, ++ key, &error); ++ if (error != NULL) { ++ retval = default_value; ++ g_error_free (error); ++ } ++ ++ return retval; ++} ++ ++gboolean ++gsp_key_file_get_shown (GKeyFile *keyfile, ++ const char *current_desktop) ++{ ++ char **only_show_in, **not_show_in; ++ gboolean found; ++ int i; ++ ++ if (!current_desktop) ++ return TRUE; ++ ++ only_show_in = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP, ++ G_KEY_FILE_DESKTOP_KEY_ONLY_SHOW_IN, ++ NULL, NULL); ++ ++ if (only_show_in) { ++ found = FALSE; ++ for (i = 0; only_show_in[i] != NULL; i++) { ++ if (g_strcmp0 (current_desktop, only_show_in[i]) == 0) { ++ found = TRUE; ++ break; ++ } ++ } ++ ++ g_strfreev (only_show_in); ++ ++ if (!found) ++ return FALSE; ++ } ++ ++ not_show_in = g_key_file_get_string_list (keyfile, G_KEY_FILE_DESKTOP_GROUP, ++ G_KEY_FILE_DESKTOP_KEY_NOT_SHOW_IN, ++ NULL, NULL); ++ ++ if (not_show_in) { ++ found = FALSE; ++ for (i = 0; not_show_in[i] != NULL; i++) { ++ if (g_strcmp0 (current_desktop, not_show_in[i]) == 0) { ++ found = TRUE; ++ break; ++ } ++ } ++ ++ g_strfreev (not_show_in); ++ ++ if (found) ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++void ++gsp_key_file_set_locale_string (GKeyFile *keyfile, ++ const gchar *key, ++ const gchar *value) ++{ ++ const char *locale; ++ const char * const *langs_pointer; ++ int i; ++ ++ if (value == NULL) { ++ value = ""; ++ } ++ ++ locale = NULL; ++ langs_pointer = g_get_language_names (); ++ for (i = 0; langs_pointer[i] != NULL; i++) { ++ /* find first without encoding */ ++ if (strchr (langs_pointer[i], '.') == NULL) { ++ locale = langs_pointer[i]; ++ break; ++ } ++ } ++ ++ if (locale != NULL) { ++ g_key_file_set_locale_string (keyfile, G_KEY_FILE_DESKTOP_GROUP, ++ key, locale, value); ++ } else { ++ g_key_file_set_string (keyfile, G_KEY_FILE_DESKTOP_GROUP, ++ key, value); ++ } ++} ++ ++void ++gsp_key_file_ensure_C_key (GKeyFile *keyfile, ++ const char *key) ++{ ++ char *C_value; ++ char *buffer; ++ ++ /* Make sure we set the "C" locale strings to the terms we set here. ++ * This is so that if the user logs into another locale they get their ++ * own description there rather then empty. It is not the C locale ++ * however, but the user created this entry herself so it's OK */ ++ C_value = gsp_key_file_get_string (keyfile, key); ++ if (C_value == NULL || C_value [0] == '\0') { ++ buffer = gsp_key_file_get_locale_string (keyfile, key); ++ if (buffer) { ++ gsp_key_file_set_string (keyfile, key, buffer); ++ g_free (buffer); ++ } ++ } ++ g_free (C_value); ++} +Index: gnome-session/capplet/gsp-keyfile.h +=================================================================== +--- /dev/null ++++ gnome-session/capplet/gsp-keyfile.h +@@ -0,0 +1,65 @@ ++/* ++ * gsp-keyfile.h: GKeyFile extensions ++ * ++ * Copyright (C) 2008, 2009 Novell, Inc. ++ * ++ * Based on code from panel-keyfile.h (from gnome-panel) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ * ++ * Authors: ++ * Vincent Untz ++ */ ++ ++#ifndef GSP_KEYFILE_H ++#define GSP_KEYFILE_H ++ ++#include "glib.h" ++ ++G_BEGIN_DECLS ++ ++#define GSP_KEY_FILE_DESKTOP_KEY_AUTOSTART_ENABLED "X-GNOME-Autostart-enabled" ++ ++void gsp_key_file_populate (GKeyFile *keyfile); ++ ++gboolean gsp_key_file_to_file (GKeyFile *keyfile, ++ const gchar *path, ++ GError **error); ++ ++gboolean gsp_key_file_get_boolean (GKeyFile *keyfile, ++ const gchar *key, ++ gboolean default_value); ++gboolean gsp_key_file_get_shown (GKeyFile *keyfile, ++ const char *current_desktop); ++#define gsp_key_file_get_string(key_file, key) \ ++ g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, key, NULL) ++#define gsp_key_file_get_locale_string(key_file, key) \ ++ g_key_file_get_locale_string(key_file, G_KEY_FILE_DESKTOP_GROUP, key, NULL, NULL) ++ ++#define gsp_key_file_set_boolean(key_file, key, value) \ ++ g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, key, value) ++#define gsp_key_file_set_string(key_file, key, value) \ ++ g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP, key, value) ++void gsp_key_file_set_locale_string (GKeyFile *keyfile, ++ const gchar *key, ++ const gchar *value); ++ ++void gsp_key_file_ensure_C_key (GKeyFile *keyfile, ++ const char *key); ++ ++G_END_DECLS ++ ++#endif /* GSP_KEYFILE_H */ +Index: gnome-session/capplet/main.c +=================================================================== +--- /dev/null ++++ gnome-session/capplet/main.c +@@ -0,0 +1,108 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * main.c ++ * Copyright (C) 1999 Free Software Foundation, Inc. ++ * Copyright (C) 2008 Lucas Rocha. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ++ * 02111-1307, USA. ++ */ ++ ++#include ++ ++#include ++#include ++ ++#include ++#include ++ ++#include "gsm-properties-dialog.h" ++ ++static gboolean show_version = FALSE; ++ ++static GOptionEntry options[] = { ++ { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL }, ++ { NULL, 0, 0, 0, NULL, NULL, NULL } ++}; ++ ++static void ++dialog_response (GsmPropertiesDialog *dialog, ++ guint response_id, ++ gpointer data) ++{ ++ GdkScreen *screen; ++ GError *error; ++ ++ if (response_id == GTK_RESPONSE_HELP) { ++ screen = gtk_widget_get_screen (GTK_WIDGET (dialog)); ++ ++ error = NULL; ++ gtk_show_uri (screen, "ghelp:user-guide?gosstartsession-2", ++ gtk_get_current_event_time (), &error); ++ ++ if (error != NULL) { ++ GtkWidget *d; ++ d = gtk_message_dialog_new (GTK_WINDOW (dialog), ++ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ "%s", ++ _("Could not display help document")); ++ gtk_message_dialog_format_secondary_text ( ++ GTK_MESSAGE_DIALOG (d), ++ "%s", error->message); ++ g_error_free (error); ++ ++ gtk_dialog_run (GTK_DIALOG (d)); ++ gtk_widget_destroy (d); ++ } ++ } else { ++ gtk_widget_destroy (GTK_WIDGET (dialog)); ++ gtk_main_quit (); ++ } ++} ++ ++int ++main (int argc, char *argv[]) ++{ ++ GError *error; ++ GtkWidget *dialog; ++ ++ bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ ++ error = NULL; ++ if (! gtk_init_with_args (&argc, &argv, " - GNOME Session Properties", options, GETTEXT_PACKAGE, &error)) { ++ g_warning ("Unable to start: %s", error->message); ++ g_error_free (error); ++ return 1; ++ } ++ ++ if (show_version) { ++ g_print ("%s %s\n", argv [0], VERSION); ++ return 0; ++ } ++ ++ dialog = gsm_properties_dialog_new (); ++ g_signal_connect (dialog, ++ "response", ++ G_CALLBACK (dialog_response), ++ NULL); ++ gtk_widget_show (dialog); ++ ++ gtk_main (); ++ ++ return 0; ++} +Index: gnome-session/configure.ac +=================================================================== +--- gnome-session.orig/configure.ac ++++ gnome-session/configure.ac +@@ -328,11 +328,13 @@ dnl ==================================== + + AC_CONFIG_FILES([ + Makefile ++capplet/Makefile + doc/Makefile + doc/dbus/Makefile + doc/dbus/gnome-session.xml + doc/man/Makefile + data/Makefile ++data/gnome-session-properties.desktop.in + data/org.gnome.SessionManager.gschema.xml + data/icons/Makefile + data/icons/16x16/Makefile +Index: gnome-session/data/Makefile.am +=================================================================== +--- gnome-session.orig/data/Makefile.am ++++ gnome-session/data/Makefile.am +@@ -24,6 +24,10 @@ wayland_sessiondir = $(datadir)/wayland- + wayland_session_in_files = gnome-wayland.desktop.in + wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop) + ++desktopdir = $(datadir)/applications ++desktop_in_files = gnome-session-properties.desktop.in ++desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) ++ + sessiondir = $(datadir)/gnome-session/sessions + session_in_in_files = gnome.session.desktop.in.in gnome-dummy.session.desktop.in.in gnome-wayland.session.desktop.in.in + session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in) +@@ -59,10 +63,12 @@ CLEANFILES = \ + $(gsettings_SCHEMAS) \ + $(xsession_DATA) \ + $(wayland_session_DATA) \ ++ $(desktop_DATA) \ + $(session_DATA) + + DISTCLEANFILES = \ + $(gsettings_SCHEMAS) \ ++ $(desktop_in_files) \ + $(wayland_session_in_files) + + -include $(top_srcdir)/git.mk +Index: gnome-session/data/gnome-session-properties.desktop.in.in +=================================================================== +--- /dev/null ++++ gnome-session/data/gnome-session-properties.desktop.in.in +@@ -0,0 +1,15 @@ ++[Desktop Entry] ++_Name=Startup Applications ++_Comment=Choose what applications to start when you log in ++Exec=gnome-session-properties ++Icon=session-properties ++Terminal=false ++Type=Application ++StartupNotify=true ++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings; ++OnlyShowIn=GNOME;Unity; ++NoDisplay=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=gnome-session ++X-GNOME-Bugzilla-Component=gnome-session-properties ++X-GNOME-Bugzilla-Version=@VERSION@ +Index: gnome-session/doc/man/Makefile.am +=================================================================== +--- gnome-session.orig/doc/man/Makefile.am ++++ gnome-session/doc/man/Makefile.am +@@ -11,6 +11,7 @@ XSLTPROC_FLAGS = \ + + man_MANS = \ + gnome-session.1 \ ++ gnome-session-properties.1 \ + gnome-session-quit.1 \ + gnome-session-inhibit.1 + +Index: gnome-session/doc/man/gnome-session-properties.1 +=================================================================== +--- /dev/null ++++ gnome-session/doc/man/gnome-session-properties.1 +@@ -0,0 +1,24 @@ ++.\" ++.\" gnome-session-properties manual page. ++.\" (C) 2009-2010 Vincent Untz (vuntz@gnome.org) ++.\" ++.TH GNOME-SESSION-PROPERTIES 1 "GNOME" ++.SH NAME ++gnome-session-properties \- Configure applications to start on login ++.SH SYNOPSIS ++.B gnome-session-properties ++.SH DESCRIPTION ++.PP ++The \fIgnome-session-properties\fP program enables the users to ++configure what applications should be started on login, in addition to ++the default startup applications configured on the system. ++.PP ++It also proposes an interface to save a snapshot of the currently ++running applications so that they can automatically be restored to ++their current state on your next GNOME session. ++.SH BUGS ++If you find bugs in the \fIgnome-session-properties\fP program, please report ++these on https://bugzilla.gnome.org. ++.SH SEE ALSO ++.BR gnome-session(1) ++.BR gnome-session-quit(1) +Index: gnome-session/po/POTFILES.in +=================================================================== +--- gnome-session.orig/po/POTFILES.in ++++ gnome-session/po/POTFILES.in +@@ -1,9 +1,14 @@ + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. ++capplet/gsm-app-dialog.c ++capplet/gsm-properties-dialog.c ++capplet/gsp-app.c ++capplet/main.c + data/gnome-custom-session.desktop.in + data/gnome.desktop.in + data/gnome-dummy.session.desktop.in.in + data/gnome.session.desktop.in.in ++data/gnome-session-properties.desktop.in.in + data/gnome-wayland.desktop.in + data/gnome-wayland.session.desktop.in.in + [type: gettext/glade]data/session-selector.ui diff -Nru gnome-session-3.9.90/debian/patches/series gnome-session-3.14.0/debian/patches/series --- gnome-session-3.9.90/debian/patches/series 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/patches/series 2014-10-31 08:20:49.000000000 +0000 @@ -1,13 +1,8 @@ -#10_session_save.patch -#12_no_gdm_fallback.patch +revert_remove_gnome_session_properties.patch 13_display_session_properties.patch 22_support_autostart_delay.patch 50_ubuntu_sessions.patch 51_remove_session_saving_from_gui.patch -52_xdg_current_desktop.patch 53_add_sessionmigration.patch -#80_new_upstream_session_dialog.patch 95_dbus_request_shutdown.patch -#101_screen_lock_on_suspend.patch 103_kill_the_fail_whale.patch -git_fix_wrong_unref_call.patch diff -Nru gnome-session-3.9.90/debian/rules gnome-session-3.14.0/debian/rules --- gnome-session-3.9.90/debian/rules 2014-10-15 10:18:25.000000000 +0000 +++ gnome-session-3.14.0/debian/rules 2014-10-31 08:20:49.000000000 +0000 @@ -10,10 +10,16 @@ -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \ - --enable-ipv6 \ - --enable-systemd + --enable-ipv6 + +ifeq (linux,$(DEB_HOST_ARCH_OS)) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-systemd +else + DEB_CONFIGURE_EXTRA_FLAGS += --disable-systemd +endif LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed install/gnome-session-bin:: install -m 644 -D debian/gnome-session-bin.user-session.upstart debian/gnome-session-bin/usr/share/upstart/sessions/gnome-session.conf + diff -Nru gnome-session-3.9.90/depcomp gnome-session-3.14.0/depcomp --- gnome-session-3.9.90/depcomp 2013-03-19 17:22:45.000000000 +0000 +++ gnome-session-3.14.0/depcomp 2014-09-22 14:19:25.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-10-18.11; # UTC +scriptversion=2013-05-30.07; # UTC # Copyright (C) 1999-2013 Free Software Foundation, Inc. @@ -552,6 +552,7 @@ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; diff -Nru gnome-session-3.9.90/doc/dbus/Makefile.in gnome-session-3.14.0/doc/dbus/Makefile.in --- gnome-session-3.9.90/doc/dbus/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/doc/dbus/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -199,6 +199,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -266,6 +267,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -280,6 +283,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/doc/Makefile.in gnome-session-3.14.0/doc/Makefile.in --- gnome-session-3.9.90/doc/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/doc/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -229,6 +229,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -296,6 +297,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -310,6 +313,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -Nru gnome-session-3.9.90/doc/man/gnome-session-inhibit.1 gnome-session-3.14.0/doc/man/gnome-session-inhibit.1 --- gnome-session-3.9.90/doc/man/gnome-session-inhibit.1 2013-03-19 17:23:07.000000000 +0000 +++ gnome-session-3.14.0/doc/man/gnome-session-inhibit.1 2014-07-18 20:54:25.000000000 +0000 @@ -2,7 +2,7 @@ .\" Title: gnome-session-inhibit .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 03/19/2013 +.\" Date: 07/18/2014 .\" Manual: User Commands .\" Source: gnome-session .\" Language: English diff -Nru gnome-session-3.9.90/doc/man/gnome-session-properties.1 gnome-session-3.14.0/doc/man/gnome-session-properties.1 --- gnome-session-3.9.90/doc/man/gnome-session-properties.1 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/doc/man/gnome-session-properties.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -.\" -.\" gnome-session-properties manual page. -.\" (C) 2009-2010 Vincent Untz (vuntz@gnome.org) -.\" -.TH GNOME-SESSION-PROPERTIES 1 "GNOME" -.SH NAME -gnome-session-properties \- Configure applications to start on login -.SH SYNOPSIS -.B gnome-session-properties -.SH DESCRIPTION -.PP -The \fIgnome-session-properties\fP program enables the users to -configure what applications should be started on login, in addition to -the default startup applications configured on the system. -.PP -It also proposes an interface to save a snapshot of the currently -running applications so that they can automatically be restored to -their current state on your next GNOME session. -.SH BUGS -If you find bugs in the \fIgnome-session-properties\fP program, please report -these on https://bugzilla.gnome.org. -.SH SEE ALSO -.BR gnome-session(1) -.BR gnome-session-quit(1) diff -Nru gnome-session-3.9.90/doc/man/Makefile.am gnome-session-3.14.0/doc/man/Makefile.am --- gnome-session-3.9.90/doc/man/Makefile.am 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/doc/man/Makefile.am 2014-06-25 18:06:33.000000000 +0000 @@ -11,7 +11,6 @@ man_MANS = \ gnome-session.1 \ - gnome-session-properties.1 \ gnome-session-quit.1 \ gnome-session-inhibit.1 diff -Nru gnome-session-3.9.90/doc/man/Makefile.in gnome-session-3.14.0/doc/man/Makefile.in --- gnome-session-3.9.90/doc/man/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/doc/man/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -200,6 +200,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -267,6 +268,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -281,6 +284,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -344,8 +349,8 @@ --stringparam man.authors.section.enabled 0 \ --stringparam man.copyright.section.enabled 0 -man_MANS = gnome-session.1 gnome-session-properties.1 \ - gnome-session-quit.1 gnome-session-inhibit.1 $(am__append_1) +man_MANS = gnome-session.1 gnome-session-quit.1 \ + gnome-session-inhibit.1 $(am__append_1) EXTRA_DIST = \ gnome-session-inhibit.xml \ gnome-session-selector.xml \ diff -Nru gnome-session-3.9.90/egg/eggdesktopfile.c gnome-session-3.14.0/egg/eggdesktopfile.c --- gnome-session-3.9.90/egg/eggdesktopfile.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/egg/eggdesktopfile.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1528 +0,0 @@ -/* eggdesktopfile.c - Freedesktop.Org Desktop Files - * Copyright (C) 2007 Novell, Inc. - * - * Based on gnome-desktop-item.c - * Copyright (C) 1999, 2000 Red Hat Inc. - * Copyright (C) 2001 George Lebl - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - - * Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "eggdesktopfile.h" - -#include -#include - -#include -#include -#include - -struct EggDesktopFile { - GKeyFile *key_file; - char *source; - - char *name, *icon; - EggDesktopFileType type; - char document_code; -}; - -/** - * egg_desktop_file_new: - * @desktop_file_path: path to a Freedesktop-style Desktop file - * @error: error pointer - * - * Creates a new #EggDesktopFile for @desktop_file. - * - * Return value: the new #EggDesktopFile, or %NULL on error. - **/ -EggDesktopFile * -egg_desktop_file_new (const char *desktop_file_path, GError **error) -{ - GKeyFile *key_file; - - key_file = g_key_file_new (); - if (!g_key_file_load_from_file (key_file, desktop_file_path, 0, error)) - { - g_key_file_free (key_file); - return NULL; - } - - return egg_desktop_file_new_from_key_file (key_file, desktop_file_path, - error); -} - -/** - * egg_desktop_file_new_from_data_dirs: - * @desktop_file_path: relative path to a Freedesktop-style Desktop file - * @error: error pointer - * - * Looks for @desktop_file_path in the paths returned from - * g_get_user_data_dir() and g_get_system_data_dirs(), and creates - * a new #EggDesktopFile from it. - * - * Return value: the new #EggDesktopFile, or %NULL on error. - **/ -EggDesktopFile * -egg_desktop_file_new_from_data_dirs (const char *desktop_file_path, - GError **error) -{ - EggDesktopFile *desktop_file; - GKeyFile *key_file; - char *full_path; - - key_file = g_key_file_new (); - if (!g_key_file_load_from_data_dirs (key_file, desktop_file_path, - &full_path, 0, error)) - { - g_key_file_free (key_file); - return NULL; - } - - desktop_file = egg_desktop_file_new_from_key_file (key_file, - full_path, - error); - g_free (full_path); - return desktop_file; -} - -/** - * egg_desktop_file_new_from_dirs: - * @desktop_file_path: relative path to a Freedesktop-style Desktop file - * @search_dirs: NULL-terminated array of directories to search - * @error: error pointer - * - * Looks for @desktop_file_path in the paths returned from - * g_get_user_data_dir() and g_get_system_data_dirs(), and creates - * a new #EggDesktopFile from it. - * - * Return value: the new #EggDesktopFile, or %NULL on error. - **/ -EggDesktopFile * -egg_desktop_file_new_from_dirs (const char *desktop_file_path, - const char **search_dirs, - GError **error) -{ - EggDesktopFile *desktop_file; - GKeyFile *key_file; - char *full_path; - - key_file = g_key_file_new (); - if (!g_key_file_load_from_dirs (key_file, desktop_file_path, search_dirs, - &full_path, 0, error)) - { - g_key_file_free (key_file); - return NULL; - } - - desktop_file = egg_desktop_file_new_from_key_file (key_file, - full_path, - error); - g_free (full_path); - return desktop_file; -} - -/** - * egg_desktop_file_new_from_key_file: - * @key_file: a #GKeyFile representing a desktop file - * @source: the path or URI that @key_file was loaded from, or %NULL - * @error: error pointer - * - * Creates a new #EggDesktopFile for @key_file. Assumes ownership of - * @key_file (on success or failure); you should consider @key_file to - * be freed after calling this function. - * - * Return value: the new #EggDesktopFile, or %NULL on error. - **/ -EggDesktopFile * -egg_desktop_file_new_from_key_file (GKeyFile *key_file, - const char *source, - GError **error) -{ - EggDesktopFile *desktop_file; - char *version, *type; - - if (!g_key_file_has_group (key_file, EGG_DESKTOP_FILE_GROUP)) - { - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_INVALID, - _("File is not a valid .desktop file")); - g_key_file_free (key_file); - return NULL; - } - - version = g_key_file_get_value (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_VERSION, - NULL); - if (version) - { - double version_num; - char *end; - - version_num = g_ascii_strtod (version, &end); - if (*end) - { - g_warning ("Invalid Version string '%s' in %s", - version, source ? source : "(unknown)"); - } - else if (version_num > 1.0) - { - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_INVALID, - /* translators: 'Version' is from a desktop file, and - * should not be translated. '%s' would probably be a - * version number. */ - _("Unrecognized desktop file Version '%s'"), version); - g_free (version); - g_key_file_free (key_file); - return NULL; - } - g_free (version); - } - - desktop_file = g_new0 (EggDesktopFile, 1); - desktop_file->key_file = key_file; - - if (g_path_is_absolute (source)) - desktop_file->source = g_filename_to_uri (source, NULL, NULL); - else - desktop_file->source = g_strdup (source); - - desktop_file->name = g_key_file_get_locale_string (key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_NAME, - NULL, - error); - if (!desktop_file->name) - { - egg_desktop_file_free (desktop_file); - return NULL; - } - - type = g_key_file_get_string (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_TYPE, error); - if (!type) - { - egg_desktop_file_free (desktop_file); - return NULL; - } - - if (!strcmp (type, "Application")) - { - char *exec, *p; - - desktop_file->type = EGG_DESKTOP_FILE_TYPE_APPLICATION; - - exec = g_key_file_get_string (key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_EXEC, - error); - if (!exec) - { - egg_desktop_file_free (desktop_file); - g_free (type); - return NULL; - } - - /* See if it takes paths or URIs or neither */ - for (p = exec; *p; p++) - { - if (*p == '%') - { - if (p[1] == '\0' || strchr ("FfUu", p[1])) - { - desktop_file->document_code = p[1]; - break; - } - p++; - } - } - - g_free (exec); - } - else if (!strcmp (type, "Link")) - { - char *url; - - desktop_file->type = EGG_DESKTOP_FILE_TYPE_LINK; - - url = g_key_file_get_string (key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_URL, - error); - if (!url) - { - egg_desktop_file_free (desktop_file); - g_free (type); - return NULL; - } - g_free (url); - } - else if (!strcmp (type, "Directory")) - desktop_file->type = EGG_DESKTOP_FILE_TYPE_DIRECTORY; - else - desktop_file->type = EGG_DESKTOP_FILE_TYPE_UNRECOGNIZED; - - g_free (type); - - /* Check the Icon key */ - desktop_file->icon = g_key_file_get_string (key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_ICON, - NULL); - if (desktop_file->icon && !g_path_is_absolute (desktop_file->icon)) - { - char *ext; - - /* Lots of .desktop files still get this wrong */ - ext = strrchr (desktop_file->icon, '.'); - if (ext && (!strcmp (ext, ".png") || - !strcmp (ext, ".xpm") || - !strcmp (ext, ".svg"))) - { - g_warning ("Desktop file '%s' has malformed Icon key '%s'" - "(should not include extension)", - source ? source : "(unknown)", - desktop_file->icon); - *ext = '\0'; - } - } - - return desktop_file; -} - -/** - * egg_desktop_file_free: - * @desktop_file: an #EggDesktopFile - * - * Frees @desktop_file. - **/ -void -egg_desktop_file_free (EggDesktopFile *desktop_file) -{ - g_key_file_free (desktop_file->key_file); - g_free (desktop_file->source); - g_free (desktop_file->name); - g_free (desktop_file->icon); - g_free (desktop_file); -} - -/** - * egg_desktop_file_get_source: - * @desktop_file: an #EggDesktopFile - * - * Gets the URI that @desktop_file was loaded from. - * - * Return value: @desktop_file's source URI - **/ -const char * -egg_desktop_file_get_source (EggDesktopFile *desktop_file) -{ - return desktop_file->source; -} - -/** - * egg_desktop_file_get_desktop_file_type: - * @desktop_file: an #EggDesktopFile - * - * Gets the desktop file type of @desktop_file. - * - * Return value: @desktop_file's type - **/ -EggDesktopFileType -egg_desktop_file_get_desktop_file_type (EggDesktopFile *desktop_file) -{ - return desktop_file->type; -} - -/** - * egg_desktop_file_get_name: - * @desktop_file: an #EggDesktopFile - * - * Gets the (localized) value of @desktop_file's "Name" key. - * - * Return value: the application/link name - **/ -const char * -egg_desktop_file_get_name (EggDesktopFile *desktop_file) -{ - return desktop_file->name; -} - -/** - * egg_desktop_file_get_icon: - * @desktop_file: an #EggDesktopFile - * - * Gets the value of @desktop_file's "Icon" key. - * - * If the icon string is a full path (that is, if g_path_is_absolute() - * returns %TRUE when called on it), it points to a file containing an - * unthemed icon. If the icon string is not a full path, it is the - * name of a themed icon, which can be looked up with %GtkIconTheme, - * or passed directly to a theme-aware widget like %GtkImage or - * %GtkCellRendererPixbuf. - * - * Return value: the icon path or name - **/ -const char * -egg_desktop_file_get_icon (EggDesktopFile *desktop_file) -{ - return desktop_file->icon; -} - -gboolean -egg_desktop_file_has_key (EggDesktopFile *desktop_file, - const char *key, - GError **error) -{ - return g_key_file_has_key (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - error); -} - -char * -egg_desktop_file_get_string (EggDesktopFile *desktop_file, - const char *key, - GError **error) -{ - return g_key_file_get_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - error); -} - -char * -egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, - const char *key, - const char *locale, - GError **error) -{ - return g_key_file_get_locale_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, locale, - error); -} - -gboolean -egg_desktop_file_get_boolean (EggDesktopFile *desktop_file, - const char *key, - GError **error) -{ - return g_key_file_get_boolean (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - error); -} - -double -egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, - const char *key, - GError **error) -{ - return g_key_file_get_double (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - error); -} - -int -egg_desktop_file_get_integer (EggDesktopFile *desktop_file, - const char *key, - GError **error) -{ - return g_key_file_get_integer (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - error); -} - -char ** -egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, - const char *key, - gsize *length, - GError **error) -{ - return g_key_file_get_string_list (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, length, - error); -} - -char ** -egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, - const char *key, - const char *locale, - gsize *length, - GError **error) -{ - return g_key_file_get_locale_string_list (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, key, - locale, length, - error); -} - -/** - * egg_desktop_file_can_launch: - * @desktop_file: an #EggDesktopFile - * @desktop_environment: the name of the running desktop environment, - * or %NULL - * - * Tests if @desktop_file can/should be launched in the current - * environment. If @desktop_environment is non-%NULL, @desktop_file's - * "OnlyShowIn" and "NotShowIn" keys are checked to make sure that - * this desktop_file is appropriate for the named environment. - * - * Furthermore, if @desktop_file has type - * %EGG_DESKTOP_FILE_TYPE_APPLICATION, its "TryExec" key (if any) is - * also checked, to make sure the binary it points to exists. - * - * egg_desktop_file_can_launch() does NOT check the value of the - * "Hidden" key. - * - * Return value: %TRUE if @desktop_file can be launched - **/ -gboolean -egg_desktop_file_can_launch (EggDesktopFile *desktop_file, - const char *desktop_environment) -{ - char *try_exec, *found_program; - char **only_show_in, **not_show_in; - gboolean found; - int i; - - if (desktop_file->type != EGG_DESKTOP_FILE_TYPE_APPLICATION && - desktop_file->type != EGG_DESKTOP_FILE_TYPE_LINK) - return FALSE; - - if (desktop_environment) - { - only_show_in = g_key_file_get_string_list (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_ONLY_SHOW_IN, - NULL, NULL); - if (only_show_in) - { - for (i = 0, found = FALSE; only_show_in[i] && !found; i++) - { - if (!strcmp (only_show_in[i], desktop_environment)) - found = TRUE; - } - - g_strfreev (only_show_in); - - if (!found) - return FALSE; - } - - not_show_in = g_key_file_get_string_list (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_NOT_SHOW_IN, - NULL, NULL); - if (not_show_in) - { - for (i = 0, found = FALSE; not_show_in[i] && !found; i++) - { - if (!strcmp (not_show_in[i], desktop_environment)) - found = TRUE; - } - - g_strfreev (not_show_in); - - if (found) - return FALSE; - } - } - - if (desktop_file->type == EGG_DESKTOP_FILE_TYPE_APPLICATION) - { - try_exec = g_key_file_get_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_TRY_EXEC, - NULL); - if (try_exec) - { - found_program = g_find_program_in_path (try_exec); - g_free (try_exec); - - if (!found_program) - return FALSE; - g_free (found_program); - } - } - - return TRUE; -} - -/** - * egg_desktop_file_accepts_documents: - * @desktop_file: an #EggDesktopFile - * - * Tests if @desktop_file represents an application that can accept - * documents on the command line. - * - * Return value: %TRUE or %FALSE - **/ -gboolean -egg_desktop_file_accepts_documents (EggDesktopFile *desktop_file) -{ - return desktop_file->document_code != 0; -} - -/** - * egg_desktop_file_accepts_multiple: - * @desktop_file: an #EggDesktopFile - * - * Tests if @desktop_file can accept multiple documents at once. - * - * If this returns %FALSE, you can still pass multiple documents to - * egg_desktop_file_launch(), but that will result in multiple copies - * of the application being launched. See egg_desktop_file_launch() - * for more details. - * - * Return value: %TRUE or %FALSE - **/ -gboolean -egg_desktop_file_accepts_multiple (EggDesktopFile *desktop_file) -{ - return (desktop_file->document_code == 'F' || - desktop_file->document_code == 'U'); -} - -/** - * egg_desktop_file_accepts_uris: - * @desktop_file: an #EggDesktopFile - * - * Tests if @desktop_file can accept (non-"file:") URIs as documents to - * open. - * - * Return value: %TRUE or %FALSE - **/ -gboolean -egg_desktop_file_accepts_uris (EggDesktopFile *desktop_file) -{ - return (desktop_file->document_code == 'U' || - desktop_file->document_code == 'u'); -} - -static void -append_quoted_word (GString *str, - const char *s, - gboolean in_single_quotes, - gboolean in_double_quotes) -{ - const char *p; - - if (!in_single_quotes && !in_double_quotes) - g_string_append_c (str, '\''); - else if (!in_single_quotes && in_double_quotes) - g_string_append (str, "\"'"); - - if (!strchr (s, '\'')) - g_string_append (str, s); - else - { - for (p = s; *p != '\0'; p++) - { - if (*p == '\'') - g_string_append (str, "'\\''"); - else - g_string_append_c (str, *p); - } - } - - if (!in_single_quotes && !in_double_quotes) - g_string_append_c (str, '\''); - else if (!in_single_quotes && in_double_quotes) - g_string_append (str, "'\""); -} - -static void -do_percent_subst (EggDesktopFile *desktop_file, - char code, - GString *str, - GSList **documents, - gboolean in_single_quotes, - gboolean in_double_quotes) -{ - GSList *d; - char *doc; - - switch (code) - { - case '%': - g_string_append_c (str, '%'); - break; - - case 'F': - case 'U': - for (d = *documents; d; d = d->next) - { - doc = d->data; - g_string_append (str, " "); - append_quoted_word (str, doc, in_single_quotes, in_double_quotes); - } - *documents = NULL; - break; - - case 'f': - case 'u': - if (*documents) - { - doc = (*documents)->data; - g_string_append (str, " "); - append_quoted_word (str, doc, in_single_quotes, in_double_quotes); - *documents = (*documents)->next; - } - break; - - case 'i': - if (desktop_file->icon) - { - g_string_append (str, "--icon "); - append_quoted_word (str, desktop_file->icon, - in_single_quotes, in_double_quotes); - } - break; - - case 'c': - if (desktop_file->name) - { - append_quoted_word (str, desktop_file->name, - in_single_quotes, in_double_quotes); - } - break; - - case 'k': - if (desktop_file->source) - { - append_quoted_word (str, desktop_file->source, - in_single_quotes, in_double_quotes); - } - break; - - case 'D': - case 'N': - case 'd': - case 'n': - case 'v': - case 'm': - /* Deprecated; skip */ - break; - - default: - g_warning ("Unrecognized %%-code '%%%c' in Exec", code); - break; - } -} - -static char * -parse_exec (EggDesktopFile *desktop_file, - GSList **documents, - GError **error) -{ - char *exec, *p, *command; - gboolean escape, single_quot, double_quot; - GString *gs; - - exec = g_key_file_get_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_EXEC, - error); - if (!exec) - return NULL; - - /* Build the command */ - gs = g_string_new (NULL); - escape = single_quot = double_quot = FALSE; - - for (p = exec; *p != '\0'; p++) - { - if (escape) - { - escape = FALSE; - g_string_append_c (gs, *p); - } - else if (*p == '\\') - { - if (!single_quot) - escape = TRUE; - g_string_append_c (gs, *p); - } - else if (*p == '\'') - { - g_string_append_c (gs, *p); - if (!single_quot && !double_quot) - single_quot = TRUE; - else if (single_quot) - single_quot = FALSE; - } - else if (*p == '"') - { - g_string_append_c (gs, *p); - if (!single_quot && !double_quot) - double_quot = TRUE; - else if (double_quot) - double_quot = FALSE; - } - else if (*p == '%' && p[1]) - { - do_percent_subst (desktop_file, p[1], gs, documents, - single_quot, double_quot); - p++; - } - else - g_string_append_c (gs, *p); - } - - g_free (exec); - command = g_string_free (gs, FALSE); - - /* Prepend "xdg-terminal " if needed (FIXME: use gvfs) */ - if (g_key_file_has_key (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_TERMINAL, - NULL)) - { - GError *terminal_error = NULL; - gboolean use_terminal = - g_key_file_get_boolean (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_TERMINAL, - &terminal_error); - if (terminal_error) - { - g_free (command); - g_propagate_error (error, terminal_error); - return NULL; - } - - if (use_terminal) - { - gs = g_string_new ("xdg-terminal "); - append_quoted_word (gs, command, FALSE, FALSE); - g_free (command); - command = g_string_free (gs, FALSE); - } - } - - return command; -} - -static GSList * -translate_document_list (EggDesktopFile *desktop_file, GSList *documents) -{ - gboolean accepts_uris = egg_desktop_file_accepts_uris (desktop_file); - GSList *ret, *d; - - for (d = documents, ret = NULL; d; d = d->next) - { - const char *document = d->data; - gboolean is_uri = !g_path_is_absolute (document); - char *translated; - - if (accepts_uris) - { - if (is_uri) - translated = g_strdup (document); - else - translated = g_filename_to_uri (document, NULL, NULL); - } - else - { - if (is_uri) - translated = g_filename_from_uri (document, NULL, NULL); - else - translated = g_strdup (document); - } - - if (translated) - ret = g_slist_prepend (ret, translated); - } - - return g_slist_reverse (ret); -} - -static void -free_document_list (GSList *documents) -{ - GSList *d; - - for (d = documents; d; d = d->next) - g_free (d->data); - g_slist_free (documents); -} - -/** - * egg_desktop_file_parse_exec: - * @desktop_file: a #EggDesktopFile - * @documents: a list of document paths or URIs - * @error: error pointer - * - * Parses @desktop_file's Exec key, inserting @documents into it, and - * returns the result. - * - * If @documents contains non-file: URIs and @desktop_file does not - * accept URIs, those URIs will be ignored. Likewise, if @documents - * contains more elements than @desktop_file accepts, the extra - * documents will be ignored. - * - * Return value: the parsed Exec string - **/ -char * -egg_desktop_file_parse_exec (EggDesktopFile *desktop_file, - GSList *documents, - GError **error) -{ - GSList *translated, *docs; - char *command; - - docs = translated = translate_document_list (desktop_file, documents); - command = parse_exec (desktop_file, &docs, error); - free_document_list (translated); - - return command; -} - -static gboolean -parse_link (EggDesktopFile *desktop_file, - EggDesktopFile **app_desktop_file, - GSList **documents, - GError **error) -{ - char *url; - GKeyFile *key_file; - - url = g_key_file_get_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_URL, - error); - if (!url) - return FALSE; - *documents = g_slist_prepend (NULL, url); - - /* FIXME: use gvfs */ - key_file = g_key_file_new (); - g_key_file_set_string (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_NAME, - "xdg-open"); - g_key_file_set_string (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_TYPE, - "Application"); - g_key_file_set_string (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_EXEC, - "xdg-open %u"); - *app_desktop_file = egg_desktop_file_new_from_key_file (key_file, NULL, NULL); - return TRUE; -} - -#if GTK_CHECK_VERSION (2, 12, 0) -static char * -start_startup_notification (GdkDisplay *display, - EggDesktopFile *desktop_file, - const char *argv0, - int screen, - int workspace, - guint32 launch_time) -{ - static int sequence = 0; - char *startup_id; - char *description, *wmclass; - char *screen_str, *workspace_str; - - if (g_key_file_has_key (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_STARTUP_NOTIFY, - NULL)) - { - if (!g_key_file_get_boolean (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_STARTUP_NOTIFY, - NULL)) - return NULL; - wmclass = NULL; - } - else - { - wmclass = g_key_file_get_string (desktop_file->key_file, - EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_STARTUP_WM_CLASS, - NULL); - if (!wmclass) - return NULL; - } - - if (launch_time == (guint32)-1) - launch_time = gdk_x11_display_get_user_time (display); - startup_id = g_strdup_printf ("%s-%lu-%s-%s-%d_TIME%lu", - g_get_prgname (), - (unsigned long)getpid (), - g_get_host_name (), - argv0, - sequence++, - (unsigned long)launch_time); - - description = g_strdup_printf (_("Starting %s"), desktop_file->name); - screen_str = g_strdup_printf ("%d", screen); - workspace_str = workspace == -1 ? NULL : g_strdup_printf ("%d", workspace); - - gdk_x11_display_broadcast_startup_message (display, "new", - "ID", startup_id, - "NAME", desktop_file->name, - "SCREEN", screen_str, - "BIN", argv0, - "ICON", desktop_file->icon, - "DESKTOP", workspace_str, - "DESCRIPTION", description, - "WMCLASS", wmclass, - NULL); - - g_free (description); - g_free (wmclass); - g_free (screen_str); - g_free (workspace_str); - - return startup_id; -} - -static void -end_startup_notification (GdkDisplay *display, - const char *startup_id) -{ - gdk_x11_display_broadcast_startup_message (display, "remove", - "ID", startup_id, - NULL); -} - -#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */) - -typedef struct { - GdkDisplay *display; - char *startup_id; -} StartupNotificationData; - -static gboolean -startup_notification_timeout (gpointer data) -{ - StartupNotificationData *sn_data = data; - - end_startup_notification (sn_data->display, sn_data->startup_id); - g_object_unref (sn_data->display); - g_free (sn_data->startup_id); - g_free (sn_data); - - return FALSE; -} - -static void -set_startup_notification_timeout (GdkDisplay *display, - const char *startup_id) -{ - StartupNotificationData *sn_data; - - sn_data = g_new (StartupNotificationData, 1); - sn_data->display = g_object_ref (display); - sn_data->startup_id = g_strdup (startup_id); - - g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH, - startup_notification_timeout, sn_data); -} -#endif /* GTK 2.12 */ - -static GPtrArray * -array_putenv (GPtrArray *env, char *variable) -{ - guint i, keylen; - - if (!env) - { - char **envp; - - env = g_ptr_array_new (); - - envp = g_listenv (); - for (i = 0; envp[i]; i++) - { - const char *value; - - value = g_getenv (envp[i]); - g_ptr_array_add (env, g_strdup_printf ("%s=%s", envp[i], - value ? value : "")); - } - g_strfreev (envp); - } - - keylen = strcspn (variable, "="); - - /* Remove old value of key */ - for (i = 0; i < env->len; i++) - { - char *envvar = env->pdata[i]; - - if (!strncmp (envvar, variable, keylen) && envvar[keylen] == '=') - { - g_free (envvar); - g_ptr_array_remove_index_fast (env, i); - break; - } - } - - /* Add new value */ - g_ptr_array_add (env, g_strdup (variable)); - - return env; -} - -static gboolean -egg_desktop_file_launchv (EggDesktopFile *desktop_file, - GSList *documents, va_list args, - GError **error) -{ - EggDesktopFileLaunchOption option; - GSList *translated_documents = NULL, *docs = NULL; - char *command, **argv; - int argc, i, screen_num; - gboolean success, current_success; - GdkDisplay *display; - char *startup_id; - - GPtrArray *env = NULL; - char **variables = NULL; - GdkScreen *screen = NULL; - int workspace = -1; - const char *directory = NULL; - guint32 launch_time = (guint32)-1; - GSpawnFlags flags = G_SPAWN_SEARCH_PATH; - GSpawnChildSetupFunc setup_func = NULL; - gpointer setup_data = NULL; - - GPid *ret_pid = NULL; - int *ret_stdin = NULL, *ret_stdout = NULL, *ret_stderr = NULL; - char **ret_startup_id = NULL; - - if (documents && desktop_file->document_code == 0) - { - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, - _("Application does not accept documents on command line")); - return FALSE; - } - - /* Read the options: technically it's incorrect for the caller to - * NULL-terminate the list of options (rather than 0-terminating - * it), but NULL-terminating lets us use G_GNUC_NULL_TERMINATED, - * it's more consistent with other glib/gtk methods, and it will - * work as long as sizeof (int) <= sizeof (NULL), and NULL is - * represented as 0. (Which is true everywhere we care about.) - */ - while ((option = va_arg (args, EggDesktopFileLaunchOption))) - { - switch (option) - { - case EGG_DESKTOP_FILE_LAUNCH_CLEARENV: - if (env) - g_ptr_array_free (env, TRUE); - env = g_ptr_array_new (); - break; - case EGG_DESKTOP_FILE_LAUNCH_PUTENV: - variables = va_arg (args, char **); - for (i = 0; variables[i]; i++) - env = array_putenv (env, variables[i]); - break; - - case EGG_DESKTOP_FILE_LAUNCH_SCREEN: - screen = va_arg (args, GdkScreen *); - break; - case EGG_DESKTOP_FILE_LAUNCH_WORKSPACE: - workspace = va_arg (args, int); - break; - - case EGG_DESKTOP_FILE_LAUNCH_DIRECTORY: - directory = va_arg (args, const char *); - break; - case EGG_DESKTOP_FILE_LAUNCH_TIME: - launch_time = va_arg (args, guint32); - break; - case EGG_DESKTOP_FILE_LAUNCH_FLAGS: - flags |= va_arg (args, GSpawnFlags); - /* Make sure they didn't set any flags that don't make sense. */ - flags &= ~G_SPAWN_FILE_AND_ARGV_ZERO; - break; - case EGG_DESKTOP_FILE_LAUNCH_SETUP_FUNC: - setup_func = va_arg (args, GSpawnChildSetupFunc); - setup_data = va_arg (args, gpointer); - break; - - case EGG_DESKTOP_FILE_LAUNCH_RETURN_PID: - ret_pid = va_arg (args, GPid *); - break; - case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE: - ret_stdin = va_arg (args, int *); - break; - case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE: - ret_stdout = va_arg (args, int *); - break; - case EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE: - ret_stderr = va_arg (args, int *); - break; - case EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID: - ret_startup_id = va_arg (args, char **); - break; - - default: - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_UNRECOGNIZED_OPTION, - _("Unrecognized launch option: %d"), - GPOINTER_TO_INT (option)); - success = FALSE; - goto out; - } - } - - if (screen) - { - char *display_name = gdk_screen_make_display_name (screen); - char *display_env = g_strdup_printf ("DISPLAY=%s", display_name); - env = array_putenv (env, display_env); - g_free (display_name); - g_free (display_env); - - display = gdk_screen_get_display (screen); - } - else - { - display = gdk_display_get_default (); - screen = gdk_display_get_default_screen (display); - } - screen_num = gdk_screen_get_number (screen); - - translated_documents = translate_document_list (desktop_file, documents); - docs = translated_documents; - - success = FALSE; - - do - { - command = parse_exec (desktop_file, &docs, error); - if (!command) - goto out; - - if (!g_shell_parse_argv (command, &argc, &argv, error)) - { - g_free (command); - goto out; - } - g_free (command); - -#if GTK_CHECK_VERSION (2, 12, 0) - startup_id = start_startup_notification (display, desktop_file, - argv[0], screen_num, - workspace, launch_time); - if (startup_id) - { - char *startup_id_env = g_strdup_printf ("DESKTOP_STARTUP_ID=%s", - startup_id); - env = array_putenv (env, startup_id_env); - g_free (startup_id_env); - } -#else - startup_id = NULL; -#endif /* GTK 2.12 */ - - if (env != NULL) - g_ptr_array_add (env, NULL); - - current_success = - g_spawn_async_with_pipes (directory, - argv, - env ? (char **)(env->pdata) : NULL, - flags, - setup_func, setup_data, - ret_pid, - ret_stdin, ret_stdout, ret_stderr, - error); - g_strfreev (argv); - - if (startup_id) - { -#if GTK_CHECK_VERSION (2, 12, 0) - if (current_success) - { - set_startup_notification_timeout (display, startup_id); - - if (ret_startup_id) - *ret_startup_id = startup_id; - else - g_free (startup_id); - } - else -#endif /* GTK 2.12 */ - g_free (startup_id); - } - else if (ret_startup_id) - *ret_startup_id = NULL; - - if (current_success) - { - /* If we successfully launch any instances of the app, make - * sure we return TRUE and don't set @error. - */ - success = TRUE; - error = NULL; - - /* Also, only set the output params on the first one */ - ret_pid = NULL; - ret_stdin = ret_stdout = ret_stderr = NULL; - ret_startup_id = NULL; - } - } - while (docs && current_success); - - out: - if (env) - { - g_ptr_array_foreach (env, (GFunc)g_free, NULL); - g_ptr_array_free (env, TRUE); - } - free_document_list (translated_documents); - - return success; -} - -/** - * egg_desktop_file_launch: - * @desktop_file: an #EggDesktopFile - * @documents: a list of URIs or paths to documents to open - * @error: error pointer - * @...: additional options - * - * Launches @desktop_file with the given arguments. Additional options - * can be specified as follows: - * - * %EGG_DESKTOP_FILE_LAUNCH_CLEARENV: (no arguments) - * clears the environment in the child process - * %EGG_DESKTOP_FILE_LAUNCH_PUTENV: (char **variables) - * adds the NAME=VALUE strings in the given %NULL-terminated - * array to the child process's environment - * %EGG_DESKTOP_FILE_LAUNCH_SCREEN: (GdkScreen *screen) - * causes the application to be launched on the given screen - * %EGG_DESKTOP_FILE_LAUNCH_WORKSPACE: (int workspace) - * causes the application to be launched on the given workspace - * %EGG_DESKTOP_FILE_LAUNCH_DIRECTORY: (char *dir) - * causes the application to be launched in the given directory - * %EGG_DESKTOP_FILE_LAUNCH_TIME: (guint32 launch_time) - * sets the "launch time" for the application. If the user - * interacts with another window after @launch_time but before - * the launched application creates its first window, the window - * manager may choose to not give focus to the new application. - * Passing 0 for @launch_time will explicitly request that the - * application not receive focus. - * %EGG_DESKTOP_FILE_LAUNCH_FLAGS (GSpawnFlags flags) - * Sets additional #GSpawnFlags to use. See g_spawn_async() for - * more details. - * %EGG_DESKTOP_FILE_LAUNCH_SETUP_FUNC (GSpawnChildSetupFunc, gpointer) - * Sets the child setup callback and the data to pass to it. - * (See g_spawn_async() for more details.) - * - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_PID (GPid **pid) - * On a successful launch, sets *@pid to the PID of the launched - * application. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID (char **startup_id) - * On a successful launch, sets *@startup_id to the Startup - * Notification "startup id" of the launched application. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE (int *fd) - * On a successful launch, sets *@fd to the file descriptor of - * a pipe connected to the application's stdin. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE (int *fd) - * On a successful launch, sets *@fd to the file descriptor of - * a pipe connected to the application's stdout. - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE (int *fd) - * On a successful launch, sets *@fd to the file descriptor of - * a pipe connected to the application's stderr. - * - * The options should be terminated with a single %NULL. - * - * If @documents contains multiple documents, but - * egg_desktop_file_accepts_multiple() returns %FALSE for - * @desktop_file, then egg_desktop_file_launch() will actually launch - * multiple instances of the application. In that case, the return - * value (as well as any values passed via - * %EGG_DESKTOP_FILE_LAUNCH_RETURN_PID, etc) will only reflect the - * first instance of the application that was launched (but the - * %EGG_DESKTOP_FILE_LAUNCH_SETUP_FUNC will be called for each - * instance). - * - * Return value: %TRUE if the application was successfully launched. - **/ -gboolean -egg_desktop_file_launch (EggDesktopFile *desktop_file, - GSList *documents, GError **error, - ...) -{ - va_list args; - gboolean success; - EggDesktopFile *app_desktop_file; - - switch (desktop_file->type) - { - case EGG_DESKTOP_FILE_TYPE_APPLICATION: - va_start (args, error); - success = egg_desktop_file_launchv (desktop_file, documents, - args, error); - va_end (args); - break; - - case EGG_DESKTOP_FILE_TYPE_LINK: - if (documents) - { - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, - /* translators: The 'Type=Link' string is found in a - * desktop file, and should not be translated. */ - _("Can't pass document URIs to a 'Type=Link' desktop entry")); - return FALSE; - } - - if (!parse_link (desktop_file, &app_desktop_file, &documents, error)) - return FALSE; - - va_start (args, error); - success = egg_desktop_file_launchv (app_desktop_file, documents, - args, error); - va_end (args); - - egg_desktop_file_free (app_desktop_file); - free_document_list (documents); - break; - - case EGG_DESKTOP_FILE_TYPE_UNRECOGNIZED: - case EGG_DESKTOP_FILE_TYPE_DIRECTORY: - default: - g_set_error (error, EGG_DESKTOP_FILE_ERROR, - EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, - _("Not a launchable item")); - success = FALSE; - break; - } - - return success; -} - - -GQuark -egg_desktop_file_error_quark (void) -{ - return g_quark_from_static_string ("egg-desktop_file-error-quark"); -} - - -G_LOCK_DEFINE_STATIC (egg_desktop_file); -static EggDesktopFile *egg_desktop_file; - -static void -egg_set_desktop_file_internal (const char *desktop_file_path, - gboolean set_defaults) -{ - GError *error = NULL; - - G_LOCK (egg_desktop_file); - if (egg_desktop_file) - egg_desktop_file_free (egg_desktop_file); - - egg_desktop_file = egg_desktop_file_new (desktop_file_path, &error); - if (error) - { - g_warning ("Could not load desktop file '%s': %s", - desktop_file_path, error->message); - g_error_free (error); - } - - if (set_defaults && egg_desktop_file != NULL) { - /* Set localized application name and default window icon */ - if (egg_desktop_file->name) - g_set_application_name (egg_desktop_file->name); - if (egg_desktop_file->icon) - { - if (g_path_is_absolute (egg_desktop_file->icon)) - gtk_window_set_default_icon_from_file (egg_desktop_file->icon, NULL); - else - gtk_window_set_default_icon_name (egg_desktop_file->icon); - } - } - - G_UNLOCK (egg_desktop_file); -} - -/** - * egg_set_desktop_file: - * @desktop_file_path: path to the application's desktop file - * - * Creates an #EggDesktopFile for the application from the data at - * @desktop_file_path. This will also call g_set_application_name() - * with the localized application name from the desktop file, and - * gtk_window_set_default_icon_name() or - * gtk_window_set_default_icon_from_file() with the application's - * icon. Other code may use additional information from the desktop - * file. - * See egg_set_desktop_file_without_defaults() for a variant of this - * function that does not set the application name and default window - * icon. - * - * Note that for thread safety reasons, this function can only - * be called once, and is mutually exclusive with calling - * egg_set_desktop_file_without_defaults(). - **/ -void -egg_set_desktop_file (const char *desktop_file_path) -{ - egg_set_desktop_file_internal (desktop_file_path, TRUE); -} - -/** - * egg_set_desktop_file_without_defaults: - * @desktop_file_path: path to the application's desktop file - * - * Creates an #EggDesktopFile for the application from the data at - * @desktop_file_path. - * See egg_set_desktop_file() for a variant of this function that - * sets the application name and default window icon from the information - * in the desktop file. - * - * Note that for thread safety reasons, this function can only - * be called once, and is mutually exclusive with calling - * egg_set_desktop_file(). - **/ -void -egg_set_desktop_file_without_defaults (const char *desktop_file_path) -{ - egg_set_desktop_file_internal (desktop_file_path, FALSE); -} - -/** - * egg_get_desktop_file: - * - * Gets the application's #EggDesktopFile, as set by - * egg_set_desktop_file(). - * - * Return value: the #EggDesktopFile, or %NULL if it hasn't been set. - **/ -EggDesktopFile * -egg_get_desktop_file (void) -{ - EggDesktopFile *retval; - - G_LOCK (egg_desktop_file); - retval = egg_desktop_file; - G_UNLOCK (egg_desktop_file); - - return retval; -} diff -Nru gnome-session-3.9.90/egg/eggdesktopfile.h gnome-session-3.14.0/egg/eggdesktopfile.h --- gnome-session-3.9.90/egg/eggdesktopfile.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/egg/eggdesktopfile.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/* eggdesktopfile.h - Freedesktop.Org Desktop Files - * Copyright (C) 2007 Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; see the file COPYING.LIB. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - - * Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_DESKTOP_FILE_H__ -#define __EGG_DESKTOP_FILE_H__ - -#include - -G_BEGIN_DECLS - -typedef struct EggDesktopFile EggDesktopFile; - -typedef enum { - EGG_DESKTOP_FILE_TYPE_UNRECOGNIZED, - - EGG_DESKTOP_FILE_TYPE_APPLICATION, - EGG_DESKTOP_FILE_TYPE_LINK, - EGG_DESKTOP_FILE_TYPE_DIRECTORY -} EggDesktopFileType; - -EggDesktopFile *egg_desktop_file_new (const char *desktop_file_path, - GError **error); - -EggDesktopFile *egg_desktop_file_new_from_data_dirs (const char *desktop_file_path, - GError **error); -EggDesktopFile *egg_desktop_file_new_from_dirs (const char *desktop_file_path, - const char **search_dirs, - GError **error); -EggDesktopFile *egg_desktop_file_new_from_key_file (GKeyFile *key_file, - const char *source, - GError **error); - -void egg_desktop_file_free (EggDesktopFile *desktop_file); - -const char *egg_desktop_file_get_source (EggDesktopFile *desktop_file); - -EggDesktopFileType egg_desktop_file_get_desktop_file_type (EggDesktopFile *desktop_file); - -const char *egg_desktop_file_get_name (EggDesktopFile *desktop_file); -const char *egg_desktop_file_get_icon (EggDesktopFile *desktop_file); - -gboolean egg_desktop_file_can_launch (EggDesktopFile *desktop_file, - const char *desktop_environment); - -gboolean egg_desktop_file_accepts_documents (EggDesktopFile *desktop_file); -gboolean egg_desktop_file_accepts_multiple (EggDesktopFile *desktop_file); -gboolean egg_desktop_file_accepts_uris (EggDesktopFile *desktop_file); - -char *egg_desktop_file_parse_exec (EggDesktopFile *desktop_file, - GSList *documents, - GError **error); - -gboolean egg_desktop_file_launch (EggDesktopFile *desktop_file, - GSList *documents, - GError **error, - ...) G_GNUC_NULL_TERMINATED; - -typedef enum { - EGG_DESKTOP_FILE_LAUNCH_CLEARENV = 1, - EGG_DESKTOP_FILE_LAUNCH_PUTENV, - EGG_DESKTOP_FILE_LAUNCH_SCREEN, - EGG_DESKTOP_FILE_LAUNCH_WORKSPACE, - EGG_DESKTOP_FILE_LAUNCH_DIRECTORY, - EGG_DESKTOP_FILE_LAUNCH_TIME, - EGG_DESKTOP_FILE_LAUNCH_FLAGS, - EGG_DESKTOP_FILE_LAUNCH_SETUP_FUNC, - EGG_DESKTOP_FILE_LAUNCH_RETURN_PID, - EGG_DESKTOP_FILE_LAUNCH_RETURN_STDIN_PIPE, - EGG_DESKTOP_FILE_LAUNCH_RETURN_STDOUT_PIPE, - EGG_DESKTOP_FILE_LAUNCH_RETURN_STDERR_PIPE, - EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID -} EggDesktopFileLaunchOption; - -/* Standard Keys */ -#define EGG_DESKTOP_FILE_GROUP "Desktop Entry" - -#define EGG_DESKTOP_FILE_KEY_TYPE "Type" -#define EGG_DESKTOP_FILE_KEY_VERSION "Version" -#define EGG_DESKTOP_FILE_KEY_NAME "Name" -#define EGG_DESKTOP_FILE_KEY_GENERIC_NAME "GenericName" -#define EGG_DESKTOP_FILE_KEY_NO_DISPLAY "NoDisplay" -#define EGG_DESKTOP_FILE_KEY_COMMENT "Comment" -#define EGG_DESKTOP_FILE_KEY_ICON "Icon" -#define EGG_DESKTOP_FILE_KEY_HIDDEN "Hidden" -#define EGG_DESKTOP_FILE_KEY_ONLY_SHOW_IN "OnlyShowIn" -#define EGG_DESKTOP_FILE_KEY_NOT_SHOW_IN "NotShowIn" -#define EGG_DESKTOP_FILE_KEY_TRY_EXEC "TryExec" -#define EGG_DESKTOP_FILE_KEY_EXEC "Exec" -#define EGG_DESKTOP_FILE_KEY_PATH "Path" -#define EGG_DESKTOP_FILE_KEY_TERMINAL "Terminal" -#define EGG_DESKTOP_FILE_KEY_MIME_TYPE "MimeType" -#define EGG_DESKTOP_FILE_KEY_CATEGORIES "Categories" -#define EGG_DESKTOP_FILE_KEY_STARTUP_NOTIFY "StartupNotify" -#define EGG_DESKTOP_FILE_KEY_STARTUP_WM_CLASS "StartupWMClass" -#define EGG_DESKTOP_FILE_KEY_URL "URL" - -/* Accessors */ -gboolean egg_desktop_file_has_key (EggDesktopFile *desktop_file, - const char *key, - GError **error); -char *egg_desktop_file_get_string (EggDesktopFile *desktop_file, - const char *key, - GError **error) G_GNUC_MALLOC; -char *egg_desktop_file_get_locale_string (EggDesktopFile *desktop_file, - const char *key, - const char *locale, - GError **error) G_GNUC_MALLOC; -gboolean egg_desktop_file_get_boolean (EggDesktopFile *desktop_file, - const char *key, - GError **error); -double egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, - const char *key, - GError **error); -int egg_desktop_file_get_integer (EggDesktopFile *desktop_file, - const char *key, - GError **error); -char **egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, - const char *key, - gsize *length, - GError **error) G_GNUC_MALLOC; -char **egg_desktop_file_get_locale_string_list (EggDesktopFile *desktop_file, - const char *key, - const char *locale, - gsize *length, - GError **error) G_GNUC_MALLOC; - - -/* Errors */ -#define EGG_DESKTOP_FILE_ERROR egg_desktop_file_error_quark() - -GQuark egg_desktop_file_error_quark (void); - -typedef enum { - EGG_DESKTOP_FILE_ERROR_INVALID, - EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, - EGG_DESKTOP_FILE_ERROR_UNRECOGNIZED_OPTION -} EggDesktopFileError; - -/* Global application desktop file */ -void egg_set_desktop_file (const char *desktop_file_path); -void egg_set_desktop_file_without_defaults (const char *desktop_file_path); -EggDesktopFile *egg_get_desktop_file (void); - - -G_END_DECLS - -#endif /* __EGG_DESKTOP_FILE_H__ */ diff -Nru gnome-session-3.9.90/egg/eggsmclient.c gnome-session-3.14.0/egg/eggsmclient.c --- gnome-session-3.9.90/egg/eggsmclient.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/egg/eggsmclient.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,604 +0,0 @@ -/* - * Copyright (C) 2007 Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include -#include - -#include "eggsmclient.h" -#include "eggsmclient-private.h" - -static void egg_sm_client_debug_handler (const char *log_domain, - GLogLevelFlags log_level, - const char *message, - gpointer user_data); - -enum { - SAVE_STATE, - QUIT_REQUESTED, - QUIT_CANCELLED, - QUIT, - LAST_SIGNAL -}; - -static guint signals[LAST_SIGNAL]; - -struct _EggSMClientPrivate { - GKeyFile *state_file; -}; - -#define EGG_SM_CLIENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EGG_TYPE_SM_CLIENT, EggSMClientPrivate)) - -G_DEFINE_TYPE (EggSMClient, egg_sm_client, G_TYPE_OBJECT) - -static EggSMClient *global_client; -static EggSMClientMode global_client_mode = EGG_SM_CLIENT_MODE_NORMAL; - -static void -egg_sm_client_init (EggSMClient *client) -{ - ; -} - -static void -egg_sm_client_class_init (EggSMClientClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - g_type_class_add_private (klass, sizeof (EggSMClientPrivate)); - - /** - * EggSMClient::save_state: - * @client: the client - * @state_file: a #GKeyFile to save state information into - * - * Emitted when the session manager has requested that the - * application save information about its current state. The - * application should save its state into @state_file, and then the - * session manager may then restart the application in a future - * session and tell it to initialize itself from that state. - * - * You should not save any data into @state_file's "start group" - * (ie, the %NULL group). Instead, applications should save their - * data into groups with names that start with the application name, - * and libraries that connect to this signal should save their data - * into groups with names that start with the library name. - * - * Alternatively, rather than (or in addition to) using @state_file, - * the application can save its state by calling - * egg_sm_client_set_restart_command() during the processing of this - * signal (eg, to include a list of files to open). - **/ - signals[SAVE_STATE] = - g_signal_new ("save_state", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, save_state), - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); - - /** - * EggSMClient::quit_requested: - * @client: the client - * - * Emitted when the session manager requests that the application - * exit (generally because the user is logging out). The application - * should decide whether or not it is willing to quit (perhaps after - * asking the user what to do with documents that have unsaved - * changes) and then call egg_sm_client_will_quit(), passing %TRUE - * or %FALSE to give its answer to the session manager. (It does not - * need to give an answer before returning from the signal handler; - * it can interact with the user asynchronously and then give its - * answer later on.) If the application does not connect to this - * signal, then #EggSMClient will automatically return %TRUE on its - * behalf. - * - * The application should not save its session state as part of - * handling this signal; if the user has requested that the session - * be saved when logging out, then ::save_state will be emitted - * separately. - * - * If the application agrees to quit, it should then wait for either - * the ::quit_cancelled or ::quit signals to be emitted. - **/ - signals[QUIT_REQUESTED] = - g_signal_new ("quit_requested", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit_requested), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - /** - * EggSMClient::quit_cancelled: - * @client: the client - * - * Emitted when the session manager decides to cancel a logout after - * the application has already agreed to quit. After receiving this - * signal, the application can go back to what it was doing before - * receiving the ::quit_requested signal. - **/ - signals[QUIT_CANCELLED] = - g_signal_new ("quit_cancelled", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit_cancelled), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - - /** - * EggSMClient::quit: - * @client: the client - * - * Emitted when the session manager wants the application to quit - * (generally because the user is logging out). The application - * should exit as soon as possible after receiving this signal; if - * it does not, the session manager may choose to forcibly kill it. - * - * Normally a GUI application would only be sent a ::quit if it - * agreed to quit in response to a ::quit_requested signal. However, - * this is not guaranteed; in some situations the session manager - * may decide to end the session without giving applications a - * chance to object. - **/ - signals[QUIT] = - g_signal_new ("quit", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EggSMClientClass, quit), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); -} - -static gboolean sm_client_disable = FALSE; -static char *sm_client_state_file = NULL; -static char *sm_client_id = NULL; -static char *sm_config_prefix = NULL; - -static gboolean -sm_client_post_parse_func (GOptionContext *context, - GOptionGroup *group, - gpointer data, - GError **error) -{ - EggSMClient *client = egg_sm_client_get (); - - if (sm_client_id == NULL) - { - const gchar *desktop_autostart_id; - - desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); - - if (desktop_autostart_id != NULL) - sm_client_id = g_strdup (desktop_autostart_id); - } - - /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes to - * use the same client id. */ - g_unsetenv ("DESKTOP_AUTOSTART_ID"); - - if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED && - EGG_SM_CLIENT_GET_CLASS (client)->startup) - EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); - return TRUE; -} - -/** - * egg_sm_client_get_option_group: - * - * Creates a %GOptionGroup containing the session-management-related - * options. You should add this group to the application's - * %GOptionContext if you want to use #EggSMClient. - * - * Return value: the %GOptionGroup - **/ -GOptionGroup * -egg_sm_client_get_option_group (void) -{ - const GOptionEntry entries[] = { - { "sm-client-disable", 0, 0, - G_OPTION_ARG_NONE, &sm_client_disable, - N_("Disable connection to session manager"), NULL }, - { "sm-client-state-file", 0, 0, - G_OPTION_ARG_FILENAME, &sm_client_state_file, - N_("Specify file containing saved configuration"), N_("FILE") }, - { "sm-client-id", 0, 0, - G_OPTION_ARG_STRING, &sm_client_id, - N_("Specify session management ID"), N_("ID") }, - /* GnomeClient compatibility option */ - { "sm-disable", 0, G_OPTION_FLAG_HIDDEN, - G_OPTION_ARG_NONE, &sm_client_disable, - NULL, NULL }, - /* GnomeClient compatibility option. This is a dummy option that only - * exists so that sessions saved by apps with GnomeClient can be restored - * later when they've switched to EggSMClient. See bug #575308. - */ - { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN, - G_OPTION_ARG_STRING, &sm_config_prefix, - NULL, NULL }, - { NULL } - }; - GOptionGroup *group; - - /* Use our own debug handler for the "EggSMClient" domain. */ - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, - egg_sm_client_debug_handler, NULL); - - group = g_option_group_new ("sm-client", - _("Session management options:"), - _("Show session management options"), - NULL, NULL); - g_option_group_add_entries (group, entries); - g_option_group_set_parse_hooks (group, NULL, sm_client_post_parse_func); - - return group; -} - -/** - * egg_sm_client_set_mode: - * @mode: an #EggSMClient mode - * - * Sets the "mode" of #EggSMClient as follows: - * - * %EGG_SM_CLIENT_MODE_DISABLED: Session management is completely - * disabled, until the mode is changed again. The application will - * not even connect to the session manager. (egg_sm_client_get() - * will still return an #EggSMClient object.) - * - * %EGG_SM_CLIENT_MODE_NO_RESTART: The application will connect to - * the session manager (and thus will receive notification when the - * user is logging out, etc), but will request to not be - * automatically restarted with saved state in future sessions. - * - * %EGG_SM_CLIENT_MODE_NORMAL: The default. #EggSMCLient will - * function normally. - * - * This must be called before the application's main loop begins and - * before any call to egg_sm_client_get(), unless the mode was set - * earlier to %EGG_SM_CLIENT_MODE_DISABLED and this call enables - * session management. Note that option parsing will call - * egg_sm_client_get(). - **/ -void -egg_sm_client_set_mode (EggSMClientMode mode) -{ - EggSMClientMode old_mode = global_client_mode; - - g_return_if_fail (global_client == NULL || global_client_mode == EGG_SM_CLIENT_MODE_DISABLED); - g_return_if_fail (!(global_client != NULL && mode == EGG_SM_CLIENT_MODE_DISABLED)); - - global_client_mode = mode; - - if (global_client != NULL && old_mode == EGG_SM_CLIENT_MODE_DISABLED) - { - if (EGG_SM_CLIENT_GET_CLASS (global_client)->startup) - EGG_SM_CLIENT_GET_CLASS (global_client)->startup (global_client, sm_client_id); - } -} - -/** - * egg_sm_client_get_mode: - * - * Gets the global #EggSMClientMode. See egg_sm_client_set_mode() - * for details. - * - * Return value: the global #EggSMClientMode - **/ -EggSMClientMode -egg_sm_client_get_mode (void) -{ - return global_client_mode; -} - -/** - * egg_sm_client_get: - * - * Returns the master #EggSMClient for the application. - * - * On platforms that support saved sessions (ie, POSIX/X11), the - * application will only request to be restarted by the session - * manager if you call egg_set_desktop_file() to set an application - * desktop file. In particular, if the desktop file contains the key - * "X - * - * Return value: the master #EggSMClient. - **/ -EggSMClient * -egg_sm_client_get (void) -{ - if (!global_client) - { - if (!sm_client_disable) - { -#if defined (GDK_WINDOWING_WIN32) - global_client = egg_sm_client_win32_new (); -#elif defined (GDK_WINDOWING_QUARTZ) - global_client = egg_sm_client_osx_new (); -#else - /* If both D-Bus and XSMP are compiled in, try XSMP first - * (since it supports state saving) and fall back to D-Bus - * if XSMP isn't available. - */ -# ifdef EGG_SM_CLIENT_BACKEND_XSMP - global_client = egg_sm_client_xsmp_new (); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS - if (!global_client) - global_client = egg_sm_client_dbus_new (); -# endif -#endif - } - - /* Fallback: create a dummy client, so that callers don't have - * to worry about a %NULL return value. - */ - if (!global_client) - global_client = g_object_new (EGG_TYPE_SM_CLIENT, NULL); - } - - return global_client; -} - -/** - * egg_sm_client_is_resumed: - * @client: the client - * - * Checks whether or not the current session has been resumed from - * a previous saved session. If so, the application should call - * egg_sm_client_get_state_file() and restore its state from the - * returned #GKeyFile. - * - * Return value: %TRUE if the session has been resumed - **/ -gboolean -egg_sm_client_is_resumed (EggSMClient *client) -{ - g_return_val_if_fail (client == global_client, FALSE); - - return sm_client_state_file != NULL; -} - -/** - * egg_sm_client_get_state_file: - * @client: the client - * - * If the application was resumed by the session manager, this will - * return the #GKeyFile containing its state from the previous - * session. - * - * Note that other libraries and #EggSMClient itself may also store - * state in the key file, so if you call egg_sm_client_get_groups(), - * on it, the return value will likely include groups that you did not - * put there yourself. (It is also not guaranteed that the first - * group created by the application will still be the "start group" - * when it is resumed.) - * - * Return value: the #GKeyFile containing the application's earlier - * state, or %NULL on error. You should not free this key file; it - * is owned by @client. - **/ -GKeyFile * -egg_sm_client_get_state_file (EggSMClient *client) -{ - EggSMClientPrivate *priv = EGG_SM_CLIENT_GET_PRIVATE (client); - char *state_file_path; - GError *err = NULL; - - g_return_val_if_fail (client == global_client, NULL); - - if (!sm_client_state_file) - return NULL; - if (priv->state_file) - return priv->state_file; - - if (!strncmp (sm_client_state_file, "file://", 7)) - state_file_path = g_filename_from_uri (sm_client_state_file, NULL, NULL); - else - state_file_path = g_strdup (sm_client_state_file); - - priv->state_file = g_key_file_new (); - if (!g_key_file_load_from_file (priv->state_file, state_file_path, 0, &err)) - { - g_warning ("Could not load SM state file '%s': %s", - sm_client_state_file, err->message); - g_clear_error (&err); - g_key_file_free (priv->state_file); - priv->state_file = NULL; - } - - g_free (state_file_path); - return priv->state_file; -} - -/** - * egg_sm_client_set_restart_command: - * @client: the client - * @argc: the length of @argv - * @argv: argument vector - * - * Sets the command used to restart @client if it does not have a - * .desktop file that can be used to find its restart command. - * - * This can also be used when handling the ::save_state signal, to - * save the current state via an updated command line. (Eg, providing - * a list of filenames to open when the application is resumed.) - **/ -void -egg_sm_client_set_restart_command (EggSMClient *client, - int argc, - const char **argv) -{ - g_return_if_fail (EGG_IS_SM_CLIENT (client)); - - if (EGG_SM_CLIENT_GET_CLASS (client)->set_restart_command) - EGG_SM_CLIENT_GET_CLASS (client)->set_restart_command (client, argc, argv); -} - -/** - * egg_sm_client_will_quit: - * @client: the client - * @will_quit: whether or not the application is willing to quit - * - * This MUST be called in response to the ::quit_requested signal, to - * indicate whether or not the application is willing to quit. The - * application may call it either directly from the signal handler, or - * at some later point (eg, after asynchronously interacting with the - * user). - * - * If the application does not connect to ::quit_requested, - * #EggSMClient will call this method on its behalf (passing %TRUE - * for @will_quit). - * - * After calling this method, the application should wait to receive - * either ::quit_cancelled or ::quit. - **/ -void -egg_sm_client_will_quit (EggSMClient *client, - gboolean will_quit) -{ - g_return_if_fail (EGG_IS_SM_CLIENT (client)); - - if (EGG_SM_CLIENT_GET_CLASS (client)->will_quit) - EGG_SM_CLIENT_GET_CLASS (client)->will_quit (client, will_quit); -} - -/** - * egg_sm_client_end_session: - * @style: a hint at how to end the session - * @request_confirmation: whether or not the user should get a chance - * to confirm the action - * - * Requests that the session manager end the current session. @style - * indicates how the session should be ended, and - * @request_confirmation indicates whether or not the user should be - * given a chance to confirm the logout/reboot/shutdown. Both of these - * flags are merely hints though; the session manager may choose to - * ignore them. - * - * Return value: %TRUE if the request was sent; %FALSE if it could not - * be (eg, because it could not connect to the session manager). - **/ -gboolean -egg_sm_client_end_session (EggSMClientEndStyle style, - gboolean request_confirmation) -{ - EggSMClient *client = egg_sm_client_get (); - - g_return_val_if_fail (EGG_IS_SM_CLIENT (client), FALSE); - - if (EGG_SM_CLIENT_GET_CLASS (client)->end_session) - { - return EGG_SM_CLIENT_GET_CLASS (client)->end_session (client, style, - request_confirmation); - } - else - return FALSE; -} - -/* Signal-emitting callbacks from platform-specific code */ - -GKeyFile * -egg_sm_client_save_state (EggSMClient *client) -{ - GKeyFile *state_file; - char *group; - - g_return_val_if_fail (client == global_client, NULL); - - state_file = g_key_file_new (); - - g_debug ("Emitting save_state"); - g_signal_emit (client, signals[SAVE_STATE], 0, state_file); - g_debug ("Done emitting save_state"); - - group = g_key_file_get_start_group (state_file); - if (group) - { - g_free (group); - return state_file; - } - else - { - g_key_file_free (state_file); - return NULL; - } -} - -void -egg_sm_client_quit_requested (EggSMClient *client) -{ - g_return_if_fail (client == global_client); - - if (!g_signal_has_handler_pending (client, signals[QUIT_REQUESTED], 0, FALSE)) - { - g_debug ("Not emitting quit_requested because no one is listening"); - egg_sm_client_will_quit (client, TRUE); - return; - } - - g_debug ("Emitting quit_requested"); - g_signal_emit (client, signals[QUIT_REQUESTED], 0); - g_debug ("Done emitting quit_requested"); -} - -void -egg_sm_client_quit_cancelled (EggSMClient *client) -{ - g_return_if_fail (client == global_client); - - g_debug ("Emitting quit_cancelled"); - g_signal_emit (client, signals[QUIT_CANCELLED], 0); - g_debug ("Done emitting quit_cancelled"); -} - -void -egg_sm_client_quit (EggSMClient *client) -{ - g_return_if_fail (client == global_client); - - g_debug ("Emitting quit"); - g_signal_emit (client, signals[QUIT], 0); - g_debug ("Done emitting quit"); - - /* FIXME: should we just call gtk_main_quit() here? */ -} - -static void -egg_sm_client_debug_handler (const char *log_domain, - GLogLevelFlags log_level, - const char *message, - gpointer user_data) -{ - static int debug = -1; - - if (debug < 0) - debug = (g_getenv ("EGG_SM_CLIENT_DEBUG") != NULL); - - if (debug) - g_log_default_handler (log_domain, log_level, message, NULL); -} diff -Nru gnome-session-3.9.90/egg/eggsmclient.h gnome-session-3.14.0/egg/eggsmclient.h --- gnome-session-3.9.90/egg/eggsmclient.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/egg/eggsmclient.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/* eggsmclient.h - * Copyright (C) 2007 Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_SM_CLIENT_H__ -#define __EGG_SM_CLIENT_H__ - -#include - -G_BEGIN_DECLS - -#define EGG_TYPE_SM_CLIENT (egg_sm_client_get_type ()) -#define EGG_SM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT, EggSMClient)) -#define EGG_SM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_SM_CLIENT, EggSMClientClass)) -#define EGG_IS_SM_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_SM_CLIENT)) -#define EGG_IS_SM_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_SM_CLIENT)) -#define EGG_SM_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_SM_CLIENT, EggSMClientClass)) - -typedef struct _EggSMClient EggSMClient; -typedef struct _EggSMClientClass EggSMClientClass; -typedef struct _EggSMClientPrivate EggSMClientPrivate; - -typedef enum { - EGG_SM_CLIENT_END_SESSION_DEFAULT, - EGG_SM_CLIENT_LOGOUT, - EGG_SM_CLIENT_REBOOT, - EGG_SM_CLIENT_SHUTDOWN -} EggSMClientEndStyle; - -typedef enum { - EGG_SM_CLIENT_MODE_DISABLED, - EGG_SM_CLIENT_MODE_NO_RESTART, - EGG_SM_CLIENT_MODE_NORMAL -} EggSMClientMode; - -struct _EggSMClient -{ - GObject parent; - -}; - -struct _EggSMClientClass -{ - GObjectClass parent_class; - - /* signals */ - void (*save_state) (EggSMClient *client, - GKeyFile *state_file); - - void (*quit_requested) (EggSMClient *client); - void (*quit_cancelled) (EggSMClient *client); - void (*quit) (EggSMClient *client); - - /* virtual methods */ - void (*startup) (EggSMClient *client, - const char *client_id); - void (*set_restart_command) (EggSMClient *client, - int argc, - const char **argv); - void (*will_quit) (EggSMClient *client, - gboolean will_quit); - gboolean (*end_session) (EggSMClient *client, - EggSMClientEndStyle style, - gboolean request_confirmation); - - /* Padding for future expansion */ - void (*_egg_reserved1) (void); - void (*_egg_reserved2) (void); - void (*_egg_reserved3) (void); - void (*_egg_reserved4) (void); -}; - -GType egg_sm_client_get_type (void) G_GNUC_CONST; - -GOptionGroup *egg_sm_client_get_option_group (void); - -/* Initialization */ -void egg_sm_client_set_mode (EggSMClientMode mode); -EggSMClientMode egg_sm_client_get_mode (void); -EggSMClient *egg_sm_client_get (void); - -/* Resuming a saved session */ -gboolean egg_sm_client_is_resumed (EggSMClient *client); -GKeyFile *egg_sm_client_get_state_file (EggSMClient *client); - -/* Alternate means of saving state */ -void egg_sm_client_set_restart_command (EggSMClient *client, - int argc, - const char **argv); - -/* Handling "quit_requested" signal */ -void egg_sm_client_will_quit (EggSMClient *client, - gboolean will_quit); - -/* Initiate a logout/reboot/shutdown */ -gboolean egg_sm_client_end_session (EggSMClientEndStyle style, - gboolean request_confirmation); - -G_END_DECLS - - -#endif /* __EGG_SM_CLIENT_H__ */ diff -Nru gnome-session-3.9.90/egg/eggsmclient-private.h gnome-session-3.14.0/egg/eggsmclient-private.h --- gnome-session-3.9.90/egg/eggsmclient-private.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/egg/eggsmclient-private.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* eggsmclient-private.h - * Copyright (C) 2007 Novell, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __EGG_SM_CLIENT_PRIVATE_H__ -#define __EGG_SM_CLIENT_PRIVATE_H__ - -#include - -#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0) -/* GTK+ 3 includes this automatically */ -#include -#endif - -#include "eggsmclient.h" - -G_BEGIN_DECLS - -GKeyFile *egg_sm_client_save_state (EggSMClient *client); -void egg_sm_client_quit_requested (EggSMClient *client); -void egg_sm_client_quit_cancelled (EggSMClient *client); -void egg_sm_client_quit (EggSMClient *client); - -#if defined (GDK_WINDOWING_X11) -# ifdef EGG_SM_CLIENT_BACKEND_XSMP -GType egg_sm_client_xsmp_get_type (void); -EggSMClient *egg_sm_client_xsmp_new (void); -# endif -# ifdef EGG_SM_CLIENT_BACKEND_DBUS -GType egg_sm_client_dbus_get_type (void); -EggSMClient *egg_sm_client_dbus_new (void); -# endif -#elif defined (GDK_WINDOWING_WIN32) -GType egg_sm_client_win32_get_type (void); -EggSMClient *egg_sm_client_win32_new (void); -#elif defined (GDK_WINDOWING_QUARTZ) -GType egg_sm_client_osx_get_type (void); -EggSMClient *egg_sm_client_osx_new (void); -#endif - -G_END_DECLS - - -#endif /* __EGG_SM_CLIENT_PRIVATE_H__ */ diff -Nru gnome-session-3.9.90/egg/eggsmclient-xsmp.c gnome-session-3.14.0/egg/eggsmclient-xsmp.c --- gnome-session-3.9.90/egg/eggsmclient-xsmp.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/egg/eggsmclient-xsmp.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1375 +0,0 @@ -/* - * Copyright (C) 2007 Novell, Inc. - * - * Inspired by various other pieces of code including GsmClient (C) - * 2001 Havoc Pennington, GnomeClient (C) 1998 Carsten Schaar, and twm - * session code (C) 1998 The Open Group. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include "eggsmclient.h" -#include "eggsmclient-private.h" - -#include "eggdesktopfile.h" - -#include -#include -#include -#include -#include -#include - -#include -#include - -#define EGG_TYPE_SM_CLIENT_XSMP (egg_sm_client_xsmp_get_type ()) -#define EGG_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP)) -#define EGG_SM_CLIENT_XSMP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMPClass)) -#define EGG_IS_SM_CLIENT_XSMP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_SM_CLIENT_XSMP)) -#define EGG_IS_SM_CLIENT_XSMP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_SM_CLIENT_XSMP)) -#define EGG_SM_CLIENT_XSMP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMPClass)) - -typedef struct _EggSMClientXSMP EggSMClientXSMP; -typedef struct _EggSMClientXSMPClass EggSMClientXSMPClass; - -/* These mostly correspond to the similarly-named states in section - * 9.1 of the XSMP spec. Some of the states there aren't represented - * here, because we don't need them. SHUTDOWN_CANCELLED is slightly - * different from the spec; we use it when the client is IDLE after a - * ShutdownCancelled message, but the application is still interacting - * and doesn't know the shutdown has been cancelled yet. - */ -typedef enum -{ - XSMP_STATE_IDLE, - XSMP_STATE_SAVE_YOURSELF, - XSMP_STATE_INTERACT_REQUEST, - XSMP_STATE_INTERACT, - XSMP_STATE_SAVE_YOURSELF_DONE, - XSMP_STATE_SHUTDOWN_CANCELLED, - XSMP_STATE_CONNECTION_CLOSED -} EggSMClientXSMPState; - -static const char *state_names[] = { - "idle", - "save-yourself", - "interact-request", - "interact", - "save-yourself-done", - "shutdown-cancelled", - "connection-closed" -}; - -#define EGG_SM_CLIENT_XSMP_STATE(xsmp) (state_names[(xsmp)->state]) - -struct _EggSMClientXSMP -{ - EggSMClient parent; - - SmcConn connection; - char *client_id; - - EggSMClientXSMPState state; - char **restart_command; - gboolean set_restart_command; - int restart_style; - - guint idle; - - /* Current SaveYourself state */ - guint expecting_initial_save_yourself : 1; - guint need_save_state : 1; - guint need_quit_requested : 1; - guint interact_errors : 1; - guint shutting_down : 1; - - /* Todo list */ - guint waiting_to_set_initial_properties : 1; - guint waiting_to_emit_quit : 1; - guint waiting_to_emit_quit_cancelled : 1; - guint waiting_to_save_myself : 1; - -}; - -struct _EggSMClientXSMPClass -{ - EggSMClientClass parent_class; - -}; - -static void sm_client_xsmp_startup (EggSMClient *client, - const char *client_id); -static void sm_client_xsmp_set_restart_command (EggSMClient *client, - int argc, - const char **argv); -static void sm_client_xsmp_will_quit (EggSMClient *client, - gboolean will_quit); -static gboolean sm_client_xsmp_end_session (EggSMClient *client, - EggSMClientEndStyle style, - gboolean request_confirmation); - -static void xsmp_save_yourself (SmcConn smc_conn, - SmPointer client_data, - int save_style, - Bool shutdown, - int interact_style, - Bool fast); -static void xsmp_die (SmcConn smc_conn, - SmPointer client_data); -static void xsmp_save_complete (SmcConn smc_conn, - SmPointer client_data); -static void xsmp_shutdown_cancelled (SmcConn smc_conn, - SmPointer client_data); -static void xsmp_interact (SmcConn smc_conn, - SmPointer client_data); - -static SmProp *array_prop (const char *name, - ...); -static SmProp *ptrarray_prop (const char *name, - GPtrArray *values); -static SmProp *string_prop (const char *name, - const char *value); -static SmProp *card8_prop (const char *name, - unsigned char value); - -static void set_properties (EggSMClientXSMP *xsmp, ...); -static void delete_properties (EggSMClientXSMP *xsmp, ...); - -static GPtrArray *generate_command (char **restart_command, - const char *client_id, - const char *state_file); - -static void save_state (EggSMClientXSMP *xsmp); -static void do_save_yourself (EggSMClientXSMP *xsmp); -static void update_pending_events (EggSMClientXSMP *xsmp); - -static void ice_init (void); -static gboolean process_ice_messages (IceConn ice_conn); -static void smc_error_handler (SmcConn smc_conn, - Bool swap, - int offending_minor_opcode, - unsigned long offending_sequence, - int error_class, - int severity, - SmPointer values); - -G_DEFINE_TYPE (EggSMClientXSMP, egg_sm_client_xsmp, EGG_TYPE_SM_CLIENT) - -static void -egg_sm_client_xsmp_init (EggSMClientXSMP *xsmp) -{ - xsmp->state = XSMP_STATE_CONNECTION_CLOSED; - xsmp->connection = NULL; - xsmp->restart_style = SmRestartIfRunning; -} - -static void -egg_sm_client_xsmp_class_init (EggSMClientXSMPClass *klass) -{ - EggSMClientClass *sm_client_class = EGG_SM_CLIENT_CLASS (klass); - - sm_client_class->startup = sm_client_xsmp_startup; - sm_client_class->set_restart_command = sm_client_xsmp_set_restart_command; - sm_client_class->will_quit = sm_client_xsmp_will_quit; - sm_client_class->end_session = sm_client_xsmp_end_session; -} - -EggSMClient * -egg_sm_client_xsmp_new (void) -{ - if (!g_getenv ("SESSION_MANAGER")) - return NULL; - - return g_object_new (EGG_TYPE_SM_CLIENT_XSMP, NULL); -} - -static gboolean -sm_client_xsmp_set_initial_properties (gpointer user_data) -{ - EggSMClientXSMP *xsmp = user_data; - EggDesktopFile *desktop_file; - GPtrArray *clone, *restart; - char pid_str[64]; - - if (xsmp->idle) - { - g_source_remove (xsmp->idle); - xsmp->idle = 0; - } - xsmp->waiting_to_set_initial_properties = FALSE; - - if (egg_sm_client_get_mode () == EGG_SM_CLIENT_MODE_NO_RESTART) - xsmp->restart_style = SmRestartNever; - - /* Parse info out of desktop file */ - desktop_file = egg_get_desktop_file (); - if (desktop_file) - { - GError *err = NULL; - char *cmdline, **argv; - int argc; - - if (xsmp->restart_style == SmRestartIfRunning) - { - if (egg_desktop_file_get_boolean (desktop_file, - "X-GNOME-AutoRestart", NULL)) - xsmp->restart_style = SmRestartImmediately; - } - - if (!xsmp->set_restart_command) - { - cmdline = egg_desktop_file_parse_exec (desktop_file, NULL, &err); - if (cmdline && g_shell_parse_argv (cmdline, &argc, &argv, &err)) - { - egg_sm_client_set_restart_command (EGG_SM_CLIENT (xsmp), - argc, (const char **)argv); - g_strfreev (argv); - } - else - { - g_warning ("Could not parse Exec line in desktop file: %s", - err->message); - g_error_free (err); - } - g_free (cmdline); - } - } - - if (!xsmp->set_restart_command) - xsmp->restart_command = g_strsplit (g_get_prgname (), " ", -1); - - clone = generate_command (xsmp->restart_command, NULL, NULL); - restart = generate_command (xsmp->restart_command, xsmp->client_id, NULL); - - g_debug ("Setting initial properties"); - - /* Program, CloneCommand, RestartCommand, and UserID are required. - * ProcessID isn't required, but the SM may be able to do something - * useful with it. - */ - g_snprintf (pid_str, sizeof (pid_str), "%lu", (gulong) getpid ()); - set_properties (xsmp, - string_prop (SmProgram, g_get_prgname ()), - ptrarray_prop (SmCloneCommand, clone), - ptrarray_prop (SmRestartCommand, restart), - string_prop (SmUserID, g_get_user_name ()), - string_prop (SmProcessID, pid_str), - card8_prop (SmRestartStyleHint, xsmp->restart_style), - NULL); - g_ptr_array_free (clone, TRUE); - g_ptr_array_free (restart, TRUE); - - if (desktop_file) - { - set_properties (xsmp, - string_prop ("_GSM_DesktopFile", egg_desktop_file_get_source (desktop_file)), - NULL); - } - - update_pending_events (xsmp); - return FALSE; -} - -/* This gets called from two different places: xsmp_die() (when the - * server asks us to disconnect) and process_ice_messages() (when the - * server disconnects unexpectedly). - */ -static void -sm_client_xsmp_disconnect (EggSMClientXSMP *xsmp) -{ - SmcConn connection; - - if (!xsmp->connection) - return; - - g_debug ("Disconnecting"); - - connection = xsmp->connection; - xsmp->connection = NULL; - SmcCloseConnection (connection, 0, NULL); - xsmp->state = XSMP_STATE_CONNECTION_CLOSED; - - xsmp->waiting_to_save_myself = FALSE; - update_pending_events (xsmp); -} - -static void -sm_client_xsmp_startup (EggSMClient *client, - const char *client_id) -{ - EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - SmcCallbacks callbacks; - char *ret_client_id; - char error_string_ret[256]; - - xsmp->client_id = g_strdup (client_id); - - ice_init (); - SmcSetErrorHandler (smc_error_handler); - - callbacks.save_yourself.callback = xsmp_save_yourself; - callbacks.die.callback = xsmp_die; - callbacks.save_complete.callback = xsmp_save_complete; - callbacks.shutdown_cancelled.callback = xsmp_shutdown_cancelled; - - callbacks.save_yourself.client_data = xsmp; - callbacks.die.client_data = xsmp; - callbacks.save_complete.client_data = xsmp; - callbacks.shutdown_cancelled.client_data = xsmp; - - client_id = NULL; - error_string_ret[0] = '\0'; - xsmp->connection = - SmcOpenConnection (NULL, xsmp, SmProtoMajor, SmProtoMinor, - SmcSaveYourselfProcMask | SmcDieProcMask | - SmcSaveCompleteProcMask | - SmcShutdownCancelledProcMask, - &callbacks, - xsmp->client_id, &ret_client_id, - sizeof (error_string_ret), error_string_ret); - - if (!xsmp->connection) - { - g_warning ("Failed to connect to the session manager: %s\n", - error_string_ret[0] ? - error_string_ret : "no error message given"); - xsmp->state = XSMP_STATE_CONNECTION_CLOSED; - return; - } - - /* We expect a pointless initial SaveYourself if either (a) we - * didn't have an initial client ID, or (b) we DID have an initial - * client ID, but the server rejected it and gave us a new one. - */ - if (!xsmp->client_id || - (ret_client_id && strcmp (xsmp->client_id, ret_client_id) != 0)) - xsmp->expecting_initial_save_yourself = TRUE; - - if (ret_client_id) - { - g_free (xsmp->client_id); - xsmp->client_id = g_strdup (ret_client_id); - free (ret_client_id); - - gdk_threads_enter (); -#if !GTK_CHECK_VERSION(2,23,3) && !GTK_CHECK_VERSION(3,0,0) - gdk_set_sm_client_id (xsmp->client_id); -#else - gdk_x11_set_sm_client_id (xsmp->client_id); -#endif - gdk_threads_leave (); - - g_debug ("Got client ID \"%s\"", xsmp->client_id); - } - - xsmp->state = XSMP_STATE_IDLE; - - /* Do not set the initial properties until we reach the main loop, - * so that the application has a chance to call - * egg_set_desktop_file(). (This may also help the session manager - * have a better idea of when the application is fully up and - * running.) - */ - xsmp->waiting_to_set_initial_properties = TRUE; - xsmp->idle = g_idle_add (sm_client_xsmp_set_initial_properties, client); -} - -static void -sm_client_xsmp_set_restart_command (EggSMClient *client, - int argc, - const char **argv) -{ - EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - int i; - - g_strfreev (xsmp->restart_command); - - xsmp->restart_command = g_new (char *, argc + 1); - for (i = 0; i < argc; i++) - xsmp->restart_command[i] = g_strdup (argv[i]); - xsmp->restart_command[i] = NULL; - - xsmp->set_restart_command = TRUE; -} - -static void -sm_client_xsmp_will_quit (EggSMClient *client, - gboolean will_quit) -{ - EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - - if (xsmp->state == XSMP_STATE_CONNECTION_CLOSED) - { - /* The session manager has already exited! Schedule a quit - * signal. - */ - xsmp->waiting_to_emit_quit = TRUE; - update_pending_events (xsmp); - return; - } - else if (xsmp->state == XSMP_STATE_SHUTDOWN_CANCELLED) - { - /* We received a ShutdownCancelled message while the application - * was interacting; Schedule a quit_cancelled signal. - */ - xsmp->waiting_to_emit_quit_cancelled = TRUE; - update_pending_events (xsmp); - return; - } - - g_return_if_fail (xsmp->state == XSMP_STATE_INTERACT); - - g_debug ("Sending InteractDone(%s)", will_quit ? "False" : "True"); - SmcInteractDone (xsmp->connection, !will_quit); - - if (will_quit && xsmp->need_save_state) - save_state (xsmp); - - g_debug ("Sending SaveYourselfDone(%s)", will_quit ? "True" : "False"); - SmcSaveYourselfDone (xsmp->connection, will_quit); - xsmp->state = XSMP_STATE_SAVE_YOURSELF_DONE; -} - -static gboolean -sm_client_xsmp_end_session (EggSMClient *client, - EggSMClientEndStyle style, - gboolean request_confirmation) -{ - EggSMClientXSMP *xsmp = (EggSMClientXSMP *)client; - int save_type; - - /* To end the session via XSMP, we have to send a - * SaveYourselfRequest. We aren't allowed to do that if anything - * else is going on, but we don't want to expose this fact to the - * application. So we do our best to patch things up here... - * - * In the worst case, this method might block for some length of - * time in process_ice_messages, but the only time that code path is - * honestly likely to get hit is if the application tries to end the - * session as the very first thing it does, in which case it - * probably won't actually block anyway. It's not worth gunking up - * the API to try to deal nicely with the other 0.01% of cases where - * this happens. - */ - - while (xsmp->state != XSMP_STATE_IDLE || - xsmp->expecting_initial_save_yourself) - { - /* If we're already shutting down, we don't need to do anything. */ - if (xsmp->shutting_down) - return TRUE; - - switch (xsmp->state) - { - case XSMP_STATE_CONNECTION_CLOSED: - return FALSE; - - case XSMP_STATE_SAVE_YOURSELF: - /* Trying to log out from the save_state callback? Whatever. - * Abort the save_state. - */ - SmcSaveYourselfDone (xsmp->connection, FALSE); - xsmp->state = XSMP_STATE_SAVE_YOURSELF_DONE; - break; - - case XSMP_STATE_INTERACT_REQUEST: - case XSMP_STATE_INTERACT: - case XSMP_STATE_SHUTDOWN_CANCELLED: - /* Already in a shutdown-related state, just ignore - * the new shutdown request... - */ - return TRUE; - - case XSMP_STATE_IDLE: - if (xsmp->waiting_to_set_initial_properties) - sm_client_xsmp_set_initial_properties (xsmp); - - if (!xsmp->expecting_initial_save_yourself) - break; - /* else fall through */ - - case XSMP_STATE_SAVE_YOURSELF_DONE: - /* We need to wait for some response from the server.*/ - process_ice_messages (SmcGetIceConnection (xsmp->connection)); - break; - - default: - /* Hm... shouldn't happen */ - return FALSE; - } - } - - /* xfce4-session will do the wrong thing if we pass SmSaveGlobal and - * the user chooses to save the session. But gnome-session will do - * the wrong thing if we pass SmSaveBoth and the user chooses NOT to - * save the session... Sigh. - */ - if (!strcmp (SmcVendor (xsmp->connection), "xfce4-session")) - save_type = SmSaveBoth; - else - save_type = SmSaveGlobal; - - g_debug ("Sending SaveYourselfRequest(SmSaveGlobal, Shutdown, SmInteractStyleAny, %sFast)", request_confirmation ? "!" : ""); - SmcRequestSaveYourself (xsmp->connection, - save_type, - True, /* shutdown */ - SmInteractStyleAny, - !request_confirmation, /* fast */ - True /* global */); - return TRUE; -} - -static gboolean -idle_do_pending_events (gpointer data) -{ - EggSMClientXSMP *xsmp = data; - EggSMClient *client = data; - - gdk_threads_enter (); - - xsmp->idle = 0; - - if (xsmp->waiting_to_emit_quit) - { - xsmp->waiting_to_emit_quit = FALSE; - egg_sm_client_quit (client); - goto out; - } - - if (xsmp->waiting_to_emit_quit_cancelled) - { - xsmp->waiting_to_emit_quit_cancelled = FALSE; - egg_sm_client_quit_cancelled (client); - xsmp->state = XSMP_STATE_IDLE; - } - - if (xsmp->waiting_to_save_myself) - { - xsmp->waiting_to_save_myself = FALSE; - do_save_yourself (xsmp); - } - - out: - gdk_threads_leave (); - return FALSE; -} - -static void -update_pending_events (EggSMClientXSMP *xsmp) -{ - gboolean want_idle = - xsmp->waiting_to_emit_quit || - xsmp->waiting_to_emit_quit_cancelled || - xsmp->waiting_to_save_myself; - - if (want_idle) - { - if (xsmp->idle == 0) - xsmp->idle = g_idle_add (idle_do_pending_events, xsmp); - } - else - { - if (xsmp->idle != 0) - g_source_remove (xsmp->idle); - xsmp->idle = 0; - } -} - -static void -fix_broken_state (EggSMClientXSMP *xsmp, const char *message, - gboolean send_interact_done, - gboolean send_save_yourself_done) -{ - g_warning ("Received XSMP %s message in state %s: client or server error", - message, EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - /* Forget any pending SaveYourself plans we had */ - xsmp->waiting_to_save_myself = FALSE; - update_pending_events (xsmp); - - if (send_interact_done) - SmcInteractDone (xsmp->connection, False); - if (send_save_yourself_done) - SmcSaveYourselfDone (xsmp->connection, True); - - xsmp->state = send_save_yourself_done ? XSMP_STATE_SAVE_YOURSELF_DONE : XSMP_STATE_IDLE; -} - -/* SM callbacks */ - -static void -xsmp_save_yourself (SmcConn smc_conn, - SmPointer client_data, - int save_type, - Bool shutdown, - int interact_style, - Bool fast) -{ - EggSMClientXSMP *xsmp = client_data; - gboolean wants_quit_requested; - - g_debug ("Received SaveYourself(%s, %s, %s, %s) in state %s", - save_type == SmSaveLocal ? "SmSaveLocal" : - save_type == SmSaveGlobal ? "SmSaveGlobal" : "SmSaveBoth", - shutdown ? "Shutdown" : "!Shutdown", - interact_style == SmInteractStyleAny ? "SmInteractStyleAny" : - interact_style == SmInteractStyleErrors ? "SmInteractStyleErrors" : - "SmInteractStyleNone", fast ? "Fast" : "!Fast", - EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - if (xsmp->state != XSMP_STATE_IDLE && - xsmp->state != XSMP_STATE_SHUTDOWN_CANCELLED) - { - fix_broken_state (xsmp, "SaveYourself", FALSE, TRUE); - return; - } - - if (xsmp->waiting_to_set_initial_properties) - sm_client_xsmp_set_initial_properties (xsmp); - - /* If this is the initial SaveYourself, ignore it; we've already set - * properties and there's no reason to actually save state too. - */ - if (xsmp->expecting_initial_save_yourself) - { - xsmp->expecting_initial_save_yourself = FALSE; - - if (save_type == SmSaveLocal && - interact_style == SmInteractStyleNone && - !shutdown && !fast) - { - g_debug ("Sending SaveYourselfDone(True) for initial SaveYourself"); - SmcSaveYourselfDone (xsmp->connection, True); - /* As explained in the comment at the end of - * do_save_yourself(), SAVE_YOURSELF_DONE is the correct - * state here, not IDLE. - */ - xsmp->state = XSMP_STATE_SAVE_YOURSELF_DONE; - return; - } - else - g_warning ("First SaveYourself was not the expected one!"); - } - - /* Even ignoring the "fast" flag completely, there are still 18 - * different combinations of save_type, shutdown and interact_style. - * We interpret them as follows: - * - * Type Shutdown Interact Interpretation - * G F A/E/N do nothing (1) - * G T N do nothing (1)* - * G T A/E quit_requested (2) - * L/B F A/E/N save_state (3) - * L/B T N save_state (3)* - * L/B T A/E quit_requested, then save_state (4) - * - * 1. Do nothing, because the SM asked us to do something - * uninteresting (save open files, but then don't quit - * afterward) or rude (save open files without asking the user - * for confirmation). - * - * 2. Request interaction and then emit ::quit_requested. This - * perhaps isn't quite correct for the SmInteractStyleErrors - * case, but we don't care. - * - * 3. Emit ::save_state. The SmSaveBoth SaveYourselfs in these - * rows essentially get demoted to SmSaveLocal, because their - * Global halves correspond to "do nothing". - * - * 4. Request interaction, emit ::quit_requested, and then emit - * ::save_state after interacting. This is the SmSaveBoth - * equivalent of #2, but we also promote SmSaveLocal shutdown - * SaveYourselfs to SmSaveBoth here, because we want to give - * the user a chance to save open files before quitting. - * - * (* It would be nice if we could do something useful when the - * session manager sends a SaveYourself with shutdown True and - * SmInteractStyleNone. But we can't, so we just pretend it didn't - * even tell us it was shutting down. The docs for ::quit mention - * that it might not always be preceded by ::quit_requested.) - */ - - /* As an optimization, we don't actually request interaction and - * emit ::quit_requested if the application isn't listening to the - * signal. - */ - wants_quit_requested = g_signal_has_handler_pending (xsmp, g_signal_lookup ("quit_requested", EGG_TYPE_SM_CLIENT), 0, FALSE); - - xsmp->need_save_state = (save_type != SmSaveGlobal); - xsmp->need_quit_requested = (shutdown && wants_quit_requested && - interact_style != SmInteractStyleNone); - xsmp->interact_errors = (interact_style == SmInteractStyleErrors); - - xsmp->shutting_down = shutdown; - - do_save_yourself (xsmp); -} - -static void -do_save_yourself (EggSMClientXSMP *xsmp) -{ - if (xsmp->state == XSMP_STATE_SHUTDOWN_CANCELLED) - { - /* The SM cancelled a previous SaveYourself, but we haven't yet - * had a chance to tell the application, so we can't start - * processing this SaveYourself yet. - */ - xsmp->waiting_to_save_myself = TRUE; - update_pending_events (xsmp); - return; - } - - if (xsmp->need_quit_requested) - { - xsmp->state = XSMP_STATE_INTERACT_REQUEST; - - g_debug ("Sending InteractRequest(%s)", - xsmp->interact_errors ? "Error" : "Normal"); - SmcInteractRequest (xsmp->connection, - xsmp->interact_errors ? SmDialogError : SmDialogNormal, - xsmp_interact, - xsmp); - return; - } - - if (xsmp->need_save_state) - { - save_state (xsmp); - - /* Though unlikely, the client could have been disconnected - * while the application was saving its state. - */ - if (!xsmp->connection) - return; - } - - g_debug ("Sending SaveYourselfDone(True)"); - SmcSaveYourselfDone (xsmp->connection, True); - - /* The client state diagram in the XSMP spec says that after a - * non-shutdown SaveYourself, we go directly back to "idle". But - * everything else in both the XSMP spec and the libSM docs - * disagrees. - */ - xsmp->state = XSMP_STATE_SAVE_YOURSELF_DONE; -} - -static void -save_state (EggSMClientXSMP *xsmp) -{ - GKeyFile *state_file; - char *state_file_path, *data; - EggDesktopFile *desktop_file; - GPtrArray *restart; - int offset, fd; - - /* We set xsmp->state before emitting save_state, but our caller is - * responsible for setting it back afterward. - */ - xsmp->state = XSMP_STATE_SAVE_YOURSELF; - - state_file = egg_sm_client_save_state ((EggSMClient *)xsmp); - if (!state_file) - { - restart = generate_command (xsmp->restart_command, xsmp->client_id, NULL); - set_properties (xsmp, - ptrarray_prop (SmRestartCommand, restart), - NULL); - g_ptr_array_free (restart, TRUE); - delete_properties (xsmp, SmDiscardCommand, NULL); - return; - } - - desktop_file = egg_get_desktop_file (); - if (desktop_file) - { - GKeyFile *merged_file; - char *desktop_file_path; - - merged_file = g_key_file_new (); - desktop_file_path = - g_filename_from_uri (egg_desktop_file_get_source (desktop_file), - NULL, NULL); - if (desktop_file_path && - g_key_file_load_from_file (merged_file, desktop_file_path, - G_KEY_FILE_KEEP_COMMENTS | - G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) - { - guint g, k, i; - char **groups, **keys, *value, *exec; - - groups = g_key_file_get_groups (state_file, NULL); - for (g = 0; groups[g]; g++) - { - keys = g_key_file_get_keys (state_file, groups[g], NULL, NULL); - for (k = 0; keys[k]; k++) - { - value = g_key_file_get_value (state_file, groups[g], - keys[k], NULL); - if (value) - { - g_key_file_set_value (merged_file, groups[g], - keys[k], value); - g_free (value); - } - } - g_strfreev (keys); - } - g_strfreev (groups); - - g_key_file_free (state_file); - state_file = merged_file; - - /* Update Exec key using "--sm-client-state-file %k" */ - restart = generate_command (xsmp->restart_command, - NULL, "%k"); - for (i = 0; i < restart->len; i++) - restart->pdata[i] = g_shell_quote (restart->pdata[i]); - g_ptr_array_add (restart, NULL); - exec = g_strjoinv (" ", (char **)restart->pdata); - g_strfreev ((char **)restart->pdata); - g_ptr_array_free (restart, FALSE); - - g_key_file_set_string (state_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_EXEC, - exec); - g_free (exec); - } - else - desktop_file = NULL; - - g_free (desktop_file_path); - } - - /* Now write state_file to disk. (We can't use mktemp(), because - * that requires the filename to end with "XXXXXX", and we want - * it to end with ".desktop".) - */ - - data = g_key_file_to_data (state_file, NULL, NULL); - g_key_file_free (state_file); - - offset = 0; - while (1) - { - state_file_path = g_strdup_printf ("%s%csession-state%c%s-%ld.%s", - g_get_user_config_dir (), - G_DIR_SEPARATOR, G_DIR_SEPARATOR, - g_get_prgname (), - (long)time (NULL) + offset, - desktop_file ? "desktop" : "state"); - - fd = open (state_file_path, O_WRONLY | O_CREAT | O_EXCL, 0644); - if (fd == -1) - { - if (errno == EEXIST) - { - offset++; - g_free (state_file_path); - continue; - } - else if (errno == ENOTDIR || errno == ENOENT) - { - char *sep = strrchr (state_file_path, G_DIR_SEPARATOR); - - *sep = '\0'; - if (g_mkdir_with_parents (state_file_path, 0755) != 0) - { - g_warning ("Could not create directory '%s'", - state_file_path); - g_free (state_file_path); - state_file_path = NULL; - break; - } - - continue; - } - - g_warning ("Could not create file '%s': %s", - state_file_path, g_strerror (errno)); - g_free (state_file_path); - state_file_path = NULL; - break; - } - - close (fd); - g_file_set_contents (state_file_path, data, -1, NULL); - break; - } - g_free (data); - - restart = generate_command (xsmp->restart_command, xsmp->client_id, - state_file_path); - set_properties (xsmp, - ptrarray_prop (SmRestartCommand, restart), - NULL); - g_ptr_array_free (restart, TRUE); - - if (state_file_path) - { - set_properties (xsmp, - array_prop (SmDiscardCommand, - "/bin/rm", "-rf", state_file_path, - NULL), - NULL); - g_free (state_file_path); - } -} - -static void -xsmp_interact (SmcConn smc_conn, - SmPointer client_data) -{ - EggSMClientXSMP *xsmp = client_data; - EggSMClient *client = client_data; - - g_debug ("Received Interact message in state %s", - EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - if (xsmp->state != XSMP_STATE_INTERACT_REQUEST) - { - fix_broken_state (xsmp, "Interact", TRUE, TRUE); - return; - } - - xsmp->state = XSMP_STATE_INTERACT; - egg_sm_client_quit_requested (client); -} - -static void -xsmp_die (SmcConn smc_conn, - SmPointer client_data) -{ - EggSMClientXSMP *xsmp = client_data; - EggSMClient *client = client_data; - - g_debug ("Received Die message in state %s", - EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - sm_client_xsmp_disconnect (xsmp); - egg_sm_client_quit (client); -} - -static void -xsmp_save_complete (SmcConn smc_conn, - SmPointer client_data) -{ - EggSMClientXSMP *xsmp = client_data; - - g_debug ("Received SaveComplete message in state %s", - EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - if (xsmp->state == XSMP_STATE_SAVE_YOURSELF_DONE) - xsmp->state = XSMP_STATE_IDLE; - else - fix_broken_state (xsmp, "SaveComplete", FALSE, FALSE); -} - -static void -xsmp_shutdown_cancelled (SmcConn smc_conn, - SmPointer client_data) -{ - EggSMClientXSMP *xsmp = client_data; - EggSMClient *client = client_data; - - g_debug ("Received ShutdownCancelled message in state %s", - EGG_SM_CLIENT_XSMP_STATE (xsmp)); - - xsmp->shutting_down = FALSE; - - if (xsmp->state == XSMP_STATE_SAVE_YOURSELF_DONE) - { - /* We've finished interacting and now the SM has agreed to - * cancel the shutdown. - */ - xsmp->state = XSMP_STATE_IDLE; - egg_sm_client_quit_cancelled (client); - } - else if (xsmp->state == XSMP_STATE_SHUTDOWN_CANCELLED) - { - /* Hm... ok, so we got a shutdown SaveYourself, which got - * cancelled, but the application was still interacting, so we - * didn't tell it yet, and then *another* SaveYourself arrived, - * which we must still be waiting to tell the app about, except - * that now that SaveYourself has been cancelled too! Dizzy yet? - */ - xsmp->waiting_to_save_myself = FALSE; - update_pending_events (xsmp); - } - else - { - g_debug ("Sending SaveYourselfDone(False)"); - SmcSaveYourselfDone (xsmp->connection, False); - - if (xsmp->state == XSMP_STATE_INTERACT) - { - /* The application is currently interacting, so we can't - * tell it about the cancellation yet; we will wait until - * after it calls egg_sm_client_will_quit(). - */ - xsmp->state = XSMP_STATE_SHUTDOWN_CANCELLED; - } - else - { - /* The shutdown was cancelled before the application got a - * chance to interact. - */ - xsmp->state = XSMP_STATE_IDLE; - } - } -} - -/* Utilities */ - -/* Create a restart/clone/Exec command based on @restart_command. - * If @client_id is non-%NULL, add "--sm-client-id @client_id". - * If @state_file is non-%NULL, add "--sm-client-state-file @state_file". - * - * None of the input strings are g_strdup()ed; the caller must keep - * them around until it is done with the returned GPtrArray, and must - * then free the array, but not its contents. - */ -static GPtrArray * -generate_command (char **restart_command, const char *client_id, - const char *state_file) -{ - GPtrArray *cmd; - int i; - - cmd = g_ptr_array_new (); - g_ptr_array_add (cmd, restart_command[0]); - - if (client_id) - { - g_ptr_array_add (cmd, (char *)"--sm-client-id"); - g_ptr_array_add (cmd, (char *)client_id); - } - - if (state_file) - { - g_ptr_array_add (cmd, (char *)"--sm-client-state-file"); - g_ptr_array_add (cmd, (char *)state_file); - } - - for (i = 1; restart_command[i]; i++) - g_ptr_array_add (cmd, restart_command[i]); - - return cmd; -} - -/* Takes a NULL-terminated list of SmProp * values, created by - * array_prop, ptrarray_prop, string_prop, card8_prop, sets them, and - * frees them. - */ -static void -set_properties (EggSMClientXSMP *xsmp, ...) -{ - GPtrArray *props; - SmProp *prop; - va_list ap; - guint i; - - props = g_ptr_array_new (); - - va_start (ap, xsmp); - while ((prop = va_arg (ap, SmProp *))) - g_ptr_array_add (props, prop); - va_end (ap); - - if (xsmp->connection) - { - SmcSetProperties (xsmp->connection, props->len, - (SmProp **)props->pdata); - } - - for (i = 0; i < props->len; i++) - { - prop = props->pdata[i]; - g_free (prop->vals); - g_free (prop); - } - g_ptr_array_free (props, TRUE); -} - -/* Takes a NULL-terminated list of property names and deletes them. */ -static void -delete_properties (EggSMClientXSMP *xsmp, ...) -{ - GPtrArray *props; - char *prop; - va_list ap; - - if (!xsmp->connection) - return; - - props = g_ptr_array_new (); - - va_start (ap, xsmp); - while ((prop = va_arg (ap, char *))) - g_ptr_array_add (props, prop); - va_end (ap); - - SmcDeleteProperties (xsmp->connection, props->len, - (char **)props->pdata); - - g_ptr_array_free (props, TRUE); -} - -/* Takes an array of strings and creates a LISTofARRAY8 property. The - * strings are neither dupped nor freed; they need to remain valid - * until you're done with the SmProp. - */ -static SmProp * -array_prop (const char *name, ...) -{ - SmProp *prop; - SmPropValue pv; - GArray *vals; - char *value; - va_list ap; - - prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmLISTofARRAY8; - - vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); - - va_start (ap, name); - while ((value = va_arg (ap, char *))) - { - pv.length = strlen (value); - pv.value = value; - g_array_append_val (vals, pv); - } - - prop->num_vals = vals->len; - prop->vals = (SmPropValue *)vals->data; - - g_array_free (vals, FALSE); - - return prop; -} - -/* Takes a GPtrArray of strings and creates a LISTofARRAY8 property. - * The array contents are neither dupped nor freed; they need to - * remain valid until you're done with the SmProp. - */ -static SmProp * -ptrarray_prop (const char *name, GPtrArray *values) -{ - SmProp *prop; - SmPropValue pv; - GArray *vals; - guint i; - - prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmLISTofARRAY8; - - vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); - - for (i = 0; i < values->len; i++) - { - pv.length = strlen (values->pdata[i]); - pv.value = values->pdata[i]; - g_array_append_val (vals, pv); - } - - prop->num_vals = vals->len; - prop->vals = (SmPropValue *)vals->data; - - g_array_free (vals, FALSE); - - return prop; -} - -/* Takes a string and creates an ARRAY8 property. The string is - * neither dupped nor freed; it needs to remain valid until you're - * done with the SmProp. - */ -static SmProp * -string_prop (const char *name, const char *value) -{ - SmProp *prop; - - prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmARRAY8; - - prop->num_vals = 1; - prop->vals = g_new (SmPropValue, 1); - - prop->vals[0].length = strlen (value); - prop->vals[0].value = (char *)value; - - return prop; -} - -/* Takes a char and creates a CARD8 property. */ -static SmProp * -card8_prop (const char *name, unsigned char value) -{ - SmProp *prop; - char *card8val; - - /* To avoid having to allocate and free prop->vals[0], we cheat and - * make vals a 2-element-long array and then use the second element - * to store value. - */ - - prop = g_new (SmProp, 1); - prop->name = (char *)name; - prop->type = (char *)SmCARD8; - - prop->num_vals = 1; - prop->vals = g_new (SmPropValue, 2); - card8val = (char *)(&prop->vals[1]); - card8val[0] = value; - - prop->vals[0].length = 1; - prop->vals[0].value = card8val; - - return prop; -} - -/* ICE code. This makes no effort to play nice with anyone else trying - * to use libICE. Fortunately, no one uses libICE for anything other - * than SM. (DCOP uses ICE, but it has its own private copy of - * libICE.) - * - * When this moves to gtk, it will need to be cleverer, to avoid - * tripping over old apps that use GnomeClient or that use libSM - * directly. - */ - -#include -#include - -static void ice_error_handler (IceConn ice_conn, - Bool swap, - int offending_minor_opcode, - unsigned long offending_sequence, - int error_class, - int severity, - IcePointer values); -static void ice_io_error_handler (IceConn ice_conn); -static void ice_connection_watch (IceConn ice_conn, - IcePointer client_data, - Bool opening, - IcePointer *watch_data); - -static void -ice_init (void) -{ - IceSetIOErrorHandler (ice_io_error_handler); - IceSetErrorHandler (ice_error_handler); - IceAddConnectionWatch (ice_connection_watch, NULL); -} - -static gboolean -process_ice_messages (IceConn ice_conn) -{ - IceProcessMessagesStatus status; - - gdk_threads_enter (); - status = IceProcessMessages (ice_conn, NULL, NULL); - gdk_threads_leave (); - - switch (status) - { - case IceProcessMessagesSuccess: - return TRUE; - - case IceProcessMessagesIOError: - sm_client_xsmp_disconnect (IceGetConnectionContext (ice_conn)); - return FALSE; - - case IceProcessMessagesConnectionClosed: - return FALSE; - - default: - g_assert_not_reached (); - } -} - -static gboolean -ice_iochannel_watch (GIOChannel *channel, - GIOCondition condition, - gpointer client_data) -{ - return process_ice_messages (client_data); -} - -static void -ice_connection_watch (IceConn ice_conn, - IcePointer client_data, - Bool opening, - IcePointer *watch_data) -{ - guint watch_id; - - if (opening) - { - GIOChannel *channel; - int fd = IceConnectionNumber (ice_conn); - - fcntl (fd, F_SETFD, fcntl (fd, F_GETFD, 0) | FD_CLOEXEC); - channel = g_io_channel_unix_new (fd); - watch_id = g_io_add_watch (channel, G_IO_IN | G_IO_ERR, - ice_iochannel_watch, ice_conn); - g_io_channel_unref (channel); - - *watch_data = GUINT_TO_POINTER (watch_id); - } - else - { - watch_id = GPOINTER_TO_UINT (*watch_data); - g_source_remove (watch_id); - } -} - -static void -ice_error_handler (IceConn ice_conn, - Bool swap, - int offending_minor_opcode, - unsigned long offending_sequence, - int error_class, - int severity, - IcePointer values) -{ - /* Do nothing */ -} - -static void -ice_io_error_handler (IceConn ice_conn) -{ - /* Do nothing */ -} - -static void -smc_error_handler (SmcConn smc_conn, - Bool swap, - int offending_minor_opcode, - unsigned long offending_sequence, - int error_class, - int severity, - SmPointer values) -{ - /* Do nothing */ -} diff -Nru gnome-session-3.9.90/egg/Makefile.am gnome-session-3.14.0/egg/Makefile.am --- gnome-session-3.9.90/egg/Makefile.am 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/egg/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP -platform_ltlibraries = \ - libeggdesktopfile.la \ - libeggsmclient-gnome.la -platform_libs = \ - libeggdesktopfile.la \ - $(SM_LIBS) \ - $(ICE_LIBS) -platform_sources = eggsmclient-xsmp.c - -INCLUDES = \ - -DG_LOG_DOMAIN=\""EggSMClient"\" \ - $(platform_defines) \ - $(EGG_SMCLIENT_CFLAGS) \ - $(SM_CFLAGS) \ - $(ICE_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) - -noinst_LTLIBRARIES = \ - libeggsmclient.la \ - $(platform_ltlibraries) - -libeggsmclient_la_LIBADD = \ - $(EGG_SMCLIENT_LIBS) \ - $(SM_LIBS) \ - $(ICE_LIBS) \ - $(platform_libs) - -libeggsmclient_la_SOURCES = \ - eggsmclient.c \ - eggsmclient.h \ - eggsmclient-private.h \ - $(platform_sources) - -libeggsmclient_gnome_la_LIBADD = \ - $(libeggsmclient_la_LIBADD) - -libeggsmclient_gnome_la_SOURCES = \ - eggsmclient.c \ - eggsmclient.h \ - eggsmclient-private.h \ - $(platform_sources) - -libeggdesktopfile_la_LIBADD = \ - $(EGG_SMCLIENT_LIBS) - -libeggdesktopfile_la_SOURCES = \ - eggdesktopfile.c \ - eggdesktopfile.h - --include $(top_srcdir)/git.mk diff -Nru gnome-session-3.9.90/egg/Makefile.in gnome-session-3.14.0/egg/Makefile.in --- gnome-session-3.9.90/egg/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/egg/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,728 +0,0 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994-2013 Free Software Foundation, Inc. - -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' -am__make_running_with_option = \ - case $${target_option-} in \ - ?) ;; \ - *) echo "am__make_running_with_option: internal error: invalid" \ - "target option '$${target_option-}' specified" >&2; \ - exit 1;; \ - esac; \ - has_opt=no; \ - sane_makeflags=$$MAKEFLAGS; \ - if $(am__is_gnu_make); then \ - sane_makeflags=$$MFLAGS; \ - else \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - bs=\\; \ - sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ - | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ - esac; \ - fi; \ - skip_next=no; \ - strip_trailopt () \ - { \ - flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ - }; \ - for flg in $$sane_makeflags; do \ - test $$skip_next = yes && { skip_next=no; continue; }; \ - case $$flg in \ - *=*|--*) continue;; \ - -*I) strip_trailopt 'I'; skip_next=yes;; \ - -*I?*) strip_trailopt 'I';; \ - -*O) strip_trailopt 'O'; skip_next=yes;; \ - -*O?*) strip_trailopt 'O';; \ - -*l) strip_trailopt 'l'; skip_next=yes;; \ - -*l?*) strip_trailopt 'l';; \ - -[dEDm]) skip_next=yes;; \ - -[JT]) skip_next=yes;; \ - esac; \ - case $$flg in \ - *$$target_option*) has_opt=yes; break;; \ - esac; \ - done; \ - test $$has_opt = yes -am__make_dryrun = (target_option=n; $(am__make_running_with_option)) -am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = egg -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -LTLIBRARIES = $(noinst_LTLIBRARIES) -am__DEPENDENCIES_1 = -libeggdesktopfile_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libeggdesktopfile_la_OBJECTS = eggdesktopfile.lo -libeggdesktopfile_la_OBJECTS = $(am_libeggdesktopfile_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -am__v_lt_1 = -am__DEPENDENCIES_2 = libeggdesktopfile.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) -libeggsmclient_gnome_la_DEPENDENCIES = $(am__DEPENDENCIES_3) -am__objects_1 = eggsmclient-xsmp.lo -am_libeggsmclient_gnome_la_OBJECTS = eggsmclient.lo $(am__objects_1) -libeggsmclient_gnome_la_OBJECTS = \ - $(am_libeggsmclient_gnome_la_OBJECTS) -libeggsmclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) -am_libeggsmclient_la_OBJECTS = eggsmclient.lo $(am__objects_1) -libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS) -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -am__v_CC_1 = -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -am__v_CCLD_1 = -SOURCES = $(libeggdesktopfile_la_SOURCES) \ - $(libeggsmclient_gnome_la_SOURCES) \ - $(libeggsmclient_la_SOURCES) -DIST_SOURCES = $(libeggdesktopfile_la_SOURCES) \ - $(libeggsmclient_gnome_la_SOURCES) \ - $(libeggsmclient_la_SOURCES) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -# Read a list of newline-separated strings from the standard input, -# and print each of them once, without duplicates. Input order is -# *not* preserved. -am__uniquify_input = $(AWK) '\ - BEGIN { nonempty = 0; } \ - { items[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in items) print i; }; } \ -' -# Make sure the list of sources is unique. This is necessary because, -# e.g., the same source file might be shared among _SOURCES variables -# for different programs/libraries. -am__define_uniq_tagged_files = \ - list='$(am__tagged_files)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGG_SMCLIENT_CFLAGS = @EGG_SMCLIENT_CFLAGS@ -EGG_SMCLIENT_LIBS = @EGG_SMCLIENT_LIBS@ -EGREP = @EGREP@ -EXECINFO_LIBS = @EXECINFO_LIBS@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GCONF_CFLAGS = @GCONF_CFLAGS@ -GCONF_LIBS = @GCONF_LIBS@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@ -GIOUNIX_LIBS = @GIOUNIX_LIBS@ -GIO_CFLAGS = @GIO_CFLAGS@ -GIO_LIBS = @GIO_LIBS@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GL_TEST_CFLAGS = @GL_TEST_CFLAGS@ -GL_TEST_LIBS = @GL_TEST_LIBS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_SESSION_CFLAGS = @GNOME_SESSION_CFLAGS@ -GNOME_SESSION_LIBS = @GNOME_SESSION_LIBS@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -GTK3_CFLAGS = @GTK3_CFLAGS@ -GTK3_LIBS = @GTK3_LIBS@ -HAVE_XRENDER = @HAVE_XRENDER@ -HAVE_XTEST = @HAVE_XTEST@ -ICE_CFLAGS = @ICE_CFLAGS@ -ICE_LIBS = @ICE_LIBS@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SESSION_PROPERTIES_CFLAGS = @SESSION_PROPERTIES_CFLAGS@ -SESSION_PROPERTIES_LIBS = @SESSION_PROPERTIES_LIBS@ -SESSION_SELECTOR_CFLAGS = @SESSION_SELECTOR_CFLAGS@ -SESSION_SELECTOR_LIBS = @SESSION_SELECTOR_LIBS@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SM_CFLAGS = @SM_CFLAGS@ -SM_LIBS = @SM_LIBS@ -STRIP = @STRIP@ -SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ -SYSTEMD_LIBS = @SYSTEMD_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -X11_CFLAGS = @X11_CFLAGS@ -X11_LIBS = @X11_LIBS@ -XEXT_CFLAGS = @XEXT_CFLAGS@ -XEXT_LIBS = @XEXT_LIBS@ -XGETTEXT = @XGETTEXT@ -XMLTO = @XMLTO@ -XRENDER_CFLAGS = @XRENDER_CFLAGS@ -XRENDER_LIBS = @XRENDER_LIBS@ -XSLTPROC = @XSLTPROC@ -XTEST_CFLAGS = @XTEST_CFLAGS@ -XTEST_LIBS = @XTEST_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -platform_defines = -DEGG_SM_CLIENT_BACKEND_XSMP -platform_ltlibraries = \ - libeggdesktopfile.la \ - libeggsmclient-gnome.la - -platform_libs = \ - libeggdesktopfile.la \ - $(SM_LIBS) \ - $(ICE_LIBS) - -platform_sources = eggsmclient-xsmp.c -INCLUDES = \ - -DG_LOG_DOMAIN=\""EggSMClient"\" \ - $(platform_defines) \ - $(EGG_SMCLIENT_CFLAGS) \ - $(SM_CFLAGS) \ - $(ICE_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED_CFLAGS) - -noinst_LTLIBRARIES = \ - libeggsmclient.la \ - $(platform_ltlibraries) - -libeggsmclient_la_LIBADD = \ - $(EGG_SMCLIENT_LIBS) \ - $(SM_LIBS) \ - $(ICE_LIBS) \ - $(platform_libs) - -libeggsmclient_la_SOURCES = \ - eggsmclient.c \ - eggsmclient.h \ - eggsmclient-private.h \ - $(platform_sources) - -libeggsmclient_gnome_la_LIBADD = \ - $(libeggsmclient_la_LIBADD) - -libeggsmclient_gnome_la_SOURCES = \ - eggsmclient.c \ - eggsmclient.h \ - eggsmclient-private.h \ - $(platform_sources) - -libeggdesktopfile_la_LIBADD = \ - $(EGG_SMCLIENT_LIBS) - -libeggdesktopfile_la_SOURCES = \ - eggdesktopfile.c \ - eggdesktopfile.h - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu egg/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu egg/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -libeggdesktopfile.la: $(libeggdesktopfile_la_OBJECTS) $(libeggdesktopfile_la_DEPENDENCIES) $(EXTRA_libeggdesktopfile_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libeggdesktopfile_la_OBJECTS) $(libeggdesktopfile_la_LIBADD) $(LIBS) - -libeggsmclient-gnome.la: $(libeggsmclient_gnome_la_OBJECTS) $(libeggsmclient_gnome_la_DEPENDENCIES) $(EXTRA_libeggsmclient_gnome_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libeggsmclient_gnome_la_OBJECTS) $(libeggsmclient_gnome_la_LIBADD) $(LIBS) - -libeggsmclient.la: $(libeggsmclient_la_OBJECTS) $(libeggsmclient_la_DEPENDENCIES) $(EXTRA_libeggsmclient_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) $(libeggsmclient_la_OBJECTS) $(libeggsmclient_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggdesktopfile.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggsmclient-xsmp.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eggsmclient.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(am__tagged_files) - $(am__define_uniq_tagged_files); mkid -fID $$unique -tags: tags-am -TAGS: tags - -tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - set x; \ - here=`pwd`; \ - $(am__define_uniq_tagged_files); \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: ctags-am - -CTAGS: ctags -ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) - $(am__define_uniq_tagged_files); \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" -cscopelist: cscopelist-am - -cscopelist-am: $(am__tagged_files) - list='$(am__tagged_files)'; \ - case "$(srcdir)" in \ - [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ - *) sdir=$(subdir)/$(srcdir) ;; \ - esac; \ - for i in $$list; do \ - if test -f "$$i"; then \ - echo "$(subdir)/$$i"; \ - else \ - echo "$$sdir/$$i"; \ - fi; \ - done >> $(top_builddir)/cscope.files - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ - ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am - - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru gnome-session-3.9.90/gnome-session/gdm.c gnome-session-3.14.0/gnome-session/gdm.c --- gnome-session-3.9.90/gnome-session/gdm.c 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gdm.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,471 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2005 Raffaele Sandrini - * Copyright (C) 2005 Red Hat, Inc. - * Copyright (C) 2002, 2003 George Lebl - * Copyright (C) 2001 Queen of England, - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Raffaele Sandrini - * George Lebl - * Mark McLoughlin - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "gdm.h" - -#define GDM_PROTOCOL_UPDATE_INTERVAL 1 /* seconds */ - -#define GDM_PROTOCOL_SOCKET_PATH "/var/run/gdm_socket" - -#define GDM_PROTOCOL_MSG_CLOSE "CLOSE" -#define GDM_PROTOCOL_MSG_VERSION "VERSION" -#define GDM_PROTOCOL_MSG_AUTHENTICATE "AUTH_LOCAL" -#define GDM_PROTOCOL_MSG_QUERY_ACTION "QUERY_LOGOUT_ACTION" -#define GDM_PROTOCOL_MSG_SET_ACTION "SET_SAFE_LOGOUT_ACTION" -#define GDM_PROTOCOL_MSG_FLEXI_XSERVER "FLEXI_XSERVER" - -#define GDM_ACTION_STR_NONE "NONE" -#define GDM_ACTION_STR_SHUTDOWN "HALT" -#define GDM_ACTION_STR_REBOOT "REBOOT" -#define GDM_ACTION_STR_SUSPEND "SUSPEND" - -typedef struct { - int fd; - char *auth_cookie; - - GdmLogoutAction available_actions; - GdmLogoutAction current_actions; - - time_t last_update; -} GdmProtocolData; - -static GdmProtocolData gdm_protocol_data = { - 0, - NULL, - GDM_LOGOUT_ACTION_NONE, - GDM_LOGOUT_ACTION_NONE, - 0 -}; - -static char * -gdm_send_protocol_msg (GdmProtocolData *data, - const char *msg) -{ - GString *retval; - char buf[256]; - char *p; - int len; - - p = g_strconcat (msg, "\n", NULL); - - if (write (data->fd, p, strlen (p)) < 0) { - g_free (p); - - g_warning ("Failed to send message to GDM: %s", - g_strerror (errno)); - - return NULL; - } - - g_free (p); - - p = NULL; - retval = NULL; - - while ((len = read (data->fd, buf, sizeof (buf) - 1)) > 0) { - buf[len] = '\0'; - - if (!retval) { - retval = g_string_new (buf); - } else { - retval = g_string_append (retval, buf); - } - - if ((p = strchr (retval->str, '\n'))) { - break; - } - } - - if (p) { - *p = '\0'; - } - - return retval ? g_string_free (retval, FALSE) : NULL; -} - -static char * -get_display_number (void) -{ - const char *display_name; - char *retval; - char *p; - - display_name = gdk_display_get_name (gdk_display_get_default ()); - - p = strchr (display_name, ':'); - - if (!p) { - return g_strdup ("0"); - } - - while (*p == ':') { - p++; - } - - retval = g_strdup (p); - - p = strchr (retval, '.'); - - if (p != NULL) { - *p = '\0'; - } - - return retval; -} - -static gboolean -gdm_authenticate_connection (GdmProtocolData *data) -{ -#define GDM_MIT_MAGIC_COOKIE_LEN 16 - - const char *xau_path; - FILE *f; - Xauth *xau; - char *display_number; - gboolean retval; - - if (data->auth_cookie) { - char *msg; - char *response; - - msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", - data->auth_cookie); - response = gdm_send_protocol_msg (data, msg); - g_free (msg); - - if (response && !strcmp (response, "OK")) { - g_free (response); - return TRUE; - } else { - g_free (response); - g_free (data->auth_cookie); - data->auth_cookie = NULL; - } - } - - if (!(xau_path = XauFileName ())) { - return FALSE; - } - - if (!(f = fopen (xau_path, "r"))) { - return FALSE; - } - - retval = FALSE; - display_number = get_display_number (); - - while ((xau = XauReadAuth (f))) { - char buffer[40]; /* 2*16 == 32, so 40 is enough */ - char *msg; - char *response; - int i; - - if (xau->family != FamilyLocal || - strncmp (xau->number, display_number, xau->number_length) || - strncmp (xau->name, "MIT-MAGIC-COOKIE-1", xau->name_length) || - xau->data_length != GDM_MIT_MAGIC_COOKIE_LEN) { - XauDisposeAuth (xau); - continue; - } - - for (i = 0; i < GDM_MIT_MAGIC_COOKIE_LEN; i++) { - g_snprintf (buffer + 2*i, 3, "%02x", (guint)(guchar)xau->data[i]); - } - - XauDisposeAuth (xau); - - msg = g_strdup_printf (GDM_PROTOCOL_MSG_AUTHENTICATE " %s", buffer); - response = gdm_send_protocol_msg (data, msg); - g_free (msg); - - if (response && !strcmp (response, "OK")) { - data->auth_cookie = g_strdup (buffer); - g_free (response); - retval = TRUE; - break; - } - - g_free (response); - } - - g_free (display_number); - - fclose (f); - - return retval; - -#undef GDM_MIT_MAGIC_COOKIE_LEN -} - -static void -gdm_shutdown_protocol_connection (GdmProtocolData *data) -{ - if (data->fd) { - close (data->fd); - } - - data->fd = 0; -} - -static gboolean -gdm_init_protocol_connection (GdmProtocolData *data) -{ - struct sockaddr_un addr; - char *response; - - g_assert (data->fd <= 0); - - if (g_file_test (GDM_PROTOCOL_SOCKET_PATH, G_FILE_TEST_EXISTS)) { - strcpy (addr.sun_path, GDM_PROTOCOL_SOCKET_PATH); - } else if (g_file_test ("/tmp/.gdm_socket", G_FILE_TEST_EXISTS)) { - strcpy (addr.sun_path, "/tmp/.gdm_socket"); - } else { - return FALSE; - } - - data->fd = socket (AF_UNIX, SOCK_STREAM, 0); - - if (data->fd < 0) { - g_warning ("Failed to create GDM socket: %s", - g_strerror (errno)); - - gdm_shutdown_protocol_connection (data); - - return FALSE; - } - - addr.sun_family = AF_UNIX; - - if (connect (data->fd, (struct sockaddr *) &addr, sizeof (addr)) < 0) { - g_warning ("Failed to establish a connection with GDM: %s", - g_strerror (errno)); - - gdm_shutdown_protocol_connection (data); - - return FALSE; - } - - response = gdm_send_protocol_msg (data, GDM_PROTOCOL_MSG_VERSION); - - if (!response || strncmp (response, "GDM ", strlen ("GDM ") != 0)) { - g_free (response); - - g_warning ("Failed to get protocol version from GDM"); - gdm_shutdown_protocol_connection (data); - - return FALSE; - } - - g_free (response); - - if (!gdm_authenticate_connection (data)) { - g_warning ("Failed to authenticate with GDM"); - gdm_shutdown_protocol_connection (data); - return FALSE; - } - - return TRUE; -} - -static void -gdm_parse_query_response (GdmProtocolData *data, - const char *response) -{ - char **actions; - int i; - - data->available_actions = GDM_LOGOUT_ACTION_NONE; - data->current_actions = GDM_LOGOUT_ACTION_NONE; - - if (strncmp (response, "OK ", 3) != 0) { - return; - } - - response += 3; - - actions = g_strsplit (response, ";", -1); - - for (i = 0; actions[i]; i++) { - GdmLogoutAction action = GDM_LOGOUT_ACTION_NONE; - gboolean selected = FALSE; - char *str = actions [i]; - int len; - - len = strlen (str); - - if (!len) { - continue; - } - - if (str[len - 1] == '!') { - selected = TRUE; - str[len - 1] = '\0'; - } - - if (!strcmp (str, GDM_ACTION_STR_SHUTDOWN)) { - action = GDM_LOGOUT_ACTION_SHUTDOWN; - } else if (!strcmp (str, GDM_ACTION_STR_REBOOT)) { - action = GDM_LOGOUT_ACTION_REBOOT; - } else if (!strcmp (str, GDM_ACTION_STR_SUSPEND)) { - action = GDM_LOGOUT_ACTION_SUSPEND; - } - - data->available_actions |= action; - - if (selected) { - data->current_actions |= action; - } - } - - g_strfreev (actions); -} - -static void -gdm_update_logout_actions (GdmProtocolData *data) -{ - time_t current_time; - char *response; - - current_time = time (NULL); - - if (current_time <= (data->last_update + GDM_PROTOCOL_UPDATE_INTERVAL)) { - return; - } - - data->last_update = current_time; - - if (!gdm_init_protocol_connection (data)) { - return; - } - - if ((response = gdm_send_protocol_msg (data, GDM_PROTOCOL_MSG_QUERY_ACTION))) { - gdm_parse_query_response (data, response); - g_free (response); - } - - gdm_shutdown_protocol_connection (data); -} - -gboolean -gdm_is_available (void) -{ - if (!gdm_init_protocol_connection (&gdm_protocol_data)) { - return FALSE; - } - - gdm_shutdown_protocol_connection (&gdm_protocol_data); - - return TRUE; -} - -gboolean -gdm_supports_logout_action (GdmLogoutAction action) -{ - gdm_update_logout_actions (&gdm_protocol_data); - - return (gdm_protocol_data.available_actions & action) != 0; -} - -GdmLogoutAction -gdm_get_logout_action (void) -{ - gdm_update_logout_actions (&gdm_protocol_data); - - return gdm_protocol_data.current_actions; -} - -void -gdm_set_logout_action (GdmLogoutAction action) -{ - char *action_str = NULL; - char *msg; - char *response; - - if (!gdm_init_protocol_connection (&gdm_protocol_data)) { - return; - } - - switch (action) { - case GDM_LOGOUT_ACTION_NONE: - action_str = GDM_ACTION_STR_NONE; - break; - case GDM_LOGOUT_ACTION_SHUTDOWN: - action_str = GDM_ACTION_STR_SHUTDOWN; - break; - case GDM_LOGOUT_ACTION_REBOOT: - action_str = GDM_ACTION_STR_REBOOT; - break; - case GDM_LOGOUT_ACTION_SUSPEND: - action_str = GDM_ACTION_STR_SUSPEND; - break; - } - - msg = g_strdup_printf (GDM_PROTOCOL_MSG_SET_ACTION " %s", action_str); - - response = gdm_send_protocol_msg (&gdm_protocol_data, msg); - - g_free (msg); - g_free (response); - - gdm_protocol_data.last_update = 0; - - gdm_shutdown_protocol_connection (&gdm_protocol_data); -} - -void -gdm_new_login (void) -{ - char *response; - - if (!gdm_init_protocol_connection (&gdm_protocol_data)) { - return; - } - - response = gdm_send_protocol_msg (&gdm_protocol_data, - GDM_PROTOCOL_MSG_FLEXI_XSERVER); - - g_free (response); - - gdm_protocol_data.last_update = 0; - - gdm_shutdown_protocol_connection (&gdm_protocol_data); -} diff -Nru gnome-session-3.9.90/gnome-session/gdm.h gnome-session-3.14.0/gnome-session/gdm.h --- gnome-session-3.9.90/gnome-session/gdm.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gdm.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -/* gdm.h - * Copyright (C) 2005 Raffaele Sandrini - * Copyright (C) 2005 Red Hat, Inc. - * Copyright (C) 2002, 2003 George Lebl - * Copyright (C) 2001 Queen of England, - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Raffaele Sandrini - * George Lebl - * Mark McLoughlin - */ - -#ifndef __GDM_LOGOUT_ACTION_H__ -#define __GDM_LOGOUT_ACTION_H__ - -#include - -G_BEGIN_DECLS - -typedef enum { - GDM_LOGOUT_ACTION_NONE = 0, - GDM_LOGOUT_ACTION_SHUTDOWN = 1 << 0, - GDM_LOGOUT_ACTION_REBOOT = 1 << 1, - GDM_LOGOUT_ACTION_SUSPEND = 1 << 2 -} GdmLogoutAction; - -gboolean gdm_is_available (void); - -void gdm_new_login (void); - -void gdm_set_logout_action (GdmLogoutAction action); - -GdmLogoutAction gdm_get_logout_action (void); - -gboolean gdm_supports_logout_action (GdmLogoutAction action); - -G_END_DECLS - -#endif /* __GDM_LOGOUT_ACTION_H__ */ diff -Nru gnome-session-3.9.90/gnome-session/gdm-log.c gnome-session-3.14.0/gnome-session/gdm-log.c --- gnome-session-3.9.90/gnome-session/gdm-log.c 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gdm-log.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * * Authors: William Jon McCann * diff -Nru gnome-session-3.9.90/gnome-session/gdm-log.h gnome-session-3.14.0/gnome-session/gdm-log.h --- gnome-session-3.9.90/gnome-session/gdm-log.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gdm-log.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * * Authors: William Jon McCann * diff -Nru gnome-session-3.9.90/gnome-session/gsm-app.c gnome-session-3.14.0/gnome-session/gsm-app.c --- gnome-session-3.9.90/gnome-session/gsm-app.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-app.c 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifdef HAVE_CONFIG_H diff -Nru gnome-session-3.9.90/gnome-session/gsm-app.h gnome-session-3.14.0/gnome-session/gsm-app.h --- gnome-session-3.9.90/gnome-session/gsm-app.h 2013-02-19 18:44:53.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-app.h 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_APP_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-autostart-app.c gnome-session-3.14.0/gnome-session/gsm-autostart-app.c --- gnome-session-3.9.90/gnome-session/gsm-autostart-app.c 2013-07-30 19:01:01.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-autostart-app.c 2014-07-18 20:50:42.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include @@ -116,7 +114,6 @@ is_disabled (GsmApp *app) { GsmAutostartAppPrivate *priv; - const char *current_desktop; priv = GSM_AUTOSTART_APP (app)->priv; @@ -138,13 +135,9 @@ } /* Check OnlyShowIn/NotShowIn/TryExec */ - current_desktop = gsm_util_get_current_desktop (); - g_desktop_app_info_set_desktop_env (current_desktop); - if (current_desktop != NULL && - !g_desktop_app_info_get_show_in (G_DESKTOP_APP_INFO (priv->app_info), - current_desktop)) { - g_debug ("app %s not for %s", - gsm_app_peek_id (app), current_desktop); + if (!g_desktop_app_info_get_show_in (priv->app_info, NULL)) { + g_debug ("app %s is not for the current desktop", + gsm_app_peek_id (app)); return TRUE; } @@ -341,36 +334,33 @@ setup_gsettings_condition_monitor (GsmAutostartApp *app, const char *key) { + GSettingsSchemaSource *source; + GSettingsSchema *schema; GSettings *settings; - const char * const *schemas; char **elems; - gboolean schema_exists; - guint i; - gboolean retval; + gboolean retval = FALSE; char *signal; + retval = FALSE; + elems = g_strsplit (key, " ", 2); + if (elems == NULL) - return FALSE; - if (elems[0] == NULL || elems[1] == NULL) { - g_strfreev (elems); - return FALSE; - } + goto out; - schemas = g_settings_list_schemas (); - schema_exists = FALSE; - for (i = 0; schemas[i] != NULL; i++) { - if (g_str_equal (schemas[i], elems[0])) { - schema_exists = TRUE; - break; - } - } + if (elems[0] == NULL || elems[1] == NULL) + goto out; - if (schema_exists == FALSE) - return FALSE; + source = g_settings_schema_source_get_default (); + + schema = g_settings_schema_source_lookup (source, elems[0], TRUE); + + if (schema == NULL) + goto out; - settings = g_settings_new (elems[0]); + settings = g_settings_new_full (schema, NULL, NULL); retval = g_settings_get_boolean (settings, elems[1]); + g_settings_schema_unref (schema); signal = g_strdup_printf ("changed::%s", elems[1]); g_signal_connect (G_OBJECT (settings), signal, @@ -379,6 +369,7 @@ app->priv->condition_settings = settings; +out: g_strfreev (elems); return retval; @@ -608,7 +599,11 @@ phase_str = g_desktop_app_info_get_string (app->priv->app_info, GSM_AUTOSTART_APP_PHASE_KEY); if (phase_str != NULL) { - if (strcmp (phase_str, "Initialization") == 0) { + if (strcmp (phase_str, "EarlyInitialization") == 0) { + phase = GSM_MANAGER_PHASE_EARLY_INITIALIZATION; + } else if (strcmp (phase_str, "DisplayServer") == 0) { + phase = GSM_MANAGER_PHASE_DISPLAY_SERVER; + } else if (strcmp (phase_str, "Initialization") == 0) { phase = GSM_MANAGER_PHASE_INITIALIZATION; } else if (strcmp (phase_str, "WindowManager") == 0) { phase = GSM_MANAGER_PHASE_WINDOW_MANAGER; @@ -906,7 +901,7 @@ _signal_pid (int pid, int signal) { - int status = -1; + int status; /* perhaps block sigchld */ g_debug ("GsmAutostartApp: sending signal %d to process %d", signal, pid); diff -Nru gnome-session-3.9.90/gnome-session/gsm-autostart-app.h gnome-session-3.14.0/gnome-session/gsm-autostart-app.h --- gnome-session-3.9.90/gnome-session/gsm-autostart-app.h 2013-07-30 19:01:01.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-autostart-app.h 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_AUTOSTART_APP_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-client.c gnome-session-3.14.0/gnome-session/gsm-client.c --- gnome-session-3.9.90/gnome-session/gsm-client.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-client.c 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" diff -Nru gnome-session-3.9.90/gnome-session/gsm-client.h gnome-session-3.14.0/gnome-session/gsm-client.h --- gnome-session-3.9.90/gnome-session/gsm-client.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-client.h 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_CLIENT_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-consolekit.c gnome-session-3.14.0/gnome-session/gsm-consolekit.c --- gnome-session-3.9.90/gnome-session/gsm-consolekit.c 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-consolekit.c 2014-07-18 20:50:42.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -31,8 +29,10 @@ #include #include +#ifdef HAVE_OLD_UPOWER #define UPOWER_ENABLE_DEPRECATED 1 #include +#endif #include "gsm-system.h" #include "gsm-consolekit.h" @@ -56,7 +56,9 @@ DBusGProxy *bus_proxy; DBusGProxy *ck_proxy; DBusGProxy *session_proxy; +#ifdef HAVE_OLD_UPOWER UpClient *up_client; +#endif gboolean is_active; gboolean restarting; @@ -306,8 +308,10 @@ G_CALLBACK (on_active_changed), manager, NULL); } +#ifdef HAVE_OLD_UPOWER g_clear_object (&manager->priv->up_client); manager->priv->up_client = up_client_new (); +#endif is_connected = TRUE; @@ -381,7 +385,9 @@ g_clear_object (&manager->priv->ck_proxy); g_clear_object (&manager->priv->session_proxy); g_clear_object (&manager->priv->session_id); +#ifdef HAVE_OLD_UPOWER g_clear_object (&manager->priv->up_client); +#endif if (manager->priv->dbus_connection != NULL) { DBusConnection *connection; @@ -950,7 +956,11 @@ { GsmConsolekit *consolekit = GSM_CONSOLEKIT (system); +#ifdef HAVE_OLD_UPOWER return up_client_get_can_suspend (consolekit->priv->up_client); +#else + return FALSE; +#endif } static gboolean @@ -958,12 +968,17 @@ { GsmConsolekit *consolekit = GSM_CONSOLEKIT (system); +#ifdef HAVE_OLD_UPOWER return up_client_get_can_hibernate (consolekit->priv->up_client); +#else + return FALSE; +#endif } static void gsm_consolekit_suspend (GsmSystem *system) { +#ifdef HAVE_OLD_UPOWER GsmConsolekit *consolekit = GSM_CONSOLEKIT (system); GError *error = NULL; gboolean ret; @@ -973,11 +988,13 @@ g_warning ("Unexpected suspend failure: %s", error->message); g_error_free (error); } +#endif } static void gsm_consolekit_hibernate (GsmSystem *system) { +#ifdef HAVE_OLD_UPOWER GsmConsolekit *consolekit = GSM_CONSOLEKIT (system); GError *error = NULL; gboolean ret; @@ -987,6 +1004,7 @@ g_warning ("Unexpected hibernate failure: %s", error->message); g_error_free (error); } +#endif } static void diff -Nru gnome-session-3.9.90/gnome-session/gsm-consolekit.h gnome-session-3.14.0/gnome-session/gsm-consolekit.h --- gnome-session-3.9.90/gnome-session/gsm-consolekit.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-consolekit.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Jon McCann diff -Nru gnome-session-3.9.90/gnome-session/gsm-dbus-client.c gnome-session-3.14.0/gnome-session/gsm-dbus-client.c --- gnome-session-3.9.90/gnome-session/gsm-dbus-client.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-dbus-client.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -120,6 +118,12 @@ raise_error (DBusConnection *connection, DBusMessage *in_reply_to, const char *error_name, + char *format, ...) G_GNUC_PRINTF (4, 5); + +static void +raise_error (DBusConnection *connection, + DBusMessage *in_reply_to, + const char *error_name, char *format, ...) { char buf[512]; @@ -597,7 +601,7 @@ { GsmDBusClient *dbus_client = (GsmDBusClient *) client; DBusMessage *message; - gboolean ret; + gboolean ret = FALSE; /* unicast the signal to only the registered bus name */ message = dbus_message_new_signal (gsm_client_peek_id (client), diff -Nru gnome-session-3.9.90/gnome-session/gsm-dbus-client.h gnome-session-3.14.0/gnome-session/gsm-dbus-client.h --- gnome-session-3.9.90/gnome-session/gsm-dbus-client.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-dbus-client.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_DBUS_CLIENT_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-fail-whale.c gnome-session-3.14.0/gnome-session/gsm-fail-whale.c --- gnome-session-3.9.90/gnome-session/gsm-fail-whale.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-fail-whale.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include diff -Nru gnome-session-3.9.90/gnome-session/gsm-fail-whale-dialog.c gnome-session-3.14.0/gnome-session/gsm-fail-whale-dialog.c --- gnome-session-3.9.90/gnome-session/gsm-fail-whale-dialog.c 2013-03-06 04:37:54.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-fail-whale-dialog.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Colin Walters @@ -27,7 +25,10 @@ #include +#include +#ifdef GDK_WINDOWING_X11 #include +#endif #include "gsm-fail-whale-dialog.h" @@ -51,6 +52,11 @@ _window_override_user_time (GsmFailWhaleDialog *window) { guint32 ev_time = gtk_get_current_event_time (); + GdkWindow *gdk_window = gtk_widget_get_window (GTK_WIDGET (window)); + +#ifdef GDK_WINDOWING_X11 + if (!GDK_IS_X11_WINDOW (gdk_window)) + return; if (ev_time == 0) { gint ev_mask = gtk_widget_get_events (GTK_WIDGET (window)); @@ -63,10 +69,11 @@ * NOTE: Last resort for D-BUS or other non-interactive * openings. Causes roundtrip to server. Lame. */ - ev_time = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window))); + ev_time = gdk_x11_get_server_time (gdk_window); } - gdk_x11_window_set_user_time (gtk_widget_get_window (GTK_WIDGET (window)), ev_time); + gdk_x11_window_set_user_time (gdk_window, ev_time); +#endif } static void @@ -195,6 +202,19 @@ } static void +gsm_fail_whale_dialog_get_preferred_width_for_height (GtkWidget *widget, + gint for_height, + gint *minimal_width, + gint *natural_width) +{ + GtkRequisition requisition; + + gsm_fail_whale_dialog_size_request (widget, &requisition); + + *minimal_width = *natural_width = requisition.width; +} + +static void gsm_fail_whale_dialog_get_preferred_height (GtkWidget *widget, gint *minimal_height, gint *natural_height) @@ -207,6 +227,19 @@ } static void +gsm_fail_whale_dialog_get_preferred_height_for_width (GtkWidget *widget, + gint for_width, + gint *minimal_height, + gint *natural_height) +{ + GtkRequisition requisition; + + gsm_fail_whale_dialog_size_request (widget, &requisition); + + *minimal_height = *natural_height = requisition.height; +} + +static void gsm_fail_whale_dialog_class_init (GsmFailWhaleDialogClass *klass) { GtkWidgetClass *widget_class; @@ -217,6 +250,8 @@ widget_class->unrealize = gsm_fail_whale_dialog_unrealize; widget_class->get_preferred_width = gsm_fail_whale_dialog_get_preferred_width; widget_class->get_preferred_height = gsm_fail_whale_dialog_get_preferred_height; + widget_class->get_preferred_width_for_height = gsm_fail_whale_dialog_get_preferred_width_for_height; + widget_class->get_preferred_height_for_width = gsm_fail_whale_dialog_get_preferred_height_for_width; g_type_class_add_private (klass, sizeof (GsmFailWhaleDialogPrivate)); } diff -Nru gnome-session-3.9.90/gnome-session/gsm-fail-whale-dialog.h gnome-session-3.14.0/gnome-session/gsm-fail-whale-dialog.h --- gnome-session-3.9.90/gnome-session/gsm-fail-whale-dialog.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-fail-whale-dialog.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Colin Walters diff -Nru gnome-session-3.9.90/gnome-session/gsm-fail-whale.h gnome-session-3.14.0/gnome-session/gsm-fail-whale.h --- gnome-session-3.9.90/gnome-session/gsm-fail-whale.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-fail-whale.h 2014-06-25 18:06:33.000000000 +0000 @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_FAIL_WHALE_H___ diff -Nru gnome-session-3.9.90/gnome-session/gsm-icon-names.h gnome-session-3.14.0/gnome-session/gsm-icon-names.h --- gnome-session-3.9.90/gnome-session/gsm-icon-names.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-icon-names.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_ICON_NAMES_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-inhibit-dialog.c gnome-session-3.14.0/gnome-session/gsm-inhibit-dialog.c --- gnome-session-3.9.90/gnome-session/gsm-inhibit-dialog.c 2013-02-19 18:44:41.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-inhibit-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,981 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#include "config.h" - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "gsm-inhibit-dialog.h" -#include "gsm-store.h" -#include "gsm-client.h" -#include "gsm-icon-names.h" -#include "gsm-inhibitor.h" -#include "gsm-util.h" - -#ifdef HAVE_XRENDER -#include -#endif - -#define GSM_INHIBIT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogPrivate)) - -#define GTKBUILDER_FILE "gsm-inhibit-dialog.ui" - -#ifndef DEFAULT_ICON_SIZE -#define DEFAULT_ICON_SIZE 32 -#endif - -#ifndef DEFAULT_SNAPSHOT_SIZE -#define DEFAULT_SNAPSHOT_SIZE 128 -#endif - -#define DIALOG_RESPONSE_LOCK_SCREEN 1 - -struct GsmInhibitDialogPrivate -{ - GtkBuilder *xml; - int action; - gboolean is_done; - GsmStore *inhibitors; - GsmStore *clients; - GtkListStore *list_store; - gboolean have_xrender; - int xrender_event_base; - int xrender_error_base; -}; - -enum { - PROP_0, - PROP_ACTION, - PROP_INHIBITOR_STORE, - PROP_CLIENT_STORE -}; - -enum { - INHIBIT_IMAGE_COLUMN = 0, - INHIBIT_NAME_COLUMN, - INHIBIT_REASON_COLUMN, - INHIBIT_ID_COLUMN, - NUMBER_OF_COLUMNS -}; - -static void gsm_inhibit_dialog_class_init (GsmInhibitDialogClass *klass); -static void gsm_inhibit_dialog_init (GsmInhibitDialog *inhibit_dialog); - -G_DEFINE_TYPE (GsmInhibitDialog, gsm_inhibit_dialog, GTK_TYPE_DIALOG) - -static void -lock_screen (GsmInhibitDialog *dialog) -{ - GError *error; - error = NULL; - g_spawn_command_line_async ("gnome-screensaver-command --lock", &error); - if (error != NULL) { - g_warning ("Couldn't lock screen: %s", error->message); - g_error_free (error); - } -} - -static void -on_response (GsmInhibitDialog *dialog, - gint response_id) - -{ - if (dialog->priv->is_done) { - g_signal_stop_emission_by_name (dialog, "response"); - return; - } - - switch (response_id) { - case DIALOG_RESPONSE_LOCK_SCREEN: - g_signal_stop_emission_by_name (dialog, "response"); - lock_screen (dialog); - break; - default: - dialog->priv->is_done = TRUE; - break; - } -} - -static void -gsm_inhibit_dialog_set_action (GsmInhibitDialog *dialog, - int action) -{ - dialog->priv->action = action; -} - -static gboolean -find_inhibitor (GsmInhibitDialog *dialog, - const char *id, - GtkTreeIter *iter) -{ - GtkTreeModel *model; - gboolean found_item; - - g_assert (GSM_IS_INHIBIT_DIALOG (dialog)); - - found_item = FALSE; - model = GTK_TREE_MODEL (dialog->priv->list_store); - - if (!gtk_tree_model_get_iter_first (model, iter)) { - return FALSE; - } - - do { - char *item_id; - - gtk_tree_model_get (model, - iter, - INHIBIT_ID_COLUMN, &item_id, - -1); - if (item_id != NULL - && id != NULL - && strcmp (item_id, id) == 0) { - found_item = TRUE; - } - g_free (item_id); - } while (!found_item && gtk_tree_model_iter_next (model, iter)); - - return found_item; -} - -static GdkPixbuf * -scale_pixbuf (GdkPixbuf *pixbuf, - int max_width, - int max_height, - gboolean no_stretch_hint) -{ - int pw; - int ph; - float scale_factor_x = 1.0; - float scale_factor_y = 1.0; - float scale_factor = 1.0; - - pw = gdk_pixbuf_get_width (pixbuf); - ph = gdk_pixbuf_get_height (pixbuf); - - /* Determine which dimension requires the smallest scale. */ - scale_factor_x = (float) max_width / (float) pw; - scale_factor_y = (float) max_height / (float) ph; - - if (scale_factor_x > scale_factor_y) { - scale_factor = scale_factor_y; - } else { - scale_factor = scale_factor_x; - } - - /* always scale down, allow to disable scaling up */ - if (scale_factor < 1.0 || !no_stretch_hint) { - int scale_x = (int) (pw * scale_factor); - int scale_y = (int) (ph * scale_factor); - g_debug ("Scaling to %dx%d", scale_x, scale_y); - return gdk_pixbuf_scale_simple (pixbuf, - scale_x, - scale_y, - GDK_INTERP_BILINEAR); - } else { - return g_object_ref (pixbuf); - } -} - -#ifdef HAVE_XRENDER - -static GdkPixbuf * -pixbuf_get_from_pixmap (Display *display, - Pixmap xpixmap, - int width, - int height) -{ - cairo_surface_t *surface; - GdkPixbuf *retval; - Visual *visual; - - retval = NULL; - - visual = DefaultVisual (display, 0); - g_debug ("GsmInhibitDialog: getting foreign pixmap for %u", (guint)xpixmap); - surface = cairo_xlib_surface_create (display, - xpixmap, - visual, - width, - height); - if (surface != NULL) { - g_debug ("GsmInhibitDialog: getting pixbuf w=%d h=%d", width, height); - retval = gdk_pixbuf_get_from_surface (surface, - 0, 0, - width, height); - } - - if (surface) { - cairo_surface_destroy (surface); - } - - return retval; -} - -static Pixmap -get_pixmap_for_window (Display *display, - Window window, - int *widthp, - int *heightp) -{ - XWindowAttributes attr; - XRenderPictureAttributes pa; - Pixmap pixmap; - XRenderPictFormat *format; - Picture src_picture; - Picture dst_picture; - gboolean has_alpha; - int width; - int height; - - XGetWindowAttributes (display, window, &attr); - - format = XRenderFindVisualFormat (display, attr.visual); - has_alpha = (format->type == PictTypeDirect && format->direct.alphaMask); - width = attr.width; - height = attr.height; - - pa.subwindow_mode = IncludeInferiors; /* Don't clip child widgets */ - - src_picture = XRenderCreatePicture (display, window, format, CPSubwindowMode, &pa); - - pixmap = XCreatePixmap (display, - window, - width, height, - attr.depth); - - dst_picture = XRenderCreatePicture (display, pixmap, format, 0, 0); - XRenderComposite (display, - has_alpha ? PictOpOver : PictOpSrc, - src_picture, - None, - dst_picture, - 0, 0, 0, 0, - 0, 0, - width, height); - - if (widthp != NULL) { - *widthp = width; - } - if (heightp != NULL) { - *heightp = height; - } - - return pixmap; -} - -#endif /* HAVE_COMPOSITE */ - -static GdkPixbuf * -get_pixbuf_for_window (GdkDisplay *gdkdisplay, - guint xid, - int thumb_width, - int thumb_height) -{ - GdkPixbuf *pixbuf = NULL; -#ifdef HAVE_XRENDER - Display *display; - Window xwindow; - Pixmap xpixmap; - int width; - int height; - - display = GDK_DISPLAY_XDISPLAY (gdkdisplay); - xwindow = (Window) xid; - - xpixmap = get_pixmap_for_window (display, xwindow, &width, &height); - - if (xpixmap == None) { - g_debug ("GsmInhibitDialog: Unable to get window snapshot for %u", xid); - return NULL; - } else { - g_debug ("GsmInhibitDialog: Got xpixmap %u", (guint)xpixmap); - } - - pixbuf = pixbuf_get_from_pixmap (display, xpixmap, width, height); - - if (xpixmap != None) { - gdk_x11_display_error_trap_push (gdkdisplay); - XFreePixmap (display, xpixmap); - gdk_x11_display_error_trap_pop_ignored (gdkdisplay); - } - - if (pixbuf != NULL) { - GdkPixbuf *scaled; - g_debug ("GsmInhibitDialog: scaling pixbuf to w=%d h=%d", width, height); - scaled = scale_pixbuf (pixbuf, thumb_width, thumb_height, TRUE); - g_object_unref (pixbuf); - pixbuf = scaled; - } -#else - g_debug ("GsmInhibitDialog: no support for getting window snapshot"); -#endif - return pixbuf; -} - -static void -add_inhibitor (GsmInhibitDialog *dialog, - GsmInhibitor *inhibitor) -{ - GdkDisplay *gdkdisplay; - const char *name; - const char *app_id; - char *desktop_filename; - GdkPixbuf *pixbuf; - GDesktopAppInfo *app_info; - GKeyFile *keyfile; - GIcon *gicon; - char **search_dirs; - guint xid; - char *freeme; - - gdkdisplay = gtk_widget_get_display (GTK_WIDGET (dialog)); - - /* FIXME: get info from xid */ - - app_info = NULL; - name = NULL; - pixbuf = NULL; - freeme = NULL; - - app_id = gsm_inhibitor_peek_app_id (inhibitor); - - if (IS_STRING_EMPTY (app_id)) { - desktop_filename = NULL; - } else if (! g_str_has_suffix (app_id, ".desktop")) { - desktop_filename = g_strdup_printf ("%s.desktop", app_id); - } else { - desktop_filename = g_strdup (app_id); - } - - xid = gsm_inhibitor_peek_toplevel_xid (inhibitor); - g_debug ("GsmInhibitDialog: inhibitor has XID %u", xid); - if (xid > 0 && dialog->priv->have_xrender) { - pixbuf = get_pixbuf_for_window (gdkdisplay, xid, DEFAULT_SNAPSHOT_SIZE, DEFAULT_SNAPSHOT_SIZE); - if (pixbuf == NULL) { - g_debug ("GsmInhibitDialog: unable to read pixbuf from %u", xid); - } - } - - if (desktop_filename != NULL) { - search_dirs = gsm_util_get_desktop_dirs (TRUE, FALSE); - - if (g_path_is_absolute (desktop_filename)) { - char *basename; - - app_info = g_desktop_app_info_new_from_filename (desktop_filename); - if (app_info == NULL) { - g_warning ("Unable to load desktop file '%s'", - desktop_filename); - - basename = g_path_get_basename (desktop_filename); - g_free (desktop_filename); - desktop_filename = basename; - } - } - - if (app_info == NULL) { - keyfile = g_key_file_new (); - if (g_key_file_load_from_dirs (keyfile, desktop_filename, (const gchar **)search_dirs, NULL, 0, NULL)) - app_info = g_desktop_app_info_new_from_keyfile (keyfile); - g_key_file_free (keyfile); - } - - /* look for a file with a vendor prefix */ - if (app_info == NULL) { - g_warning ("Unable to find desktop file '%s'", - desktop_filename); - g_free (desktop_filename); - desktop_filename = g_strdup_printf ("gnome-%s.desktop", app_id); - keyfile = g_key_file_new (); - if (g_key_file_load_from_dirs (keyfile, desktop_filename, (const gchar **)search_dirs, NULL, 0, NULL)) - app_info = g_desktop_app_info_new_from_keyfile (keyfile); - g_key_file_free (keyfile); - } - g_strfreev (search_dirs); - - if (app_info == NULL) { - g_warning ("Unable to find desktop file '%s'", - desktop_filename); - } else { - name = g_app_info_get_name (G_APP_INFO (app_info)); - gicon = g_app_info_get_icon (G_APP_INFO (app_info)); - - if (pixbuf == NULL) { - GtkIconInfo *info; - info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), - gicon, - DEFAULT_ICON_SIZE, - 0); - pixbuf = gtk_icon_info_load_icon (info, NULL); - gtk_icon_info_free (info); - } - } - } - - /* try client info */ - if (name == NULL) { - const char *client_id; - client_id = gsm_inhibitor_peek_client_id (inhibitor); - if (! IS_STRING_EMPTY (client_id)) { - GsmClient *client; - client = GSM_CLIENT (gsm_store_lookup (dialog->priv->clients, client_id)); - if (client != NULL) { - freeme = gsm_client_get_app_name (client); - name = freeme; - } - } - } - - if (name == NULL) { - if (! IS_STRING_EMPTY (app_id)) { - name = app_id; - } else { - name = _("Unknown"); - } - } - - if (pixbuf == NULL) { - GtkIconInfo *info; - info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), - GSM_ICON_INHIBITOR_DEFAULT, - DEFAULT_ICON_SIZE, - 0); - pixbuf = gtk_icon_info_load_icon (info, NULL); - gtk_icon_info_free (info); - } - - gtk_list_store_insert_with_values (dialog->priv->list_store, - NULL, 0, - INHIBIT_IMAGE_COLUMN, pixbuf, - INHIBIT_NAME_COLUMN, name, - INHIBIT_REASON_COLUMN, gsm_inhibitor_peek_reason (inhibitor), - INHIBIT_ID_COLUMN, gsm_inhibitor_peek_id (inhibitor), - -1); - - g_free (desktop_filename); - g_free (freeme); - g_clear_object (&pixbuf); - g_clear_object (&app_info); -} - -static gboolean -model_has_one_entry (GtkTreeModel *model) -{ - guint n_rows; - - n_rows = gtk_tree_model_iter_n_children (model, NULL); - g_debug ("Model has %d rows", n_rows); - - return (n_rows > 0 && n_rows < 2); -} - -static void -update_dialog_text (GsmInhibitDialog *dialog) -{ - const char *description_text; - const char *header_text; - GtkWidget *widget; - - if (model_has_one_entry (GTK_TREE_MODEL (dialog->priv->list_store))) { - g_debug ("Found one entry in model"); - header_text = _("A program is still running:"); - description_text = _("Waiting for the program to finish. Interrupting the program may cause you to lose work."); - } else { - g_debug ("Found multiple entries (or none) in model"); - header_text = _("Some programs are still running:"); - description_text = _("Waiting for programs to finish. Interrupting these programs may cause you to lose work."); - } - - widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - "header-label")); - if (widget != NULL) { - char *markup; - markup = g_strdup_printf ("%s", header_text); - gtk_label_set_markup (GTK_LABEL (widget), markup); - g_free (markup); - } - - widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - "description-label")); - if (widget != NULL) { - gtk_label_set_text (GTK_LABEL (widget), description_text); - } -} - -static void -on_store_inhibitor_added (GsmStore *store, - const char *id, - GsmInhibitDialog *dialog) -{ - GsmInhibitor *inhibitor; - GtkTreeIter iter; - - g_debug ("GsmInhibitDialog: inhibitor added: %s", id); - - if (dialog->priv->is_done) { - return; - } - - inhibitor = (GsmInhibitor *)gsm_store_lookup (store, id); - - /* Add to model */ - if (! find_inhibitor (dialog, id, &iter)) { - add_inhibitor (dialog, inhibitor); - update_dialog_text (dialog); - } - -} - -static void -on_store_inhibitor_removed (GsmStore *store, - const char *id, - GsmInhibitDialog *dialog) -{ - GtkTreeIter iter; - - g_debug ("GsmInhibitDialog: inhibitor removed: %s", id); - - if (dialog->priv->is_done) { - return; - } - - /* Remove from model */ - if (find_inhibitor (dialog, id, &iter)) { - gtk_list_store_remove (dialog->priv->list_store, &iter); - update_dialog_text (dialog); - } - - /* if there are no inhibitors left then trigger response */ - if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (dialog->priv->list_store), &iter)) { - gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); - } -} - -static void -gsm_inhibit_dialog_set_inhibitor_store (GsmInhibitDialog *dialog, - GsmStore *store) -{ - g_return_if_fail (GSM_IS_INHIBIT_DIALOG (dialog)); - - if (store != NULL) { - g_object_ref (store); - } - - if (dialog->priv->inhibitors != NULL) { - g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors, - on_store_inhibitor_added, - dialog); - g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors, - on_store_inhibitor_removed, - dialog); - - g_object_unref (dialog->priv->inhibitors); - } - - - g_debug ("GsmInhibitDialog: setting store %p", store); - - dialog->priv->inhibitors = store; - - if (dialog->priv->inhibitors != NULL) { - g_signal_connect (dialog->priv->inhibitors, - "added", - G_CALLBACK (on_store_inhibitor_added), - dialog); - g_signal_connect (dialog->priv->inhibitors, - "removed", - G_CALLBACK (on_store_inhibitor_removed), - dialog); - } -} - -static void -gsm_inhibit_dialog_set_client_store (GsmInhibitDialog *dialog, - GsmStore *store) -{ - g_return_if_fail (GSM_IS_INHIBIT_DIALOG (dialog)); - - if (store != NULL) { - g_object_ref (store); - } - - if (dialog->priv->clients != NULL) { - g_object_unref (dialog->priv->clients); - } - - dialog->priv->clients = store; -} - -static void -gsm_inhibit_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GsmInhibitDialog *dialog = GSM_INHIBIT_DIALOG (object); - - switch (prop_id) { - case PROP_ACTION: - gsm_inhibit_dialog_set_action (dialog, g_value_get_int (value)); - break; - case PROP_INHIBITOR_STORE: - gsm_inhibit_dialog_set_inhibitor_store (dialog, g_value_get_object (value)); - break; - case PROP_CLIENT_STORE: - gsm_inhibit_dialog_set_client_store (dialog, g_value_get_object (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gsm_inhibit_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GsmInhibitDialog *dialog = GSM_INHIBIT_DIALOG (object); - - switch (prop_id) { - case PROP_ACTION: - g_value_set_int (value, dialog->priv->action); - break; - case PROP_INHIBITOR_STORE: - g_value_set_object (value, dialog->priv->inhibitors); - break; - case PROP_CLIENT_STORE: - g_value_set_object (value, dialog->priv->clients); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -name_cell_data_func (GtkTreeViewColumn *tree_column, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - GsmInhibitDialog *dialog) -{ - char *name; - char *reason; - char *markup; - - name = NULL; - reason = NULL; - gtk_tree_model_get (model, - iter, - INHIBIT_NAME_COLUMN, &name, - INHIBIT_REASON_COLUMN, &reason, - -1); - - markup = g_strdup_printf ("%s\n" - "%s", - name ? name : "(null)", - reason ? reason : "(null)"); - - g_free (name); - g_free (reason); - - g_object_set (cell, "markup", markup, NULL); - g_free (markup); -} - -static gboolean -add_to_model (const char *id, - GsmInhibitor *inhibitor, - GsmInhibitDialog *dialog) -{ - add_inhibitor (dialog, inhibitor); - return FALSE; -} - -static void -populate_model (GsmInhibitDialog *dialog) -{ - gsm_store_foreach_remove (dialog->priv->inhibitors, - (GsmStoreFunc)add_to_model, - dialog); - update_dialog_text (dialog); -} - -static void -setup_dialog (GsmInhibitDialog *dialog) -{ - const char *button_text; - GtkWidget *treeview; - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - - switch (dialog->priv->action) { - case GSM_LOGOUT_ACTION_SWITCH_USER: - button_text = _("Switch User Anyway"); - break; - case GSM_LOGOUT_ACTION_LOGOUT: - button_text = _("Log Out Anyway"); - break; - case GSM_LOGOUT_ACTION_SLEEP: - button_text = _("Suspend Anyway"); - break; - case GSM_LOGOUT_ACTION_HIBERNATE: - button_text = _("Hibernate Anyway"); - break; - case GSM_LOGOUT_ACTION_SHUTDOWN: - button_text = _("Shut Down Anyway"); - break; - case GSM_LOGOUT_ACTION_REBOOT: - button_text = _("Restart Anyway"); - break; - default: - g_assert_not_reached (); - break; - } - - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("Lock Screen"), - DIALOG_RESPONSE_LOCK_SCREEN); - gtk_dialog_add_button (GTK_DIALOG (dialog), - _("Cancel"), - GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (dialog), - button_text, - GTK_RESPONSE_ACCEPT); - g_signal_connect (dialog, - "response", - G_CALLBACK (on_response), - dialog); - - dialog->priv->list_store = gtk_list_store_new (NUMBER_OF_COLUMNS, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_STRING); - - treeview = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - "inhibitors-treeview")); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE); - gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), - GTK_TREE_MODEL (dialog->priv->list_store)); - - /* IMAGE COLUMN */ - renderer = gtk_cell_renderer_pixbuf_new (); - column = gtk_tree_view_column_new (); - gtk_tree_view_column_pack_start (column, renderer, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - - gtk_tree_view_column_set_attributes (column, - renderer, - "pixbuf", INHIBIT_IMAGE_COLUMN, - NULL); - - g_object_set (renderer, "xalign", 1.0, NULL); - - /* NAME COLUMN */ - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new (); - gtk_tree_view_column_pack_start (column, renderer, FALSE); - gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column); - gtk_tree_view_column_set_cell_data_func (column, - renderer, - (GtkTreeCellDataFunc) name_cell_data_func, - dialog, - NULL); - - gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), - INHIBIT_REASON_COLUMN); - - populate_model (dialog); -} - -static GObject * -gsm_inhibit_dialog_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) -{ - GsmInhibitDialog *dialog; -#ifdef HAVE_XRENDER - GdkDisplay *gdkdisplay; -#endif /* HAVE_XRENDER */ - - dialog = GSM_INHIBIT_DIALOG (G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->constructor (type, - n_construct_properties, - construct_properties)); - -#ifdef HAVE_XRENDER - gdkdisplay = gdk_display_get_default (); - - gdk_x11_display_error_trap_push (gdkdisplay); - if (XRenderQueryExtension (GDK_DISPLAY_XDISPLAY (gdkdisplay), &dialog->priv->xrender_event_base, &dialog->priv->xrender_error_base)) { - g_debug ("GsmInhibitDialog: Initialized XRender extension"); - dialog->priv->have_xrender = TRUE; - } else { - g_debug ("GsmInhibitDialog: Unable to initialize XRender extension"); - dialog->priv->have_xrender = FALSE; - } - gdk_display_sync (gdkdisplay); - gdk_x11_display_error_trap_pop_ignored (gdkdisplay); -#endif /* HAVE_XRENDER */ - - /* FIXME: turn this on when it is ready */ - dialog->priv->have_xrender = FALSE; - - setup_dialog (dialog); - - gtk_widget_show_all (GTK_WIDGET (dialog)); - - return G_OBJECT (dialog); -} - -static void -gsm_inhibit_dialog_dispose (GObject *object) -{ - GsmInhibitDialog *dialog; - - g_return_if_fail (object != NULL); - g_return_if_fail (GSM_IS_INHIBIT_DIALOG (object)); - - dialog = GSM_INHIBIT_DIALOG (object); - - g_debug ("GsmInhibitDialog: dispose called"); - - g_clear_object (&dialog->priv->list_store); - - if (dialog->priv->inhibitors != NULL) { - g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors, - on_store_inhibitor_added, - dialog); - g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors, - on_store_inhibitor_removed, - dialog); - - g_clear_object (&dialog->priv->inhibitors); - } - - g_clear_object (&dialog->priv->xml); - - G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->dispose (object); -} - -static void -gsm_inhibit_dialog_class_init (GsmInhibitDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->get_property = gsm_inhibit_dialog_get_property; - object_class->set_property = gsm_inhibit_dialog_set_property; - object_class->constructor = gsm_inhibit_dialog_constructor; - object_class->dispose = gsm_inhibit_dialog_dispose; - - g_object_class_install_property (object_class, - PROP_ACTION, - g_param_spec_int ("action", - "action", - "action", - -1, - G_MAXINT, - -1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_INHIBITOR_STORE, - g_param_spec_object ("inhibitor-store", - NULL, - NULL, - GSM_TYPE_STORE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_CLIENT_STORE, - g_param_spec_object ("client-store", - NULL, - NULL, - GSM_TYPE_STORE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_type_class_add_private (klass, sizeof (GsmInhibitDialogPrivate)); -} - -static void -gsm_inhibit_dialog_init (GsmInhibitDialog *dialog) -{ - GtkWidget *content_area; - GtkWidget *widget; - GError *error; - - dialog->priv = GSM_INHIBIT_DIALOG_GET_PRIVATE (dialog); - - dialog->priv->xml = gtk_builder_new (); - gtk_builder_set_translation_domain (dialog->priv->xml, GETTEXT_PACKAGE); - - error = NULL; - if (!gtk_builder_add_from_file (dialog->priv->xml, - GTKBUILDER_DIR "/" GTKBUILDER_FILE, - &error)) { - if (error) { - g_warning ("Could not load inhibitor UI file: %s", - error->message); - g_error_free (error); - } else { - g_warning ("Could not load inhibitor UI file."); - } - } - - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - widget = GTK_WIDGET (gtk_builder_get_object (dialog->priv->xml, - "main-box")); - gtk_container_add (GTK_CONTAINER (content_area), widget); - - gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GSM_ICON_LOGOUT); - gtk_window_set_title (GTK_WINDOW (dialog), ""); - g_object_set (dialog, - "resizable", FALSE, - NULL); -} - -GtkWidget * -gsm_inhibit_dialog_new (GsmStore *inhibitors, - GsmStore *clients, - int action) -{ - GObject *object; - - object = g_object_new (GSM_TYPE_INHIBIT_DIALOG, - "action", action, - "inhibitor-store", inhibitors, - "client-store", clients, - NULL); - - return GTK_WIDGET (object); -} diff -Nru gnome-session-3.9.90/gnome-session/gsm-inhibit-dialog.h gnome-session-3.14.0/gnome-session/gsm-inhibit-dialog.h --- gnome-session-3.9.90/gnome-session/gsm-inhibit-dialog.h 2013-02-19 18:44:41.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-inhibit-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2008 William Jon McCann - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GSM_INHIBIT_DIALOG_H -#define __GSM_INHIBIT_DIALOG_H - -#include -#include - -#include "gsm-store.h" - -G_BEGIN_DECLS - -#define GSM_TYPE_INHIBIT_DIALOG (gsm_inhibit_dialog_get_type ()) -#define GSM_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialog)) -#define GSM_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogClass)) -#define GSM_IS_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_INHIBIT_DIALOG)) -#define GSM_IS_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_INHIBIT_DIALOG)) -#define GSM_INHIBIT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogClass)) - -typedef struct GsmInhibitDialogPrivate GsmInhibitDialogPrivate; - -typedef enum -{ - GSM_LOGOUT_ACTION_LOGOUT, - GSM_LOGOUT_ACTION_SWITCH_USER, - GSM_LOGOUT_ACTION_SHUTDOWN, - GSM_LOGOUT_ACTION_REBOOT, - GSM_LOGOUT_ACTION_HIBERNATE, - GSM_LOGOUT_ACTION_SLEEP -} GsmLogoutAction; - -typedef struct -{ - GtkDialog parent; - GsmInhibitDialogPrivate *priv; -} GsmInhibitDialog; - -typedef struct -{ - GtkDialogClass parent_class; -} GsmInhibitDialogClass; - -GType gsm_inhibit_dialog_get_type (void); - -GtkWidget * gsm_inhibit_dialog_new (GsmStore *inhibitors, - GsmStore *clients, - int action); -GtkTreeModel * gsm_inhibit_dialog_get_model (GsmInhibitDialog *dialog); - -G_END_DECLS - -#endif /* __GSM_INHIBIT_DIALOG_H */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-inhibitor.c gnome-session-3.14.0/gnome-session/gsm-inhibitor.c --- gnome-session-3.9.90/gnome-session/gsm-inhibitor.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-inhibitor.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" diff -Nru gnome-session-3.9.90/gnome-session/gsm-inhibitor-flag.h gnome-session-3.14.0/gnome-session/gsm-inhibitor-flag.h --- gnome-session-3.9.90/gnome-session/gsm-inhibitor-flag.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-inhibitor-flag.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_INHIBITOR_FLAG_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-inhibitor.h gnome-session-3.14.0/gnome-session/gsm-inhibitor.h --- gnome-session-3.9.90/gnome-session/gsm-inhibitor.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-inhibitor.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_INHIBITOR_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-logout-dialog.c gnome-session-3.14.0/gnome-session/gsm-logout-dialog.c --- gnome-session-3.9.90/gnome-session/gsm-logout-dialog.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-logout-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,475 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2006 Vincent Untz - * Copyright (C) 2008 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Vincent Untz - */ - -#include - -#include -#include - -#define UPOWER_ENABLE_DEPRECATED 1 -#include - -#include "gsm-logout-dialog.h" -#include "gsm-system.h" -#include "gsm-icon-names.h" -#include "gdm.h" - -#define GSM_LOGOUT_DIALOG_GET_PRIVATE(o) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialogPrivate)) - -/* Shared with gsm-fail-whale-dialog.c */ -#define AUTOMATIC_ACTION_TIMEOUT 60 - -#define LOCKDOWN_SCHEMA "org.gnome.desktop.lockdown" -#define KEY_DISABLE_USER_SWITCHING "disable-user-switching" - -struct _GsmLogoutDialogPrivate -{ - GsmDialogLogoutType type; - - UpClient *up_client; - GsmSystem *system; - - int timeout; - unsigned int timeout_id; - - unsigned int default_response; -}; - -static GsmLogoutDialog *current_dialog = NULL; - -static void gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog); - -static void gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog, - gpointer data); - -static void gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, - gpointer data); - -enum { - PROP_0, - PROP_MESSAGE_TYPE -}; - -G_DEFINE_TYPE (GsmLogoutDialog, gsm_logout_dialog, GTK_TYPE_MESSAGE_DIALOG); - -static void -gsm_logout_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_MESSAGE_TYPE: - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gsm_logout_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - switch (prop_id) { - case PROP_MESSAGE_TYPE: - g_value_set_enum (value, GTK_MESSAGE_WARNING); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gsm_logout_dialog_class_init (GsmLogoutDialogClass *klass) -{ - GObjectClass *gobject_class; - - gobject_class = G_OBJECT_CLASS (klass); - - /* This is a workaround to avoid a stupid crash: libgnomeui - * listens for the "show" signal on all GtkMessageDialog and - * gets the "message-type" of the dialogs. We will crash when - * it accesses this property if we don't override it since we - * didn't define it. */ - gobject_class->set_property = gsm_logout_dialog_set_property; - gobject_class->get_property = gsm_logout_dialog_get_property; - - g_object_class_override_property (gobject_class, - PROP_MESSAGE_TYPE, - "message-type"); - - g_type_class_add_private (klass, sizeof (GsmLogoutDialogPrivate)); -} - -static void -gsm_logout_dialog_init (GsmLogoutDialog *logout_dialog) -{ - logout_dialog->priv = GSM_LOGOUT_DIALOG_GET_PRIVATE (logout_dialog); - - logout_dialog->priv->timeout_id = 0; - logout_dialog->priv->timeout = 0; - logout_dialog->priv->default_response = GTK_RESPONSE_CANCEL; - - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); - gtk_window_stick (GTK_WINDOW (logout_dialog)); - - logout_dialog->priv->up_client = up_client_new (); - - logout_dialog->priv->system = gsm_get_system (); - - g_signal_connect (logout_dialog, - "destroy", - G_CALLBACK (gsm_logout_dialog_destroy), - NULL); - - g_signal_connect (logout_dialog, - "show", - G_CALLBACK (gsm_logout_dialog_show), - NULL); -} - -static void -gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog, - gpointer data) -{ - if (logout_dialog->priv->timeout_id != 0) { - g_source_remove (logout_dialog->priv->timeout_id); - logout_dialog->priv->timeout_id = 0; - } - - g_clear_object (&logout_dialog->priv->up_client); - g_clear_object (&logout_dialog->priv->system); - - current_dialog = NULL; -} - -static gboolean -gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog) -{ - return up_client_get_can_suspend (logout_dialog->priv->up_client); -} - -static gboolean -gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog) -{ - return up_client_get_can_hibernate (logout_dialog->priv->up_client); -} - -static gboolean -gsm_logout_supports_switch_user (GsmLogoutDialog *logout_dialog) -{ - GSettings *settings; - gboolean ret; - - settings = g_settings_new (LOCKDOWN_SCHEMA); - if (g_settings_get_boolean (settings, KEY_DISABLE_USER_SWITCHING)) - ret = FALSE; - g_object_unref (settings); - - if (ret) - ret = gsm_system_can_switch_user (logout_dialog->priv->system); - - return ret; -} - -static gboolean -gsm_logout_supports_reboot (GsmLogoutDialog *logout_dialog) -{ - gboolean ret; - - ret = gsm_system_can_restart (logout_dialog->priv->system); - if (!ret) { - ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT); - } - - return ret; -} - -static gboolean -gsm_logout_supports_shutdown (GsmLogoutDialog *logout_dialog) -{ - gboolean ret; - - ret = gsm_system_can_stop (logout_dialog->priv->system); - if (!ret) { - ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN); - } - - return ret; -} - -static void -gsm_logout_dialog_show (GsmLogoutDialog *logout_dialog, gpointer user_data) -{ - gsm_logout_dialog_set_timeout (logout_dialog); -} - -static gboolean -gsm_logout_dialog_timeout (gpointer data) -{ - GsmLogoutDialog *logout_dialog; - char *seconds_warning; - char *secondary_text; - int seconds_to_show; - - logout_dialog = (GsmLogoutDialog *) data; - - if (!logout_dialog->priv->timeout) { - gtk_dialog_response (GTK_DIALOG (logout_dialog), - logout_dialog->priv->default_response); - - return FALSE; - } - - if (logout_dialog->priv->timeout <= 30) { - seconds_to_show = logout_dialog->priv->timeout; - } else { - seconds_to_show = (logout_dialog->priv->timeout/10) * 10; - - if (logout_dialog->priv->timeout % 10) - seconds_to_show += 10; - } - - switch (logout_dialog->priv->type) { - case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: - /* This string is shared with gsm-fail-whale-dialog.c */ - seconds_warning = ngettext ("You will be automatically logged " - "out in %d second.", - "You will be automatically logged " - "out in %d seconds.", - seconds_to_show); - break; - - case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: - seconds_warning = ngettext ("This system will be automatically " - "shut down in %d second.", - "This system will be automatically " - "shut down in %d seconds.", - seconds_to_show); - break; - - case GSM_DIALOG_LOGOUT_TYPE_REBOOT: - seconds_warning = ngettext ("This system will be automatically " - "restarted in %d second.", - "This system will be automatically " - "restarted in %d seconds.", - seconds_to_show); - break; - - default: - g_assert_not_reached (); - } - - if (!gsm_system_is_login_session (logout_dialog->priv->system)) { - char *name, *tmp; - - name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL); - - if (!name || name[0] == '\0' || strcmp (name, "Unknown") == 0) { - name = g_locale_to_utf8 (g_get_user_name (), -1 , NULL, NULL, NULL); - } - - if (!name) { - name = g_strdup (g_get_user_name ()); - } - - tmp = g_strdup_printf (_("You are currently logged in as \"%s\"."), name); - secondary_text = g_strconcat (tmp, "\n", seconds_warning, NULL); - g_free (tmp); - - g_free (name); - } else { - secondary_text = g_strdup (seconds_warning); - } - - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (logout_dialog), - secondary_text, - seconds_to_show, - NULL); - - logout_dialog->priv->timeout--; - - g_free (secondary_text); - - return TRUE; -} - -static void -gsm_logout_dialog_set_timeout (GsmLogoutDialog *logout_dialog) -{ - logout_dialog->priv->timeout = AUTOMATIC_ACTION_TIMEOUT; - - /* Sets the secondary text */ - gsm_logout_dialog_timeout (logout_dialog); - - if (logout_dialog->priv->timeout_id != 0) { - g_source_remove (logout_dialog->priv->timeout_id); - } - - logout_dialog->priv->timeout_id = g_timeout_add (1000, - gsm_logout_dialog_timeout, - logout_dialog); -} - -static GtkWidget * -gsm_get_dialog (GsmDialogLogoutType type, - GdkScreen *screen, - guint32 activate_time) -{ - GsmLogoutDialog *logout_dialog; - GtkWidget *dialog_image; - const char *primary_text; - const char *icon_name; - - if (current_dialog != NULL) { - gtk_widget_destroy (GTK_WIDGET (current_dialog)); - } - - logout_dialog = g_object_new (GSM_TYPE_LOGOUT_DIALOG, NULL); - - current_dialog = logout_dialog; - - gtk_window_set_title (GTK_WINDOW (logout_dialog), ""); - - logout_dialog->priv->type = type; - - icon_name = NULL; - primary_text = NULL; - - switch (type) { - case GSM_DIALOG_LOGOUT_TYPE_LOGOUT: - icon_name = GSM_ICON_LOGOUT; - primary_text = _("Log out of this system now?"); - - logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_LOGOUT; - - if (gsm_logout_supports_switch_user (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Switch User"), - GSM_LOGOUT_RESPONSE_SWITCH_USER); - } - - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Log Out"), - GSM_LOGOUT_RESPONSE_LOGOUT); - - break; - case GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN: - icon_name = GSM_ICON_SHUTDOWN; - primary_text = _("Shut down this system now?"); - - logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_SHUTDOWN; - - if (gsm_logout_supports_system_suspend (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("S_uspend"), - GSM_LOGOUT_RESPONSE_SLEEP); - } - - if (gsm_logout_supports_system_hibernate (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Hibernate"), - GSM_LOGOUT_RESPONSE_HIBERNATE); - } - - if (gsm_logout_supports_reboot (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Restart"), - GSM_LOGOUT_RESPONSE_REBOOT); - } - - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - - if (gsm_logout_supports_shutdown (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Shut Down"), - GSM_LOGOUT_RESPONSE_SHUTDOWN); - } - break; - case GSM_DIALOG_LOGOUT_TYPE_REBOOT: - icon_name = GSM_ICON_SHUTDOWN; - primary_text = _("Restart this system now?"); - - logout_dialog->priv->default_response = GSM_LOGOUT_RESPONSE_REBOOT; - - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL); - - if (gsm_logout_supports_reboot (logout_dialog)) { - gtk_dialog_add_button (GTK_DIALOG (logout_dialog), - _("_Restart"), - GSM_LOGOUT_RESPONSE_REBOOT); - } - break; - default: - g_assert_not_reached (); - } - - dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); - - gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image), - icon_name, GTK_ICON_SIZE_DIALOG); - gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); - gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER_ALWAYS); - gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); - - gtk_dialog_set_default_response (GTK_DIALOG (logout_dialog), - logout_dialog->priv->default_response); - - gtk_window_set_screen (GTK_WINDOW (logout_dialog), screen); - - return GTK_WIDGET (logout_dialog); -} - -GtkWidget * -gsm_get_shutdown_dialog (GdkScreen *screen, - guint32 activate_time, - GsmDialogLogoutType type) -{ - return gsm_get_dialog (type, - screen, - activate_time); -} - -GtkWidget * -gsm_get_logout_dialog (GdkScreen *screen, - guint32 activate_time) -{ - return gsm_get_dialog (GSM_DIALOG_LOGOUT_TYPE_LOGOUT, - screen, - activate_time); -} diff -Nru gnome-session-3.9.90/gnome-session/gsm-logout-dialog.h gnome-session-3.14.0/gnome-session/gsm-logout-dialog.h --- gnome-session-3.9.90/gnome-session/gsm-logout-dialog.h 2013-02-19 18:44:41.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-logout-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2006 Vincent Untz - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. - * - * Authors: - * Vincent Untz - */ - -#ifndef __GSM_LOGOUT_DIALOG_H__ -#define __GSM_LOGOUT_DIALOG_H__ - -#include - -G_BEGIN_DECLS - -enum -{ - GSM_LOGOUT_RESPONSE_LOGOUT, - GSM_LOGOUT_RESPONSE_SWITCH_USER, - GSM_LOGOUT_RESPONSE_SHUTDOWN, - GSM_LOGOUT_RESPONSE_REBOOT, - GSM_LOGOUT_RESPONSE_HIBERNATE, - GSM_LOGOUT_RESPONSE_SLEEP -}; - -typedef enum { - GSM_DIALOG_LOGOUT_TYPE_LOGOUT, - GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN, - GSM_DIALOG_LOGOUT_TYPE_REBOOT -} GsmDialogLogoutType; - -#define GSM_TYPE_LOGOUT_DIALOG (gsm_logout_dialog_get_type ()) -#define GSM_LOGOUT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialog)) -#define GSM_LOGOUT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialogClass)) -#define GSM_IS_LOGOUT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_LOGOUT_DIALOG)) -#define GSM_IS_LOGOUT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_LOGOUT_DIALOG)) -#define GSM_LOGOUT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_LOGOUT_DIALOG, GsmLogoutDialogClass)) - -typedef struct _GsmLogoutDialog GsmLogoutDialog; -typedef struct _GsmLogoutDialogClass GsmLogoutDialogClass; -typedef struct _GsmLogoutDialogPrivate GsmLogoutDialogPrivate; - -struct _GsmLogoutDialog -{ - GtkMessageDialog parent; - - GsmLogoutDialogPrivate *priv; -}; - -struct _GsmLogoutDialogClass -{ - GtkMessageDialogClass parent_class; -}; - -GType gsm_logout_dialog_get_type (void) G_GNUC_CONST; - -GtkWidget *gsm_get_logout_dialog (GdkScreen *screen, - guint32 activate_time); -GtkWidget *gsm_get_shutdown_dialog (GdkScreen *screen, - guint32 activate_time, - GsmDialogLogoutType type); - -G_END_DECLS - -#endif /* __GSM_LOGOUT_DIALOG_H__ */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-manager.c gnome-session-3.14.0/gnome-session/gsm-manager.c --- gnome-session-3.9.90/gnome-session/gsm-manager.c 2013-08-20 14:49:45.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-manager.c 2014-06-25 18:06:33.000000000 +0000 @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ @@ -36,11 +35,10 @@ #include #include #include +#include #include #include -#include /* for logout dialog */ - #include "gsm-manager.h" #include "gsm-manager-glue.h" @@ -60,10 +58,7 @@ #include "gsm-autostart-app.h" #include "gsm-util.h" -#include "gdm.h" -#include "gsm-logout-dialog.h" #include "gsm-icon-names.h" -#include "gsm-inhibit-dialog.h" #include "gsm-system.h" #include "gsm-session-save.h" #include "gsm-shell-extensions.h" @@ -116,10 +111,8 @@ GSM_MANAGER_LOGOUT_LOGOUT, GSM_MANAGER_LOGOUT_REBOOT, GSM_MANAGER_LOGOUT_REBOOT_INTERACT, - GSM_MANAGER_LOGOUT_REBOOT_GDM, GSM_MANAGER_LOGOUT_SHUTDOWN, GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT, - GSM_MANAGER_LOGOUT_SHUTDOWN_GDM } GsmManagerLogoutType; struct GsmManagerPrivate @@ -150,12 +143,13 @@ /* This is the action that will be done just before we exit */ GsmManagerLogoutType logout_type; - GtkWidget *inhibit_dialog; - /* List of clients which were disconnected due to disabled condition * and shouldn't be automatically restarted */ GSList *condition_clients; + GSList *pending_end_session_tasks; + GCancellable *end_session_cancellable; + GSettings *settings; GSettings *session_settings; GSettings *screensaver_settings; @@ -204,7 +198,6 @@ static void maybe_save_session (GsmManager *manager); static gboolean _log_out_is_locked_down (GsmManager *manager); -static gboolean _switch_user_is_locked_down (GsmManager *manager); static void _handle_client_end_session_response (GsmManager *manager, GsmClient *client, @@ -315,6 +308,35 @@ extensions); } +static void +on_display_server_failure (GsmManager *manager, + GsmApp *app) +{ + const gchar *app_id; + gboolean allow_logout; + GsmShellExtensions *extensions; + + app_id = gsm_app_peek_app_id (app); + + if (g_str_equal (app_id, "gnome-shell-wayland.desktop")) { + extensions = g_object_new (GSM_TYPE_SHELL_EXTENSIONS, NULL); + gsm_shell_extensions_disable_all (extensions); + + g_object_unref (extensions); + } else { + extensions = NULL; + } + +#ifdef HAVE_SYSTEMD + sd_journal_send ("MESSAGE_ID=%s", GSM_MANAGER_UNRECOVERABLE_FAILURE_MSGID, + "PRIORITY=%d", 3, + "MESSAGE=Unrecoverable failure in required component %s", app_id, + NULL); +#endif + + gsm_quit (); +} + static gboolean _debug_client (const char *id, GsmClient *client, @@ -445,6 +467,12 @@ case GSM_MANAGER_PHASE_STARTUP: name = "STARTUP"; break; + case GSM_MANAGER_PHASE_EARLY_INITIALIZATION: + name = "EARLY_INITIALIZATION"; + break; + case GSM_MANAGER_PHASE_DISPLAY_SERVER: + name = "DISPLAY_SERVER"; + break; case GSM_MANAGER_PHASE_INITIALIZATION: name = "INITIALIZATION"; break; @@ -490,26 +518,17 @@ switch (manager->priv->logout_type) { case GSM_MANAGER_LOGOUT_LOGOUT: - gtk_main_quit (); + case GSM_MANAGER_LOGOUT_NONE: + gsm_quit (); break; case GSM_MANAGER_LOGOUT_REBOOT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: - gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE); gsm_system_complete_shutdown (manager->priv->system); break; - case GSM_MANAGER_LOGOUT_REBOOT_GDM: - gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT); - gtk_main_quit (); - break; case GSM_MANAGER_LOGOUT_SHUTDOWN: case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: - gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE); gsm_system_complete_shutdown (manager->priv->system); break; - case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: - gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN); - gtk_main_quit (); - break; default: g_assert_not_reached (); break; @@ -546,6 +565,8 @@ switch (manager->priv->phase) { case GSM_MANAGER_PHASE_STARTUP: + case GSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case GSM_MANAGER_PHASE_DISPLAY_SERVER: case GSM_MANAGER_PHASE_INITIALIZATION: case GSM_MANAGER_PHASE_WINDOW_MANAGER: case GSM_MANAGER_PHASE_PANEL: @@ -599,12 +620,29 @@ } } +static gboolean +is_app_display_server (GsmManager *manager, + GsmApp *app) +{ + GsmManagerPhase phase; + + phase = gsm_app_peek_phase (app); + + return (phase == GSM_MANAGER_PHASE_DISPLAY_SERVER && + is_app_required (manager, app)); +} + static void _restart_app (GsmManager *manager, GsmApp *app) { GError *error = NULL; + if (is_app_display_server (manager, app)) { + on_display_server_failure (manager, app); + return; + } + if (!gsm_app_restart (app, &error)) { if (is_app_required (manager, app)) { on_required_app_failure (manager, app); @@ -693,6 +731,8 @@ switch (manager->priv->phase) { case GSM_MANAGER_PHASE_STARTUP: + case GSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case GSM_MANAGER_PHASE_DISPLAY_SERVER: case GSM_MANAGER_PHASE_INITIALIZATION: case GSM_MANAGER_PHASE_WINDOW_MANAGER: case GSM_MANAGER_PHASE_PANEL: @@ -834,10 +874,30 @@ } static void +complete_end_session_tasks (GsmManager *manager) +{ + GSList *l; + + for (l = manager->priv->pending_end_session_tasks; + l != NULL; + l = l->next) { + GTask *task = G_TASK (l->data); + if (!g_task_return_error_if_cancelled (task)) + g_task_return_boolean (task, TRUE); + } + + g_slist_free_full (manager->priv->pending_end_session_tasks, + (GDestroyNotify) g_object_unref); + manager->priv->pending_end_session_tasks = NULL; +} + +static void do_phase_end_session (GsmManager *manager) { ClientEndSessionData data; + complete_end_session_tasks (manager); + data.manager = manager; data.flags = 0; @@ -1052,12 +1112,7 @@ /* switch back to running phase */ g_debug ("GsmManager: Cancelling the end of session"); - /* remove the dialog before we remove the inhibitors, else the dialog - * will activate itself automatically when the last inhibitor will be - * removed */ - if (manager->priv->inhibit_dialog) - gtk_widget_destroy (GTK_WIDGET (manager->priv->inhibit_dialog)); - manager->priv->inhibit_dialog = NULL; + g_cancellable_cancel (manager->priv->end_session_cancellable); /* clear all JIT inhibitors */ gsm_store_foreach_remove (manager->priv->inhibitors, @@ -1072,219 +1127,10 @@ manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL; manager->priv->logout_type = GSM_MANAGER_LOGOUT_NONE; - gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE); start_phase (manager); } - -static void -manager_switch_user (GdkDisplay *display, - GsmManager *manager) -{ - GError *error; - char *command; - GAppLaunchContext *context; - GAppInfo *app; - - /* We have to do this here and in request_switch_user() because this - * function can be called at a later time, not just directly after - * request_switch_user(). */ - if (_switch_user_is_locked_down (manager)) { - g_warning ("Unable to switch user: User switching has been locked down"); - return; - } - - command = g_strdup_printf ("%s %s", - GDM_FLEXISERVER_COMMAND, - GDM_FLEXISERVER_ARGS); - - error = NULL; - context = (GAppLaunchContext*) gdk_display_get_app_launch_context (display); - app = g_app_info_create_from_commandline (command, GDM_FLEXISERVER_COMMAND, 0, &error); - - if (app) { - g_app_info_launch (app, NULL, context, &error); - g_object_unref (app); - } - - g_free (command); - g_object_unref (context); - - if (error) { - g_debug ("GsmManager: Unable to start GDM greeter: %s", error->message); - g_error_free (error); - } -} - -static gboolean -sleep_lock_is_enabled (GsmManager *manager) -{ - return g_settings_get_boolean (manager->priv->screensaver_settings, - KEY_SLEEP_LOCK); -} - -static void -manager_perhaps_lock (GsmManager *manager) -{ - GError *error; - gboolean ret; - - /* only lock if gnome-screensaver is set to lock */ - if (!sleep_lock_is_enabled (manager)) { - return; - } - - /* do this sync to ensure it's on the screen when we start suspending */ - error = NULL; - ret = g_spawn_command_line_sync ("gnome-screensaver-command --lock", NULL, NULL, NULL, &error); - if (!ret) { - g_warning ("Couldn't lock screen: %s", error->message); - g_error_free (error); - } -} - -static void -manager_attempt_hibernate (GsmManager *manager) -{ - if (gsm_system_can_hibernate (manager->priv->system)) { - /* lock the screen before we suspend */ - manager_perhaps_lock (manager); - gsm_system_hibernate (manager->priv->system); - } -} - -static void -manager_attempt_suspend (GsmManager *manager) -{ - if (gsm_system_can_suspend (manager->priv->system)) { - /* lock the screen before we suspend */ - manager_perhaps_lock (manager); - gsm_system_suspend (manager->priv->system); - } -} - -static void -do_inhibit_dialog_action (GdkDisplay *display, - GsmManager *manager, - int action) -{ - switch (action) { - case GSM_LOGOUT_ACTION_SWITCH_USER: - manager_switch_user (display, manager); - break; - case GSM_LOGOUT_ACTION_HIBERNATE: - manager_attempt_hibernate (manager); - break; - case GSM_LOGOUT_ACTION_SLEEP: - manager_attempt_suspend (manager); - break; - case GSM_LOGOUT_ACTION_SHUTDOWN: - case GSM_LOGOUT_ACTION_REBOOT: - case GSM_LOGOUT_ACTION_LOGOUT: - manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_FORCE; - end_phase (manager); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -inhibit_dialog_response (GsmInhibitDialog *dialog, - guint response_id, - GsmManager *manager) -{ - GdkDisplay *display; - int action; - - g_debug ("GsmManager: Inhibit dialog response: %d", response_id); - - display = gtk_widget_get_display (GTK_WIDGET (dialog)); - - /* must destroy dialog before cancelling since we'll - remove JIT inhibitors and we don't want to trigger - action. */ - g_object_get (dialog, "action", &action, NULL); - gtk_widget_destroy (GTK_WIDGET (dialog)); - manager->priv->inhibit_dialog = NULL; - - /* In case of dialog cancel, switch user, hibernate and - * suspend, we just perform the respective action and return, - * without shutting down the session. */ - switch (response_id) { - case GTK_RESPONSE_CANCEL: - case GTK_RESPONSE_NONE: - case GTK_RESPONSE_DELETE_EVENT: - if (action == GSM_LOGOUT_ACTION_LOGOUT - || action == GSM_LOGOUT_ACTION_SHUTDOWN - || action == GSM_LOGOUT_ACTION_REBOOT) { - cancel_end_session (manager); - } - break; - case GTK_RESPONSE_ACCEPT: - g_debug ("GsmManager: doing action %d", action); - do_inhibit_dialog_action (display, manager, action); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -end_session_or_show_fallback_dialog (GsmManager *manager) -{ - GsmLogoutAction action; - - if (! gsm_manager_is_logout_inhibited (manager)) { - end_phase (manager); - return; - } - - if (manager->priv->inhibit_dialog != NULL) { - g_debug ("GsmManager: inhibit dialog already up"); - gtk_window_present (GTK_WINDOW (manager->priv->inhibit_dialog)); - return; - } - - switch (manager->priv->logout_type) { - case GSM_MANAGER_LOGOUT_LOGOUT: - action = GSM_LOGOUT_ACTION_LOGOUT; - break; - case GSM_MANAGER_LOGOUT_REBOOT: - case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: - case GSM_MANAGER_LOGOUT_REBOOT_GDM: - action = GSM_LOGOUT_ACTION_REBOOT; - break; - case GSM_MANAGER_LOGOUT_SHUTDOWN: - case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: - case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: - action = GSM_LOGOUT_ACTION_SHUTDOWN; - break; - default: - g_warning ("Unexpected logout type %d when creating inhibit dialog", - manager->priv->logout_type); - action = GSM_LOGOUT_ACTION_LOGOUT; - break; - } - - /* Note: GSM_LOGOUT_ACTION_SHUTDOWN and GSM_LOGOUT_ACTION_REBOOT are - * actually handled the same way as GSM_LOGOUT_ACTION_LOGOUT in the - * inhibit dialog; the action, if the button is clicked, will be to - * simply go to the next phase. */ - manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors, - manager->priv->clients, - action); - - g_signal_connect (manager->priv->inhibit_dialog, - "response", - G_CALLBACK (inhibit_dialog_response), - manager); - gtk_widget_show (manager->priv->inhibit_dialog); -} - static void end_session_or_show_shell_dialog (GsmManager *manager) { @@ -1298,12 +1144,10 @@ break; case GSM_MANAGER_LOGOUT_REBOOT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: - case GSM_MANAGER_LOGOUT_REBOOT_GDM: type = GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART; break; case GSM_MANAGER_LOGOUT_SHUTDOWN: case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: - case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: type = GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN; break; default: @@ -1357,12 +1201,7 @@ manager->priv->query_timeout_id = 0; } - if (gsm_shell_is_running (manager->priv->shell)) { - end_session_or_show_shell_dialog (manager); - } else { - end_session_or_show_fallback_dialog (manager); - } - + end_session_or_show_shell_dialog (manager); } static guint32 @@ -1510,6 +1349,8 @@ switch (manager->priv->phase) { case GSM_MANAGER_PHASE_STARTUP: + case GSM_MANAGER_PHASE_EARLY_INITIALIZATION: + case GSM_MANAGER_PHASE_DISPLAY_SERVER: case GSM_MANAGER_PHASE_INITIALIZATION: case GSM_MANAGER_PHASE_WINDOW_MANAGER: case GSM_MANAGER_PHASE_PANEL: @@ -1525,6 +1366,10 @@ NULL); #endif gsm_xsmp_server_start_accepting_new_clients (manager->priv->xsmp_server); + if (manager->priv->pending_end_session_tasks != NULL) + complete_end_session_tasks (manager); + g_object_unref (manager->priv->end_session_cancellable); + manager->priv->end_session_cancellable = g_cancellable_new (); g_signal_emit (manager, signals[SESSION_RUNNING], 0); update_idle (manager); break; @@ -1572,7 +1417,7 @@ guint phase; g_debug ("GsmManager: App startup summary"); - for (phase = GSM_MANAGER_PHASE_INITIALIZATION; phase < GSM_MANAGER_PHASE_RUNNING; phase++) { + for (phase = GSM_MANAGER_PHASE_EARLY_INITIALIZATION; phase < GSM_MANAGER_PHASE_RUNNING; phase++) { g_debug ("GsmManager: Phase %s", phase_num_to_name (phase)); gsm_store_foreach (manager->priv->apps, (GsmStoreFunc)_debug_app_for_phase, @@ -1588,7 +1433,7 @@ g_return_if_fail (GSM_IS_MANAGER (manager)); gsm_xsmp_server_start (manager->priv->xsmp_server); - gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION); + gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_EARLY_INITIALIZATION); debug_app_summary (manager); start_phase (manager); } @@ -1917,11 +1762,7 @@ &data); if (count > 0 && manager->priv->phase == GSM_MANAGER_PHASE_QUERY_END_SESSION) { - if (gsm_shell_is_running (manager->priv->shell)) { - end_session_or_show_shell_dialog (manager); - } else { - end_session_or_show_fallback_dialog (manager); - } + end_session_or_show_shell_dialog (manager); } } @@ -1973,7 +1814,6 @@ GError *error = NULL; DBusConnection *connection; - error = NULL; manager->priv->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); if (manager->priv->connection == NULL) { if (error != NULL) { @@ -2088,7 +1928,6 @@ app = find_app_for_startup_id (manager, new_id); if (app != NULL) { gsm_client_set_app_id (GSM_CLIENT (client), gsm_app_peek_app_id (app)); - gsm_app_registered (app); goto out; } @@ -2103,6 +1942,20 @@ return handled; } +static void +on_xsmp_client_register_confirmed (GsmXSMPClient *client, + const gchar *id, + GsmManager *manager) +{ + GsmApp *app; + + app = find_app_for_startup_id (manager, id); + + if (app != NULL) { + gsm_app_registered (app); + } +} + static gboolean auto_save_is_enabled (GsmManager *manager) { @@ -2285,6 +2138,10 @@ G_CALLBACK (on_xsmp_client_register_request), manager); g_signal_connect (client, + "register-confirmed", + G_CALLBACK (on_xsmp_client_register_confirmed), + manager); + g_signal_connect (client, "logout-request", G_CALLBACK (on_xsmp_client_logout_request), manager); @@ -2546,6 +2403,7 @@ g_debug ("GsmManager: disposing manager"); + g_clear_object (&manager->priv->end_session_cancellable); g_clear_object (&manager->priv->xsmp_server); if (manager->priv->clients != NULL) { @@ -2854,6 +2712,7 @@ G_CALLBACK (on_gsm_system_active_changed), manager); manager->priv->shell = gsm_get_shell (); + manager->priv->end_session_cancellable = g_cancellable_new (); } GsmManager * @@ -2900,7 +2759,7 @@ g_set_error (error, GSM_MANAGER_ERROR, GSM_MANAGER_ERROR_NOT_IN_INITIALIZATION, - "Setenv interface is only available during the Initialization phase"); + "Setenv interface is only available during the DisplayServer and Initialization phase"); return FALSE; } @@ -2979,7 +2838,7 @@ { g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); - if (manager->priv->phase > GSM_MANAGER_PHASE_INITIALIZATION) { + if (manager->priv->phase != GSM_MANAGER_PHASE_INITIALIZATION) { g_set_error (error, GSM_MANAGER_ERROR, GSM_MANAGER_ERROR_NOT_IN_INITIALIZATION, @@ -2992,42 +2851,6 @@ return TRUE; } -static gboolean -gsm_manager_is_switch_user_inhibited (GsmManager *manager) -{ - GsmInhibitor *inhibitor; - - if (manager->priv->inhibitors == NULL) { - return FALSE; - } - - inhibitor = (GsmInhibitor *)gsm_store_find (manager->priv->inhibitors, - (GsmStoreFunc)inhibitor_has_flag, - GUINT_TO_POINTER (GSM_INHIBITOR_FLAG_SWITCH_USER)); - if (inhibitor == NULL) { - return FALSE; - } - return TRUE; -} - -static gboolean -gsm_manager_is_suspend_inhibited (GsmManager *manager) -{ - GsmInhibitor *inhibitor; - - if (manager->priv->inhibitors == NULL) { - return FALSE; - } - - inhibitor = (GsmInhibitor *)gsm_store_find (manager->priv->inhibitors, - (GsmStoreFunc)inhibitor_has_flag, - GUINT_TO_POINTER (GSM_INHIBITOR_FLAG_SUSPEND)); - if (inhibitor == NULL) { - return FALSE; - } - return TRUE; -} - static void request_reboot (GsmManager *manager) { @@ -3054,62 +2877,6 @@ } static void -request_suspend (GsmManager *manager) -{ - g_debug ("GsmManager: requesting suspend"); - - if (! gsm_manager_is_suspend_inhibited (manager)) { - manager_attempt_suspend (manager); - return; - } - - if (manager->priv->inhibit_dialog != NULL) { - g_debug ("GsmManager: inhibit dialog already up"); - gtk_window_present (GTK_WINDOW (manager->priv->inhibit_dialog)); - return; - } - - manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors, - manager->priv->clients, - GSM_LOGOUT_ACTION_SLEEP); - - g_signal_connect (manager->priv->inhibit_dialog, - "response", - G_CALLBACK (inhibit_dialog_response), - manager); - gtk_widget_show (manager->priv->inhibit_dialog); -} - -static void -request_hibernate (GsmManager *manager) -{ - g_debug ("GsmManager: requesting hibernate"); - - /* hibernate uses suspend inhibit */ - if (! gsm_manager_is_suspend_inhibited (manager)) { - manager_attempt_hibernate (manager); - return; - } - - if (manager->priv->inhibit_dialog != NULL) { - g_debug ("GsmManager: inhibit dialog already up"); - gtk_window_present (GTK_WINDOW (manager->priv->inhibit_dialog)); - return; - } - - manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors, - manager->priv->clients, - GSM_LOGOUT_ACTION_HIBERNATE); - - g_signal_connect (manager->priv->inhibit_dialog, - "response", - G_CALLBACK (inhibit_dialog_response), - manager); - gtk_widget_show (manager->priv->inhibit_dialog); -} - - -static void request_logout (GsmManager *manager, GsmManagerLogoutMode mode) { @@ -3122,146 +2889,6 @@ } static void -request_switch_user (GdkDisplay *display, - GsmManager *manager) -{ - g_debug ("GsmManager: requesting user switch"); - - /* See comment in manager_switch_user() to understand why we do this in - * both functions. */ - if (_switch_user_is_locked_down (manager)) { - g_warning ("Unable to switch user: User switching has been locked down"); - return; - } - - if (! gsm_manager_is_switch_user_inhibited (manager)) { - manager_switch_user (display, manager); - return; - } - - if (manager->priv->inhibit_dialog != NULL) { - g_debug ("GsmManager: inhibit dialog already up"); - gtk_window_present (GTK_WINDOW (manager->priv->inhibit_dialog)); - return; - } - - manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors, - manager->priv->clients, - GSM_LOGOUT_ACTION_SWITCH_USER); - - g_signal_connect (manager->priv->inhibit_dialog, - "response", - G_CALLBACK (inhibit_dialog_response), - manager); - gtk_widget_show (manager->priv->inhibit_dialog); -} - -static void -logout_dialog_response (GsmLogoutDialog *logout_dialog, - guint response_id, - GsmManager *manager) -{ - GdkDisplay *display; - - /* We should only be here if mode has already have been set from - * show_fallback_shutdown/logout_dialog - */ - g_assert (manager->priv->logout_mode == GSM_MANAGER_LOGOUT_MODE_NORMAL); - - g_debug ("GsmManager: Logout dialog response: %d", response_id); - - display = gtk_widget_get_display (GTK_WIDGET (logout_dialog)); - - gtk_widget_destroy (GTK_WIDGET (logout_dialog)); - - /* In case of dialog cancel, switch user, hibernate and - * suspend, we just perform the respective action and return, - * without shutting down the session. */ - switch (response_id) { - case GTK_RESPONSE_CANCEL: - case GTK_RESPONSE_NONE: - case GTK_RESPONSE_DELETE_EVENT: - break; - case GSM_LOGOUT_RESPONSE_SWITCH_USER: - request_switch_user (display, manager); - break; - case GSM_LOGOUT_RESPONSE_HIBERNATE: - request_hibernate (manager); - break; - case GSM_LOGOUT_RESPONSE_SLEEP: - request_suspend (manager); - break; - case GSM_LOGOUT_RESPONSE_SHUTDOWN: - request_shutdown (manager); - break; - case GSM_LOGOUT_RESPONSE_REBOOT: - request_reboot (manager); - break; - case GSM_LOGOUT_RESPONSE_LOGOUT: - /* We've already gotten confirmation from the user so - * initiate the logout in NO_CONFIRMATION mode. - * - * (it shouldn't matter whether we use NO_CONFIRMATION or stay - * with NORMAL, unless the shell happens to start after the - * user confirmed) - */ - request_logout (manager, GSM_MANAGER_LOGOUT_MODE_NO_CONFIRMATION); - break; - default: - g_assert_not_reached (); - break; - } -} - -static void -show_fallback_shutdown_dialog (GsmManager *manager, - gboolean is_reboot) -{ - GtkWidget *dialog; - - if (manager->priv->phase >= GSM_MANAGER_PHASE_QUERY_END_SESSION) { - /* Already shutting down, nothing more to do */ - return; - } - - manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL; - - dialog = gsm_get_shutdown_dialog (gdk_screen_get_default (), - gtk_get_current_event_time (), - is_reboot ? - GSM_DIALOG_LOGOUT_TYPE_REBOOT : - GSM_DIALOG_LOGOUT_TYPE_SHUTDOWN); - - g_signal_connect (dialog, - "response", - G_CALLBACK (logout_dialog_response), - manager); - gtk_widget_show (dialog); -} - -static void -show_fallback_logout_dialog (GsmManager *manager) -{ - GtkWidget *dialog; - - if (manager->priv->phase >= GSM_MANAGER_PHASE_QUERY_END_SESSION) { - /* Already shutting down, nothing more to do */ - return; - } - - manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL; - - dialog = gsm_get_logout_dialog (gdk_screen_get_default (), - gtk_get_current_event_time ()); - - g_signal_connect (dialog, - "response", - G_CALLBACK (logout_dialog_response), - manager); - gtk_widget_show (dialog); -} - -static void disconnect_shell_dialog_signals (GsmManager *manager) { if (manager->priv->shell_end_session_dialog_canceled_id != 0) { @@ -3404,30 +3031,12 @@ user_logout (GsmManager *manager, GsmManagerLogoutMode mode) { - gboolean logout_prompt; - gboolean shell_running; - if (manager->priv->phase >= GSM_MANAGER_PHASE_QUERY_END_SESSION) { /* Already shutting down, nothing more to do */ return; } - shell_running = gsm_shell_is_running (manager->priv->shell); - logout_prompt = g_settings_get_boolean (manager->priv->settings, - KEY_LOGOUT_PROMPT); - - /* If the shell isn't running, and this isn't a non-interative logout request, - * and the user has their settings configured to show a confirmation dialog for - * logout, then go ahead and show the fallback confirmation dialog now. - * - * If the shell is running, then the confirmation dialog and inhibitor dialog are - * combined, so we'll show it at a later stage in the logout process. - */ - if (!shell_running && mode == GSM_MANAGER_LOGOUT_MODE_NORMAL && logout_prompt) { - show_fallback_logout_dialog (manager); - } else { - request_logout (manager, mode); - } + request_logout (manager, mode); } /* @@ -3453,81 +3062,93 @@ KEY_DISABLE_LOG_OUT); } -static gboolean -_switch_user_is_locked_down (GsmManager *manager) +static void +complete_end_session_task (GsmManager *manager, + GAsyncResult *result, + DBusGMethodInvocation *context) { - return g_settings_get_boolean (manager->priv->lockdown_settings, - KEY_DISABLE_USER_SWITCHING); + GError *error = NULL; + + if (!g_task_propagate_boolean (G_TASK (result), &error)) + dbus_g_method_return_error (context, error); + else + dbus_g_method_return (context); } gboolean -gsm_manager_shutdown (GsmManager *manager, - GError **error) +gsm_manager_shutdown (GsmManager *manager, + DBusGMethodInvocation *context) { - gboolean shell_running; + GTask *task; + GError *error = NULL; g_debug ("GsmManager: Shutdown called"); g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { - g_set_error (error, - GSM_MANAGER_ERROR, - GSM_MANAGER_ERROR_NOT_IN_RUNNING, - "Shutdown interface is only available during the Running phase"); + error = g_error_new (GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_NOT_IN_RUNNING, + "Shutdown interface is only available during the Running phase"); + dbus_g_method_return_error (context, error); + g_error_free (error); return FALSE; } if (_log_out_is_locked_down (manager)) { - g_set_error (error, - GSM_MANAGER_ERROR, - GSM_MANAGER_ERROR_LOCKED_DOWN, - "Logout has been locked down"); + error = g_error_new (GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_LOCKED_DOWN, + "Logout has been locked down"); + dbus_g_method_return_error (context, error); + g_error_free (error); return FALSE; } - shell_running = gsm_shell_is_running (manager->priv->shell); + task = g_task_new (manager, manager->priv->end_session_cancellable, (GAsyncReadyCallback) complete_end_session_task, context); - if (!shell_running) - show_fallback_shutdown_dialog (manager, FALSE); - else - request_shutdown (manager); + manager->priv->pending_end_session_tasks = g_slist_prepend (manager->priv->pending_end_session_tasks, + task); + + request_shutdown (manager); return TRUE; } gboolean -gsm_manager_reboot (GsmManager *manager, - GError **error) +gsm_manager_reboot (GsmManager *manager, + DBusGMethodInvocation *context) { - gboolean shell_running; + GTask *task; + GError *error = NULL; g_debug ("GsmManager: Reboot called"); g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) { - g_set_error (error, - GSM_MANAGER_ERROR, - GSM_MANAGER_ERROR_NOT_IN_RUNNING, - "Reboot interface is only available during the Running phase"); + error = g_error_new (GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_NOT_IN_RUNNING, + "Reboot interface is only available during the Running phase"); + dbus_g_method_return_error (context, error); + g_error_free (error); return FALSE; } if (_log_out_is_locked_down (manager)) { - g_set_error (error, - GSM_MANAGER_ERROR, - GSM_MANAGER_ERROR_LOCKED_DOWN, - "Logout has been locked down"); + error = g_error_new (GSM_MANAGER_ERROR, + GSM_MANAGER_ERROR_LOCKED_DOWN, + "Logout has been locked down"); + dbus_g_method_return_error (context, error); + g_error_free (error); return FALSE; } - shell_running = gsm_shell_is_running (manager->priv->shell); + task = g_task_new (manager, manager->priv->end_session_cancellable, (GAsyncReadyCallback) complete_end_session_task, context); - if (!shell_running) - show_fallback_shutdown_dialog (manager, TRUE); - else - request_reboot (manager); + manager->priv->pending_end_session_tasks = g_slist_prepend (manager->priv->pending_end_session_tasks, + task); + + request_reboot (manager); return TRUE; } @@ -4211,34 +3832,30 @@ static gboolean do_query_end_session_exit (GsmManager *manager) { - int action; + gboolean reboot = FALSE; + gboolean shutdown = FALSE; switch (manager->priv->logout_type) { case GSM_MANAGER_LOGOUT_LOGOUT: - action = GSM_LOGOUT_ACTION_LOGOUT; break; case GSM_MANAGER_LOGOUT_REBOOT: case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: - case GSM_MANAGER_LOGOUT_REBOOT_GDM: - action = GSM_LOGOUT_ACTION_REBOOT; + reboot = TRUE; break; case GSM_MANAGER_LOGOUT_SHUTDOWN: case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: - case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM: - action = GSM_LOGOUT_ACTION_SHUTDOWN; + shutdown = TRUE; break; default: g_warning ("Unexpected logout type %d in do_query_end_session_exit()", manager->priv->logout_type); - action = GSM_LOGOUT_ACTION_LOGOUT; break; } - if (action == GSM_LOGOUT_ACTION_REBOOT || - action == GSM_LOGOUT_ACTION_SHUTDOWN) { + if (reboot || shutdown) { g_signal_connect (manager->priv->system, "shutdown-prepared", G_CALLBACK (on_shutdown_prepared), manager); - gsm_system_prepare_shutdown (manager->priv->system, action == GSM_LOGOUT_ACTION_REBOOT); + gsm_system_prepare_shutdown (manager->priv->system, reboot); return FALSE; /* don't leave query end session yet */ } diff -Nru gnome-session-3.9.90/gnome-session/gsm-manager.h gnome-session-3.14.0/gnome-session/gsm-manager.h --- gnome-session-3.9.90/gnome-session/gsm-manager.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-manager.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ @@ -69,6 +68,10 @@ typedef enum { /* gsm's own startup/initialization phase */ GSM_MANAGER_PHASE_STARTUP = 0, + /* gnome-initial-setup */ + GSM_MANAGER_PHASE_EARLY_INITIALIZATION, + /* wayland compositor and XWayland */ + GSM_MANAGER_PHASE_DISPLAY_SERVER, /* xrandr setup, gnome-settings-daemon, etc */ GSM_MANAGER_PHASE_INITIALIZATION, /* window/compositing managers */ @@ -157,9 +160,9 @@ GError *error); gboolean gsm_manager_shutdown (GsmManager *manager, - GError **error); + DBusGMethodInvocation *context); gboolean gsm_manager_reboot (GsmManager *manager, - GError **error); + DBusGMethodInvocation *context); gboolean gsm_manager_can_shutdown (GsmManager *manager, gboolean *shutdown_available, diff -Nru gnome-session-3.9.90/gnome-session/gsm-manager-logout-mode.h gnome-session-3.14.0/gnome-session/gsm-manager-logout-mode.h --- gnome-session-3.9.90/gnome-session/gsm-manager-logout-mode.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-manager-logout-mode.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-presence.c gnome-session-3.14.0/gnome-session/gsm-presence.c --- gnome-session-3.9.90/gnome-session/gsm-presence.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-presence.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -190,15 +188,6 @@ g_debug ("GsmPresence: adding idle watch (%i) for %d secs", presence->priv->idle_watch_id, presence->priv->idle_timeout / 1000); - - /* If the idle-delay is really short, we might end up with - * the idletime already being past the timeout */ - if (presence->priv->idle_timeout < gnome_idle_monitor_get_idletime (presence->priv->idle_monitor)) { - g_debug ("Idle time %i already expired, triggering idle", presence->priv->idle_timeout); - idle_became_idle_cb (presence->priv->idle_monitor, - presence->priv->idle_watch_id, - presence); - } } } @@ -365,6 +354,7 @@ g_return_val_if_fail (GSM_IS_PRESENCE (presence), FALSE); g_free (presence->priv->status_text); + presence->priv->status_text = NULL; /* check length */ if (status_text != NULL && strlen (status_text) > MAX_STATUS_TEXT) { @@ -377,11 +367,11 @@ if (status_text != NULL) { presence->priv->status_text = g_strdup (status_text); - } else { - presence->priv->status_text = g_strdup (""); } + g_object_notify (G_OBJECT (presence), "status-text"); - g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, presence->priv->status_text); + g_signal_emit (presence, signals[STATUS_TEXT_CHANGED], 0, + presence->priv->status_text ? presence->priv->status_text : ""); return TRUE; } @@ -457,7 +447,7 @@ g_value_set_uint (value, self->priv->status); break; case PROP_STATUS_TEXT: - g_value_set_string (value, self->priv->status_text); + g_value_set_string (value, self->priv->status_text ? self->priv->status_text : ""); break; case PROP_IDLE_ENABLED: g_value_set_boolean (value, self->priv->idle_enabled); diff -Nru gnome-session-3.9.90/gnome-session/gsm-presence-flag.h gnome-session-3.14.0/gnome-session/gsm-presence-flag.h --- gnome-session-3.9.90/gnome-session/gsm-presence-flag.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-presence-flag.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_PRESENCE_FLAG_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-presence.h gnome-session-3.14.0/gnome-session/gsm-presence.h --- gnome-session-3.9.90/gnome-session/gsm-presence.h 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-presence.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_PRESENCE_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-process-helper.c gnome-session-3.14.0/gnome-session/gsm-process-helper.c --- gnome-session-3.9.90/gnome-session/gsm-process-helper.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-process-helper.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,55 +13,59 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include -#include -#include -#include - -#include +#include #include #include "gsm-process-helper.h" typedef struct { - const char *command_line; - GPid pid; - gboolean timed_out; - int status; - GMainLoop *loop; - guint child_id; - guint timeout_id; + gboolean done; + GSubprocess *process; + gboolean caught_error; + GError **error; + GMainContext *maincontext; + GSource *timeout_source; } GsmProcessHelper; static void -on_child_exited (GPid pid, - gint status, - gpointer data) +on_child_exited (GObject *source, + GAsyncResult *result, + gpointer data) { GsmProcessHelper *helper = data; - helper->timed_out = FALSE; - helper->status = status; + helper->done = TRUE; + + if (!g_subprocess_wait_check_finish ((GSubprocess*)source, result, + helper->caught_error ? NULL : helper->error)) + helper->caught_error = TRUE; + + g_clear_pointer (&helper->timeout_source, g_source_destroy); - g_spawn_close_pid (pid); - g_main_loop_quit (helper->loop); + g_main_context_wakeup (helper->maincontext); } static gboolean on_child_timeout (gpointer data) { GsmProcessHelper *helper = data; + + g_assert (!helper->done); + + g_subprocess_force_exit (helper->process); + + g_set_error_literal (helper->error, + G_IO_CHANNEL_ERROR, + G_IO_CHANNEL_ERROR_FAILED, + "Timed out"); - kill (helper->pid, SIGTERM); - helper->timed_out = TRUE; - g_main_loop_quit (helper->loop); - + helper->timeout_source = NULL; + return FALSE; } @@ -70,69 +74,40 @@ unsigned int timeout, GError **error) { - GsmProcessHelper *helper; + gboolean ret = FALSE; + GsmProcessHelper helper = { 0, }; gchar **argv = NULL; - GPid pid; - gboolean ret; + GMainContext *subcontext = NULL; if (!g_shell_parse_argv (command_line, NULL, &argv, error)) - return FALSE; - - ret = g_spawn_async (NULL, - argv, - NULL, - G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD, - NULL, - NULL, - &pid, - error); + goto out; - g_strfreev (argv); + helper.error = error; - if (!ret) - return FALSE; + subcontext = g_main_context_new (); + g_main_context_push_thread_default (subcontext); - ret = FALSE; + helper.process = g_subprocess_newv ((const char*const*)argv, 0, error); + if (!helper.process) + goto out; - helper = g_slice_new0 (GsmProcessHelper); + g_subprocess_wait_async (helper.process, NULL, on_child_exited, &helper); - helper->command_line = command_line; - helper->pid = pid; - helper->timed_out = FALSE; - helper->status = -1; - - helper->loop = g_main_loop_new (NULL, FALSE); - helper->child_id = g_child_watch_add (helper->pid, on_child_exited, helper); - helper->timeout_id = g_timeout_add (timeout, on_child_timeout, helper); - - g_main_loop_run (helper->loop); - - if (helper->timed_out) { - g_set_error_literal (error, - G_IO_CHANNEL_ERROR, - G_IO_CHANNEL_ERROR_FAILED, - "Timed out"); - } else { - if (g_spawn_check_exit_status (helper->status, error)) - ret = TRUE; - } + helper.timeout_source = g_timeout_source_new (timeout); - if (helper->loop) { - g_main_loop_unref (helper->loop); - helper->loop = NULL; - } + g_source_set_callback (helper.timeout_source, on_child_timeout, &helper, NULL); + g_source_attach (helper.timeout_source, subcontext); - if (helper->child_id) { - g_source_remove (helper->child_id); - helper->child_id = 0; - } + while (!helper.done) + g_main_context_iteration (subcontext, TRUE); - if (helper->timeout_id) { - g_source_remove (helper->timeout_id); - helper->timeout_id = 0; + ret = helper.caught_error; + out: + g_strfreev (argv); + if (subcontext) { + g_main_context_pop_thread_default (subcontext); + g_main_context_unref (subcontext); } - - g_slice_free (GsmProcessHelper, helper); - + g_clear_object (&helper.process); return ret; } diff -Nru gnome-session-3.9.90/gnome-session/gsm-process-helper.h gnome-session-3.14.0/gnome-session/gsm-process-helper.h --- gnome-session-3.9.90/gnome-session/gsm-process-helper.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-process-helper.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_PROCESS_HELPER_H diff -Nru gnome-session-3.9.90/gnome-session/gsm-session-fill.c gnome-session-3.14.0/gnome-session/gsm-session-fill.c --- gnome-session-3.9.90/gnome-session/gsm-session-fill.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-session-fill.c 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include diff -Nru gnome-session-3.9.90/gnome-session/gsm-session-fill.h gnome-session-3.14.0/gnome-session/gsm-session-fill.h --- gnome-session-3.9.90/gnome-session/gsm-session-fill.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-session-fill.h 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_SESSION_FILL_H diff -Nru gnome-session-3.9.90/gnome-session/gsm-session-save.c gnome-session-3.14.0/gnome-session/gsm-session-save.c --- gnome-session-3.9.90/gnome-session/gsm-session-save.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-session-save.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include @@ -177,7 +175,7 @@ GHashTable *discard_hash) { gboolean result = TRUE; - GKeyFile *key_file = NULL; + GKeyFile *key_file; char *discard_exec = NULL; g_debug ("GsmSessionSave: removing '%s' from saved session", filename); diff -Nru gnome-session-3.9.90/gnome-session/gsm-session-save.h gnome-session-3.14.0/gnome-session/gsm-session-save.h --- gnome-session-3.9.90/gnome-session/gsm-session-save.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-session-save.h 2014-06-25 18:06:33.000000000 +0000 @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_SESSION_SAVE_H__ diff -Nru gnome-session-3.9.90/gnome-session/gsm-shell.c gnome-session-3.14.0/gnome-session/gsm-shell.c --- gnome-session-3.9.90/gnome-session/gsm-shell.c 2013-02-19 18:44:41.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-shell.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -534,11 +532,7 @@ on_end_session_dialog_proxy_destroyed (DBusGProxy *proxy, GsmShell *shell) { - /* FIXME - is this right? */ - if (shell->priv->end_session_dialog_proxy != NULL) { - g_object_unref (shell->priv->proxy); - shell->priv->end_session_dialog_proxy = NULL; - } + g_clear_object (&shell->priv->end_session_dialog_proxy); } static gboolean diff -Nru gnome-session-3.9.90/gnome-session/gsm-shell-extensions.c gnome-session-3.14.0/gnome-session/gsm-shell-extensions.c --- gnome-session-3.9.90/gnome-session/gsm-shell-extensions.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-shell-extensions.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Jasper St. Pierre @@ -165,22 +163,18 @@ static void gsm_shell_extensions_init (GsmShellExtensions *self) { - const gchar * const * schemas; + GSettingsSchemaSource *source; + GSettingsSchema *schema; self->priv = SHELL_EXTENSIONS_PRIVATE (self); - /* Unfortunately, gsettings does not have a way to test - * for the existance of a schema, so hack around it. */ - schemas = g_settings_list_schemas (); - while (schemas != NULL) - { - if (g_str_equal (*schemas, SHELL_SCHEMA)) - { - self->priv->settings = g_settings_new (SHELL_SCHEMA); - break; - } + source = g_settings_schema_source_get_default (); + schema = g_settings_schema_source_lookup (source, SHELL_SCHEMA, TRUE); - schemas ++; + if (schema != NULL) + { + self->priv->settings = g_settings_new_full (schema, NULL, NULL); + g_settings_schema_unref (schema); } if (self->priv->settings != NULL) diff -Nru gnome-session-3.9.90/gnome-session/gsm-shell-extensions.h gnome-session-3.14.0/gnome-session/gsm-shell-extensions.h --- gnome-session-3.9.90/gnome-session/gsm-shell-extensions.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-shell-extensions.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Jasper St. Pierre diff -Nru gnome-session-3.9.90/gnome-session/gsm-shell.h gnome-session-3.14.0/gnome-session/gsm-shell.h --- gnome-session-3.9.90/gnome-session/gsm-shell.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-shell.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Ray Strode diff -Nru gnome-session-3.9.90/gnome-session/gsm-store.c gnome-session-3.14.0/gnome-session/gsm-store.c --- gnome-session-3.9.90/gnome-session/gsm-store.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-store.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-store.h gnome-session-3.14.0/gnome-session/gsm-store.h --- gnome-session-3.9.90/gnome-session/gsm-store.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-store.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-system.c gnome-session-3.14.0/gnome-session/gsm-system.c --- gnome-session-3.9.90/gnome-session/gsm-system.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-system.c 2014-07-18 20:50:42.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -70,6 +68,58 @@ g_object_interface_install_property (iface, pspec); } +typedef GObject GsmSystemNull; +typedef GObjectClass GsmSystemNullClass; + +static void do_nothing (void) { } +static gboolean return_true (void) { return TRUE; } +static gboolean return_false (void) { return TRUE; } + +static void +gsm_system_null_init_iface (GsmSystemInterface *iface) +{ + iface->can_switch_user = (void *) return_false; + iface->can_stop = (void *) return_false; + iface->can_restart = (void *) return_false; + iface->can_suspend = (void *) return_false; + iface->can_hibernate = (void *) return_false; + iface->attempt_stop = (void *) do_nothing; + iface->attempt_restart = (void *) do_nothing; + iface->suspend = (void *) do_nothing; + iface->hibernate = (void *) do_nothing; + iface->set_session_idle = (void *) do_nothing; + iface->is_login_session = (void *) return_true; + iface->add_inhibitor = (void *) do_nothing; + iface->remove_inhibitor = (void *) do_nothing; + iface->prepare_shutdown = (void *) do_nothing; + iface->complete_shutdown = (void *) do_nothing; +} + +static void +gsm_system_null_init (GsmSystemNull *gsn) +{ +} + +static void +gsm_system_null_get_property (GObject *object, guint prop_id, + GValue *value, GParamSpec *pspec) +{ + g_value_set_boolean (value, TRUE); +} + +static void +gsm_system_null_class_init (GsmSystemNullClass *class) +{ + class->get_property = gsm_system_null_get_property; + class->set_property = (void *) do_nothing; + + g_object_class_override_property (class, 1, "active"); +} + +static GType gsm_system_null_get_type (void); +G_DEFINE_TYPE_WITH_CODE (GsmSystemNull, gsm_system_null, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GSM_TYPE_SYSTEM, gsm_system_null_init_iface)) + GQuark gsm_system_error_quark (void) { @@ -202,6 +252,7 @@ g_debug ("Using systemd for session tracking"); } } + if (system == NULL) { system = GSM_SYSTEM (gsm_consolekit_new ()); if (system != NULL) { @@ -209,5 +260,10 @@ } } + if (system == NULL) { + system = g_object_new (gsm_system_null_get_type (), NULL); + g_warning ("Using null backend for session tracking"); + } + return g_object_ref (system); } diff -Nru gnome-session-3.9.90/gnome-session/gsm-systemd.c gnome-session-3.14.0/gnome-session/gsm-systemd.c --- gnome-session-3.9.90/gnome-session/gsm-systemd.c 2013-07-30 19:01:01.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-systemd.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Author: Matthias Clasen */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-systemd.h gnome-session-3.14.0/gnome-session/gsm-systemd.h --- gnome-session-3.9.90/gnome-session/gsm-systemd.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-systemd.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Matthias Clasen diff -Nru gnome-session-3.9.90/gnome-session/gsm-system.h gnome-session-3.14.0/gnome-session/gsm-system.h --- gnome-session-3.9.90/gnome-session/gsm-system.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-system.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * * Authors: * Jon McCann diff -Nru gnome-session-3.9.90/gnome-session/gsm-util.c gnome-session-3.14.0/gnome-session/gsm-util.c --- gnome-session-3.9.90/gnome-session/gsm-util.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-util.c 2014-07-18 20:50:42.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include @@ -327,33 +325,6 @@ return result; } -const char * -gsm_util_get_current_desktop () -{ - static char *current_desktop = NULL; - - /* Support XDG_CURRENT_DESKTOP environment variable; this can be used - * to abuse gnome-session in non-GNOME desktops. */ - if (!current_desktop) { - const char *desktop; - - desktop = g_getenv ("XDG_CURRENT_DESKTOP"); - - /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it - * was not set */ - if (!desktop || desktop[0] == '\0') - current_desktop = g_strdup ("GNOME"); - else - current_desktop = g_strdup (desktop); - } - - /* Using "*" means skipping desktop-related checks */ - if (g_strcmp0 (current_desktop, "*") == 0) - return NULL; - - return current_desktop; -} - gboolean gsm_util_text_is_blank (const char *str) { @@ -537,7 +508,10 @@ { GError *bus_error; - g_setenv (variable, value, TRUE); + if (!value) + g_unsetenv (variable); + else + g_setenv (variable, value, TRUE); bus_error = NULL; diff -Nru gnome-session-3.9.90/gnome-session/gsm-util.h gnome-session-3.14.0/gnome-session/gsm-util.h --- gnome-session-3.9.90/gnome-session/gsm-util.h 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-util.h 2014-07-18 20:50:42.000000000 +0000 @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_UTIL_H__ @@ -42,18 +40,18 @@ gchar ** gsm_util_get_desktop_dirs (gboolean include_saved_session, gboolean autostart_first); -const char *gsm_util_get_current_desktop (void); - gboolean gsm_util_text_is_blank (const char *str); void gsm_util_init_error (gboolean fatal, - const char *format, ...); + const char *format, ...) G_GNUC_PRINTF (2, 3); char * gsm_util_generate_startup_id (void); void gsm_util_setenv (const char *variable, const char *value); +void gsm_quit (void); + G_END_DECLS #endif /* __GSM_UTIL_H__ */ diff -Nru gnome-session-3.9.90/gnome-session/gsm-xsmp-client.c gnome-session-3.14.0/gnome-session/gsm-xsmp-client.c --- gnome-session-3.9.90/gnome-session/gsm-xsmp-client.c 2013-08-20 14:49:49.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-xsmp-client.c 2014-06-25 18:06:33.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" @@ -66,6 +64,7 @@ enum { REGISTER_REQUEST, + REGISTER_CONFIRMED, LOGOUT_REQUEST, LAST_SIGNAL }; @@ -1002,6 +1001,16 @@ NULL, G_TYPE_BOOLEAN, 1, G_TYPE_POINTER); + signals[REGISTER_CONFIRMED] = + g_signal_new ("register-confirmed", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GsmXSMPClientClass, register_confirmed), + NULL, + NULL, + NULL, + G_TYPE_NONE, + 1, G_TYPE_POINTER); signals[LOGOUT_REQUEST] = g_signal_new ("logout-request", G_OBJECT_CLASS_TYPE (object_class), @@ -1089,6 +1098,8 @@ gsm_client_set_status (GSM_CLIENT (client), GSM_CLIENT_REGISTERED); + g_signal_emit (client, signals[REGISTER_CONFIRMED], 0, id); + g_free (id); free (previous_id); diff -Nru gnome-session-3.9.90/gnome-session/gsm-xsmp-client.h gnome-session-3.14.0/gnome-session/gsm-xsmp-client.h --- gnome-session-3.9.90/gnome-session/gsm-xsmp-client.h 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-xsmp-client.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #ifndef __GSM_XSMP_CLIENT_H__ @@ -52,6 +50,8 @@ /* signals */ gboolean (*register_request) (GsmXSMPClient *client, char **client_id); + void (*register_confirmed) (GsmXSMPClient *client, + const char *client_id); gboolean (*logout_request) (GsmXSMPClient *client, gboolean prompt); diff -Nru gnome-session-3.9.90/gnome-session/gsm-xsmp-server.c gnome-session-3.14.0/gnome-session/gsm-xsmp-server.c --- gnome-session-3.9.90/gnome-session/gsm-xsmp-server.c 2013-02-19 18:37:28.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-xsmp-server.c 2014-06-25 18:06:33.000000000 +0000 @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ @@ -40,14 +39,14 @@ #include #include -#ifdef HAVE_X11_XTRANS_XTRANS_H +#if HAVE_XTRANS /* Get the proto for _IceTransNoListen */ #define ICE_t #define TRANS_SERVER #include #undef ICE_t #undef TRANS_SERVER -#endif /* HAVE_X11_XTRANS_XTRANS_H */ +#endif /* HAVE_XTRANS */ #include "gsm-xsmp-server.h" #include "gsm-xsmp-client.h" @@ -583,7 +582,7 @@ gsm_util_init_error (TRUE, "Could not initialize libSM: %s", error); } -#ifdef HAVE_X11_XTRANS_XTRANS_H +#if HAVE_XTRANS /* By default, IceListenForConnections will open one socket for each * transport type known to X. We don't want connections from remote * hosts, so for security reasons it would be best if ICE didn't @@ -635,7 +634,7 @@ gsm_util_init_error (TRUE, "IceListenForConnections did not return a local listener!"); } -#ifdef HAVE_X11_XTRANS_XTRANS_H +#ifdef HAVE_XTRANS if (server->priv->num_local_xsmp_sockets != server->priv->num_xsmp_sockets) { /* Xtrans was apparently compiled with support for some * non-local transport besides TCP (which we disabled above); we diff -Nru gnome-session-3.9.90/gnome-session/gsm-xsmp-server.h gnome-session-3.14.0/gnome-session/gsm-xsmp-server.h --- gnome-session-3.9.90/gnome-session/gsm-xsmp-server.h 2013-02-19 18:37:28.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/gsm-xsmp-server.h 2014-06-25 18:06:33.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/main.c gnome-session-3.14.0/gnome-session/main.c --- gnome-session-3.9.90/gnome-session/main.c 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/main.c 2014-07-18 20:50:42.000000000 +0000 @@ -14,9 +14,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include @@ -30,7 +28,6 @@ #include #include -#include #include @@ -61,8 +58,25 @@ static DBusGProxy *bus_proxy = NULL; +static GMainLoop *loop; + static void shutdown_cb (gpointer data); +void +gsm_quit (void) +{ + g_main_loop_quit (loop); +} + +static void +gsm_main (void) +{ + if (loop == NULL) + loop = g_main_loop_new (NULL, TRUE); + + g_main_loop_run (loop); +} + static void on_bus_name_lost (DBusGProxy *bus_proxy, const char *name, @@ -212,7 +226,7 @@ */ gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_EXIT); - gtk_main_quit (); + gsm_quit (); } static gboolean @@ -261,6 +275,11 @@ int status; char *argv[] = { LIBEXECDIR "/gnome-session-check-accelerated", NULL }; + if (getenv ("DISPLAY") == NULL) { + /* Not connected to X11, someone else will take care of checking GL */ + return TRUE; + } + if (!g_spawn_sync (NULL, (char **) argv, NULL, 0, NULL, NULL, NULL, NULL, &status, error)) { return FALSE; @@ -273,13 +292,13 @@ main (int argc, char **argv) { GError *error = NULL; - char *display_str; GsmManager *manager; GsmStore *client_store; static char **override_autostart_dirs = NULL; static char *opt_session_name = NULL; const char *session_name; gboolean gl_failed = FALSE; + GOptionContext *options; static GOptionEntry entries[] = { { "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), N_("AUTOSTART_DIR") }, { "session", 0, 0, G_OPTION_ARG_STRING, &opt_session_name, N_("Session to use"), N_("SESSION_NAME") }, @@ -320,15 +339,16 @@ textdomain (GETTEXT_PACKAGE); error = NULL; - gtk_init_with_args (&argc, &argv, - (char *) _(" - the GNOME session manager"), - entries, GETTEXT_PACKAGE, - &error); + options = g_option_context_new (_(" - the GNOME session manager")); + g_option_context_add_main_entries (options, entries, GETTEXT_PACKAGE); + g_option_context_parse (options, &argc, &argv, &error); if (error != NULL) { g_warning ("%s", error->message); exit (1); } + g_option_context_free (options); + if (show_version) { g_print ("%s %s\n", argv [0], VERSION); exit (0); @@ -352,25 +372,25 @@ if (gl_failed) { gsm_fail_whale_dialog_we_failed (FALSE, TRUE, NULL); - gtk_main (); + gsm_main (); exit (1); } if (please_fail) { gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL); - gtk_main (); + gsm_main (); exit (1); } gdm_log_init (); gdm_log_set_debug (debug); - /* Set DISPLAY explicitly for all our children, in case --display - * was specified on the command line. + /* From 3.14 GDM sets XDG_CURRENT_DESKTOP. For compatibility with + * older versions of GDM, other display managers, and startx, + * set a fallback value if we don't find it set. */ - display_str = gdk_get_display (); - gsm_util_setenv ("DISPLAY", display_str); - g_free (display_str); + if (g_getenv ("XDG_CURRENT_DESKTOP") == NULL) + gsm_util_setenv ("XDG_CURRENT_DESKTOP", "GNOME"); /* Some third-party programs rely on GNOME_DESKTOP_SESSION_ID to * detect if GNOME is running. We keep this for compatibility reasons. @@ -392,7 +412,7 @@ if (!acquire_name ()) { gsm_fail_whale_dialog_we_failed (TRUE, TRUE, NULL); - gtk_main (); + gsm_main (); exit (1); } @@ -422,7 +442,7 @@ gsm_manager_start (manager); - gtk_main (); + gsm_main (); g_clear_object (&manager); g_clear_object (&client_store); diff -Nru gnome-session-3.9.90/gnome-session/Makefile.am gnome-session-3.14.0/gnome-session/Makefile.am --- gnome-session-3.9.90/gnome-session/Makefile.am 2013-03-04 16:49:52.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/Makefile.am 2014-07-18 20:50:42.000000000 +0000 @@ -8,7 +8,9 @@ test-process-helper AM_CPPFLAGS = \ + $(GTK3_CFLAGS) \ $(GNOME_SESSION_CFLAGS) \ + $(UPOWER_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) @@ -28,19 +30,11 @@ gsm-fail-whale.c \ gsm-system.h \ gsm-system.c \ - gsm-consolekit.c \ - gsm-consolekit.h \ gsm-systemd.h \ gsm-systemd.c \ - gsm-logout-dialog.h \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ gsm-presence.h \ gsm-presence-flag.h \ gsm-presence.c \ - gdm.h \ - gdm.c \ gdm-log.h \ gdm-log.c \ main.c \ @@ -65,6 +59,8 @@ gsm-xsmp-server.c \ gsm-xsmp-server.h +gnome_session_SOURCES += gsm-consolekit.c gsm-consolekit.h + gnome_session_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(X11_CFLAGS) \ @@ -74,7 +70,6 @@ $(GCONF_CFLAGS) \ $(SYSTEMD_CFLAGS) \ $(GIOUNIX_CFLAGS) \ - -I$(top_srcdir)/egg \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -DDATA_DIR=\""$(datadir)/gnome-session"\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ @@ -91,6 +86,7 @@ $(XTEST_LIBS) \ $(XEXT_LIBS) \ $(GNOME_SESSION_LIBS) \ + $(UPOWER_LIBS) \ $(GCONF_LIBS) \ $(SYSTEMD_LIBS) \ $(GIOUNIX_LIBS) \ @@ -120,13 +116,14 @@ $(GTK3_LIBS) test_inhibit_SOURCES = test-inhibit.c -test_inhibit_LDADD = $(GNOME_SESSION_LIBS) +test_inhibit_LDADD = $(GTK3_LIBS) $(GNOME_SESSION_LIBS) test_client_dbus_SOURCES = test-client-dbus.c test_client_dbus_LDADD = $(DBUS_GLIB_LIBS) test_process_helper_SOURCES = test-process-helper.c gsm-process-helper.c gsm-process-helper.h -test_process_helper_LDADD = $(DBUS_GLIB_LIBS) +test_process_helper_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS) +test_process_helper_LDADD = $(GIO_LIBS) gsm-manager-glue.h: org.gnome.SessionManager.xml Makefile.am $(AM_V_GEN)dbus-binding-tool --prefix=gsm_manager --mode=glib-server --output=gsm-manager-glue.h $(srcdir)/org.gnome.SessionManager.xml diff -Nru gnome-session-3.9.90/gnome-session/Makefile.in gnome-session-3.14.0/gnome-session/Makefile.in --- gnome-session-3.9.90/gnome-session/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -116,13 +116,10 @@ gnome_session-gsm-dbus-client.$(OBJEXT) \ gnome_session-gsm-fail-whale.$(OBJEXT) \ gnome_session-gsm-system.$(OBJEXT) \ - gnome_session-gsm-consolekit.$(OBJEXT) \ gnome_session-gsm-systemd.$(OBJEXT) \ - gnome_session-gsm-logout-dialog.$(OBJEXT) \ - gnome_session-gsm-inhibit-dialog.$(OBJEXT) \ gnome_session-gsm-presence.$(OBJEXT) \ - gnome_session-gdm.$(OBJEXT) gnome_session-gdm-log.$(OBJEXT) \ - gnome_session-main.$(OBJEXT) gnome_session-gsm-store.$(OBJEXT) \ + gnome_session-gdm-log.$(OBJEXT) gnome_session-main.$(OBJEXT) \ + gnome_session-gsm-store.$(OBJEXT) \ gnome_session-gsm-inhibitor.$(OBJEXT) \ gnome_session-gsm-manager.$(OBJEXT) \ gnome_session-gsm-process-helper.$(OBJEXT) \ @@ -130,14 +127,16 @@ gnome_session-gsm-session-save.$(OBJEXT) \ gnome_session-gsm-shell-extensions.$(OBJEXT) \ gnome_session-gsm-shell.$(OBJEXT) \ - gnome_session-gsm-xsmp-server.$(OBJEXT) + gnome_session-gsm-xsmp-server.$(OBJEXT) \ + gnome_session-gsm-consolekit.$(OBJEXT) gnome_session_OBJECTS = $(am_gnome_session_OBJECTS) gnome_session_DEPENDENCIES = libgsmutil.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_gnome_session_failed_OBJECTS = \ gnome_session_failed-gsm-fail-whale-dialog.$(OBJEXT) gnome_session_failed_OBJECTS = $(am_gnome_session_failed_OBJECTS) @@ -147,11 +146,17 @@ test_client_dbus_DEPENDENCIES = $(am__DEPENDENCIES_1) am_test_inhibit_OBJECTS = test-inhibit.$(OBJEXT) test_inhibit_OBJECTS = $(am_test_inhibit_OBJECTS) -test_inhibit_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_test_process_helper_OBJECTS = test-process-helper.$(OBJEXT) \ - gsm-process-helper.$(OBJEXT) +test_inhibit_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +am_test_process_helper_OBJECTS = \ + test_process_helper-test-process-helper.$(OBJEXT) \ + test_process_helper-gsm-process-helper.$(OBJEXT) test_process_helper_OBJECTS = $(am_test_process_helper_OBJECTS) test_process_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) +test_process_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(test_process_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -274,6 +279,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -341,6 +347,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -355,6 +363,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -413,62 +423,26 @@ NULL = noinst_LTLIBRARIES = libgsmutil.la AM_CPPFLAGS = \ + $(GTK3_CFLAGS) \ $(GNOME_SESSION_CFLAGS) \ + $(UPOWER_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS) -gnome_session_SOURCES = \ - gsm-app.h \ - gsm-app.c \ - gsm-autostart-app.h \ - gsm-autostart-app.c \ - gsm-client.c \ - gsm-client.h \ - gsm-xsmp-client.h \ - gsm-xsmp-client.c \ - gsm-dbus-client.h \ - gsm-dbus-client.c \ - gsm-fail-whale.h \ - gsm-fail-whale.c \ - gsm-system.h \ - gsm-system.c \ - gsm-consolekit.c \ - gsm-consolekit.h \ - gsm-systemd.h \ - gsm-systemd.c \ - gsm-logout-dialog.h \ - gsm-logout-dialog.c \ - gsm-inhibit-dialog.h \ - gsm-inhibit-dialog.c \ - gsm-presence.h \ - gsm-presence-flag.h \ - gsm-presence.c \ - gdm.h \ - gdm.c \ - gdm-log.h \ - gdm-log.c \ - main.c \ - gsm-store.h \ - gsm-store.c \ - gsm-inhibitor.h \ - gsm-inhibitor.c \ - gsm-inhibitor-flag.h \ - gsm-manager.c \ - gsm-manager.h \ - gsm-manager-logout-mode.h \ - gsm-process-helper.c \ - gsm-process-helper.h \ - gsm-session-fill.c \ - gsm-session-fill.h \ - gsm-session-save.c \ - gsm-session-save.h \ - gsm-shell-extensions.c \ - gsm-shell-extensions.h \ - gsm-shell.c \ - gsm-shell.h \ - gsm-xsmp-server.c \ - gsm-xsmp-server.h - +gnome_session_SOURCES = gsm-app.h gsm-app.c gsm-autostart-app.h \ + gsm-autostart-app.c gsm-client.c gsm-client.h \ + gsm-xsmp-client.h gsm-xsmp-client.c gsm-dbus-client.h \ + gsm-dbus-client.c gsm-fail-whale.h gsm-fail-whale.c \ + gsm-system.h gsm-system.c gsm-systemd.h gsm-systemd.c \ + gsm-presence.h gsm-presence-flag.h gsm-presence.c gdm-log.h \ + gdm-log.c main.c gsm-store.h gsm-store.c gsm-inhibitor.h \ + gsm-inhibitor.c gsm-inhibitor-flag.h gsm-manager.c \ + gsm-manager.h gsm-manager-logout-mode.h gsm-process-helper.c \ + gsm-process-helper.h gsm-session-fill.c gsm-session-fill.h \ + gsm-session-save.c gsm-session-save.h gsm-shell-extensions.c \ + gsm-shell-extensions.h gsm-shell.c gsm-shell.h \ + gsm-xsmp-server.c gsm-xsmp-server.h gsm-consolekit.c \ + gsm-consolekit.h gnome_session_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(X11_CFLAGS) \ @@ -478,7 +452,6 @@ $(GCONF_CFLAGS) \ $(SYSTEMD_CFLAGS) \ $(GIOUNIX_CFLAGS) \ - -I$(top_srcdir)/egg \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -DDATA_DIR=\""$(datadir)/gnome-session"\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ @@ -495,6 +468,7 @@ $(XTEST_LIBS) \ $(XEXT_LIBS) \ $(GNOME_SESSION_LIBS) \ + $(UPOWER_LIBS) \ $(GCONF_LIBS) \ $(SYSTEMD_LIBS) \ $(GIOUNIX_LIBS) \ @@ -524,11 +498,12 @@ $(GTK3_LIBS) test_inhibit_SOURCES = test-inhibit.c -test_inhibit_LDADD = $(GNOME_SESSION_LIBS) +test_inhibit_LDADD = $(GTK3_LIBS) $(GNOME_SESSION_LIBS) test_client_dbus_SOURCES = test-client-dbus.c test_client_dbus_LDADD = $(DBUS_GLIB_LIBS) test_process_helper_SOURCES = test-process-helper.c gsm-process-helper.c gsm-process-helper.h -test_process_helper_LDADD = $(DBUS_GLIB_LIBS) +test_process_helper_CFLAGS = $(AM_CFLAGS) $(GIO_CFLAGS) +test_process_helper_LDADD = $(GIO_LIBS) BUILT_SOURCES = \ gsm-manager-glue.h \ gsm-presence-glue.h \ @@ -723,7 +698,7 @@ test-process-helper$(EXEEXT): $(test_process_helper_OBJECTS) $(test_process_helper_DEPENDENCIES) $(EXTRA_test_process_helper_DEPENDENCIES) @rm -f test-process-helper$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_process_helper_OBJECTS) $(test_process_helper_LDADD) $(LIBS) + $(AM_V_CCLD)$(test_process_helper_LINK) $(test_process_helper_OBJECTS) $(test_process_helper_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -732,16 +707,13 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gdm-log.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gdm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-app.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-autostart-app.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-consolekit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-dbus-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-fail-whale.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-inhibit-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-inhibitor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-logout-dialog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-manager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-presence.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-process-helper.Po@am__quote@ @@ -756,25 +728,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-gsm-xsmp-server.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gsm-process-helper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsmutil_la-gsm-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-client-dbus.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-inhibit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-process-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process_helper-gsm-process-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_process_helper-test-process-helper.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -888,20 +860,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-system.obj `if test -f 'gsm-system.c'; then $(CYGPATH_W) 'gsm-system.c'; else $(CYGPATH_W) '$(srcdir)/gsm-system.c'; fi` -gnome_session-gsm-consolekit.o: gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c - -gnome_session-gsm-consolekit.obj: gsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` - gnome_session-gsm-systemd.o: gsm-systemd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-systemd.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-systemd.Tpo -c -o gnome_session-gsm-systemd.o `test -f 'gsm-systemd.c' || echo '$(srcdir)/'`gsm-systemd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-systemd.Tpo $(DEPDIR)/gnome_session-gsm-systemd.Po @@ -916,34 +874,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-systemd.obj `if test -f 'gsm-systemd.c'; then $(CYGPATH_W) 'gsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/gsm-systemd.c'; fi` -gnome_session-gsm-logout-dialog.o: gsm-logout-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-logout-dialog.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-logout-dialog.Tpo -c -o gnome_session-gsm-logout-dialog.o `test -f 'gsm-logout-dialog.c' || echo '$(srcdir)/'`gsm-logout-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-logout-dialog.Tpo $(DEPDIR)/gnome_session-gsm-logout-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-logout-dialog.c' object='gnome_session-gsm-logout-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-logout-dialog.o `test -f 'gsm-logout-dialog.c' || echo '$(srcdir)/'`gsm-logout-dialog.c - -gnome_session-gsm-logout-dialog.obj: gsm-logout-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-logout-dialog.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-logout-dialog.Tpo -c -o gnome_session-gsm-logout-dialog.obj `if test -f 'gsm-logout-dialog.c'; then $(CYGPATH_W) 'gsm-logout-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gsm-logout-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-logout-dialog.Tpo $(DEPDIR)/gnome_session-gsm-logout-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-logout-dialog.c' object='gnome_session-gsm-logout-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-logout-dialog.obj `if test -f 'gsm-logout-dialog.c'; then $(CYGPATH_W) 'gsm-logout-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gsm-logout-dialog.c'; fi` - -gnome_session-gsm-inhibit-dialog.o: gsm-inhibit-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-inhibit-dialog.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Tpo -c -o gnome_session-gsm-inhibit-dialog.o `test -f 'gsm-inhibit-dialog.c' || echo '$(srcdir)/'`gsm-inhibit-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Tpo $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibit-dialog.c' object='gnome_session-gsm-inhibit-dialog.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-inhibit-dialog.o `test -f 'gsm-inhibit-dialog.c' || echo '$(srcdir)/'`gsm-inhibit-dialog.c - -gnome_session-gsm-inhibit-dialog.obj: gsm-inhibit-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-inhibit-dialog.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Tpo -c -o gnome_session-gsm-inhibit-dialog.obj `if test -f 'gsm-inhibit-dialog.c'; then $(CYGPATH_W) 'gsm-inhibit-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibit-dialog.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Tpo $(DEPDIR)/gnome_session-gsm-inhibit-dialog.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-inhibit-dialog.c' object='gnome_session-gsm-inhibit-dialog.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-inhibit-dialog.obj `if test -f 'gsm-inhibit-dialog.c'; then $(CYGPATH_W) 'gsm-inhibit-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gsm-inhibit-dialog.c'; fi` - gnome_session-gsm-presence.o: gsm-presence.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-presence.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-presence.Tpo -c -o gnome_session-gsm-presence.o `test -f 'gsm-presence.c' || echo '$(srcdir)/'`gsm-presence.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-presence.Tpo $(DEPDIR)/gnome_session-gsm-presence.Po @@ -958,20 +888,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-presence.obj `if test -f 'gsm-presence.c'; then $(CYGPATH_W) 'gsm-presence.c'; else $(CYGPATH_W) '$(srcdir)/gsm-presence.c'; fi` -gnome_session-gdm.o: gdm.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gdm.o -MD -MP -MF $(DEPDIR)/gnome_session-gdm.Tpo -c -o gnome_session-gdm.o `test -f 'gdm.c' || echo '$(srcdir)/'`gdm.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gdm.Tpo $(DEPDIR)/gnome_session-gdm.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm.c' object='gnome_session-gdm.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gdm.o `test -f 'gdm.c' || echo '$(srcdir)/'`gdm.c - -gnome_session-gdm.obj: gdm.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gdm.obj -MD -MP -MF $(DEPDIR)/gnome_session-gdm.Tpo -c -o gnome_session-gdm.obj `if test -f 'gdm.c'; then $(CYGPATH_W) 'gdm.c'; else $(CYGPATH_W) '$(srcdir)/gdm.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gdm.Tpo $(DEPDIR)/gnome_session-gdm.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gdm.c' object='gnome_session-gdm.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gdm.obj `if test -f 'gdm.c'; then $(CYGPATH_W) 'gdm.c'; else $(CYGPATH_W) '$(srcdir)/gdm.c'; fi` - gnome_session-gdm-log.o: gdm-log.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gdm-log.o -MD -MP -MF $(DEPDIR)/gnome_session-gdm-log.Tpo -c -o gnome_session-gdm-log.o `test -f 'gdm-log.c' || echo '$(srcdir)/'`gdm-log.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gdm-log.Tpo $(DEPDIR)/gnome_session-gdm-log.Po @@ -1126,6 +1042,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-xsmp-server.obj `if test -f 'gsm-xsmp-server.c'; then $(CYGPATH_W) 'gsm-xsmp-server.c'; else $(CYGPATH_W) '$(srcdir)/gsm-xsmp-server.c'; fi` +gnome_session-gsm-consolekit.o: gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.o -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.o `test -f 'gsm-consolekit.c' || echo '$(srcdir)/'`gsm-consolekit.c + +gnome_session-gsm-consolekit.obj: gsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session-gsm-consolekit.obj -MD -MP -MF $(DEPDIR)/gnome_session-gsm-consolekit.Tpo -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session-gsm-consolekit.Tpo $(DEPDIR)/gnome_session-gsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-consolekit.c' object='gnome_session-gsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session-gsm-consolekit.obj `if test -f 'gsm-consolekit.c'; then $(CYGPATH_W) 'gsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/gsm-consolekit.c'; fi` + gnome_session_failed-gsm-fail-whale-dialog.o: gsm-fail-whale-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_failed_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gnome_session_failed-gsm-fail-whale-dialog.o -MD -MP -MF $(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Tpo -c -o gnome_session_failed-gsm-fail-whale-dialog.o `test -f 'gsm-fail-whale-dialog.c' || echo '$(srcdir)/'`gsm-fail-whale-dialog.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Tpo $(DEPDIR)/gnome_session_failed-gsm-fail-whale-dialog.Po @@ -1140,6 +1070,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gnome_session_failed_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gnome_session_failed-gsm-fail-whale-dialog.obj `if test -f 'gsm-fail-whale-dialog.c'; then $(CYGPATH_W) 'gsm-fail-whale-dialog.c'; else $(CYGPATH_W) '$(srcdir)/gsm-fail-whale-dialog.c'; fi` +test_process_helper-test-process-helper.o: test-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -MT test_process_helper-test-process-helper.o -MD -MP -MF $(DEPDIR)/test_process_helper-test-process-helper.Tpo -c -o test_process_helper-test-process-helper.o `test -f 'test-process-helper.c' || echo '$(srcdir)/'`test-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_process_helper-test-process-helper.Tpo $(DEPDIR)/test_process_helper-test-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-process-helper.c' object='test_process_helper-test-process-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -c -o test_process_helper-test-process-helper.o `test -f 'test-process-helper.c' || echo '$(srcdir)/'`test-process-helper.c + +test_process_helper-test-process-helper.obj: test-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -MT test_process_helper-test-process-helper.obj -MD -MP -MF $(DEPDIR)/test_process_helper-test-process-helper.Tpo -c -o test_process_helper-test-process-helper.obj `if test -f 'test-process-helper.c'; then $(CYGPATH_W) 'test-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/test-process-helper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_process_helper-test-process-helper.Tpo $(DEPDIR)/test_process_helper-test-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-process-helper.c' object='test_process_helper-test-process-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -c -o test_process_helper-test-process-helper.obj `if test -f 'test-process-helper.c'; then $(CYGPATH_W) 'test-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/test-process-helper.c'; fi` + +test_process_helper-gsm-process-helper.o: gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -MT test_process_helper-gsm-process-helper.o -MD -MP -MF $(DEPDIR)/test_process_helper-gsm-process-helper.Tpo -c -o test_process_helper-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_process_helper-gsm-process-helper.Tpo $(DEPDIR)/test_process_helper-gsm-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='test_process_helper-gsm-process-helper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -c -o test_process_helper-gsm-process-helper.o `test -f 'gsm-process-helper.c' || echo '$(srcdir)/'`gsm-process-helper.c + +test_process_helper-gsm-process-helper.obj: gsm-process-helper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -MT test_process_helper-gsm-process-helper.obj -MD -MP -MF $(DEPDIR)/test_process_helper-gsm-process-helper.Tpo -c -o test_process_helper-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_process_helper-gsm-process-helper.Tpo $(DEPDIR)/test_process_helper-gsm-process-helper.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gsm-process-helper.c' object='test_process_helper-gsm-process-helper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_process_helper_CFLAGS) $(CFLAGS) -c -o test_process_helper-gsm-process-helper.obj `if test -f 'gsm-process-helper.c'; then $(CYGPATH_W) 'gsm-process-helper.c'; else $(CYGPATH_W) '$(srcdir)/gsm-process-helper.c'; fi` + mostlyclean-libtool: -rm -f *.lo diff -Nru gnome-session-3.9.90/gnome-session/org.gnome.SessionManager.xml gnome-session-3.14.0/gnome-session/org.gnome.SessionManager.xml --- gnome-session-3.9.90/gnome-session/org.gnome.SessionManager.xml 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/org.gnome.SessionManager.xml 2014-06-25 18:06:33.000000000 +0000 @@ -271,6 +271,7 @@ + Request a shutdown dialog. @@ -279,6 +280,7 @@ + Request a reboot dialog. diff -Nru gnome-session-3.9.90/gnome-session/README gnome-session-3.14.0/gnome-session/README --- gnome-session-3.9.90/gnome-session/README 2012-07-12 20:00:42.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/README 2014-06-25 18:06:33.000000000 +0000 @@ -9,16 +9,20 @@ (GsmAppAutostart represents an autostarted app, and GsmAppResumed represents an app resumed from the previous saved session.) -Startup is divided into 6 phases (GsmSessionPhase): +Startup is divided into 7 phases (GsmManagerPhase): - * GSM_SESSION_PHASE_STARTUP covers gnome-session's internal + * GSM_MANAGER_PHASE_STARTUP covers gnome-session's internal startup, which also includes starting gconfd and dbus-daemon (if it's not already running). Gnome-session starts up those explicitly because it needs them for its own purposes. - * GSM_SESSION_PHASE_INITIALIZATION is the first phase of "normal" - startup (ie, startup controlled by .desktop files rather than - hardcoding). It covers low-level stuff like + * GSM_MANAGER_PHASE_EARLY_INITIALIZATION is the first phase of + "normal" startup (ie, startup controlled by .desktop files + rather than hardcoding). It covers the possible installation of + files in $HOME by gnome-initial-setup and must be done before + other components such as gnome-keyring use those files. + + * GSM_MANAGER_PHASE_INITIALIZATION covers low-level stuff like gnome-settings-daemon and at-spi-registryd, that need to be running very early (before any windows are displayed). @@ -27,18 +31,18 @@ in gnome-session's environment. This can be used for things like $GTK_MODULES, $GNOME_KEYRING_SOCKET, etc - * GSM_SESSION_PHASE_WINDOW_MANAGER includes window managers and + * GSM_MANAGER_PHASE_WINDOW_MANAGER includes window managers and compositing managers, and anything else that has to be running before any windows are mapped - * GSM_SESSION_PHASE_PANEL includes anything that permanently takes + * GSM_MANAGER_PHASE_PANEL includes anything that permanently takes up screen real estate (via EWMH struts). This is the first phase where things actually appear on the screen. - * GSM_SESSION_PHASE_DESKTOP includes anything that draws directly + * GSM_MANAGER_PHASE_DESKTOP includes anything that draws directly on the desktop (eg, nautilus). - * GSM_SESSION_PHASE_APPLICATION is everything else (normal apps, + * GSM_MANAGER_PHASE_APPLICATION is everything else (normal apps, tray icons, etc) For each startup phase, GsmSession launches the appropriate GsmApps. @@ -54,7 +58,7 @@ Running/Shutdown ---------------- -GSM_SESSION_PHASE_RUNNING is pretty similar to the old gnome-session; +GSM_MANAGER_PHASE_RUNNING is pretty similar to the old gnome-session; mostly it just tracks XSMP clients, and watches for SmRestartImmediately clients exiting (NOTE: THIS DOESN'T HAPPEN YET). diff -Nru gnome-session-3.9.90/gnome-session/test-client-dbus.c gnome-session-3.14.0/gnome-session/test-client-dbus.c --- gnome-session-3.9.90/gnome-session/test-client-dbus.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/test-client-dbus.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/test-inhibit.c gnome-session-3.14.0/gnome-session/test-inhibit.c --- gnome-session-3.9.90/gnome-session/test-inhibit.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/test-inhibit.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/gnome-session/test-process-helper.c gnome-session-3.14.0/gnome-session/test-process-helper.c --- gnome-session-3.9.90/gnome-session/test-process-helper.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/gnome-session/test-process-helper.c 2014-06-25 18:06:33.000000000 +0000 @@ -13,9 +13,7 @@ * General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . * */ diff -Nru gnome-session-3.9.90/HACKING gnome-session-3.14.0/HACKING --- gnome-session-3.9.90/HACKING 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/HACKING 2014-07-18 20:50:42.000000000 +0000 @@ -7,7 +7,7 @@ For information on how to access GNOME git please read: - http://live.gnome.org/Git + https://wiki.gnome.org/Git + Please send patches as bug reports in GNOME Bugzilla: @@ -16,7 +16,7 @@ Your patch should be in unified diff form (the -u option to GNU diff). See also: - http://live.gnome.org/GnomeLove/SubmittingPatches + https://wiki.gnome.org/GnomeLove/SubmittingPatches + Please try and send a patch against a recent version of this package. Patches against git master are most preferable. diff -Nru gnome-session-3.9.90/INSTALL gnome-session-3.14.0/INSTALL --- gnome-session-3.9.90/INSTALL 2013-03-19 17:22:45.000000000 +0000 +++ gnome-session-3.14.0/INSTALL 2014-09-22 14:19:25.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff -Nru gnome-session-3.9.90/m4/libtool.m4 gnome-session-3.14.0/m4/libtool.m4 --- gnome-session-3.9.90/m4/libtool.m4 2013-08-20 14:50:01.000000000 +0000 +++ gnome-session-3.14.0/m4/libtool.m4 2014-09-22 14:19:18.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru gnome-session-3.9.90/Makefile.am gnome-session-3.14.0/Makefile.am --- gnome-session-3.9.90/Makefile.am 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/Makefile.am 2014-06-25 18:06:33.000000000 +0000 @@ -1,7 +1,5 @@ SUBDIRS = \ - egg \ gnome-session \ - capplet \ tools \ data \ doc \ diff -Nru gnome-session-3.9.90/Makefile.in gnome-session-3.14.0/Makefile.in --- gnome-session-3.9.90/Makefile.in 2013-08-20 14:50:05.000000000 +0000 +++ gnome-session-3.14.0/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -252,6 +252,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -319,6 +320,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -333,6 +336,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -389,9 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = \ - egg \ gnome-session \ - capplet \ tools \ data \ doc \ @@ -459,8 +462,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -671,10 +674,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -716,9 +725,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -Nru gnome-session-3.9.90/missing gnome-session-3.14.0/missing --- gnome-session-3.9.90/missing 2013-03-19 17:22:45.000000000 +0000 +++ gnome-session-3.14.0/missing 2014-09-22 14:19:24.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru gnome-session-3.9.90/NEWS gnome-session-3.14.0/NEWS --- gnome-session-3.9.90/NEWS 2013-08-20 14:45:06.000000000 +0000 +++ gnome-session-3.14.0/NEWS 2014-09-22 14:18:59.000000000 +0000 @@ -1,4 +1,102 @@ ============== +Version 3.14.0 +============== + + * DOAP updates + * Translation updates + +============== +Version 3.13.3 +============== + + * Fixes for XDG_CURRENT_DESKTOP semantic shift + * Translation updates + +============== +Version 3.12.1 +============== + + * Add DesktopNames to session files + * doap file updates + * ConsoleKit fixes + * Translation updates + +============== +Version 3.12.0 +============== + * fix for wayland support + +=============== +Version 3.11.92 +=============== + * Update FSF address in copyright headers + * Small wayland update + * Improve xtrans autogoo + * Translation updates + +============== +Version 3.11.4 +============== + + * Fix crash on startup for non-systemd systems + * Translation updates + +============== +Version 3.11.3 +============== + * Warning fixes + * Use modern methods for finding gsettings schemas + * fail whale size request fixes + * Translation updates + +============== +Version 3.11.2 +============== + * blacklist nv25 + * use new GSubprocess api + * Translation updates + +============== +Version 3.11.0 +============== + * Fix a possible crash in the presence interface + * gsm-manager: Don't abort when all clients exit (#710480) + * gsm-util: Use g_unsetenv() rather than g_setenv(variable, NULL) (#710485) + * Only support UPower 0.9 + * Drop EggSMClient + * Remove gnome-session-properties (#708923) + * Translation updates + +============== +Version 3.10.1 +============== + * Fix a crash on session end (#709221) + * Translation updates + +============== +Version 3.10.0 +============== + * Put gnome-shell-wayland.desktop in /usr/share/wayland-sessions instead of /usr/share/xsessions + * Translation updates + +============== +Version 3.9.92 +============== + * Add basic support for running Wayland sessions + * Translation updates + +============== +Version 3.9.91 +============== + * Add new phase for gnome-initial-setup and new phase for mutter-wayland + * Fix deadlock now that idle handling is in mutter + * Drop dead fallback code + * Add bits needed for wayland integration + * rename session-properties to gnome-session-properties + * make shutdown and reboot failable operations + * misc fixes + +============== Version 3.9.90 ============== * code style fix ups diff -Nru gnome-session-3.9.90/po/af.po gnome-session-3.14.0/po/af.po --- gnome-session-3.9.90/po/af.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/af.po 2014-06-25 18:06:33.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2004 Zuza Software Foundation # This file is distributed under the same license as the gnome-session package. # Zuza Software Foundation , 2004 -# F Wolff , 2011. +# F Wolff , 2011, 2013. msgid "" msgstr "" "Project-Id-Version: gnome-session 2.6-branch\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-29 21:37+0000\n" -"PO-Revision-Date: 2011-04-02 10:23+0200\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-24 12:21+0200\n" "Last-Translator: F Wolff \n" "Language-Team: translate-discuss-af@lists.sourceforge.net\n" "Language: af\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.0-beta4\n" +"X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" #: ../capplet/gsm-app-dialog.c:120 @@ -32,39 +32,39 @@ msgid "Edit Startup Program" msgstr "Redigeer aanvangsprogram" -#: ../capplet/gsm-app-dialog.c:485 +#: ../capplet/gsm-app-dialog.c:484 msgid "The startup command cannot be empty" msgstr "Die aanvangsbevel kan nie leeg wees nie" -#: ../capplet/gsm-app-dialog.c:491 +#: ../capplet/gsm-app-dialog.c:490 msgid "The startup command is not valid" msgstr "Die aanvangsbevel is nie geldig nie" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Geaktiveer" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikoon" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Voorkeure vir aanvangstoepassings" -#: ../capplet/gsp-app.c:269 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Geen naam" -#: ../capplet/gsp-app.c:275 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Geen beskrywing" -#: ../capplet/main.c:35 ../gnome-session/main.c:280 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Weergawe van hierdie program" @@ -72,11 +72,15 @@ msgid "Could not display help document" msgstr "Kon nie hulpdokument vertoon nie" -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "GNOME (terugval)" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Doelgemaak" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Hierdie inskrywing laat mens 'n gestoorde sessie kies" -#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1 +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -84,252 +88,192 @@ msgid "This session logs you into GNOME" msgstr "Hierdie sessie laat mens aanmeld by GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:1 -msgid "Some programs are still running:" -msgstr "Sommige programme loop steeds:" +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +#, fuzzy +#| msgid "GNOME" +msgid "GNOME dummy" +msgstr "GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:2 ../gnome-session/gsm-inhibit-dialog.c:644 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you " -"to lose work." -msgstr "" -"Wag nog vir die program om te voltooi. Onderbreking van die program kan " -"veroorsaak dat werk verloor word." +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aanvangstoepassings" -#: ../data/session-properties.desktop.in.in.h:1 +#: ../data/gnome-session-properties.desktop.in.in.h:2 msgid "Choose what applications to start when you log in" msgstr "Kies watter toepassings moet begin by aanmelding" -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Startup Applications" -msgstr "Aanvangstoepassings" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME op Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Hierdie sessie laat mens aanmeld by GNOME m.b.v. Wayland" + +#: ../data/session-selector.ui.h:1 +#| msgid "Current Session" +msgid "Custom Session" +msgstr "Doelgemaakte sessie" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +msgid "Please select a custom session to run" +msgstr "Kies asb. 'n pasgemaakte sessie om uit te voer" + +#: ../data/session-selector.ui.h:3 +#| msgid "_Sessions:" +msgid "_New Session" +msgstr "_Nuwe sessie" + +#: ../data/session-selector.ui.h:4 +#| msgid "Save sessions" +msgid "_Remove Session" +msgstr "Ve_rwyder sessie" + +#: ../data/session-selector.ui.h:5 +#| msgid "Current Session" +msgid "Rena_me Session" +msgstr "Hernoe_m sessie" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Gaan voort" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Bykomende aanvangs_programme:" #: ../data/session-properties.ui.h:2 -msgid "Browse…" -msgstr "Blaai…" +msgid "Startup Programs" +msgstr "Aanvangsprogramme" #: ../data/session-properties.ui.h:3 -msgid "Co_mmand:" -msgstr "Op_drag:" +msgid "_Automatically remember running applications when logging out" +msgstr "_Onthou outomaties toepassings wat nog loop by afgemelding" #: ../data/session-properties.ui.h:4 -msgid "Comm_ent:" -msgstr "Opm_erking:" +#| msgid "_Remember Currently Running Application" +msgid "_Remember Currently Running Applications" +msgstr "_Onthou die toepassings wat tans loop" #: ../data/session-properties.ui.h:5 msgid "Options" msgstr "Opsies" #: ../data/session-properties.ui.h:6 -msgid "Startup Programs" -msgstr "Aanvangsprogramme" +msgid "Browse…" +msgstr "Blaai…" #: ../data/session-properties.ui.h:7 -msgid "_Automatically remember running applications when logging out" -msgstr "_Onthou outomaties toepassings wat nog loop by afgemelding" +msgid "Comm_ent:" +msgstr "Opm_erking:" #: ../data/session-properties.ui.h:8 -msgid "_Name:" -msgstr "_Naam:" +msgid "Co_mmand:" +msgstr "Op_drag:" #: ../data/session-properties.ui.h:9 -msgid "_Remember Currently Running Application" -msgstr "_Onthou die toepassing wat tans loop" +msgid "_Name:" +msgstr "_Naam:" #: ../egg/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Lêer is nie 'n geldige .desktop-lêer nie" -#: ../egg/eggdesktopfile.c:188 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../egg/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Nieherkende \"desktop\"-lêerweergawe '%s'" -#: ../egg/eggdesktopfile.c:958 +#: ../egg/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Begin tans %s" -#: ../egg/eggdesktopfile.c:1100 +#: ../egg/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Toepassing aanvaar nie dokumente op die opdraglyn nie" -#: ../egg/eggdesktopfile.c:1168 +#: ../egg/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Nieherkende lanseerkeuse: %d" -#: ../egg/eggdesktopfile.c:1373 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../egg/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" "Kan nie dokument URI's na 'n 'Type=Link' \"desktop\"-inskrywing aangee nie" -#: ../egg/eggdesktopfile.c:1394 +#: ../egg/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Nie 'n lanseerbare item nie" -#: ../egg/eggsmclient.c:225 +#: ../egg/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Deaktiveer konneksie na sessiebestuurder" -#: ../egg/eggsmclient.c:228 +#: ../egg/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Spesifiseer lêer wat gestoorde konfigurasie bevat" -#: ../egg/eggsmclient.c:228 +#: ../egg/eggsmclient.c:229 msgid "FILE" msgstr "LÊER" -#: ../egg/eggsmclient.c:231 +#: ../egg/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Spesifiseer sessiebestuurs-ID" -#: ../egg/eggsmclient.c:231 +#: ../egg/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../egg/eggsmclient.c:252 +#: ../egg/eggsmclient.c:253 msgid "Session management options:" msgstr "Sessiebestuurkeuses:" -#: ../egg/eggsmclient.c:253 +#: ../egg/eggsmclient.c:254 msgid "Show session management options" msgstr "Wys keuses vir sessiebestuur" -#: ../gnome-session/gsm-gconf.c:106 -#, c-format +#: ../gnome-session/gsm-fail-whale-dialog.c:295 +msgid "Oh no! Something has gone wrong." +msgstr "Gits! Iets het verkeerd geloop." + +#: ../gnome-session/gsm-fail-whale-dialog.c:302 +#| msgid "" +#| "A problem has occurred and the system can't recover.\n" +#| "Please log out and try again." msgid "" -"There is a problem with the configuration server.\n" -"(%s exited with status %d)" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" msgstr "" -"Daar is 'n probleem met die opstellingbediener.\n" -"(%s het afgesluit met status %d)" - -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "Ikoon '%s' nie gevind nie" - -#: ../gnome-session/gsm-inhibit-dialog.c:592 -msgid "Unknown" -msgstr "Onbekend" - -#: ../gnome-session/gsm-inhibit-dialog.c:643 -msgid "A program is still running:" -msgstr "'n Program loop steeds:" +"'n Fout het voorgekom en die stelsel kan nie daarvan herstel nie. Kontak die " +"stelseladministrateur." -#: ../gnome-session/gsm-inhibit-dialog.c:647 -msgid "Some programs are still running:" -msgstr "Sommige programme loop steeds:" - -#: ../gnome-session/gsm-inhibit-dialog.c:648 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#| msgid "" +#| "A problem has occurred and the system can't recover.\n" +#| "Please log out and try again." msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you " -"to lose work." +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." msgstr "" -"Wag nog vir programme om te voltooi. Onderbreking van dié programme kan " -"veroorsaak dat werk verloor word." - -#: ../gnome-session/gsm-inhibit-dialog.c:878 -msgid "Switch User Anyway" -msgstr "Wissel in elk geval van gebruiker" - -#: ../gnome-session/gsm-inhibit-dialog.c:881 -msgid "Log Out Anyway" -msgstr "Meld in elk geval af" - -#: ../gnome-session/gsm-inhibit-dialog.c:884 -msgid "Suspend Anyway" -msgstr "Sluimer in elk geval" - -#: ../gnome-session/gsm-inhibit-dialog.c:887 -msgid "Hibernate Anyway" -msgstr "Hiberneer in elk geval" - -#: ../gnome-session/gsm-inhibit-dialog.c:890 -msgid "Shut Down Anyway" -msgstr "Skakel in elk geval af" - -#: ../gnome-session/gsm-inhibit-dialog.c:893 -msgid "Reboot Anyway" -msgstr "Herbegin in elk geval" - -#: ../gnome-session/gsm-inhibit-dialog.c:901 -msgid "Lock Screen" -msgstr "Sluit skerm" - -#: ../gnome-session/gsm-inhibit-dialog.c:904 -msgid "Cancel" -msgstr "Kanselleer" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:275 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "U gaan outomaties afgemeld word oor %d sekonde." -msgstr[1] "U gaan outomaties afgemeld word oor %d sekondes." - -#: ../gnome-session/gsm-logout-dialog.c:283 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Dié stelsel gaan outomaties afgeskakel word oor %d sekonde." -msgstr[1] "Dié stelsel gaan outomaties afgeskakel word oor %d sekondes." - -#: ../gnome-session/gsm-logout-dialog.c:315 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "U is tans aangemeld as \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:381 -msgid "Log out of this system now?" -msgstr "Meld nou af van hierdie stelsel?" - -#: ../gnome-session/gsm-logout-dialog.c:387 -msgid "_Switch User" -msgstr "Wi_ssel gebruiker" - -#: ../gnome-session/gsm-logout-dialog.c:396 -#: ../gnome-session/gsm-fail-whale-dialog.c:296 -#: ../gnome-session/gsm-util.c:363 -msgid "_Log Out" -msgstr "Me_ld af" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "Shut down this system now?" -msgstr "Skakel die stelsel nou af?" - -#: ../gnome-session/gsm-logout-dialog.c:408 -msgid "S_uspend" -msgstr "Sl_uimer" - -#: ../gnome-session/gsm-logout-dialog.c:414 -msgid "_Hibernate" -msgstr "_Hiberneer" - -#: ../gnome-session/gsm-logout-dialog.c:420 -msgid "_Restart" -msgstr "He_rbegin" - -#: ../gnome-session/gsm-logout-dialog.c:430 -msgid "_Shut Down" -msgstr "_Skakel af" +"'n Fout het voorgekom en die stelsel kan nie daarvan herstel nie. Alle " +"uitbreidings is gedeaktiveer as voorsorgmaatreël." -#: ../gnome-session/gsm-fail-whale-dialog.c:276 -msgid "Oh no! Something has gone wrong." -msgstr "Gits! Iets het verkeerd geloop." - -#. make this changable at some point -#: ../gnome-session/gsm-fail-whale-dialog.c:283 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -337,114 +281,308 @@ "'n Fout het voorgekom en die stelsel kan nie herstel daarvan nie.\n" "Meld af en probeer gerus weer." -#: ../gnome-session/gsm-process-helper.c:123 -#, c-format -msgid "Exited with code %d" -msgstr "Afgesluit met kode %d" - -#: ../gnome-session/gsm-process-helper.c:128 -#, c-format -msgid "Killed by signal %d" -msgstr "Afsluiting geforseer met sein %d" - -#: ../gnome-session/gsm-process-helper.c:133 -#, c-format -msgid "Stopped by signal %d" -msgstr "Gestop met sein %d" - -#: ../gnome-session/gsm-manager.c:1372 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 kon nie laai nie" +#: ../gnome-session/gsm-fail-whale-dialog.c:321 +msgid "_Log Out" +msgstr "Me_ld af" -#: ../gnome-session/gsm-manager.c:1373 -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the " -"fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not " -"capable of delivering the full GNOME 3 experience." -msgstr "" -"Ongelukkig kon GNOME 3 nie behoorlik laai nie en het in terugvalmodus " -"begin.\n" -"\n" -"Dit beteken waarskynlik dat die stelsel (grafikahardeware of aandrywer) nie " -"in staat is om die volle ervaring van GNOME 3 te lewer nie." +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 +msgid "Enable debugging code" +msgstr "Aktiveer ontfoutkode" -#: ../gnome-session/gsm-manager.c:1375 -msgid "Learn more about GNOME 3" -msgstr "Vind meer uit oor GNOME 3" +#: ../gnome-session/gsm-fail-whale-dialog.c:344 +msgid "Allow logout" +msgstr "Laat afmelding toe" + +#: ../gnome-session/gsm-fail-whale-dialog.c:345 +msgid "Show extension warning" +msgstr "Wys uitbreidingwaarskuwing" -#: ../gnome-session/gsm-manager.c:1472 ../gnome-session/gsm-manager.c:2203 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Reageer nie" -#: ../gnome-session/gsm-xsmp-client.c:1183 +#: ../gnome-session/gsm-util.c:411 +#| msgid "Log out" +msgid "_Log out" +msgstr "Me_ld af" + +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. +#. +#: ../gnome-session/gsm-xsmp-client.c:559 +#| msgid "_Remember Currently Running Application" +msgid "Remembered Application" +msgstr "Onthou die toepassing" + +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Dié program keer afmelding." -#: ../gnome-session/gsm-xsmp-server.c:325 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Nuwe klientverbinding word geweier omdat die sessie tans afgesluit word\n" -#: ../gnome-session/gsm-xsmp-server.c:587 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Kon nie 'n ICE-luistersok skep nie: %s" -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:347 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "" -"Kon nie 'n aanmeldsessie begin nie (en kon nie aan die X-bediener koppel nie)" - -#: ../gnome-session/main.c:276 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Oorheers standaard outobegin gidse" -#: ../gnome-session/main.c:277 +#: ../gnome-session/main.c:305 +msgid "AUTOSTART_DIR" +msgstr "OUTOBEGINGIDS" + +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessie om te gebruik" -#: ../gnome-session/main.c:278 -msgid "Enable debugging code" -msgstr "Aktiveer ontfoutkode" +#: ../gnome-session/main.c:306 +msgid "SESSION_NAME" +msgstr "SESSIENAAM" -#: ../gnome-session/main.c:279 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Moenie gebruiker-gespesifiseerde toepassings laai nie" -#: ../gnome-session/main.c:300 +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:311 +msgid "Show the fail whale dialog for testing" +msgstr "Wys die dialoog vir ernstige foute (vir toetsdoeleindes)" + +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - die GNOME-sessiebestuurder" -#: ../tools/gnome-session-quit.c:52 +#: ../tools/gnome-session-inhibit.c:110 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [KEUSE...] OPDRAG\n" +"\n" +"Voer OPDRAG uit terwyl sommige sessiefunksionaliteit onderdruk word.\n" +"\n" +" -h, --help Wys dié hulp\n" +" --version Wys programweergawe\n" +" --app-id ID Die program-ID om te gebruik tydens\n" +" onderdrukking (opsioneel)\n" +" --reason REDE Die rede vir onderdrukking (opsioneel)\n" +" --inhibit ARG Dinge om te onderdruk, dubbelpuntgeskyde lys van:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Moenie OPDRAG begin nie en wag bloot vir altyd\n" +"\n" +"As geen --inhibit-keuse gegee is nie, word \"idle\" aangeneem.\n" + +#: ../tools/gnome-session-inhibit.c:148 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Uitvoering van \"%s\" het misluk\n" + +#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 +#: ../tools/gnome-session-inhibit.c:228 +#, c-format +msgid "%s requires an argument\n" +msgstr "\"%s\" benodig 'n parameter\n" + +#: ../tools/gnome-session-selector.c:62 +#, c-format +#| msgid "Sessions" +msgid "Session %d" +msgstr "Sessie %d" + +#: ../tools/gnome-session-selector.c:108 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "Sessiename mag nie begin met ‘.’ nie en mag nie ‘/’-karakters bevat nie" + +#: ../tools/gnome-session-selector.c:112 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Sessiename mag nie begin met ‘.’ nie" + +#: ../tools/gnome-session-selector.c:116 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Sessiename mag nie ‘/’-karakters bevat nie" + +#: ../tools/gnome-session-selector.c:124 +#, c-format +#| msgid "The session name already exists" +msgid "A session named ‘%s’ already exists" +msgstr "'n Sessie met die naam ‘%s’ bestaan reeds" + +#: ../tools/gnome-session-quit.c:53 msgid "Log out" msgstr "Meld af" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:54 msgid "Power off" msgstr "Skakel af" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:55 +#| msgid "Reboot Anyway" +msgid "Reboot" +msgstr "Herbegin" + +#: ../tools/gnome-session-quit.c:56 msgid "Ignoring any existing inhibitors" msgstr "Gaan enige bestaande inhibeerders ignoreer" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:57 msgid "Don't prompt for user confirmation" msgstr "Moenie vra vir gebruikerbevestiging nie" -#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 +#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "Kon nie met sessiebestuurder koppel nie" -#: ../tools/gnome-session-quit.c:199 +#: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "Program geroep met konflikterende opsies" +#~ msgid "Some programs are still running:" +#~ msgstr "Sommige programme loop steeds:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "Wag nog vir die program om te voltooi. Onderbreking van die program kan " +#~ "veroorsaak dat werk verloor word." + +#~ msgid "" +#~ "There is a problem with the configuration server.\n" +#~ "(%s exited with status %d)" +#~ msgstr "" +#~ "Daar is 'n probleem met die opstellingbediener.\n" +#~ "(%s het afgesluit met status %d)" + +#~ msgid "Icon '%s' not found" +#~ msgstr "Ikoon '%s' nie gevind nie" + +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgid "A program is still running:" +#~ msgstr "'n Program loop steeds:" + +#~ msgid "Some programs are still running:" +#~ msgstr "Sommige programme loop steeds:" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "Wag nog vir programme om te voltooi. Onderbreking van dié programme kan " +#~ "veroorsaak dat werk verloor word." + +#~ msgid "Switch User Anyway" +#~ msgstr "Wissel in elk geval van gebruiker" + +#~ msgid "Log Out Anyway" +#~ msgstr "Meld in elk geval af" + +#~ msgid "Suspend Anyway" +#~ msgstr "Sluimer in elk geval" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hiberneer in elk geval" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Skakel in elk geval af" + +#~ msgid "Lock Screen" +#~ msgstr "Sluit skerm" + +#~ msgid "Cancel" +#~ msgstr "Kanselleer" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "U gaan outomaties afgemeld word oor %d sekonde." +#~ msgstr[1] "U gaan outomaties afgemeld word oor %d sekondes." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Dié stelsel gaan outomaties afgeskakel word oor %d sekonde." +#~ msgstr[1] "Dié stelsel gaan outomaties afgeskakel word oor %d sekondes." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "U is tans aangemeld as \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Meld nou af van hierdie stelsel?" + +#~ msgid "_Switch User" +#~ msgstr "Wi_ssel gebruiker" + +#~ msgid "Shut down this system now?" +#~ msgstr "Skakel die stelsel nou af?" + +#~ msgid "S_uspend" +#~ msgstr "Sl_uimer" + +#~ msgid "_Hibernate" +#~ msgstr "_Hiberneer" + +#~ msgid "_Restart" +#~ msgstr "He_rbegin" + +#~ msgid "_Shut Down" +#~ msgstr "_Skakel af" + +#~ msgid "Exited with code %d" +#~ msgstr "Afgesluit met kode %d" + +#~ msgid "Killed by signal %d" +#~ msgstr "Afsluiting geforseer met sein %d" + +#~ msgid "Stopped by signal %d" +#~ msgstr "Gestop met sein %d" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "GNOME 3 kon nie laai nie" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "Ongelukkig kon GNOME 3 nie behoorlik laai nie en het in terugvalmodus begin.\n" +#~ "\n" +#~ "Dit beteken waarskynlik dat die stelsel (grafikahardeware of aandrywer) " +#~ "nie in staat is om die volle ervaring van GNOME 3 te lewer nie." + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "Vind meer uit oor GNOME 3" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "" +#~ "Kon nie 'n aanmeldsessie begin nie (en kon nie aan die X-bediener koppel " +#~ "nie)" + #~ msgid "Allow TCP connections" #~ msgstr "Laat TCP-konneksies toe" @@ -483,9 +621,6 @@ #~ "Voorkeurbeeld wat gebruik moet word vir die spatskerm wanneer daar by " #~ "GNOME Desktop aangemeld word" -#~ msgid "Save sessions" -#~ msgstr "Stoor sessies" - #~ msgid "Show the splash screen" #~ msgstr "Vertoon die spatskerm" @@ -667,9 +802,6 @@ #~ msgid "The session name cannot be empty" #~ msgstr "Die sessienaam kan nie leeg wees nie" -#~ msgid "The session name already exists" -#~ msgstr "Die sessienaam bestaan reeds" - #~ msgid "Add a new session" #~ msgstr "Voeg 'n nuwe sessie by" @@ -686,28 +818,15 @@ #~ "Sommige veranderings is nie gestoor nie.\n" #~ "Is dit nog steeds OK om af te sluit?" -#~ msgid "Sessions" -#~ msgstr "Sessies" - #~ msgid "Show splash screen on _login" #~ msgstr "Vertoon spatskerm by _aanmelding" -#, fuzzy -#~ msgid "As_k on logout" -#~ msgstr "_Waarsku by afmelding" - #~ msgid "Automatically save chan_ges to session" #~ msgstr "Stoor outomaties veran_deringe aan sessie" -#~ msgid "_Sessions:" -#~ msgstr "_Sessies:" - #~ msgid "Session Name" #~ msgstr "Sessienaam" -#~ msgid "Current Session" -#~ msgstr "Huidige sessie" - #~ msgid "Remove the currently selected client from the session." #~ msgstr "Verwyder die huidige geselekteerde kliënt van die sessie." diff -Nru gnome-session-3.9.90/po/an.po gnome-session-3.14.0/po/an.po --- gnome-session-3.9.90/po/an.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/an.po 2014-06-25 18:06:33.000000000 +0000 @@ -8,68 +8,24 @@ "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-23 19:51+0000\n" -"PO-Revision-Date: 2013-02-14 19:56+0100\n" -"Last-Translator: Daniel Martinez \n" +"POT-Creation-Date: 2013-12-18 21:34+0000\n" +"PO-Revision-Date: 2013-12-21 17:12+0100\n" +"Last-Translator: Jorge Pérez Pérez \n" "Language-Team: Aragonese \n" "Language: an\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.6.3\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Seleccionar comando" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Adhibir programa a l'encieto" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Editar programa a l'encieto" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "O comando d'encieto no puet estar vuedo" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "O comando d'encieto no ye valido" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Enchegau" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Icono" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Programa" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Preferencias d'as aplicacions a l'encieto" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Sin nombre" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Sin descripción" - -#: ../capplet/main.c:35 ../gnome-session/main.c:284 -msgid "Version of this application" -msgstr "Versión d'ista aplicación" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Personalizau" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "No se pudo amostrar o documento d'aduya" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Ista dentrada te deixa trigar una sesion alzada" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -79,18 +35,19 @@ msgid "This session logs you into GNOME" msgstr "Ista sesión accede a GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "Personalizau" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "Ista dentrada te deixa trigar una sesion alzada" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME en o Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Ista sesión accede a lo GNOME, fendo servir o Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sesión personalizada" @@ -115,18 +72,6 @@ msgid "_Continue" msgstr "_Continar" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Encara se son executando qualques programas:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicacions a l'encieto" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Esleye qué aplicacions rancar en encetar a sesión" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programas adicionals ta encetar:" @@ -164,80 +109,11 @@ msgid "_Name:" msgstr "_Nombre:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "O fichero no ye un fichero .desktop valido" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "No se reconoixe a versión '%s' d'o fichero desktop" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Encetando %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "l'aplicación no accepta documentos en a linia de comandos" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opción de lanzamiento no reconoixida: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"No se pueden pasar os URI de documentos a dentradas d'escritorio Type=Link" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "No ye un elemento lanzable" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Desactivar a connexión con o chestor de sesions" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Especifica o fichero que contién a configuración alzada" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FICHERO" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Especifica l'ID de chestión d'a sesión" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Opcions de chestión de sesión:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Amostrar opcions de chestión de sesión" - -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:323 msgid "Oh no! Something has gone wrong." msgstr "Redios! Bella cosa salió malament." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -245,7 +121,7 @@ "Ocurrió un problema y o sistema no se puet recuperar. Contacta con un " "administrador de sistemas." -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -253,7 +129,7 @@ "Ocurrió un problema y o sistema no se puet recuperar. Por precacción, s'han " "desactivau todas as extensions." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:334 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -261,140 +137,23 @@ "Ocurrió un problema y o sistema no se puet recuperar.\n" "zarra la sesión y intenta-lo de nuevas." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:349 msgid "_Log Out" msgstr "T_rancar a sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Enchegar o codigo de depuración" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:372 msgid "Allow logout" msgstr "Permitir zarrar sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:373 msgid "Show extension warning" msgstr "Amostrar alvertencias d'as extensions" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconoixiu" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Encara se ye executando un programa:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Se ye asperando que o programa remate. Interrumpir iste programa puet causar " -"a perda d'o suyo treballo." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Se ye asperando que os programas rematen. Interrumpir istos programas puet " -"causar perdas de datos." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Cambiar usuario de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Salir de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Suspender de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernar de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Amortar de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reenchegar de todas trazas" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloquiar pantalla" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancelar" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Saldrás automaticament d'a sesión en %d segundo." -msgstr[1] "Saldrás automaticament d'a sesión en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "O sistema s'amortará automaticament en %d segundo." -msgstr[1] "O sistema s'amortará automaticament en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "O sistema se reenchegará automaticament en %d segundo." -msgstr[1] "O sistema se reenchegará automaticament en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Has encetau sesión como «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Trancar a sesión en iste sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Ca_mbiar d'usuario" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Amortar agora iste sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Suspender" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernar" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reenchegar" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Amortar" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Reiniciar iste sistema agora?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1272 ../gnome-session/gsm-manager.c:2044 msgid "Not responding" msgstr "No responde" @@ -406,11 +165,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Aplicación remerada" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Iste programa ye bloquiando a zarrada de sesió" @@ -427,32 +186,36 @@ msgid "Could not create ICE listening socket: %s" msgstr "No se pudo creyar o socket d'escuita ICE: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Sobreescribir as carpetas d'encieto automatico estandar" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "CARPETA_D'ENCIETO_AUTOMATICO" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sesión ta emplegar" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOMBRE_D'A_SESIÓN" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "No cargar as aplicacions especificadas por l'usuario" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "Versión d'ista aplicación" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Amostrar o dialogo d'a ballena de prebas" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - O chestor de sesions de GNOME" @@ -554,8 +317,179 @@ msgid "Program called with conflicting options" msgstr "Se clamó a lo programa con opcions en conflicto" -#~ msgid "GNOME fallback" -#~ msgstr "Alternativa de GNOME" +#~ msgid "Select Command" +#~ msgstr "Seleccionar comando" + +#~ msgid "Add Startup Program" +#~ msgstr "Adhibir programa a l'encieto" + +#~ msgid "Edit Startup Program" +#~ msgstr "Editar programa a l'encieto" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "O comando d'encieto no puet estar vuedo" + +#~ msgid "The startup command is not valid" +#~ msgstr "O comando d'encieto no ye valido" + +#~ msgid "Enabled" +#~ msgstr "Enchegau" + +#~ msgid "Icon" +#~ msgstr "Icono" + +#~ msgid "Program" +#~ msgstr "Programa" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Preferencias d'as aplicacions a l'encieto" + +#~ msgid "No name" +#~ msgstr "Sin nombre" + +#~ msgid "No description" +#~ msgstr "Sin descripción" + +#~ msgid "Could not display help document" +#~ msgstr "No se pudo amostrar o documento d'aduya" + +#~ msgid "Some programs are still running:" +#~ msgstr "Encara se son executando qualques programas:" + +#~ msgid "Startup Applications" +#~ msgstr "Aplicacions a l'encieto" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Esleye qué aplicacions rancar en encetar a sesión" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "O fichero no ye un fichero .desktop valido" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "No se reconoixe a versión '%s' d'o fichero desktop" + +#~ msgid "Starting %s" +#~ msgstr "Encetando %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "l'aplicación no accepta documentos en a linia de comandos" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opción de lanzamiento no reconoixida: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "No se pueden pasar os URI de documentos a dentradas d'escritorio Type=Link" + +#~ msgid "Not a launchable item" +#~ msgstr "No ye un elemento lanzable" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Desactivar a connexión con o chestor de sesions" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Especifica o fichero que contién a configuración alzada" + +#~ msgid "FILE" +#~ msgstr "FICHERO" + +#~ msgid "Specify session management ID" +#~ msgstr "Especifica l'ID de chestión d'a sesión" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opcions de chestión de sesión:" + +#~ msgid "Show session management options" +#~ msgstr "Amostrar opcions de chestión de sesión" + +#~ msgid "Unknown" +#~ msgstr "Desconoixiu" + +#~ msgid "A program is still running:" +#~ msgstr "Encara se ye executando un programa:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Se ye asperando que o programa remate. Interrumpir iste programa puet " +#~ "causar a perda d'o suyo treballo." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Se ye asperando que os programas rematen. Interrumpir istos programas " +#~ "puet causar perdas de datos." + +#~ msgid "Switch User Anyway" +#~ msgstr "Cambiar usuario de todas trazas" + +#~ msgid "Log Out Anyway" +#~ msgstr "Salir de todas trazas" + +#~ msgid "Suspend Anyway" +#~ msgstr "Suspender de todas trazas" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernar de todas trazas" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Amortar de todas trazas" + +#~ msgid "Restart Anyway" +#~ msgstr "Reenchegar de todas trazas" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquiar pantalla" + +#~ msgid "Cancel" +#~ msgstr "Cancelar" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Saldrás automaticament d'a sesión en %d segundo." +#~ msgstr[1] "Saldrás automaticament d'a sesión en %d segundos." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "O sistema s'amortará automaticament en %d segundo." +#~ msgstr[1] "O sistema s'amortará automaticament en %d segundos." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "O sistema se reenchegará automaticament en %d segundo." +#~ msgstr[1] "O sistema se reenchegará automaticament en %d segundos." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Has encetau sesión como «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "Trancar a sesión en iste sistema agora?" + +#~ msgid "_Switch User" +#~ msgstr "Ca_mbiar d'usuario" + +#~ msgid "Shut down this system now?" +#~ msgstr "Amortar agora iste sistema?" + +#~ msgid "S_uspend" +#~ msgstr "_Suspender" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernar" + +#~ msgid "_Restart" +#~ msgstr "_Reenchegar" + +#~ msgid "_Shut Down" +#~ msgstr "_Amortar" + +#~ msgid "Restart this system now?" +#~ msgstr "Reiniciar iste sistema agora?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/ar.po gnome-session-3.14.0/po/ar.po --- gnome-session-3.9.90/po/ar.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/ar.po 2014-06-25 18:06:33.000000000 +0000 @@ -5,15 +5,15 @@ # Djihed Afifi , 2006. # Anas Husseini , 2007. # Anas Afif Emad , 2008. -# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2011, 2013. +# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014. # Anass Ahmed , 2011. # Ibrahim Saed , 2012. msgid "" msgstr "" "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-23 18:20+0200\n" -"PO-Revision-Date: 2013-03-23 18:20+0200\n" +"POT-Creation-Date: 2014-02-28 23:26+0200\n" +"PO-Revision-Date: 2014-02-28 23:26+0200\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -22,60 +22,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Virtaal 0.7.0\n" +"X-Generator: Virtaal 1.0.0-beta1\n" "X-Project-Style: gnome\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "اختر أمرا" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "أضِف برنامجا لبداية التشغيل" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "حرّر برنامج بدء التشغيل" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "لا يمكن أن يكون أمر بدء التشغيل فارغًا" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "أمر بدء التشغيل غير سليم" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "مُفعّل" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "أيقونة" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "البرنامج" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "تفضيلات برمجيات بدء التشغيل" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "بلا اسم" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "بلا وصف" - -#: ../capplet/main.c:35 ../gnome-session/main.c:284 -msgid "Version of this application" -msgstr "إصدارة هذا التطبيق" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "خاص" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "تعذّر عرض مستند المساعدة" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "هذه الخاصية تسمح لك باختيار جلسة محفوطة" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -85,23 +41,24 @@ msgid "This session logs you into GNOME" msgstr "تولجك هذه الجلسة في جنوم" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "خاص" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "هذه الخاصية تسمح لك باختيار جلسة محفوطة" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "جنوم لا شيء" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "جنوم على وايلاند" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "تولجك هذه الجلسة في جنوم باستخدام وايلاند" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "جلسة خاصة" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "من فضلك، اختر جلسة خاصة للعمل" @@ -121,18 +78,6 @@ msgid "_Continue" msgstr "_أكمل" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "ما زالت بعض البرامج تعمل:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "تطبيقات بدء التشغيل" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "اختر التطبيقات التي تريد تشغيلها عند ولوجك" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "برامج بدء الت_شغيل الإضافية:" @@ -169,91 +114,23 @@ msgid "_Name:" msgstr "الا_سم:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ليس هذا ملف .desktop سليم" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "إصدارة ملف سطح مكتب غير معروفة: '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "يجري بدء %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "لا يقبل التطبيق مستندات في سطر الأوامر" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "خيار إطلاق غير معروف: %Id" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "تعذّر تمرير مسارات الملفات إلى مدخلة سطح مكتب 'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "ليس عنصرا يمكن إطلاقه" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "عطّل الاتصال بمدير الجلسات" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "حدد ملفا يحتوي الاعدادات المحفوظة" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ملف" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "حدد رقم معرّف إدارة الجلسات" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "معرّف" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "خيارات إدارة الجلسات:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "اعرض خيارات إدارة الجلسات" - -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "لا! ثمة مشكلة." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "حدثت مشكلة وتعذّر تعافي النظام. حاول الاتصال بمدير النظام." -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "حدثت مشكلة وتعذّر تعافي النظام. ستتعطل جميع الامتدادات كإجراء احترازي." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -261,152 +138,27 @@ "حدثت مشكلة وتعذّر تعافي النظام.\n" "حاول الخروج ثم الولوج مجددا." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "ا_خرج" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "فعّل كود تتبع الأخطاء" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "اسمح بالخروج" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "أظهر تحذير الامتداد" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "مجهول" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ما زال أحد البرامج يعمل:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "بانتظار انتهاء البرامج. مقاطعة هذه البرامج قد يتسبب في فقدان العمل." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "بانتظار انتهاء البرامج. مقاطعة هذه البرامج قد يتسبب في فقد بيانات." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "بدّل المستخدم بالرغم من هذا" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "اخرج بالرغم من هذا" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "علّق بالرغم من هذا" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "أسبِت بالرغم من هذا" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "أغلق بالرغم من هذا" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "أعد التشغيل على أي حال" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "أوصد الشاشة" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ألغ" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "سيتم إخراجك حالا." -msgstr[1] "سيتم إخراجك خلال ثانية واحدة." -msgstr[2] "سيتم إخراجك خلال ثانيتين." -msgstr[3] "سيتم إخراجك خلال %Id ثوان." -msgstr[4] "سيتم إخراجك خلال %Id ثانية." -msgstr[5] "سيتم إخراجك خلال %Id ثانية." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "سيتم إطفاء النظام حالا." -msgstr[1] "سيتم إطفاء النظام خلال ثانية واحدة." -msgstr[2] "سيتم إطفاء النظام خلال ثانيتين." -msgstr[3] "سيتم إطفاء النظام خلال %Id ثوان." -msgstr[4] "سيتم إطفاء النظام خلال %Id ثانية." -msgstr[5] "سيتم إطفاء النظام خلال %Id ثوان." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "سيعاد تشغيل النظام حالا." -msgstr[1] "سيعاد تشغيل النظام آليا خلال ثانية واحدة." -msgstr[2] "سيعاد تشغيل النظام آليا خلال ثانيتين." -msgstr[3] "سيعاد تشغيل النظام آليا خلال %Id ثوان." -msgstr[4] "سيعاد تشغيل النظام آليا خلال %Id ثانية." -msgstr[5] "سيعاد تشغيل النظام آليا خلال %Id ثانية." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "حاليا أنت والج باسم \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "أأخرج من هذا النظام الآن؟" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ب_دّل المستخدم" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "أأطفئ هذا النظام الآن؟" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_علّق" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "أ_سبِت" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "أعِد الت_شغيل" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "أ_طفئ" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "هل ترغب بإعادة تشغيل النظام الآن؟" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "لا يستجيب" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:409 msgid "_Log out" msgstr "ا_خرج" @@ -414,55 +166,59 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "التطبيقات المتذكرة" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "يعيق هذا البرنامج الخروج." -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "يرفض العملاء الجدد لأن الجلسة يتم إطفاؤها حاليا\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "تعذّر إنشاء مقبس استماع ICE: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "تخطى مجلدات بدء التشغيل القياسية" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "الجلسة التي ستُستخدم" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "لا تُحمّل التطبيقات التي حددها المستخدم" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "إصدارة هذا التطبيق" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "أظهر حوار الفشل للاختبار" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - مدير جلسات جنوم" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -481,70 +237,248 @@ "If no --inhibit option is specified, idle is assumed.\n" msgstr "" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "فشل التنفيذ %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "يتطلب الخيار %s معاملا\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "جلسة %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "لا يسمح أن يبدأ اسم الجلسة بـ '.' أو أن يتضمن '/'" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "لا يسمح أن تبدأ أسماء الجلسات بـ '.'" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "لا يسمح أن تتضمن أسماء الجلسات حرف '/'" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "جلسة باسم ‘%s’ موجودة بالفعل" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "اخرج" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "أطفئ" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "أعِد التشغيل" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "متجاهلًا أية معيقات موجودة" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "لا تطلب تأكيدا من المستخدم" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "تعذّر الاتصال بمدير الجلسات" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "تم استدعاء البرنامج بخيارات متضاربة" -#~ msgid "GNOME fallback" -#~ msgstr "جنوم (تقليدية)" +#~ msgid "Select Command" +#~ msgstr "اختر أمرا" + +#~ msgid "Add Startup Program" +#~ msgstr "أضِف برنامجا لبداية التشغيل" + +#~ msgid "Edit Startup Program" +#~ msgstr "حرّر برنامج بدء التشغيل" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "لا يمكن أن يكون أمر بدء التشغيل فارغًا" + +#~ msgid "The startup command is not valid" +#~ msgstr "أمر بدء التشغيل غير سليم" + +#~ msgid "Enabled" +#~ msgstr "مُفعّل" + +#~ msgid "Icon" +#~ msgstr "أيقونة" + +#~ msgid "Program" +#~ msgstr "البرنامج" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "تفضيلات برمجيات بدء التشغيل" + +#~ msgid "No name" +#~ msgstr "بلا اسم" + +#~ msgid "No description" +#~ msgstr "بلا وصف" + +#~ msgid "Could not display help document" +#~ msgstr "تعذّر عرض مستند المساعدة" + +#~ msgid "Startup Applications" +#~ msgstr "تطبيقات بدء التشغيل" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "اختر التطبيقات التي تريد تشغيلها عند ولوجك" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ليس هذا ملف .desktop سليم" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "إصدارة ملف سطح مكتب غير معروفة: '%s'" + +#~ msgid "Starting %s" +#~ msgstr "يجري بدء %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "لا يقبل التطبيق مستندات في سطر الأوامر" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "خيار إطلاق غير معروف: %Id" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "تعذّر تمرير مسارات الملفات إلى مدخلة سطح مكتب 'Type=Link'" + +#~ msgid "Not a launchable item" +#~ msgstr "ليس عنصرا يمكن إطلاقه" + +#~ msgid "Disable connection to session manager" +#~ msgstr "عطّل الاتصال بمدير الجلسات" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "حدد ملفا يحتوي الاعدادات المحفوظة" + +#~ msgid "FILE" +#~ msgstr "ملف" + +#~ msgid "Specify session management ID" +#~ msgstr "حدد رقم معرّف إدارة الجلسات" + +#~ msgid "ID" +#~ msgstr "معرّف" + +#~ msgid "Session management options:" +#~ msgstr "خيارات إدارة الجلسات:" + +#~ msgid "Show session management options" +#~ msgstr "اعرض خيارات إدارة الجلسات" + +#~ msgid "Some programs are still running:" +#~ msgstr "ما زالت بعض البرامج تعمل:" + +#~ msgid "Unknown" +#~ msgstr "مجهول" + +#~ msgid "A program is still running:" +#~ msgstr "ما زال أحد البرامج يعمل:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "بانتظار انتهاء البرامج. مقاطعة هذه البرامج قد يتسبب في فقدان العمل." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "بانتظار انتهاء البرامج. مقاطعة هذه البرامج قد يتسبب في فقد بيانات." + +#~ msgid "Switch User Anyway" +#~ msgstr "بدّل المستخدم بالرغم من هذا" + +#~ msgid "Log Out Anyway" +#~ msgstr "اخرج بالرغم من هذا" + +#~ msgid "Suspend Anyway" +#~ msgstr "علّق بالرغم من هذا" + +#~ msgid "Hibernate Anyway" +#~ msgstr "أسبِت بالرغم من هذا" + +#~ msgid "Shut Down Anyway" +#~ msgstr "أغلق بالرغم من هذا" + +#~ msgid "Restart Anyway" +#~ msgstr "أعد التشغيل على أي حال" + +#~ msgid "Lock Screen" +#~ msgstr "أوصد الشاشة" + +#~ msgid "Cancel" +#~ msgstr "ألغ" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "سيتم إخراجك حالا." +#~ msgstr[1] "سيتم إخراجك خلال ثانية واحدة." +#~ msgstr[2] "سيتم إخراجك خلال ثانيتين." +#~ msgstr[3] "سيتم إخراجك خلال %Id ثوان." +#~ msgstr[4] "سيتم إخراجك خلال %Id ثانية." +#~ msgstr[5] "سيتم إخراجك خلال %Id ثانية." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "سيتم إطفاء النظام حالا." +#~ msgstr[1] "سيتم إطفاء النظام خلال ثانية واحدة." +#~ msgstr[2] "سيتم إطفاء النظام خلال ثانيتين." +#~ msgstr[3] "سيتم إطفاء النظام خلال %Id ثوان." +#~ msgstr[4] "سيتم إطفاء النظام خلال %Id ثانية." +#~ msgstr[5] "سيتم إطفاء النظام خلال %Id ثوان." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "سيعاد تشغيل النظام حالا." +#~ msgstr[1] "سيعاد تشغيل النظام آليا خلال ثانية واحدة." +#~ msgstr[2] "سيعاد تشغيل النظام آليا خلال ثانيتين." +#~ msgstr[3] "سيعاد تشغيل النظام آليا خلال %Id ثوان." +#~ msgstr[4] "سيعاد تشغيل النظام آليا خلال %Id ثانية." +#~ msgstr[5] "سيعاد تشغيل النظام آليا خلال %Id ثانية." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "حاليا أنت والج باسم \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "أأخرج من هذا النظام الآن؟" + +#~ msgid "_Switch User" +#~ msgstr "ب_دّل المستخدم" + +#~ msgid "Shut down this system now?" +#~ msgstr "أأطفئ هذا النظام الآن؟" + +#~ msgid "S_uspend" +#~ msgstr "_علّق" + +#~ msgid "_Hibernate" +#~ msgstr "أ_سبِت" + +#~ msgid "_Restart" +#~ msgstr "أعِد الت_شغيل" + +#~ msgid "_Shut Down" +#~ msgstr "أ_طفئ" + +#~ msgid "Restart this system now?" +#~ msgstr "هل ترغب بإعادة تشغيل النظام الآن؟" #~ msgid "Icon '%s' not found" #~ msgstr "الأيقونة '%s' غير موجودة" diff -Nru gnome-session-3.9.90/po/as.po gnome-session-3.14.0/po/as.po --- gnome-session-3.9.90/po/as.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/as.po 2014-06-25 18:06:33.000000000 +0000 @@ -3,75 +3,30 @@ # # Amitakhya Phukan , 2009, 2010. # Nilamdyuti Goswami , 2011, 2012, 2013. +# ngoswami , 2014. #zanata. msgid "" msgstr "" "Project-Id-Version: as\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-05 18:57+0530\n" +"POT-Creation-Date: 2014-01-03 14:35+0000\n" +"PO-Revision-Date: 2014-01-06 17:30+0630\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: Assamese \n" -"Language: as_IN\n" +"Language: as\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "কমান্ড বাছক" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "আৰম্ভৰ প্ৰগ্ৰাম যোগ কৰক" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "আৰম্ভৰ প্ৰগ্ৰাম সম্পাদন কৰক" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "আৰম্ভৰ কমান্ড ৰিক্ত থাকিব নোৱাৰিব" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "আৰম্ভৰ কমান্ড অবৈধ" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "সামৰ্থবান" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "আইকন" - -# -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "প্ৰগ্ৰাম" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "আৰম্ভৰ এপ্লিকেচন পছন্দসমূহ" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "নাম নোহোৱা" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "বিৱৰণ নাই" - -# -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "এই এপ্লিকেচনৰ সংস্কৰণ" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "স্বনিৰ্বাচিত" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "সহায় দস্তাবেজ প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "এই প্ৰৱিষ্টিয়ে আপোনাক এটা সংৰক্ষিত অধিবেশন নিৰ্বাচন কৰাত সহায় কৰে" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -81,19 +36,19 @@ msgid "This session logs you into GNOME" msgstr "এই অধিবেশনে আপোনাক GNOME ত লগিন কৰায়" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "স্বনিৰ্বাচিত" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "এই প্ৰৱিষ্টিয়ে আপোনাক এটা সংৰক্ষিত অধিবেশন নিৰ্বাচন কৰাত সহায় কৰে" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME ডামি" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Wayland ত GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "এই অধিবেশনে আপোনাক Wayland ব্যৱহাৰ কৰি, GNOME ত লগিন কৰায়" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "স্বনিৰ্বাচিত অধিবেশন" @@ -118,18 +73,6 @@ msgid "_Continue" msgstr "অব্যাহত ৰাখক (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "কিছুমান প্ৰগ্ৰাম চলি আছে:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "আৰম্ভৰ এপ্লিকেচনসমূহ" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "লগিন কৰাৰ সময়ত কোনবোৰ এপ্লিকেচন আৰম্ভ হব বাছক" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "অতিৰিক্ত আৰম্ভৰ প্ৰগ্ৰামসমূহ (_p):" @@ -146,7 +89,6 @@ msgid "_Remember Currently Running Applications" msgstr "বৰ্তমানে চলি থকা এপ্লিকেচনসমূহ মনত ৰাখক (_R)" -# #: ../data/session-properties.ui.h:5 msgid "Options" msgstr "বিকল্পসমূহ" @@ -159,94 +101,19 @@ msgid "Comm_ent:" msgstr "মন্তব্য (_e):" -# #: ../data/session-properties.ui.h:8 msgid "Co_mmand:" msgstr "কমান্ড (_m):" -# #: ../data/session-properties.ui.h:9 msgid "_Name:" msgstr "নাম (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ফাইলটো এটা বৈধ .desktop ফাইল নহয়" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ডেস্কটপ ফাইলৰ অজ্ঞাত সংস্কৰণ '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s আৰম্ভ কৰা হৈছে" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "এই এপ্লিকেচনে কমান্ড-শাৰীৰ মাধ্যমে দস্তাবেজসমূহ গ্ৰহণ নকৰে" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "অপৰিচিত লঞ্চ বিকল্প: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"'Type=Link' ডেস্কটপ প্ৰবিষ্টিৰ ক্ষেত্ৰত দস্তাবেজৰ URI প্ৰেৰণ কৰিব নোৱাৰি" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "এটা লঞ্চ কৰিব পৰা বস্তু নহয় " - -# -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "অধিবেশন ব্যৱস্থাপকৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক" - -# -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "সংৰক্ষিত সংৰূপ অন্তৰ্ভুক্ত কৰা ফাইল ধাৰ্য্য কৰক" - -# -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -# -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "অধিবেশন ব্যৱস্থাপনাৰ ID উল্লেখ কৰক" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্পসমূহ:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্পসমূহ দেখুৱাওক" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:323 msgid "Oh no! Something has gone wrong." msgstr "ইচচ! কিবা এটা ভুল হৈছে।" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -254,7 +121,7 @@ "এটা সমস্যা দেখা দিছে আৰু চিস্টেমটো উদ্ধাৰ হব পৰা নাই। অনুগ্ৰহ কৰি এজন চিস্টেম " "প্ৰশাসকক যোগাযোগ কৰক" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -263,7 +130,7 @@ "সাৱধানতা " "হিচাপে অসামৰ্থবান কৰা হৈছে।" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:334 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -271,150 +138,23 @@ "এটা সমস্যা দেখা দিছে আৰু চিস্টেমটো উদ্ধাৰ হব পৰা নাই।\n" "অনুগ্ৰহ কৰি লগআউট কৰক আৰু পুনৰ চেষ্টা কৰক।" -# -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:349 msgid "_Log Out" msgstr "লগআউট কৰক (_L)" -# -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "ক'ড ডিবাগিং সামৰ্থবান কৰক" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:372 msgid "Allow logout" msgstr "লগআউটৰ অনুমতি দিয়ক" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:373 msgid "Show extension warning" msgstr "সম্প্ৰসাৰনৰ সতৰ্কবাৰ্তা দেখুৱাওক" -# -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "অজ্ঞাত" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "এটা প্ৰগ্ৰাম বৰ্তমানে চলি আছে:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"প্ৰগ্ৰাম সমাপ্ত হোৱাৰ অপেক্ষা কৰা হৈছে। প্ৰগ্ৰাম বিঘ্নিত হ'লে আপুনি কাৰ্য্য " -"হেৰুৱাব " -"পাৰে।" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"প্ৰগ্ৰামসমূহ সমাপ্ত হোৱাৰ বাবে অপেক্ষা কৰা হৈছে। প্ৰগ্ৰামসমূহ বিঘ্নিত হ'লে " -"আপুনি কাৰ্য্য " -"হেৰুৱাব পাৰে।" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "তথাপিও ব্যৱহাৰকাৰী পৰিবৰ্তন কৰক" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "তথাপিও লগআউট কৰক" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "তথাপিও স্থগিত কৰক" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "তথাপিও হাইবাৰনেইট কৰক" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "তথাপিও বন্ধ কৰক" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "তথাপিও পুনৰাম্ভ কৰক" - -# -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "পৰ্দা লক কৰক" - -# -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "বাতিল কৰক" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে আপোনাক লগআউট কৰা হব।" -msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে আপোনাক লগআউট কৰা হব।" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম বন্ধ কৰা হব।" -msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম বন্ধ কৰা হব।" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম পুনাৰম্ভ কৰা হব।" -msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম পুনাৰম্ভ কৰা হব।" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "বৰ্তমানে আপুনি \"%s\" হিচাপে লগিন কৰিছে।" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "এতিয়াই চিস্টেমৰ পৰা লগআউট কৰিব নে?" - -# -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ব্যৱহাৰকাৰী পৰিবৰ্তন কৰক (_S)" - -# -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "এই মুহূৰ্তে চিস্টেম বন্ধ কৰিব নে?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "স্থগিত কৰক (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "হাইবাৰনেইট কৰক (_H)" - -# -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "পুনৰাম্ভ কৰক (_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "বন্ধ কৰক (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "এই চিস্টেম এতিয়া পুনৰাম্ভ কৰিব নে?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1272 ../gnome-session/gsm-manager.c:2044 msgid "Not responding" msgstr "কোনো প্ৰতিক্ৰিয়া নাই" @@ -426,11 +166,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "মনত ৰখা এপ্লিকেচন" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "এই প্ৰগ্ৰামে লগআউট অবৰোধ কৰি আছে।" @@ -448,32 +188,36 @@ msgid "Could not create ICE listening socket: %s" msgstr "ICE অপেক্ষাৰ ছ'কেট নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "প্ৰামাণিক স্বআৰম্ভ ডাইৰেকটৰিসমূহ অভাৰৰাইড কৰক" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "ব্যৱহাৰ হ'ব লগিয়া অধিবেশন" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "ব্যৱহাৰকাৰী দ্বাৰা নিৰ্ধাৰিত এপ্লিকেচনসমূহ ল'ড নকৰিব" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "এই এপ্লিকেচনৰ সংস্কৰণ" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "পৰিক্ষণৰ বাবে ব্যৰ্থ হোৱেইল ডাইলগ দেখুৱাওক" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOME অধিবেশন ব্যৱস্থাপক" @@ -497,18 +241,18 @@ msgstr "" "%s [OPTION...] COMMAND\n" "\n" -"Execute COMMAND while inhibiting some session functionality.\n" +"অধিবেশনৰ কাৰ্য্যকৰীতাক বাধা দিওতে COMMAND এক্সিকিউট কৰক। \n" "\n" -" -h, --help Show this help\n" -" --version Show program version\n" -" --app-id ID The application id to use\n" -" when inhibiting (optional)\n" -" --reason REASON The reason for inhibiting (optional)\n" -" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" -h, --help এই সহায় দেখুৱাওক\n" +" --version প্ৰগ্ৰামৰ সংস্কৰণ দেখুৱাওক\n" +" --app-id ID বাধা দিওতে ব্যৱহাৰ কৰিন লগিয়া\n" +" এপ্লিকেচন আইডি (বৈকল্পিক)\n" +" --reason REASON বাধা দিয়াৰ কাৰণ (বৈকল্পিক)\n" +" --inhibit ARG বাধা দিব লগিয়া বস্তু, কলন-পৃথকিত তালিকা:\n" " logout, switch-user, suspend, idle, automount\n" -" --inhibit-only Do not launch COMMAND and wait forever instead\n" +" --inhibit-only ইয়াৰ পৰিৱৰ্তে COMMAND লঞ্চ কৰি সদায়ৰ বাবে অপেক্ষা নকৰিব\n" "\n" -"If no --inhibit option is specified, idle is assumed.\n" +"যদি কোনো --inhibit বিকল্প ধাৰ্য্য কৰা হোৱা নাই, idle ধৰি লোৱা হয়।\n" #: ../tools/gnome-session-inhibit.c:148 #, c-format @@ -523,7 +267,6 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "অধিবেশন %d" @@ -547,14 +290,13 @@ msgid "A session named ‘%s’ already exists" msgstr "‘%s’ নামৰ এটা অধিবেশন ইতিমধ্যে অস্তিত্ববান" -# #: ../tools/gnome-session-quit.c:53 msgid "Log out" msgstr "লগআউট কৰক" #: ../tools/gnome-session-quit.c:54 msgid "Power off" -msgstr "পাওৱাৰ অফ কৰক" +msgstr "বন্ধ কৰক" #: ../tools/gnome-session-quit.c:55 msgid "Reboot" @@ -576,85 +318,175 @@ msgid "Program called with conflicting options" msgstr "দ্বন্দ্বযুক্ত বিকল্প সহ প্ৰগ্ৰামক কল কৰা হৈছে" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME ফলবেক" +#~ msgid "Select Command" +#~ msgstr "কমান্ড বাছক" -#~ msgid "%d hour" -#~ msgid_plural "%d hours" -#~ msgstr[0] "%d ঘন্টা" -#~ msgstr[1] "%d ঘন্টা" - -#~ msgid "%d minute" -#~ msgid_plural "%d minutes" -#~ msgstr[0] "%d মিনিট" -#~ msgstr[1] "%d মিনিট" - -#~ msgid "%d second" -#~ msgid_plural "%d seconds" -#~ msgstr[0] "%d ছেকেণ্ড" -#~ msgstr[1] "%d ছেকেণ্ড" +#~ msgid "Add Startup Program" +#~ msgstr "আৰম্ভৰ প্ৰগ্ৰাম যোগ কৰক" -#~ msgid "0 seconds" -#~ msgstr "0 ছেকেণ্ড" +#~ msgid "Edit Startup Program" +#~ msgstr "আৰম্ভৰ প্ৰগ্ৰাম সম্পাদন কৰক" -#~ msgid "Automatic logout in %s" -#~ msgstr "%s ত স্বচালিতভাৱে লগআউট কৰা হব" +#~ msgid "The startup command cannot be empty" +#~ msgstr "আৰম্ভৰ কমান্ড ৰিক্ত থাকিব নোৱাৰিব" -#~ msgid "" -#~ "This session is configured to automatically log out after a period of " -#~ "inactivity." -#~ msgstr "" -#~ "এই অধিবেশন নিষ্ক্ৰিয়তাৰ এটা অৱধিৰ পিছত স্বচালিতভাৱে লগ আউট কৰিবলে সংৰূপণ কৰা " -#~ "আছে।" +#~ msgid "The startup command is not valid" +#~ msgstr "আৰম্ভৰ কমান্ড অবৈধ" + +#~ msgid "Enabled" +#~ msgstr "সামৰ্থবান" + +#~ msgid "Icon" +#~ msgstr "আইকন" + +#~ msgid "Program" +#~ msgstr "প্ৰগ্ৰাম" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "আৰম্ভৰ এপ্লিকেচন পছন্দসমূহ" + +#~ msgid "No name" +#~ msgstr "নাম নোহোৱা" + +#~ msgid "No description" +#~ msgstr "বিৱৰণ নাই" + +#~ msgid "Could not display help document" +#~ msgstr "সহায় দস্তাবেজ প্ৰদৰ্শন কৰিবলৈ ব্যৰ্থ" + +#~ msgid "Some programs are still running:" +#~ msgstr "কিছুমান প্ৰগ্ৰাম চলি আছে:" -#~ msgid "Icon '%s' not found" -#~ msgstr "'%s' আইকন পোৱা নগল" +#~ msgid "Startup Applications" +#~ msgstr "আৰম্ভৰ এপ্লিকেচনসমূহ" -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "GNOME 3 ল'ড হ'বলৈ ব্যৰ্থ" +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "লগিন কৰাৰ সময়ত কোনবোৰ এপ্লিকেচন আৰম্ভ হব বাছক" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ফাইলটো এটা বৈধ .desktop ফাইল নহয়" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ডেস্কটপ ফাইলৰ অজ্ঞাত সংস্কৰণ '%s'" + +#~ msgid "Starting %s" +#~ msgstr "%s আৰম্ভ কৰা হৈছে" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "এই এপ্লিকেচনে কমান্ড-শাৰীৰ মাধ্যমে দস্তাবেজসমূহ গ্ৰহণ নকৰে" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "অপৰিচিত লঞ্চ বিকল্প: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' ডেস্কটপ প্ৰবিষ্টিৰ ক্ষেত্ৰত দস্তাবেজৰ URI প্ৰেৰণ কৰিব নোৱাৰি" + +#~ msgid "Not a launchable item" +#~ msgstr "এটা লঞ্চ কৰিব পৰা বস্তু নহয় " + +#~ msgid "Disable connection to session manager" +#~ msgstr "অধিবেশন ব্যৱস্থাপকৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "সংৰক্ষিত সংৰূপ অন্তৰ্ভুক্ত কৰা ফাইল ধাৰ্য্য কৰক" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "অধিবেশন ব্যৱস্থাপনাৰ ID উল্লেখ কৰক" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্পসমূহ:" + +#~ msgid "Show session management options" +#~ msgstr "অধিবেশন ব্যৱস্থাপনা বিকল্পসমূহ দেখুৱাওক" + +#~ msgid "Unknown" +#~ msgstr "অজ্ঞাত" + +#~ msgid "A program is still running:" +#~ msgstr "এটা প্ৰগ্ৰাম বৰ্তমানে চলি আছে:" #~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." #~ msgstr "" -#~ "দুৰ্ভাগ্যজনকভাৱে GNOME 3 সঠিকভাৱে আৰম্ভ হ'বলৈ ব্যৰ্থ হল আৰু ফলবেক অৱস্থাত " -#~ "আৰম্ভ হল।\n" -#~ "\n" -#~ "এইটোৱে খুব সম্ভব এয়া বুজায় যে আপোনাৰ চিস্টেম (গ্ৰাফিক্স হাৰ্ডওৱেৰ বা ড্ৰাইভাৰ) " -#~ "পূৰ্ণ GNOME 3 অনুভুতি চলাবলে সক্ষম নহয়।" - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "GNOME 3 ৰ বিষয়ে অধিক জানক" +#~ "প্ৰগ্ৰাম সমাপ্ত হোৱাৰ অপেক্ষা কৰা হৈছে। প্ৰগ্ৰাম বিঘ্নিত হ'লে আপুনি কাৰ্য্য হেৰুৱাব " +#~ "পাৰে।" #~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." #~ msgstr "" -#~ "লগিন অধিবেশন আৰম্ভ কৰিবলৈ ব্যৰ্থ (X চাৰ্ভাৰৰ সৈতে সংযোগ স্থাপন কৰিবলৈ ব্যৰ্থ)" +#~ "প্ৰগ্ৰামসমূহ সমাপ্ত হোৱাৰ বাবে অপেক্ষা কৰা হৈছে। প্ৰগ্ৰামসমূহ বিঘ্নিত হ'লে আপুনি " +#~ "কাৰ্য্য হেৰুৱাব পাৰে।" -#~ msgid "Exited with code %d" -#~ msgstr "%d ক'ডৰ সৈতে প্ৰস্থান কৰা হৈছে" +#~ msgid "Switch User Anyway" +#~ msgstr "তথাপিও ব্যৱহাৰকাৰী পৰিবৰ্তন কৰক" -#~ msgid "Killed by signal %d" -#~ msgstr "%d সঙ্কেত দ্বাৰা কিল কৰা হৈছে" +#~ msgid "Log Out Anyway" +#~ msgstr "তথাপিও লগআউট কৰক" -#~ msgid "Stopped by signal %d" -#~ msgstr "%d সঙ্কেত দ্বাৰা বন্ধ কৰা হৈছে" +#~ msgid "Suspend Anyway" +#~ msgstr "তথাপিও স্থগিত কৰক" -#~ msgid "Some programs are still running:" -#~ msgstr "কিছুমান প্ৰগ্ৰাম এতিয়াও চলি আছে:" +#~ msgid "Hibernate Anyway" +#~ msgstr "তথাপিও হাইবাৰনেইট কৰক" -#~| msgid "" -#~| "A problem has occurred and the system can't recover.\n" -#~| "Please log out and try again." -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "এটা সমস্যা দেখা দিছে আৰু চিস্টেমটো উদ্ধাৰ হব পৰা নাই। তলত থকা কিছুমান " -#~ "সম্প্ৰসাৰনৰ বাবে এনে হব পাৰে।\n" -#~ "অনুগ্ৰহ কৰি কিছুমান অসামৰ্থবান কৰাৰ চেষ্টা কৰক, আৰু তাৰ পিছত লগ আউট কৰক আৰু পুনৰ " -#~ "চেষ্টা কৰক।" +#~ msgid "Shut Down Anyway" +#~ msgstr "তথাপিও বন্ধ কৰক" + +#~ msgid "Restart Anyway" +#~ msgstr "তথাপিও পুনৰাম্ভ কৰক" + +#~ msgid "Lock Screen" +#~ msgstr "পৰ্দা লক কৰক" + +#~ msgid "Cancel" +#~ msgstr "বাতিল কৰক" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে আপোনাক লগআউট কৰা হব।" +#~ msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে আপোনাক লগআউট কৰা হব।" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম বন্ধ কৰা হব।" +#~ msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম বন্ধ কৰা হব।" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম পুনাৰম্ভ কৰা হব।" +#~ msgstr[1] "%d ছেকেণ্ডৰ পিছত স্বচালিতভাৱে চিস্টেম পুনাৰম্ভ কৰা হব।" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "বৰ্তমানে আপুনি \"%s\" হিচাপে লগিন কৰিছে।" + +#~ msgid "Log out of this system now?" +#~ msgstr "এতিয়াই চিস্টেমৰ পৰা লগআউট কৰিব নে?" + +#~ msgid "_Switch User" +#~ msgstr "ব্যৱহাৰকাৰী পৰিবৰ্তন কৰক (_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "এই মুহূৰ্তে চিস্টেম বন্ধ কৰিব নে?" + +#~ msgid "S_uspend" +#~ msgstr "স্থগিত কৰক (_u)" + +#~ msgid "_Hibernate" +#~ msgstr "হাইবাৰনেইট কৰক (_H)" + +#~ msgid "_Restart" +#~ msgstr "পুনৰাম্ভ কৰক (_R)" + +#~ msgid "_Shut Down" +#~ msgstr "বন্ধ কৰক (_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "এই চিস্টেম এতিয়া পুনৰাম্ভ কৰিব নে?" diff -Nru gnome-session-3.9.90/po/be.po gnome-session-3.14.0/po/be.po --- gnome-session-3.9.90/po/be.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/be.po 2014-06-25 18:06:33.000000000 +0000 @@ -1,12 +1,12 @@ # Vital Khilko , 2003. -# Ihar Hrachyshka , 2006, 2011. +# Ihar Hrachyshka , 2006, 2011, 2013. # Alexander Nyakhaychyk , 2006, 2008, 2009. msgid "" msgstr "" "Project-Id-Version: gnome-session.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-22 19:20+0000\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" "PO-Revision-Date: 2012-09-07 18:03+0300\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian \n" @@ -37,31 +37,31 @@ msgid "The startup command is not valid" msgstr "Хібны загад аўтазапуску" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Уключана" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Значок" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Праграма" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Настройкі праграм аўтазапуску" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Няма назвы" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Няма апісання" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Версія гэтай праграмы" @@ -69,14 +69,6 @@ msgid "Could not display help document" msgstr "Не ўдалося паказаць даведачны дакумент" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Сеанс уваходу ў GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Уласны" @@ -85,10 +77,35 @@ msgid "This entry lets you select a saved session" msgstr "Гэты выбар дазваляе выбраць раней захаваны сеанс" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Сеанс уваходу ў GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME-пустышка" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Праграмы аўтазапуску" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Выбар праграмы для аўтазапуску пры ўваходзе ў сеанс" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME на Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Гэты сеанс прызначаны для ўваходу ў GNOME з выкарыстаннем Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Уласны сеанс" @@ -113,18 +130,6 @@ msgid "_Continue" msgstr "_Працягнуць" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Некаторыя праграмы дасюль запушчаныя:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Праграмы аўтазапуску" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Выбар праграмы для аўтазапуску пры ўваходзе ў сеанс" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Дадатковыя праграмы _аўтазапуску:" @@ -230,11 +235,11 @@ msgid "Show session management options" msgstr "Паказаць опцыі для кіравання сеансам" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Нешта пайшло не так, як мае быць!" -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -242,7 +247,7 @@ "Узнікла праблема, пасля якой сістэма не здолела ўзнавіць працу. Звярніцеся " "да вашага сістэмнага адміністратара." -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -250,7 +255,7 @@ "Узнікла праблема, пасля якой сістэма не здолела ўзнавіць працу. Для пэўнасці " "ўсе пашырэнні былі выключаны." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -258,142 +263,23 @@ "Узнікла праблема, пасля якой сістэма не здолела ўзнавіць працу.\n" "Выйдзіце з сеанса і паўтарыце спробу." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Выйсці" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Уключыць адладачны код" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Дазволіць выхад з сеанса" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Паказаць перасцярогі ад пашырэння" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Невядома" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Праграма дасюль запушчана:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Чакаем заканчэння працы праграмы. Перарваўшы праграму, можна страціць " -"наробак." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Чакаем заканчэння працы праграм. Перарваўшы іх, можна страціць наробак." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Прымусова пераключыць карыстальніка" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Прымусова выйсці з сеанса" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Прымусова супыніць камп'ютар" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Прымусовая гібернацыя" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Прымусова выключыць камп'ютар" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Прымусова перазапусціць камп'ютар" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Замкнуць экран" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Скасаваць" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Аўтаматычны выхад з сеанса праз %d секунду." -msgstr[1] "Аўтаматычны выхад з сеанса праз %d секунды." -msgstr[2] "Аўтаматычны выхад з сеанса праз %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Аўтаматычнае выключэнне камп'ютара праз %d секунду." -msgstr[1] "Аўтаматычнае выключэнне камп'ютара праз %d секунды." -msgstr[2] "Аўтаматычнае выключэнне камп'ютара праз %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Аўтаматычная перазагрузка камп'ютара праз %d секунду." -msgstr[1] "Аўтаматычная перазагрузка камп'ютара праз %d секунды." -msgstr[2] "Аўтаматычная перазагрузка камп'ютара праз %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Вы ўвайшлі ў сістэму як \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Выйсці з сеанса?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Пераключыць _карыстальніка" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Выключыць камп'ютар?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Супыніць камп'ютар" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Гібернацыя" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Пера_запусціць камп'ютар" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "В_ыключыць камп'ютар" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Перазагрузіць камп'ютар?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Не адказвае" @@ -405,11 +291,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Запомненыя праграмы" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Гэта праграма замінае выхаду з сеанса" @@ -424,32 +310,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Не ўдалося стварыць ICE-сокет праслухоўвання: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Засланіць звычайныя каталогі аўтазапуску" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "КАТАЛОГ_АЎТАЗАПУСКУ" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Патрэбны сеанс" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "НАЗВА_СЕАНСА" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Не запускаць праграм, вызначаных карыстальнікам" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Паказаць аварыйнае дыялогавае акенца" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - кіраўнік сеансаў GNOME" @@ -548,3 +434,4 @@ #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "Праграма запушчана з несумяшчальнымі опцыямі" + diff -Nru gnome-session-3.9.90/po/bg.po gnome-session-3.14.0/po/bg.po --- gnome-session-3.9.90/po/bg.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/bg.po 2014-07-18 20:50:42.000000000 +0000 @@ -1,7 +1,7 @@ # Bulgarian translation of gnome-session po-file. # Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc. # Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. -# Copyright (C) 2012, 2013 Free Software Foundation, Inc. +# Copyright (C) 2012, 2013, 2014 Free Software Foundation, Inc. # Pavel Cholakov , 2001. # Yanko Kaneti , 2002. # Vladimir "Kaladan" Petkov , 2004, 2005. @@ -9,15 +9,15 @@ # Yavor Doganov , 2008. # Damyan Ivanov , 2010. # Alexander Shopov , 2002, 2005, 2006, 2007, 2009, 2010. -# Alexander Shopov , 2011, 2012, 2013. +# Alexander Shopov , 2011, 2012, 2013, 2014. # Krasimir Chonov , 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-18 05:34+0200\n" -"PO-Revision-Date: 2013-01-18 05:34+0200\n" +"POT-Creation-Date: 2014-06-28 07:59+0300\n" +"PO-Revision-Date: 2014-06-28 07:59+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -26,57 +26,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Избор на команда" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Добавяне на програма стартираща при влизане" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Редактиране на програмите стартиращи при влизане" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "Командата за програма стартираща при влизане не може да е празна" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "Командата за програма стартираща при влизане е неправилна" - -#: ../capplet/gsm-properties-dialog.c:518 -msgid "Enabled" -msgstr "Включена" - -#: ../capplet/gsm-properties-dialog.c:530 -msgid "Icon" -msgstr "Икона" - -#: ../capplet/gsm-properties-dialog.c:542 -msgid "Program" -msgstr "Програма" - -#: ../capplet/gsm-properties-dialog.c:746 -msgid "Startup Applications Preferences" -msgstr "Настройки за автоматично стартиране на програми" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Без име" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Без описание" - -#: ../capplet/main.c:35 ../gnome-session/main.c:264 -msgid "Version of this application" -msgstr "Версията на тази програма" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Документът от помощта не може да бъде показан" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Други" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Оттук може да изберете сесия, която сте запазили вие" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -86,22 +42,42 @@ msgid "This session logs you into GNOME" msgstr "Влизане в GNOME" -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "Резервен вариант за GNOME" - -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "Some programs are still running:" -msgstr "Все още работят програмите:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Автоматично стартирани програми" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "" -"Изберете програмите, които да се стартират при влизането ви в системата" +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "GNOME — фиктивна" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME с Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Влизане в GNOME с използване на Wayland" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "Друга сесия" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Изберите коя друга сесия да се стартира" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "_Нова сесия" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "Из_триване на сесия" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "Пре_именуване на сесия" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Продължаване" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -139,79 +115,11 @@ msgid "_Name:" msgstr "_Име:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Файлът не е във формат .desktop" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Непозната версия на файла: %s" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Стартиране на %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Програмата не приема документи през командния ред" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Непозната опция при стартиране „%d“" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "В обекти от вида „Type=Link“ не може да се подават адреси на документи" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Не е обект за стартиране" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Изключване на връзката с управлението на сесиите" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Указване на файла със запазените настройки" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ФАЙЛ" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Указване на идентификатор за управлението на сесиите" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ИДЕНТИФИКАТОР" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Настройки на управлението на сесии:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Показване на настройките за управлението на сесиите" - -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "О, не! Нещо се обърка." -#: ../gnome-session/gsm-fail-whale-dialog.c:313 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -219,7 +127,7 @@ "Възникна проблем и системата не може да се справи. Свържете се със системен " "администратор" -#: ../gnome-session/gsm-fail-whale-dialog.c:315 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -227,7 +135,7 @@ "Възникна проблем и системата не може да се справи. За всеки случай всички " "разширения са изключени." -#: ../gnome-session/gsm-fail-whale-dialog.c:317 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -235,181 +143,27 @@ "Възникна проблем и системата не може да се справи.\n" "Излезте от системата и опитайте отново." -#: ../gnome-session/gsm-fail-whale-dialog.c:332 -#: ../gnome-session/gsm-logout-dialog.c:383 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "_Изход" -#: ../gnome-session/gsm-fail-whale-dialog.c:354 ../gnome-session/main.c:262 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "Включване на изчистването на грешки" -#: ../gnome-session/gsm-fail-whale-dialog.c:355 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "Разрешаване на изхода" -#: ../gnome-session/gsm-fail-whale-dialog.c:356 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Показване на предупреждение за разширение" -#: ../gnome-session/gsm-inhibit-dialog.c:463 -msgid "Unknown" -msgstr "Непозната" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "A program is still running:" -msgstr "Все още работи програмата:" - -#: ../gnome-session/gsm-inhibit-dialog.c:512 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Изчакване на програмата да завърши. Прекъсването ѝ може да доведе до загуба " -"на информация." - -#: ../gnome-session/gsm-inhibit-dialog.c:516 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Изчакване на програмите да завършат. Прекъсването им може да доведе до " -"загуба на информация." - -#: ../gnome-session/gsm-inhibit-dialog.c:746 -msgid "Switch User Anyway" -msgstr "Смяна на потребител" - -#: ../gnome-session/gsm-inhibit-dialog.c:749 -msgid "Log Out Anyway" -msgstr "Изход въпреки всичко" - -#: ../gnome-session/gsm-inhibit-dialog.c:752 -msgid "Suspend Anyway" -msgstr "Приспиване" - -#: ../gnome-session/gsm-inhibit-dialog.c:755 -msgid "Hibernate Anyway" -msgstr "Дълбоко приспиване" - -#: ../gnome-session/gsm-inhibit-dialog.c:758 -msgid "Shut Down Anyway" -msgstr "Спиране въпреки всичко" - -#: ../gnome-session/gsm-inhibit-dialog.c:761 -msgid "Restart Anyway" -msgstr "Рестартиране въпреки всичко" - -#: ../gnome-session/gsm-inhibit-dialog.c:769 -msgid "Lock Screen" -msgstr "Заключване на екрана" - -#: ../gnome-session/gsm-inhibit-dialog.c:772 -msgid "Cancel" -msgstr "Отказ" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:262 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Ще излезете от системата автоматично след %d секунда." -msgstr[1] "Ще излезете от системата автоматично след %d секунди." - -#: ../gnome-session/gsm-logout-dialog.c:270 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Компютърът ще се изключи автоматично след %d секунда." -msgstr[1] "Компютърът ще се изключи автоматично след %d секунди." - -#: ../gnome-session/gsm-logout-dialog.c:278 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Компютърът ще се рестартира автоматично след %d секунда." -msgstr[1] "Компютърът ще се рестартира автоматично след %d секунди." - -#: ../gnome-session/gsm-logout-dialog.c:302 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "В момента сте влезли като „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:368 -msgid "Log out of this system now?" -msgstr "Излизане от системата?" - -#: ../gnome-session/gsm-logout-dialog.c:374 -msgid "_Switch User" -msgstr "_Смяна на потребител" - -#: ../gnome-session/gsm-logout-dialog.c:389 -msgid "Shut down this system now?" -msgstr "Изключване на системата?" - -#: ../gnome-session/gsm-logout-dialog.c:395 -msgid "S_uspend" -msgstr "_Приспиване" - -#: ../gnome-session/gsm-logout-dialog.c:401 -msgid "_Hibernate" -msgstr "_Дълбоко приспиване" - -#: ../gnome-session/gsm-logout-dialog.c:407 -#: ../gnome-session/gsm-logout-dialog.c:433 -msgid "_Restart" -msgstr "_Рестартиране" - -#: ../gnome-session/gsm-logout-dialog.c:417 -msgid "_Shut Down" -msgstr "Изключване на _компютъра" - -#: ../gnome-session/gsm-logout-dialog.c:423 -msgid "Restart this system now?" -msgstr "Рестартиране на системата?" - -#: ../gnome-session/gsm-manager.c:1458 ../gnome-session/gsm-manager.c:2206 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Не отговаря" -#: ../gnome-session/gsm-manager.c:2819 -#, c-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d час" -msgstr[1] "%d часа" - -#: ../gnome-session/gsm-manager.c:2820 -#, c-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d минута" -msgstr[1] "%d минути" - -#: ../gnome-session/gsm-manager.c:2821 -#, c-format -msgid "%d second" -msgid_plural "%d seconds" -msgstr[0] "%d секунда" -msgstr[1] "%d секунди" - -#: ../gnome-session/gsm-manager.c:2830 -msgid "0 seconds" -msgstr "%d секунда" - -#: ../gnome-session/gsm-manager.c:2855 -#, c-format -msgid "Automatic logout in %s" -msgstr "Автоматичен изход след %s" - -#: ../gnome-session/gsm-manager.c:2856 -msgid "" -"This session is configured to automatically log out after a period of " -"inactivity." -msgstr "" -"Сесията е настроена автоматично да се прекъсне след период на бездействие." - -#: ../gnome-session/gsm-util.c:417 +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "_Изход" @@ -417,15 +171,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Запомнена програма" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Тази програма блокира излизането." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -433,41 +187,45 @@ "Отхвърляне на свързванията с нови клиенти, защото тази сесия в момента се " "затваря\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Неуспех при създаването на гнездо на ICE за слушане: %s" -#: ../gnome-session/main.c:260 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Използване на различни от стандартните папки за стартиране при влизане" -#: ../gnome-session/main.c:260 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "ПАПКА_ЗА_АВТОМАТИЧНО_СТАРТИРАНЕ" -#: ../gnome-session/main.c:261 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Коя сесия да се ползва" -#: ../gnome-session/main.c:261 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "ИМЕ_НА_СЕСИЯ" -#: ../gnome-session/main.c:263 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "Да не се зареждат програми, зададени от потребителя" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Версията на тази програма" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "Показване на черния екран за грешка с тестови цели" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr "— управление на сесиите на GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -505,41 +263,66 @@ "Ако не е указана опция „--inhibit“, за стандартна се ползва стойност " "„idle“.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Неуспешно изпълнение на %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s изисква аргумент\n" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-selector.c:61 +#, c-format +msgid "Session %d" +msgstr "Сесия %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" +"Имената на сесиите не могат за започват със знака „.“ или да съдържат знака " +"„/“" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Имената на сесиите не могат за започват със знака „.“" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Имената на сесиите не могат да съдържат знака „/“" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "Вече има сесия с това име — „%s“" + +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Изход" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Изключване" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Рестартиране" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Изход въпреки блокиращите програми" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "Без потвърждаване" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "Не може да се изгради връзка към управлението на сесии" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Програмата е стартирана с противоречащи си опции" diff -Nru gnome-session-3.9.90/po/bn_IN.po gnome-session-3.14.0/po/bn_IN.po --- gnome-session-3.9.90/po/bn_IN.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/bn_IN.po 2014-09-22 14:18:16.000000000 +0000 @@ -6,22 +6,23 @@ # Khandakar Mujahidul Islam , 2003-2005. # Runa Bhattacharjee , 2008. # Runa Bhattacharjee , 2008, 2009, 2010, 2011, 2012. +# sray , 2013. #zanata msgid "" msgstr "" "Project-Id-Version: bn_IN\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2012-07-17 02:00+0000\n" -"PO-Revision-Date: 2012-09-21 15:17+0530\n" -"Last-Translator: Runa Bhattacharjee \n" +"PO-Revision-Date: 2013-09-25 07:13-0400\n" +"Last-Translator: sray \n" "Language-Team: Bengali (India) \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"Language: bn-IN\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "\n" +"X-Generator: Zanata 3.1.2\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -43,31 +44,32 @@ msgid "The startup command is not valid" msgstr "প্রারম্ভিক কমান্ডের নাম উল্লেখ করা আবশ্যক" -#: ../capplet/gsm-properties-dialog.c:518 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "সক্রিয়" -#: ../capplet/gsm-properties-dialog.c:530 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "আইকন" -#: ../capplet/gsm-properties-dialog.c:542 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "প্রোগ্রাম" -#: ../capplet/gsm-properties-dialog.c:746 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "প্রারম্ভিক অ্যাপ্লিকেশন সংক্রান্ত পছন্দ" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "নামবিহীন" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "বিবরণ অনুপস্থিত" -#: ../capplet/main.c:35 ../gnome-session/main.c:294 +#: ../capplet/main.c:35 +#: ../gnome-session/main.c:288 msgid "Version of this application" msgstr "অ্যাপ্লিকেশনের সংস্করণ" @@ -75,11 +77,8 @@ msgid "Could not display help document" msgstr "সহায়ক নথিপত্র প্রদর্শন করতে ব্যর্থ" -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "GNOME ফল-ব্যাক" - -#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1 +#: ../data/gnome.desktop.in.h:1 +#: ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -87,19 +86,51 @@ msgid "This session logs you into GNOME" msgstr "এই সেশানের মাধ্যমে GNOME-এ লগ-ইন করা যাবে" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:643 +# auto translated by TM merge from project: system-config-printer, version: 1.1.16-23, DocId: system-config-printer +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "স্বনির্ধারিত" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "এই এন্ট্রি অাপনাকে একটি সংরক্ষিত সেশন নির্বাচন করতে দেয়" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "GNOME ডামি" + +# auto translated by TM merge from project: gdm, version: 3.8.4, DocId: gdm +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "স্বনির্ধারিত সেশান" + +#: ../data/session-selector.ui.h:2 +#: ../tools/gnome-session-selector.c:103 +msgid "Please select a custom session to run" +msgstr "চালাতে অনুগ্রহ করে একটি স্বনির্বাচিত সেশন নির্বাচন করুন" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "নতুন সেশন (_N)" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "সেশন সরান (_R)" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "সেশনের নাম পরিবর্তন করুন (_m)" + +# auto translated by TM merge from project: brasero, version: 3.8.0, DocId: brasero +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "এগিয়ে চলুন (_C)" + +#: ../data/gsm-inhibit-dialog.ui.h:1 +#: ../gnome-session/gsm-inhibit-dialog.c:514 msgid "Some programs are still running:" msgstr "কয়েকটি প্রোগ্রাম চলছে:" -#: ../data/gsm-inhibit-dialog.ui.h:2 ../gnome-session/gsm-inhibit-dialog.c:640 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you " -"to lose work." -msgstr "" -"প্রোগ্রাম সমাপ্তির অপেক্ষা করা হচ্ছে। প্রোগ্রাম বিঘ্নিত হলে সঞ্চালিত কর্মের " -"তথ্য মুছে " -"যাওয়ার সম্ভাবনা রয়েছে।" - #: ../data/session-properties.desktop.in.in.h:1 msgid "Startup Applications" msgstr "প্রারম্ভিক অ্যাপ্লিকেশন" @@ -123,7 +154,6 @@ "(_A)" #: ../data/session-properties.ui.h:4 -#| msgid "_Remember Currently Running Application" msgid "_Remember Currently Running Applications" msgstr "বর্তমানে চলমান অ্যাপ্লিকেশনের তালিকা মনে রাখা হবে (_R)" @@ -216,259 +246,302 @@ msgid "Show session management options" msgstr "সেশন পরিচালনা সংক্রান্ত বিকল্প প্রদর্শন করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "'%s' আইকন পাওয়া যায়নি" +#: ../gnome-session/gsm-fail-whale-dialog.c:286 +msgid "Oh no! Something has gone wrong." +msgstr "ওহ হো! কিছু সমস্যা হয়েছে।" + +#: ../gnome-session/gsm-fail-whale-dialog.c:293 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "" +"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়। অনুগ্রহ করে সিস্টেম " +"অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।" + +#: ../gnome-session/gsm-fail-whale-dialog.c:295 +msgid "" +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." +msgstr "" +"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়। সাবধানতা হিসাবে সকল " +"এক্সটেনশন নিষ্ক্রিয় করা হয়েছে।" + +#: ../gnome-session/gsm-fail-whale-dialog.c:297 +msgid "" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." +msgstr "" +"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়।\n" +"অনুগ্রহ করে লগ আউট করে পুনরায় প্রয়াস করুন।" + +#: ../gnome-session/gsm-fail-whale-dialog.c:312 +#: ../gnome-session/gsm-logout-dialog.c:384 +msgid "_Log Out" +msgstr "লগ-আউট করুন (_L)" + +#: ../gnome-session/gsm-fail-whale-dialog.c:334 +#: ../gnome-session/main.c:286 +msgid "Enable debugging code" +msgstr "কোড ডিবাগ ব্যবস্থা সক্রিয় করুন" + +#: ../gnome-session/gsm-fail-whale-dialog.c:335 +msgid "Allow logout" +msgstr "লগ অাউটের অনুমতি দিন" + +#: ../gnome-session/gsm-fail-whale-dialog.c:336 +msgid "Show extension warning" +msgstr "এক্সটেনশন সর্তকতা দেখান" -#: ../gnome-session/gsm-inhibit-dialog.c:588 +#: ../gnome-session/gsm-inhibit-dialog.c:462 msgid "Unknown" msgstr "অজানা" -#: ../gnome-session/gsm-inhibit-dialog.c:639 +#: ../gnome-session/gsm-inhibit-dialog.c:510 msgid "A program is still running:" msgstr "একটি প্রোগ্রাম বর্তমানে চলছে:" -#: ../gnome-session/gsm-inhibit-dialog.c:644 +#: ../gnome-session/gsm-inhibit-dialog.c:511 msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you " -"to lose work." +"Waiting for the program to finish. Interrupting the program may cause you to " +"lose work." msgstr "" -"প্রোগ্রাম সমাপ্তির অপেক্ষা করা হচ্ছে। প্রোগ্রাম বিঘ্নিত হলে সঞ্চালিত কর্মের " -"ফলে মুছে " -"যাওয়ার সম্ভাবনা রয়েছে।" +"প্রোগ্রাম সমাপ্ত হওয়ার অপেক্ষা করা হয়েছে। প্রোগ্রামটিকে মাঝপথে বাধা দিলে " +"অাপনার করা কাজ অাপনাকে হারাতে হতে পারে।" -#: ../gnome-session/gsm-inhibit-dialog.c:874 +#: ../gnome-session/gsm-inhibit-dialog.c:515 +msgid "" +"Waiting for programs to finish. Interrupting these programs may cause you to " +"lose work." +msgstr "" +"প্রোগ্রামগুলি সমাপ্ত হওয়ার অপেক্ষা করা হচ্ছে। এই প্রোগ্রামগুলিকে মাঝপথে বাধা " +"দিলে অাপনার করা কাজ অাপনাকে হারাতে হতে পারে।" + +#: ../gnome-session/gsm-inhibit-dialog.c:745 msgid "Switch User Anyway" msgstr "তথাপি ব্যবহারকারী অ্যাকাউন্ট পরিবর্তন করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:877 +#: ../gnome-session/gsm-inhibit-dialog.c:748 msgid "Log Out Anyway" msgstr "তথাপি লগ-আউট করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:880 +#: ../gnome-session/gsm-inhibit-dialog.c:751 msgid "Suspend Anyway" msgstr "তথাপি স্থগিত করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:883 +#: ../gnome-session/gsm-inhibit-dialog.c:754 msgid "Hibernate Anyway" msgstr "তথাপি নিদ্রিত করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:886 +#: ../gnome-session/gsm-inhibit-dialog.c:757 msgid "Shut Down Anyway" msgstr "তথাপি বন্ধ করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:889 -#| msgid "Reboot Anyway" +#: ../gnome-session/gsm-inhibit-dialog.c:760 msgid "Restart Anyway" msgstr "তথাপি পুনরারম্ভ করা হবে" -#: ../gnome-session/gsm-inhibit-dialog.c:897 +#: ../gnome-session/gsm-inhibit-dialog.c:768 msgid "Lock Screen" msgstr "পর্দা লক করুন" -#: ../gnome-session/gsm-inhibit-dialog.c:900 +#: ../gnome-session/gsm-inhibit-dialog.c:771 msgid "Cancel" msgstr "বাতিল" #. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:266 +#: ../gnome-session/gsm-logout-dialog.c:263 #, c-format msgid "You will be automatically logged out in %d second." msgid_plural "You will be automatically logged out in %d seconds." msgstr[0] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে আপনাকে লগ-আউট করা হবে।" msgstr[1] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে আপনাকে লগ-আউট করা হবে।" -#: ../gnome-session/gsm-logout-dialog.c:274 +#: ../gnome-session/gsm-logout-dialog.c:271 #, c-format msgid "This system will be automatically shut down in %d second." msgid_plural "This system will be automatically shut down in %d seconds." msgstr[0] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম বন্ধ করা হবে।" msgstr[1] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম বন্ধ করা হবে।" -#: ../gnome-session/gsm-logout-dialog.c:282 +#: ../gnome-session/gsm-logout-dialog.c:279 #, c-format -#| msgid "This system will be automatically shut down in %d second." -#| msgid_plural "This system will be automatically shut down in %d seconds." msgid "This system will be automatically restarted in %d second." msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম পুনরারম্ভ করা হবে।" -msgstr[1] "%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম পুনরারম্ভ করা হবে।" +msgstr[0] "" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম পুনরারম্ভ করা হবে।" +msgstr[1] "" +"%d সেকেন্ড অতিক্রান্ত হলে স্বয়ংক্রিয়রূপে সিস্টেম পুনরারম্ভ করা হবে।" -#: ../gnome-session/gsm-logout-dialog.c:306 +#: ../gnome-session/gsm-logout-dialog.c:303 #, c-format msgid "You are currently logged in as \"%s\"." msgstr "বর্তমানে \"%s\" পরিচয়ে লগ-ইন করা হয়েছে।" -#: ../gnome-session/gsm-logout-dialog.c:372 +#: ../gnome-session/gsm-logout-dialog.c:369 msgid "Log out of this system now?" msgstr "এই মুহূর্তে সিস্টেম থেকে লগ-আউট করা হবে কি?" -#: ../gnome-session/gsm-logout-dialog.c:378 +#: ../gnome-session/gsm-logout-dialog.c:375 msgid "_Switch User" msgstr "ব্যবহারকারী পরিবর্তন করুন (_S)" -#: ../gnome-session/gsm-logout-dialog.c:387 -#: ../gnome-session/gsm-fail-whale-dialog.c:337 -#: ../gnome-session/gsm-util.c:389 -msgid "_Log Out" -msgstr "লগ-আউট করুন (_L)" - -#: ../gnome-session/gsm-logout-dialog.c:393 +#: ../gnome-session/gsm-logout-dialog.c:390 msgid "Shut down this system now?" msgstr "এই মুহূর্তে সিস্টেম বন্ধ করা হবে কি?" -#: ../gnome-session/gsm-logout-dialog.c:399 +#: ../gnome-session/gsm-logout-dialog.c:396 msgid "S_uspend" msgstr "স্থগিত করা হবে (_u)" -#: ../gnome-session/gsm-logout-dialog.c:405 +#: ../gnome-session/gsm-logout-dialog.c:402 msgid "_Hibernate" msgstr "নিদ্রিত অবস্থা (_H)" -#: ../gnome-session/gsm-logout-dialog.c:411 -#: ../gnome-session/gsm-logout-dialog.c:437 +#: ../gnome-session/gsm-logout-dialog.c:408 +#: ../gnome-session/gsm-logout-dialog.c:434 msgid "_Restart" msgstr "পুনরারম্ভ (_R)" -#: ../gnome-session/gsm-logout-dialog.c:421 +#: ../gnome-session/gsm-logout-dialog.c:418 msgid "_Shut Down" msgstr "বন্ধ করুন (_S)" -#: ../gnome-session/gsm-logout-dialog.c:427 -#| msgid "Shut down this system now?" +#: ../gnome-session/gsm-logout-dialog.c:424 msgid "Restart this system now?" msgstr "অবিলম্বে সিস্টেম পুনরারম্ভ করা হবে কি?" -#: ../gnome-session/gsm-fail-whale-dialog.c:311 -msgid "Oh no! Something has gone wrong." -msgstr "ওহ হো! কিছু সমস্যা হয়েছে।" - -#: ../gnome-session/gsm-fail-whale-dialog.c:318 -msgid "" -"A problem has occurred and the system can't recover. Please contact a system " -"administrator" -msgstr "" -"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়। অনুগ্রহ করে সিস্টেম " -"অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন।" - -#: ../gnome-session/gsm-fail-whale-dialog.c:320 -msgid "" -"A problem has occurred and the system can't recover. All extensions have " -"been disabled as a precaution." -msgstr "" -"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়। সাবধানতা হিসাবে সকল " -"এক্সটেনশন নিষ্ক্রিয় করা হয়েছে।" - -#: ../gnome-session/gsm-fail-whale-dialog.c:322 -msgid "" -"A problem has occurred and the system can't recover.\n" -"Please log out and try again." -msgstr "" -"একটি সমস্যা হয়েছে এবং সিস্টেমটি পুনরুদ্ধার করা সম্ভব নয়।\n" -"অনুগ্রহ করে লগ আউট করে পুনরায় প্রয়াস করুন।" - -#: ../gnome-session/gsm-manager.c:1393 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 লোড করতে ব্যর্থ" - -#: ../gnome-session/gsm-manager.c:1394 -#| msgid "" -#| "Unfortunately GNOME 3 failed to start properly and started in the " -#| "fallback mode.\n" -#| "\n" -#| "This most likely means your graphics hardwayre is not capable to run the " -#| "full GNOME 3 experience" -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the " -"fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not " -"capable of delivering the full GNOME 3 experience." -msgstr "" -"দুর্ভাগ্যবসত, GNOME 3 সঠিকভাবে আরম্ভ করতে ব্যর্থ হয়েছে ও ফল-ব্যাক মোডে " -"আরম্ভ " -"করা হয়েছে।\n" -"\n" -"সম্ভবত GNOME 3-র সম্পূর্ণ ব্যবহারের অভিজ্ঞতার জন্য আপনার সিস্টেমের " -"হার্ডওয়্যারের (গ্রাফিক্স হার্ডওয়্যার অথবা ড্রাইভার)" -"প্রয়োজনীয় ক্ষমতা নেই।" - -#: ../gnome-session/gsm-manager.c:1396 -msgid "Learn more about GNOME 3" -msgstr "GNOME 3 সম্বন্ধে অধিক তথ্য" - -#: ../gnome-session/gsm-manager.c:1493 ../gnome-session/gsm-manager.c:2234 +#: ../gnome-session/gsm-manager.c:1432 +#: ../gnome-session/gsm-manager.c:2190 msgid "Not responding" msgstr "কোনো প্রতিক্রিয়া হয়নি" +# auto translated by TM merge from project: gnome-session, version: 3.8.4, DocId: gnome-session-3.0 +#: ../gnome-session/gsm-util.c:411 +msgid "_Log out" +msgstr "লগ-আউট করুন (_L)" + #. It'd be really surprising to reach this code: if we're here, #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. -#. -#: ../gnome-session/gsm-xsmp-client.c:559 -#| msgid "_Remember Currently Running Application" +#: ../gnome-session/gsm-xsmp-client.c:558 msgid "Remembered Application" msgstr "অ্যাপ্লিকোশন মনে রাখা হবে" -#: ../gnome-session/gsm-xsmp-client.c:1197 +#: ../gnome-session/gsm-xsmp-client.c:1196 msgid "This program is blocking logout." msgstr "এই প্রোগ্রাম দ্বারা লগ-আউট করতে প্রতিরোধ করা হচ্ছে।" -#: ../gnome-session/gsm-xsmp-server.c:326 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "সিস্টেম বর্তমানে বন্ধ করার প্রচেষ্টা করা হচ্ছে ও এই কারণে নতুন ক্লায়েন্টের " -"সাথে সংযোগ " -"স্থাপনের অনুরোধ প্রত্যাখ্যান করা হচ্ছে।\n" +"সাথে সংযোগ স্থাপনের অনুরোধ প্রত্যাখ্যান করা হচ্ছে।\n" -#: ../gnome-session/gsm-xsmp-server.c:595 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE অপেক্ষার সকেট নির্মাণ করতে ব্যর্থ: %s" -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:373 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "" -"লগ-ইন সেশান আরম্ভ করতে ব্যর্থ (X সার্ভারের সাথে সংযোগ স্থাপন করতে ব্যর্থ)" - -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:284 msgid "Override standard autostart directories" msgstr "প্রমিত autostart ডিরেক্টরির মান উপেক্ষা করা হবে" -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:284 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:285 msgid "Session to use" msgstr "ব্যবহারযোগ্য সেশান" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:285 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:292 -msgid "Enable debugging code" -msgstr "কোড ডিবাগ ব্যবস্থা সক্রিয় করুন" - -#: ../gnome-session/main.c:293 +#: ../gnome-session/main.c:287 msgid "Do not load user-specified applications" msgstr "ব্যবহারকারী দ্বারা নির্ধারিত অ্যাপ্লিকেশন লোড করা হবে না" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:296 +#: ../gnome-session/main.c:290 msgid "Show the fail whale dialog for testing" msgstr "পরীক্ষার জন্য ফেইল-ওয়েইল ডায়লগটি প্রদর্শন করা হবে" -#: ../gnome-session/main.c:316 +#: ../gnome-session/main.c:324 msgid " - the GNOME session manager" msgstr "- GNOME সেশান পরিচালনা ব্যবস্থা" +#: ../tools/gnome-session-inhibit.c:110 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" + +#: ../tools/gnome-session-inhibit.c:148 +#, c-format +msgid "Failed to execute %s\n" +msgstr "%s সম্পাদন করা গেল না\n" + +#: ../tools/gnome-session-inhibit.c:208 +#: ../tools/gnome-session-inhibit.c:218 +#: ../tools/gnome-session-inhibit.c:228 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s এর একটি অার্গুমেন্টের অাবশ্যক\n" + +#: ../tools/gnome-session-selector.c:62 +#, c-format +msgid "Session %d" +msgstr "সেশন %d" + +#: ../tools/gnome-session-selector.c:108 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" +"সেশন নামগুলি ‘.’ দিয়ে শুরু করা যাবে না বা তাতে ‘/’ অক্ষর থাকলে চলবে না" + +#: ../tools/gnome-session-selector.c:112 +msgid "Session names are not allowed to start with ‘.’" +msgstr "সেশন নামগুলি ‘.’ দিয়ে শুরু হলে চলবে না" + +#: ../tools/gnome-session-selector.c:116 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "সেশন নামগুলিতে ‘/’ অক্ষর থাকলে চলবে না" + +#: ../tools/gnome-session-selector.c:124 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "‘%s’ নামের একটি সেশন ইতিমধ্যেই উপস্থিত" + #: ../tools/gnome-session-quit.c:53 msgid "Log out" msgstr "লগ-আউট" @@ -478,139 +551,22 @@ msgstr "বন্ধ করুন" #: ../tools/gnome-session-quit.c:55 -#| msgid "Reboot Anyway" msgid "Reboot" msgstr "পুনরারম্ভ" #: ../tools/gnome-session-quit.c:56 -#| msgid "Log out, ignoring any existing inhibitors" msgid "Ignoring any existing inhibitors" msgstr "কোনো উপস্থিত প্রতিরোধ অগ্রাহ্য করা হবে" #: ../tools/gnome-session-quit.c:57 -#| msgid "Do not require confirmation" msgid "Don't prompt for user confirmation" msgstr "ব্যবহারকারী দ্বারা নিশ্চিত করার অনুরোধ করা হবে না" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:91 +#: ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "সেশান পরিচালনব্যবস্থার সাথে সংযোগ স্থাপন করতে ব্যর্থ" #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "দ্বন্দ্বযুক্ত বিকল্প সহ প্রোগ্রাম আরম্ভের প্রচেষ্টা করা হয়েছে" - -#~ msgid "Some programs are still running:" -#~ msgstr "কয়েকটি প্রোগ্রাম এখনো চলছে:" - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "কনফিগারেশন সার্ভারে কিছু সমস্যা উপস্থিত রয়েছে।\n" -#~ "(%s প্রস্থানকালে %d অবস্থা উৎপন্ন হয়েছে)" - -#~ msgid "Show logout dialog" -#~ msgstr "লগ-আউটের ডায়লগ বক্স প্রদর্শন করা হবে" - -#~ msgid "Show shutdown dialog" -#~ msgstr "বন্ধ করার ডায়লগ বক্স প্রদর্শন করা হবে" - -#~ msgid "Use dialog boxes for errors" -#~ msgstr "ত্রুটির ক্ষেত্রে ডায়লগ বক্স ব্যবহার করুন" - -#~ msgid "Set the current session name" -#~ msgstr "বর্তমান সেশনের নাম নির্ধারণ করুন" - -#~ msgid "NAME" -#~ msgstr "NAME" - -#~ msgid "Kill session" -#~ msgstr "সেশান kill করুন" - -#~ msgid "Default session" -#~ msgstr "ডিফল্ট সেশান" - -#~ msgid "File Manager" -#~ msgstr "ফাইল পরিচালন ব্যবস্থা" - -#~ msgid "" -#~ "If enabled, gnome-session will prompt the user before ending a session." -#~ msgstr "" -#~ "সক্রিয় থাকলে, সেশান সমাপ্ত করার পূর্বে gnome-session দ্বারা ব্যবহারকারীকে সতর্ক " -#~ "করা হবে" - -#~| msgid "" -#~| "If enabled, gnome-session will prompt the user before ending a session." -#~ msgid "If enabled, gnome-session will save the session automatically." -#~ msgstr "সক্রিয় থাকলে, gnome-session দ্বারা স্বয়ংক্রিয়ভাবে সেশান সংরক্ষণ করা হবে।" - -#~ msgid "List of applications that are part of the default session." -#~ msgstr "ডিফল্ট সেশানের জন্য অ্যাপ্লিকেশনের তালিকা।" - -#~ msgid "" -#~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." -#~ msgstr "" -#~ "সেশানের জন্য আবশ্যক সমাগ্রীর তালিকা। (প্রতিটি বস্তুর জন্য \"/desktop/gnome/" -#~ "session/required-components\"-র অধীন একটি কি চিহ্নিত করা হয়েছে।) প্রারম্ভিক " -#~ "অ্যাপ্লিকেশনের পছন্দ নির্ধারণের বৈশিষ্ট্যের ফলে ব্যবহারকারীরা সেশানের কোনো আবশ্যক " -#~ "সামগ্রী সরাতে পারবেন না। কোনো সমাগ্রী মুছে ফেলা হলে, সেশান পরিচালন ব্যবস্থা " -#~ "দ্বারা তা পুনরায় যোগ করা হবে।" - -#~ msgid "Logout prompt" -#~ msgstr "লগ-আউট প্রম্পট" - -#~ msgid "Panel" -#~ msgstr "প্যানেল" - -#~ msgid "Required session components" -#~ msgstr "সেশানের আবশ্যক সামগ্রী" - -#~ msgid "Save sessions" -#~ msgstr "সেশন সংরক্ষণ করা হবে" - -#~ msgid "" -#~ "The file manager provides the desktop icons and allows you to interact " -#~ "with your saved files." -#~ msgstr "" -#~ "ফাইল পরিচালন ব্যবস্থা দ্বারা ডেস্কটপ আইকন উপলব্ধ করা হয় ও সংরক্ষিত ফাইলগুলির " -#~ "সাথে ইন্টারেক্ট করার সুবিধা উপস্থিত করা হয়।" - -#~ msgid "" -#~ "The number of minutes of inactivity before the session is considered idle." -#~ msgstr "সেশানকে কর্মবিহীন ধার্য করার পূর্বে চিহ্নিত মিনিট অবধি অপেক্ষা করা হবে।" - -#~ msgid "" -#~ "The panel provides the bar at the top or bottom of the screen containing " -#~ "menus, the window list, status icons, the clock, etc." -#~ msgstr "" -#~ "প্যানেলের সাহায্যে পর্দার উপর অথবা নীচের অংশে মেনু, উইন্ডো তালিকা, অবস্থাসূচক " -#~ "আইকন, ঘড়ি প্রভৃতি বার উপলব্ধ করা হয়।" - -#~ msgid "" -#~ "The window manager is the program that draws the title bar and borders " -#~ "around windows, and allows you to move and resize windows." -#~ msgstr "" -#~ "উইন্ডো পরিচালন ব্যবস্থার সাহায্যে উইন্ডোর শিরোনামের বার ও প্রান্তরেখা আঁকা হয় ও " -#~ "উইন্ডোর অবস্থান ও মাপ পরিবর্তন করা সম্ভব হবে।" - -#~ msgid "Time before session is considered idle" -#~ msgstr "সেশান কর্মবিহীন ধার্য করার পূর্বে কত সময় অপেক্ষা করা হবে" - -#~ msgid "Window Manager" -#~ msgstr "উইন্ডো পরিচালন ব্যবস্থা" - -#~ msgid "" -#~ "Waiting for program to finish. Interrupting program may cause you to " -#~ "lose work." -#~ msgstr "" -#~ "প্রোগ্রাম সমাপ্তির অপেক্ষা করা হচ্ছে। প্রোগ্রাম বিঘ্নিত হলে সঞ্চালিত কর্মের ফলাফল " -#~ "মুছে যাওয়ার সম্ভাবনা রয়েছে।" - -#~ msgid "GConf key used to lookup default session" -#~ msgstr "ডিফল্ট সেশান অনুসন্ধানের জন্য ব্যবহৃত GConf-কি" diff -Nru gnome-session-3.9.90/po/ca.po gnome-session-3.14.0/po/ca.po --- gnome-session-3.9.90/po/ca.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/ca.po 2014-06-25 18:06:33.000000000 +0000 @@ -7,15 +7,16 @@ # David Planella , 2008, 2009, 2010, 2011. # Jordi Serratosa , 2012. # Gil Forcada , 2013. +# Josep Sànchez , 2013. # msgid "" msgstr "" "Project-Id-Version: gnome-session 2.3.7\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-11 09:34+0000\n" -"PO-Revision-Date: 2013-03-02 19:39+0100\n" -"Last-Translator: Gil Forcada \n" +"POT-Creation-Date: 2013-09-14 16:16+0000\n" +"PO-Revision-Date: 2013-09-15 00:41+0200\n" +"Last-Translator: Josep Sànchez \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -43,31 +44,31 @@ msgid "The startup command is not valid" msgstr "L'ordre d'inici no és vàlida" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Habilitat" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Icona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferències de les aplicacions d'inici" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Sense nom" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Sense descripció" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versió d'aquesta aplicació" @@ -75,14 +76,6 @@ msgid "Could not display help document" msgstr "No s'ha pogut mostrar el document de l'ajuda" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Aquesta sessió us entra al GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalitzada" @@ -91,10 +84,35 @@ msgid "This entry lets you select a saved session" msgstr "Aquesta entrada us permet seleccionar una sessió desada" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Aquesta sessió us entra al GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME de prova" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplicacions d'inici" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Trieu quines aplicacions voleu que s'iniciïn en entrar" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sobre Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Amb aquesta sessió accediu al GNOME emprant Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sessió personalitzada" @@ -119,18 +137,6 @@ msgid "_Continue" msgstr "_Continua" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Hi ha alguns programes que encara s'estan executant:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicacions d'inici" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Trieu quines aplicacions voleu que s'iniciïn en entrar" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programes d'inici addicionals:" @@ -240,11 +246,11 @@ msgid "Show session management options" msgstr "Mostra les opcions de gestió de la sessió" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Alguna cosa ha fallat." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -252,7 +258,7 @@ "S'ha produït un problema i el sistema no es pot recuperar. Contacteu amb " "l'administrador del sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -260,7 +266,7 @@ "S'ha produït un problema i el sistema no es pot recuperar. Com a mètode de " "precaució s'han inhabilitat totes les extensions." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -268,140 +274,23 @@ "S'ha produït un problema i el sistema no es pot recuperar.\n" "Sortiu i torneu-ho a provar." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Surt" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Habilita el codi de depuració" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Permet sortir" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Mostra l'avís de l'extensió" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconegut" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Hi ha un programa que encara s'està executant:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"S'està esperant que finalitzi el programa. Si l'interrompeu podríeu perdre " -"les dades no desades." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"S'està esperant que finalitzin alguns programes. Si els interrompeu és " -"possible que perdeu les dades no desades." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Canvia d'usuari de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Surt de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Atura temporalment de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hiberna de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Atura de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reinicia de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloca la pantalla" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancel·la" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Sortireu automàticament d'aquí a %d segon." -msgstr[1] "Sortireu automàticament d'aquí a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Aquest sistema s'aturarà automàticament d'aquí a %d segon." -msgstr[1] "Aquest sistema s'aturarà automàticament d'aquí a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Es reiniciarà el sistema automàticament d'aquí a %d segon." -msgstr[1] "Es reiniciarà el sistema automàticament d'aquí a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Heu entrat com a «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Voleu sortir d'aquest sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Canvia d'_usuari" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Voleu aturar aquest sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "A_tura temporalment" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hiberna" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reinicia" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Atura l'ordinador" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Voleu reiniciar el sistema ara?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "No està responent" @@ -413,11 +302,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Aplicació recordada" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Aquest programa està blocant la sortida." @@ -434,32 +323,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "No s'ha pogut crear el sòcol ICE d'escolta: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Ignora els directoris estàndard d'inici automàtic" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "DIRECTORI_INICI_AUTOMÀTIC" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessió que s'utilitzarà" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOM_DE_SESSIÓ" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "No carreguis les aplicacions especificades per l'usuari" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Mostra el diàleg de la balena per fer proves" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- el gestor de sessions del GNOME" @@ -562,8 +451,94 @@ msgstr "" "El programa s'ha invocat amb opcions que entren en conflicte entre elles" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME clàssic" +#~ msgid "Some programs are still running:" +#~ msgstr "Hi ha alguns programes que encara s'estan executant:" + +#~ msgid "Unknown" +#~ msgstr "Desconegut" + +#~ msgid "A program is still running:" +#~ msgstr "Hi ha un programa que encara s'està executant:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "S'està esperant que finalitzi el programa. Si l'interrompeu podríeu " +#~ "perdre les dades no desades." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "S'està esperant que finalitzin alguns programes. Si els interrompeu és " +#~ "possible que perdeu les dades no desades." + +#~ msgid "Switch User Anyway" +#~ msgstr "Canvia d'usuari de totes maneres" + +#~ msgid "Log Out Anyway" +#~ msgstr "Surt de totes maneres" + +#~ msgid "Suspend Anyway" +#~ msgstr "Atura temporalment de totes maneres" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hiberna de totes maneres" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Atura de totes maneres" + +#~ msgid "Restart Anyway" +#~ msgstr "Reinicia de totes maneres" + +#~ msgid "Lock Screen" +#~ msgstr "Bloca la pantalla" + +#~ msgid "Cancel" +#~ msgstr "Cancel·la" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sortireu automàticament d'aquí a %d segon." +#~ msgstr[1] "Sortireu automàticament d'aquí a %d segons." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Aquest sistema s'aturarà automàticament d'aquí a %d segon." +#~ msgstr[1] "Aquest sistema s'aturarà automàticament d'aquí a %d segons." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Es reiniciarà el sistema automàticament d'aquí a %d segon." +#~ msgstr[1] "Es reiniciarà el sistema automàticament d'aquí a %d segons." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Heu entrat com a «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "Voleu sortir d'aquest sistema?" + +#~ msgid "_Switch User" +#~ msgstr "Canvia d'_usuari" + +#~ msgid "Shut down this system now?" +#~ msgstr "Voleu aturar aquest sistema?" + +#~ msgid "S_uspend" +#~ msgstr "A_tura temporalment" + +#~ msgid "_Hibernate" +#~ msgstr "_Hiberna" + +#~ msgid "_Restart" +#~ msgstr "_Reinicia" + +#~ msgid "_Shut Down" +#~ msgstr "_Atura l'ordinador" + +#~ msgid "Restart this system now?" +#~ msgstr "Voleu reiniciar el sistema ara?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/ca@valencia.po gnome-session-3.14.0/po/ca@valencia.po --- gnome-session-3.9.90/po/ca@valencia.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/ca@valencia.po 2014-06-25 18:06:33.000000000 +0000 @@ -7,14 +7,15 @@ # David Planella , 2008, 2009, 2010, 2011. # Jordi Serratosa , 2012. # Gil Forcada , 2013. +# Josep Sànchez , 2013. # msgid "" msgstr "" "Project-Id-Version: gnome-session 2.3.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-12 22:53+0100\n" -"PO-Revision-Date: 2013-03-02 19:39+0100\n" -"Last-Translator: Gil Forcada \n" +"POT-Creation-Date: 2013-10-06 21:58+0200\n" +"PO-Revision-Date: 2013-09-15 00:41+0200\n" +"Last-Translator: Josep Sànchez \n" "Language-Team: Catalan \n" "Language: ca-XV\n" "MIME-Version: 1.0\n" @@ -42,31 +43,31 @@ msgid "The startup command is not valid" msgstr "L'orde d'inici no és vàlida" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Habilitat" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Icona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferències de les aplicacions d'inici" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Sense nom" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Sense descripció" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versió d'esta aplicació" @@ -74,14 +75,6 @@ msgid "Could not display help document" msgstr "No s'ha pogut mostrar el document de l'ajuda" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Esta sessió vos entra al GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalitzada" @@ -90,10 +83,35 @@ msgid "This entry lets you select a saved session" msgstr "Esta entrada vos permet seleccionar una sessió guardada" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Esta sessió vos entra al GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME de prova" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplicacions d'inici" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Trieu quines aplicacions voleu que s'inicien en entrar" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sobre Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Amb esta sessió accediu al GNOME emprant Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sessió personalitzada" @@ -118,18 +136,6 @@ msgid "_Continue" msgstr "_Continua" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Hi ha alguns programes que encara s'estan executant:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicacions d'inici" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Trieu quines aplicacions voleu que s'inicien en entrar" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programes d'inici addicionals:" @@ -238,11 +244,11 @@ msgid "Show session management options" msgstr "Mostra les opcions de gestió de la sessió" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Alguna cosa ha fallat." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -250,7 +256,7 @@ "S'ha produït un problema i el sistema no es pot recuperar. Contacteu amb " "l'administrador del sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -258,7 +264,7 @@ "S'ha produït un problema i el sistema no es pot recuperar. Com a mètode de " "precaució s'han inhabilitat totes les extensions." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,140 +272,23 @@ "S'ha produït un problema i el sistema no es pot recuperar.\n" "Eixiu i torneu-ho a provar." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "I_x" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Habilita el codi de depuració" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Permet eixir" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Mostra l'avís de l'extensió" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconegut" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Hi ha un programa que encara s'està executant:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"S'està esperant que finalitzi el programa. Si l'interrompeu podríeu perdre " -"les dades no guardades." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"S'està esperant que finalitzin alguns programes. Si els interrompeu és " -"possible que perdeu les dades no guardades." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Canvia d'usuari de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Ix de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Para temporalment de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hiberna de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Para de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reinicia de totes maneres" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloca la pantalla" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancel·la" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Eixireu automàticament d'ací a %d segon." -msgstr[1] "Eixireu automàticament d'ací a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Este sistema es pararà automàticament d'ací a %d segon." -msgstr[1] "Este sistema es pararà automàticament d'ací a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Es reiniciarà el sistema automàticament d'ací a %d segon." -msgstr[1] "Es reiniciarà el sistema automàticament d'ací a %d segons." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Heu entrat com a «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Voleu eixir d'este sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Canvia d'_usuari" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Voleu parar este sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "A_tura temporalment" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hiberna" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reinicia" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Atura l'ordinador" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Voleu reiniciar el sistema ara?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "No està responent" @@ -411,11 +300,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Aplicació recordada" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Este programa està blocant l'eixida." @@ -432,32 +321,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "No s'ha pogut crear el sòcol ICE d'escolta: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Ignora els directoris estàndard d'inici automàtic" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "DIRECTORI_INICI_AUTOMÀTIC" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessió que s'utilitzarà" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOM_DE_SESSIÓ" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "No carreguis les aplicacions especificades per l'usuari" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Mostra el diàleg de la balena per fer proves" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- el gestor de sessions del GNOME" @@ -560,8 +449,94 @@ msgstr "" "El programa s'ha invocat amb opcions que entren en conflicte entre elles" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME clàssic" +#~ msgid "Some programs are still running:" +#~ msgstr "Hi ha alguns programes que encara s'estan executant:" + +#~ msgid "Unknown" +#~ msgstr "Desconegut" + +#~ msgid "A program is still running:" +#~ msgstr "Hi ha un programa que encara s'està executant:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "S'està esperant que finalitzi el programa. Si l'interrompeu podríeu " +#~ "perdre les dades no desades." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "S'està esperant que finalitzin alguns programes. Si els interrompeu és " +#~ "possible que perdeu les dades no desades." + +#~ msgid "Switch User Anyway" +#~ msgstr "Canvia d'usuari de totes maneres" + +#~ msgid "Log Out Anyway" +#~ msgstr "Surt de totes maneres" + +#~ msgid "Suspend Anyway" +#~ msgstr "Atura temporalment de totes maneres" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hiberna de totes maneres" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Atura de totes maneres" + +#~ msgid "Restart Anyway" +#~ msgstr "Reinicia de totes maneres" + +#~ msgid "Lock Screen" +#~ msgstr "Bloca la pantalla" + +#~ msgid "Cancel" +#~ msgstr "Cancel·la" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sortireu automàticament d'aquí a %d segon." +#~ msgstr[1] "Sortireu automàticament d'aquí a %d segons." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Aquest sistema s'aturarà automàticament d'aquí a %d segon." +#~ msgstr[1] "Aquest sistema s'aturarà automàticament d'aquí a %d segons." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Es reiniciarà el sistema automàticament d'aquí a %d segon." +#~ msgstr[1] "Es reiniciarà el sistema automàticament d'aquí a %d segons." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Heu entrat com a «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "Voleu sortir d'aquest sistema?" + +#~ msgid "_Switch User" +#~ msgstr "Canvia d'_usuari" + +#~ msgid "Shut down this system now?" +#~ msgstr "Voleu aturar aquest sistema?" + +#~ msgid "S_uspend" +#~ msgstr "A_tura temporalment" + +#~ msgid "_Hibernate" +#~ msgstr "_Hiberna" + +#~ msgid "_Restart" +#~ msgstr "_Reinicia" + +#~ msgid "_Shut Down" +#~ msgstr "_Atura l'ordinador" + +#~ msgid "Restart this system now?" +#~ msgstr "Voleu reiniciar el sistema ara?" #~ msgid "%d hour" #~ msgid_plural "%d hours" @@ -844,10 +819,11 @@ #~ "ports. This option will allow connections from (authorized) remote hosts. " #~ "gnome-session must be restarted for this to take effect." #~ msgstr "" -#~ "Per raons de seguretat, en les plataformes que tenen _IceTcpTransNoListen" -#~ "() (sistemes XFree86), el gnome-session no escolta connexions en ports " -#~ "TCP. Aquesta opció permetrà connexions des de màquines remotes " -#~ "(autoritzades). S'ha de reiniciar el gnome-session perquè tingui efecte." +#~ "Per raons de seguretat, en les plataformes que tenen " +#~ "_IceTcpTransNoListen() (sistemes XFree86), el gnome-session no escolta " +#~ "connexions en ports TCP. Aquesta opció permetrà connexions des de " +#~ "màquines remotes (autoritzades). S'ha de reiniciar el gnome-session " +#~ "perquè tingui efecte." #~ msgid "_Order:" #~ msgstr "_Ordre:" diff -Nru gnome-session-3.9.90/po/cs.po gnome-session-3.14.0/po/cs.po --- gnome-session-3.9.90/po/cs.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/cs.po 2014-06-25 18:06:33.000000000 +0000 @@ -2,6 +2,7 @@ # Copyright (C) 1999, 2003, 2007, 2008, 2009, 2010, 2011 the author(s) of gnome-session. # Copyright (C) 2004, 2005, 2006 Miloslav Trmac . # This file is distributed under the same license as the gnome-session package. +# # GIS , 1999. # David Šauer , 1999. # George Lebl , 2000, 2001. @@ -10,22 +11,23 @@ # Miloslav Trmac , 2004, 2005, 2006. # Petr Tomeš , 2006. # Petr Kovar , 2007, 2008, 2009, 2010, 2011, 2012, 2013. -# Marek Černocký , 2012. +# Marek Černocký , 2012, 2013. +# msgid "" msgstr "" -"Project-Id-Version: gnome-session\n" +"Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-24 18:09+0200\n" -"Last-Translator: Petr Kovar \n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-09 18:11+0200\n" +"Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Gtranslator 2.91.6\n" "X-Project-Style: gnome\n" #: ../capplet/gsm-app-dialog.c:120 @@ -48,31 +50,31 @@ msgid "The startup command is not valid" msgstr "Příkaz při přihlášení není platný" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Povoleno" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Předvolby aplikací spouštěných při přihlášení" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Bez názvu" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Bez popisu" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Verze této aplikace" @@ -80,14 +82,6 @@ msgid "Could not display help document" msgstr "Nelze zobrazit dokument nápovědy" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Toto sezení vás přihlásí do GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Vlastní" @@ -96,11 +90,35 @@ msgid "This entry lets you select a saved session" msgstr "Tato položka umožňuje vybrat uložené sezení" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Toto sezení vás přihlásí do GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplikace spouštěné při přihlášení" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Vybere aplikace, které se mají spouštět při přihlášení" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME na Waylandu" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Toto sezení vás přihlásí do GNOME, bude používat Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Vlastní sezení" @@ -125,18 +143,6 @@ msgid "_Continue" msgstr "_Pokračovat" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Některé programy stále běží:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplikace spouštěné při přihlášení" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Vybere aplikace, které se mají spouštět při přihlášení" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Další programy při přihlášení:" @@ -241,11 +247,11 @@ msgid "Show session management options" msgstr "Zobrazit volby správy sezení" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Jejda! Něco se pokazilo." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -253,7 +259,7 @@ "Došlo ke komplikacím a systém se nepodařilo obnovit. Kontaktujte prosím " "správce systému" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -261,7 +267,7 @@ "Došlo ke komplikacím a systém se nepodařilo obnovit. Všechna rozšíření byla " "preventivně zakázána." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -269,154 +275,27 @@ "Došlo ke komplikacím a systém se nepodařilo obnovit.\n" "Odhlaste se prosím a zkuste to znovu." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Odhlásit se" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Zapnout ladicí kód" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Umožnit odhlášení" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Zobrazit varování rozšíření" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Neznámé" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Program stále běží:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Čeká se na ukončení programu. Přerušení běhu programu může způsobit ztrátu " -"rozdělané práce." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Čeká se na ukončení běhu programů. Přerušení běhu těchto programů může " -"způsobit ztrátu rozdělané práce." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Přesto přepnout uživatele" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Přesto se odhlásit" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Přesto uspat do paměti" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Přesto uspat na disk" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Přesto vypnout" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Přesto restartovat" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Uzamknout obrazovku" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Zrušit" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Budete automaticky odhlášeni za %d sekundu." -msgstr[1] "Budete automaticky odhlášeni za %d sekundy." -msgstr[2] "Budete automaticky odhlášeni za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Systém bude automaticky vypnut za %d sekundu." -msgstr[1] "Systém bude automaticky vypnut za %d sekundy." -msgstr[2] "Systém bude automaticky vypnut za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Tento systém bude automaticky restartován za %d sekundu." -msgstr[1] "Tento systém bude automaticky restartován za %d sekundy." -msgstr[2] "Tento systém bude automaticky restartován za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Aktuálně jste přihlášeni jako „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Odhlásit se nyní z tohoto systému?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Přepnout uživatele" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Vypnout nyní tento systém?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Uspat do paměti" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "Uspat na _disk" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Restartovat" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Vypnout" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Restartovat tento systém nyní?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Neodpovídá" #: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" msgid "_Log out" msgstr "Odh_lásit se" @@ -424,52 +303,52 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Zapamatovaná aplikace" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Tento program brání odhlášení." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Odmítnutí spojení nového klienta, jelikož právě probíhá vypnutí sezení\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Nelze vytvořit socket naslouchání ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Přepsat standardní adresáře automatického spuštění" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "ADR_AUTOSPUŠTĚNÍ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sezení, které se má použít" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NÁZEV_SEZENÍ" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Nenahrávat uživatelem zadané aplikace" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Zobrazit dialogové okno černé barvy pro testování" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " – správce sezení GNOME" @@ -495,15 +374,15 @@ "\n" "Spustí PŘÍKAZ a zablokuje určitou vlastnost sezení.\n" "\n" -" -h, --help Zobrazí tuto nápovědu\n" -" --version Zobrazí verzi programu\n" +" -h, --help Zobrazit tuto nápovědu\n" +" --version Zobrazit verzi programu\n" " --app-id ID ID aplikace, které se má použít při zablokování\n" " (volitelné)\n" " --reason DŮVOD Důvod zablokování (volitelné)\n" " --inhibit ARG Vlastnosti k zablokování, seznam těchto prvků\n" " oddělených dvojtečkou:\n" " logout, switch-user, suspend, idle, automount\n" -" --inhibit-only Nespustí PŘÍKAZ a namísto toho čeká donekonečna\n" +" --inhibit-only Nespustit PŘÍKAZ a namísto toho čekat donekonečna\n" "\n" "Pokud není zadána volba --inhibit, použije se idle.\n" @@ -520,27 +399,26 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Sezení %d" #: ../tools/gnome-session-selector.c:108 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "Názvy sezení nemohou začínat znakem \".\" nebo obsahovat znak \"/\"" +msgstr "Názvy sezení nemohou začínat znakem „.“ nebo obsahovat znak „/“" #: ../tools/gnome-session-selector.c:112 msgid "Session names are not allowed to start with ‘.’" -msgstr "Názvy sezení nemohou začínat znakem \".\"" +msgstr "Názvy sezení nemohou začínat znakem „.“" #: ../tools/gnome-session-selector.c:116 msgid "Session names are not allowed to contain ‘/’ characters" -msgstr "Názvy sezení nemohou obsahovat znak \"/\"" +msgstr "Názvy sezení nemohou obsahovat znak „/“" #: ../tools/gnome-session-selector.c:124 #, c-format msgid "A session named ‘%s’ already exists" -msgstr "Sezení s názvem \"%s\" již existuje" +msgstr "Sezení s názvem „%s“ již existuje" #: ../tools/gnome-session-quit.c:53 msgid "Log out" @@ -569,45 +447,3 @@ #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "Program volán s kolidujícími volbami" - -#~ msgid "GNOME fallback" -#~ msgstr "Záložní prostředí GNOME" - -#~ msgid "Icon '%s' not found" -#~ msgstr "Ikona „%s“ nenalezena" - -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "Nelze načíst GNOME 3" - -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "GNOME 3 bohužel nemohlo být správně spuštěno a bylo přepnuto do " -#~ "záložního režimu.\n" -#~ "\n" -#~ "Příčinou je patrně váš systém (grafický hardware nebo ovladač), na kterém " -#~ "není možné provozovat GNOME 3 se všemi jeho vlastnostmi." - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "Poznejte lépe GNOME 3" - -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "" -#~ "Nepodařilo se spustit sezení s přihlášením (a spojit se se serverem X)" - -#~ msgid "Some programs are still running:" -#~ msgstr "Některé programy stále běží:" - -#~ msgid "Exited with code %d" -#~ msgstr "Program skončil s kódem %d" - -#~ msgid "Killed by signal %d" -#~ msgstr "Zabito signálem %d" - -#~ msgid "Stopped by signal %d" -#~ msgstr "Zastaveno signálem %d" diff -Nru gnome-session-3.9.90/po/da.po gnome-session-3.14.0/po/da.po --- gnome-session-3.9.90/po/da.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/da.po 2014-06-25 18:06:33.000000000 +0000 @@ -22,16 +22,16 @@ # Ask Hjorth Larsen , 2007. # Kenneth Nielsen , 2008-2009, 2013. # M.P. Rommedahl , 2008. -# Kris Thomsen , 2011. +# Kris Thomsen , 2011, 2013. # flemming christensen , 2011. # msgid "" msgstr "" "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-11 23:28+0100\n" -"PO-Revision-Date: 2013-03-11 23:27+0100\n" -"Last-Translator: Kenneth Nielsen \n" +"POT-Creation-Date: 2013-09-14 15:55+0200\n" +"PO-Revision-Date: 2013-09-14 15:43+0100\n" +"Last-Translator: Kris Thomsen \n" "Language-Team: Danish \n" "Language: \n" "MIME-Version: 1.0\n" @@ -60,31 +60,31 @@ msgid "The startup command is not valid" msgstr "Startkommandoen er ugyldig" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Aktiveret" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikon" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Indstillinger for opstartsprogrammer" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Intet navn" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Ingen beskrivelse" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Version af dette program" @@ -92,14 +92,6 @@ msgid "Could not display help document" msgstr "Kunne ikke vise hjælpedokument" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Denne session logger dig ind i GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Tilpasset" @@ -108,10 +100,35 @@ msgid "This entry lets you select a saved session" msgstr "Dette indtastningsfelt lader dig vælge en gemt session" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Denne session logger dig ind i GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME-attrap" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Opstartsprogrammer" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Vælg hvilke programmer som skal startes når du logger ind" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME på Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Denne session logger dig ind i GNOME, med brug af Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Tilpasset session" @@ -136,18 +153,6 @@ msgid "_Continue" msgstr "_Fortsæt" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Nogle programmer kører stadigvæk:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Opstartsprogrammer" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Vælg hvilke programmer som skal startes når du logger ind" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Yderligere opstarts_programmer:" @@ -252,11 +257,11 @@ msgid "Show session management options" msgstr "Vis tilvalg for sessionshåndtering" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Åh nej! Noget er gået galt." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -264,7 +269,7 @@ "Der er opstået et problem og systemet kan ikke gendannes.\n" "Henvend dig venligst til en systemadministrator" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -272,7 +277,7 @@ "Der er opstået et problem, og systemet kan ikke gendannes. Alle udvidelser " "er blevet deaktiveret for en sikkerheds skyld." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -280,140 +285,23 @@ "Et problem er opstået og systemet kan ikke gendannes.\n" "Log venligst ud og prøv igen." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Log ud" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Aktivér fejlfindingskode" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Tillad log ud" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Vis udvidelsesfejl" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Ukendt" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Et program kører stadigvæk:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Venter på at programmet afslutter. At afbryde dette program kan føre til, at " -"du mister data." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Venter på at programmer afslutter. At afbryde disse programmer kan føre til, " -"at du mister data." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Skift bruger alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Log ud alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Gå i standby alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Gå i dvale alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Sluk alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Genstart alligevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Lås skærmen" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Annullér" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Du vil automatisk blive logget ud om %d sekund." -msgstr[1] "Du vil automatisk blive logget ud om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Dette system vil automatisk lukke ned om %d sekund." -msgstr[1] "Dette system vil automatisk lukke ned om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Dette system vil automatisk genstarte om %d sekund." -msgstr[1] "Dette system vil automatisk genstarte om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Du er på nuværende tidspunkt logget ind som \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Log ud af dette system nu?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Skift bruger" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Sluk dette system nu?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "S_tandby" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Dvale" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Genstart" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Sluk" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Genstart dette system nu?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Svarer ikke" @@ -425,11 +313,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Husket program" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Dette program blokerer log ud." @@ -445,32 +333,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Kunne ikke oprette ICE-lyttesoklen: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Tilsidesæt standard-autostartmapper" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_KAT" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Session som skal bruges" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSIONS_NAVN" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Hent ikke brugerangivne programmer" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Vis dialogen uheldig hval for at gennemføre en test" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - GNOME-sessionshåndteringen" @@ -569,8 +457,94 @@ msgid "Program called with conflicting options" msgstr "Program blev kaldt med selvmodsigende tilvalg" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME-tilbagefaldstilstand" +#~ msgid "Some programs are still running:" +#~ msgstr "Nogle programmer kører stadigvæk:" + +#~ msgid "Unknown" +#~ msgstr "Ukendt" + +#~ msgid "A program is still running:" +#~ msgstr "Et program kører stadigvæk:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Venter på at programmet afslutter. At afbryde dette program kan føre til, " +#~ "at du mister data." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Venter på at programmer afslutter. At afbryde disse programmer kan føre " +#~ "til, at du mister data." + +#~ msgid "Switch User Anyway" +#~ msgstr "Skift bruger alligevel" + +#~ msgid "Log Out Anyway" +#~ msgstr "Log ud alligevel" + +#~ msgid "Suspend Anyway" +#~ msgstr "Gå i standby alligevel" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Gå i dvale alligevel" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Sluk alligevel" + +#~ msgid "Restart Anyway" +#~ msgstr "Genstart alligevel" + +#~ msgid "Lock Screen" +#~ msgstr "Lås skærmen" + +#~ msgid "Cancel" +#~ msgstr "Annullér" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Du vil automatisk blive logget ud om %d sekund." +#~ msgstr[1] "Du vil automatisk blive logget ud om %d sekunder." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Dette system vil automatisk lukke ned om %d sekund." +#~ msgstr[1] "Dette system vil automatisk lukke ned om %d sekunder." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Dette system vil automatisk genstarte om %d sekund." +#~ msgstr[1] "Dette system vil automatisk genstarte om %d sekunder." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Du er på nuværende tidspunkt logget ind som \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Log ud af dette system nu?" + +#~ msgid "_Switch User" +#~ msgstr "_Skift bruger" + +#~ msgid "Shut down this system now?" +#~ msgstr "Sluk dette system nu?" + +#~ msgid "S_uspend" +#~ msgstr "S_tandby" + +#~ msgid "_Hibernate" +#~ msgstr "_Dvale" + +#~ msgid "_Restart" +#~ msgstr "_Genstart" + +#~ msgid "_Shut Down" +#~ msgstr "_Sluk" + +#~ msgid "Restart this system now?" +#~ msgstr "Genstart dette system nu?" #~ msgid "Icon '%s' not found" #~ msgstr "Ikon \"%s\" kunne ikke findes" diff -Nru gnome-session-3.9.90/po/de.po gnome-session-3.14.0/po/de.po --- gnome-session-3.9.90/po/de.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/de.po 2014-06-25 18:06:33.000000000 +0000 @@ -22,16 +22,15 @@ "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-25 23:29+0000\n" -"PO-Revision-Date: 2013-02-25 15:26+0100\n" -"Last-Translator: Mario Blättermann \n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-13 19:26+0100\n" +"Last-Translator: Benjamin Steinwender \n" "Language-Team: Deutsch \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.5.7\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -53,31 +52,31 @@ msgid "The startup command is not valid" msgstr "Der Startbefehl ist ungültig" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Aktiviert" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Symbol" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programm" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Startprogrammeinstellungen" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Namenlos" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Keine Beschreibung" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Version dieser Anwendung" @@ -85,14 +84,6 @@ msgid "Could not display help document" msgstr "Die Hilfeseite konnte nicht angezeigt werden" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Diese Sitzung meldet Sie bei GNOME an" - # Benutzerdefiniert oder Angepasst? #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -103,10 +94,38 @@ msgstr "" "Dieser Eintrag ermöglicht es Ihnen, eine gespeicherte Sitzung auswählen" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Diese Sitzung meldet Sie bei GNOME an" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME Platzhalter" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Startprogramme" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "" +"Wählen Sie, welche Anwendungen gestartet werden, wenn Sie sich anmelden" + +# Ich denken Wayland kann man stehen lassen: mittlerweile gibt es auch einen Wayland-Artikel in Wikipedia: http://de.wikipedia.org/wiki/Wayland_%28Anzeige-Server%29 +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME unter Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Diese Sitzung meldet Sie bei GNOME unter Wayland an" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Benutzerdefinierte Sitzung" @@ -132,19 +151,6 @@ msgid "_Continue" msgstr "_Fortfahren" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Einige Anwendungen laufen noch:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Startprogramme" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "" -"Wählen Sie, welche Anwendungen gestartet werden, wenn Sie sich anmelden" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Zusätzliche Startprogramme:" @@ -249,11 +255,11 @@ msgid "Show session management options" msgstr "Sitzungsoptionen anzeigen" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Leider ist ein Problem aufgetreten." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -261,7 +267,7 @@ "Ein Problem ist aufgetreten, welches vom System nicht behoben werden kann. " "Bitte kontaktieren Sie den Systemverwalter." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -269,7 +275,7 @@ "Ein Problem ist aufgetreten, welches vom System nicht behoben werden kann. " "Als Vorsichtsmaßnahme sind alle Erweiterungen deaktiviert worden." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -277,140 +283,23 @@ "Ein Problem ist aufgetreten, welches vom System nicht behoben werden kann.\n" "Bitte melden Sie sich ab und versuchen Sie es erneut." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "Benutzer ab_melden" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Debugging-Code aktivieren" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Abmelden erlauben" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Warnung der Erweiterung anzeigen" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Unbekannt" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Eine Anwendung läuft noch:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Warten auf das Beenden der Anwendung. Durch Abbruch der Anwendung könnten " -"Änderungen verloren gehen." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Warten auf das Beenden der Anwendungen. Durch Abbruch der Anwendungen " -"könnten Änderungen verloren gehen." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Trotzdem Benutzer wechseln" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Trotzdem abmelden" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Trotzdem in Bereitschaftsmodus gehen" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Trotzdem in Ruhezustand gehen" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Trotzdem ausschalten" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Trotzdem neu starten" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bildschirm sperren" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Abbrechen" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Sie werden in %d Sekunde automatisch abgemeldet." -msgstr[1] "Sie werden in %d Sekunden automatisch abgemeldet." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Der Rechner wird in %d Sekunde automatisch ausgeschaltet." -msgstr[1] "Der Rechner wird in %d Sekunden automatisch ausgeschaltet." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Der Rechner wird in %d Sekunde automatisch neu gestartet." -msgstr[1] "Der Rechner wird in %d Sekunden automatisch neu gestartet." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Sie sind zurzeit als »%s« angemeldet." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Jetzt vom System abmelden?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Benutzer _wechseln" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Möchten Sie den Rechner jetzt ausschalten?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Bereitschaft" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Ruhezustand" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Neu starten" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "Rechner a_usschalten" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Möchten Sie den Rechner jetzt neustarten?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Keine Antwort" @@ -422,11 +311,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Gemerkte Anwendung" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Dieses Programm blockiert die Abmeldung." @@ -443,33 +332,33 @@ msgid "Could not create ICE listening socket: %s" msgstr "ICE-Listening-Socket konnte nicht erzeugt werden: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Vorgegebene Autostart-Ordner außer Kraft setzen" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTARTORDNER" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Zu verwendende Sitzung" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SITZUNGSNAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Keine benutzerspezifischen Anwendungen laden" # Der Kommentar im Quelltext lautet: »/* Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong */« #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Den Dialog zum Fehlschlag für Prüfungszwecke anzeigen" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - Die GNOME-Sitzung verwalten" @@ -569,8 +458,94 @@ msgid "Program called with conflicting options" msgstr "Programm wurde mit Optionen aufgerufen, die zu einem Konflikt führen" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME-Ausweichmodus" +#~ msgid "Some programs are still running:" +#~ msgstr "Einige Anwendungen laufen noch:" + +#~ msgid "Unknown" +#~ msgstr "Unbekannt" + +#~ msgid "A program is still running:" +#~ msgstr "Eine Anwendung läuft noch:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Warten auf das Beenden der Anwendung. Durch Abbruch der Anwendung könnten " +#~ "Änderungen verloren gehen." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Warten auf das Beenden der Anwendungen. Durch Abbruch der Anwendungen " +#~ "könnten Änderungen verloren gehen." + +#~ msgid "Switch User Anyway" +#~ msgstr "Trotzdem Benutzer wechseln" + +#~ msgid "Log Out Anyway" +#~ msgstr "Trotzdem abmelden" + +#~ msgid "Suspend Anyway" +#~ msgstr "Trotzdem in Bereitschaftsmodus gehen" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Trotzdem in Ruhezustand gehen" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Trotzdem ausschalten" + +#~ msgid "Restart Anyway" +#~ msgstr "Trotzdem neu starten" + +#~ msgid "Lock Screen" +#~ msgstr "Bildschirm sperren" + +#~ msgid "Cancel" +#~ msgstr "Abbrechen" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sie werden in %d Sekunde automatisch abgemeldet." +#~ msgstr[1] "Sie werden in %d Sekunden automatisch abgemeldet." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Der Rechner wird in %d Sekunde automatisch ausgeschaltet." +#~ msgstr[1] "Der Rechner wird in %d Sekunden automatisch ausgeschaltet." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Der Rechner wird in %d Sekunde automatisch neu gestartet." +#~ msgstr[1] "Der Rechner wird in %d Sekunden automatisch neu gestartet." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Sie sind zurzeit als »%s« angemeldet." + +#~ msgid "Log out of this system now?" +#~ msgstr "Jetzt vom System abmelden?" + +#~ msgid "_Switch User" +#~ msgstr "Benutzer _wechseln" + +#~ msgid "Shut down this system now?" +#~ msgstr "Möchten Sie den Rechner jetzt ausschalten?" + +#~ msgid "S_uspend" +#~ msgstr "_Bereitschaft" + +#~ msgid "_Hibernate" +#~ msgstr "_Ruhezustand" + +#~ msgid "_Restart" +#~ msgstr "_Neu starten" + +#~ msgid "_Shut Down" +#~ msgstr "Rechner a_usschalten" + +#~ msgid "Restart this system now?" +#~ msgstr "Möchten Sie den Rechner jetzt neustarten?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/el.po gnome-session-3.14.0/po/el.po --- gnome-session-3.9.90/po/el.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/el.po 2014-07-18 20:50:42.000000000 +0000 @@ -30,74 +30,31 @@ # Jennie Petoumenou , 2009. # Michael Kotsarinis , 2011. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2013. +# Efstathios Iosifidis , 2013. msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-02-24 13:26+0300\n" -"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" +"POT-Creation-Date: 2014-07-07 07:25+0000\n" +"PO-Revision-Date: 2014-07-08 12:35+0200\n" +"Last-Translator: Tom Tryfonidis \n" "Language-Team: team@gnome.gr\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.6.5\n" "X-Project-Style: gnome\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Επιλογή εντολής" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Προσθήκη προγραμμάτων εκκίνησης" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Επεξεργασία προγραμμάτων εκκίνησης" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "Η εντολή εκκίνησης δε μπορεί να είναι κενή" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "Η εντολή εκκίνησης δεν είναι έγκυρη" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Ενεργό" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Εικονίδιο" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Πρόγραμμα" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Προτιμήσεις προγραμμάτων εκκίνησης" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Χωρίς όνομα" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Χωρίς περιγραφή" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "Η έκδοση αυτής της εφαρμογής" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Προσαρμοσμένο" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Δεν είναι δυνατή η προβολή του αρχείου βοήθειας" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Αυτή η καταχώριση επιτρέπει την επιλογή μιας αποθηκευμένης συνεδρίας" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -107,40 +64,36 @@ msgid "This session logs you into GNOME" msgstr "Αυτή η συνεδρία σας συνδέει στο GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "Προσαρμογή" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "Αυτή η καταχώριση επιτρέπει την επιλογή μιας αποθηκευμένης συνεδρίας" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Εικονικό GNOME" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME σε Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Αυτή η συνεδρία σας συνδέει στο GNOME, χρησιμοποιώντας Wayland" + #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "Προσαρμοσμένη συνεδρία" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" -msgstr "Παρακαλώ επιλέξτε μια προσαρμοσμένη συνεδρία για να εκτελέσετε" +msgstr "Παρακαλούμε επιλέξτε μια προσαρμοσμένη συνεδρία για να εκτελεστεί" #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "_Νέα συνεδρία" #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "_Αφαίρεση συνεδρίας" #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "Με_τονομασία συνεδρίας" @@ -148,25 +101,13 @@ msgid "_Continue" msgstr "_Συνέχεια" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Μερικά προγράμματα εκτελούνται ακόμη:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Προγράμματα εκκίνησης" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Επιλέξτε τα προγράμματα που θα εκκινούνται όταν συνδέεστε στο σύστημα" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Πρόσθετα _προγράμματα εκκίνησης:" #: ../data/session-properties.ui.h:2 msgid "Startup Programs" -msgstr "Εκκίνηση προγραμμάτων" +msgstr "Προγράμματα εκκίνησης" #: ../data/session-properties.ui.h:3 msgid "_Automatically remember running applications when logging out" @@ -196,89 +137,19 @@ msgid "_Name:" msgstr "Ό_νομα:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Το αρχείο δεν είναι ένα έγκυρο αρχείο .desktop" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Μη αναγνωρίσιμη έκδοση αρχείου desktop '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Εκκινείται %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Η εφαρμογή δεν δέχεται έγγραφα από την γραμμή εντολών" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Μη αναγνωρίσιμη επιλογή εκκίνησης: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Δεν είναι δυνατό το πέρασμα URIs σε μια εγγραφή επιφάνειας εργασίας " -"'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Δεν είναι ένα εκκινήσιμο αντικείμενο" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Απενεργοποίηση σύνδεσης με το διαχειριστή συνεδρίας" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Καθορισμός αρχείου που περιέχει αποθηκευμένες ρυθμίσεις" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ΑΡΧΕΙΟ" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Καθορίζει ένα όνομα συνεδρίας προς φόρτωση" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Επιλογές διαχείρισης συνεδρίας:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Προβολή επιλογών διαχείρισης συνεδρίας" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "Ωχ όχι! Κάτι πήγε στραβά." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "" -"Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει. Παρακαλώ " +"Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει. Παρακαλούμε " "επικοινωνήστε με τον διαχειριστή του συστήματος" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -286,160 +157,35 @@ "Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει. Έχουν " "απενεργοποιηθεί όλες οι επεκτάσεις για λόγους προφύλαξης." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." msgstr "" "Προέκυψε ένα πρόβλημα και το σύστημα δε μπορεί να ανακάμψει.\n" -"Παρακαλώ αποσυνδεθείτε και δοκιμάστε ξανά." +"Παρακαλούμε αποσυνδεθείτε και δοκιμάστε ξανά." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "Απο_σύνδεση" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" -msgstr "Ενεργοποίηση κώδικα εκσφαλμάτωσης" +msgstr "Ενεργοποίηση κώδικα αποφαλμάτωσης" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "Να επιτρέπεται αποσύνδεση" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Προβολή προειδοποίησης επέκτασης" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Άγνωστο" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Ένα πρόγραμμα εκτελείται ήδη:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Αναμονή τερματισμού του προγράμματος. Η διακοπή του προγράμματος μπορεί να " -"προκαλέσει απώλεια δεδομένων." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Αναμονή για τον τερματισμό των προγραμμάτων. Η διακοπή αυτών των " -"προγραμμάτων μπορεί να προκαλέσει απώλεια δεδομένων." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Αλλαγή χρήστη ούτως ή άλλως" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Αποσύνδεση ούτως ή άλλως" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Αναστολή ούτως ή άλλως" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Αδρανοποίηση ούτως ή άλλως" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Κλείσιμο ούτως ή άλλως" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Επανεκκίνηση οπωσδήποτε" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Κλείδωμα οθόνης" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Ακύρωση" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτο." -msgstr[1] "Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτα." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Το σύστημα θα κλείσει αυτόματα σε %d δευτερόλεπτο." -msgstr[1] "Το σύστημα θα κλείσει αυτόματα σε %d δευτερόλεπτα." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Το σύστημα θα επανεκκινηθεί αυτόματα σε %d δευτερόλεπτο." -msgstr[1] "Το σύστημα θα επανεκκινηθεί αυτόματα σε %d δευτερόλεπτα." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Είστε συνδεδεμένος ως \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Να γίνει αποσύνδεση από το σύστημα τώρα;" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Α_λλαγή χρήστη" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Να κλείσει το σύστημα τώρα;" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "Α_ναστολή" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "Α_δρανοποίηση" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Επα_νεκκίνηση" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "Κ_λείσιμο συστήματος" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Να επανεκκινηθεί το σύστημα τώρα;" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Δεν ανταποκρίνεται" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "_Αποσύνδεση" @@ -447,56 +193,60 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Απομνημόνευση εφαρμογών" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Αυτό το πρόγραμμα εμποδίζει την αποσύνδεση." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Άρνηση σύνδεσης νέου πελάτη επειδή το σύστημα τερματίζεται αυτή τη στιγμή\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" -msgstr "Αδυναμία δημιουργίας ICE listening socket: %s" +msgstr "Αδυναμία δημιουργίας υποδοχής ακρόασης ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Παράκαμψη τυπικών καταλόγων αυτόματης εκκίνησης" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Συνεδρία για χρήση" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" -msgstr "ΟΝΟΜΑ_ΣΥΝΕΔΡΙΑΣ" +msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "Να μην φορτώνονται εφαρμογές καθορισμένες από τον χρήστη" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Η έκδοση αυτής της εφαρμογής" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "Εμφάνιση του διαλόγου fail whale για δοκιμή" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - ο διαχειριστής συνεδρίας του GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -531,73 +281,251 @@ "\n" "Εάν δεν έχει οριστεί καμιά επιλογή --inhibit, υποτίθεται αδράνεια.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Αποτυχία εκτέλεσης του %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "Το %s απαιτεί ένα όρισμα\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Συνεδρία %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" "Τα ονόματα της συνεδρίας δεν επιτρέπεται να ξεκινάνε με ‘.’ ή να περιέχουν " "χαρακτήρες ‘/’" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "Τα ονόματα της συνεδρίας δεν επιτρέπεται να ξεκινούν με ‘.’" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "Τα ονόματα της συνεδρίας δεν επιτρέπεται να περιέχουν χαρακτήρες ‘/’" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" -msgstr "Μια συνεδρία με όνομα ‘%s’ υπάρχει ήδη" +msgstr "Υπάρχει ήδη μια συνεδρία με όνομα ‘%s’" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Αποσύνδεση" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Τερματισμός" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Επανεκκίνηση" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Αγνοώντας όποιους υπάρχοντες αναστολείς" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "Να μη ζητείται επιβεβαίωση από το χρήστη" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" -msgstr "Αδύνατη η σύνδεση με το διαχειριστή συνεδρίας" +msgstr "Αδυναμία σύνδεσης με το διαχειριστή συνεδρίας" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Το πρόγραμμα κλήθηκε με συγκρουόμενες επιλογές" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME εφεδρικό" +#~ msgid "Select Command" +#~ msgstr "Επιλογή εντολής" + +#~ msgid "Add Startup Program" +#~ msgstr "Προσθήκη προγραμμάτων εκκίνησης" + +#~ msgid "Edit Startup Program" +#~ msgstr "Επεξεργασία προγραμμάτων εκκίνησης" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "Η εντολή εκκίνησης δε μπορεί να είναι κενή" + +#~ msgid "The startup command is not valid" +#~ msgstr "Η εντολή εκκίνησης δεν είναι έγκυρη" + +#~ msgid "Enabled" +#~ msgstr "Ενεργό" + +#~ msgid "Icon" +#~ msgstr "Εικονίδιο" + +#~ msgid "Program" +#~ msgstr "Πρόγραμμα" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Προτιμήσεις προγραμμάτων εκκίνησης" + +#~ msgid "No name" +#~ msgstr "Χωρίς όνομα" + +#~ msgid "No description" +#~ msgstr "Χωρίς περιγραφή" + +#~ msgid "Could not display help document" +#~ msgstr "Δεν είναι δυνατή η προβολή του αρχείου βοήθειας" + +#~ msgid "Startup Applications" +#~ msgstr "Προγράμματα εκκίνησης" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "" +#~ "Επιλέξτε τα προγράμματα που θα εκκινούνται όταν συνδέεστε στο σύστημα" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Το αρχείο δεν είναι ένα έγκυρο αρχείο .desktop" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Μη αναγνωρίσιμη έκδοση αρχείου desktop '%s'" + +#~ msgid "Starting %s" +#~ msgstr "Εκκινείται %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Η εφαρμογή δεν δέχεται έγγραφα από την γραμμή εντολών" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Μη αναγνωρίσιμη επιλογή εκκίνησης: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Δεν είναι δυνατό το πέρασμα URIs σε μια εγγραφή επιφάνειας εργασίας " +#~ "'Type=Link'" + +#~ msgid "Not a launchable item" +#~ msgstr "Δεν είναι ένα εκκινήσιμο αντικείμενο" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Απενεργοποίηση σύνδεσης με το διαχειριστή συνεδρίας" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Καθορισμός αρχείου που περιέχει αποθηκευμένες ρυθμίσεις" + +#~ msgid "FILE" +#~ msgstr "ΑΡΧΕΙΟ" + +#~ msgid "Specify session management ID" +#~ msgstr "Καθορίζει ένα όνομα συνεδρίας προς φόρτωση" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Επιλογές διαχείρισης συνεδρίας:" + +#~ msgid "Show session management options" +#~ msgstr "Προβολή επιλογών διαχείρισης συνεδρίας" + +#~ msgid "Some programs are still running:" +#~ msgstr "Μερικά προγράμματα εκτελούνται ακόμη:" + +#~ msgid "Unknown" +#~ msgstr "Άγνωστο" + +#~ msgid "A program is still running:" +#~ msgstr "Ένα πρόγραμμα εκτελείται ήδη:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Αναμονή τερματισμού του προγράμματος. Η διακοπή του προγράμματος μπορεί " +#~ "να προκαλέσει απώλεια δεδομένων." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Αναμονή για τον τερματισμό των προγραμμάτων. Η διακοπή αυτών των " +#~ "προγραμμάτων μπορεί να προκαλέσει απώλεια δεδομένων." + +#~ msgid "Switch User Anyway" +#~ msgstr "Αλλαγή χρήστη ούτως ή άλλως" + +#~ msgid "Log Out Anyway" +#~ msgstr "Αποσύνδεση ούτως ή άλλως" + +#~ msgid "Suspend Anyway" +#~ msgstr "Αναστολή ούτως ή άλλως" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Αδρανοποίηση ούτως ή άλλως" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Κλείσιμο ούτως ή άλλως" + +#~ msgid "Restart Anyway" +#~ msgstr "Επανεκκίνηση οπωσδήποτε" + +#~ msgid "Lock Screen" +#~ msgstr "Κλείδωμα οθόνης" + +#~ msgid "Cancel" +#~ msgstr "Ακύρωση" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτο." +#~ msgstr[1] "Θα αποσυνδεθείτε αυτόματα σε %d δευτερόλεπτα." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Το σύστημα θα κλείσει αυτόματα σε %d δευτερόλεπτο." +#~ msgstr[1] "Το σύστημα θα κλείσει αυτόματα σε %d δευτερόλεπτα." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Το σύστημα θα επανεκκινηθεί αυτόματα σε %d δευτερόλεπτο." +#~ msgstr[1] "Το σύστημα θα επανεκκινηθεί αυτόματα σε %d δευτερόλεπτα." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Είστε συνδεδεμένος ως \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Να γίνει αποσύνδεση από το σύστημα τώρα;" + +#~ msgid "_Switch User" +#~ msgstr "Α_λλαγή χρήστη" + +#~ msgid "Shut down this system now?" +#~ msgstr "Να κλείσει το σύστημα τώρα;" + +#~ msgid "S_uspend" +#~ msgstr "Α_ναστολή" + +#~ msgid "_Hibernate" +#~ msgstr "Α_δρανοποίηση" + +#~ msgid "_Restart" +#~ msgstr "Επα_νεκκίνηση" + +#~ msgid "_Shut Down" +#~ msgstr "Κ_λείσιμο συστήματος" + +#~ msgid "Restart this system now?" +#~ msgstr "Να επανεκκινηθεί το σύστημα τώρα;" #~ msgid "Icon '%s' not found" #~ msgstr "Το εικονίδιο '%s' δεν βρέθηκε " diff -Nru gnome-session-3.9.90/po/es.po gnome-session-3.14.0/po/es.po --- gnome-session-3.9.90/po/es.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/es.po 2014-07-18 20:50:42.000000000 +0000 @@ -20,8 +20,8 @@ "Project-Id-Version: gnome-session.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-02-21 16:45+0100\n" +"POT-Creation-Date: 2014-04-15 08:11+0000\n" +"PO-Revision-Date: 2013-09-10 14:25+0200\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "Language: \n" @@ -31,57 +31,13 @@ "X-Generator: Gtranslator 2.91.5\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Seleccionar comando" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Añadir programa al inicio" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Editar programa al inicio" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "El comando de inicio no puede estar vacío" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "El comando de inicio no es válido" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Activado" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Icono" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Programa" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Preferencias de las aplicaciones al inicio" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Sin nombre" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Sin descripción" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "Versión de esta aplicación" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Personalizada" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "No se pudo mostrar el documento de ayuda" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Esta entrada le permite seleccionar una sesión guardada" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -91,24 +47,24 @@ msgid "This session logs you into GNOME" msgstr "Esta sesión accede a GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "Personalizada" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "Esta entrada le permite seleccionar una sesión guardada" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME «dummy»" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME en Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Esta sesión accede a GNOME, usando Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sesión personalizada" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "Seleccione una sesión personalizada que ejecutar" @@ -128,18 +84,6 @@ msgid "_Continue" msgstr "_Continuar" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Aún se están ejecutando algunos programas:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicaciones al inicio" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Elija qué aplicaciones iniciar al iniciar la sesión" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programas adicionales para iniciar:" @@ -177,80 +121,11 @@ msgid "_Name:" msgstr "_Nombre:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "El archivo no es un archivo .desktop válido" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "No se reconoce la versión «%s» del archivo desktop" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Iniciando %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "La aplicación no acepta documentos en la línea de comandos" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opción de lanzamiento no reconocida: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"No se pueden pasar los URI de documentos a entradas de escritorio Type=Link" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "No es un elemento lanzable" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Desactivar la conexión con el gestor de sesiones" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Especifique el archivo que contiene la configuración guardada" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ARCHIVO" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Especifique el ID de gestión de la sesión" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Opciones de gestión de sesión:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Mostrar opciones de gestión de sesión" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "Algo salió mal." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -258,7 +133,7 @@ "Ocurrió un problema y el sistema no se puede recuperar. Contacte con un " "administrador de sistemas." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -266,7 +141,7 @@ "Ocurrió un problema y el sistema no se puede recuperar. Por precaución, se " "han desactivado todas las extensiones." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -274,144 +149,27 @@ "Ocurrió un problema y el sistema no se puede recuperar.\n" "cierre la sesión e inténtelo de nuevo." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "Ce_rrar la sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "Activar el código de depuración" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "Permitir cerrar sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Mostrar advertencias de las extensiones" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconocido" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Aún se está ejecutando un programa:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Esperando a que los programas finalicen. Interrumpir estos programas puede " -"causar la pérdida de su trabajo." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Esperando a que los programas finalicen. Interrumpir estos programas puede " -"causar la pérdida de su trabajo." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Cambiar usuario de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Salir de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Suspender de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Apagar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reiniciar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloquear pantalla" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancelar" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Saldrá automáticamente de la sesión en %d segundo." -msgstr[1] "Saldrá automáticamente de la sesión en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "El sistema se apagará automáticamente en %d segundo." -msgstr[1] "El sistema se apagará automáticamente en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "El sistema se reiniciará automáticamente en %d segundo." -msgstr[1] "El sistema se reiniciará automáticamente en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Ha iniciado sesión como «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "¿Cerrar la sesión en este sistema ahora?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Ca_mbiar usuario" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "¿Apagar ahora este sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Suspender" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernar" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reiniciar" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Apagar" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "¿Reiniciar este sistema ahora?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "No responde" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:409 msgid "_Log out" msgstr "_Cerrar la sesión" @@ -419,15 +177,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Aplicación recordada" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Este programa está bloqueando el cierre de sesión." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -435,41 +193,45 @@ "Rechazando la conexión de un nuevo cliente porque actualmente se está " "cerrando la sesión\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "No se pudo crear el socket de escucha ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" -msgstr "Sobreescribir las carpetas de inicio automático estándar" +msgstr "Sobrescribir las carpetas de inicio automático estándar" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "CARPETA_DE_AUTOINICIO" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Sesión que usar" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "NOMBRE_DE_LA_SESIÓN" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "No cargar las aplicaciones especificadas por el usuario" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Versión de esta aplicación" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "Mostrar el diálogo de la ballena de pruebas" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - El gestor de sesiones de GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -503,72 +265,244 @@ "\n" "Si no se especifica la opción --inhibit se asume «idle».\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Falló al ejecutar %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s requiere un argumento\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "Sesión %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" "No se permite que los nombres de las sesiones empiecen por «.» ni que " "contengan el caracter «/»" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "No se permite que los nombres de las sesiones empiecen por «.»" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "No se permite que los nombres de las sesiones contengan «/»" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "Ya existe una sesión llamada «%s»" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Cerrar la sesión" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Apagar" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Reiniciar" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Ignorando cualquier inhibidor existente" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "No requerir confirmación del usuario" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "No se pudo conectar con el gestor de sesiones" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Se llamó al programa con opciones en conflicto" -#~ msgid "GNOME fallback" -#~ msgstr "Alternativa de GNOME" +#~ msgid "Select Command" +#~ msgstr "Seleccionar comando" + +#~ msgid "Add Startup Program" +#~ msgstr "Añadir programa al inicio" + +#~ msgid "Edit Startup Program" +#~ msgstr "Editar programa al inicio" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "El comando de inicio no puede estar vacío" + +#~ msgid "The startup command is not valid" +#~ msgstr "El comando de inicio no es válido" + +#~ msgid "Enabled" +#~ msgstr "Activado" + +#~ msgid "Icon" +#~ msgstr "Icono" + +#~ msgid "Program" +#~ msgstr "Programa" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Preferencias de las aplicaciones al inicio" + +#~ msgid "No name" +#~ msgstr "Sin nombre" + +#~ msgid "No description" +#~ msgstr "Sin descripción" + +#~ msgid "Could not display help document" +#~ msgstr "No se pudo mostrar el documento de ayuda" + +#~ msgid "Startup Applications" +#~ msgstr "Aplicaciones al inicio" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Elija qué aplicaciones iniciar al iniciar la sesión" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "El archivo no es un archivo .desktop válido" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "No se reconoce la versión «%s» del archivo desktop" + +#~ msgid "Starting %s" +#~ msgstr "Iniciando %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "La aplicación no acepta documentos en la línea de comandos" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opción de lanzamiento no reconocida: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "No se pueden pasar los URI de documentos a entradas de escritorio " +#~ "Type=Link" + +#~ msgid "Not a launchable item" +#~ msgstr "No es un elemento lanzable" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Desactivar la conexión con el gestor de sesiones" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Especifique el archivo que contiene la configuración guardada" + +#~ msgid "FILE" +#~ msgstr "ARCHIVO" + +#~ msgid "Specify session management ID" +#~ msgstr "Especifique el ID de gestión de la sesión" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opciones de gestión de sesión:" + +#~ msgid "Show session management options" +#~ msgstr "Mostrar opciones de gestión de sesión" + +#~ msgid "Some programs are still running:" +#~ msgstr "Aún se están ejecutando algunos programas:" + +#~ msgid "Unknown" +#~ msgstr "Desconocido" + +#~ msgid "A program is still running:" +#~ msgstr "Aún se está ejecutando un programa:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Esperando a que los programas finalicen. Interrumpir estos programas " +#~ "puede causar la pérdida de su trabajo." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Esperando a que los programas finalicen. Interrumpir estos programas " +#~ "puede causar la pérdida de su trabajo." + +#~ msgid "Switch User Anyway" +#~ msgstr "Cambiar usuario de todas formas" + +#~ msgid "Log Out Anyway" +#~ msgstr "Salir de todas formas" + +#~ msgid "Suspend Anyway" +#~ msgstr "Suspender de todas formas" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernar de todas formas" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Apagar de todas formas" + +#~ msgid "Restart Anyway" +#~ msgstr "Reiniciar de todas formas" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquear pantalla" + +#~ msgid "Cancel" +#~ msgstr "Cancelar" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Saldrá automáticamente de la sesión en %d segundo." +#~ msgstr[1] "Saldrá automáticamente de la sesión en %d segundos." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "El sistema se apagará automáticamente en %d segundo." +#~ msgstr[1] "El sistema se apagará automáticamente en %d segundos." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "El sistema se reiniciará automáticamente en %d segundo." +#~ msgstr[1] "El sistema se reiniciará automáticamente en %d segundos." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Ha iniciado sesión como «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "¿Cerrar la sesión en este sistema ahora?" + +#~ msgid "_Switch User" +#~ msgstr "Ca_mbiar usuario" + +#~ msgid "Shut down this system now?" +#~ msgstr "¿Apagar ahora este sistema?" + +#~ msgid "S_uspend" +#~ msgstr "_Suspender" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernar" + +#~ msgid "_Restart" +#~ msgstr "_Reiniciar" + +#~ msgid "_Shut Down" +#~ msgstr "_Apagar" + +#~ msgid "Restart this system now?" +#~ msgstr "¿Reiniciar este sistema ahora?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/et.po gnome-session-3.14.0/po/et.po --- gnome-session-3.9.90/po/et.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/et.po 2014-06-25 18:06:33.000000000 +0000 @@ -16,8 +16,8 @@ "Project-Id-Version: gnome-session MASTER\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-12 13:31+0000\n" -"PO-Revision-Date: 2013-03-12 16:21+0300\n" +"POT-Creation-Date: 2013-11-18 19:21+0000\n" +"PO-Revision-Date: 2013-09-13 02:12+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian <>\n" "Language: et\n" @@ -25,45 +25,13 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Poedit 1.5.4\n" -msgid "Select Command" -msgstr "Käsu valimine" - -msgid "Add Startup Program" -msgstr "Automaatselt käivituva rakenduse lisamine" - -msgid "Edit Startup Program" -msgstr "Automaatselt käivituva rakenduse muutmine" - -msgid "The startup command cannot be empty" -msgstr "Käivituskäsku ei tohi tühjaks jätta" - -msgid "The startup command is not valid" -msgstr "Käivituskäsk pole korrektne" - -msgid "Enabled" -msgstr "Lubatud" - -msgid "Icon" -msgstr "Ikoon" - -msgid "Program" -msgstr "Rakendus" - -msgid "Startup Applications Preferences" -msgstr "Automaatselt käivitatavate rakenduste eelistused" - -msgid "No name" -msgstr "Nimi puudub" - -msgid "No description" -msgstr "Kirjeldus puudub" - -msgid "Version of this application" -msgstr "Rakenduse versioon" +msgid "Custom" +msgstr "Kohandatud" -msgid "Could not display help document" -msgstr "Abidokumenti pole võimalik kuvada" +msgid "This entry lets you select a saved session" +msgstr "Selle abil saab valida salvestatud seansi" msgid "GNOME" msgstr "GNOME" @@ -71,15 +39,14 @@ msgid "This session logs you into GNOME" msgstr "Selle seansiga logitakse sind GNOME keskkonda sisse" -msgid "Custom" -msgstr "Kohandatud" +msgid "GNOME dummy" +msgstr "GNOME libaseanss" -msgid "This entry lets you select a saved session" -msgstr "Selle abil saab valida salvestatud seansi" +msgid "GNOME on Wayland" +msgstr "GNOME Waylandiga" -#, fuzzy -msgid "GNOME dummy" -msgstr "GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Selle seansiga logitakse sind Waylandi kasutades GNOME keskkonda sisse" msgid "Custom Session" msgstr "Kohandatud seanss" @@ -99,15 +66,6 @@ msgid "_Continue" msgstr "_Jätka" -msgid "Some programs are still running:" -msgstr "Mõned rakendused töötavad ikka veel:" - -msgid "Startup Applications" -msgstr "Automaatselt käivitatavad rakendused" - -msgid "Choose what applications to start when you log in" -msgstr "Sisselogimisel käivitatavate rakenduste valimine" - msgid "Additional startup _programs:" msgstr "Täiendavad automaatselt käivituvad _rakendused:" @@ -135,61 +93,6 @@ msgid "_Name:" msgstr "_Nimi:" -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Fail pole korrektne .desktop fail" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Töölauafailis tundmatu \"Version '%s'\"" - -#, c-format -msgid "Starting %s" -msgstr "Käivitamine: %s" - -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Rakendus ei toeta käsurealt määratavaid dokumente" - -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Tundmatu käivitusvalik: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"Dokumendi URI-sid pole võimalik 'Type=Link' tüüpi töölauakirjetele edastada" - -#, c-format -msgid "Not a launchable item" -msgstr "Pole käivitatav kirje" - -msgid "Disable connection to session manager" -msgstr "Seansihalduriga ühendumise keelamine" - -msgid "Specify file containing saved configuration" -msgstr "Salvestatud seadistusi sisaldava faili määramine" - -msgid "FILE" -msgstr "FAIL" - -msgid "Specify session management ID" -msgstr "Seansihalduse ID määramine" - -msgid "ID" -msgstr "ID" - -msgid "Session management options:" -msgstr "Seansihalduse valikud:" - -msgid "Show session management options" -msgstr "Seansihalduse valikute näitamine" - msgid "Oh no! Something has gone wrong." msgstr "Oo ei! Miski läks nihu." @@ -226,97 +129,6 @@ msgid "Show extension warning" msgstr "Laienduse hoiatuse kuvamine" -msgid "Unknown" -msgstr "Tundmatu" - -msgid "A program is still running:" -msgstr "Üks rakendus töötab ikka veel:" - -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Rakenduse töö lõpetamise järel ootamine. Rakenduse katkestamine võib " -"põhjustada sinu töö kaotsimineku." - -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Rakenduse töö lõpetamise järel ootamine. Rakenduste katkestamine võib " -"põhjustada sinu töö kaotsimineku." - -msgid "Switch User Anyway" -msgstr "Vaheta ikkagi kasutajat" - -msgid "Log Out Anyway" -msgstr "Logi ikkagi välja" - -msgid "Suspend Anyway" -msgstr "Alusta ikkagi uinakut" - -msgid "Hibernate Anyway" -msgstr "Alusta ikkagi talveund" - -msgid "Shut Down Anyway" -msgstr "Lülita ikkagi välja" - -msgid "Restart Anyway" -msgstr "Taaskäivita ikkagi" - -msgid "Lock Screen" -msgstr "Lukusta ekraan" - -msgid "Cancel" -msgstr "Tühista" - -#. This string is shared with gsm-fail-whale-dialog.c -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Sind logitakse %d sekundi pärast automaatselt välja." -msgstr[1] "Sind logitakse %d sekundi pärast automaatselt välja." - -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "See arvuti lülitatakse %d sekundi pärast automaatselt välja." -msgstr[1] "See arvuti lülitatakse %d sekundi pärast automaatselt välja." - -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "See arvuti taaskäivitatakse %d sekundi pärast automaatselt." -msgstr[1] "See arvuti taaskäivitatakse %d sekundi pärast automaatselt." - -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Sa oled sisse logitud kasutajana \"%s\"." - -msgid "Log out of this system now?" -msgstr "Kas logida arvutist välja?" - -msgid "_Switch User" -msgstr "_Vaheta kasutajat" - -msgid "Shut down this system now?" -msgstr "Kas lülitada arvuti välja?" - -msgid "S_uspend" -msgstr "_Alusta uinakut" - -msgid "_Hibernate" -msgstr "_Alusta talveund" - -msgid "_Restart" -msgstr "_Taaskäivita" - -msgid "_Shut Down" -msgstr "Lülita _välja" - -msgid "Restart this system now?" -msgstr "Kas taaskäivitada arvuti kohe?" - msgid "Not responding" msgstr "Ei vasta" @@ -360,6 +172,9 @@ msgid "Do not load user-specified applications" msgstr "Kasutaja määratud rakendusi ei laadita" +msgid "Version of this application" +msgstr "Rakenduse versioon" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong msgid "Show the fail whale dialog for testing" msgstr "Testimise jaoks kuvatakse nurjumise dialoogi" @@ -447,8 +262,180 @@ msgid "Program called with conflicting options" msgstr "Rakendus kutsuti välja vastuoluliste parameetritega" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME varurežiim" +#~ msgid "Select Command" +#~ msgstr "Käsu valimine" + +#~ msgid "Add Startup Program" +#~ msgstr "Automaatselt käivituva rakenduse lisamine" + +#~ msgid "Edit Startup Program" +#~ msgstr "Automaatselt käivituva rakenduse muutmine" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "Käivituskäsku ei tohi tühjaks jätta" + +#~ msgid "The startup command is not valid" +#~ msgstr "Käivituskäsk pole korrektne" + +#~ msgid "Enabled" +#~ msgstr "Lubatud" + +#~ msgid "Icon" +#~ msgstr "Ikoon" + +#~ msgid "Program" +#~ msgstr "Rakendus" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "Automaatselt käivitatavate rakenduste eelistused" + +#~ msgid "No name" +#~ msgstr "Nimi puudub" + +#~ msgid "No description" +#~ msgstr "Kirjeldus puudub" + +#~ msgid "Could not display help document" +#~ msgstr "Abidokumenti pole võimalik kuvada" + +#~ msgid "Startup Applications" +#~ msgstr "Automaatselt käivitatavad rakendused" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Sisselogimisel käivitatavate rakenduste valimine" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Fail pole korrektne .desktop fail" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "Töölauafailis tundmatu \"Version '%s'\"" + +#~ msgid "Starting %s" +#~ msgstr "Käivitamine: %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "Rakendus ei toeta käsurealt määratavaid dokumente" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Tundmatu käivitusvalik: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "Dokumendi URI-sid pole võimalik 'Type=Link' tüüpi töölauakirjetele " +#~ "edastada" + +#~ msgid "Not a launchable item" +#~ msgstr "Pole käivitatav kirje" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Seansihalduriga ühendumise keelamine" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Salvestatud seadistusi sisaldava faili määramine" + +#~ msgid "FILE" +#~ msgstr "FAIL" + +#~ msgid "Specify session management ID" +#~ msgstr "Seansihalduse ID määramine" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Seansihalduse valikud:" + +#~ msgid "Show session management options" +#~ msgstr "Seansihalduse valikute näitamine" + +#~ msgid "Some programs are still running:" +#~ msgstr "Mõned rakendused töötavad ikka veel:" + +#~ msgid "Unknown" +#~ msgstr "Tundmatu" + +#~ msgid "A program is still running:" +#~ msgstr "Üks rakendus töötab ikka veel:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Rakenduse töö lõpetamise järel ootamine. Rakenduse katkestamine võib " +#~ "põhjustada sinu töö kaotsimineku." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Rakenduse töö lõpetamise järel ootamine. Rakenduste katkestamine võib " +#~ "põhjustada sinu töö kaotsimineku." + +#~ msgid "Switch User Anyway" +#~ msgstr "Vaheta ikkagi kasutajat" + +#~ msgid "Log Out Anyway" +#~ msgstr "Logi ikkagi välja" + +#~ msgid "Suspend Anyway" +#~ msgstr "Alusta ikkagi uinakut" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Alusta ikkagi talveund" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Lülita ikkagi välja" + +#~ msgid "Restart Anyway" +#~ msgstr "Taaskäivita ikkagi" + +#~ msgid "Lock Screen" +#~ msgstr "Lukusta ekraan" + +#~ msgid "Cancel" +#~ msgstr "Tühista" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sind logitakse %d sekundi pärast automaatselt välja." +#~ msgstr[1] "Sind logitakse %d sekundi pärast automaatselt välja." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "See arvuti lülitatakse %d sekundi pärast automaatselt välja." +#~ msgstr[1] "See arvuti lülitatakse %d sekundi pärast automaatselt välja." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "See arvuti taaskäivitatakse %d sekundi pärast automaatselt." +#~ msgstr[1] "See arvuti taaskäivitatakse %d sekundi pärast automaatselt." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Sa oled sisse logitud kasutajana \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Kas logida arvutist välja?" + +#~ msgid "_Switch User" +#~ msgstr "_Vaheta kasutajat" + +#~ msgid "Shut down this system now?" +#~ msgstr "Kas lülitada arvuti välja?" + +#~ msgid "S_uspend" +#~ msgstr "_Alusta uinakut" + +#~ msgid "_Hibernate" +#~ msgstr "_Alusta talveund" + +#~ msgid "_Restart" +#~ msgstr "_Taaskäivita" + +#~ msgid "_Shut Down" +#~ msgstr "Lülita _välja" + +#~ msgid "Restart this system now?" +#~ msgstr "Kas taaskäivitada arvuti kohe?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/eu.po gnome-session-3.14.0/po/eu.po --- gnome-session-3.9.90/po/eu.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/eu.po 2014-06-25 18:06:33.000000000 +0000 @@ -1,17 +1,17 @@ # translation of eu.po to Basque # Copyright (C) 1999, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# # Joseba Bidaurrazaga van Dierdonck , 2000. # Hizkuntza Politikarako Sailburuordetza , 2004. # Julen Ruiz Aizpuru , 2011. # Iñaki Larrañaga Murgoitio , 2005, 2006, 2007, 2008, 2009, 2010, 2011. # Iñaki Larrañaga Murgoitio , 2012, 2013. -# msgid "" msgstr "" "Project-Id-Version: eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-04 23:04+0100\n" -"PO-Revision-Date: 2013-03-03 18:12+0100\n" +"POT-Creation-Date: 2013-09-14 18:15+0200\n" +"PO-Revision-Date: 2013-09-14 18:15+0200\n" "Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" "Language: eu\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" "X-Project-Style: gnome\n" #: ../capplet/gsm-app-dialog.c:120 @@ -42,31 +42,31 @@ msgid "The startup command is not valid" msgstr "Abioko komandoa ez da baliozkoa" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Gaituta" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikonoa" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Abioko aplikazioen hobespenak" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Izenik ez" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Azalpenik ez" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Aplikazio honen bertsioa" @@ -74,14 +74,6 @@ msgid "Could not display help document" msgstr "Ezin izan da laguntzako dokumentua bistaratu" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Saio honek GNOMEn sartuko zaitu" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Pertsonalizatua" @@ -90,10 +82,35 @@ msgid "This entry lets you select a saved session" msgstr "Sarrera honek gordetako saio bat hautatzea uzten dizu" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Saio honek GNOMEn sartuko zaitu" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Probako GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Abioko aplikazioak" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Aukeratu zein aplikazio abiarazi saioa-hasten duzunean" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME Wayland gainean" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Saio honek GNOMEn sartuko zaitu, Wayland erabiliz" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Saio pertsonalizatua" @@ -118,18 +135,6 @@ msgid "_Continue" msgstr "_Jarraitu" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Programa batzuk oraindik exekutatzen ari dira:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Abioko aplikazioak" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Aukeratu zein aplikazio abiarazi saioa-hasten duzunean" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Abioko _programa osagarriak:" @@ -235,11 +240,11 @@ msgid "Show session management options" msgstr "Erakutsi saio-kudeatzailearen aukerak" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Zerbait gaizki irten da." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -247,7 +252,7 @@ "Arazo bat gertatu da eta sistemak ezin du berreskuratu. Jarri harremanetan " "sistemaren administratzaile batekin" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -255,7 +260,7 @@ "Arazo bat gertatu da eta sistemak ezin du berreskuratu. Hedapen guztiak " "desgaitu egin dira badazpada." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -263,139 +268,23 @@ "Arazo bat gertatu da eta sistemak ezin du berreskuratu.\n" "Amaitu saioa eta saiatu berriro." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "Amaitu _saioa" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Gaitu arazketa-kodea" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Baimendu saioa amaitzea" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Erakutsi hedapenaren abisua" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Ezezaguna" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Programa bat oraindik exekutatzen ari da:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Programa amaitu zain. Programa hau eteteak zure lanak galtzea eragin lezake." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Programak amaitu zain. Programa hauek eteteak zure lanak galtzea eragin " -"lezake." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Aldatu erabiltzailez hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Amaitu saioa hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Eseki hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernatu hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Itzali hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Berrabiarazi hala ere" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Blokeatu pantaila" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Utzi" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Automatikoki zure saioa segundo %d barru amaituko da." -msgstr[1] "Automatikoki zure saioa %d segundotan amaituko da." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Automatikoki sistema segundo %d barru itzaliko da." -msgstr[1] "Automatikoki sistema %d segundotan itzaliko da." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Automatikoki sistema segundo %d barru berrabiaraziko da." -msgstr[1] "Automatikoki sistema %d segundotan berrabiaraziko da." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Unean \"%s\" gisa zaude saioan hasita." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Amaitu saioa sistematik orain?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Aldatu erabiltzailez" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Itzali sistema orain?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Eseki" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernatu" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Berrabiarazi" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Itzali" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Berrabiarazi sistema orain?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Ez du erantzuten" @@ -407,11 +296,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Gogoratutako aplikazioa" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Programa honek saioa amaitzea blokeatzen ari da." @@ -426,32 +315,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Ezin izan da entzuteko ICE socket-a sortu: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Jaramonik ez egin hasiera automatikoko direktorio estandarrei" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "HASIERA_AUTOMATIKOKO_DIREKTORIOA" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Saioa erabiltzeko" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SAIOAREN_IZENA" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ez kargatu erabiltzaileak zehaztutako aplikazioak" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Erakutsi errorearen elkarrizketa-koadroa probetarako" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOMEren saio-kudeatzailea" @@ -554,8 +443,94 @@ msgid "Program called with conflicting options" msgstr "Gatazkan dauden aukerekin deitu da programa" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME ordezkoa" +#~ msgid "Some programs are still running:" +#~ msgstr "Programa batzuk oraindik exekutatzen ari dira:" + +#~ msgid "Unknown" +#~ msgstr "Ezezaguna" + +#~ msgid "A program is still running:" +#~ msgstr "Programa bat oraindik exekutatzen ari da:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Programa amaitu zain. Programa hau eteteak zure lanak galtzea eragin " +#~ "lezake." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Programak amaitu zain. Programa hauek eteteak zure lanak galtzea eragin " +#~ "lezake." + +#~ msgid "Switch User Anyway" +#~ msgstr "Aldatu erabiltzailez hala ere" + +#~ msgid "Log Out Anyway" +#~ msgstr "Amaitu saioa hala ere" + +#~ msgid "Suspend Anyway" +#~ msgstr "Eseki hala ere" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernatu hala ere" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Itzali hala ere" + +#~ msgid "Restart Anyway" +#~ msgstr "Berrabiarazi hala ere" + +#~ msgid "Lock Screen" +#~ msgstr "Blokeatu pantaila" + +#~ msgid "Cancel" +#~ msgstr "Utzi" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Automatikoki zure saioa segundo %d barru amaituko da." +#~ msgstr[1] "Automatikoki zure saioa %d segundotan amaituko da." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Automatikoki sistema segundo %d barru itzaliko da." +#~ msgstr[1] "Automatikoki sistema %d segundotan itzaliko da." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Automatikoki sistema segundo %d barru berrabiaraziko da." +#~ msgstr[1] "Automatikoki sistema %d segundotan berrabiaraziko da." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Unean \"%s\" gisa zaude saioan hasita." + +#~ msgid "Log out of this system now?" +#~ msgstr "Amaitu saioa sistematik orain?" + +#~ msgid "_Switch User" +#~ msgstr "_Aldatu erabiltzailez" + +#~ msgid "Shut down this system now?" +#~ msgstr "Itzali sistema orain?" + +#~ msgid "S_uspend" +#~ msgstr "_Eseki" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernatu" + +#~ msgid "_Restart" +#~ msgstr "_Berrabiarazi" + +#~ msgid "_Shut Down" +#~ msgstr "_Itzali" + +#~ msgid "Restart this system now?" +#~ msgstr "Berrabiarazi sistema orain?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/fa.po gnome-session-3.14.0/po/fa.po --- gnome-session-3.9.90/po/fa.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/fa.po 2014-06-25 18:06:33.000000000 +0000 @@ -12,10 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: gnome-session 2.10.0\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-20 10:28+0330\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-10-05 18:08+0330\n" "Last-Translator: Arash Mousavi \n" "Language-Team: Persian\n" "Language: fa_IR\n" @@ -24,7 +23,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -46,31 +45,31 @@ msgid "The startup command is not valid" msgstr "فرمان راه‌اندازی معتبر نیست" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "فعال" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "نقشک" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "برنامه" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "ترجیحات برنامه‌های راه‌اندازی" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "بدون نام" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "بدون شرح" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "نسخه‌ی این برنامه" @@ -78,14 +77,6 @@ msgid "Could not display help document" msgstr "نمی‌توان سند راهنما را نمایش داد" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "گنوم" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "این نشست شما را به گنوم وارد می‌کند." - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "سفارشی" @@ -94,11 +85,37 @@ msgid "This entry lets you select a saved session" msgstr "این ورودی به شما اجاره می‌دهد نشست ذخیره شده‌ای را انتخاب کنید" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "گنوم" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "این نشست شما را به گنوم وارد می‌کند." + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "گنوم ساختگی" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "برنامه‌های راه‌اندازی" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "انتخاب کنید که هنگام ورود به سیستم چه برنامه‌هایی آغاز شوند" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "گنوم بر روی Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "این نشست، با استفاده از Wayland شما را به گنوم وارد می‌کند" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "نشست سفارشی" @@ -123,18 +140,6 @@ msgid "_Continue" msgstr "_ادامه" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "چند برنامه همچنان در حال اجرا هستند:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "برنامه‌های راه‌اندازی" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "انتخاب کنید که هنگام ورود به سیستم چه برنامه‌هایی آغاز شوند" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "برنامه‌های راه‌اندازی اضافی:" @@ -239,174 +244,43 @@ msgid "Show session management options" msgstr "گزینه‌های مدیریت نشست نمایش داده شوند" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "اُخ نه! یک چیزی اشتباه شد." +#: ../gnome-session/gsm-fail-whale-dialog.c:302 +msgid "A problem has occurred and the system can't recover. Please contact a system administrator" +msgstr "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. لطفا با یک مدیر سیستم تماس بگیرید" + #: ../gnome-session/gsm-fail-whale-dialog.c:304 -msgid "" -"A problem has occurred and the system can't recover. Please contact a system " -"administrator" -msgstr "" -"یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. لطفا با یک مدیر سیستم تماس " -"بگیرید" +msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." +msgstr "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. تمام افزونه‌ها جهت احتیاط غیرفعال شده‌اند." #: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" -"A problem has occurred and the system can't recover. All extensions have " -"been disabled as a precaution." -msgstr "" -"یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود. تمام افزونه‌ها جهت احتیاط " -"غیرفعال شده‌اند." - -#: ../gnome-session/gsm-fail-whale-dialog.c:308 -msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." msgstr "" "یک مشکل رُخ داده است و سیستم نمی‌تواند بازیابی شود.\n" "لطفا از سیستم خارج شوید و دوباره امتحان کنید." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_خروج از سیستم" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "کد اشکال‌زدایی به کار انداخته شود" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "اجازه خروج از سیستم داده شود" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "اخطار پسوند نشان داده شود" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "ناشناخته" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "یک برنامه همچنان در حال اجرا است:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"در حال انتظار برای پایان یافتن برنامه. وقفه انداختن در برنامه ممکن است باعث " -"از دست رفتن کارتان بشود." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"در حال انتظار برای پایان یافتن برنامه‌ها. وقفه انداختن در این برنامه‌ها ممکن " -"است باعث از دست رفتن کارتان بشود." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "در هر حال، تعویض کاربر انجام شود" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "در هر حال خروج از سیستم انجام شود" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "در هر حال سیستم معلق شود" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "در هر حال خواب زمستانی انجام شود" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "در هر حال خاموش کردن سیستم صورت گیرد" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "در هر حال سیستم مجددا راه‌اندازی شود" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "قفل کردن صفحه" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "انصراف" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "شما پس از %Id ثانیه به صورت خودکار از سیستم خارج خواهید شد." -msgstr[1] "شما پس از %Id ثانیه خودکار از سیستم خارج خواهید شد." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "این سیستم پس از %Id ثانیه، به صورت خودکار خاموش خواهد شد." -msgstr[1] "این سیستم پس از %Id ثانیه، خودکار خاموش خواهد شد." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "این سیستم پس از %Id ثانیه، به صورت خودکار مجددا راه‌اندازی خواهد شد." -msgstr[1] "این سیستم پس از %Id ثانیه، بصورت خودکار مجددا راه‌اندازی خواهد شد." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "هم‌اکنون شما با عنوان «%s» وارد سیستم شده‌اید." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "هم‌اکنون از این سیستم خارج شویم؟" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_تعویض کاربر" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "این سیستم هم‌اکنون خاموش شود؟" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_تعلیق" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_خواب زمستانی" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_راه‌اندازی مجدد" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "خامو_ش کردن" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "سیستم هم‌اکنون خاموش شود؟" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "نا پاسخگو" @@ -418,18 +292,16 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "بخاطر سپردن برنامه" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "این برنامه جلوی خروج از سیستم را گرفته است." #: ../gnome-session/gsm-xsmp-server.c:341 -msgid "" -"Refusing new client connection because the session is currently being shut " -"down\n" +msgid "Refusing new client connection because the session is currently being shut down\n" msgstr "چون سیستم در حال خاموش شدن است درخواست اتصال کارگیر رَد می‌شود\n" #: ../gnome-session/gsm-xsmp-server.c:610 @@ -437,32 +309,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "ایجاد سوکت گوش‌کننده‌ی ICE ممکن نشد: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "شاخه‌های استاندارد آغاز خودکار، لغو شود" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "نشستی که استفاده شود" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "برنامه‌های مشخص شده توسط کاربر اجرا نشوند" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "نمایش بالن محاوره شکست جهت آزمایش کردن" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " ـ مدیر نشست گنوم" @@ -512,13 +384,11 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "نشست %Id" #: ../tools/gnome-session-selector.c:108 -msgid "" -"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "نام نشست‌ها نمی‌توانند با «.» شروع شده یا شامل نویسه‌ی «/» باشند" #: ../tools/gnome-session-selector.c:112 @@ -562,20 +432,120 @@ msgid "Program called with conflicting options" msgstr "برنامه با گزینه‌های ناسازگار فراخوانده شده است" -#~ msgid "GNOME fallback" -#~ msgstr "گنوم یدکی" +#~ msgid "Some programs are still running:" +#~ msgstr "چند برنامه همچنان در حال اجرا هستند:" + +#~ msgid "Unknown" +#~ msgstr "ناشناخته" + +#~ msgid "A program is still running:" +#~ msgstr "یک برنامه همچنان در حال اجرا است:" +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "در حال انتظار برای پایان یافتن برنامه. وقفه انداختن در برنامه ممکن است " +#~ "باعث از دست رفتن کارتان بشود." +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "در حال انتظار برای پایان یافتن برنامه‌ها. وقفه انداختن در این برنامه‌ها " +#~ "ممکن است باعث از دست رفتن کارتان بشود." + +#~ msgid "Switch User Anyway" +#~ msgstr "در هر حال، تعویض کاربر انجام شود" + +#~ msgid "Log Out Anyway" +#~ msgstr "در هر حال خروج از سیستم انجام شود" + +#~ msgid "Suspend Anyway" +#~ msgstr "در هر حال سیستم معلق شود" + +#~ msgid "Hibernate Anyway" +#~ msgstr "در هر حال خواب زمستانی انجام شود" + +#~ msgid "Shut Down Anyway" +#~ msgstr "در هر حال خاموش کردن سیستم صورت گیرد" + +#~ msgid "Restart Anyway" +#~ msgstr "در هر حال سیستم مجددا راه‌اندازی شود" + +#~ msgid "Lock Screen" +#~ msgstr "قفل کردن صفحه" + +#~ msgid "Cancel" +#~ msgstr "انصراف" + +#~ msgid "You will be automatically logged out in %d second." + +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "شما پس از %Id ثانیه به صورت خودکار از سیستم خارج خواهید شد." +#~ msgstr[1] "شما پس از %Id ثانیه خودکار از سیستم خارج خواهید شد." + +#~ msgid "This system will be automatically shut down in %d second." + +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "این سیستم پس از %Id ثانیه، به صورت خودکار خاموش خواهد شد." +#~ msgstr[1] "این سیستم پس از %Id ثانیه، خودکار خاموش خواهد شد." + +#~ msgid "This system will be automatically restarted in %d second." + +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "" +#~ "این سیستم پس از %Id ثانیه، به صورت خودکار مجددا راه‌اندازی خواهد شد." +#~ msgstr[1] "" +#~ "این سیستم پس از %Id ثانیه، بصورت خودکار مجددا راه‌اندازی خواهد شد." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "هم‌اکنون شما با عنوان «%s» وارد سیستم شده‌اید." + +#~ msgid "Log out of this system now?" +#~ msgstr "هم‌اکنون از این سیستم خارج شویم؟" + +#~ msgid "_Switch User" +#~ msgstr "_تعویض کاربر" + +#~ msgid "Shut down this system now?" +#~ msgstr "این سیستم هم‌اکنون خاموش شود؟" + +#~ msgid "S_uspend" +#~ msgstr "_تعلیق" + +#~ msgid "_Hibernate" +#~ msgstr "_خواب زمستانی" + +#~ msgid "_Restart" +#~ msgstr "_راه‌اندازی مجدد" + +#~ msgid "_Shut Down" +#~ msgstr "خامو_ش کردن" + +#~ msgid "Restart this system now?" +#~ msgstr "سیستم هم‌اکنون خاموش شود؟" #~ msgid "%d hour" + #~ msgid_plural "%d hours" #~ msgstr[0] "%Id ساعت" #~ msgstr[1] "%Id ساعت" #~ msgid "%d minute" + #~ msgid_plural "%d minutes" #~ msgstr[0] "%Id دقیقه" #~ msgstr[1] "%Id دقیقه" #~ msgid "%d second" + #~ msgid_plural "%d seconds" #~ msgstr[0] "%Id ثانیه" #~ msgstr[1] "%Id ثانیه" diff -Nru gnome-session-3.9.90/po/fi.po gnome-session-3.14.0/po/fi.po --- gnome-session-3.9.90/po/fi.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/fi.po 2014-06-25 18:06:33.000000000 +0000 @@ -8,22 +8,23 @@ # Timo Jyrinki , 2008-2010. # Ville-Pekka Vainio , 2010. # Tommi Vainikainen , 2011. -# Jiri Grönroos , 2012, 2013. +# Jiri Grönroos , 2012, 2013. +# msgid "" msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-06 20:02+0200\n" +"POT-Creation-Date: 2013-09-16 12:25+0000\n" +"PO-Revision-Date: 2013-09-18 20:23+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: Finnish \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -45,31 +46,31 @@ msgid "The startup command is not valid" msgstr "Käynnistyskomento ei ole kelvollinen" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Käytössä" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Kuvake" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Sovellus" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Aloitusohjelmien asetukset" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Ei nimeä" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Ei kuvausta" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Tämän ohjelman versio" @@ -77,14 +78,6 @@ msgid "Could not display help document" msgstr "Ohjetta ei voitu näyttää" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "Gnome" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Tämä istunto kirjautuu Gnomeen" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Omavalintainen" @@ -93,13 +86,37 @@ msgid "This entry lets you select a saved session" msgstr "Tämä kohta mahdollistaa tallennetun istunnon valinnan" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "Gnome" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Tämä istunto kirjautuu Gnomeen" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Gnome-malli-istunto (dummy)" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Käynnistettävät ohjelmat" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Valitse sisäänkirjauduttaessa käynnistettävät ohjelmat" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Gnome Waylandilla" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Tämä istunto kirjautuu Gnomeen Waylandia käyttäen" + #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "Omavalintainen istunto" @@ -108,17 +125,14 @@ msgstr "Valitse omavalintainen istunto" #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "_Uusi istunto" #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "_Poista istunto" #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "Ni_meä istunto uudelleen" @@ -126,18 +140,6 @@ msgid "_Continue" msgstr "_Jatka" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Joitakin ohjelmia on vielä käynnissä:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Käynnistettävät ohjelmat" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Valitse sisäänkirjauduttaessa käynnistettävät ohjelmat" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Muut käynnistyvät _ohjelmat:" @@ -242,11 +244,11 @@ msgid "Show session management options" msgstr "Näytä istunnonhallinnan valinnat" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Voi ei! Jotain meni pieleen." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -254,7 +256,7 @@ "Esiintyi ongelma ja järjestelmä ei pysty palautumaan. Ota yhteyttä " "järjestelmän ylläpitäjään" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -262,7 +264,7 @@ "Esiintyi ongelma ja järjestelmä ei pysty palautumaan. Kaikki laajennukset on " "poistettu käytöstä varotoimenpiteenä." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -270,152 +272,27 @@ "Esiintyi ongelma ja järjestelmä ei pysty palautumaan.\n" "Kirjaudu ulos ja yritä uudelleen, kiitos." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "Kirjaudu _ulos" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Käytä vianetsintäkoodia" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Salli uloskirjautuminen" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Näytä laajennusvaroitus" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Tuntematon" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Ohjelma on vielä käynnissä:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Odotetaan ohjelman sulkeutumista. Ohjelman suorituksen keskeyttäminen voi " -"aiheuttaa töiden häviämisen." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Odotetaan ohjelmien sulkeutumista. Ohjelmien suorituksen keskeyttäminen voi " -"aiheuttaa töiden häviämisen." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Vaihda käyttäjää kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Kirjaudu ulos kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Siirry valmiustilaan kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Siirry lepotilaan kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Sammuta kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Käynnistä uudelleen kaikesta huolimatta" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Lukitse näyttö" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Peru" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Sinut kirjataan ulos automaattisesti %d sekunnin kuluttua." -msgstr[1] "Sinut kirjataan ulos automaattisesti %d sekunnin kuluttua." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Järjestelmä sammuu automaattisesti %d sekunnin kuluttua." -msgstr[1] "Järjestelmä sammuu automaattisesti %d sekunnin kuluttua." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Järjestelmä käynnistetään uudelleen %d sekunnin kuluttua." -msgstr[1] "Järjestelmä käynnistetään uudelleen %d sekunnin kuluttua." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Olet kirjautunut sisään käyttäjänä ”%s”." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Kirjaudutaanko ulos järjestelmästä nyt?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Vaihda käyttäjää" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Sammutetaanko järjestelmä nyt?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "Valmi_ustila" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Lepotila" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Käynnistä _uudelleen" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Sammuta" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Käynnistetäänkö järjestelmä uudelleen nyt?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Ei vastaa" #: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" msgid "_Log out" msgstr "Kirjau_du ulos" @@ -423,15 +300,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Muistettu sovellus" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Tämä ohjelma estää kirjautumisen ulos." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -439,37 +316,37 @@ "Kieltäydytään uudesta asiakasyhteydestä, koska istuntoa ollaan parhaillaan " "sulkemassa\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE-kuuntelupistoketta ei voi luoda: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Korvaa automaattikäynnistyksen oletuskansiot" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOKÄYN_HAK" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Käytettävä istunto" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "ISTUNTONIMI" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Älä lataa käyttäjän määrittelemiä sovelluksia" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Näytä musta virheikkuna testausta varten" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - Gnomen istunnonhallinta" @@ -494,7 +371,6 @@ #: ../tools/gnome-session-inhibit.c:148 #, c-format -#| msgid "Failed to save session" msgid "Failed to execute %s\n" msgstr "Kohteen %s suorittaminen epäonnistui\n" @@ -506,7 +382,6 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Istunto %d" @@ -556,8 +431,100 @@ msgid "Program called with conflicting options" msgstr "Ohjelmaa kutsuttiin ristiriitaisilla valitsimilla" -#~ msgid "GNOME fallback" -#~ msgstr "Gnome-vara" +#~ msgid "Some programs are still running:" +#~ msgstr "Joitakin ohjelmia on vielä käynnissä:" + +#~ msgid "Unknown" +#~ msgstr "Tuntematon" + +#~ msgid "A program is still running:" +#~ msgstr "Ohjelma on vielä käynnissä:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Odotetaan ohjelman sulkeutumista. Ohjelman suorituksen keskeyttäminen voi " +#~ "aiheuttaa töiden häviämisen." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Odotetaan ohjelmien sulkeutumista. Ohjelmien suorituksen keskeyttäminen " +#~ "voi aiheuttaa töiden häviämisen." + +#~ msgid "Switch User Anyway" +#~ msgstr "Vaihda käyttäjää kaikesta huolimatta" + +#~ msgid "Log Out Anyway" +#~ msgstr "Kirjaudu ulos kaikesta huolimatta" + +#~ msgid "Suspend Anyway" +#~ msgstr "Siirry valmiustilaan kaikesta huolimatta" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Siirry lepotilaan kaikesta huolimatta" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Sammuta kaikesta huolimatta" + +#~ msgid "Restart Anyway" +#~ msgstr "Käynnistä uudelleen kaikesta huolimatta" + +#~ msgid "Lock Screen" +#~ msgstr "Lukitse näyttö" + +#~ msgid "Cancel" +#~ msgstr "Peru" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Sinut kirjataan ulos automaattisesti %d sekunnin kuluttua." +#~ msgstr[1] "Sinut kirjataan ulos automaattisesti %d sekunnin kuluttua." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Järjestelmä sammuu automaattisesti %d sekunnin kuluttua." +#~ msgstr[1] "Järjestelmä sammuu automaattisesti %d sekunnin kuluttua." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Järjestelmä käynnistetään uudelleen %d sekunnin kuluttua." +#~ msgstr[1] "Järjestelmä käynnistetään uudelleen %d sekunnin kuluttua." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Olet kirjautunut sisään käyttäjänä ”%s”." + +#~ msgid "Log out of this system now?" +#~ msgstr "Kirjaudutaanko ulos järjestelmästä nyt?" + +#~ msgid "_Switch User" +#~ msgstr "_Vaihda käyttäjää" + +#~ msgid "Shut down this system now?" +#~ msgstr "Sammutetaanko järjestelmä nyt?" + +#~ msgid "S_uspend" +#~ msgstr "Valmi_ustila" + +#~ msgid "_Hibernate" +#~ msgstr "_Lepotila" + +#~ msgid "_Restart" +#~ msgstr "Käynnistä _uudelleen" + +#~ msgid "_Shut Down" +#~ msgstr "_Sammuta" + +#~ msgid "Restart this system now?" +#~ msgstr "Käynnistetäänkö järjestelmä uudelleen nyt?" #~ msgid "Icon '%s' not found" #~ msgstr "Kuvaketta ”%s” ei löydy" diff -Nru gnome-session-3.9.90/po/fr.po gnome-session-3.14.0/po/fr.po --- gnome-session-3.9.90/po/fr.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/fr.po 2014-06-25 18:06:33.000000000 +0000 @@ -20,8 +20,8 @@ "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-15 14:59+0100\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-12 18:08+0200\n" "Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \n" "Language: \n" @@ -50,31 +50,31 @@ msgid "The startup command is not valid" msgstr "La commande de démarrage n'est pas valide" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Activé" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Icône" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programme" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Préférences des applications au démarrage" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Pas de nom" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Pas de description" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Version de cette application" @@ -82,14 +82,6 @@ msgid "Could not display help document" msgstr "Impossible d'afficher le document d'aide" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Cette session vous connecte dans GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personnalisé" @@ -98,10 +90,35 @@ msgid "This entry lets you select a saved session" msgstr "Ce choix permet d'accéder à une session enregistrée" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Cette session vous connecte dans GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME factice" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Applications au démarrage" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Choisir les applications à lancer à la connexion" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sur Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Cette session vous connecte dans GNOME, en utilisant Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Session personnalisée" @@ -126,18 +143,6 @@ msgid "_Continue" msgstr "_Continuer" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Des programmes sont toujours en cours d'exécution :" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Applications au démarrage" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Choisir les applications à lancer à la connexion" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programmes supplémentaires au démarrage :" @@ -246,11 +251,11 @@ msgid "Show session management options" msgstr "Affiche les options de la gestion de sessions" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Oh mince ! Quelque chose s'est mal passé." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -258,7 +263,7 @@ "Un problème est survenu et le système ne peut pas se récupérer. Contactez un " "administrateur système" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -266,7 +271,7 @@ "Un problème est survenu et le système ne peut pas se récupérer. Toutes les " "extensions ont été désactivées par mesure de précaution." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -274,140 +279,23 @@ "Un problème est survenu et le système ne peut pas se récupérer.\n" "Déconnectez-vous et essayez à nouveau." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Fermer la session" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Active le code de débogage" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Autoriser la déconnexion" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Afficher l'avertissement pour les extensions" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Inconnu" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Un programme est toujours en cours d'exécution :" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Attente de la fin du programme. L'interruption du programme risquerait de " -"vous faire perdre certaines données." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Attente de la fin des programmes. L'interruption de ces programmes " -"risquerait de vous faire perdre certaines données." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Changer d'utilisateur malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Se déconnecter malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Mettre en veille malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hiberner malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Éteindre malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Redémarrer malgré tout" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Verrouiller l'écran" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Annuler" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Vous serez automatiquement déconnecté dans %d seconde." -msgstr[1] "Vous serez automatiquement déconnecté dans %d secondes." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Cet ordinateur va s'éteindre automatiquement dans %d seconde." -msgstr[1] "Cet ordinateur va s'éteindre automatiquement dans %d secondes." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Cet ordinateur va redémarrer automatiquement dans %d seconde." -msgstr[1] "Cet ordinateur va redémarrer automatiquement dans %d secondes." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Vous êtes actuellement connecté en tant que « %s »." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Se déconnecter du système maintenant ?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Changer d'_utilisateur" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Éteindre cet ordinateur maintenant ?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Mettre en veille" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hiberner" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Redémarrer" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "Ét_eindre" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Redémarrer cet ordinateur maintenant ?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Absence de réponse" @@ -419,15 +307,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Applications mémorisées" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ce programme bloque la déconnexion." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -435,37 +323,37 @@ "Refus de la connexion d'un nouveau client car la session est actuellement en " "cours de fermeture\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Impossible de créer le connecteur d'écoute ICE : %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Remplace les répertoires autostart standards" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "RÉP_AUTOSTART" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Session à utiliser" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOM_SESSION" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ne charge pas les applications demandées par l'utilisateur" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Afficher le dialogue d'erreur pour le tester" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- le gestionnaire de sessions de GNOME" @@ -496,9 +384,11 @@ " --app-id ID L'identifiant d'application à utiliser\n" " lors de l'inhibition (optionnel)\n" " --reason REASON La raison de l'inhibition (optionnel)\n" -" --inhibit ARG Les choses à inhiber, liste séparée par des doubles-points parmi :\n" +" --inhibit ARG Les choses à inhiber, liste séparée par des doubles-" +"points parmi :\n" " logout, switch-user, suspend, idle, automount\n" -" --inhibit-only Ne pas lancer COMMANDE et attendre indéfiniment à la place\n" +" --inhibit-only Ne pas lancer COMMANDE et attendre indéfiniment à la " +"place\n" "\n" "Si aucune option --inhibit n'est précisée, « idle » est supposé.\n" @@ -521,7 +411,9 @@ #: ../tools/gnome-session-selector.c:108 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "Les noms de sessions ne peuvent pas commencer par « . » ou contenir le caractère « / »" +msgstr "" +"Les noms de sessions ne peuvent pas commencer par « . » ou contenir le " +"caractère « / »" #: ../tools/gnome-session-selector.c:112 msgid "Session names are not allowed to start with ‘.’" @@ -564,8 +456,94 @@ msgid "Program called with conflicting options" msgstr "Programme appelé avec des options conflictuelles" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME restreint" +#~ msgid "Some programs are still running:" +#~ msgstr "Des programmes sont toujours en cours d'exécution :" + +#~ msgid "Unknown" +#~ msgstr "Inconnu" + +#~ msgid "A program is still running:" +#~ msgstr "Un programme est toujours en cours d'exécution :" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Attente de la fin du programme. L'interruption du programme risquerait de " +#~ "vous faire perdre certaines données." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Attente de la fin des programmes. L'interruption de ces programmes " +#~ "risquerait de vous faire perdre certaines données." + +#~ msgid "Switch User Anyway" +#~ msgstr "Changer d'utilisateur malgré tout" + +#~ msgid "Log Out Anyway" +#~ msgstr "Se déconnecter malgré tout" + +#~ msgid "Suspend Anyway" +#~ msgstr "Mettre en veille malgré tout" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hiberner malgré tout" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Éteindre malgré tout" + +#~ msgid "Restart Anyway" +#~ msgstr "Redémarrer malgré tout" + +#~ msgid "Lock Screen" +#~ msgstr "Verrouiller l'écran" + +#~ msgid "Cancel" +#~ msgstr "Annuler" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Vous serez automatiquement déconnecté dans %d seconde." +#~ msgstr[1] "Vous serez automatiquement déconnecté dans %d secondes." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Cet ordinateur va s'éteindre automatiquement dans %d seconde." +#~ msgstr[1] "Cet ordinateur va s'éteindre automatiquement dans %d secondes." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Cet ordinateur va redémarrer automatiquement dans %d seconde." +#~ msgstr[1] "Cet ordinateur va redémarrer automatiquement dans %d secondes." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Vous êtes actuellement connecté en tant que « %s »." + +#~ msgid "Log out of this system now?" +#~ msgstr "Se déconnecter du système maintenant ?" + +#~ msgid "_Switch User" +#~ msgstr "Changer d'_utilisateur" + +#~ msgid "Shut down this system now?" +#~ msgstr "Éteindre cet ordinateur maintenant ?" + +#~ msgid "S_uspend" +#~ msgstr "_Mettre en veille" + +#~ msgid "_Hibernate" +#~ msgstr "_Hiberner" + +#~ msgid "_Restart" +#~ msgstr "_Redémarrer" + +#~ msgid "_Shut Down" +#~ msgstr "Ét_eindre" + +#~ msgid "Restart this system now?" +#~ msgstr "Redémarrer cet ordinateur maintenant ?" #~ msgid "Icon '%s' not found" #~ msgstr "Icône « %s » non trouvée" diff -Nru gnome-session-3.9.90/po/fur.po gnome-session-3.14.0/po/fur.po --- gnome-session-3.9.90/po/fur.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/fur.po 2014-09-22 14:18:16.000000000 +0000 @@ -7,8 +7,8 @@ "Project-Id-Version: gnome-session 2.20.x\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-01-26 22:27+0000\n" -"PO-Revision-Date: 2013-01-27 02:33+0100\n" +"POT-Creation-Date: 2014-08-13 19:24+0000\n" +"PO-Revision-Date: 2014-08-14 05:43+0100\n" "Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" @@ -18,82 +18,65 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Selezion comant" - -#: ../capplet/gsm-app-dialog.c:193 -#, fuzzy -msgid "Add Startup Program" -msgstr "Zonte program di inviament" - -#: ../capplet/gsm-app-dialog.c:197 -#, fuzzy -msgid "Edit Startup Program" -msgstr "Modifiche programe di inviament" - -#: ../capplet/gsm-app-dialog.c:484 -#, fuzzy -msgid "The startup command cannot be empty" -msgstr "Il non dal program di inviament nol pos jessi vueit" - -#: ../capplet/gsm-app-dialog.c:490 -#, fuzzy -msgid "The startup command is not valid" -msgstr "Il comant di inviament nol è valid" - -#: ../capplet/gsm-properties-dialog.c:518 -msgid "Enabled" -msgstr "Abilitât" - -#: ../capplet/gsm-properties-dialog.c:530 -msgid "Icon" -msgstr "Icone" - -#: ../capplet/gsm-properties-dialog.c:542 -msgid "Program" -msgstr "Program" - -#: ../capplet/gsm-properties-dialog.c:746 -msgid "Startup Applications Preferences" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" msgstr "" -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Nissun non" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Nissune descrizion" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "Version di cheste aplicazion" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "No pues mostrâ il document di jutori" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Ti permet di selezionâ une session salvade" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" #: ../data/gnome.desktop.in.h:2 -#, fuzzy msgid "This session logs you into GNOME" -msgstr "Cheste session ti puartarâ dentri GNOME" +msgstr "Cheste session ti fasarâ jentrâ dentri GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Cualchi program al sta ancjemò zirant:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "" +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +#, fuzzy +#| msgid "GNOME" +msgid "GNOME dummy" +msgstr "GNOME" -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Selezione cualis aplicazions fa partî cuanche tu jentris" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME su Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Cheste session ti fasarâ jentrâ dentri GNOME, doprant Wayland" + +#: ../data/session-selector.ui.h:1 +#| msgid "Current Session" +msgid "Custom Session" +msgstr "Session personalizade" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Par plasê selezione une session personalizade di inviâ" + +#: ../data/session-selector.ui.h:3 +#| msgid "Sessions" +msgid "_New Session" +msgstr "G_nove Sessions" + +#: ../data/session-selector.ui.h:4 +#| msgid "Save sessions" +msgid "_Remove Session" +msgstr "_Gjave sessions" + +#: ../data/session-selector.ui.h:5 +#| msgid "Current Session" +msgid "Rena_me Session" +msgstr "Cambie Non ae Session" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Indenant" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -120,7 +103,7 @@ #, fuzzy #| msgid "_Browse..." msgid "Browse…" -msgstr "_Esplore..." +msgstr "Esplore..." #: ../data/session-properties.ui.h:7 msgid "Comm_ent:" @@ -134,84 +117,11 @@ msgid "_Name:" msgstr "_Non:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Il file a nol è un valit file .desktop" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "" - -#: ../egg/eggdesktopfile.c:974 -#, fuzzy, c-format -#| msgid "Starting" -msgid "Starting %s" -msgstr "Inviament in côrs di %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "L'aplicazion no acete documents su linie di comant" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opzion di inviament no ricognossude: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Element no inviabil" - -#: ../egg/eggsmclient.c:226 -#, fuzzy -#| msgid "Could not connect to the session manager" -msgid "Disable connection to session manager" -msgstr "Impussibil colegasi al gjestôr di session" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -#, fuzzy -#| msgid "Specify a session name to load" -msgid "Specify session management ID" -msgstr "Specifiche un non pe session di cjariâ" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Opzions di ministrazion di session:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Mostre opzions di ministrazion di session" - -#: ../gnome-session/gsm-fail-whale-dialog.c:296 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "Orpo! Alc al è lât stuart." -#: ../gnome-session/gsm-fail-whale-dialog.c:303 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -219,7 +129,7 @@ "Al è vignût fûr un probleme e il sisteme nol pues comedasi. Par plasê clame " "il ministradôr di sisteme" -#: ../gnome-session/gsm-fail-whale-dialog.c:305 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -227,7 +137,7 @@ "Al è vignût fûr un probleme e il sisteme nol pues comedasi. Dutis lis " "estensions a son stadis disabilitadis par precauzion." -#: ../gnome-session/gsm-fail-whale-dialog.c:307 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -235,144 +145,27 @@ "Al è vignût fûr un probleme e il sisteme nol pues comedasi. \n" "Par plasê jes e riprove." -#: ../gnome-session/gsm-fail-whale-dialog.c:322 -#: ../gnome-session/gsm-logout-dialog.c:383 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "_Jes" -#: ../gnome-session/gsm-fail-whale-dialog.c:344 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "Permet di jessî" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Mostre avîs di estension" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "No cognossût" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Un program al sta ancjemò zirant:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"O spieti che il program al finissi. Interompi il program al pues fati pierdi " -"il lavôr fat." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"O spieti che i programs a finissin. Interompi chescj programs al pues fati " -"pierdi il lavôr fat." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Cambie utent d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Jes d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Sospint d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Glace d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Stude d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reinvie d'istes" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloche Visôr" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Anule" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:262 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Tu jessarâs automaticamentri in %d secont." -msgstr[1] "Tu jessarâs automaticamentri in %d seconts." - -#: ../gnome-session/gsm-logout-dialog.c:270 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Il sisteme a si studarà automaticamentri in %d secont." -msgstr[1] "Il sisteme a si studarà automaticamentri in %d seconts." - -#: ../gnome-session/gsm-logout-dialog.c:278 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Il sisteme a si reinviarà automaticamentri in %d secont." -msgstr[1] "Il sisteme a si reinviarà automaticamentri in %d seconts." - -#: ../gnome-session/gsm-logout-dialog.c:302 -#, fuzzy, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "In chest moment tu sês jentrât come \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:368 -msgid "Log out of this system now?" -msgstr "Jessî di chest sisteme cumò?" - -#: ../gnome-session/gsm-logout-dialog.c:374 -msgid "_Switch User" -msgstr "_Cambie Utent" - -#: ../gnome-session/gsm-logout-dialog.c:389 -msgid "Shut down this system now?" -msgstr "Studâ il sisteme cumò?" - -#: ../gnome-session/gsm-logout-dialog.c:395 -msgid "S_uspend" -msgstr "S_ospint" - -#: ../gnome-session/gsm-logout-dialog.c:401 -msgid "_Hibernate" -msgstr "_Glace" - -#: ../gnome-session/gsm-logout-dialog.c:407 -#: ../gnome-session/gsm-logout-dialog.c:433 -msgid "_Restart" -msgstr "_Reinvie" - -#: ../gnome-session/gsm-logout-dialog.c:417 -msgid "_Shut Down" -msgstr "_Stude" - -#: ../gnome-session/gsm-logout-dialog.c:423 -msgid "Restart this system now?" -msgstr "Reinviâ il sisteme cumò?" - -#: ../gnome-session/gsm-manager.c:1428 ../gnome-session/gsm-manager.c:2176 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Nol rispuint" -#: ../gnome-session/gsm-util.c:417 +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "_Jes" @@ -380,58 +173,62 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 #, fuzzy #| msgid "Remember running applications" msgid "Remembered Application" msgstr "Aplicazion Visade " -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Chest program al sta blocant la jessude." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "Refudi le gnove conession client parce che la session a si sta studant\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Impussibil creâ il socket di scolte ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" -msgstr "" +msgstr "No'l ten cont des directory standard di inviament automatic" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Session di doprâ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" -msgstr "" +msgstr "NON_SESSION" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" -msgstr "" +msgstr "Nol cjame lis aplicazions specificadis dal utent" + +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Version di cheste aplicazion" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr "- Ministradôr di session di GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -450,47 +247,234 @@ "If no --inhibit option is specified, idle is assumed.\n" msgstr "" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Falît a eseguî %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s al scugne vê un argoment\n" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-selector.c:61 +#, c-format +#| msgid "Sessions" +msgid "Session %d" +msgstr "Session %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "I nons di session no puedin tacâ cun ‘.’ o vê il caratar ‘/’" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "I nons di session no puedin tacâ cun ‘.’" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "I nons di session a no puedin vê il caratar ‘/’" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "Une session clamade ‘%s’ a esist aromai" + +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "_Jes" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Stude" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" -msgstr "Reinvie" +msgstr "Torne invie" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" -msgstr "" +msgstr "Ignore ogni inibidôr esistent" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "No sta domandâ conferme" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "Impussibil colegasi al ministradôr di session" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Program clamât cun opzions in conflit" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME rapeç" +#~ msgid "Select Command" +#~ msgstr "Selezion comant" + +#, fuzzy +#~ msgid "Add Startup Program" +#~ msgstr "Zonte program di inviament" + +#, fuzzy +#~ msgid "Edit Startup Program" +#~ msgstr "Modifiche programe di inviament" + +#, fuzzy +#~ msgid "The startup command cannot be empty" +#~ msgstr "Il non dal program di inviament nol pos jessi vueit" + +#, fuzzy +#~ msgid "The startup command is not valid" +#~ msgstr "Il comant di inviament nol è valid" + +#~ msgid "Enabled" +#~ msgstr "Abilitât" + +#~ msgid "Icon" +#~ msgstr "Icone" + +#~ msgid "Program" +#~ msgstr "Program" + +#~ msgid "No name" +#~ msgstr "Nissun non" + +#~ msgid "No description" +#~ msgstr "Nissune descrizion" + +#~ msgid "Could not display help document" +#~ msgstr "No pues mostrâ il document di jutori" + +#~ msgid "Some programs are still running:" +#~ msgstr "Cualchi program al sta ancjemò zirant:" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "Selezione cualis aplicazions fa partî cuanche tu jentris" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "Il file a nol è un valit file .desktop" + +#~| msgid "Starting" +#~ msgid "Starting %s" +#~ msgstr "Inviament in côrs di %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "L'aplicazion no acete documents su linie di comant" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opzion di inviament no ricognossude: %d" + +#~ msgid "Not a launchable item" +#~ msgstr "Element no inviabil" + +#~| msgid "Could not connect to the session manager" +#~ msgid "Disable connection to session manager" +#~ msgstr "Impussibil colegasi al gjestôr di session" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~| msgid "Specify a session name to load" +#~ msgid "Specify session management ID" +#~ msgstr "Specifiche un non pe session di cjariâ" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opzions di ministrazion di session:" + +#~ msgid "Show session management options" +#~ msgstr "Mostre opzions di ministrazion di session" + +#~ msgid "Unknown" +#~ msgstr "No cognossût" + +#~ msgid "A program is still running:" +#~ msgstr "Un program al sta ancjemò zirant:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "O spieti che il program al finissi. Interompi il program al pues fati " +#~ "pierdi il lavôr fat." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "O spieti che i programs a finissin. Interompi chescj programs al pues " +#~ "fati pierdi il lavôr fat." + +#~ msgid "Switch User Anyway" +#~ msgstr "Cambie utent d'istes" + +#~ msgid "Log Out Anyway" +#~ msgstr "Jes d'istes" + +#~ msgid "Suspend Anyway" +#~ msgstr "Sospint d'istes" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Glace d'istes" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Stude d'istes" + +#~ msgid "Restart Anyway" +#~ msgstr "Reinvie d'istes" + +#~ msgid "Lock Screen" +#~ msgstr "Bloche Visôr" + +#~ msgid "Cancel" +#~ msgstr "Anule" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Tu jessarâs automaticamentri in %d secont." +#~ msgstr[1] "Tu jessarâs automaticamentri in %d seconts." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Il sisteme a si studarà automaticamentri in %d secont." +#~ msgstr[1] "Il sisteme a si studarà automaticamentri in %d seconts." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Il sisteme a si reinviarà automaticamentri in %d secont." +#~ msgstr[1] "Il sisteme a si reinviarà automaticamentri in %d seconts." + +#, fuzzy +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "In chest moment tu sês jentrât come \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Jessî di chest sisteme cumò?" + +#~ msgid "_Switch User" +#~ msgstr "_Cambie Utent" + +#~ msgid "Shut down this system now?" +#~ msgstr "Studâ il sisteme cumò?" + +#~ msgid "S_uspend" +#~ msgstr "S_ospint" + +#~ msgid "_Hibernate" +#~ msgstr "_Glace" + +#~ msgid "_Restart" +#~ msgstr "_Reinvie" + +#~ msgid "_Shut Down" +#~ msgstr "_Stude" + +#~ msgid "Restart this system now?" +#~ msgstr "Reinviâ il sisteme cumò?" #~ msgid "Allow TCP connections" #~ msgstr "Permet conessions TCP" @@ -526,9 +510,6 @@ #~ msgid "Preferred Image to use for login splash screen" #~ msgstr "Imagjine preferide di doprâ pa la schermade di inviament" -#~ msgid "Save sessions" -#~ msgstr "Salve sessions" - #~ msgid "Selected option in the log out dialog" #~ msgstr "Opzion selezionade tal dialogo di logout" @@ -559,9 +540,6 @@ #~ msgid "Configure your sessions" #~ msgstr "Configure lis sessions" -#~ msgid "Sessions" -#~ msgstr "Sessions" - #~ msgid "" #~ "Assistive technology support has been requested for this session, but the " #~ "accessibility registry was not found. Please ensure that the AT-SPI " @@ -781,9 +759,6 @@ #~ "Par sigurece, l'inviament di une session cuntun utent coun podês al vares " #~ "di mai sedi fat. Se pussibil loggasi come utent normâl." -#~ msgid "_Continue" -#~ msgstr "_Indenant" - #~ msgid "" #~ "The session might encounter issues if the computer clock is not properly " #~ "configured. Please consider adjusting it.\n" @@ -860,9 +835,6 @@ #~ msgid "_Close without Saving" #~ msgstr "_Siere cence salvâ" -#~ msgid "Current Session" -#~ msgstr "Session curint" - #~ msgid "Your session has been saved." #~ msgstr "La session jè stade salvade" diff -Nru gnome-session-3.9.90/po/gd.po gnome-session-3.14.0/po/gd.po --- gnome-session-3.9.90/po/gd.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-session-3.14.0/po/gd.po 2014-06-25 18:06:34.000000000 +0000 @@ -0,0 +1,590 @@ +# Gaelic; Scottish translation for gnome-session +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the gnome-session package. +# FIRST AUTHOR , 2011. +# GunChleoc , 2013. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-15 08:00+0000\n" +"PO-Revision-Date: 2013-09-22 08:04+0100\n" +"Last-Translator: GunChleoc \n" +"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\n" +"Language: gd\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : " +"(n > 2 && n < 20) ? 2 : 3;\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Launchpad-Export-Date: 2013-09-15 06:24+0000\n" +"X-Project-Style: gnome\n" + +#: ../capplet/gsm-app-dialog.c:120 +msgid "Select Command" +msgstr "Tagh àithne" + +#: ../capplet/gsm-app-dialog.c:193 +msgid "Add Startup Program" +msgstr "Cuir prògram tòiseachaidh ris" + +#: ../capplet/gsm-app-dialog.c:197 +msgid "Edit Startup Program" +msgstr "Deasaich am prògram tòiseachaidh" + +#: ../capplet/gsm-app-dialog.c:484 +msgid "The startup command cannot be empty" +msgstr "Chan fhaod an àithne tòiseachaidh a bhith falamh" + +#: ../capplet/gsm-app-dialog.c:490 +msgid "The startup command is not valid" +msgstr "Chan eil an àithne tòiseachaidh dligheach" + +#: ../capplet/gsm-properties-dialog.c:519 +msgid "Enabled" +msgstr "An comas" + +#: ../capplet/gsm-properties-dialog.c:531 +msgid "Icon" +msgstr "Ìomhaigheag" + +#: ../capplet/gsm-properties-dialog.c:543 +msgid "Program" +msgstr "Prògram" + +#: ../capplet/gsm-properties-dialog.c:747 +msgid "Startup Applications Preferences" +msgstr "Roghainnean nam prògraman tòiseachaidh" + +#: ../capplet/gsp-app.c:276 +msgid "No name" +msgstr "Gun ainm" + +#: ../capplet/gsp-app.c:282 +msgid "No description" +msgstr "Gun tuairisgeul" + +#: ../capplet/main.c:35 +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "Tionndadh a' phrògraim seo" + +#: ../capplet/main.c:61 +msgid "Could not display help document" +msgstr "Cha b' urrainn dhuinn sgrìobhainn na cobharach a shealltainn" + +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Gnàthaichte" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "'S urrainn dhut seisean air a shàbhaladh a thaghadh leis an innteart seo" + +#: ../data/gnome.desktop.in.h:1 +#: ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Clàraidh an seisean seo a-steach gu GNOME thu" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "Caochag GNOME" + +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Prògraman tòiseachaidh" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Tagh na prògraman a thèid a ruith nuair a nì thu clàradh a-steach" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME air Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Clàraidh an seisean seo a-steach gu GNOME thu a'cleachdadh Wayland" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "Seisean gnàthaichte" + +#: ../data/session-selector.ui.h:2 +#: ../tools/gnome-session-selector.c:103 +msgid "Please select a custom session to run" +msgstr "Tagh seisean gnàthaichte gus a ruith" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "_Seisean ùr" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "Thoi_r an seisean air falbh" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "Thoir ain_m ùr air an t-seisean" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Lean air adhart" + +#: ../data/session-properties.ui.h:1 +msgid "Additional startup _programs:" +msgstr "_Prògraman tòiseachaidh a bharrachd:" + +#: ../data/session-properties.ui.h:2 +msgid "Startup Programs" +msgstr "Prògraman tòiseachaidh" + +#: ../data/session-properties.ui.h:3 +msgid "_Automatically remember running applications when logging out" +msgstr "" +"Cuimhnich na prògraman a bhios a' ruith gu fèin-obr_achail nuair a nì mi " +"clàradh a-mach" + +#: ../data/session-properties.ui.h:4 +msgid "_Remember Currently Running Applications" +msgstr "Cuimhnich na p_rògraman a tha a' ruith an-dràsta" + +#: ../data/session-properties.ui.h:5 +msgid "Options" +msgstr "Roghainnean" + +#: ../data/session-properties.ui.h:6 +msgid "Browse…" +msgstr "Brabhsaich..." + +#: ../data/session-properties.ui.h:7 +msgid "Comm_ent:" +msgstr "Abai_rt:" + +#: ../data/session-properties.ui.h:8 +msgid "Co_mmand:" +msgstr "Ài_thne:" + +#: ../data/session-properties.ui.h:9 +msgid "_Name:" +msgstr "Ai_nm:" + +#: ../egg/eggdesktopfile.c:165 +#, c-format +msgid "File is not a valid .desktop file" +msgstr "Chan eil am faidhle seo na fhaidhle .desktop dligheach" + +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../egg/eggdesktopfile.c:191 +#, c-format +msgid "Unrecognized desktop file Version '%s'" +msgstr "Faidhle desktop tionndadh \"%s\" neo-aithnichte" + +#: ../egg/eggdesktopfile.c:974 +#, c-format +msgid "Starting %s" +msgstr "A' tòiseachadh %s" + +#: ../egg/eggdesktopfile.c:1116 +#, c-format +msgid "Application does not accept documents on command line" +msgstr "Cha ghabh am prògram ri sgrìobhainnean air an loidhne-àithne" + +#: ../egg/eggdesktopfile.c:1184 +#, c-format +msgid "Unrecognized launch option: %d" +msgstr "Roghainn tòiseachaidh neo-aithnichte: %d" + +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../egg/eggdesktopfile.c:1391 +#, c-format +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "Cha ghabh URI sgrìobhainn a chur gu innteart desktop \"Type=Link\"" + +#: ../egg/eggdesktopfile.c:1412 +#, c-format +msgid "Not a launchable item" +msgstr "Chan e nì a ghabhas tòiseachadh a th' ann" + +#: ../egg/eggsmclient.c:226 +msgid "Disable connection to session manager" +msgstr "Chur à comas an ceangal ri manaidsear nan seisean" + +#: ../egg/eggsmclient.c:229 +msgid "Specify file containing saved configuration" +msgstr "Sònraich am faidhle sa deach an rèiteachadh a shàbhaladh" + +#: ../egg/eggsmclient.c:229 +msgid "FILE" +msgstr "FAIDHLE" + +#: ../egg/eggsmclient.c:232 +msgid "Specify session management ID" +msgstr "Sònraich ID stiùireadh nan seisean" + +#: ../egg/eggsmclient.c:232 +msgid "ID" +msgstr "ID" + +#: ../egg/eggsmclient.c:253 +msgid "Session management options:" +msgstr "Roghainnean stiùireadh nan seisean:" + +#: ../egg/eggsmclient.c:254 +msgid "Show session management options" +msgstr "Seall roghainnean stiùireadh nan seisean" + +#: ../gnome-session/gsm-fail-whale-dialog.c:295 +msgid "Oh no! Something has gone wrong." +msgstr "Obh Obh! Chaidh rudeigin cearr." + +#: ../gnome-session/gsm-fail-whale-dialog.c:302 +msgid "A problem has occurred and the system can't recover. Please contact a system administrator" +msgstr "Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Feuch an cuir thu fiosrachadh gu rianaire an t-siostaim agad." + +#: ../gnome-session/gsm-fail-whale-dialog.c:304 +msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." +msgstr "Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag. Chaidh na h-uile leudachan a chur à comas mar earalas." + +#: ../gnome-session/gsm-fail-whale-dialog.c:306 +msgid "" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." +msgstr "" +"Thachair duilgheadas ach nach urrainn dhan t-siostam aiseag.\n" +"An clàraich thu a-mach is a-steach airson feuchainn ris a-rithist?" + +#: ../gnome-session/gsm-fail-whale-dialog.c:321 +msgid "_Log Out" +msgstr "C_làraich a-mach" + +#: ../gnome-session/gsm-fail-whale-dialog.c:343 +#: ../gnome-session/main.c:307 +msgid "Enable debugging code" +msgstr "Cuir an comas còd dì-bhugachaidh" + +#: ../gnome-session/gsm-fail-whale-dialog.c:344 +msgid "Allow logout" +msgstr "Ceadaich clàradh a-mach" + +#: ../gnome-session/gsm-fail-whale-dialog.c:345 +msgid "Show extension warning" +msgstr "Seall rabhadh leudachain" + +#: ../gnome-session/gsm-manager.c:1271 +#: ../gnome-session/gsm-manager.c:2043 +msgid "Not responding" +msgstr "Chan eil e a' freagairt" + +#: ../gnome-session/gsm-util.c:411 +msgid "_Log out" +msgstr "C_làraich a-mach" + +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. +#. +#: ../gnome-session/gsm-xsmp-client.c:559 +msgid "Remembered Application" +msgstr "Prògram air a chuimhneachadh" + +#: ../gnome-session/gsm-xsmp-client.c:1209 +msgid "This program is blocking logout." +msgstr "Tha am prògram seo a' bacadh a' chlàraidh a-mach." + +#: ../gnome-session/gsm-xsmp-server.c:341 +msgid "Refusing new client connection because the session is currently being shut down\n" +msgstr "A' diùltadh ceangal ùr ri cliant on a tha an seisean 'ga dhùnadh sìos an-dràsta.\n" + +#: ../gnome-session/gsm-xsmp-server.c:610 +#, c-format +msgid "Could not create ICE listening socket: %s" +msgstr "Cha b' urrainn dhuinn socaid èisteachd ICE a chruthachadh: %s" + +#: ../gnome-session/main.c:305 +msgid "Override standard autostart directories" +msgstr "Tar-àithn na pasganan fèin-tòiseachaidh bunaiteach" + +#: ../gnome-session/main.c:305 +msgid "AUTOSTART_DIR" +msgstr "PASGAN_FÈIN_TOISEACHAIDH" + +#: ../gnome-session/main.c:306 +msgid "Session to use" +msgstr "An seisean ri chleachdadh" + +#: ../gnome-session/main.c:306 +msgid "SESSION_NAME" +msgstr "AINM_SEISEIN" + +#: ../gnome-session/main.c:308 +msgid "Do not load user-specified applications" +msgstr "Cha b' urrainn dhuinn prògraman gnàthaichte a' chleachdaiche a luchdadh" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:311 +msgid "Show the fail whale dialog for testing" +msgstr "Seall an còmhradh \"fail whale\" a chum deuchainn" + +#: ../gnome-session/main.c:344 +msgid " - the GNOME session manager" +msgstr " - manaidsear nan seisan GNOME" + +#: ../tools/gnome-session-inhibit.c:110 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [ROGHAINN...] ÀITHNE\n" +"\n" +"Cuir ÀITHNE an gnìomh fhad 's a thèid cuid a dh'fhoincseanan seisean a " +"bhacadh.\n" +"\n" +" -h, --help Seall a' chobhair seo\n" +" --version Seall an tionndadh dhen phrògram\n" +" --app-id ID ID a' phrògraim a thèid a chleachdadh\n" +" leis a' bhacadh (roghainneil)\n" +" --reason ADHBHAR Adhbhar a' bhacaidh (rogainneil)\n" +" --inhibit ARG Nithean ri am bacadh, liosta air a sgaradh le\n" +" còileanan de:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Na tòisich air ÀITHNE is feitheamh gun chrìch\n" +" 'na àite\n" +"\n" +"Mur deach an roghainn --inhibit a shònrachadh, thathar an dùil\n" +"air idle.\n" + +#: ../tools/gnome-session-inhibit.c:148 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Cha deach leinn %s a chur an gnìomh\n" + +#: ../tools/gnome-session-inhibit.c:208 +#: ../tools/gnome-session-inhibit.c:218 +#: ../tools/gnome-session-inhibit.c:228 +#, c-format +msgid "%s requires an argument\n" +msgstr "Tha argamaid a dhìth air %s\n" + +#: ../tools/gnome-session-selector.c:62 +#, c-format +msgid "Session %d" +msgstr "Seisean %d" + +#: ../tools/gnome-session-selector.c:108 +msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "Chan eil ainm seisein a thòisicheas le \".\" no sa bheil an caractar \"/\" ceadaichte" + +#: ../tools/gnome-session-selector.c:112 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Chan eil ainm seisein a thòisicheas le \".\" ceadaichte" + +#: ../tools/gnome-session-selector.c:116 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Chan eil ainm seisein sa bheil an caractar \"/\" ceadaichte" + +#: ../tools/gnome-session-selector.c:124 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "Tha seisean air a bheil \"%s\" ann mar-thà" + +#: ../tools/gnome-session-quit.c:53 +msgid "Log out" +msgstr "Clàraich a-mach" + +#: ../tools/gnome-session-quit.c:54 +msgid "Power off" +msgstr "Cuir a' chumhachd dheth" + +#: ../tools/gnome-session-quit.c:55 +msgid "Reboot" +msgstr "Ath-thòisich an siostam" + +#: ../tools/gnome-session-quit.c:56 +msgid "Ignoring any existing inhibitors" +msgstr "A' leigeil seachad gach bacadair a tha ann" + +#: ../tools/gnome-session-quit.c:57 +msgid "Don't prompt for user confirmation" +msgstr "Na faighnich airson dearbhadh a' chleachdaiche" + +#: ../tools/gnome-session-quit.c:91 +#: ../tools/gnome-session-quit.c:101 +msgid "Could not connect to the session manager" +msgstr "Cha b' urrainn dhuinn ceangal ri manaidsear nan seisean" + +#: ../tools/gnome-session-quit.c:203 +msgid "Program called with conflicting options" +msgstr "Chaidh prògram a ghairm le roghainnean ann an còmhstri" + +#~ msgid "Some programs are still running:" +#~ msgstr "Tha cuid a' phrògraman a' ruith fhathast:" + +#~ msgid "Unknown" +#~ msgstr "Chan eil fhios" + +#~ msgid "A program is still running:" +#~ msgstr "Tha prògram a' ruith fhathast:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Tha sinn a' feitheamh gus an crìochnaich am prògram. Dh'fhaoidte gun " +#~ "caill thu obair ma chuireas tu stad air." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Tha sinn a' feitheamh gus an crìochnaich prògraman. Dh'fhaoidte gun caill " +#~ "thu obair ma chuireas tu stad orra." + +#~ msgid "Switch User Anyway" +#~ msgstr "Gearr leum gu cleachdaiche eile co-dhiù" + +#~ msgid "Log Out Anyway" +#~ msgstr "Log a-mach co-dhiù" + +#~ msgid "Suspend Anyway" +#~ msgstr "Cuir na dhàil co-dhiù" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Geamhraich co-dhiù" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Dùin sìos co-dhiù" + +#~ msgid "Restart Anyway" +#~ msgstr "Ath-thòisich co-dhiù" + +#~ msgid "Lock Screen" +#~ msgstr "Glais an sgrìn" + +#~ msgid "Cancel" +#~ msgstr "Sguir dheth" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Thèid do logadh a-mach gu fèin-obrachail an ceann %d diog." +#~ msgstr[1] "Thèid do logadh a-mach gu fèin-obrachail an ceann %d dhiog." +#~ msgstr[2] "Thèid do logadh a-mach gu fèin-obrachail an ceann %d diogan." +#~ msgstr[3] "Thèid do logadh a-mach gu fèin-obrachail an ceann %d diog." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "" +#~ "Thèid an siostam seo a dhùnadh sìos gu fèin-obrachail an ceann %d diog." +#~ msgstr[1] "" +#~ "Thèid an siostam seo a dhùnadh sìos gu fèin-obrachail an ceann %d dhiog." +#~ msgstr[2] "" +#~ "Thèid an siostam seo a dhùnadh sìos gu fèin-obrachail an ceann %d diogan." +#~ msgstr[3] "" +#~ "Thèid an siostam seo a dhùnadh sìos gu fèin-obrachail an ceann %d diog." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "" +#~ "Thèid an siostam seo ath-thòiseachadh gu fèin-obrachail an ceann %d diog." +#~ msgstr[1] "" +#~ "Thèid an siostam seo ath-thòiseachadh gu fèin-obrachail an ceann %d dhiog." +#~ msgstr[2] "" +#~ "Thèid an siostam seo ath-thòiseachadh gu fèin-obrachail an ceann %d " +#~ "diogan." +#~ msgstr[3] "" +#~ "Thèid an siostam seo ath-thòiseachadh gu fèin-obrachail an ceann %d diog." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Tha thu air logadh a-steach an-dràsta mar \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "A bheil thu airson logadh a-mach on t-siostam seo an-dràsta?" + +#~ msgid "_Switch User" +#~ msgstr "Gearr leum gu _cleachdaiche eile" + +#~ msgid "Shut down this system now?" +#~ msgstr "A bheil thu airson an siostam seo a dhùnadh sìos an-dràsta?" + +#~ msgid "S_uspend" +#~ msgstr "C_uir na dhàil" + +#~ msgid "_Hibernate" +#~ msgstr "Geam_hraich" + +#~ msgid "_Restart" +#~ msgstr "_Ath-thòisich" + +#~ msgid "_Shut Down" +#~ msgstr "_Dùin sìos" + +#~ msgid "Restart this system now?" +#~ msgstr "A bheil thu airson an siostam ath-thòiseachadh an-dràsta?" + +#~ msgid "Icon '%s' not found" +#~ msgstr "Ìomhaigheag '%s' gun lorg" + +#~ msgid "GNOME fallback (Safe Mode)" +#~ msgstr "GNOME cùl-taic (Modh sàbhail)" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "A' feitheamh gus a chrìochnicheas am prògram, dh' fhaodadh tu caill " +#~ "d'obair le a bhith a' cuir stad air am program." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause " +#~ "you to lose work." +#~ msgstr "" +#~ "A' feitheamh son prògraman a chrìochnach. Dh'fhaodadh tu caill d'obair le " +#~ "a bhith a' cuir stad air na prògraman seo." + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "Ionnsaich barrachd mu dheidhinn GNOME" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "Dh'fhàillig GNOME 3 luchdadh" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "" +#~ "Cha b' urrainn tòiseach seisein logadh a-steach ( 's cha b' urrainn " +#~ "ceangal ris an fhrithealaiche X" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "Gu mì-fhortanach dh'fhàillig GNOME 3 tòiseachadh ceart agus thòisich e " +#~ "ann an modh cùl-taic.\n" +#~ "\n" +#~ "Tha seo ciallachadh gu mòr nach eil do shiostam ( bathar-chruaidh " +#~ "grafaichean no dràibhear) an comas lìbhrigeadh làn blas GNOME 3." diff -Nru gnome-session-3.9.90/po/gl.po gnome-session-3.14.0/po/gl.po --- gnome-session-3.9.90/po/gl.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/gl.po 2014-06-25 18:06:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: gnome-session.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-20 11:06+0100\n" -"PO-Revision-Date: 2013-02-20 11:06+0200\n" +"POT-Creation-Date: 2013-09-10 15:35+0200\n" +"PO-Revision-Date: 2013-09-10 15:37+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" @@ -47,31 +47,31 @@ msgid "The startup command is not valid" msgstr "A orde do programa de inicio non é correcta" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Activado" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Icona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferencias dos aplicativos de inicio" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Sen nome" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Sen descrición" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versión deste aplicativo" @@ -79,14 +79,6 @@ msgid "Could not display help document" msgstr "Non foi posíbel mostrar o documento de axuda" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Esta sesión iniciará en GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalizada" @@ -95,10 +87,35 @@ msgid "This entry lets you select a saved session" msgstr "Esta entrada permítelle selecciona unha sesión gardada" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Esta sesión iniciará en GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME de proba" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplicativos de inicio" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Seleccione que aplicativos se iniciarán coa sesión" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME en Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Esta sesión iniciará en GNOME, usando Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sesión personalizada" @@ -123,18 +140,6 @@ msgid "_Continue" msgstr "_Continuar" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Aínda se están executando algúns programas:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicativos de inicio" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Seleccione que aplicativos se iniciarán coa sesión" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programas de inicio adicionais:" @@ -241,11 +246,11 @@ msgid "Show session management options" msgstr "Mostrar as opcións de xestión de sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Recoido! Algo foi mal." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -253,7 +258,7 @@ "Produciuse un problema e non é posíbel recuperar o sistema. Contacte co " "administrador do sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -261,7 +266,7 @@ "Produciuse un problema e non é posíbel recuperar o sistema. Desactivaronse " "todas as extensións como medida de precaución." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -269,140 +274,23 @@ "Produciuse un problema e non é posíbel recuperar o sistema.\n" "Saia da sesión e ténteo de novo." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Saír da sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Activar o código de depuración" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Permitir saír da sesión" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Mostrar aviso de extensión" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Descoñecido" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Aínda se está executando un programa:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Esperando a que os programas rematen. Se interrompe este programa pode " -"causar a perda do seu traballo." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Esperando a que os programas rematen. A interrupción destes programas " -"podería causar a perda do seu traballo." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Cambiar de usuario de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Saír da sesión de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Suspender de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Apagar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reiniciar de todas formas" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloquear a pantalla" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancelar" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "A súa sesión rematará automaticamente en %d segundo." -msgstr[1] "A súa sesión rematará automaticamente en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Este sistema apagarase automaticamente en %d segundo." -msgstr[1] "Este sistema apagarase automaticamente en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Este sistema reiniciarase automaticamente en %d segundo." -msgstr[1] "Este sistema reiniciarase automaticamente en %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Actualmente ten unha sesión iniciada como «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Quere saír da sesión neste sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Cambiar de usuario" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Quere apagar o sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "S_uspender" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernar" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reiniciar" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Apagar" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Desexa reiniciar o sistema agora?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Non responde" @@ -414,11 +302,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Aplicativo recordado" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Este programa está bloqueando a saída da sesión." @@ -435,32 +323,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Non foi posíbel crear o socket de escoita ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Ignorar os directorios de inicio automático estándares" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "CARTAFO_DE_AUTOINICIO" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sesión a usar" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOME_DA_SESIÓN" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Non cargar os aplicativos especificados polo usuario" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Mostrar o diálogo da balea de fallos" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- o xestor de sesións do GNOME" @@ -559,8 +447,94 @@ msgid "Program called with conflicting options" msgstr "Chamouse un programa con opcións en conflito" -#~ msgid "GNOME fallback" -#~ msgstr "Alternativa de GNOME" +#~ msgid "Some programs are still running:" +#~ msgstr "Aínda se están executando algúns programas:" + +#~ msgid "Unknown" +#~ msgstr "Descoñecido" + +#~ msgid "A program is still running:" +#~ msgstr "Aínda se está executando un programa:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Esperando a que os programas rematen. Se interrompe este programa pode " +#~ "causar a perda do seu traballo." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Esperando a que os programas rematen. A interrupción destes programas " +#~ "podería causar a perda do seu traballo." + +#~ msgid "Switch User Anyway" +#~ msgstr "Cambiar de usuario de todas formas" + +#~ msgid "Log Out Anyway" +#~ msgstr "Saír da sesión de todas formas" + +#~ msgid "Suspend Anyway" +#~ msgstr "Suspender de todas formas" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernar de todas formas" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Apagar de todas formas" + +#~ msgid "Restart Anyway" +#~ msgstr "Reiniciar de todas formas" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquear a pantalla" + +#~ msgid "Cancel" +#~ msgstr "Cancelar" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "A súa sesión rematará automaticamente en %d segundo." +#~ msgstr[1] "A súa sesión rematará automaticamente en %d segundos." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Este sistema apagarase automaticamente en %d segundo." +#~ msgstr[1] "Este sistema apagarase automaticamente en %d segundos." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Este sistema reiniciarase automaticamente en %d segundo." +#~ msgstr[1] "Este sistema reiniciarase automaticamente en %d segundos." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Actualmente ten unha sesión iniciada como «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "Quere saír da sesión neste sistema agora?" + +#~ msgid "_Switch User" +#~ msgstr "_Cambiar de usuario" + +#~ msgid "Shut down this system now?" +#~ msgstr "Quere apagar o sistema agora?" + +#~ msgid "S_uspend" +#~ msgstr "S_uspender" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernar" + +#~ msgid "_Restart" +#~ msgstr "_Reiniciar" + +#~ msgid "_Shut Down" +#~ msgstr "_Apagar" + +#~ msgid "Restart this system now?" +#~ msgstr "Desexa reiniciar o sistema agora?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/gu.po gnome-session-3.14.0/po/gu.po --- gnome-session-3.9.90/po/gu.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/gu.po 2014-09-22 14:18:16.000000000 +0000 @@ -3,14 +3,14 @@ # MagNet , 2004. # Ankit Patel , 2004, 2005, 2007, 2009. # Ankit Patel , 2006. -# Sweta Kothari , 2009, 2010, 2011, 2012, 2013. +# Sweta Kothari , 2009, 2010, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: gu\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." "cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-02-27 16:50+0530\n" +"POT-Creation-Date: 2014-08-26 07:29+0000\n" +"PO-Revision-Date: 2014-08-26 16:43+0530\n" "Last-Translator: \n" "Language-Team: American English \n" "Language: \n" @@ -30,64 +30,13 @@ "\n" "\n" -# gnome-session/session-properties-capplet.c:362 -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "આદેશ ને પસંદ કરો" - -# gnome-session/startup-programs.c:392 -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "શરુઆતી કાર્યક્રમને ઉમેરો" - -# gnome-session/startup-programs.c:392 -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "શરુઆતી કાર્યક્રમમાં ફેરફાર કરો" - -# gnome-session/startup-programs.c:332 -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "શરુઆતી આદેશ ખાલી હોઈ શકે નહિ" - -# gnome-session/startup-programs.c:332 -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "શરૂઆતી આદેશ માન્ય નથી" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "સક્રિય કરેલ" - -# gnome-session/logout.c:266 -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "ચિહ્ન" - -# gnome-session/gsm-client-list.c:111 -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "કાર્યક્રમ" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "શરૂઆતી કાર્યક્રમોની પસંદગીઓ" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "નામ નથી" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "કોઈ વર્ણન નથી" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "આ કાર્યક્રમની આવૃત્તિ" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "વૈવિધ્ય" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "મદદ દસ્તાવેજ દર્શાવી શકાયુ નહિં" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "આ નોંધણી કે જે તમને સંગ્રહ થયેલ સત્રને પસંદ કરવા દે છે" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -97,24 +46,26 @@ msgid "This session logs you into GNOME" msgstr "આ સત્ર તમને GNOME માં પ્રવેશ આપે છે" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "વૈવિધ્ય" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "આ નોંધણી કે જે તમને સંગ્રહ થયેલ સત્રને પસંદ કરવા દે છે" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME ડમી" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "Wayland પર GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "આ સત્ર તમને GNOME માં પ્રવેશ આપે છે, Wayland ને વાપરી રહ્યા છે" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "વૈવિધ્ય સત્ર" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "મહેરબાની કરીને ચલાવવા માટે વૈવિધ્ય સત્રને પસંદ કરો" @@ -134,18 +85,6 @@ msgid "_Continue" msgstr "ચાલુ રાખો (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "કેટલીક પ્રક્રિયાઓ એ હજુ ચાલી રહી છે:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "શરૂઆતી કાર્યક્રમો" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "જ્યારે તમે પ્રવેશો તો શરૂ કરવા માટે ક્યા કાર્યક્મો જોઇએ છે તેને પસંદ કરો" - # gnome-session/startup-programs.c:372 #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -187,84 +126,11 @@ msgid "_Name:" msgstr "નામ (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ફાઇલ એ યોગ્ય .desktop ફાઇલ નથી" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ઓળખી ન શકાય તેવી ડેસ્કટોપ ફાઇલ આવૃત્તિ '%s'" - -# gnome-session/gsm-client-row.c:34 -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "શરુ થઈ રહ્યુ છે %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "આદેશ વાક્ય પર કાર્યક્રમ એ દસ્તાવેજોને સ્વીકારતુ નથી" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "નહિં ઓળખાતો લોન્ચ વિકલ્પ: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "'Type=Link' ડેસ્કટોપ પ્રવેશમાં દસ્તાવેજ URIs ને પસાર કરી શકાતી નથી" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "શરૂ કરવા માટે વસ્તુ નથી" - -# gnome-session/save-session.c:112 -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "સત્ર સંચાલક નાં જોડાણને નિષ્ક્રિય કરો" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "ચોક્કસ ફાઇલ એ સંગ્રહ થયેલ રૂપરેખાંકનને સમાવી રહ્યુ છે" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ફાઇલ" - -# gnome-session/main.c:66 -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "સત્ર વ્યવસ્થાપન ID ને સ્પષ્ટ કરો" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -# gnome-session/session-properties-capplet.c:332 -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "સત્ર વ્યવસ્થાપન વિકલ્પો:" - -# gnome-session/session-properties-capplet.c:332 -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "સત્ર વ્યવસ્થાપન વિકલ્પો ને બતાવો" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "અરે નહિં! કંઇક ખોટુ થઇ ગયુ." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -272,7 +138,7 @@ "સમસ્યા ઉદ્ભવી અને સિસ્ટમને પુન:પ્રાપ્ત કરી શક્યા નહિં. મહેરબાની કરીને સિસ્ટમ સંચાલકનો સંપર્ક " "કરો" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -280,7 +146,7 @@ "સમસ્યા ઉદ્ભવી અને સિસ્ટમને પુન:પ્રાપ્ત કરી શક્યા નહિં. બધા એક્સટેન્શન એક સાવચેતી તરીકે " "નિષ્ક્રિય છે." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -289,156 +155,28 @@ " મહેરબાની કરીને બહાર નીકળો અને ફરીથી પ્રયત્ન કરો." # gnome-session/logout.c:274 -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "બહાર નીકળો (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "ડિબગીંગ કોડ ને સક્રિય કરો" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "logout ની પરવાનગી આપો" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "ઍક્સટેન્શન ચેતવણી બતાવો" -# gnome-session/gsm-client-row.c:43 -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "અજ્ઞાત" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "પ્રક્રિયા એ હજુ ચાલી રહી છે:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"સમાપ્ત કરવા પ્રક્રિયા માટે રાહ જોઇ રહ્યા છે. અટકાવેલી પ્રક્રિયા એ તમે તમારા કામ ને " -"ગુમાવવાનું કારણ બની શકે છે." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"સમાપ્ત કરવા પ્રક્રિયા માટે રાહ જોઇ રહ્યા છે. અટકાવેલી પ્રક્રિયા એ તમે તમારા કામ ને " -"ગુમાવવાનું કારણ બની શકે છે." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "કોઇપણ રીતે વપરાશકર્તાને બદલો" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "કોઈ પણ રીતે બહાર નીકળો" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "કોઇપણ રીતે અટકાવો" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "કોઈ પણ રીતે હાઇબરનેટ કરો" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "કોઈ પણ રીતે બંધ કરો" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "કોઈ પણ રીતે ફરી શરૂ કરો" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "સ્ક્રીન ને તાળુ મારો" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "રદ કરો" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "તમે %d સેકન્ડમાં આપમેળે બહાર નીકળી જશો." -msgstr[1] "તમે %d સેકન્ડોમાં આપમેળે બહાર નીકળી જશો." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "આ સિસ્ટમ એ %d સેકન્ડમાં આપમેળે બહાર નીકળી જશે." -msgstr[1] "આ સિસ્ટમ એ %d સેકન્ડોમાં આપમેળે બહાર નીકળી જશે." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "આ સિસ્ટમ એ %d સેકંડમાં આપમેળે પુન:શરૂ થઇ જશે." -msgstr[1] "આ સિસ્ટમ એ %d સેકંડમાં આપમેળે પુન:શરૂ થઇ જશે." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "\"%s\" તરીકે તમે હાલમાં પ્રવેશેલ છો." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "હવે આ સિસ્ટમની બહાર નીકળો?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "વપરાશકર્તા ને બદલો (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "હવે આ સિસ્ટમ ને બંધ કરો?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "અટકાવો (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "હાઇબરનેટ (_H)" - -# gnome-session/session-properties.c:173 -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "ફરીથી શરુ કરો (_R)" - -# gnome-session/logout.c:277 -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "બંધ કરો (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "શું હવે આ સિસ્ટમને પુન:શરૂ કરવા માંગો છો?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "જવાબ આપતુ નથી" # gnome-session/logout.c:274 -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "બહાર નીકળો (_L)" @@ -446,55 +184,59 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "યાદ રાખેલ કાર્યક્રમ" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "આ કાર્યક્રમ એ બહાર નીકળવાને અટકાવી રહ્યો છે." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "નવા ક્લાઇન્ટ જોડાણને ના પાડી રહ્યા છે કારણ કે સત્ર એ હાલમાં બંધ થયેલ છે\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE સાંભળવાની સોકેટ ને બનાવી શકાતી નથી: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "પ્રમાણભૂત આપોઆપશરૂઆત ડિરેક્ટરીઓ પર ફરી લખો" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "વાપરવા માટે સત્ર" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "વપરાશકર્તા-સ્પષ્ટ થયેલ કાર્યક્રમો ને લોડ કરાતા નથી" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "આ કાર્યક્રમની આવૃત્તિ" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "પરીક્ષણ માટે નિષ્ફળ વ્હેલ સંવાદ બતાવો" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - જીનોમ સત્ર વ્યવસ્થાપક" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -527,72 +269,262 @@ "\n" "If no --inhibit વિકલ્પ સ્પષ્ટ થયેલ છે, નિષ્ક્રિય તરીકે ધાર્યુ હતુ.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s ને ચલાવતી વખતે નિષ્ફળતા\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s ને દલીલની જરૂર છે\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "સત્ર %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "સત્ર નામો ‘.’ સાથે શરૂ થવા પરવાનગી આપતા નથી અથવા ‘/’ અક્ષરોને સમાવે છે" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "સત્ર નામો ‘.’ સાથે શરૂ કરવા પરવાનગી આપતા નથી" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "સત્ર નામો ‘/’ અક્ષરોને સમાવવા પરવાનગી આપતુ નથી" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "નામ થયેલ સત્ર ‘%s’ પહેલેથી અસ્તિત્વ ધરાવે છે" # gnome-session/logout.c:274 -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "બહાર નીકળો" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "પાવર બંધ" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "રીબુટ" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "કોઈપણ વર્તમાન ઇન્હિબિટર્સ અવગણી રહ્યા છે" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "વપરાશકર્તા ખાતરી માટે પૂછશો નહિં" # gnome-session/save-session.c:112 -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "સત્ર સંચાલક સાથે સંપર્ક થઈ શક્યો નથી" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "તકરાતા વિકલ્પો સાથે કાર્યક્રમ બોલાવવામાં આવ્યો" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME ફોલબેક" +# gnome-session/session-properties-capplet.c:362 +#~ msgid "Select Command" +#~ msgstr "આદેશ ને પસંદ કરો" + +# gnome-session/startup-programs.c:392 +#~ msgid "Add Startup Program" +#~ msgstr "શરુઆતી કાર્યક્રમને ઉમેરો" + +# gnome-session/startup-programs.c:392 +#~ msgid "Edit Startup Program" +#~ msgstr "શરુઆતી કાર્યક્રમમાં ફેરફાર કરો" + +# gnome-session/startup-programs.c:332 +#~ msgid "The startup command cannot be empty" +#~ msgstr "શરુઆતી આદેશ ખાલી હોઈ શકે નહિ" + +# gnome-session/startup-programs.c:332 +#~ msgid "The startup command is not valid" +#~ msgstr "શરૂઆતી આદેશ માન્ય નથી" + +#~ msgid "Enabled" +#~ msgstr "સક્રિય કરેલ" + +# gnome-session/logout.c:266 +#~ msgid "Icon" +#~ msgstr "ચિહ્ન" + +# gnome-session/gsm-client-list.c:111 +#~ msgid "Program" +#~ msgstr "કાર્યક્રમ" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "શરૂઆતી કાર્યક્રમોની પસંદગીઓ" + +#~ msgid "No name" +#~ msgstr "નામ નથી" + +#~ msgid "No description" +#~ msgstr "કોઈ વર્ણન નથી" + +#~ msgid "Could not display help document" +#~ msgstr "મદદ દસ્તાવેજ દર્શાવી શકાયુ નહિં" + +#~ msgid "Some programs are still running:" +#~ msgstr "કેટલીક પ્રક્રિયાઓ એ હજુ ચાલી રહી છે:" + +#~ msgid "Startup Applications" +#~ msgstr "શરૂઆતી કાર્યક્રમો" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "જ્યારે તમે પ્રવેશો તો શરૂ કરવા માટે ક્યા કાર્યક્મો જોઇએ છે તેને પસંદ કરો" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ફાઇલ એ યોગ્ય .desktop ફાઇલ નથી" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ઓળખી ન શકાય તેવી ડેસ્કટોપ ફાઇલ આવૃત્તિ '%s'" + +# gnome-session/gsm-client-row.c:34 +#~ msgid "Starting %s" +#~ msgstr "શરુ થઈ રહ્યુ છે %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "આદેશ વાક્ય પર કાર્યક્રમ એ દસ્તાવેજોને સ્વીકારતુ નથી" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "નહિં ઓળખાતો લોન્ચ વિકલ્પ: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' ડેસ્કટોપ પ્રવેશમાં દસ્તાવેજ URIs ને પસાર કરી શકાતી નથી" + +#~ msgid "Not a launchable item" +#~ msgstr "શરૂ કરવા માટે વસ્તુ નથી" + +# gnome-session/save-session.c:112 +#~ msgid "Disable connection to session manager" +#~ msgstr "સત્ર સંચાલક નાં જોડાણને નિષ્ક્રિય કરો" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "ચોક્કસ ફાઇલ એ સંગ્રહ થયેલ રૂપરેખાંકનને સમાવી રહ્યુ છે" + +#~ msgid "FILE" +#~ msgstr "ફાઇલ" + +# gnome-session/main.c:66 +#~ msgid "Specify session management ID" +#~ msgstr "સત્ર વ્યવસ્થાપન ID ને સ્પષ્ટ કરો" + +#~ msgid "ID" +#~ msgstr "ID" + +# gnome-session/session-properties-capplet.c:332 +#~ msgid "Session management options:" +#~ msgstr "સત્ર વ્યવસ્થાપન વિકલ્પો:" + +# gnome-session/session-properties-capplet.c:332 +#~ msgid "Show session management options" +#~ msgstr "સત્ર વ્યવસ્થાપન વિકલ્પો ને બતાવો" + +# gnome-session/gsm-client-row.c:43 +#~ msgid "Unknown" +#~ msgstr "અજ્ઞાત" + +#~ msgid "A program is still running:" +#~ msgstr "પ્રક્રિયા એ હજુ ચાલી રહી છે:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "સમાપ્ત કરવા પ્રક્રિયા માટે રાહ જોઇ રહ્યા છે. અટકાવેલી પ્રક્રિયા એ તમે તમારા કામ ને " +#~ "ગુમાવવાનું કારણ બની શકે છે." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "સમાપ્ત કરવા પ્રક્રિયા માટે રાહ જોઇ રહ્યા છે. અટકાવેલી પ્રક્રિયા એ તમે તમારા કામ ને " +#~ "ગુમાવવાનું કારણ બની શકે છે." + +#~ msgid "Switch User Anyway" +#~ msgstr "કોઇપણ રીતે વપરાશકર્તાને બદલો" + +#~ msgid "Log Out Anyway" +#~ msgstr "કોઈ પણ રીતે બહાર નીકળો" + +#~ msgid "Suspend Anyway" +#~ msgstr "કોઇપણ રીતે અટકાવો" + +#~ msgid "Hibernate Anyway" +#~ msgstr "કોઈ પણ રીતે હાઇબરનેટ કરો" + +#~ msgid "Shut Down Anyway" +#~ msgstr "કોઈ પણ રીતે બંધ કરો" + +#~ msgid "Restart Anyway" +#~ msgstr "કોઈ પણ રીતે ફરી શરૂ કરો" + +#~ msgid "Lock Screen" +#~ msgstr "સ્ક્રીન ને તાળુ મારો" + +#~ msgid "Cancel" +#~ msgstr "રદ કરો" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "તમે %d સેકન્ડમાં આપમેળે બહાર નીકળી જશો." +#~ msgstr[1] "તમે %d સેકન્ડોમાં આપમેળે બહાર નીકળી જશો." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "આ સિસ્ટમ એ %d સેકન્ડમાં આપમેળે બહાર નીકળી જશે." +#~ msgstr[1] "આ સિસ્ટમ એ %d સેકન્ડોમાં આપમેળે બહાર નીકળી જશે." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "આ સિસ્ટમ એ %d સેકંડમાં આપમેળે પુન:શરૂ થઇ જશે." +#~ msgstr[1] "આ સિસ્ટમ એ %d સેકંડમાં આપમેળે પુન:શરૂ થઇ જશે." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "\"%s\" તરીકે તમે હાલમાં પ્રવેશેલ છો." + +#~ msgid "Log out of this system now?" +#~ msgstr "હવે આ સિસ્ટમની બહાર નીકળો?" + +#~ msgid "_Switch User" +#~ msgstr "વપરાશકર્તા ને બદલો (_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "હવે આ સિસ્ટમ ને બંધ કરો?" + +#~ msgid "S_uspend" +#~ msgstr "અટકાવો (_u)" + +#~ msgid "_Hibernate" +#~ msgstr "હાઇબરનેટ (_H)" + +# gnome-session/session-properties.c:173 +#~ msgid "_Restart" +#~ msgstr "ફરીથી શરુ કરો (_R)" + +# gnome-session/logout.c:277 +#~ msgid "_Shut Down" +#~ msgstr "બંધ કરો (_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "શું હવે આ સિસ્ટમને પુન:શરૂ કરવા માંગો છો?" #~ msgid "Icon '%s' not found" #~ msgstr "ચિહ્ન '%s' એ શોધાયુ નથી" diff -Nru gnome-session-3.9.90/po/he.po gnome-session-3.14.0/po/he.po --- gnome-session-3.9.90/po/he.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/he.po 2014-09-22 14:18:16.000000000 +0000 @@ -4,76 +4,32 @@ # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER. # Gil Osher , 2002, 2005. # Gil 'Dolfin' Osher , 2002,2003. +# Yosef Or Boczko , 2013. # msgid "" msgstr "" "Project-Id-Version: gnome-session.HEAD.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-21 23:40+0200\n" -"PO-Revision-Date: 2013-02-22 00:01+0200\n" -"Last-Translator: Yaron Shahrabani \n" -"Language-Team: Hebrew \n" +"POT-Creation-Date: 2014-09-04 09:34+0300\n" +"PO-Revision-Date: 2014-09-04 09:34+0300\n" +"Last-Translator: Yosef Or Boczko \n" +"Language-Team: עברית <>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "בחירת פקודה" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "הוספת תכנית עם ההפעלה" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "עריכת תכנית עם ההפעלה" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "פקודת ההפעלה לא יכולה להיות ריקה" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "פקודת ההפעלה אינה תקינה" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "מאופשר" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "סמל" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "תכנית" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "העדפות יישומי הפעלה" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "ללא שם" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "ללא תיאור" - -#: ../capplet/main.c:35 -#: ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "Version of this application" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "התאמה אישית" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Could not display help document" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "רשומה זו מאפשרת לך לבחור בהפעלה שנשמרה" -#: ../data/gnome.desktop.in.h:1 -#: ../data/gnome.session.desktop.in.in.h:1 +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "‏GNOME" @@ -81,24 +37,24 @@ msgid "This session logs you into GNOME" msgstr "הפעלה זאת מחברת אותך לשולחן העבודה GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "התאמה אישית" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "רשומה זו מאפשרת לך לבחור בהפעלה שנשמרה" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "מדומה של GNOME" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "‏GNOME על גבי Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "הפעלה זאת מחברת אותך לשולחן העבודה GNOME, באמצעות Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "הפעלה מותאמת אישית" -#: ../data/session-selector.ui.h:2 -#: ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "נא לבחור הפעלה מותאמת אישית להרצה" @@ -118,19 +74,6 @@ msgid "_Continue" msgstr "להמ_שיך" -#: ../data/gsm-inhibit-dialog.ui.h:1 -#: ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "ישנן תכניות שעדיין רצות:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "יישומי ההפעלה" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "בחירת אילו יישומים יופעלו בעת כניסת המשתמש" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_תכניות הפעלה נוספות:" @@ -167,87 +110,25 @@ msgid "_Name:" msgstr "_שם:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "הקובץ אינו קובץ ‎.desktop תקני" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "גרסת קובץ ה־‎.desktop‏ '%s' אינה מזוהה" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s מופעל" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "היישום לא מקבל מסמכים בשורת הפקודה" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "אפשרות הרצה לא מזוהה: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "לא ניתן חהעביר כתובת מסמך לכניסת .desktop מסוג 'Type=link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "הפריט לא ניתן להרצה" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Disable connection to session manager" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Specify file containing saved configuration" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Specify session management ID" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Session management options:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Show session management options" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "אבוי! משהו השתבש." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 -msgid "A problem has occurred and the system can't recover. Please contact a system administrator" -msgstr "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. נא ליצור קשר עם מנהל המערכת." - -#: ../gnome-session/gsm-fail-whale-dialog.c:306 -msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." -msgstr "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. ליתר ביטחון נוטרלו כל ההרחבות." +#: ../gnome-session/gsm-fail-whale-dialog.c:328 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "" +"אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. נא ליצור קשר עם מנהל המערכת." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 +msgid "" +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." +msgstr "" +"אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה. ליתר ביטחון נוטרלו כל ההרחבות." + +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -255,138 +136,27 @@ "אירעה שגיאה והמערכת אינה יכולה להשתקם ממנה.\n" "נא לצאת ולנסות שוב." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "_ניתוק" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 -#: ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "Enable debugging code" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "לאפשר יציאה" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "הצגת אזהרת הרחבות" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "לא ידוע" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ישנה תכנית שעדיין רצה:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "Waiting for the program to finish. Interrupting the program may cause you to lose work." -msgstr "בהמתנה לסיום התכנית. הפרעה לתכנית עלולה לגרור אבדן החומר שעבדת עליו." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "Waiting for programs to finish. Interrupting these programs may cause you to lose work." -msgstr "בהמתנה לסיום התכניות. הפרעה לתכניות עלולה לגרור לאבדן החומר שעבדת עליו." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "ה_חלפת משתמש בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "יציאה בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "השהייה בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "מעבר למצב שינה בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "כיבוי בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "הפעלה מחדש בכל מקרה" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "נעילת המסך" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ביטול" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "בעוד שנייה אחת יתרחש ניתוק אוטומטי." -msgstr[1] "בעוד %d שניות יתרחש ניתוק אוטומטי." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "בעוד שנייה אחת המערכת תכבה אוטומטית." -msgstr[1] "המערכת תכבה אוטומטית בעוד %d שניות." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "בעוד שנייה אחת המערכת תופעל מחדש אוטומטית." -msgstr[1] "המערכת תופעל מחדש אוטומטית בעוד %d שניות." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "כרגע נכנסת תחת השם \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "האם להתנתק מהמערכת?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ה_חלפת משתמש" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "האם לכבות את המערכת כעת?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "ה_שהייה" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "מ_צב שינה" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "הפעלה מ_חדש" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_כיבוי" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "האם להפעיל את המערכת מחדש כעת?" - -#: ../gnome-session/gsm-manager.c:1429 -#: ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "אין תגובה" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "י_ציאה" @@ -394,53 +164,59 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "יישום השמור בזיכרון" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "תכנית זו מונעת את היציאה." -#: ../gnome-session/gsm-xsmp-server.c:341 -msgid "Refusing new client connection because the session is currently being shut down\n" +#: ../gnome-session/gsm-xsmp-server.c:340 +msgid "" +"Refusing new client connection because the session is currently being shut " +"down\n" msgstr "מסרב לחיבור לקוח חדש מכיון שההפעלה נמצאת במהלך כיבוי\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "לא ניתן ליצור שקע ICE: ‏%s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Override standard autostart directories" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "הפעלה לשימוש" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "Do not load user-specified applications" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Version of this application" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "הצגת דו־שיח 'לוויתן הכשל' לבדיקה" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - the GNOME session manager" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -473,86 +249,250 @@ "\n" "If no --inhibit option is specified, idle is assumed.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Failed to execute %s\n" -#: ../tools/gnome-session-inhibit.c:208 -#: ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s requires an argument\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "הפעלה %d" -#: ../tools/gnome-session-selector.c:108 -msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "אסור ששמות ההפעלות יתחילו בתו ‘.’ או יכילו את התו ‘/’" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "אסור ששמות ההפעלות יתחילו בתו ‘.’" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "אסור ששמות ההפעלות יכילו את התו ‘/’" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "כבר קיימת הפעלה בשם ‘%s’" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Log out" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "כיבוי" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "הפעלה מחדש" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "תוך התעלמות ממעקבים קיימים" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "אין לבקש אישור מהמשתמש" -#: ../tools/gnome-session-quit.c:91 -#: ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "לא ניתן להתחבר למנהל ההפעלה" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "התכנית נקראה עם אפשרויות סותרות" -#~ msgid "GNOME fallback" -#~ msgstr "רשת הביטחון של GNOME" +#~ msgid "Select Command" +#~ msgstr "בחירת פקודה" -#~ msgid "%d hour" +#~ msgid "Add Startup Program" +#~ msgstr "הוספת תכנית עם ההפעלה" + +#~ msgid "Edit Startup Program" +#~ msgstr "עריכת תכנית עם ההפעלה" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "פקודת ההפעלה לא יכולה להיות ריקה" + +#~ msgid "The startup command is not valid" +#~ msgstr "פקודת ההפעלה אינה תקינה" + +#~ msgid "Enabled" +#~ msgstr "מאופשר" + +#~ msgid "Icon" +#~ msgstr "סמל" + +#~ msgid "Program" +#~ msgstr "תכנית" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "העדפות יישומי הפעלה" + +#~ msgid "No name" +#~ msgstr "ללא שם" + +#~ msgid "No description" +#~ msgstr "ללא תיאור" + +#~ msgid "Could not display help document" +#~ msgstr "Could not display help document" + +#~ msgid "Startup Applications" +#~ msgstr "יישומי ההפעלה" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "בחירת אילו יישומים יופעלו בעת כניסת המשתמש" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "הקובץ אינו קובץ ‎.desktop תקני" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "גרסת קובץ ה־‎.desktop‏ '%s' אינה מזוהה" + +#~ msgid "Starting %s" +#~ msgstr "%s מופעל" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "היישום לא מקבל מסמכים בשורת הפקודה" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "אפשרות הרצה לא מזוהה: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "לא ניתן חהעביר כתובת מסמך לכניסת .desktop מסוג 'Type=link'" + +#~ msgid "Not a launchable item" +#~ msgstr "הפריט לא ניתן להרצה" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Disable connection to session manager" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Specify file containing saved configuration" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "Specify session management ID" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Session management options:" +#~ msgid "Show session management options" +#~ msgstr "Show session management options" + +#~ msgid "Some programs are still running:" +#~ msgstr "ישנן תכניות שעדיין רצות:" + +#~ msgid "Unknown" +#~ msgstr "לא ידוע" + +#~ msgid "A program is still running:" +#~ msgstr "ישנה תכנית שעדיין רצה:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "בהמתנה לסיום התכנית. הפרעה לתכנית עלולה לגרור אבדן החומר שעבדת עליו." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "בהמתנה לסיום התכניות. הפרעה לתכניות עלולה לגרור לאבדן החומר שעבדת עליו." + +#~ msgid "Switch User Anyway" +#~ msgstr "ה_חלפת משתמש בכל מקרה" + +#~ msgid "Log Out Anyway" +#~ msgstr "יציאה בכל מקרה" + +#~ msgid "Suspend Anyway" +#~ msgstr "השהייה בכל מקרה" + +#~ msgid "Hibernate Anyway" +#~ msgstr "מעבר למצב שינה בכל מקרה" + +#~ msgid "Shut Down Anyway" +#~ msgstr "כיבוי בכל מקרה" + +#~ msgid "Restart Anyway" +#~ msgstr "הפעלה מחדש בכל מקרה" + +#~ msgid "Lock Screen" +#~ msgstr "נעילת המסך" + +#~ msgid "Cancel" +#~ msgstr "ביטול" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "בעוד שנייה אחת יתרחש ניתוק אוטומטי." +#~ msgstr[1] "בעוד %d שניות יתרחש ניתוק אוטומטי." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "בעוד שנייה אחת המערכת תכבה אוטומטית." +#~ msgstr[1] "המערכת תכבה אוטומטית בעוד %d שניות." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "בעוד שנייה אחת המערכת תופעל מחדש אוטומטית." +#~ msgstr[1] "המערכת תופעל מחדש אוטומטית בעוד %d שניות." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "כרגע נכנסת תחת השם \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "האם להתנתק מהמערכת?" + +#~ msgid "_Switch User" +#~ msgstr "ה_חלפת משתמש" + +#~ msgid "Shut down this system now?" +#~ msgstr "האם לכבות את המערכת כעת?" + +#~ msgid "S_uspend" +#~ msgstr "ה_שהייה" + +#~ msgid "_Hibernate" +#~ msgstr "מ_צב שינה" + +#~ msgid "_Restart" +#~ msgstr "הפעלה מ_חדש" + +#~ msgid "_Shut Down" +#~ msgstr "_כיבוי" + +#~ msgid "Restart this system now?" +#~ msgstr "האם להפעיל את המערכת מחדש כעת?" + +#~ msgid "%d hour" #~ msgid_plural "%d hours" #~ msgstr[0] "שעה אחת" #~ msgstr[1] "%d שעות" #~ msgid "%d minute" - #~ msgid_plural "%d minutes" #~ msgstr[0] "דקה אחת" #~ msgstr[1] "%d דקות" #~ msgid "%d second" - #~ msgid_plural "%d seconds" #~ msgstr[0] "שנייה אחת" #~ msgstr[1] "%d שניות" diff -Nru gnome-session-3.9.90/po/hi.po gnome-session-3.14.0/po/hi.po --- gnome-session-3.9.90/po/hi.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/hi.po 2014-09-22 14:18:16.000000000 +0000 @@ -5,16 +5,16 @@ # # Rajesh Ranjan , 2005, 2006, 2009. # Rajesh Ranjan , 2009. -# rajesh , 2012. +# rajesh , 2012, 2014. # chandankumar , 2013. msgid "" msgstr "" "Project-Id-Version: gnome-session.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-25 10:58+0000\n" -"Last-Translator: chandankumar \n" +"POT-Creation-Date: 2014-09-19 19:32+0000\n" +"PO-Revision-Date: 2014-09-20 22:10+0630\n" +"Last-Translator: rajesh \n" "Language-Team: Hindi \n" "Language: hi\n" "MIME-Version: 1.0\n" @@ -28,64 +28,13 @@ "\n" "\n" -# gnome-session/startup-programs.c:282 gnome-session/startup-programs.c:289 -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "कमांड चुनें" - -# gnome-session/startup-programs.c:372 -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "प्रारंभिक प्रोग्राम में जोड़ें" - -# gnome-session/startup-programs.c:392 -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "प्रारंभिक प्रोग्राम में संशोधन करें" - -# gnome-session/startup-programs.c:332 -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "प्रारंभिक निर्देश रिक्त नहीं हो सकता" - -# gnome-session/startup-programs.c:332 -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "प्रारंभिक वैध नहीं है" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "सक्षम" - -# gnome-session/logout.c:266 -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "प्रतीक" - -# gnome-session/gsm-client-list.c:111 -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "प्रोग्राम" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "आरंभन अनुप्रयोग वरीयता" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "कोई नाम नहीं" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "कोई विवरण नहीं" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "इस अनुप्रयोग का संस्करण" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "मनपसंद" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "मदद दस्तावेज़ नहीं दिखा सका" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "इस प्रविष्टि की मदद से आप एक सहेजी गई सत्र का चयन करें" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -95,44 +44,42 @@ msgid "This session logs you into GNOME" msgstr "यह सत्र गनोम में लॉगइन होगा" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "मनपसंद" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "इस प्रविष्टि की मदद से आप एक सहेजी गई सत्र का चयन करें" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "गनोम डमी" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "गनोम वेलैंड पर" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "यह सत्र गनोम में लॉगइन होगा, वेलैंड के उपयोग से" + # gnome-session/save-session.c:43 #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "मनपसंद सत्र" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "चलाने के लिए एक कस्टम सत्र का चयन करें" # gnome-session/session-properties.c:272 #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "नया सत्र (_N)" # gnome-session/session-properties.c:272 #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "सत्रें हटाएं (_R)" # gnome-session/session-properties.c:272 #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "सत्र का नाम बदलें (_m)" @@ -140,18 +87,6 @@ msgid "_Continue" msgstr "जारी रखें (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "कुछ प्रोग्राम अभी भी चल रहा है:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "आरंभन अनुप्रयोग" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "चुनें कि कौन सा अनुप्रयोग शुरू करना है जब लॉगिन हों" - # gnome-session/startup-programs.c:372 #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -193,84 +128,11 @@ msgid "_Name:" msgstr "नाम (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "फ़ाइल वैध .desktop फ़ाइल नहीं है" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "अपरिचित डेस्कटॉप फ़ाइल संस्करण '%s'" - -# gnome-session/gsm-client-row.c:34 -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s आरंभ हो रहा है" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "कमांड लाइन पर अनुप्रयोग दस्तावेज़ स्वीकार नहीं करता है" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "अपरिचित लॉन्च विकल्प: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "दस्तावेज़ URI को 'Type=Link' डेस्कटॉप प्रविष्टि में भेज नहीं सकता है" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "चलाने योग्य प्रोग्राम नहीं है" - -# gnome-session/save-session.c:112 -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "सत्र प्रबंधक में कनेक्शन निष्क्रिय करें" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "सहेजा विन्यास समाहित करता फ़ाइल निर्दिष्ट करें" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "फ़ाइल" - -# gnome-session/main.c:66 -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "सत्र प्रबंधन ID निर्दिष्ट करें" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "आईडी" - -# gnome-session/session-properties-capplet.c:332 -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "सत्र प्रबंधन विकल्प:" - -# gnome-session/session-properties-capplet.c:332 -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "सत्र प्रबंधन विकल्प दिखाएँ" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "नहीं! कुछ गलत हो गया है." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -278,7 +140,7 @@ "एक समस्या आई और तंत्र रिकवर नहीं कर सकता है. कृपया तंत्र प्रशासक से संपर्क " "करें" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -287,7 +149,7 @@ "लिहाज से " "निष्क्रिय कर दिया गया है." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -296,158 +158,28 @@ "कृपया लॉग आउट करें और फिर कोशिश करें." # gnome-session/logout.c:274 -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "लॉग आउट (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "डिबगिंग कोड सक्रिय करें" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "लॉगआउट की अनुमति दें" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "विस्तार चेतावनी दिखाएं" -# gnome-session/gsm-client-row.c:43 -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "अज्ञात" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "एक प्रोग्राम अभी भी चल रहा है:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"समाप्त करने के लिए प्रोग्राम के लिए प्रतीक्षारत. इन प्रोग्राम में व्यवधान " -"आपको काम खराब " -"करने का कारण बन सकता है. " - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"समाप्त करने के लिए प्रोग्राम के लिए प्रतीक्षारत. इन प्रोग्राम में व्यवधान " -"आपको काम खराब " -"करने का कारण बन सकता है. " - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "किसी तरह उपयोक्ता बदलें" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "किसी तरह लॉगआउट करें" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "किसी तरह स्थगित करें" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "किसी तरह हाइबरनेट करें" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "किसी तरह बंद करें" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "किसी तरह फिर आरंभ करें" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "स्क्रीन पर ताला लगाएँ" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "रद्द करें" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे." -msgstr[1] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "तंत्र %d सेकेंड में स्वतः बंद हो जायेगा" -msgstr[1] "तंत्र %d सेकेंड में स्वतः बंद हो जायेगा" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "तंत्र %d सेकेंड में स्वतः आरंभ हो जायेगा" -msgstr[1] "तंत्र %d सेकेंडों में स्वतः आरंभ हो जायेगा" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "आप अभी बतौर \"%s\" लॉग इन हैं." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "अब इस तंत्र से लॉग आउट करें?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "उपयोक्ता बदलें (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "अब इस तंत्र को बंद करें?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "स्थगित करें (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "सुप्तावस्था में ले जायें (_H)" - -# gnome-session/session-properties.c:173 -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "पुन:आरंभ करें (_R)" - -# gnome-session/logout.c:277 -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "बंद करें (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "अब यह तंत्र फिर आरंभ करें?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "कोई प्रतिक्रिया नहीं दे रहा है" # gnome-session/logout.c:274 -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "लॉग आउट (_L)" @@ -455,56 +187,60 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "स्मृतिस्थ अनुप्रयोग" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "यह प्रोग्राम लॉगआउट रोक रहा है." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "नया क्लाइंट कनेक्शन अस्वीकार कर रहा है क्योंकि सत्र शट डाउन हो रहा है\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE लाइसेंसिंग सॉकेट बना नहीं सका: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "मानक स्वतः आरंभ निर्देशिका अध्यारोहित करें" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "उपयोग में सत्र" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "उपयोक्ता विशिष्ट अनुप्रयोग मत लोड करें" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "इस अनुप्रयोग का संस्करण" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "फेल ह्वेल संवाद को जाँच के लिए दिखाएँ" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr "- GNOME सत्र प्रबंधक" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -539,74 +275,264 @@ "अगर कोई विकल्प को बाधित करने के लिए निर्दिष्ट किया जाता है, निष्क्रिय माना " "जाता है.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s कार्यान्वित करने में असफल\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "% s ने एक तर्क की आवश्यकता है\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "सत्र %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" "सत्र के नाम के साथ शुरू करने की अनुमति दी जाती है या '.' '/' अक्षर होते हैं" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "सत्र के नाम ‘.’ के साथ शुरू करने की अनुमति नहीं है. " -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "सत्र नाम '/' अक्षर होते हैं की अनुमति नहीं है" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "'%s' नामक सत्र पहले से ही मौजूद है" # gnome-session/logout.c:274 -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "लॉग आउट" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "बंद करें" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "रिबूट करें" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "किसी मौजूदा इनहिबिटर्स को अनदेखा कर रहा है" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "उपयोक्ता संपुष्टि के लिए प्राँप्ट मत करें" # gnome-session/save-session.c:112 -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "सत्र मैनेजर से संपर्क स्थापित नहीं हो पा रहा है" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "विरोधी विकल्प के साथ लाया गया प्रोग्राम" -#~ msgid "GNOME fallback" -#~ msgstr "गनोम फॉलबैक" +# gnome-session/startup-programs.c:282 gnome-session/startup-programs.c:289 +#~ msgid "Select Command" +#~ msgstr "कमांड चुनें" + +# gnome-session/startup-programs.c:372 +#~ msgid "Add Startup Program" +#~ msgstr "प्रारंभिक प्रोग्राम में जोड़ें" + +# gnome-session/startup-programs.c:392 +#~ msgid "Edit Startup Program" +#~ msgstr "प्रारंभिक प्रोग्राम में संशोधन करें" + +# gnome-session/startup-programs.c:332 +#~ msgid "The startup command cannot be empty" +#~ msgstr "प्रारंभिक निर्देश रिक्त नहीं हो सकता" + +# gnome-session/startup-programs.c:332 +#~ msgid "The startup command is not valid" +#~ msgstr "प्रारंभिक वैध नहीं है" + +#~ msgid "Enabled" +#~ msgstr "सक्षम" + +# gnome-session/logout.c:266 +#~ msgid "Icon" +#~ msgstr "प्रतीक" + +# gnome-session/gsm-client-list.c:111 +#~ msgid "Program" +#~ msgstr "प्रोग्राम" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "आरंभन अनुप्रयोग वरीयता" + +#~ msgid "No name" +#~ msgstr "कोई नाम नहीं" + +#~ msgid "No description" +#~ msgstr "कोई विवरण नहीं" + +#~ msgid "Could not display help document" +#~ msgstr "मदद दस्तावेज़ नहीं दिखा सका" + +#~ msgid "Some programs are still running:" +#~ msgstr "कुछ प्रोग्राम अभी भी चल रहा है:" + +#~ msgid "Startup Applications" +#~ msgstr "आरंभन अनुप्रयोग" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "चुनें कि कौन सा अनुप्रयोग शुरू करना है जब लॉगिन हों" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "फ़ाइल वैध .desktop फ़ाइल नहीं है" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "अपरिचित डेस्कटॉप फ़ाइल संस्करण '%s'" + +# gnome-session/gsm-client-row.c:34 +#~ msgid "Starting %s" +#~ msgstr "%s आरंभ हो रहा है" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "कमांड लाइन पर अनुप्रयोग दस्तावेज़ स्वीकार नहीं करता है" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "अपरिचित लॉन्च विकल्प: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "दस्तावेज़ URI को 'Type=Link' डेस्कटॉप प्रविष्टि में भेज नहीं सकता है" + +#~ msgid "Not a launchable item" +#~ msgstr "चलाने योग्य प्रोग्राम नहीं है" + +# gnome-session/save-session.c:112 +#~ msgid "Disable connection to session manager" +#~ msgstr "सत्र प्रबंधक में कनेक्शन निष्क्रिय करें" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "सहेजा विन्यास समाहित करता फ़ाइल निर्दिष्ट करें" + +#~ msgid "FILE" +#~ msgstr "फ़ाइल" + +# gnome-session/main.c:66 +#~ msgid "Specify session management ID" +#~ msgstr "सत्र प्रबंधन ID निर्दिष्ट करें" + +#~ msgid "ID" +#~ msgstr "आईडी" + +# gnome-session/session-properties-capplet.c:332 +#~ msgid "Session management options:" +#~ msgstr "सत्र प्रबंधन विकल्प:" + +# gnome-session/session-properties-capplet.c:332 +#~ msgid "Show session management options" +#~ msgstr "सत्र प्रबंधन विकल्प दिखाएँ" + +# gnome-session/gsm-client-row.c:43 +#~ msgid "Unknown" +#~ msgstr "अज्ञात" + +#~ msgid "A program is still running:" +#~ msgstr "एक प्रोग्राम अभी भी चल रहा है:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "समाप्त करने के लिए प्रोग्राम के लिए प्रतीक्षारत. इन प्रोग्राम में व्यवधान आपको काम " +#~ "खराब करने का कारण बन सकता है. " + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "समाप्त करने के लिए प्रोग्राम के लिए प्रतीक्षारत. इन प्रोग्राम में व्यवधान आपको काम " +#~ "खराब करने का कारण बन सकता है. " + +#~ msgid "Switch User Anyway" +#~ msgstr "किसी तरह उपयोक्ता बदलें" + +#~ msgid "Log Out Anyway" +#~ msgstr "किसी तरह लॉगआउट करें" + +#~ msgid "Suspend Anyway" +#~ msgstr "किसी तरह स्थगित करें" + +#~ msgid "Hibernate Anyway" +#~ msgstr "किसी तरह हाइबरनेट करें" + +#~ msgid "Shut Down Anyway" +#~ msgstr "किसी तरह बंद करें" + +#~ msgid "Restart Anyway" +#~ msgstr "किसी तरह फिर आरंभ करें" + +#~ msgid "Lock Screen" +#~ msgstr "स्क्रीन पर ताला लगाएँ" + +#~ msgid "Cancel" +#~ msgstr "रद्द करें" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे." +#~ msgstr[1] "आप स्वतः %d सेकेंड में लॉग आउट हो जायेंगे." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "तंत्र %d सेकेंड में स्वतः बंद हो जायेगा" +#~ msgstr[1] "तंत्र %d सेकेंड में स्वतः बंद हो जायेगा" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "तंत्र %d सेकेंड में स्वतः आरंभ हो जायेगा" +#~ msgstr[1] "तंत्र %d सेकेंडों में स्वतः आरंभ हो जायेगा" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "आप अभी बतौर \"%s\" लॉग इन हैं." + +#~ msgid "Log out of this system now?" +#~ msgstr "अब इस तंत्र से लॉग आउट करें?" + +#~ msgid "_Switch User" +#~ msgstr "उपयोक्ता बदलें (_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "अब इस तंत्र को बंद करें?" + +#~ msgid "S_uspend" +#~ msgstr "स्थगित करें (_S)" + +#~ msgid "_Hibernate" +#~ msgstr "सुप्तावस्था में ले जायें (_H)" + +# gnome-session/session-properties.c:173 +#~ msgid "_Restart" +#~ msgstr "पुन:आरंभ करें (_R)" + +# gnome-session/logout.c:277 +#~ msgid "_Shut Down" +#~ msgstr "बंद करें (_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "अब यह तंत्र फिर आरंभ करें?" #~ msgid "Icon '%s' not found" #~ msgstr "'%s' प्रतीक नहीं मिली" diff -Nru gnome-session-3.9.90/po/hu.po gnome-session-3.14.0/po/hu.po --- gnome-session-3.9.90/po/hu.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/hu.po 2014-06-25 18:06:34.000000000 +0000 @@ -11,17 +11,16 @@ msgid "" msgstr "" "Project-Id-Version: gnome-session master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-19 17:49+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-12 13:53+0200\n" +"PO-Revision-Date: 2013-09-12 13:51+0200\n" "Last-Translator: Gabor Kelemen \n" -"Language-Team: Hungarian \n" +"Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../capplet/gsm-app-dialog.c:120 @@ -44,31 +43,31 @@ msgid "The startup command is not valid" msgstr "Az elindítandó parancs nem érvényes" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Engedélyezve" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikon" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Indítópult beállításai" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Névtelen" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Nincs leírás" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Ezen alkalmazás verziója" @@ -76,14 +75,6 @@ msgid "Could not display help document" msgstr "A súgódokumentum nem jeleníthető meg" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Bejelentkezés a GNOME környezetbe" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Egyéni" @@ -92,11 +83,35 @@ msgid "This entry lets you select a saved session" msgstr "Ez a bejegyzés lehetővé teszi mentett munkamenet kiválasztását" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Bejelentkezés a GNOME környezetbe" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME példa" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Indítópult" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "A bejelentkezéskor elindítandó alkalmazások kiválasztása" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME Waylandon" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Bejelentkezés a GNOME környezetbe Wayland használatával" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Egyéni környezet" @@ -121,18 +136,6 @@ msgid "_Continue" msgstr "_Folytatás" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Néhány program még fut:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Indítópult" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "A bejelentkezéskor elindítandó alkalmazások kiválasztása" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "További elindítandó _programok:" @@ -238,11 +241,11 @@ msgid "Show session management options" msgstr "Munkamenet-kezelési kapcsolók megjelenítése" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Jaj! Valami elromlott." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -250,7 +253,7 @@ "Hiba történt, és a rendszer nem képes helyreállni. Keresse meg a " "rendszergazdát." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -258,7 +261,7 @@ "Hiba történt, és a rendszer nem képes helyreállni. Elővigyázatosságból " "minden kiterjesztés letiltásra került." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,151 +269,27 @@ "Hiba történt, és a rendszer nem képes helyreállni.\n" "Jelentkezzen ki, és próbálja újra." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Kijelentkezés" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Hibakeresési kód engedélyezése" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Kijelentkezés engedélyezése" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Kiterjesztés figyelmeztetésének megjelenítése" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Ismeretlen" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Egy program még fut:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Várakozás a program befejeződésére. A program megszakítása adatok " -"elvesztését okozhatja." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Várakozás a programok befejeződésére. A programok megszakítása adatok " -"elvesztését okozhatja." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Felhasználóváltás mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Kijelentkezés mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Felfüggesztés mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernálás mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Leállítás mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Újraindítás mindenképp" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Képernyő zárolása" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Mégse" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Automatikusan ki fog jelentkezni %d másodperc múlva." -msgstr[1] "Automatikusan ki fog jelentkezni %d másodperc múlva." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "A rendszer %d másodperc múlva automatikusan le fog állni." -msgstr[1] "A rendszer %d másodperc múlva automatikusan le fog állni." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "A rendszer %d másodperc múlva automatikusan újra fog indulni." -msgstr[1] "A rendszer %d másodperc múlva automatikusan újra fog indulni." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Jelenleg „%s” néven van bejelentkezve." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Kijelentkezik most?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Felhasználó_váltás" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Leállítja a rendszert?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Felfüggesztés" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernálás" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Újr_aindítás" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Leállítás" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Újraindítja a rendszert?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Nem válaszol" #: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" msgid "_Log out" msgstr "_Kijelentkezés" @@ -418,51 +297,51 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Megjegyzett alkalmazás" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ez a program blokkolja a kijelentkezést." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "Új ügyfélkapcsolatok visszautasítása, mivel a rendszer éppen leáll\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Nem hozható létre az ICE-figyelő foglalat: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Szabványos automatikus indítási könyvtárak felülbírálása" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTO_INDÍTÁS_KVT" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Használandó munkamenet" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "MUNKAMENET_NEVE" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ne töltsön be felhasználó által megadott alkalmazásokat" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "A hibaképernyő megjelenítése teszteléshez" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " – A GNOME munkamenet-kezelője" @@ -512,7 +391,6 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "%d. környezet" @@ -564,8 +442,100 @@ msgid "Program called with conflicting options" msgstr "A program kapcsolói ütköznek" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME tartalék" +#~ msgid "Some programs are still running:" +#~ msgstr "Néhány program még fut:" + +#~ msgid "Unknown" +#~ msgstr "Ismeretlen" + +#~ msgid "A program is still running:" +#~ msgstr "Egy program még fut:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Várakozás a program befejeződésére. A program megszakítása adatok " +#~ "elvesztését okozhatja." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Várakozás a programok befejeződésére. A programok megszakítása adatok " +#~ "elvesztését okozhatja." + +#~ msgid "Switch User Anyway" +#~ msgstr "Felhasználóváltás mindenképp" + +#~ msgid "Log Out Anyway" +#~ msgstr "Kijelentkezés mindenképp" + +#~ msgid "Suspend Anyway" +#~ msgstr "Felfüggesztés mindenképp" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernálás mindenképp" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Leállítás mindenképp" + +#~ msgid "Restart Anyway" +#~ msgstr "Újraindítás mindenképp" + +#~ msgid "Lock Screen" +#~ msgstr "Képernyő zárolása" + +#~ msgid "Cancel" +#~ msgstr "Mégse" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Automatikusan ki fog jelentkezni %d másodperc múlva." +#~ msgstr[1] "Automatikusan ki fog jelentkezni %d másodperc múlva." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "A rendszer %d másodperc múlva automatikusan le fog állni." +#~ msgstr[1] "A rendszer %d másodperc múlva automatikusan le fog állni." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "A rendszer %d másodperc múlva automatikusan újra fog indulni." +#~ msgstr[1] "A rendszer %d másodperc múlva automatikusan újra fog indulni." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Jelenleg „%s” néven van bejelentkezve." + +#~ msgid "Log out of this system now?" +#~ msgstr "Kijelentkezik most?" + +#~ msgid "_Switch User" +#~ msgstr "Felhasználó_váltás" + +#~ msgid "Shut down this system now?" +#~ msgstr "Leállítja a rendszert?" + +#~ msgid "S_uspend" +#~ msgstr "_Felfüggesztés" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernálás" + +#~ msgid "_Restart" +#~ msgstr "Újr_aindítás" + +#~ msgid "_Shut Down" +#~ msgstr "_Leállítás" + +#~ msgid "Restart this system now?" +#~ msgstr "Újraindítja a rendszert?" #~ msgid "Icon '%s' not found" #~ msgstr "A(z) „%s” ikon nem található" diff -Nru gnome-session-3.9.90/po/id.po gnome-session-3.14.0/po/id.po --- gnome-session-3.9.90/po/id.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/id.po 2014-07-18 20:50:42.000000000 +0000 @@ -3,76 +3,32 @@ # This file is distributed under the same license as the gnome-session package. # # Mohammad DAMT , 2005. -# Dirgita , 2010, 2011, 2012. -# Andika Triwidada , 2010, 2011, 2013. +# Dirgita , 2010, 2011, 2012, 2014. +# Andika Triwidada , 2010, 2011, 2013, 2014. # Bonaventura Aditya Perdana , 2012. msgid "" msgstr "" "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-11 16:32+0700\n" -"Last-Translator: Andika Triwidada \n" -"Language-Team: Indonesian \n" +"POT-Creation-Date: 2014-04-08 19:52+0000\n" +"PO-Revision-Date: 2014-04-09 05:31+0700\n" +"Last-Translator: Dirgita \n" +"Language-Team: Indonesian \n" "Language: id\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" -"X-Generator: Poedit 1.5.5\n" +"X-Generator: Lokalize 1.5\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Pilih Perintah" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Tambah Program Awalan" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Sunting Program Awalan" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "Perintah awalan tidak boleh kosong" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "Perintah awalan tidak sah" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Diaktifkan" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Ikon" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Program" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Preferensi Aplikasi Awalan" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Tanpa nama" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Tanpa deskripsi" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "Versi aplikasi ini" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Gubahan" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Tidak dapat membuka dokumen bantuan" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Entri ini memungkinkan Anda memilih suatu sesi yang tersimpan" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -82,24 +38,24 @@ msgid "This session logs you into GNOME" msgstr "Sesi ini melogkan Anda ke dalam GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "Gubahan" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "Entri ini memungkinkan Anda memilih suatu sesi yang tersimpan" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME pada Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Sesi ini melogkan Anda masuk ke dalam GNOME, memakai Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sesi Gubahan" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "Silakan pilih suatu sesi gubahan yang akan dijalankan" @@ -119,18 +75,6 @@ msgid "_Continue" msgstr "_Lanjutkan" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Beberapa program masih berjalan:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplikasi Awalan" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Memilih aplikasi yang hendak dijalankan saat Anda log masuk" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Program awalan lain:" @@ -167,80 +111,11 @@ msgid "_Name:" msgstr "_Nama:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Ini bukan berkas .desktop yang sah" - -# %s adalah versi. -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Berkas desktop Versi '%s' tak dikenal" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Memulai %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Aplikasi tidak menerima dokumen pada baris perintah" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Opsi peluncuran tak dikenal: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Tidak dapat melewatkan URI dokumen pada entri desktop 'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Bukan objek yang dapat dieksekusi" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Menonaktifkan koneksi ke manajer sesi" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Menentukan berkas yang memuat konfigurasi" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "BERKAS" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Menentukan ID manajemen sesi" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Opsi manajemen sesi:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Menampilkan opsi manajemen sesi" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." -msgstr "Oh, Tidak! Sesuatu yang tidak diinginkan telah terjadi." +msgstr "Oh, Tak! Sesuatu yang tidak diinginkan telah terjadi." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -248,7 +123,7 @@ "Terjadi masalah dan sistem tidak dapat dipulihkan. Silakan kontak " "administrator sistem" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -256,7 +131,7 @@ "Terjadi masalah dan sistem tidak dapat dipulihkan. Semua ekstensi dibuat " "nonaktif sebagai tindak pencegahan." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -264,148 +139,27 @@ "Terjadi masalah dan sistem tidak dapat dipulihkan.\n" "Silakan log keluar dan coba lagi." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "Ke_luar" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "Mengaktifkan kode debug" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" -msgstr "Ijinkan log keluar" +msgstr "Izinkan log keluar" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Tunjukkan peringatan ekstensi" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Tak dikenal" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Sebuah program masih berjalan:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Menunggu program selesai. Menginterupsi program dapat menyebabkan Anda " -"kehilangan hasil pekerjaan." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Menunggu program selesai. Menginterupsi program dapat menyebabkan Anda " -"kehilangan hasil pekerjaan." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Tetap Ganti Pengguna" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Tetap Keluar" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Tetap Suspensi" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Tetap Hibernasi" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Tetap Matikan" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Tetap Start Ulang" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Kunci Layar" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Batal" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Anda akan keluar otomatis dalam %d detik.\t\t" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Sistem ini akan mati otomatis dalam %d detik." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Sistem ini akan dinyalakan ulang otomatis dalam %d detik." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Anda saat ini masuk sebagai \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Keluar dari sistem ini sekarang?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Ganti Pengguna" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Matikan sistem ini sekarang?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "S_uspensi" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernasi" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "H_idupkan Ulang" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Matikan" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Nyalakan ulang sistem ini sekarang?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" -msgstr "Tidak merespon" +msgstr "Tak merespon" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:409 msgid "_Log out" msgstr "_Log keluar" @@ -413,15 +167,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Aplikasi Yang Diingat" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Program ini menghalangi log keluar." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -429,41 +183,45 @@ "Menolak sambungan dari klien baru, karena sesi sedang dalam proses " "dimatikan\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" -msgstr "Tidak dapat membuat soket pendengar ICE: %s" +msgstr "Tak dapat membuat soket pendengar ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Menimpa direktori standar autostart" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "DIR_MULAI_OTOMATIS" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Sesi yang dipakai" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "NAMA_SESI" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" -msgstr "Tidak memuat aplikasi yang ditentukan oleh pengguna" +msgstr "Tak memuat aplikasi yang ditentukan oleh pengguna" + +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Versi aplikasi ini" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "Tampilkan dialog paus gagal untul pengujian" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - manajer sesi GNOME" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -497,66 +255,66 @@ "\n" "Bila tak ada opsi --inhibit yang dinyatakan, diasumsikan idle.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "Gagal mengeksekusi %s\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s memerlukan argumen\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Sesi %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "Nama sesi tak boleh diawali dengan '.' atau memuat karakter '/'" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "Nama sesi tak boleh diawali dengan '.'" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "Nama sesi tak boleh memuat karakter '/'" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "Nama sesi '%s' telah ada" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Keluar" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Matikan" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Nyalakan Ulang" # Keterangan untuk opsi force-logout. -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Mengabaikan sembarang pencegah" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "Jangan tanyakan konfirmasi pengguna" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" -msgstr "Tidak dapat terhubung dengan manajer sesi" +msgstr "Tak dapat terhubung dengan manajer sesi" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Program dipanggil dengan opsi yang bertentangan" + diff -Nru gnome-session-3.9.90/po/it.po gnome-session-3.14.0/po/it.po --- gnome-session-3.9.90/po/it.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/it.po 2014-06-25 18:06:34.000000000 +0000 @@ -9,15 +9,16 @@ msgstr "" "Project-Id-Version: gnome-session 3.7.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-03 01:38+0100\n" -"PO-Revision-Date: 2013-03-03 01:38+0100\n" +"POT-Creation-Date: 2013-09-16 14:24+0200\n" +"PO-Revision-Date: 2013-09-15 18:45+0200\n" "Last-Translator: Luca Ferretti \n" -"Language-Team: Italian \n" +"Language-Team: Italiano \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -39,31 +40,31 @@ msgid "The startup command is not valid" msgstr "Il comando di avvio non è valido" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Abilitato" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Icona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programma" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferenze delle applicazioni d'avvio" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Nessun nome" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Nessuna descrizione" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versione di questa applicazione" @@ -71,14 +72,6 @@ msgid "Could not display help document" msgstr "Impossibile mostrare il documento d'aiuto" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Questa sessione esegue l'accesso in GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalizzata" @@ -87,10 +80,35 @@ msgid "This entry lets you select a saved session" msgstr "Consente di selezionare una sessione salvata" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Questa sessione esegue l'accesso in GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Applicazioni d'avvio" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Sceglie quali applicazioni avviare quando si esegue l'accesso" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME su Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Questa sessione esegue l'accesso in GNOME, usando Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sessione personalizzata" @@ -115,18 +133,6 @@ msgid "_Continue" msgstr "_Continua" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Alcuni programmi sono ancora in esecuzione:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Applicazioni d'avvio" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Sceglie quali applicazioni avviare quando si esegue l'accesso" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programmi d'avvio aggiuntivi:" @@ -238,11 +244,11 @@ msgid "Show session management options" msgstr "Mostra le opzioni di gestione sessione" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Oh no! Qualcosa è andato storto." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -250,7 +256,7 @@ "Si è verificato un problema impossibile da recuperare. Contattare " "l'amministratore di sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -258,7 +264,7 @@ "Si è verificato un problema impossibile da recuperare. Per precauzione, " "tutte le estensioni sono state disabilitate." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,146 +272,25 @@ "Si è verificato un problema impossibile da recuperare.\n" "Terminare la sessione e provare di nuovo." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Termina sessione" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Abilita codice di debug" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Consente di terminare la sessione" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Mostra gli avvisi delle estensioni" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Sconosciuto" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Un programma è ancora in esecuzione:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"In attesa che il programma finisca. Interrompere il programma potrebbe " -"causare la perdita del proprio lavoro." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"In attesa che i programmi finiscano. Interrompere questi programmi potrebbe " -"causare la perdita del proprio lavoro." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Cambia utente comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Termina sessione comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Sospendi comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Iberna comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Arresta comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Riavvia comunque" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Blocca schermo" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Annulla" - -# modificata parecchio... -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "" -"La sessione in corso verrà terminata automaticamente entro %d secondo." -msgstr[1] "" -"La sessione in corso verrà terminata automaticamente entro %d secondi." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Questo sistema verrà arrestato automaticamente entro %d secondo." -msgstr[1] "Questo sistema verrà arrestato automaticamente entro %d secondi." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Questo sistema verrà riavviato automaticamente entro %d secondo." -msgstr[1] "Questo sistema verrà riavviato automaticamente entro %d secondi." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "È stato effettuato l'accesso come «%s»." - -# lo so che c'è system, ma in italiano non ha senso -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Terminare questa sessione adesso?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Cambia utente" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Arrestare questo sistema adesso?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Sospendi" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "I_berna" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Ria_vvia" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "A_rresta" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Riavviare questo sistema adesso?" - # non so se la forma è corretta, non ho provato # a inibire il termine sessione -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Non risponde" @@ -417,11 +302,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Applicazioni memorizzate" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Questo programma sta bloccando la terminazione della sessione." @@ -437,32 +322,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Impossibile creare il socket di ascolto ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Non tiene conto delle directory standard di avvio automatico" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "DIR_AUTOSTART" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessione da usare" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOME_SESSIONE" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Non carica le applicazioni specificate dall'utente" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Mostra il dialogo \"fail whale\" per test" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- il gestore di sessioni di GNOME" diff -Nru gnome-session-3.9.90/po/ja.po gnome-session-3.14.0/po/ja.po --- gnome-session-3.9.90/po/ja.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/ja.po 2014-06-25 18:06:34.000000000 +0000 @@ -11,7 +11,7 @@ # Takeshi AIHANA , 2003-2009. # Takayuki KUSANO , 1999-2002, 2009-2012. # Yasumichi Akahoshi , 2010. -# Jiro Matsuzawa , 2011, 2012. +# Jiro Matsuzawa , 2011, 2012, 2013. # Hideki Yamane , 2011, 2012. # Noriko Mizumoto , 2012. # @@ -19,9 +19,9 @@ msgstr "" "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-06 04:38+0000\n" -"PO-Revision-Date: 2013-02-04 19:22+0900\n" -"Last-Translator: Carrot031 \n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-15 21:58+0900\n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -49,31 +49,31 @@ msgid "The startup command is not valid" msgstr "コマンド名が間違っています" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "有効" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "アイコン" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "プログラム" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "自動起動するアプリケーションの設定" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "名前なし" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "(説明なし)" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "このアプリケーションのバージョンを表示する" @@ -81,6 +81,14 @@ msgid "Could not display help document" msgstr "ヘルプのドキュメントを表示できませんでした" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "カスタム" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "このエントリーから保存したセッションを選択できます" + #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -89,27 +97,34 @@ msgid "This session logs you into GNOME" msgstr "このセッションで GNOME にログインします" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#, fuzzy -#| msgid "GNOME" msgid "GNOME dummy" -msgstr "GNOME" +msgstr "GNOME ダミー" + +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "自動起動するアプリケーション" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "ログインした後に起動するアプリケーションを選択します" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME on Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "このセッションは Wayland を使って GNOME にログインします" #: ../data/session-selector.ui.h:1 msgid "Custom Session" -msgstr "" +msgstr "カスタムセッション" #: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 msgid "Please select a custom session to run" -msgstr "" +msgstr "起動するカスタムセッションを選択してください" #: ../data/session-selector.ui.h:3 msgid "_New Session" @@ -127,18 +142,6 @@ msgid "_Continue" msgstr "続行(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "いくつかのプログラムが未だ実行中です:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "自動起動するアプリケーション" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ログインした後に起動するアプリケーションを選択します" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "自動的に起動するプログラムの追加(_P):" @@ -243,19 +246,19 @@ msgid "Show session management options" msgstr "セッション管理のオプションを表示する" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "あれっ! 何かおかしいです。" -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "A problem has occurred and the system can't recover. Please contact a system administrator" msgstr "問題が発生して、システムの復帰ができません。システム管理者に連絡してください" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." msgstr "問題が発生して、システムの復帰ができません。念のため、すべての拡張を無効にしました。" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -263,129 +266,23 @@ "問題が発生して、システムの復帰ができません。\n" "ログアウトして再度試してください。" -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "ログアウト(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "デバッグモードにする" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" -msgstr "" +msgstr "ログアウトを許可する" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" -msgstr "" - -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "不明" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "プログラムが未だ実行中です:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "Waiting for the program to finish. Interrupting the program may cause you to lose work." -msgstr "プログラムが終了するのを待っています。プログラムの実行を強制的に中断すると、作業内容を失うことになるかもしれません。" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "Waiting for programs to finish. Interrupting these programs may cause you to lose work." -msgstr "プログラムが終了するのを待っています。実行中のプログラムを途中で強制終了させてしまうと、これまでの処理結果を失ってしまう可能性があります。" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "とにかくユーザーを切り替える" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "とにかくログアウトする" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "とにかくサスペンドにする" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "とにかく休止状態にする" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "とにかくシャットダウンする" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "とにかく再起動する" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "画面をロックする" +msgstr "拡張機能に関する警告を表示する" -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "キャンセル" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "残り %d 秒で自動的にログアウトします。" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "このシステムは残り %d 秒で自動的にシャットダウンします。" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "このシステムは残り %d 秒で自動的に再起動します。" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "あなたは現在 \"%s\" としてログインしています。" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "このシステムから今すぐログアウトしますか?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ユーザーを切り替える(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "このシステムを今すぐシャットダウンしますか?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "サスペンド(_U)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "休止状態(_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "再起動(_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "シャットダウン(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "このシステムを今すぐ再起動しますか?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "応答なし" @@ -397,11 +294,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "実行していたアプリケーション" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "このプログラムがログアウトできないようにしています。" @@ -414,32 +311,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "ICE の監視ソケットを生成できませんでした: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "標準の自動起動フォルダーをオーバーライドする" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "使用するセッション" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "ユーザーが指定したアプリケーションを起動しない" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "テスト用にエラー画面を表示する" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOME セッションマネージャー" @@ -461,6 +358,19 @@ "\n" "If no --inhibit option is specified, idle is assumed.\n" msgstr "" +"%s [OPTION...] COMMAND\n" +"\n" +"COMMAND を起動し、その間セッションのいくつかの機能を抑止します。\n" +"\n" +" -h, --help このヘルプを表示する\n" +" --version プログラムのバージョンを表示する\n" +" --app-id ID 抑止時に使用するアプリケーションID (オプション)\n" +" --reason REASON 抑止する理由を指定する (オプション)\n" +" --inhibit ARG 抑止する機能をコロン区切りで以下から指定する:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only COMMAND を起動せずに待機する\n" +"\n" +"--inhibit オプションが無指定の場合 idle を指定したものと扱います。\n" #: ../tools/gnome-session-inhibit.c:148 #, c-format @@ -523,8 +433,83 @@ msgid "Program called with conflicting options" msgstr "同時には適用できないオプションを指定しました" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME フォールバック" +#~ msgid "Some programs are still running:" +#~ msgstr "いくつかのプログラムが未だ実行中です:" + +#~ msgid "Unknown" +#~ msgstr "不明" + +#~ msgid "A program is still running:" +#~ msgstr "プログラムが未だ実行中です:" + +#~ msgid "Waiting for the program to finish. Interrupting the program may cause you to lose work." +#~ msgstr "プログラムが終了するのを待っています。プログラムの実行を強制的に中断すると、作業内容を失うことになるかもしれません。" + +#~ msgid "Waiting for programs to finish. Interrupting these programs may cause you to lose work." +#~ msgstr "プログラムが終了するのを待っています。実行中のプログラムを途中で強制終了させてしまうと、これまでの処理結果を失ってしまう可能性があります。" + +#~ msgid "Switch User Anyway" +#~ msgstr "とにかくユーザーを切り替える" + +#~ msgid "Log Out Anyway" +#~ msgstr "とにかくログアウトする" + +#~ msgid "Suspend Anyway" +#~ msgstr "とにかくサスペンドにする" + +#~ msgid "Hibernate Anyway" +#~ msgstr "とにかく休止状態にする" + +#~ msgid "Shut Down Anyway" +#~ msgstr "とにかくシャットダウンする" + +#~ msgid "Restart Anyway" +#~ msgstr "とにかく再起動する" + +#~ msgid "Lock Screen" +#~ msgstr "画面をロックする" + +#~ msgid "Cancel" +#~ msgstr "キャンセル" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "残り %d 秒で自動的にログアウトします。" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "このシステムは残り %d 秒で自動的にシャットダウンします。" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "このシステムは残り %d 秒で自動的に再起動します。" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "あなたは現在 \"%s\" としてログインしています。" + +#~ msgid "Log out of this system now?" +#~ msgstr "このシステムから今すぐログアウトしますか?" + +#~ msgid "_Switch User" +#~ msgstr "ユーザーを切り替える(_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "このシステムを今すぐシャットダウンしますか?" + +#~ msgid "S_uspend" +#~ msgstr "サスペンド(_U)" + +#~ msgid "_Hibernate" +#~ msgstr "休止状態(_H)" + +#~ msgid "_Restart" +#~ msgstr "再起動(_R)" + +#~ msgid "_Shut Down" +#~ msgstr "シャットダウン(_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "このシステムを今すぐ再起動しますか?" #~ msgid "Icon '%s' not found" #~ msgstr "'%s' というアイコンが見つかりませんでした" diff -Nru gnome-session-3.9.90/po/kk.po gnome-session-3.14.0/po/kk.po --- gnome-session-3.9.90/po/kk.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/kk.po 2014-06-25 18:06:34.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-08 17:23+0600\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-15 13:49+0600\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" "Language: kk\n" @@ -39,31 +39,31 @@ msgid "The startup command is not valid" msgstr "Іске қосылатын команда дұрыс емес" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Іске қосулы" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Таңбаша" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Бағдарлама" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Іске қосылатын қолданба баптаулары" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Аты жоқ" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Анықтамасы жоқ" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Осы қолданбаның нұсқасы" @@ -71,14 +71,6 @@ msgid "Could not display help document" msgstr "Көмек құжатын көрсету мүмкін емес" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Бұл сессия арқылы GNOME-ға кіресіз" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Таңдауыңызша" @@ -87,11 +79,39 @@ msgid "This entry lets you select a saved session" msgstr "Бұл элемент сізге сақталып тұрған сессияны таңдауға рұқсат етеді" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Бұл сессия арқылы GNOME-ға кіресіз" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME жалған сессиясы" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Іске қосылатын қолданбалар" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "" +"Сіз жүйеге кіргенде қандай қолданбалар автоматты түрде іске қосылатынын " +"таңдаңыз" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "Wayland негізіндегі GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Бұл сессия арқылы Wayland негізіндегі GNOME ішіне кіресіз" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Таңдауыңызша сесия" @@ -116,20 +136,6 @@ msgid "_Continue" msgstr "Жалға_стыру" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Кейбір бағдарламалар әлі де орындалып жатыр:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Іске қосылатын қолданбалар" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "" -"Сіз жүйеге кіргенде қандай қолданбалар автоматты түрде іске қосылатынын " -"таңдаңыз" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Қосымша іске қосылатын бағ_дарламалар:" @@ -234,11 +240,11 @@ msgid "Show session management options" msgstr "Сессия басқарушысы опцияларын көрсету" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Қап! Бір нәрсе қате кетті." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -246,7 +252,7 @@ "Мәселе орын алды және жүйе өз қалпына келе алмады. Жүйелік әкімшіңізге " "хабарласыңыз" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -254,7 +260,7 @@ "Мәселе орын алды және жүйе өз қалпына келе алмады. Барлық кеңейтулер сақтық " "мақсатында сөндірілген." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -262,143 +268,23 @@ "Мәселе орын алды және жүйе өз қалпына келе алмады.\n" "Жүйеден шығып, қайталап көріңіз." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "Жүйеден ш_ығу" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Жөндеу кодын іске қосу" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Жүйеден шығуды рұқсат ету" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Кеңейту ескертуін көрсету" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Белгісіз" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Бағдарлама әлі орындалып жатыр:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Бағдарлама өз жұмысын аяқтауды күту. Бағдарламаны мәжбүрлетіп жабу жұмыс " -"нәтижелерін жоғалтуға әкеп соғуы мүмкін." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Бағдарламалардың өз жұмысын аяқтауды күту. Бұл бағдарламаларды мәжбүрлетіп " -"жабу жұмыс нәтижелерін жоғалтуға әкеп соғуы мүмкін." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Сонда да пайдаланушыны ауыстыру" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Сонда да жүйеден шығу" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Сонда да ұйықтату" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Сонда да гибернациялау" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Сонда да сөндіру" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Сонда да қайта іске қосу" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Экранды блоктау" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Бас тарту" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Сіз жүйеден автоматты түрде %d секундтан кейін шығасыз." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Жүйе автоматты түрде %d секундтан кейін сөндіріледі." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Жүйе автоматты түрде %d секундтан кейін қайта қосылады." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Сіз жүйеге \"%s\" ретінде кірдіңіз." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Бұл жүйеден қазір шығу керек пе?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Па_йдаланушыны ауыстыру" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Бұл жүйені қазір сөндіру керек пе?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "Ұ_йықтату" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "Г_ибернация" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Қа_йта қосу" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Сөндіру" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Бұл жүйені қазір қайта қосу керек пе?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Жауап бермейді" @@ -410,11 +296,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Есте сақталған қолданбалар" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Бұл бағдарлама жүйеден шығуды болдырмай тұр." @@ -429,32 +315,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "ICE тындаушы сокетін жасау мүмкін емес: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Стандартты іске қосылу бумалардың орнына басқаларды қолдану" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "АВТОІСКЕҚОСЫЛУ_БУМАСЫ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Қолдану үшін сессия" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "СЕССИЯ_АТЫ" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Пайдаланушыға тән қолданбаларды жөнелтпеу" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Сынау үшін \"fail whale\" сұхбатын көрсету" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - GNOME сессиялар басқарушысы" @@ -506,7 +392,6 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Сессия %d" @@ -558,29 +443,11 @@ msgid "Program called with conflicting options" msgstr "Бағдарлама өазара ерегісетін опциялармен шақырылды" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME қауіпсіз сессиясы" +#~ msgid "Some programs are still running:" +#~ msgstr "Кейбір бағдарламалар әлі де орындалып жатыр:" + +#~ msgid "Unknown" +#~ msgstr "Белгісіз" -#~ msgid "%d hour" -#~ msgid_plural "%d hours" -#~ msgstr[0] "%d сағат" - -#~ msgid "%d minute" -#~ msgid_plural "%d minutes" -#~ msgstr[0] "%d минут" - -#~ msgid "%d second" -#~ msgid_plural "%d seconds" -#~ msgstr[0] "%d секунд" - -#~ msgid "0 seconds" -#~ msgstr "0 секунд" - -#~ msgid "Automatic logout in %s" -#~ msgstr "Автоматты шығуға дейін %s" - -#~ msgid "" -#~ "This session is configured to automatically log out after a period of " -#~ "inactivity." -#~ msgstr "" -#~ "Бұл сессия белсенді емес біраз уақыттан кейін автоматты шығуға бапталған." +#~ msgid "A program is still running:" +#~ msgstr "Бағдарлама әлі орындалып жатыр:" diff -Nru gnome-session-3.9.90/po/km.po gnome-session-3.14.0/po/km.po --- gnome-session-3.9.90/po/km.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/km.po 2014-07-18 20:50:42.000000000 +0000 @@ -1,489 +1,530 @@ -# Khmer translation for gnome-session -# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 -# This file is distributed under the same license as the gnome-session package. -# FIRST AUTHOR , 2009. -# sutha , 2012. -msgid "" -msgstr "" -"Project-Id-Version: gnome-session\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-30 16:54+0000\n" -"PO-Revision-Date: 2012-09-28 14:46+0700\n" -"Last-Translator: sutha \n" -"Language-Team: Khmer \n" -"Language: \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" -"X-Generator: WordForge 0.8 RC1\n" -"X-Language: km-KH\n" - -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "ជ្រើសរើសពាក្យបញ្ជា" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "បន្ថែម​​កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "កែសម្រួល​កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "ពាក្យ​បញ្ជា​ចាប់ផ្ដើម​មិន​អាច​ទទេ​ឡើយ" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "ពាក្យ​បញ្ជា​ចាប់ផ្ដើម​មិន​ត្រឹមត្រូវ​ទេ" - -#: ../capplet/gsm-properties-dialog.c:518 -msgid "Enabled" -msgstr "បាន​បើក" - -#: ../capplet/gsm-properties-dialog.c:530 -msgid "Icon" -msgstr "រូបតំណាង" - -#: ../capplet/gsm-properties-dialog.c:542 -msgid "Program" -msgstr "កម្មវិធី" - -#: ../capplet/gsm-properties-dialog.c:746 -msgid "Startup Applications Preferences" -msgstr "ចំណូល​ចិត្ត​កម្មវិធី​ចាប់ផ្ដើម" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "គ្មាន​ឈ្មោះ" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "គ្មាន​សេចក្ដី​ពិពណ៌នា" - -#: ../capplet/main.c:35 ../gnome-session/main.c:294 -msgid "Version of this application" -msgstr "កំណែ​កម្មវិធី​នេះ" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "មិន​អាច​បង្ហាញ​ឯកសារ​ជំនួយ​បាន​ទេ" - -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "GNOME fallback" - -#: ../data/gnome.session.desktop.in.in.h:1 ../data/gnome.desktop.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "សម័យ​នេះ​ជា​កំណត់​ហេតុ​ដែល​អ្នក​ទៅ​កាន់ GNOME" - -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:643 -msgid "Some programs are still running:" -msgstr "កម្មវិធី​មួយ​ចំនួន​នៅ​តែ​កំពុង​ដំណើរ​ការ ៖" - -#: ../data/gsm-inhibit-dialog.ui.h:2 ../gnome-session/gsm-inhibit-dialog.c:640 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you " -"to lose work." -msgstr "រង់ចាំ​ឲ្យ​កម្មវិធី​ចប់ ។ ការ​ផ្អាក​កម្មវិធី​អាច​បណ្ដាល​ឲ្យ​បាត់បង់កិច្ចការ ។" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ជ្រើស​កម្មវិធី​ត្រូវ​ចាប់ផ្ដើម​នៅ​ពេល​ចូល" - -#: ../data/session-properties.ui.h:1 -msgid "Additional startup _programs:" -msgstr "កម្មវិធី​ចាប់ផ្ដើម​បន្ថែម ៖" - -#: ../data/session-properties.ui.h:2 -msgid "Startup Programs" -msgstr "ចាប់ផ្ដើម​កម្មវិធី" - -#: ../data/session-properties.ui.h:3 -msgid "_Automatically remember running applications when logging out" -msgstr "ចងចាំ​កម្មវិធី​ដែល​កំពុង​ដំណើរការ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅ​ពេល​ចេញ" - -#: ../data/session-properties.ui.h:4 -msgid "_Remember Currently Running Applications" -msgstr "ចងចាំ​ការ​ដំណើរការ​កម្មវិធី​បច្ចុប្បន្ន" - -#: ../data/session-properties.ui.h:5 -msgid "Options" -msgstr "ជម្រើស" - -#: ../data/session-properties.ui.h:6 -msgid "Browse…" -msgstr "រក​មើល..." - -#: ../data/session-properties.ui.h:7 -msgid "Comm_ent:" -msgstr "មតិយោបល់ ៖" - -#: ../data/session-properties.ui.h:8 -msgid "Co_mmand:" -msgstr "ពាក្យ​បញ្ជា ៖" - -#: ../data/session-properties.ui.h:9 -msgid "_Name:" -msgstr "ឈ្មោះ ៖" - -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ឯកសារ​មិន​មែន​ជា​ឯកសារ .desktop ត្រឹមត្រូវ" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "មិន​ស្គាល់​ឯកសារ​ផ្ទៃតុ​កំណែ '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "ចាប់ផ្ដើម %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "កម្មវិធី​មិន​ទទួល​យក​ឯកសារ​នៅ​លើ​បន្ទាត់​ពាក្យ​បញ្ជា​ឡើយ" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "ជម្រើស​បើក​ដំណើរការ​ដែល​មិន​ស្គាល់ ៖ %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "មិន​អាច​ចម្លង URIs របស់​ឯកសារ​ទៅ​ធាតុ​ផ្ទៃតុ 'Type=Link'" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "មិនមែន​ជា​ធាតុ​ដែល​អាច​ចាប់ផ្ដើម​បាន​ទេ" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "បិទ​ការ​តភ្ជាប់​ទៅ​កម្មវិធី​គ្រប់គ្រង​សម័យ" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "បញ្ជាក់​ឯកសារ​ថា​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​បាន​រក្សាទុក" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ឯកសារ" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "បញ្ជាក់​លេខ​សម្គាល់​គ្រប់គ្រង​សម័យ" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "លេខ​សម្គាល់" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "ជម្រើស​គ្រប់គ្រង​សម័យ ៖" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "បង្ហាញ​ជម្រើស​គ្រប់គ្រង​សម័យ" - -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "រក​មិន​ឃើញ​រូបតំណាង '%s'" - -#: ../gnome-session/gsm-inhibit-dialog.c:588 -msgid "Unknown" -msgstr "មិនស្គាល់" - -#: ../gnome-session/gsm-inhibit-dialog.c:639 -msgid "A program is still running:" -msgstr "កម្មវិធី​នៅ​តែ​កំពុង​ដំណើរការ ៖" - -#: ../gnome-session/gsm-inhibit-dialog.c:644 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you " -"to lose work." -msgstr "រង់ចាំ​ឲ្យ​កម្មវិធី​ចប់ ។ ការ​ផ្អាក​កម្មវិធី​ទាំង​នេះ​អាច​បណ្ដាល​ឲ្យ​បាត់បង់​កិច្ចកា​រ​របស់​អ្នក ។" - -#: ../gnome-session/gsm-inhibit-dialog.c:874 -msgid "Switch User Anyway" -msgstr "អញ្ចឹង​ប្ដូរ​អ្នក​ប្រើ" - -#: ../gnome-session/gsm-inhibit-dialog.c:877 -msgid "Log Out Anyway" -msgstr "អញ្ចឹង​ចេញ" - -#: ../gnome-session/gsm-inhibit-dialog.c:880 -msgid "Suspend Anyway" -msgstr "អញ្ចឹង​ផ្អាក" - -#: ../gnome-session/gsm-inhibit-dialog.c:883 -msgid "Hibernate Anyway" -msgstr "អញ្ចឹង​សង្ខំ" - -#: ../gnome-session/gsm-inhibit-dialog.c:886 -msgid "Shut Down Anyway" -msgstr "អញ្ចឹង បិទ" - -#: ../gnome-session/gsm-inhibit-dialog.c:889 -msgid "Restart Anyway" -msgstr "អញ្ចឹង ចាប់ផ្ដើម​ឡើងវិញ" - -#: ../gnome-session/gsm-inhibit-dialog.c:897 -msgid "Lock Screen" -msgstr "ចាក់សោ​អេក្រង់" - -#: ../gnome-session/gsm-inhibit-dialog.c:900 -msgid "Cancel" -msgstr "បោះបង់" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:266 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "អ្នក​នឹង​ត្រូវ​ចេញ​​ក្នុង​រយៈពេល %d វិនាទី ។" - -#: ../gnome-session/gsm-logout-dialog.c:274 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ប្រព័ន្ធ​នេះ​នឹង​បិទ​ដោយ​ស្វ័យ​ប្រវត្តិ​ក្នុង​រយៈ​ពេល %d វិនាទី ។" - -#: ../gnome-session/gsm-logout-dialog.c:282 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ប្រព័ន្ធ​នេះ​នឹង​ត្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ​ដោយ​ស្វ័យប្រវត្តិ​នៅ​ %d វិនាទី ។" - -#: ../gnome-session/gsm-logout-dialog.c:306 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "បច្ចុប្បន្ន​បាន​ចូល​ជា \"%s\" ។" - -#: ../gnome-session/gsm-logout-dialog.c:372 -msgid "Log out of this system now?" -msgstr "ចេញ​ពី​ប្រព័ន្ធ​នេះ​ឥឡូវ ?" - -#: ../gnome-session/gsm-logout-dialog.c:378 -msgid "_Switch User" -msgstr "ប្ដូរ​អ្នក​ប្រើ" - -#: ../gnome-session/gsm-logout-dialog.c:387 -#: ../gnome-session/gsm-fail-whale-dialog.c:337 -#: ../gnome-session/gsm-util.c:428 -msgid "_Log Out" -msgstr "ចេញ" - -#: ../gnome-session/gsm-logout-dialog.c:393 -msgid "Shut down this system now?" -msgstr "បិទ​ប្រព័ន្ធ​នេះ​ឥឡូវ ?" - -#: ../gnome-session/gsm-logout-dialog.c:399 -msgid "S_uspend" -msgstr "ផ្អាក" - -#: ../gnome-session/gsm-logout-dialog.c:405 -msgid "_Hibernate" -msgstr "សម្ងំ" - -#: ../gnome-session/gsm-logout-dialog.c:411 -#: ../gnome-session/gsm-logout-dialog.c:437 -msgid "_Restart" -msgstr "ចាប់ផ្ដើម​ឡើង​វិញ" - -#: ../gnome-session/gsm-logout-dialog.c:421 -msgid "_Shut Down" -msgstr "បិទ" - -#: ../gnome-session/gsm-logout-dialog.c:427 -msgid "Restart this system now?" -msgstr "ចាប់ផ្ដើម​ប្រព័ន្ធ​នេះ​ឥឡូវ​នេះ​ឬ ?" - -#: ../gnome-session/gsm-fail-whale-dialog.c:311 -msgid "Oh no! Something has gone wrong." -msgstr "អូ ! មាន​អ្វី​មួយ​មិន​ត្រឹមត្រូវ​ហើយ ។" - -#: ../gnome-session/gsm-fail-whale-dialog.c:318 -msgid "" -"A problem has occurred and the system can't recover. Please contact a system " -"administrator" -msgstr "មាន​បញ្ហា ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ សូម​ទាក់ទង​អ្នក​គ្រប់គ្រង​ប្រព័ន្ធ​របស់​អ្នក" - -#: ../gnome-session/gsm-fail-whale-dialog.c:320 -msgid "" -"A problem has occurred and the system can't recover. All extensions have " -"been disabled as a precaution." -msgstr "មាន​បញ្ហា ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ ផ្នែក​បន្ថែម​ទាំងអស់​ត្រូវ​បាន​បិទ ។" - -#: ../gnome-session/gsm-fail-whale-dialog.c:322 -msgid "" -"A problem has occurred and the system can't recover.\n" -"Please log out and try again." -msgstr "" -"មាន​បញ្ហា​ ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។\n" -"សូម​ចេញ ហើយ​ព្យាយាម​​ម្ដង​ទៀត ។" - -#: ../gnome-session/gsm-manager.c:1393 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 បាន​ប​រាជ័យ​ក្នុង​ការ​ផ្ទុក" - -#: ../gnome-session/gsm-manager.c:1394 -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the " -"fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not " -"capable of delivering the full GNOME 3 experience." -msgstr "" -"ជា​អកុសល GNOME 3 មិន​អាច​ចាប់ផ្ដើម​ត្រឹមត្រូវ ហើយ​បាន​ចាប់ផ្ដើម​ក្នុង របៀប fallback ។\n" -"\n" -"នេះ​ប្រហែលជា​ប្រព័ន្ធ​របស់​អ្នក (ផ្នែក​រឹង​ក្រាហ្វិក ឬ​កម្មវិធី​បញ្ជា) មិន​អាច​ផ្ដល់​បទពិសោធន៍ GNOME 3 " -"ពេញលេញ ។" - -#: ../gnome-session/gsm-manager.c:1396 -msgid "Learn more about GNOME 3" -msgstr "សិក្សា​បន្ថែម​អំពី GNOME 3" - -#: ../gnome-session/gsm-manager.c:1493 ../gnome-session/gsm-manager.c:2234 -msgid "Not responding" -msgstr "មិន​ឆ្លើយ​តប" - -#. It'd be really surprising to reach this code: if we're here, -#. * then the XSMP client already has set several XSMP -#. * properties. But it could still be that SmProgram is not set. -#. -#: ../gnome-session/gsm-xsmp-client.c:559 -msgid "Remembered Application" -msgstr "កម្មវិធី​ដែល​ចងចាំ" - -#: ../gnome-session/gsm-xsmp-client.c:1197 -msgid "This program is blocking logout." -msgstr "កម្មវិធី​នេះ​ត្រូវ​បាន​ទប់ស្កាត់​មិន​ឲ្យ​ចេញ ។" - -#: ../gnome-session/gsm-xsmp-server.c:326 -msgid "" -"Refusing new client connection because the session is currently being shut " -"down\n" -msgstr "បដិសេធ​ការ​តភ្ជាប់​ម៉ាស៊ីន​ភ្ញៀវ ពីព្រោះ​សម័យ​បច្ចុប្បន្ន​កំពុង​ត្រូវ​បានបិទ\n" - -#: ../gnome-session/gsm-xsmp-server.c:595 -#, c-format -msgid "Could not create ICE listening socket: %s" -msgstr "មិន​អាច​បង្កើត​រន្ធ​ស្ដាប់ ICE បាន​ទេ ៖ %s" - -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:412 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "មិន​អាច​ចាប់ផ្ដើម​សម័យ​ចូល​បាន​ទេ (និង​មិន​អាច​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ X បាន​ទេ)" - -#: ../gnome-session/main.c:290 -msgid "Override standard autostart directories" -msgstr "បដិសេធ​ថត​ចាប់ផ្ដើម​ដោយ​ស្វ័យ​ប្រវត្តិ​ស្តង់ដារ" - -#: ../gnome-session/main.c:290 -msgid "AUTOSTART_DIR" -msgstr "AUTOSTART_DIR" - -#: ../gnome-session/main.c:291 -msgid "Session to use" -msgstr "សម័យ​ត្រូវ​ប្រើ" - -#: ../gnome-session/main.c:291 -msgid "SESSION_NAME" -msgstr "SESSION_NAME" - -#: ../gnome-session/main.c:292 -msgid "Enable debugging code" -msgstr "បើក​កូដ​បំបាត់​កំហុស" - -#: ../gnome-session/main.c:293 -msgid "Do not load user-specified applications" -msgstr "កុំ​ផ្ទុក​កម្មវិធី​ដែល​បាន​បញ្ជាក់​ដោយ​អ្នក​ប្រើ" - -#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:296 -msgid "Show the fail whale dialog for testing" -msgstr "បង្ហាញ​ប្រអប់ fail whale សម្រាប់​សាកល្បង" - -#: ../gnome-session/main.c:316 -msgid " - the GNOME session manager" -msgstr " - កម្មវិធី​គ្រប់គ្រង​សម័យ GNOME" - -#: ../tools/gnome-session-quit.c:53 -msgid "Log out" -msgstr "ចេញ" - -#: ../tools/gnome-session-quit.c:54 -msgid "Power off" -msgstr "បិទ" - -#: ../tools/gnome-session-quit.c:55 -msgid "Reboot" -msgstr "ចាប់ផ្ដើម​ឡើង​វិញ" - -#: ../tools/gnome-session-quit.c:56 -msgid "Ignoring any existing inhibitors" -msgstr "មិន​អើពើ​កម្មវិធី​ហាមឃាត់​ដែល​មាន​ស្រាប់" - -#: ../tools/gnome-session-quit.c:57 -msgid "Don't prompt for user confirmation" -msgstr "កុំ​សួរ​រក​ការ​បញ្ជាក់​របស់​អ្នក​ប្រើ" - -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 -msgid "Could not connect to the session manager" -msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កម្មវិធី​គ្រប់គ្រង​សម័យ​បាន​ទេ" - -#: ../tools/gnome-session-quit.c:203 -msgid "Program called with conflicting options" -msgstr "កម្មវិធី​បានហៅ​ដោយ​ប្រើ​ជម្រើសប៉ះទង្គិច" - -#~ msgid "Some programs are still running:" -#~ msgstr "កម្មវិធី​មួយ​ចំនួន​នៅ​តែ​កំពុង​ដំណើរការ ៖" - -#~ msgid "Ubuntu" -#~ msgstr "អ៊ូប៊ុនទូ" - -#~ msgid "This session logs you into Ubuntu" -#~ msgstr "សកម្ម​នេះ​ចុះ​កំណត់​ហេតុ​អ្នក​ក្នុង​អ៊ូប៊ុនទូ" - -#~ msgid "_Remember Currently Running Application" -#~ msgstr "ចងចាំ​កម្មវិធី​ដែល​កំពុង​ដំណើរការ​ថ្មីៗ" - -#~ msgid "Stopped by signal %d" -#~ msgstr "បាន​បញ្ឈប់​ដោយ​សញ្ញា %d" - -#~ msgid "Killed by signal %d" -#~ msgstr "បាន​បញ្ចប់​ដោយ​សញ្ញា %d" - -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "បញ្ហា​បានកើត​ឡើង ហើយ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ ផ្នែក​បន្ថែម​មួយ​ចំនួន​ដូច​ខាង​ក្រោម​អាច​បណ្ដាល​ឲ្យ​" -#~ "មាន​បញ្ហា​នេះ ។ សូម​ព្យាយាម​បិទ​ពួកវា ហើយ​បន្ទាប់​ចេញ និង​ព្យាយាម​ម្ដង​ទៀត ។" - -#~ msgid "Exited with code %d" -#~ msgstr "បាន​ចាកចេញ​ដោយ​មាន​កូដ %d" +# Khmer translation for gnome-session +# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 +# This file is distributed under the same license as the gnome-session package. +# FIRST AUTHOR , 2009. +# sutha , 2012. +msgid "" +msgstr "" +"Project-Id-Version: gnome-session\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-04-02 09:36+0000\n" +"PO-Revision-Date: 2012-09-28 14:46+0700\n" +"Last-Translator: sutha \n" +"Language-Team: Khmer \n" +"Language: \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" +"X-Generator: WordForge 0.8 RC1\n" +"X-Language: km-KH\n" + +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "ផ្ទាល់​ខ្លួន" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "ធាតុ​នេះ​អនុញ្ញាត​ឲ្យ​អ្នក​ជ្រើស​សម័យ​ដែល​បាន​រក្សាទុក" + +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "សម័យ​នេះ​ជា​កំណត់​ហេតុ​ដែល​អ្នក​ទៅ​កាន់ GNOME" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +#| msgid "GNOME" +msgid "GNOME dummy" +msgstr "GNOME dummy" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME នៅ Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "សម័យ​នេះ​ចុះ​កំណត់ហេតុ​អ្នក​ក្នុង GNOME ដោយ​ប្រើ Wayland" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "សម័យ​ផ្ទាល់​ខ្លួន" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "សូម​ជ្រើសសម័យ​ផ្ទាល់ខ្លួន ដើម្បីដំណើរការ" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "សម័យ​ថ្មី" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "លុប​សម័យ​ចេញ" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "ប្ដូរ​ឈ្មោះ​សម័យ" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "បន្ត" + +#: ../data/session-properties.ui.h:1 +msgid "Additional startup _programs:" +msgstr "កម្មវិធី​ចាប់ផ្ដើម​បន្ថែម ៖" + +#: ../data/session-properties.ui.h:2 +msgid "Startup Programs" +msgstr "ចាប់ផ្ដើម​កម្មវិធី" + +#: ../data/session-properties.ui.h:3 +msgid "_Automatically remember running applications when logging out" +msgstr "ចងចាំ​កម្មវិធី​ដែល​កំពុង​ដំណើរការ​ដោយ​ស្វ័យ​ប្រវត្តិ នៅ​ពេល​ចេញ" + +#: ../data/session-properties.ui.h:4 +msgid "_Remember Currently Running Applications" +msgstr "ចងចាំ​ការ​ដំណើរការ​កម្មវិធី​បច្ចុប្បន្ន" + +#: ../data/session-properties.ui.h:5 +msgid "Options" +msgstr "ជម្រើស" + +#: ../data/session-properties.ui.h:6 +msgid "Browse…" +msgstr "រក​មើល..." + +#: ../data/session-properties.ui.h:7 +msgid "Comm_ent:" +msgstr "មតិយោបល់ ៖" + +#: ../data/session-properties.ui.h:8 +msgid "Co_mmand:" +msgstr "ពាក្យ​បញ្ជា ៖" + +#: ../data/session-properties.ui.h:9 +msgid "_Name:" +msgstr "ឈ្មោះ ៖" + +#: ../gnome-session/gsm-fail-whale-dialog.c:321 +msgid "Oh no! Something has gone wrong." +msgstr "អូ ! មាន​អ្វី​មួយ​មិន​ត្រឹមត្រូវ​ហើយ ។" + +#: ../gnome-session/gsm-fail-whale-dialog.c:328 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "មាន​បញ្ហា ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ សូម​ទាក់ទង​អ្នក​គ្រប់គ្រង​ប្រព័ន្ធ​របស់​អ្នក" + +#: ../gnome-session/gsm-fail-whale-dialog.c:330 +msgid "" +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." +msgstr "មាន​បញ្ហា ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ ផ្នែក​បន្ថែម​ទាំងអស់​ត្រូវ​បាន​បិទ ។" + +#: ../gnome-session/gsm-fail-whale-dialog.c:332 +msgid "" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." +msgstr "" +"មាន​បញ្ហា​ ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។\n" +"សូម​ចេញ ហើយ​ព្យាយាម​​ម្ដង​ទៀត ។" + +#: ../gnome-session/gsm-fail-whale-dialog.c:347 +msgid "_Log Out" +msgstr "ចេញ" + +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 +msgid "Enable debugging code" +msgstr "បើក​កូដ​បំបាត់​កំហុស" + +#: ../gnome-session/gsm-fail-whale-dialog.c:370 +msgid "Allow logout" +msgstr "អនុញ្ញាត​ឲ្យ​ចេញ" + +#: ../gnome-session/gsm-fail-whale-dialog.c:371 +msgid "Show extension warning" +msgstr "បង្ហាញ​ការ​ព្រមាន​ផ្នែក​បន្ថែម" + +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 +msgid "Not responding" +msgstr "មិន​ឆ្លើយ​តប" + +#: ../gnome-session/gsm-util.c:409 +#| msgid "Log out" +msgid "_Log out" +msgstr "ចេញ" + +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. +#. +#: ../gnome-session/gsm-xsmp-client.c:557 +msgid "Remembered Application" +msgstr "កម្មវិធី​ដែល​ចងចាំ" + +#: ../gnome-session/gsm-xsmp-client.c:1207 +msgid "This program is blocking logout." +msgstr "កម្មវិធី​នេះ​ត្រូវ​បាន​ទប់ស្កាត់​មិន​ឲ្យ​ចេញ ។" + +#: ../gnome-session/gsm-xsmp-server.c:340 +msgid "" +"Refusing new client connection because the session is currently being shut " +"down\n" +msgstr "បដិសេធ​ការ​តភ្ជាប់​ម៉ាស៊ីន​ភ្ញៀវ ពីព្រោះ​សម័យ​បច្ចុប្បន្ន​កំពុង​ត្រូវ​បានបិទ\n" + +#: ../gnome-session/gsm-xsmp-server.c:609 +#, c-format +msgid "Could not create ICE listening socket: %s" +msgstr "មិន​អាច​បង្កើត​រន្ធ​ស្ដាប់ ICE បាន​ទេ ៖ %s" + +#: ../gnome-session/main.c:303 +msgid "Override standard autostart directories" +msgstr "បដិសេធ​ថត​ចាប់ផ្ដើម​ដោយ​ស្វ័យ​ប្រវត្តិ​ស្តង់ដារ" + +#: ../gnome-session/main.c:303 +msgid "AUTOSTART_DIR" +msgstr "AUTOSTART_DIR" + +#: ../gnome-session/main.c:304 +msgid "Session to use" +msgstr "សម័យ​ត្រូវ​ប្រើ" + +#: ../gnome-session/main.c:304 +msgid "SESSION_NAME" +msgstr "SESSION_NAME" + +#: ../gnome-session/main.c:306 +msgid "Do not load user-specified applications" +msgstr "កុំ​ផ្ទុក​កម្មវិធី​ដែល​បាន​បញ្ជាក់​ដោយ​អ្នក​ប្រើ" + +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "កំណែ​កម្មវិធី​នេះ" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:309 +msgid "Show the fail whale dialog for testing" +msgstr "បង្ហាញ​ប្រអប់ fail whale សម្រាប់​សាកល្បង" + +#: ../gnome-session/main.c:342 +msgid " - the GNOME session manager" +msgstr " - កម្មវិធី​គ្រប់គ្រង​សម័យ GNOME" + +#: ../tools/gnome-session-inhibit.c:108 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [OPTION...] COMMAND\n\nExecute COMMAND while inhibiting some session " +"functionality.\n\n -h, --help Show this help\n --version " +"Show program version\n --app-id ID The application id to use\n " +" when inhibiting (optional)\n --reason REASON The " +"reason for inhibiting (optional)\n --inhibit ARG Things to inhibit, " +"colon-separated list of:\n logout, switch-user, suspend, " +"idle, automount\n --inhibit-only Do not launch COMMAND and wait forever " +"instead\n\nIf no --inhibit option is specified, idle is assumed.\n" + +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "បាន​បរាជ័យ​ក្នុង​ការ​អនុវត្ត %s\n" + +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s ទាមទារ​អាគុយម៉ង់\n" + +#: ../tools/gnome-session-selector.c:61 +#, c-format +#| msgid "Session to use" +msgid "Session %d" +msgstr "សម័យ %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" +"ឈ្មោះសម័យ​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​ចាប់ផ្ដើម​ដោយ ‘.’ ឬ​មាន​តួអក្សរ ‘/’" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "ឈ្មោះ​សម័យ​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​ចាប់ផ្ដើម​ដោយ ‘.’" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "ឈ្មោះ​សម័យ​មិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​មានតួអក្សរ ‘/’" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "មាន​ឈ្មោះ​សម័យ​ដែលមាន​ឈ្មោះ ‘%s’ រួច​ហើយ" + +#: ../tools/gnome-session-quit.c:51 +msgid "Log out" +msgstr "ចេញ" + +#: ../tools/gnome-session-quit.c:52 +msgid "Power off" +msgstr "បិទ" + +#: ../tools/gnome-session-quit.c:53 +msgid "Reboot" +msgstr "ចាប់ផ្ដើម​ឡើង​វិញ" + +#: ../tools/gnome-session-quit.c:54 +msgid "Ignoring any existing inhibitors" +msgstr "មិន​អើពើ​កម្មវិធី​ហាមឃាត់​ដែល​មាន​ស្រាប់" + +#: ../tools/gnome-session-quit.c:55 +msgid "Don't prompt for user confirmation" +msgstr "កុំ​សួរ​រក​ការ​បញ្ជាក់​របស់​អ្នក​ប្រើ" + +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 +msgid "Could not connect to the session manager" +msgstr "មិន​អាច​តភ្ជាប់​ទៅ​កម្មវិធី​គ្រប់គ្រង​សម័យ​បាន​ទេ" + +#: ../tools/gnome-session-quit.c:201 +msgid "Program called with conflicting options" +msgstr "កម្មវិធី​បានហៅ​ដោយ​ប្រើ​ជម្រើសប៉ះទង្គិច" + +#~ msgid "Select Command" +#~ msgstr "ជ្រើសរើសពាក្យបញ្ជា" + +#~ msgid "Add Startup Program" +#~ msgstr "បន្ថែម​​កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" + +#~ msgid "Edit Startup Program" +#~ msgstr "កែសម្រួល​កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "ពាក្យ​បញ្ជា​ចាប់ផ្ដើម​មិន​អាច​ទទេ​ឡើយ" + +#~ msgid "The startup command is not valid" +#~ msgstr "ពាក្យ​បញ្ជា​ចាប់ផ្ដើម​មិន​ត្រឹមត្រូវ​ទេ" + +#~ msgid "Enabled" +#~ msgstr "បាន​បើក" + +#~ msgid "Icon" +#~ msgstr "រូបតំណាង" + +#~ msgid "Program" +#~ msgstr "កម្មវិធី" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "ចំណូល​ចិត្ត​កម្មវិធី​ចាប់ផ្ដើម" + +#~ msgid "No name" +#~ msgstr "គ្មាន​ឈ្មោះ" + +#~ msgid "No description" +#~ msgstr "គ្មាន​សេចក្ដី​ពិពណ៌នា" + +#~ msgid "Could not display help document" +#~ msgstr "មិន​អាច​បង្ហាញ​ឯកសារ​ជំនួយ​បាន​ទេ" + +#~ msgid "Some programs are still running:" +#~ msgstr "កម្មវិធី​មួយ​ចំនួន​នៅ​តែ​កំពុង​ដំណើរ​ការ ៖" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause " +#~ "you to lose work." +#~ msgstr "រង់ចាំ​ឲ្យ​កម្មវិធី​ចប់ ។ ការ​ផ្អាក​កម្មវិធី​អាច​បណ្ដាល​ឲ្យ​បាត់បង់កិច្ចការ ។" + +#~ msgid "Startup Applications" +#~ msgstr "កម្មវិធី​នៅ​ពេល​ចាប់ផ្ដើម" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "ជ្រើស​កម្មវិធី​ត្រូវ​ចាប់ផ្ដើម​នៅ​ពេល​ចូល" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ឯកសារ​មិន​មែន​ជា​ឯកសារ .desktop ត្រឹមត្រូវ" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "មិន​ស្គាល់​ឯកសារ​ផ្ទៃតុ​កំណែ '%s'" + +#~ msgid "Starting %s" +#~ msgstr "ចាប់ផ្ដើម %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "កម្មវិធី​មិន​ទទួល​យក​ឯកសារ​នៅ​លើ​បន្ទាត់​ពាក្យ​បញ្ជា​ឡើយ" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "ជម្រើស​បើក​ដំណើរការ​ដែល​មិន​ស្គាល់ ៖ %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "មិន​អាច​ចម្លង URIs របស់​ឯកសារ​ទៅ​ធាតុ​ផ្ទៃតុ 'Type=Link'" + +#~ msgid "Not a launchable item" +#~ msgstr "មិនមែន​ជា​ធាតុ​ដែល​អាច​ចាប់ផ្ដើម​បាន​ទេ" + +#~ msgid "Disable connection to session manager" +#~ msgstr "បិទ​ការ​តភ្ជាប់​ទៅ​កម្មវិធី​គ្រប់គ្រង​សម័យ" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "បញ្ជាក់​ឯកសារ​ថា​មាន​ការ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​បាន​រក្សាទុក" + +#~ msgid "FILE" +#~ msgstr "ឯកសារ" + +#~ msgid "Specify session management ID" +#~ msgstr "បញ្ជាក់​លេខ​សម្គាល់​គ្រប់គ្រង​សម័យ" + +#~ msgid "ID" +#~ msgstr "លេខ​សម្គាល់" + +#~ msgid "Session management options:" +#~ msgstr "ជម្រើស​គ្រប់គ្រង​សម័យ ៖" + +#~ msgid "Show session management options" +#~ msgstr "បង្ហាញ​ជម្រើស​គ្រប់គ្រង​សម័យ" + +#~ msgid "Icon '%s' not found" +#~ msgstr "រក​មិន​ឃើញ​រូបតំណាង '%s'" + +#~ msgid "Unknown" +#~ msgstr "មិនស្គាល់" + +#~ msgid "A program is still running:" +#~ msgstr "កម្មវិធី​នៅ​តែ​កំពុង​ដំណើរការ ៖" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause " +#~ "you to lose work." +#~ msgstr "រង់ចាំ​ឲ្យ​កម្មវិធី​ចប់ ។ ការ​ផ្អាក​កម្មវិធី​ទាំង​នេះ​អាច​បណ្ដាល​ឲ្យ​បាត់បង់​កិច្ចកា​រ​របស់​អ្នក ។" + +#~ msgid "Switch User Anyway" +#~ msgstr "អញ្ចឹង​ប្ដូរ​អ្នក​ប្រើ" + +#~ msgid "Log Out Anyway" +#~ msgstr "អញ្ចឹង​ចេញ" + +#~ msgid "Suspend Anyway" +#~ msgstr "អញ្ចឹង​ផ្អាក" + +#~ msgid "Hibernate Anyway" +#~ msgstr "អញ្ចឹង​សង្ខំ" + +#~ msgid "Shut Down Anyway" +#~ msgstr "អញ្ចឹង បិទ" + +#~ msgid "Restart Anyway" +#~ msgstr "អញ្ចឹង ចាប់ផ្ដើម​ឡើងវិញ" + +#~ msgid "Lock Screen" +#~ msgstr "ចាក់សោ​អេក្រង់" + +#~ msgid "Cancel" +#~ msgstr "បោះបង់" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "អ្នក​នឹង​ត្រូវ​ចេញ​​ក្នុង​រយៈពេល %d វិនាទី ។" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ប្រព័ន្ធ​នេះ​នឹង​បិទ​ដោយ​ស្វ័យ​ប្រវត្តិ​ក្នុង​រយៈ​ពេល %d វិនាទី ។" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ប្រព័ន្ធ​នេះ​នឹង​ត្រូវ​បាន​ចាប់ផ្ដើម​ឡើង​វិញ​ដោយ​ស្វ័យប្រវត្តិ​នៅ​ %d វិនាទី ។" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "បច្ចុប្បន្ន​បាន​ចូល​ជា \"%s\" ។" + +#~ msgid "Log out of this system now?" +#~ msgstr "ចេញ​ពី​ប្រព័ន្ធ​នេះ​ឥឡូវ ?" + +#~ msgid "_Switch User" +#~ msgstr "ប្ដូរ​អ្នក​ប្រើ" + +#~ msgid "Shut down this system now?" +#~ msgstr "បិទ​ប្រព័ន្ធ​នេះ​ឥឡូវ ?" + +#~ msgid "S_uspend" +#~ msgstr "ផ្អាក" + +#~ msgid "_Hibernate" +#~ msgstr "សម្ងំ" + +#~ msgid "_Restart" +#~ msgstr "ចាប់ផ្ដើម​ឡើង​វិញ" + +#~ msgid "_Shut Down" +#~ msgstr "បិទ" + +#~ msgid "Restart this system now?" +#~ msgstr "ចាប់ផ្ដើម​ប្រព័ន្ធ​នេះ​ឥឡូវ​នេះ​ឬ ?" + +#~ msgid "GNOME 3 Failed to Load" +#~ msgstr "GNOME 3 បាន​ប​រាជ័យ​ក្នុង​ការ​ផ្ទុក" + +#~ msgid "" +#~ "Unfortunately GNOME 3 failed to start properly and started in the " +#~ "fallback mode.\n" +#~ "\n" +#~ "This most likely means your system (graphics hardware or driver) is not " +#~ "capable of delivering the full GNOME 3 experience." +#~ msgstr "" +#~ "ជា​អកុសល GNOME 3 មិន​អាច​ចាប់ផ្ដើម​ត្រឹមត្រូវ ហើយ​បាន​ចាប់ផ្ដើម​ក្នុង របៀប fallback ។\n" +#~ "\n" +#~ "នេះ​ប្រហែលជា​ប្រព័ន្ធ​របស់​អ្នក (ផ្នែក​រឹង​ក្រាហ្វិក ឬ​កម្មវិធី​បញ្ជា) មិន​អាច​ផ្ដល់​បទពិសោធន៍ GNOME 3 " +#~ "ពេញលេញ ។" + +#~ msgid "Learn more about GNOME 3" +#~ msgstr "សិក្សា​បន្ថែម​អំពី GNOME 3" + +#~ msgid "" +#~ "Unable to start login session (and unable to connect to the X server)" +#~ msgstr "មិន​អាច​ចាប់ផ្ដើម​សម័យ​ចូល​បាន​ទេ (និង​មិន​អាច​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​បម្រើ X បាន​ទេ)" + +#~ msgid "Some programs are still running:" +#~ msgstr "កម្មវិធី​មួយ​ចំនួន​នៅ​តែ​កំពុង​ដំណើរការ ៖" + +#~ msgid "Ubuntu" +#~ msgstr "អ៊ូប៊ុនទូ" + +#~ msgid "This session logs you into Ubuntu" +#~ msgstr "សកម្ម​នេះ​ចុះ​កំណត់​ហេតុ​អ្នក​ក្នុង​អ៊ូប៊ុនទូ" + +#~ msgid "_Remember Currently Running Application" +#~ msgstr "ចងចាំ​កម្មវិធី​ដែល​កំពុង​ដំណើរការ​ថ្មីៗ" + +#~ msgid "Stopped by signal %d" +#~ msgstr "បាន​បញ្ឈប់​ដោយ​សញ្ញា %d" + +#~ msgid "Killed by signal %d" +#~ msgstr "បាន​បញ្ចប់​ដោយ​សញ្ញា %d" + +#~ msgid "" +#~ "A problem has occurred and the system can't recover. Some of the " +#~ "extensions below may have caused this.\n" +#~ "Please try disabling some of these, and then log out and try again." +#~ msgstr "" +#~ "បញ្ហា​បានកើត​ឡើង ហើយ​ប្រព័ន្ធ​មិន​អាច​សង្គ្រោះ​បាន​ទេ ។ ផ្នែក​បន្ថែម​មួយ​ចំនួន​ដូច​ខាង​ក្រោម​អាច​បណ្ដាល​ឲ្យ​" +#~ "មាន​បញ្ហា​នេះ ។ សូម​ព្យាយាម​បិទ​ពួកវា ហើយ​បន្ទាប់​ចេញ និង​ព្យាយាម​ម្ដង​ទៀត ។" + +#~ msgid "Exited with code %d" +#~ msgstr "បាន​ចាកចេញ​ដោយ​មាន​កូដ %d" diff -Nru gnome-session-3.9.90/po/kn.po gnome-session-3.14.0/po/kn.po --- gnome-session-3.9.90/po/kn.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/kn.po 2014-09-22 14:18:16.000000000 +0000 @@ -2,74 +2,31 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Shankar Prasad , 2008, 2009, 2010, 2012, 2013. +# Shankar Prasad , 2008, 2009, 2010, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: gnome-session.master.kn\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-22 21:50+0530\n" -"Last-Translator: Shankar Prasad \n" +"POT-Creation-Date: 2014-09-02 07:30+0000\n" +"PO-Revision-Date: 2014-09-18 16:48+0530\n" +"Last-Translator: Shankar Prasad \n" "Language-Team: Kannada \n" "Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "ಆದೇಶವನ್ನು ಆರಿಸು" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "ಆರಂಭಿಕ ಕ್ರಮವಿಧಿಯನ್ನು ಸೇರಿಸು" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "ಆರಂಭಿಕ ಕ್ರಮವಿಧಿಯನ್ನು ಸಂಪಾದಿಸು" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "ಆರಂಭಿಕ ಆದೇಶವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "ಆರಂಭಿಕ ಆದೇಶವು ಮಾನ್ಯವಾದುದಲ್ಲ" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "ಶಕ್ತಗೊಂಡ" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "ಚಿಹ್ನೆ" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "ಕ್ರಮವಿಧಿ" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "ಆರಂಭಿಕ ಅನ್ವಯಗಳ ಆದ್ಯತೆಗಳು" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "ಯಾವುದೆ ಹೆಸರಿಲ್ಲ" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "ಯಾವುದೆ ವಿವರಣೆ ಇಲ್ಲ" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "ಈ ಅನ್ವಯದ ಆವೃತ್ತಿ" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "ಅಗತ್ಯಾನುಗುಣ" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "ನೆರವಿನ ದಸ್ತಾವೇಜನ್ನು ತೋರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "" +"ಈ ನಮೂದು ನಿಮಗೆ ಒಂದು ಉಳಿಸಲಾದ ಅಧಿವೇಶನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -79,26 +36,25 @@ msgid "This session logs you into GNOME" msgstr "ಈ ಅಧಿವೇಶನವು ನಿಮ್ಮನ್ನು GNOME ಗೆ ಪ್ರವೇಶಿಸುವಂತೆ ಮಾಡುತ್ತದೆ" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "ನನ್ನಿಚ್ಛೆಯ" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "" -"ಈ ನಮೂದು ನಿಮಗೆ ಒಂದು ಉಳಿಸಲಾದ ಅಧಿವೇಶನವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME ಡಮ್ಮಿ" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Wayland ನಲ್ಲಿ GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "ಈ ಅಧಿವೇಶನವು Wayland ಬಳಸಿಕೊಂಡು GNOME ಗೆ ಪ್ರವೇಶಿಸುತ್ತದೆ" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" -msgstr "ಇಚ್ಛೆಯ ಅಧಿವೇಶನ" +msgstr "ಅಗತ್ಯಾನುಗುಣ ಅಧಿವೇಶನ" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 -#| msgid "Please choose a custom session to run." +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "ಚಲಾಯಿಸಲು ಒಂದು ಅಗತ್ಯಾನುಗುಣ ಅಧಿವೇಶನವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ." @@ -111,7 +67,6 @@ msgstr "ಅಧಿವೇಶನವನ್ನು ತೆಗೆದು ಹಾಕು(_R)" #: ../data/session-selector.ui.h:5 -#| msgid "_Remove Session" msgid "Rena_me Session" msgstr "ಅಧಿವೇಶನವನ್ನು ಮರು ಹೆಸರಿಸು (_m)" @@ -119,18 +74,6 @@ msgid "_Continue" msgstr "ಮುಂದುವರೆ(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "ಕೆಲವು ಕ್ರಮವಿಧಿಗಳು ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿವೆ:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "ಆರಂಭಿಕ ಅನ್ವಯಗಳು" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ನೀವು ಪ್ರವೇಶಿಸಿದಾಗ ಯಾವ ಅನ್ವಯವನ್ನು ಆರಂಭಿಸಬೇಕು ಎನ್ನುವುದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "ಹೆಚ್ಚುವರಿ ಆರಂಭಿಕ ಕ್ರಮವಿಧಿಗಳು (_p):" @@ -167,79 +110,11 @@ msgid "_Name:" msgstr "ಹೆಸರು (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ಕಡತವು ಮಾನ್ಯವಾದ .desktop ಕಡತವಾಗಿಲ್ಲ" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ಗುರುತಿಸಲಾಗದ ಗಣಕತೆರೆ ಕಡತದ ಆವೃತ್ತಿ '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "ಅನ್ವಯವು ಆಜ್ಞಾ ಸಾಲಿನಲ್ಲಿ ದಸ್ತಾವೇಜುಗಳನ್ನು ಅಂಗೀಕರಿಸುವುದಿಲ್ಲ" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "ಗುರುತಿಸಲಾಗದ ಆರಂಭಿಕ ಆಯ್ಕೆ: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "ಒಂದು 'Type=Link' ಗಣಕತೆರೆ ನಮೂದು ದಸ್ತಾವೇಜು URIಗಳನ್ನು ರವಾನಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "ಆರಂಭಿಸಬಹುದಾದ ಅಂಶವಾಗಿಲ್ಲ" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕದೊಂದಿಗಿನ ಸಂಪರ್ಕವನ್ನು ಅಶಕ್ತಗೊಳಿಸು" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "ಉಳಿಸಲಾದ ಸಂರಚನೆಯನ್ನು ಹೊಂದಿರುವ ಕಡತವನ್ನು ಸೂಚಿಸಿ" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕ ID ಯನ್ನು ಸೂಚಿಸಿ" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕ ಆಯ್ಕೆಗಳು:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "ಅಧಿವೇಶನದ ವ್ಯವಸ್ಥಾಪಕ ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "ಓಹ್ ಛೇ! ಎಲ್ಲೋ ಏನೋ ತಪ್ಪಾಗಿದೆ." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -248,7 +123,7 @@ "ದಯವಿಟ್ಟು ನಿಮ್ಮ " "ಗಣಕ ವ್ಯವಸ್ಥಾಪಕರನ್ನು ಸಂಪರ್ಕಸಿ." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -257,7 +132,7 @@ "ಸುರಕ್ಷತೆಯ " "ದೃಷ್ಟಿಯಿಂದ ಎಲ್ಲಾ ವಿಸ್ತರಣೆಯಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -265,152 +140,27 @@ "ಒಂದು ತೊಂದರೆ ಉಂಟಾಗಿದೆ ಮತ್ತು ವ್ಯವಸ್ಥೆಯನ್ನು ಪುನಶ್ಚೇತನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n" "ದಯವಿಟ್ಟು ನಿರ್ಗಮಿಸಿ ಮತ್ತು ಇನ್ನೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "ನಿರ್ಗಮಿಸು (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "ದೋಷನಿವಾರಣ ಕೋಡ್ ಅನ್ನು ಶಕ್ತಗೊಳಿಸು" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "ನಿರ್ಗಮನಕ್ಕೆ ಅನುಮತಿಸು" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "ವಿಸ್ತರಣೆಯ ಎಚ್ಚರಿಕೆಯನ್ನು ತೋರಿಸು" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "ತಿಳಿಯದ" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ಒಂದು ಕ್ರಮವಿಧಿಗಳು ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿವೆ:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"ಕ್ರಮವಿಧಿಗಳು ಅಂತ್ಯಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ. ಈ ಕ್ರಮವಿಧಿಗಳನ್ನು ಮಧ್ಯದಲ್ಲಿ " -"ತಡೆಯುವುದರಿಂದ ನಿಮ್ಮ ಕೆಲಸವು ನಾಶಗೊಳ್ಳಬಹುದು." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"ಕ್ರಮವಿಧಿಗಳು ಅಂತ್ಯಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ. ಈ ಕ್ರಮವಿಧಿಗಳನ್ನುನ್ನು ಮಧ್ಯದಲ್ಲಿ " -"ತಡೆಯುವುದರಿಂದ ನಿಮ್ಮ ಕೆಲಸವು ನಾಶಗೊಳ್ಳಬಹುದು." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ಬಳಕೆದಾರನನ್ನು ಬದಲಾಯಿಸು" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ನಿರ್ಗಮಿಸು" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತಗೊಳಿಸು" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ಹೈಬರ್ನೇಟ್ ಮಾಡು" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ಮುಚ್ಚು" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "ಪರವಾಗಿಲ್ಲ ಮರಳಿ ಬೂಟ್ ಮಾಡು" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡು" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ರದ್ದುಗೊಳಿಸು" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ನಿರ್ಗಮಿಸಲಿದ್ದೀರಿ." -msgstr[1] "ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ನಿರ್ಗಮಿಸಲಿದ್ದೀರಿ." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." -msgstr[1] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ಮರಳಿ ಆರಂಭಗೊಳ್ಳುತ್ತದೆ." -msgstr[1] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮರಳಿ ಆರಂಭಗೊಳ್ಳುತ್ತದೆ." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "ನೀವು ಪ್ರಸಕ್ತ \"%s\" ಆಗಿ ಪ್ರವೇಶಿಸಿದ್ದೀರಿ." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "ಈ ಗಣಕದಿಂದ ಈಗಲೆ ನಿರ್ಗಮಿಸಬೇಕೆ?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ಬಳಕೆದಾರರನ್ನು ಬದಲಾಯಿಸು (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "ಈ ಗಣಕವನ್ನು ಈಗಲೆ ಮುಚ್ಚಬೇಕೆ?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತಗೊಳಿಸು (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "ಹೈಬರ್ನೇಟ್ (_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "ಮತ್ತೆ ಆರಂಭಿಸು (_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "ಮುಚ್ಚು (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ಈ ಗಣಕವನ್ನು ಈಗಲೆ ಮರಳಿ ಆರಂಭಿಸಬೇಕೆ?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "ಪ್ರತಿಕ್ರಿಯಿಸುತ್ತಿಲ್ಲ" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "ನಿರ್ಗಮಿಸು (_L)" @@ -418,15 +168,15 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "ನೆನಪಿಟ್ಟುಕೊಳ್ಳಲಾದ ಅನ್ವಯ" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "ಈ ಕ್ರಮವಿಧಿಯು ನಿರ್ಗಮನವನ್ನು ತಡೆಯುತ್ತಿದೆ." -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" @@ -434,41 +184,45 @@ "ಹೊಸ ಕ್ಲೈಂಟ್ ಸಂಪರ್ಕಗಳನ್ನು ತಿರಸ್ಕರಿಸಲಾಗುತ್ತಿದೆ ಏಕೆಂದರೆ ಅಧೀವೇಶವನವು ಈಗ " "ಮುಚ್ಚಲ್ಪಡುತ್ತಿದೆ\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE ಆಲಿಸುವ ಸಾಕೆಟ್ ಅನ್ನು ನಿರ್ಮಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "ರೂಢಿಗತ ಸ್ವಯಂಚಾಲನಾ ಕೋಶಗಳನ್ನು ಅತಿಕ್ರಮಿಸು" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "ಬಳಸಬೇಕಿರುವ ಅಧಿವೇಶನ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "ಬಳಕೆದಾರ-ಸೂಚಿತ ಅನ್ವಯಗಳನ್ನು ಲೋಡ್ ಮಾಡಬೇಡ" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "ಈ ಅನ್ವಯದ ಆವೃತ್ತಿ" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "ಪರೀಕ್ಷೆಗಾಗಿ ಫೈಲ್ ವೇಲ್ ಸಂವಾದವನ್ನು ತೋರಿಸು" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr "- GNOME ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕ" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -496,357 +250,245 @@ " ಅನ್ವಯದ id (ಐಚ್ಛಿಕ)\n" " --reason REASON ತಡೆಹಿಡಿಯಲು ಕಾರಣ (ಐಚ್ಛಿಕ)\n" " --inhibit ARG ತಡೆಹಿಡಿಯಬೇಕಿರುವ ವಿಷಯಗಳು, ವಿರಾಮಚಿಹ್ನೆಯಿಂದ ಬೇರ್ಪಡಿಸಲಾದ " -"ಇವುಗಳ ಪಟ್ಟಿ:\n" +"ಇವುಗಳ " +"ಪಟ್ಟಿ:\n" " ನಿರ್ಗಮನ, ಬಳಕೆದಾರನನ್ನು-ಬದಲಿಸು, ಸ್ಥಗಿತಗೊಳಿಸು, ಜಡ, " "ಸ್ವಯಂಏರಿಸುವಿಕೆ\n" " --inhibit-only COMMAND ಅನ್ನು ಆರಂಭಿಸಬೇಡ ಮತ್ತು ಬದಲಿಗೆ ಯಾವಾಗಲೂ ಕಾಯುತ್ತಿರು\n" "\n" "ಯಾವುದೆ --inhibit ಆಯ್ಕೆಯನ್ನು ಸೂಚಿಸದೆ ಇದ್ದಲ್ಲಿ, ಜಡ (idle) ಎಂದು ಊಹಿಸಲಾಗುತ್ತದೆ.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s ಕಾರ್ಯಗತಗೊಳಿಸಲು ವಿಫಲಗೊಂಡಿದೆ\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s ಒಂದು ಆರ್ಗ್ಯುಮೆಂಟಿನ ಅಗತ್ಯವಿರುತ್ತದೆ\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "ಅಧಿವೇಶನ %d" -#: ../tools/gnome-session-selector.c:108 -#| msgid "" -#| "Session names are not allowed\n" -#| "to start with a '.' character" +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "ಅಧಿವೇಶನದ ಹೆಸರುಗಳು ’.’ ಅಥವಾ ’/’ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರುವಂತಿಲ್ಲ" -#: ../tools/gnome-session-selector.c:112 -#| msgid "" -#| "Session names are not allowed\n" -#| "to start with a '.' character" +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "ಅಧಿವೇಶನದ ಹೆಸರುಗಳು ಒಂದು ’.’ ಅಕ್ಷರದಿಂದ ಆರಂಭಿಸುವಂತಿಲ್ಲ" -#: ../tools/gnome-session-selector.c:116 -#| msgid "" -#| "Session names are not allowed\n" -#| "to contain '/' characters" +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "ಅಧಿವೇಶನದ ಹೆಸರುಗಳು ’/’ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರುವಂತಿಲ್ಲ" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format -#| msgid "" -#| "A session with this name\n" -#| "already exists" msgid "A session named ‘%s’ already exists" msgstr "’%s’ ಎಂಬ ಹೆಸರಿನ ಅಧಿವೇಶನವೊಂದು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "ನಿರ್ಗಮಿಸು" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "ಸ್ಥಗಿತಗೊಳಿಸು" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "ಮರಳಿ ಬೂಟ್ ಮಾಡು" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "ಯಾವುದೆ ಪ್ರತಿರೋಧಗಳಿದ್ದರೂ ಅವನ್ನು ಕಡೆಗಣಿಸು" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "ಬಳಕೆದಾರರಿಂದ ಖಚಿತಪಡಿಸುವಂತೆ ಕೇಳಬೇಡ" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕನೊಂದಿಗೆ ಸಂಪರ್ಕ ಹೊಂದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "ಅಸಮಂಜಸ ಆಯ್ಕೆಗಳೊಂದಿಗೆ ಕ್ರಮವಿಧಿಯನ್ನು ಕರೆಯಲಾಗಿದೆ" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME ಫಾಲ್‍ಬ್ಯಾಕ್" +#~ msgid "Select Command" +#~ msgstr "ಆದೇಶವನ್ನು ಆರಿಸು" -#~ msgid "Icon '%s' not found" -#~ msgstr "ಚಿಹ್ನೆ '%s' ಯು ಕಂಡು ಬಂದಿಲ್ಲ" +#~ msgid "Add Startup Program" +#~ msgstr "ಆರಂಭಿಕ ಕ್ರಮವಿಧಿಯನ್ನು ಸೇರಿಸು" -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "GNOME 3 ಲೋಡ್ ಆಗುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" +#~ msgid "Edit Startup Program" +#~ msgstr "ಆರಂಭಿಕ ಕ್ರಮವಿಧಿಯನ್ನು ಸಂಪಾದಿಸು" -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "ದುರದೃಷ್ಟವಶಾತ್ GNOME 3 ಫಾಲ್‌ಬ್ಯಾಕ್ ಸ್ಥಿತಿಯಲ್ಲಿ ಸರಿಯಾಗಿ ಪ್ರಾರಂಭಗೊಳ್ಳುವಲ್ಲಿ " -#~ "ವಿಫಲಗೊಂಡಿದೆ.\n" -#~ "\n" -#~ "ಇದರರ್ಥ ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯಿಂದ (ಗ್ರಾಫಿಕ್ಸ್ ಯಂತ್ರಾಂಶ ಅಥವ ಚಾಲಕ) ಪರಿಪೂರ್ಣವಾದ GNOME 3 " -#~ "ಅನುಭವವನ್ನು ಒದಗಿಸಲು ಸಾಧ್ಯವಿರದೆ ಇರಬಹುದು." +#~ msgid "The startup command cannot be empty" +#~ msgstr "ಆರಂಭಿಕ ಆದೇಶವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ" -#~ msgid "Learn more about GNOME 3" -#~ msgstr "GNOME ನ ಬಗ್ಗೆ ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ 3" +#~ msgid "The startup command is not valid" +#~ msgstr "ಆರಂಭಿಕ ಆದೇಶವು ಮಾನ್ಯವಾದುದಲ್ಲ" -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "" -#~ "ಪ್ರವೇಶ ಅಧಿವೇಶನವನ್ನು ಆರಂಭಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ (ಹಾಗು X ಪರಿಚಾರಕಕ್ಕೆ ಸಂಪರ್ಕ ಸಾಧಿಸಲು " -#~ "ಸಾಧ್ಯವಾಗಿಲ್ಲ)" +#~ msgid "Enabled" +#~ msgstr "ಶಕ್ತಗೊಂಡ" -#~ msgid "GNOME Settings Daemon Helper" -#~ msgstr "GNOME ಸೆಟ್ಟಿಂಗ್ಸ್‍ ಡೀಮನ್ ಹೆಲ್ಪರ್" +#~ msgid "Icon" +#~ msgstr "ಚಿಹ್ನೆ" -#~ msgid "Default session" -#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಅಧಿವೇಶನ" +#~ msgid "Program" +#~ msgstr "ಕ್ರಮವಿಧಿ" -#~ msgid "File Manager" -#~ msgstr "ಕಡತ ವ್ಯವಸ್ಥಾಪಕ" +#~ msgid "Startup Applications Preferences" +#~ msgstr "ಆರಂಭಿಕ ಅನ್ವಯಗಳ ಆದ್ಯತೆಗಳು" -#~ msgid "" -#~ "If enabled, gnome-session will prompt the user before ending a session." -#~ msgstr "" -#~ "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, ಯಾವುದೆ ಒಂದು ಅಧೀವೇಶನವನ್ನು ಮುಗಿಸುವ ಮೊದಲು gnome-session " -#~ "ಬಳಕೆದಾರನನ್ನು ಕೇಳುತ್ತದೆ." +#~ msgid "No name" +#~ msgstr "ಯಾವುದೆ ಹೆಸರಿಲ್ಲ" -#~ msgid "" -#~ "If enabled, gnome-session will save the session automatically. Otherwise, " -#~ "the logout dialog will have an option to save the session." -#~ msgstr "" -#~ "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, gnome-session ಅಧಿವೇಶನವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಉಳಿಸುತ್ತದೆ. ಇಲ್ಲದೆ " -#~ "ಹೋದಲ್ಲಿ, ಅಧಿವೇಶನವನ್ನು ಉಳಿಸಲು ನಿರ್ಗಮಿಸುವ ಸಂವಾದದಲ್ಲಿ ಆಯ್ಕೆಯು ಇರುತ್ತದೆ." +#~ msgid "No description" +#~ msgstr "ಯಾವುದೆ ವಿವರಣೆ ಇಲ್ಲ" -#~ msgid "List of applications that are part of the default session." -#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಅಧಿವೇಶನದ ಭಾಗವಾಗಿರುವ ಅನ್ವಯಗಳ ಪಟ್ಟಿ." +#~ msgid "Could not display help document" +#~ msgstr "ನೆರವಿನ ದಸ್ತಾವೇಜನ್ನು ತೋರಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" -#~ msgid "" -#~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." -#~ msgstr "" -#~ "ಅಧಿವೇಶನದ ಭಾಗವಾಗಿರಬೇಕಾಗಿರುವ ಘಟಕಗಳ ಪಟ್ಟಿ.. (ಪ್ರತಿಯೊಂದು ಅಂಶದ ಹೆಸರುಗಳು \"/" -#~ "desktop/gnome/session/required_components\" ನ ಅಡಿಯಲ್ಲಿ ಒಂದು " -#~ "ಕೀಲಿಯಾಗಿರುತ್ತದೆ). ಬಳಕೆದಾರರು ಒಂದು ಅಗತ್ಯವಾದ ಘಟಕವನ್ನು ತೆಗೆದು ಹಾಕಲು ಸಾಮಾನ್ಯವಾಗಿ " -#~ "ಆರಂಭಿಕ ಅನ್ವಯದ ಆದ್ಯತೆಗಳು ಅನುಮತಿಸುವುದಿಲ್ಲ ಹಾಗು ಎಲ್ಲಿಯಾದರೂ ಅವುಗಳನ್ನು ತೆಗೆದು " -#~ "ಹಾಕಿದಲ್ಲಿ ಅಧಿವೇಶನದ ವ್ಯವಸ್ಥಾಪಕವು ಪ್ರವೇಶದ ಸಮಯದಲ್ಲಿ ಅಗತ್ಯವಾದ ಘಟಕಗಳನ್ನು " -#~ "ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರಳಿ ಸೇರಿಸುತ್ತದೆ." +#~ msgid "Some programs are still running:" +#~ msgstr "ಕೆಲವು ಕ್ರಮವಿಧಿಗಳು ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿವೆ:" -#~ msgid "Logout prompt" -#~ msgstr "ನಿರ್ಗಮನದ ಪ್ರಾಂಪ್ಟ್‍" +#~ msgid "Startup Applications" +#~ msgstr "ಆರಂಭಿಕ ಅನ್ವಯಗಳು" -#~ msgid "Panel" -#~ msgstr "ಫಲಕ" +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "ನೀವು ಪ್ರವೇಶಿಸಿದಾಗ ಯಾವ ಅನ್ವಯವನ್ನು ಆರಂಭಿಸಬೇಕು ಎನ್ನುವುದನ್ನು ಆಯ್ಕೆ ಮಾಡಿ" -#~ msgid "Preferred Image to use for login splash screen" -#~ msgstr "ಪ್ರವೇಶದ ಎರಚು ತೆರೆಯ ಮೇಲೆ ಬಳಸಬೇಕಿರುವ ಚಿತ್ರ" +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ಕಡತವು ಮಾನ್ಯವಾದ .desktop ಕಡತವಾಗಿಲ್ಲ" -#~ msgid "Required session components" -#~ msgstr "ಅಧಿವೇಶನದ ಅಂಗಗಳ ಅಗತ್ಯವಿದೆ" +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ಗುರುತಿಸಲಾಗದ ಗಣಕತೆರೆ ಕಡತದ ಆವೃತ್ತಿ '%s'" -#~ msgid "Save sessions" -#~ msgstr "ಅಧಿವೇಶನವನ್ನು ಉಳಿಸು" +#~ msgid "Starting %s" +#~ msgstr "%s ಅನ್ನು ಆರಂಭಿಸಲಾಗುತ್ತಿದೆ" -#~ msgid "Show the splash screen" -#~ msgstr "ಎರಚು ತೆರೆಯನ್ನು ತೋರಿಸು" +#~ msgid "Application does not accept documents on command line" +#~ msgstr "ಅನ್ವಯವು ಆಜ್ಞಾ ಸಾಲಿನಲ್ಲಿ ದಸ್ತಾವೇಜುಗಳನ್ನು ಅಂಗೀಕರಿಸುವುದಿಲ್ಲ" -#~ msgid "Show the splash screen when the session starts up" -#~ msgstr "ಅಧಿವೇಶನವು ಆರಂಭಗೊಂಡಾಗ ಎರಚು ತೆರೆಯನ್ನು ತೋರಿಸು" +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "ಗುರುತಿಸಲಾಗದ ಆರಂಭಿಕ ಆಯ್ಕೆ: %d" -#~ msgid "" -#~ "The file manager provides the desktop icons and allows you to interact " -#~ "with your saved files." -#~ msgstr "" -#~ "ಕಡತ ವ್ಯವಸ್ಥಾಪಕವು ಗಣಕತೆರೆ ಚಿಹ್ನೆಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ ಹಾಗು ನೀವು ಉಳಿಸಿದ ಕಡತಗಳೊಂದಿಗೆ " -#~ "ವ್ಯವಹರಿಸಲು ಅನುವು ಮಾಡಿಕೊಡುತ್ತದೆ." +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "ಒಂದು 'Type=Link' ಗಣಕತೆರೆ ನಮೂದು ದಸ್ತಾವೇಜು URIಗಳನ್ನು ರವಾನಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ" -#~ msgid "" -#~ "The number of minutes of inactivity before the session is considered idle." -#~ msgstr "" -#~ "ಅಧಿವೇಶನವನ್ನು ಜಡವಾಗಿದೆ ಎಂದು ಪರಿಗಣಿಸಬೇಕಿರುವ ಮೊದಲು ಅದು ನಿಷ್ಕ್ರಿಯವಾಗಿರಬೇಕಿರುವ " -#~ "ನಿಮಿಷಗಳ ಸಂಖ್ಯೆ." +#~ msgid "Not a launchable item" +#~ msgstr "ಆರಂಭಿಸಬಹುದಾದ ಅಂಶವಾಗಿಲ್ಲ" -#~ msgid "" -#~ "The panel provides the bar at the top or bottom of the screen containing " -#~ "menus, the window list, status icons, the clock, etc." -#~ msgstr "" -#~ "ಮೆನುಗಳು, ವಿಂಡೋ ಪಟ್ಟಿ, ಸ್ಥಿತಿ ಚಿಹ್ನೆಗಳು, ಗಡಿಯಾರ ಹಾಗು ಇತ್ಯಾದಿಗಳನ್ನು ಹೊಂದಿರುವ " -#~ "ಪಟ್ಟಿಯನ್ನು ತೆರೆಯ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅಥವ ಕೆಳಭಾಗದಲ್ಲಿನ ಒದಗಿಸುತ್ತದೆ." +#~ msgid "Disable connection to session manager" +#~ msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕದೊಂದಿಗಿನ ಸಂಪರ್ಕವನ್ನು ಅಶಕ್ತಗೊಳಿಸು" -#~ msgid "" -#~ "The window manager is the program that draws the title bar and borders " -#~ "around windows, and allows you to move and resize windows." -#~ msgstr "" -#~ "ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕವು ವಿಂಡೋಗಳ ಸುತ್ತಲೂ ಶೀರ್ಷಿಕೆ ಪಟ್ಟಿ ಹಾಗು ಅಂಚುಗಳನ್ನು ಎಳೆಯುವ " -#~ "ಪ್ರೊಗ್ರಾಂ ಆಗಿದೆ, ಹಾಗು ಇದು ವಿಂಡೋಗಳನ್ನು ಸ್ಥಳಾಂತರಿಸಲು ಹಾಗು ಗಾತ್ರಬದಲಾವಣೆಯನ್ನು ಮಾಡಲು " -#~ "ಅನುವು ಮಾಡುತ್ತದೆ." +#~ msgid "Specify file containing saved configuration" +#~ msgstr "ಉಳಿಸಲಾದ ಸಂರಚನೆಯನ್ನು ಹೊಂದಿರುವ ಕಡತವನ್ನು ಸೂಚಿಸಿ" -#~ msgid "" -#~ "This is a relative path value based off the $datadir/pixmaps/ directory. " -#~ "Sub-directories and image names are valid values. Changing this value " -#~ "will effect the next session login." -#~ msgstr "" -#~ "ಇದು $datadir/pixmaps/ ಕೋಶದ ಮೇಲೆ ಆಧರಿತವಾದ ಒಂದು ಸಂಬಂಧಿತ ಮಾರ್ಗವಾಗಿದೆ. ಉಪ-" -#~ "ಕೋಶಗಳು ಹಾಗು ಚಿತ್ರದ ಹೆಸರುಗಳು ಮಾನ್ಯವಾದ ಮೌಲ್ಯಗಳನ್ನು ಹೊಂದಿರುತ್ತವೆ. ಈ ಮೌಲ್ಯವನ್ನು " -#~ "ಬದಲಾಯಿಸುವುದರಿಂದ ಮುಂದಿನ ಅಧಿವೇಶನದ ಪ್ರವೇಶದ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತದೆ." +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕ ID ಯನ್ನು ಸೂಚಿಸಿ" -#~ msgid "Time before session is considered idle" -#~ msgstr "ಅಧಿವೇಶನವನ್ನು ಜಡ ಎಂದು ಪರಿಗಣಿಸುವ ಮುಂಚಿನ ಸಮಯ" +#~ msgid "ID" +#~ msgstr "ID" -#~ msgid "Window Manager" -#~ msgstr "ವಿಂಡೋ ವ್ಯವಸ್ಥಾಪಕ" +#~ msgid "Session management options:" +#~ msgstr "ಅಧಿವೇಶನ ವ್ಯವಸ್ಥಾಪಕ ಆಯ್ಕೆಗಳು:" -#~ msgid "Some programs are still running:" -#~ msgstr "ಕೆಲವು ಪ್ರೊಗ್ರಾಂಗಳು ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿವೆ:" +#~ msgid "Show session management options" +#~ msgstr "ಅಧಿವೇಶನದ ವ್ಯವಸ್ಥಾಪಕ ಆಯ್ಕೆಗಳನ್ನು ತೋರಿಸು" + +#~ msgid "Unknown" +#~ msgstr "ತಿಳಿಯದ" + +#~ msgid "A program is still running:" +#~ msgstr "ಒಂದು ಕ್ರಮವಿಧಿಗಳು ಇನ್ನೂ ಚಾಲನೆಯಲ್ಲಿವೆ:" #~ msgid "" -#~ "Waiting for program to finish. Interrupting program may cause you to " -#~ "lose work." +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." #~ msgstr "" -#~ "ಪ್ರೊಗ್ರಾಂ ಅಂತ್ಯಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ. ಪ್ರೊಗ್ರಾಂ ಅನ್ನು ಮಧ್ಯದಲ್ಲಿ ತಡೆಯುವುದರಿಂದ " -#~ "ನಿಮ್ಮ ಕೆಲಸವು ನಾಶಗೊಳ್ಳಬಹುದು." +#~ "ಕ್ರಮವಿಧಿಗಳು ಅಂತ್ಯಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ. ಈ ಕ್ರಮವಿಧಿಗಳನ್ನು ಮಧ್ಯದಲ್ಲಿ " +#~ "ತಡೆಯುವುದರಿಂದ ನಿಮ್ಮ ಕೆಲಸವು ನಾಶಗೊಳ್ಳಬಹುದು." #~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." #~ msgstr "" -#~ "ಸಂರಚನಾ ಪರಿಚಾರಕದಲ್ಲಿ ಒಂದು ದೋಷವು ಎದುರಾಗಿದೆ.\n" -#~ "(%s ವು %d ಸ್ಥಿತಿಯೊಂದಿಗೆ ನಿರ್ಗಮಿಸಿದೆ)" +#~ "ಕ್ರಮವಿಧಿಗಳು ಅಂತ್ಯಗೊಳ್ಳುವವರೆಗೆ ಕಾಯಲಾಗುತ್ತಿದೆ. ಈ ಕ್ರಮವಿಧಿಗಳನ್ನುನ್ನು ಮಧ್ಯದಲ್ಲಿ " +#~ "ತಡೆಯುವುದರಿಂದ ನಿಮ್ಮ ಕೆಲಸವು ನಾಶಗೊಳ್ಳಬಹುದು." -#~ msgid "GConf key used to lookup default session" -#~ msgstr "ಪೂರ್ವನಿಯೋಜಿತ ಅಧಿವೇಶನವನ್ನು ನೋಡಿಕೊಳ್ಳಲು ಬಳಸಲಾಗುವ GConf ಕೀಲಿ" +#~ msgid "Switch User Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ಬಳಕೆದಾರನನ್ನು ಬದಲಾಯಿಸು" -#~ msgid "- GNOME Splash Screen" -#~ msgstr "- GNOME ಎರಚು ತೆರೆ" +#~ msgid "Log Out Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ನಿರ್ಗಮಿಸು" -#~ msgid "GNOME Splash Screen" -#~ msgstr "GNOME ಎರಚು ತೆರೆ" +#~ msgid "Suspend Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತಗೊಳಿಸು" -#~ msgid "Show shutdown dialog" -#~ msgstr "ಮುಚ್ಚುವ ಸಂವಾದವನ್ನು ತೋರಿಸು" +#~ msgid "Hibernate Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ಹೈಬರ್ನೇಟ್ ಮಾಡು" -#~ msgid "Use dialog boxes for errors" -#~ msgstr "ದೋಷಗಳಿಗಾಗಿ ಸಂವಾದ ಚೌಕವನ್ನು ಉಪಯೋಗಿಸು" +#~ msgid "Shut Down Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ಮುಚ್ಚು" -#~ msgid "Set the current session name" -#~ msgstr "ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಅಧಿವೇಶನಕ್ಕೆ ಹೆಸರನ್ನು ನೀಡು" +#~ msgid "Restart Anyway" +#~ msgstr "ಪರವಾಗಿಲ್ಲ ಮರಳಿ ಬೂಟ್ ಮಾಡು" -#~ msgid "NAME" -#~ msgstr "NAME" +#~ msgid "Lock Screen" +#~ msgstr "ತೆರೆಯನ್ನು ಲಾಕ್ ಮಾಡು" -#~ msgid "Kill session" -#~ msgstr "ಅಧಿವೇಶನವನ್ನು ಮುಗಿಸು" +#~ msgid "Cancel" +#~ msgstr "ರದ್ದುಗೊಳಿಸು" -#~ msgid "Amount of time a user can remain idle" -#~ msgstr "ಒಬ್ಬ ಬಳಕೆದಾರನು ಜಡವಾಗಿರಬಹುದಾದ ಸಮಯ" +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ನಿರ್ಗಮಿಸಲಿದ್ದೀರಿ." +#~ msgstr[1] "ನೀವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ನಿರ್ಗಮಿಸಲಿದ್ದೀರಿ." -#~ msgid "" -#~ "If a user tries to login as root, show a dialog telling them it's a bad " -#~ "idea" -#~ msgstr "" -#~ "ಬಳಕೆದಾರರು ನಿರ್ವಾಹಕರಾಗಿ ಪ್ರವೇಶಿಸಲು ಪ್ರಯತ್ನಿಸಿದಲ್ಲಿ, ಹಾಗೆ ಮಾಡುವುದು ಉಚಿತವಲ್ಲ ಎಂದು " -#~ "ತೋರಿಸುವ ಒಂದು ಸಂವಾದ ಚೌಕವನ್ನು ತೋರಿಸು" +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." +#~ msgstr[1] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮುಚ್ಚಲ್ಪಡುತ್ತದೆ." -#~ msgid "The action to take after the maximum idle time" -#~ msgstr "ಗರಿಷ್ಟ ಜಡವಾಗಿದ್ದ ಸಮಯದ ನಂತರ ತೆಗೆದುಕೊಳ್ಳಬೇಕಿರುವ ಕ್ರಮ" +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡಿನಲ್ಲಿ ಮರಳಿ ಆರಂಭಗೊಳ್ಳುತ್ತದೆ." +#~ msgstr[1] "ಗಣಕವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ %d ಸೆಕೆಂಡುಗಳಲ್ಲಿ ಮರಳಿ ಆರಂಭಗೊಳ್ಳುತ್ತದೆ." -#~ msgid "" -#~ "The name of the action to take when the maximum allowed idle time has " -#~ "been reached. The Delay is specified in the \"max_idle_time\" key. " -#~ "Allowed values are: logout, forced-logout. An empty string disables the " -#~ "action." -#~ msgstr "" -#~ "ಜಡ ಸ್ಥಿತಿಯಲ್ಲಿ ಅನುಮತಿ ಇರುವ ಗರಿಷ್ಟ ಸಮಯವನ್ನು ತಲುಪಿದಾಗ ತೆಗೆದುಕೊಳ್ಳಬೇಕಿರುವ ಕ್ರಿಯೆಯ " -#~ "ಹೆಸರು. ವಿಳಂಬವನ್ನು \"max_idle_time\" ಕೀಲಿಯಲ್ಲಿ ಸೂಚಿಸಲಾಗಿರುತ್ತದೆ. ಅನುಮತಿ ಇರುವ " -#~ "ಮೌಲ್ಯಗಳೆಂದರೆ: logout, forced-logout. ಇದನ್ನು ಖಾಲಿ ಬಿಟ್ಟಲ್ಲಿ ಕ್ರಿಯೆಯು " -#~ "ನಿಷ್ಕ್ರಿಯವಾಗಿರುತ್ತದೆ." +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "ನೀವು ಪ್ರಸಕ್ತ \"%s\" ಆಗಿ ಪ್ರವೇಶಿಸಿದ್ದೀರಿ." -#~ msgid "" -#~ "The number of minutes a user can remain idle before the max_idle_action " -#~ "is automatically taken." -#~ msgstr "" -#~ "max_idle_action ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೆಗೆದುಕೊಳ್ಳುವ ಮೊದಲು ಬಳಕೆದಾರರು " -#~ "ನಿಷ್ಕ್ರಿಯವಾಗಿರಬೇಕಿರುವ ನಿಮಿಷಗಳ ಸಂಖ್ಯೆ." +#~ msgid "Log out of this system now?" +#~ msgstr "ಈ ಗಣಕದಿಂದ ಈಗಲೆ ನಿರ್ಗಮಿಸಬೇಕೆ?" -#~ msgid "Warn user against running gnome-session from root account" -#~ msgstr "ನಿರ್ವಾಹಕ ಖಾತೆಯಿಂದ gnome-ಅಧಿವೇಶನವನ್ನು ಚಲಾಯಿಸದಂತೆ ಬಳಕೆದಾರರಿಗೆ ಎಚ್ಚರಿಸು" +#~ msgid "_Switch User" +#~ msgstr "ಬಳಕೆದಾರರನ್ನು ಬದಲಾಯಿಸು (_S)" -#~ msgid "" -#~ "When enabled, gnome-session will automatically save the next session at " -#~ "log out even if auto saving is disabled." -#~ msgstr "" -#~ "ಶಕ್ತಗೊಂಡಿದ್ದಲ್ಲಿ, ಸ್ವಯಂ ಉಳಿಸುವಿಕೆಯನ್ನು ಅಶಕ್ತಗೊಂಡಿದ್ದರೂ ಸಹ gnome-session " -#~ "ನಿರ್ಗಮಿಸಿದಾಗ ಮುಂದಿನ ಅಧಿವೇಶನವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಉಳಿಸುತ್ತದೆ." +#~ msgid "Shut down this system now?" +#~ msgstr "ಈ ಗಣಕವನ್ನು ಈಗಲೆ ಮುಚ್ಚಬೇಕೆ?" -#~ msgid "Please enter a name for the new session." -#~ msgstr "ಹೊಸ ಅಧಿವೇಶನಕ್ಕಾಗಿ ಒಂದು ಹೆಸರನ್ನು ನಮೂದಿಸಿ." +#~ msgid "S_uspend" +#~ msgstr "ತಾತ್ಕಾಲಿಕ ಸ್ಥಗಿತಗೊಳಿಸು (_u)" -#~ msgid "" -#~ "You are currently trying to run as the root super user. The super user " -#~ "is a specialized account that is not designed to run a normal user " -#~ "session. Various programs will not function properly, and actions " -#~ "performed under this account can cause unrecoverable damage to the " -#~ "operating system." -#~ msgstr "" -#~ "ನೀವು ಪ್ರಸಕ್ತ ಒಬ್ಬ ನಿರ್ವಾಹಕರಾಗಿ(ಸೂಪರ್ ಯೂಸರ್) ಚಲಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿದ್ದೀರಿ. " -#~ "ನಿರ್ವಾಹಕರೆನ್ನುವುದು ವಿಶೇಷ ಖಾತೆಯಾಗಿದ್ದು ಒಂದು ಸಾಮಾನ್ಯ ಬಳಕೆದಾರರ ಅಧಿವೇಶನವಾಗಿ " -#~ "ಚಲಾಯಿಸಲು ಸೂಕ್ತವಾಗಿರುವುದಿಲ್ಲ. ಹಲವಾರು ಪ್ರೊಗ್ರಾಮ್‌ಗಳು ಸಮರ್ಪಕವಾಗಿ ಕೆಲಸ ಮಾಡದೆ " -#~ "ಇರಬಹುದು, ಹಾಗು ಇದರಲ್ಲಿ ನಿರ್ವಹಿಸಲಾದ ಕಾರ್ಯಗಳಿಂದ ನಿಮ್ಮ ಕಾರ್ಯವ್ಯವಸ್ಥೆಗೆ ಸರಿಪಡಿಸಲಾಗದೆ " -#~ "ಇರುವಂತಹ ತೊಂದರೆಯು ಉಂಟಾಗಬಹುದು." - -#~ msgid "%d hour" -#~ msgid_plural "%d hours" -#~ msgstr[0] "%d ಗಂಟೆ" -#~ msgstr[1] "%d ಗಂಟೆಗಳು" - -#~ msgid "%d minute" -#~ msgid_plural "%d minutes" -#~ msgstr[0] "%d ನಿಮಿಷ" -#~ msgstr[1] "%d ನಿಮಿಷಗಳು" - -#~ msgid "%d second" -#~ msgid_plural "%d seconds" -#~ msgstr[0] "%d ಸೆಕೆಂಡ್" -#~ msgstr[1] "%d ಸೆಕೆಂಡುಗಳು" - -#~ msgid "%s %s %s" -#~ msgstr "%s %s %s" - -#~ msgid "%s %s" -#~ msgstr "%s %s" - -#~ msgid "%s" -#~ msgstr "%s" +#~ msgid "_Hibernate" +#~ msgstr "ಹೈಬರ್ನೇಟ್ (_H)" -#~ msgid "0 seconds" -#~ msgstr "0 ಸೆಕೆಂಡುಗಳು" +#~ msgid "_Restart" +#~ msgstr "ಮತ್ತೆ ಆರಂಭಿಸು (_R)" -#~ msgid "Automatic logout in %s" -#~ msgstr "%s ನಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತ ನಿರ್ಗಮನ" - -#~ msgid "" -#~ "This session is configured to automatically log out after a period of " -#~ "inactivity." -#~ msgstr "" -#~ "ಒಂದು ನಿಶ್ಚಿತ ಸಮಯದವರೆಗೆ ಜಡವಾಗಿದ್ದಲ್ಲಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ಗಮಿಸುವಂತೆ ಈ " -#~ "ಅಧಿವೇಶನವನ್ನು ಸಂರಚಿಸಲಾಗಿರುತ್ತದೆ." +#~ msgid "_Shut Down" +#~ msgstr "ಮುಚ್ಚು (_S)" -#~ msgid "Do not show me this again" -#~ msgstr "ಇದನ್ನು ನನಗೆ ಪುನಃ ತೋರಿಸಬೇಡ" +#~ msgid "Restart this system now?" +#~ msgstr "ಈ ಗಣಕವನ್ನು ಈಗಲೆ ಮರಳಿ ಆರಂಭಿಸಬೇಕೆ?" diff -Nru gnome-session-3.9.90/po/ko.po gnome-session-3.14.0/po/ko.po --- gnome-session-3.9.90/po/ko.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/ko.po 2014-06-25 18:06:34.000000000 +0000 @@ -5,13 +5,18 @@ # Updated by Young-Ho Cha , 2000,2001,2006,2007 # Changwoo Ryu , 1998, 2002-2013. # +# +# 용어: +# +# - Wayland - 웨일랜드 +# msgid "" msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-16 23:07+0900\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-14 04:16+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" "Language: ko\n" @@ -40,31 +45,31 @@ msgid "The startup command is not valid" msgstr "시작 프로그램이 올바르지 않습니다" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "사용하기" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "아이콘" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "프로그램" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "시작 프로그램 기본 설정" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "이름 없음" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "설명 없음" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "이 프로그램의 버전" @@ -72,14 +77,6 @@ msgid "Could not display help document" msgstr "도움말 문서를 표시할 수 없습니다" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "그놈" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "이 세션을 사용하면 그놈에 로그인합니다" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "사용자 지정" @@ -88,10 +85,35 @@ msgid "This entry lets you select a saved session" msgstr "이 항목으로 저장한 세션을 지정합니다" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "그놈" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "이 세션을 사용하면 그놈에 로그인합니다" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "그놈 더미" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr " 시작 프로그램" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "로그인할 때 어떤 프로그램을 시작할 지 고릅니다" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "그놈, 웨일랜드" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "이 세션을 사용하면 그놈에 로그인합니다" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "사용자 지정 세션" @@ -116,18 +138,6 @@ msgid "_Continue" msgstr "계속(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "프로그램이 실행 중입니다:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr " 시작 프로그램" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "로그인할 때 어떤 프로그램을 시작할 지 고릅니다" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "시작 프로그램 추가(_P):" @@ -232,17 +242,17 @@ msgid "Show session management options" msgstr "세션 관리 옵션을 표시합니다" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "아, 뭔가 문제가 생겼습니다." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "문제가 발생했지만 복구하지 못했습니다. 시스템 관리자에게 문의하십시오" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -250,7 +260,7 @@ "문제가 발생했지만 복구하지 못했습니다. 안전을 위해 모든 확장 기능을 사용하지 " "않도록 만듭니다." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -258,137 +268,23 @@ "문제가 발생했지만 복구하지 못했습니다.\n" "로그아웃하고 다시 시도하십시오." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "로그아웃(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "디버깅 코드를 사용합니다" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "로그아웃 허용" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "확장 경고 표시" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "모름" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "한 프로그램이 실행 중입니다:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"프로그램이 끝나기를 기다리는 중입니다. 이 프로그램을 중단하면 작업하던 내용" -"을 잃어버릴 수도 있습니다." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"프로그램이 끝나기를 기다리는 중입니다. 이 프로그램을 중단하면 작업하던 내용" -"을 잃어버릴 수도 있습니다." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "그래도 사용자 바꾸기" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "그래도 로그아웃" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "그래도 절전" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "그래도 최대 절전" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "그래도 끄기" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "그래도 다시 시작" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "화면 잠그기" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "취소" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "%d초 뒤에 자동으로 로그아웃합니다." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "%d초 뒤에 자동으로 시스템을 끕니다." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "%d초 뒤에 자동으로 시스템이 다시 시작합니다." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "\"%s\" 사용자로 로그인했습니다." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "지금 시스템에서 로그아웃하시겠습니까?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "사용자 바꾸기(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "지금 시스템을 끄시겠습니까?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "절전(_U)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "최대 절전(_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "다시 시작(_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "끄기(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "지금 시스템을 다시 시작하시겠습니까?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "응답 없음" @@ -400,51 +296,51 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "기억한 프로그램" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "이 프로그램이 로그아웃을 막고 있습니다." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "지금 세션을 끝내는 중이므로 새 클라이언트 연결을 거부합니다.\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE 리스닝 소켓을 만들 수 없습니다: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "기본 자동 시작 디렉토리 대신 사용합니다" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "<자동시작_폴더>" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "사용할 세션" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "<세션_이름>" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "사용자가 지정한 프로그램을 읽어들이지 않습니다" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "테스트 용도로 고래 표시" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- 그놈 세션 관리자" @@ -541,77 +437,3 @@ #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "함께 사용할 수 없는 옵션을 같이 사용했습니다" - -#~ msgid "GNOME fallback" -#~ msgstr "그놈 대체" - -#~ msgid "Icon '%s' not found" -#~ msgstr "'%s' 아이콘이 없습니다" - -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "그놈 3 읽어들이기 실패했습니다" - -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "그놈 3 시작이 실패해서 대체 모드로 시작합니다.\n" -#~ "\n" -#~ "보통 이 경우 완전한 그놈 3 기능을 사용하기에는 시스템 기능이(그래픽 하드웨" -#~ "어 또는 드라이버) 부족한 경우입니다." - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "그놈 3에 대해 좀 더 알고 싶으면" - -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "로그인 세션을 시작할 수 없습니다(X 서버에 연결할 수 없습니다)" - -#~ msgid "Some programs are still running:" -#~ msgstr "실행 중인 프로그램이 있습니다:" - -#~ msgid "Exited with code %d" -#~ msgstr "시그널 %d번으로 끝났습니다" - -#~ msgid "Killed by signal %d" -#~ msgstr "시그널 %d번으로 강제 종료되었습니다" - -#~ msgid "Stopped by signal %d" -#~ msgstr "시그널 %d번으로 중지되었습니다" - -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "문제가 발생했지만 복구하지 못했습니다. 아래의 확장 기능이 문제를 일으켰을 " -#~ "수도 있습니다.\n" -#~ "아래 확장 기능을 사용하지 않게 한 다음, 로그아웃하고 다시 시도하십시오." - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "설정 서버에 문제가 있습니다.\n" -#~ "(%s 프로그램이 %d번 상태로 끝났습니다)" - -#~ msgid "Try _Recovery" -#~ msgstr "복구 시도(_R)" - -#~ msgid "A system error has occurred: %s" -#~ msgstr "시스템 오류가 발생했습니다: %s" - -#~ msgid "A fatal system error has occurred: %s" -#~ msgstr "치명적 시스템 오류가 발생했습니다: %s" - -#~ msgid "Component '%s': %s" -#~ msgstr "구성 요소 '%s': %s" - -#~ msgid "Killed by signal" -#~ msgstr "시그널로 강제 종료되었습니다" - -#~ msgid "Timed out" -#~ msgstr "제한 시간 초과" diff -Nru gnome-session-3.9.90/po/LINGUAS gnome-session-3.14.0/po/LINGUAS --- gnome-session-3.9.90/po/LINGUAS 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/LINGUAS 2014-06-25 18:06:33.000000000 +0000 @@ -37,6 +37,7 @@ fur fy ga +gd gl gu ha diff -Nru gnome-session-3.9.90/po/lt.po gnome-session-3.14.0/po/lt.po --- gnome-session-3.9.90/po/lt.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/lt.po 2014-06-25 18:06:34.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-02-26 23:02+0200\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-12 22:38+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -44,31 +44,31 @@ msgid "The startup command is not valid" msgstr "Paleidimo komanda netinkama" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Įjungta" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Piktograma" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Paleidžiamų programų nustatymai" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Be pavadinimo" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Nėra aprašymo" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Programos versija" @@ -76,14 +76,6 @@ msgid "Could not display help document" msgstr "Nepavyko parodyti žinyno dokumento" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Šis seansas prijungia jus prie GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Pasirinktinis" @@ -92,11 +84,36 @@ msgid "This entry lets you select a saved session" msgstr "Šis įvesties laukas leidžia pasirinkti įrašytą seansą" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Šis seansas prijungia jus prie GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME netikra" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Paleidžiamos programos" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Pasirinkite, kokias programas paleisti jums prisijungiant" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME Wayland aplinkoje" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Šis seansas prijungia jus prie GNOME naudojant Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Pasirinktinis seansas" @@ -121,18 +138,6 @@ msgid "_Continue" msgstr "_Tęsti" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Kai kurios programos vis dar veikia:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Paleidžiamos programos" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Pasirinkite, kokias programas paleisti jums prisijungiant" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Papildomos paleidžiamos _programos:" @@ -237,11 +242,11 @@ msgid "Show session management options" msgstr "Rodyti seanso valdymo parinktis" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "O ne! Nutiko kažkas negera." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -249,7 +254,7 @@ "Įvyko klaida ir sistema negali atsistatyti. Susisiekite su sistemos " "administratoriumi" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -257,7 +262,7 @@ "Įvyko klaida ir sistema negali atsistatyti. Kaip atsargos priemonė visi " "plėtiniai buvo išjungti." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -265,143 +270,23 @@ "Įvyko klaida ir sistema negali atsistatyti.\n" "Atsijunkite ir prisijunkite iš naujo." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Atsijungti" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Įjungti derinimo kodą" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Leisti atsijungimą" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Rodyti plėtinio įspėjimą" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Nežinoma" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Programa vis dar veikia:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Laukiama, kol programa baigs darbą. Nutraukus programos darbą galite " -"prarasti neįrašytų duomenų." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Laukiama, kol programos baigs darbą. Šias programas nutraukus gali būti " -"prarasta neįrašytų duomenų." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Vis tiek keisti naudotoją" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Vis tiek atsijungti" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Vis tiek užmigdyti" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Vis tiek hibernuoti" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Vis tiek išjungti" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Vis tiek įkelti iš naujo" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Užrakinti ekraną" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Atsisakyti" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Būsite automatiškai atjungti po %d sekundės." -msgstr[1] "Būsite automatiškai atjungti po %d sekundžių." -msgstr[2] "Būsite automatiškai atjungti po %d sekundžių." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Sistema automatiškai išsijungs po %d sekundės." -msgstr[1] "Sistema automatiškai išsijungs po %d sekundžių." -msgstr[2] "Sistema automatiškai išsijungs po %d sekundžių." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Sistema automatiškai bus įkelta iš naujo po %d sekundės." -msgstr[1] "Sistema automatiškai bus įkelta iš naujo po %d sekundžių." -msgstr[2] "Sistema automatiškai bus įkelta iš naujo po %d sekundžių." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Esate prisijungę kaip „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Atsijungti dabar?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Keisti naudotoją" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Išjungti sistemą dabar?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Užmigdyti" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernuoti" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Įkelti iš _naujo" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "Išj_ungti" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Įkelti sistemą iš naujo dabar?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Neatsako" @@ -413,11 +298,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Atsiminti programą" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ši programa neleidžia atsijungti." @@ -432,32 +317,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Nepavyko sukurti ICE klausymo lizdo: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Nepaisyti standartinių automatinės paleisties aplankų" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Naudoti sesiją" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Neįkelti naudotojo nurodytų programų" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Rodyti visiškos nesėkmės dialogą bandymui" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " – GNOME seanso valdyklė" diff -Nru gnome-session-3.9.90/po/lv.po gnome-session-3.14.0/po/lv.po --- gnome-session-3.9.90/po/lv.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/lv.po 2014-06-25 18:06:34.000000000 +0000 @@ -2,28 +2,29 @@ # Latvian translation for Gnome Session. # Copyright © 2006 Gnome i18n Project for Latvian. # +# # P�eris Krij�is , 2000. # Artis Trops , 2000. # Raivis Dejus , 2006, 2009. # Rudolfs , 2011. # Rūdofls Mazurs , 2011, 2012. # Rūdolfs Mazurs , 2010, 2011, 2013. -# msgid "" msgstr "" "Project-Id-Version: lv\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-20 11:57+0200\n" -"PO-Revision-Date: 2013-02-20 12:08+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-10 21:38+0300\n" "Last-Translator: Rūdolfs Mazurs \n" -"Language-Team: Latviešu \n" +"Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Gtranslator 2.91.5\n" +"X-Generator: Lokalize 1.5\n" "X-Launchpad-Export-Date: 2009-02-19 16:24+0000\n" #: ../capplet/gsm-app-dialog.c:120 @@ -46,31 +47,31 @@ msgid "The startup command is not valid" msgstr "Starta komanda nav derīga" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Aktivēts" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programma" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Starta programmu iestatījumi" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Nav nosaukuma" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Nav apraksta" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Lietotnes versija" @@ -78,14 +79,6 @@ msgid "Could not display help document" msgstr "Nevar parādīt palīdzības dokumentu" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Šī sesija ieraksta jūs GNOME vidē" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Pielāgota" @@ -94,10 +87,37 @@ msgid "This entry lets you select a saved session" msgstr "Šis ieraksts ļauj izvēlēties saglabātu sesiju" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Šī sesija ieraksta jūs GNOME vidē" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME makets" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Starta lietotnes" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Izvēlieties, kādas programmas vēlaties palaist ierakstoties" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME ar Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Šī sesija ieraksta jūs GNOME vidē, izmantojot Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Pielāgota sesija" @@ -122,18 +142,6 @@ msgid "_Continue" msgstr "_Turpināt" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Dažas programmas joprojām darbojas:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Starta lietotnes" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Izvēlieties, kādas programmas vēlaties palaist ierakstoties" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Papildu starta _programmas:" @@ -238,11 +246,11 @@ msgid "Show session management options" msgstr "Rādīt sesiju pārvaldības opcijas" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Ak nē! Kaut kas nogāja greizi." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -250,7 +258,7 @@ "Gadījās problēma, un sistēma no tās nevar atgūties. Lūdzu, sazinieties ar " "sistēmas administratoru." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -258,7 +266,7 @@ "Gadījās problēma, un sistēma no tās nevar atgūties. Kā piesardzības " "pasākums, visi paplašinājumi ir deaktivēti." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,143 +274,23 @@ "Gadījās problēma, un sistēma no tās nevar atgūties.\n" "Lūdzu, izrakstieties un mēģiniet vēlreiz." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Izrakstīties" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Aktivēt atkļūdošanas kodu" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Atļaut izrakstīšanos" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Rādīt paplašinājumu brīdinājumus" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Nezināms" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Programma joprojām darbojas:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Gaida programmas darbības beigas. Programmas pārtraukšana var novest pie " -"darba rezultātu zaudēšanas." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Gaida programmu darbības beigas. Programmu pārtraukšana var novest pie darba " -"rezultātu zaudēšanas." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Tomēr nomainīt lietotāju" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Tomēr izrakstīties" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Tomēr iesnaudināt" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Tomēr sastindzināt" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Tomēr izslēgt" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Tomēr pārstartēt" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Noslēgt ekrānu" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Atcelt" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundes." -msgstr[1] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundēm." -msgstr[2] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundēm." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Sistēma tiks automātiski izslēgta pēc %d sekundes." -msgstr[1] "Sistēma tiks automātiski izslēgta pēc %d sekundēm." -msgstr[2] "Sistēma tiks automātiski izslēgta pēc %d sekundēm." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Sistēma tiks automātiski pārstartēta pēc %d sekundes." -msgstr[1] "Sistēma tiks automātiski pārstartēta pēc %d sekundēm." -msgstr[2] "Sistēma tiks automātiski pārstartēta pēc %d sekundēm." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Šobrīd jūs esat ierakstījies kā “%s”." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Izrakstīties no sistēmas tagad?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Nomainīt lietotāju" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Izslēgt datoru tagad?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "Iesna_udināt" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "S_astindzināt" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Pā_rstartēt" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "Iz_slēgt" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Izslēgt datoru tagad?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Neatbild" @@ -414,11 +302,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Iegaumētā lietotne" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Programma bloķē izrakstīšanos." @@ -433,32 +321,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Nevar izveidot ICE klausīšanās ligzdu — %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Aizstāt standarta automātiskā starta direktorijas" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTARTA_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sesija, ko izmantot" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESIJAS_NOSAUKUMS" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Neielādēt lietotāja norādītās lietotnes" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Rādīt neveiksmju vali testēšanai" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - GNOME sesiju pārvaldnieks" @@ -557,8 +445,97 @@ msgid "Program called with conflicting options" msgstr "Programma izsaukta ar konfliktējošām opcijām" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME atkāpšanās" +#~ msgid "Some programs are still running:" +#~ msgstr "Dažas programmas joprojām darbojas:" + +#~ msgid "Unknown" +#~ msgstr "Nezināms" + +#~ msgid "A program is still running:" +#~ msgstr "Programma joprojām darbojas:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Gaida programmas darbības beigas. Programmas pārtraukšana var novest pie " +#~ "darba rezultātu zaudēšanas." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Gaida programmu darbības beigas. Programmu pārtraukšana var novest pie " +#~ "darba rezultātu zaudēšanas." + +#~ msgid "Switch User Anyway" +#~ msgstr "Tomēr nomainīt lietotāju" + +#~ msgid "Log Out Anyway" +#~ msgstr "Tomēr izrakstīties" + +#~ msgid "Suspend Anyway" +#~ msgstr "Tomēr iesnaudināt" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Tomēr sastindzināt" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Tomēr izslēgt" + +#~ msgid "Restart Anyway" +#~ msgstr "Tomēr pārstartēt" + +#~ msgid "Lock Screen" +#~ msgstr "Noslēgt ekrānu" + +#~ msgid "Cancel" +#~ msgstr "Atcelt" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundes." +#~ msgstr[1] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundēm." +#~ msgstr[2] "Jūs tiksiet automātiski izrakstīts no sesijas pēc %d sekundēm." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Sistēma tiks automātiski izslēgta pēc %d sekundes." +#~ msgstr[1] "Sistēma tiks automātiski izslēgta pēc %d sekundēm." +#~ msgstr[2] "Sistēma tiks automātiski izslēgta pēc %d sekundēm." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Sistēma tiks automātiski pārstartēta pēc %d sekundes." +#~ msgstr[1] "Sistēma tiks automātiski pārstartēta pēc %d sekundēm." +#~ msgstr[2] "Sistēma tiks automātiski pārstartēta pēc %d sekundēm." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Šobrīd jūs esat ierakstījies kā “%s”." + +#~ msgid "Log out of this system now?" +#~ msgstr "Izrakstīties no sistēmas tagad?" + +#~ msgid "_Switch User" +#~ msgstr "_Nomainīt lietotāju" + +#~ msgid "Shut down this system now?" +#~ msgstr "Izslēgt datoru tagad?" + +#~ msgid "S_uspend" +#~ msgstr "Iesna_udināt" + +#~ msgid "_Hibernate" +#~ msgstr "S_astindzināt" + +#~ msgid "_Restart" +#~ msgstr "Pā_rstartēt" + +#~ msgid "_Shut Down" +#~ msgstr "Iz_slēgt" + +#~ msgid "Restart this system now?" +#~ msgstr "Izslēgt datoru tagad?" #~ msgid "Icon '%s' not found" #~ msgstr "Ikona “%s” nav atrasta" diff -Nru gnome-session-3.9.90/po/ml.po gnome-session-3.14.0/po/ml.po --- gnome-session-3.9.90/po/ml.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/ml.po 2014-06-25 18:06:34.000000000 +0000 @@ -6,74 +6,32 @@ # Hari Vishnu , 2008. # Praveen Arimbrathodiyil , 2008. # Anish A , 2013. +# Akhilan , 2013 +# Anish Sheela , 2013. msgid "" msgstr "" "Project-Id-Version: gnome-session.master.ml\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-23 22:29+0000\n" -"PO-Revision-Date: 2013-03-25 10:46+0530\n" -"Last-Translator: Ani Peter \n" -"Language-Team: American English \n" +"POT-Creation-Date: 2013-10-23 19:36+0000\n" +"PO-Revision-Date: 2013-10-25 20:47+0530\n" +"Last-Translator: Anish Sheela \n" +"Language-Team: Swatantra Malayalam Computing \n" "Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "കമാന്‍ഡ് തെരഞ്ഞെടുക്കുക" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "ആരംഭ നിര്‍ദ്ദേശം ചേര്‍ക്കുക" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "ആരംഭ നിര്‍ദ്ദേശം ചിട്ടപ്പെടുത്തുക" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "ആരംഭ നിര്‍ദ്ദേശം ശൂന്യമായിരിക്കുവാന്‍ പാടില്ല" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "ആരംഭ ആജ്ഞ ശരിയല്ല" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "പ്രവര്‍ത്തന സജ്ജമാക്കുക" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "ചിഹ്നം " - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "പ്രോഗ്രാം" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "പ്രാരംഭ പ്രയോഗങ്ങള്‍ക്കുള്ള മുന്‍ഗണനകള്‍" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "പേരില്ല" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "വിവരണം ഒന്നുമില്ല" - -#: ../capplet/main.c:35 ../gnome-session/main.c:284 -msgid "Version of this application" -msgstr "ഈ പ്രയോഗത്തിന്റെ പതിപ്പു്" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "യഥേഷ്ടം" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "സഹായത്തിനുള്ള വിവരണം ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "സൂക്ഷിച്ച ഒരു പ്രവര്‍ത്തനവേള തെരഞ്ഞെടുക്കാന്‍ ഇതനുവദിക്കുന്നു" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -83,26 +41,26 @@ msgid "This session logs you into GNOME" msgstr "ഈ പ്രവര്‍ത്തനവേള നിങ്ങളെ ഗ്നോമിലേക്ക് കയറ്റുന്നു" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "യഥേഷ്ടം" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "സൂക്ഷിച്ച ഒരു പ്രവര്‍ത്തനവേള തെരഞ്ഞെടുക്കാന്‍ ഇതനുവദിക്കുന്നു" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "ഗ്നോം ഡമ്മി" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "ഗ്നോം വേലാന്റില്‍" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "ഈ പ്രവര്‍ത്തനവേള നിങ്ങളെ ഗ്നോമിലേക്ക് കയറ്റുന്നു, വേലാന്റ് ഉപയോഗിച്ച്" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" -msgstr "ഇഷ്ടമുള്ള പ്രവര്‍ത്തനവേള" +msgstr "പ്രവര്‍ത്തനവേള ചിട്ടപ്പെടുത്തുക" #: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 msgid "Please select a custom session to run" -msgstr "ഓടിക്കേണ്ട ഒരു ഇഷ്ട്ടമുള്ള പ്രവര്‍ത്തനവേള എടുക്കുക" +msgstr "പ്രവർത്തിപ്പിക്കാനായി ഇഷ്ടമുള്ള ഒരു പ്രവർത്തനവേള തിരഞ്ഞെടുക്കുക" #: ../data/session-selector.ui.h:3 msgid "_New Session" @@ -120,31 +78,17 @@ msgid "_Continue" msgstr "_തുടരുക" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "ചില പ്രയോഗങ്ങള്‍ ഇപ്പോഴും പ്രവര്‍ത്തിച്ചു് കൊണ്ടിരിയ്ക്കുന്നു:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "പ്രാരംഭ പ്രയോഗങ്ങള്‍" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "" -"നിങ്ങള്‍ ലോഗിന്‍ ചെയ്യുമ്പോള്‍ ആരംഭിക്കേണ്ട പ്രയോഗങ്ങള്‍ തെരഞ്ഞെടുക്കുക" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "കൂടുതല്‍ പ്രാരംഭ _പ്രയോഗങ്ങള്‍:" #: ../data/session-properties.ui.h:2 msgid "Startup Programs" -msgstr "പ്രാരംഭ പ്രോഗ്രാമുകള്‍" +msgstr "പ്രാരംഭ പ്രയോഗങ്ങൾ" #: ../data/session-properties.ui.h:3 msgid "_Automatically remember running applications when logging out" -msgstr "" -"പുറത്തിറങ്ങുമ്പോള്‍ പ്രവര്‍ത്തിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ഓര്‍ത്തിരിയ്ക്കുക." +msgstr "പുറത്തിറങ്ങുമ്പോള്‍ പ്രവര്‍ത്തിയ്ക്കുന്ന പ്രയോഗങ്ങള്‍ ഓര്‍ത്തിരിയ്ക്കുക." #: ../data/session-properties.ui.h:4 msgid "_Remember Currently Running Applications" @@ -170,98 +114,27 @@ msgid "_Name:" msgstr "_പേരു്:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ഇതൊരു ശരിയായ .പണിയിടം (.desktop ) ഫയലല്ല" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ആറിയാത്ത പണിയിടം ഫയലിന്റെ പതിപ്പ് '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s തുടങ്ങുന്നു" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "പ്രയോഗം രചനകള്‍ ആജ്ഞ സ്ഥാനത്തു് സ്വീകരിക്കുന്നില്ല" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "മനസിലാക്കാന്‍ കഴിയാത്ത തുടങ്ങാനുള്ള ഐച്ഛികം: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "" -"രചനാ യു.അര്‍.എലുകള്‍ ഒരു 'Type=Link'('തരം=ബന്ധം') പണിയിട കുറിപ്പിലേക്ക് " -"ചേര്‍ക്കാന്‍ കഴിയില്ല" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "തുടങ്ങാവുന്ന വസ്തുവല്ല" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "പ്രവര്‍ത്തനവേള നടത്തിപ്പുകാരനുമായി ബന്ധം അപ്രാവര്‍ത്തികമാക്കുക" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "സൂക്ഷിച്ചിരിക്കുന്ന ക്രമീകരണങ്ങള്‍ ഉള്ള ഫയല്‍ വ്യക്തമാക്കുക" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE(ഫയല്‍ )" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "പ്രവര്‍ത്തനവേള കൈകാര്യം ചെയ്യാനുള്ള തിരിച്ചറിയല്‍ വ്യക്തമാക്കുക" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID (തിരിച്ചറിയല്‍)" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "സെഷന്‍ മാനേജ്മെന്റ ഉപാധികള്‍:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "സെഷന്‍ മാനേജ്മെന്റ ഉപാധികള്‍ കാണിക്കുക" - -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." -msgstr "എന്തോ തെറ്റു് സംഭച്ചിരിയ്ക്കുന്നു!!" +msgstr "എന്തോ പിശക് സംഭച്ചിരിയ്ക്കുന്നു!!" -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "" "എന്തോ പ്രശ്നം കാരണം സിസ്റ്റം വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല. ദയവായി ഒരു സിസ്റ്റം " -"അഡ്മിസിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക." +"കാര്യനിർവ്വാഹകനുമായി ബന്ധപ്പെടുക." -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "" -"എന്തോ പ്രശ്നം കാരണം സിസ്റ്റം വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല. മുന്‍കരുതലിനായി " -"എല്ലാ എക്സ്റ്റെന്‍ഷനുകളും " +"എന്തോ പ്രശ്നം കാരണം സിസ്റ്റം വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല. മുന്‍കരുതലിനായി എല്ലാ ചേർപ്പുകളും " "പ്രവര്‍ത്തന രഹിതമാക്കിയിരിയ്ക്കുന്നു." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -269,142 +142,23 @@ "എന്തോ പ്രശ്നം കാരണം സിസ്റ്റം വീണ്ടെടുക്കുവാന്‍ സാധ്യമല്ല.\n" "ദയവായി പുറത്തു് കടന്നു് വീണ്ടും ശ്രമിയ്ക്കുക." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "പുറത്തിറങ്ങുക" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "പിഴവു് തിരുത്താന്‍ സഹായിയ്ക്കുന്ന കോഡ് പ്രാവര്‍ത്തികമാക്കുക" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "പുറത്തിറങ്ങാന്‍ അനുവദിയ്ക്കുക" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "എക്സ്റ്റെന്‍ഷന്‍ മുന്നറിയിപ്പ് കാണിക്കുക" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "അപരിചിതമായ" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ഒരു പ്രയോഗം ഇപ്പോഴും പ്രവര്‍ത്തിച്ചു് കൊണ്ടിരിയ്ക്കുന്നു:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"പ്രയോഗം തീരുന്നതു് വരെ കാത്തിരിയ്ക്കുന്നു. ഈ പ്രയോഗം തടസ്സപ്പെടുത്തുന്നതു് " -"നിങ്ങള്‍ " -"ചെയ്തുകൊണ്ടിരിയ്ക്കുന്ന പണി നഷ്ടപ്പെടുവാന്‍ കാരണമായേയ്ക്കാം." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"പ്രയോഗങ്ങള്‍ തീരുന്നതു് വരെ കാത്തിരിയ്ക്കുന്നു. ഈ പ്രയോഗങ്ങളെ " -"തടസ്സപ്പെടുത്തുന്നതു് നിങ്ങള്‍ " -"ചെയ്തുകൊണ്ടിരിയ്ക്കുന്ന പണി നഷ്ടപ്പെടുവാന്‍ കാരണമായേയ്ക്കാം." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "എന്തായാലും ഉപയോക്താവിനെ മാറ്റുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "എന്തായാലും പുറത്തിറങ്ങുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "എന്തായാലും മയങ്ങുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "എന്തായാലും ശിശിരനിദ്രയിലാഴുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "എന്തായാലും നിര്‍ത്തി വയ്ക്കുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "എന്തായാലും വീണ്ടും തുടങ്ങുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "സ്ക്രീന്‍ പൂട്ടുക" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "റദ്ദാക്കുക" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "നിങ്ങള്‍ താനെ %d സെക്കന്റില്‍ പുറത്തിറങ്ങുന്നതായിരിയ്ക്കും." -msgstr[1] "നിങ്ങള്‍ താനെ %d സെക്കന്റില്‍ പുറത്തിറങ്ങുന്നതായിരിയ്ക്കും." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ഈ സിസ്റ്റം തനിയെ %d സെകന്റില്‍ അടച്ചു പൂട്ടും" -msgstr[1] "ഈ സിസ്റ്റം തനിയെ %d സെകന്റില്‍ അടച്ചു പൂട്ടും" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ഈ സിസ്റ്റം തനിയെ %d സെക്കന്റില്‍ അടച്ചു പൂട്ടും." -msgstr[1] "ഈ സിസ്റ്റം തനിയെ %d സെക്കന്റുകളില്‍ അടച്ചു പൂട്ടും." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "നിങ്ങള്‍ നിലവില്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "ഈ സിസ്റ്റത്തില്‍ നിന്ന് ഇപ്പോള്‍ പുറത്തിറങ്ങണോ?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ഉപയോക്താവിനെ മാറ്റുക" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "ഈ സിസ്റ്റം ഇപ്പോള്‍ അടച്ചുപൂട്ടണോ ?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_മയങ്ങിക്കോട്ടെ" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_ശിശിരനിദ്ര" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "വീണ്ടും തുടങ്ങുക" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "കമ്പ്യൂട്ടര്‍ അടച്ചുപൂട്ടുക" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ഈ സിസ്റ്റം ഇപ്പോള്‍ വീണ്ടും ആരംഭിയ്ക്കണമോ?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1272 ../gnome-session/gsm-manager.c:2044 msgid "Not responding" msgstr "പ്രതികരിയ്ക്കുന്നില്ല" @@ -416,11 +170,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "ഓര്‍ത്തു് വച്ച പ്രയോഗങ്ങള്‍" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "ഈ പ്രയോഗം പുറത്തിറങ്ങുന്നതു് തടയുന്നു." @@ -428,41 +182,43 @@ msgid "" "Refusing new client connection because the session is currently being shut " "down\n" -msgstr "" -"പുതിയ ക്ലയന്റ് ബന്ധം നിരസിക്കുന്നു കാരണം പ്രവര്‍ത്തനവേള ഇപ്പോള്‍ അടച്ചു " -"പൂട്ടൂകയാണു്\n" +msgstr "പുതിയ ക്ലയന്റ് ബന്ധം നിരസിക്കുന്നു കാരണം പ്രവര്‍ത്തനവേള ഇപ്പോള്‍ അടച്ചു പൂട്ടൂകയാണു്\n" #: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "'ഐസ് '(ICE) കേള്‍ക്കാനുള്ള സോക്കറ്റ് ഉണ്ടാക്കാന്‍ കഴിഞ്ഞില്ല: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "സാധാരണയുള്ള സ്വയം തുടങ്ങാനുള്ള തട്ടുകള്‍ മറികടക്കുക" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "ഉപയോഗിയ്ക്കുവാനുള്ള സെഷന്‍" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "ഉപയോക്താവ് വ്യക്തമാക്കിയ പ്രയോഗങ്ങള്‍ ലോഡ് ചെയ്യേണ്ട" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "ഈ പ്രയോഗത്തിന്റെ പതിപ്പു്" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "പരീക്ഷണത്തിനായി പരാജയ ഡയലോഗ് കാണിയ്ക്കുക" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOME പ്രവര്‍ത്തനവേള നടത്തിപ്പുകാരന്‍" @@ -493,13 +249,11 @@ " --app-id ID തടസ്സപ്പെടുത്തുമ്പോള്‍ ഉപയോഗിക്കേണ്ട\n" "\t\t\t\t\tആപ്ലിക്കേഷന്‍ ഐഡി (വേണമെങ്കില്‍)\n" " --reason REASON തടസ്സപ്പെടുത്താനുള്ള കാരണം (വേണമെങ്കില്‍)\n" -" --inhibit ARG എന്തൊക്കെ തടസ്സപ്പെടുത്തണം, കോളന്‍ കൊണ്ടു തിരിച്ച " -"പട്ടിക:\n" +" --inhibit ARG എന്തൊക്കെ തടസ്സപ്പെടുത്തണം, കോളന്‍ കൊണ്ടു തിരിച്ച പട്ടിക:\n" " logout, switch-user, suspend, idle, automount\n" " --inhibit-only COMMAND തുടങ്ങിയിട്ട് എന്നേക്കുമായി കാത്തിരിക്കേണ്ട\n" "\n" -"--inhibit ഐച്ഛികങ്ങളൊന്നും തെരഞ്ഞെടുത്തിലെങ്കില്‍, ചുമ്മായിരിക്കുന്നതായി " -"കരുതുന്നു.\n" +"--inhibit ഐച്ഛികങ്ങളൊന്നും തെരഞ്ഞെടുത്തിലെങ്കില്‍, ചുമ്മായിരിക്കുന്നതായി കരുതുന്നു.\n" #: ../tools/gnome-session-inhibit.c:148 #, c-format @@ -515,25 +269,25 @@ #: ../tools/gnome-session-selector.c:62 #, c-format msgid "Session %d" -msgstr "സെഷന്‍ %d" +msgstr "പ്രവർത്തനവേള %d" #: ../tools/gnome-session-selector.c:108 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "സെഷന്റെ പേര് ‘.’ വെച്ച് തുടങ്ങാനോ ‘/’ കാണാനോ പാടില്ല" +msgstr "പ്രവർത്തനവേളയുടെ പേര് ‘.’ വെച്ച് തുടങ്ങാനോ ‘/’ കാണാനോ പാടില്ല" #: ../tools/gnome-session-selector.c:112 msgid "Session names are not allowed to start with ‘.’" -msgstr "‘.’ വെച്ച് സെഷന്റെ പേര് തുടങ്ങാന്‍ പാടില്ല" +msgstr "‘.’ വെച്ച് പ്രവർത്തനവേളയുടെ പേര് തുടങ്ങാന്‍ പാടില്ല" #: ../tools/gnome-session-selector.c:116 msgid "Session names are not allowed to contain ‘/’ characters" -msgstr "സെഷന്റെ പേരില്‍ ‘/’ കാണാന്‍ പാടില്ല" +msgstr "പ്രവർത്തനവേളയുടെ പേരില്‍ ‘/’ കാണാന്‍ പാടില്ല" #: ../tools/gnome-session-selector.c:124 #, c-format msgid "A session named ‘%s’ already exists" -msgstr "‘%s’ എന്ന പേരില്‍ ഒരു സെഷന്‍ നിലവിലുണ്ടു്" +msgstr "‘%s’ എന്ന പേരില്‍ ഒരു പ്രവർത്തനവേള നിലവിലുണ്ടു്" #: ../tools/gnome-session-quit.c:53 msgid "Log out" @@ -553,7 +307,7 @@ #: ../tools/gnome-session-quit.c:57 msgid "Don't prompt for user confirmation" -msgstr "ഉറപ്പു വരുത്തുന്നതിനായി ഇനി ചോദിയ്ക്കേണ്ട" +msgstr "ഉറപ്പു വരുത്തുന്നതിനായി ഇനി ചോദിക്കേണ്ട" #: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" @@ -561,11 +315,182 @@ #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" -msgstr "" -"പരസ്പരവിരുദ്ധമായ ഐച്ഛികങ്ങളോടെയാണു് പ്രോഗ്രാമിനെ വിളിച്ചിരിയ്ക്കുന്നതു്" +msgstr "പരസ്പരവിരുദ്ധമായ ഐച്ഛികങ്ങളോടെയാണു് പ്രോഗ്രാമിനെ വിളിച്ചിരിയ്ക്കുന്നതു്" + +#~ msgid "Select Command" +#~ msgstr "കമാന്‍ഡ് തെരഞ്ഞെടുക്കുക" + +#~ msgid "Add Startup Program" +#~ msgstr "ആരംഭ നിര്‍ദ്ദേശം ചേര്‍ക്കുക" + +#~ msgid "Edit Startup Program" +#~ msgstr "ആരംഭ നിര്‍ദ്ദേശം ചിട്ടപ്പെടുത്തുക" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "ആരംഭ നിര്‍ദ്ദേശം ശൂന്യമായിരിക്കുവാന്‍ പാടില്ല" + +#~ msgid "The startup command is not valid" +#~ msgstr "ആരംഭ ആജ്ഞ ശരിയല്ല" + +#~ msgid "Enabled" +#~ msgstr "പ്രവര്‍ത്തന സജ്ജമാക്കുക" + +#~ msgid "Icon" +#~ msgstr "ചിഹ്നം " + +#~ msgid "Program" +#~ msgstr "പ്രോഗ്രാം" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "പ്രാരംഭ പ്രയോഗങ്ങള്‍ക്കുള്ള മുന്‍ഗണനകള്‍" + +#~ msgid "No name" +#~ msgstr "പേരില്ല" + +#~ msgid "No description" +#~ msgstr "വിവരണം ഒന്നുമില്ല" + +#~ msgid "Could not display help document" +#~ msgstr "സഹായത്തിനുള്ള വിവരണം ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല" + +#~ msgid "Some programs are still running:" +#~ msgstr "ചില പ്രയോഗങ്ങള്‍ ഇപ്പോഴും പ്രവര്‍ത്തിച്ചു് കൊണ്ടിരിയ്ക്കുന്നു:" + +#~ msgid "Startup Applications" +#~ msgstr "പ്രാരംഭ പ്രയോഗങ്ങള്‍" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "നിങ്ങള്‍ ലോഗിന്‍ ചെയ്യുമ്പോള്‍ ആരംഭിക്കേണ്ട പ്രയോഗങ്ങള്‍ തെരഞ്ഞെടുക്കുക" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ഇതൊരു ശരിയായ .പണിയിടം (.desktop ) ഫയലല്ല" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ആറിയാത്ത പണിയിടം ഫയലിന്റെ പതിപ്പ് '%s'" -#~ msgid "GNOME fallback" -#~ msgstr "ഗ്നോം ഫോള്‍ബാക്ക്" +#~ msgid "Starting %s" +#~ msgstr "%s തുടങ്ങുന്നു" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "പ്രയോഗം രചനകള്‍ ആജ്ഞ സ്ഥാനത്തു് സ്വീകരിക്കുന്നില്ല" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "മനസിലാക്കാന്‍ കഴിയാത്ത തുടങ്ങാനുള്ള ഐച്ഛികം: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "രചനാ യു.അര്‍.എലുകള്‍ ഒരു 'Type=Link'('തരം=ബന്ധം') പണിയിട കുറിപ്പിലേക്ക് ചേര്‍ക്കാന്‍ " +#~ "കഴിയില്ല" + +#~ msgid "Not a launchable item" +#~ msgstr "തുടങ്ങാവുന്ന വസ്തുവല്ല" + +#~ msgid "Disable connection to session manager" +#~ msgstr "പ്രവര്‍ത്തനവേള നടത്തിപ്പുകാരനുമായി ബന്ധം അപ്രാവര്‍ത്തികമാക്കുക" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "സൂക്ഷിച്ചിരിക്കുന്ന ക്രമീകരണങ്ങള്‍ ഉള്ള ഫയല്‍ വ്യക്തമാക്കുക" + +#~ msgid "FILE" +#~ msgstr "FILE(ഫയല്‍ )" + +#~ msgid "Specify session management ID" +#~ msgstr "പ്രവര്‍ത്തനവേള കൈകാര്യം ചെയ്യാനുള്ള തിരിച്ചറിയല്‍ വ്യക്തമാക്കുക" + +#~ msgid "ID" +#~ msgstr "ID (തിരിച്ചറിയല്‍)" + +#~ msgid "Session management options:" +#~ msgstr "സെഷന്‍ മാനേജ്മെന്റ ഉപാധികള്‍:" + +#~ msgid "Show session management options" +#~ msgstr "സെഷന്‍ മാനേജ്മെന്റ ഉപാധികള്‍ കാണിക്കുക" + +#~ msgid "Unknown" +#~ msgstr "അപരിചിതമായ" + +#~ msgid "A program is still running:" +#~ msgstr "ഒരു പ്രയോഗം ഇപ്പോഴും പ്രവര്‍ത്തിച്ചു് കൊണ്ടിരിയ്ക്കുന്നു:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "പ്രയോഗം തീരുന്നതു് വരെ കാത്തിരിയ്ക്കുന്നു. ഈ പ്രയോഗം തടസ്സപ്പെടുത്തുന്നതു് നിങ്ങള്‍ " +#~ "ചെയ്തുകൊണ്ടിരിയ്ക്കുന്ന പണി നഷ്ടപ്പെടുവാന്‍ കാരണമായേയ്ക്കാം." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "പ്രയോഗങ്ങള്‍ തീരുന്നതു് വരെ കാത്തിരിയ്ക്കുന്നു. ഈ പ്രയോഗങ്ങളെ തടസ്സപ്പെടുത്തുന്നതു് നിങ്ങള്‍ " +#~ "ചെയ്തുകൊണ്ടിരിയ്ക്കുന്ന പണി നഷ്ടപ്പെടുവാന്‍ കാരണമായേയ്ക്കാം." + +#~ msgid "Switch User Anyway" +#~ msgstr "എന്തായാലും ഉപയോക്താവിനെ മാറ്റുക" + +#~ msgid "Log Out Anyway" +#~ msgstr "എന്തായാലും പുറത്തിറങ്ങുക" + +#~ msgid "Suspend Anyway" +#~ msgstr "എന്തായാലും മയങ്ങുക" + +#~ msgid "Hibernate Anyway" +#~ msgstr "എന്തായാലും ശിശിരനിദ്രയിലാഴുക" + +#~ msgid "Shut Down Anyway" +#~ msgstr "എന്തായാലും നിര്‍ത്തി വയ്ക്കുക" + +#~ msgid "Restart Anyway" +#~ msgstr "എന്തായാലും വീണ്ടും തുടങ്ങുക" + +#~ msgid "Lock Screen" +#~ msgstr "സ്ക്രീന്‍ പൂട്ടുക" + +#~ msgid "Cancel" +#~ msgstr "റദ്ദാക്കുക" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "നിങ്ങള്‍ താനെ %d സെക്കന്റില്‍ പുറത്തിറങ്ങുന്നതായിരിയ്ക്കും." +#~ msgstr[1] "നിങ്ങള്‍ താനെ %d സെക്കന്റില്‍ പുറത്തിറങ്ങുന്നതായിരിയ്ക്കും." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ഈ സിസ്റ്റം തനിയെ %d സെകന്റില്‍ അടച്ചു പൂട്ടും" +#~ msgstr[1] "ഈ സിസ്റ്റം തനിയെ %d സെകന്റില്‍ അടച്ചു പൂട്ടും" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ഈ സിസ്റ്റം തനിയെ %d സെക്കന്റില്‍ അടച്ചു പൂട്ടും." +#~ msgstr[1] "ഈ സിസ്റ്റം തനിയെ %d സെക്കന്റുകളില്‍ അടച്ചു പൂട്ടും." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "നിങ്ങള്‍ നിലവില്‍ \"%s\" ആയി ലോഗിന്‍ ചെയ്തിരിക്കുന്നു." + +#~ msgid "Log out of this system now?" +#~ msgstr "ഈ സിസ്റ്റത്തില്‍ നിന്ന് ഇപ്പോള്‍ പുറത്തിറങ്ങണോ?" + +#~ msgid "_Switch User" +#~ msgstr "ഉപയോക്താവിനെ മാറ്റുക" + +#~ msgid "Shut down this system now?" +#~ msgstr "ഈ സിസ്റ്റം ഇപ്പോള്‍ അടച്ചുപൂട്ടണോ ?" + +#~ msgid "S_uspend" +#~ msgstr "_മയങ്ങിക്കോട്ടെ" + +#~ msgid "_Hibernate" +#~ msgstr "_ശിശിരനിദ്ര" + +#~ msgid "_Restart" +#~ msgstr "വീണ്ടും തുടങ്ങുക" + +#~ msgid "_Shut Down" +#~ msgstr "കമ്പ്യൂട്ടര്‍ അടച്ചുപൂട്ടുക" + +#~ msgid "Restart this system now?" +#~ msgstr "ഈ സിസ്റ്റം ഇപ്പോള്‍ വീണ്ടും ആരംഭിയ്ക്കണമോ?" #~ msgid "Icon '%s' not found" #~ msgstr "'%s' ചിഹ്നം കണ്ടില്ല" @@ -617,123 +542,3 @@ #~ msgid "List of applications that are part of the default session." #~ msgstr "സഹജമായ പ്രവര്‍ത്തനവേളയുടെ ഭാഗമായ പ്രയോഗങ്ങളുടെ പട്ടിക." - -#~| msgid "" -#~| "List of components that are required as part of the session. (Each " -#~| "element names a key under \"/desktop/gnome/session/required-components" -#~| "\".) The Session Preferences will not normally allow users to remove a " -#~| "required component from the session, and the session manager will " -#~| "automatically add the required components back to the session if they do " -#~| "get removed." -#~ msgid "" -#~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." -#~ msgstr "" -#~ "പ്രവര്‍ത്തനവേളയുടെ ഭാഗമായി ആവശ്യമുള്ള വിഭാഗങ്ങള്‍. (ഓരോ വസ്തുവും \"/desktop/gnome/" -#~ "session/required-components\"-ഇന്റെ കീഴില്‍ ഒരു കീ പേരു് ഇടുന്നു). പ്രാരംഭ " -#~ "പ്രയോഗങ്ങള്‍ക്കുള്ള മുന്‍ഗണനകള്‍ പൊതുവെ ഉപയോക്താക്കളെ ഒരു ആവശ്യമുള്ള വിഭാഗം പ്രവര്‍ത്തനവേളയില്‍ " -#~ "നിന്നും കളയാന്‍ അനുവദിക്കുന്നില്ല, അതിനൊപ്പം പ്രവര്‍ത്തനവേള നടത്തിപ്പുകാരന്‍ തനിയെ ആവശ്യമുള്ള " -#~ "വിഭാഗം പ്രവര്‍ത്തനവേളയിലേയ്ക്കു് ചേര്‍ക്കുന്നു അവ കളഞ്ഞു പോയെങ്കില്‍." - -#~ msgid "Logout prompt" -#~ msgstr "പുറത്തിറങ്ങുന്നതിനുളള അറിയിപ്പു്" - -#~ msgid "Panel" -#~ msgstr "പാളി" - -#~ msgid "Preferred Image to use for login splash screen" -#~ msgstr "അകത്തുകയറുമ്പോള്‍ മിന്നിമറയുന്ന സ്ക്രീനിനു് ഉപയോഗിക്കുവാന്‍ ആഗ്രഹിക്കുന്ന ചിത്രം" - -#~ msgid "Required session components" -#~ msgstr "ആവശ്യമുള്ള പ്രവര്‍ത്തനവേളയിലെ ഘടകഭാഗങ്ങള്‍" - -#~ msgid "Show the splash screen" -#~ msgstr "മിന്നിമറയുന്ന സ്ക്രീന്‍ കാണിക്കുക" - -#~ msgid "Show the splash screen when the session starts up" -#~ msgstr "പ്രവര്‍ത്തനവേള ആരംഭിക്കുമ്പോള്‍ മിന്നിമറയുന്ന സ്ക്രീന്‍ കാണിക്കുക" - -#~ msgid "" -#~ "The file manager provides the desktop icons and allows you to interact " -#~ "with your saved files." -#~ msgstr "" -#~ "ഫയല്‍ നടത്തിപ്പുകാരന്‍ പണിയിട ചിഹ്നങ്ങള്‍ തരുന്നതിനോടൊപ്പം നിങ്ങളെ നിങ്ങളുടെ സൂക്ഷിച്ച " -#~ "ഫയലുകളുമായി വിനിമയം നടത്താന്‍ അനുവദിക്കുന്നു." - -#~ msgid "" -#~ "The number of minutes of inactivity before the session is considered idle." -#~ msgstr "സെഷന്‍ നിശ്ചലമാകുന്നതിനു് മുമ്പ് പ്രവര്‍ത്തനത്തിലില്ലാത്ത സമയം." - -#~ msgid "" -#~ "The panel provides the bar at the top or bottom of the screen containing " -#~ "menus, the window list, status icons, the clock, etc." -#~ msgstr "" -#~ "ഈ പാളി വിഭവസൂചികകള്‍ ഉള്ള ചതുരം സ്ക്രീനിന്റെ മുകളിലോ താഴെയോ തരുന്നു, അതിനൊപ്പം " -#~ "ജാലകപട്ടിക, സ്ഥിതി ചിഹ്നങ്ങള്‍, ഘടികാരം, ഇത്യാദി" - -#~ msgid "" -#~ "The window manager is the program that draws the title bar and borders " -#~ "around windows, and allows you to move and resize windows." -#~ msgstr "" -#~ "ജാലക നടത്തിപ്പുകാരന്‍ ആണു് ജാലകങ്ങള്‍ക്കു് ചുറ്റും സീമകളും തലകെട്ടു് ചതുരവും വരയ്ക്കുന്ന പ്രയോഗം, ഇതു് " -#~ "നിങ്ങളെ ജാലകങ്ങള്‍ അനക്കുവാനും അവയുടെ വലിപ്പം മാറ്റുവാനും അനുവദിയ്ക്കുന്നു." - -#~ msgid "" -#~ "This is a relative path value based off the $datadir/pixmaps/ directory. " -#~ "Sub-directories and image names are valid values. Changing this value " -#~ "will effect the next session login." -#~ msgstr "" -#~ "$datadir/pixmaps/ തട്ടില്‍ അടിസ്ഥാനമാക്കിയ ഒരു റിലേറ്റീവ് പാഥ് മൂല്ല്യം ആണിതു്. " -#~ "ഉപതട്ടുകളും രൂപങ്ങളുടെ പേരും ശരിയായ മൂല്ല്യങ്ങളാണു്. ഇതില്‍ വരുത്തുന്ന മാറ്റങ്ങള്‍ അടുത്ത " -#~ "പ്രവര്‍ത്തനവേളയില്‍ കയറുമ്പോള്‍ ബാധിക്കുന്നതാണു്." - -#~ msgid "Time before session is considered idle" -#~ msgstr "സെഷന്‍ നിശ്ചലമാകുന്നതിനുമുമ്പുള്ള സമയം" - -#~ msgid "Window Manager" -#~ msgstr "ജാലക പാലകന്‍" - -#~ msgid "Some programs are still running:" -#~ msgstr "ചില പ്രയോഗങ്ങള്‍ ഇപ്പോഴും പ്രവര്‍ത്തിച്ചു് കൊണ്ടിരിയ്ക്കുന്നു:" - -#~ msgid "" -#~ "Waiting for program to finish. Interrupting program may cause you to " -#~ "lose work." -#~ msgstr "" -#~ "പ്രയോഗം തീരുന്നതു് വരെ കാത്തിരിയ്ക്കുന്നു. പ്രയോഗത്തെ തടസ്സപ്പെടുത്തുന്നതു് ചെയ്ത പണി നഷ്ടപ്പെടാന്‍ " -#~ "കാരണമായേയ്ക്കാം." - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "ക്രമീകരണ സെര്‍വറില്‍ ഒരു കുഴപ്പമുണ്ട്.\n" -#~ "(%s %d സ്ഥിതിയുമായി നിര്‍ത്തി ഇറങ്ങിയിരിക്കുന്നു)" - -#~ msgid "GConf key used to lookup default session" -#~ msgstr "സഹജമായ പ്രവര്‍ത്തനവേള കണ്ടുപിടിയ്ക്കാനുപയോഗിയ്ക്കുന്ന ജികോണ്‍ഫിലെ ചാവി" - -#~ msgid "- GNOME Splash Screen" -#~ msgstr "- ഗ്നോമിലെ മിന്നിമറയുന്ന സ്ക്രീന്‍" - -#~ msgid "GNOME Splash Screen" -#~ msgstr "- ഗ്നോമിലെ മിന്നിമറയുന്ന സ്ക്രീന്‍" - -#~ msgid "Show shutdown dialog" -#~ msgstr "നിര്‍ത്തി വയ്ക്കുന്നതിനുള്ള സംഭാഷണം കാണിയ്ക്കുക" - -#~ msgid "Use dialog boxes for errors" -#~ msgstr "തെറ്റുകള്‍ വരുമ്പോള്‍ സംഭാഷണ കളങ്ങള്‍ ഉപയോഗിയ്ക്കുക" - -#~ msgid "Set the current session name" -#~ msgstr "ഇപ്പോഴുള്ള പ്രവര്‍ത്തനവേളയ്ക്കു് പേരു് കൊടുക്കുക" - -#~ msgid "NAME" -#~ msgstr "NAME(പേര്)" - -#~ msgid "Kill session" -#~ msgstr "പ്രവര്‍ത്തനവേള ഇല്ലാതാക്കുക" diff -Nru gnome-session-3.9.90/po/mr.po gnome-session-3.14.0/po/mr.po --- gnome-session-3.9.90/po/mr.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/mr.po 2014-09-22 14:18:16.000000000 +0000 @@ -6,14 +6,14 @@ # SECOND AUTHOR: Pradeep Deshpande # THIRD AUTHOR: Rahul Bhalerao , 2006. # FOURTH AUTHOR: Sandeep Shedmake , 2008, 2009. -# Sandeep Shedmake , 2009, 2010, 2012, 2013. +# Sandeep Shedmake , 2009, 2010, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: mr\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-21 14:32+0530\n" +"POT-Creation-Date: 2014-09-11 19:24+0000\n" +"PO-Revision-Date: 2014-09-12 09:43+0530\n" "Last-Translator: Sandeep Shedmake \n" "Language-Team: Marathi \n" "Language: mr\n" @@ -23,57 +23,13 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "आदेश नीवडा" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "सुरूवातीचा कार्यक्रम समाविष्ट करा" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "सुरु होणारे कार्यक्रम संपादन करा" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "सुरुवातीची आज्ञा रिकामी असू शकत नाही" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "प्रारंभ आदेश वैध नाही" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "कार्यान्वीत" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "चिन्ह" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "कार्यक्रम" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "प्रारंभिक अनुप्रयोग आवड निवड" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "नाव आढळले नाही" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "वर्णन आढळले नाही" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "या अनुप्रयोगाची आवृत्ती" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "पसंतीचे" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "मदत दस्तऐवज दाखवण्यास अशक्य" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "हि नोंदणी तुम्हाला साठवलेले सत्र पसंत करायला देते" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -83,40 +39,38 @@ msgid "This session logs you into GNOME" msgstr "GNOME मध्ये दाखल करण्याजोगी सत्र लॉग" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "पसंतीचे" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "हि नोंदणी तुम्हाला साठवलेले सत्र पसंत करायला देते" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME डम्मी" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "वेलँडवरील GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "हे सत्र तुम्हाला GNOME मध्ये दाखल करते, वेलँडचा वापर करत आहे" + #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "पसंतीचे सत्र" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "कृपया चालवण्याजोगी पसंतीचे सत्र पसंत करा" #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "नवीन सत्र (_N)" #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "सत्र काढून टाका (_R)" #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "सत्राला पुनःनाव द्या (_m)" @@ -124,18 +78,6 @@ msgid "_Continue" msgstr "सुरू ठेवा (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "काहिक कार्यक्रम अजूनही कार्यरत आहे:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "आरंभिक अनुप्रयोग" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "प्रवेश केल्यावर कुठले अनुप्रयोग सुरू करायचे ते नीवडा" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "अगाऊ प्रारंभिक कार्यक्रम (_p):" @@ -172,86 +114,18 @@ msgid "_Name:" msgstr "नाव (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "फाइल वैध .desktop फाइल नाही" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "अपरिचीत डेस्कटॉप फाइल आवृत्ती '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s सुरू करत आहे" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "अनुप्रयोग आदेश ओळ पासून दस्तऐवज स्वीकारत नाही" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "अपरिचीत प्रक्षेपन पर्याय: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "'Type=Link' डेस्कटॉप नोंदणी करीता दस्तऐवजातील URIs पाठवू शकत नाही" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "प्रक्षेपण घटक नाही" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "सत्र संचालकाशी जुळवणी मोडा" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "संचयीत संयोजना समाविष्ठीत फाइल निर्देशीत करा" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "सत्र व्यवस्थापन ID निर्देशीत करा" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "सत्र व्यवस्थपान पर्याय:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "सत्र व्यवस्थपान पर्याय दाखवा" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "अरे! काहितरी चुकले." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "" "अडचण आढळली व प्रणालीची पुनःप्राप्ति अशक्य. कृपया प्रणाली प्रशासकाशी संपर्क करा" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -259,7 +133,7 @@ "अडचण आढळली व प्रणालीची पुनःप्राप्ति अशक्य. सर्व एक्सटेंशन्स्ला सावधगिरी " "म्हणून बंद केले आहे." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -267,152 +141,27 @@ "अडचण आढळली व प्रणालीची पुनःप्राप्ति अशक्य. \n" "कृपया बाहेर पडा व पुनः प्रयत्न करा." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "बाहेर पडा (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "डीबगींग कोड कार्यान्वीत करा" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "बाहेर पडा स्वीकारा" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "एक्सटेंशन सावधानता दाखवा" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "अज्ञात" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "कार्यक्रम अजूनही कार्यरत आहे:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"प्रोग्राम समाप्त होण्याची वाट पहात आहे. प्रोग्राममध्ये व्यत्य आणल्यास केलेले " -"कार्य गमवाल." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"कार्यक्रमाच्या समाप्तीकरीता प्रतिक्षेत आहे. अशा कार्यक्रमास अडथळा आणल्यास " -"तुमचे कार्य गमवाल." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "वापरकर्त्यास कसेहीकरून बदलवा" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "कसेही बाहेर पडा" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "कसेहीकरून रद्द वगळा" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "कसेही करून हायबरनेट करा" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "कसेही बंद करा करा" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "कसेही पुन्हा सुरू करा" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "पडदा कुलूपबंद करा" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "रद्द करा" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "तुम्ही आपोआप %d सेकंदात बाहेर पडाल." -msgstr[1] "तुम्ही आपोआप %d सेकंदात बाहेर पडाल." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "प्रणाली आपोआप %d सेकंदात पूर्णपणे बंद होईल." -msgstr[1] "प्रणाली आपोआप %d सेकंदात पूर्णपणे बंद होईल." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "हि प्रणाली आपोआप %d सेकंदात पुनः सुरू केले जाईल." -msgstr[1] "हि प्रणाली आपोआप %d सेकंदात पुनः सुरू केले जाईल." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "तुम्ही वर्तमानक्षणी \"%s\" नुरूप प्रवेश केला आहे." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "या प्रणालीतून आता बाहेर पडा?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "वापरकर्ता बदलवा (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "या प्रणालीस आता बंद करा?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "सस्पेंड (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "हायबरनेट (_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "पुन्हा सुरू करा (_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "बंद करा (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ह्या प्रणालीला आता पुनः सुरू करायचे?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "प्रतिसाद देत नाह" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "बाहेर पडा (_L)" @@ -420,56 +169,60 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "लक्षात ठेवलेले ॲप्लिकेशन्स्" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "हा प्रोग्राम बाहेर पडण्यापासून रोखत आहे." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "नविन क्लाऐंट जुळवणी नकारत आहे कारण सत्र वर्तमानक्षणी बंद केले जात आहे\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE सक्रीय सॉकेट बनवू शकला नाही: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "मानक स्वप्रारंभ संचयीकावर खोडून पुन्हा लिहा" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "वापरण्याजोगी सत्र" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "वापरकर्ता-निर्देशीत अनुप्रयोग दाखल करू शकले नाही" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "या अनुप्रयोगाची आवृत्ती" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "चाचणीवेळी अपयशी संवाद दाखवा" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - GNOME सत्र व्यवस्थापक" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -502,72 +255,246 @@ "\n" "--inhibit पर्याय निर्देशीत न केल्यास, आयडल गृहीत घेतले जाते.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s चालवण्यास अपयशी\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s ला आर्ग्युमेंट आवश्यक आहे\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "सत्र %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" "सत्र नाव ‘.’ पासून सुरू होत नाही किंवा त्यामध्ये ‘/’ अक्षरे समाविष्टीत नाही" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "सत्र नाव ‘.’ पासून सुरू होत नाही" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "सत्र नावात ‘/’ अक्षरे समाविष्टीत नसावे" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "‘%s’ नावाचे सत्र आधिपासूनच अस्तित्वात आहे" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "बाहेर पडा" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "बंद करा" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "पुनःबूट करा" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "अस्तित्वाती इंहिबिटर्सकडे दुर्लक्ष करत आहे" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "वापरकर्ता खात्रीकरीता विनंती करू नका" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "सत्र संचालकाशी संपर्क झाला नाही" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "मतभेदीय पर्यायसह कार्यक्रमाला कॉल केले" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME फॉलबॅक" +#~ msgid "Select Command" +#~ msgstr "आदेश नीवडा" + +#~ msgid "Add Startup Program" +#~ msgstr "सुरूवातीचा कार्यक्रम समाविष्ट करा" + +#~ msgid "Edit Startup Program" +#~ msgstr "सुरु होणारे कार्यक्रम संपादन करा" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "सुरुवातीची आज्ञा रिकामी असू शकत नाही" + +#~ msgid "The startup command is not valid" +#~ msgstr "प्रारंभ आदेश वैध नाही" + +#~ msgid "Enabled" +#~ msgstr "कार्यान्वीत" + +#~ msgid "Icon" +#~ msgstr "चिन्ह" + +#~ msgid "Program" +#~ msgstr "कार्यक्रम" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "प्रारंभिक अनुप्रयोग आवड निवड" + +#~ msgid "No name" +#~ msgstr "नाव आढळले नाही" + +#~ msgid "No description" +#~ msgstr "वर्णन आढळले नाही" + +#~ msgid "Could not display help document" +#~ msgstr "मदत दस्तऐवज दाखवण्यास अशक्य" + +#~ msgid "Some programs are still running:" +#~ msgstr "काहिक कार्यक्रम अजूनही कार्यरत आहे:" + +#~ msgid "Startup Applications" +#~ msgstr "आरंभिक अनुप्रयोग" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "प्रवेश केल्यावर कुठले अनुप्रयोग सुरू करायचे ते नीवडा" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "फाइल वैध .desktop फाइल नाही" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "अपरिचीत डेस्कटॉप फाइल आवृत्ती '%s'" + +#~ msgid "Starting %s" +#~ msgstr "%s सुरू करत आहे" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "अनुप्रयोग आदेश ओळ पासून दस्तऐवज स्वीकारत नाही" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "अपरिचीत प्रक्षेपन पर्याय: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' डेस्कटॉप नोंदणी करीता दस्तऐवजातील URIs पाठवू शकत नाही" + +#~ msgid "Not a launchable item" +#~ msgstr "प्रक्षेपण घटक नाही" + +#~ msgid "Disable connection to session manager" +#~ msgstr "सत्र संचालकाशी जुळवणी मोडा" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "संचयीत संयोजना समाविष्ठीत फाइल निर्देशीत करा" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "सत्र व्यवस्थापन ID निर्देशीत करा" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "सत्र व्यवस्थपान पर्याय:" + +#~ msgid "Show session management options" +#~ msgstr "सत्र व्यवस्थपान पर्याय दाखवा" + +#~ msgid "Unknown" +#~ msgstr "अज्ञात" + +#~ msgid "A program is still running:" +#~ msgstr "कार्यक्रम अजूनही कार्यरत आहे:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "प्रोग्राम समाप्त होण्याची वाट पहात आहे. प्रोग्राममध्ये व्यत्य आणल्यास केलेले कार्य गमवाल." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "कार्यक्रमाच्या समाप्तीकरीता प्रतिक्षेत आहे. अशा कार्यक्रमास अडथळा आणल्यास तुमचे कार्य " +#~ "गमवाल." + +#~ msgid "Switch User Anyway" +#~ msgstr "वापरकर्त्यास कसेहीकरून बदलवा" + +#~ msgid "Log Out Anyway" +#~ msgstr "कसेही बाहेर पडा" + +#~ msgid "Suspend Anyway" +#~ msgstr "कसेहीकरून रद्द वगळा" + +#~ msgid "Hibernate Anyway" +#~ msgstr "कसेही करून हायबरनेट करा" + +#~ msgid "Shut Down Anyway" +#~ msgstr "कसेही बंद करा करा" + +#~ msgid "Restart Anyway" +#~ msgstr "कसेही पुन्हा सुरू करा" + +#~ msgid "Lock Screen" +#~ msgstr "पडदा कुलूपबंद करा" + +#~ msgid "Cancel" +#~ msgstr "रद्द करा" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "तुम्ही आपोआप %d सेकंदात बाहेर पडाल." +#~ msgstr[1] "तुम्ही आपोआप %d सेकंदात बाहेर पडाल." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "प्रणाली आपोआप %d सेकंदात पूर्णपणे बंद होईल." +#~ msgstr[1] "प्रणाली आपोआप %d सेकंदात पूर्णपणे बंद होईल." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "हि प्रणाली आपोआप %d सेकंदात पुनः सुरू केले जाईल." +#~ msgstr[1] "हि प्रणाली आपोआप %d सेकंदात पुनः सुरू केले जाईल." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "तुम्ही वर्तमानक्षणी \"%s\" नुरूप प्रवेश केला आहे." + +#~ msgid "Log out of this system now?" +#~ msgstr "या प्रणालीतून आता बाहेर पडा?" + +#~ msgid "_Switch User" +#~ msgstr "वापरकर्ता बदलवा (_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "या प्रणालीस आता बंद करा?" + +#~ msgid "S_uspend" +#~ msgstr "सस्पेंड (_u)" + +#~ msgid "_Hibernate" +#~ msgstr "हायबरनेट (_H)" + +#~ msgid "_Restart" +#~ msgstr "पुन्हा सुरू करा (_R)" + +#~ msgid "_Shut Down" +#~ msgstr "बंद करा (_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "ह्या प्रणालीला आता पुनः सुरू करायचे?" #~ msgid "Icon '%s' not found" #~ msgstr "चिन्ह '%s' आढळले नाही" diff -Nru gnome-session-3.9.90/po/ms.po gnome-session-3.14.0/po/ms.po --- gnome-session-3.9.90/po/ms.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/ms.po 2014-09-22 14:18:16.000000000 +0000 @@ -1,6 +1,6 @@ # gnome-session Bahasa Melayu (ms) -# Melihat Sistem kehakiman masa kini, Saya tak hairan -# kalau saya disabitkan dengan kesalahan mendera isteri +# Melihat Sistem kehakiman masa kini, Saya tak hairan +# kalau saya disabitkan dengan kesalahan mendera isteri # ketika saya masih BUJANG # # Hasbullah Bin Pit (sebol) , 2001-2003 @@ -8,495 +8,617 @@ msgid "" msgstr "" "Project-Id-Version: gnome-session HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-01-11 08:59+0000\n" -"PO-Revision-Date: 2003-08-08 01:58+0800\n" -"Last-Translator: Hasbullah Bin Pit \n" -"Language-Team: Projek Gabai \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-07-12 07:22+0000\n" +"PO-Revision-Date: 2014-09-15 21:14+0730\n" +"Last-Translator: Umarzuki Mochlis Moktar \n" +"Language-Team: ms\n" +"Language: Malay\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" -#: gnome-session/gnome-session.schemas.in.h:1 -msgid "Allow TCP connections" -msgstr "Izinkan Sambungan TCP" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Ubahsuai" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Entri ini membolehkan anda memilih sesi yang disimpan." + +#: ../data/gnome.desktop.in.h:1 +#: ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Sesi ini akan log masuk ke GNOME" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "GNOME dummy" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME pada Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Sesi ini log masukkan anda ke GNOME menggunakan Wayland" + +#: ../data/session-selector.ui.h:1 +#| msgid "Current Session" +msgid "Custom Session" +msgstr "Sesi Diubah Suai" + +#: ../data/session-selector.ui.h:2 +#: ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Sila pilih sesi yang telah diubahsuai untuk dijalankan" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "_Sessi Baru" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "_Buang Sesi" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "Nam_akan Sesi" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Sambung" -#: gnome-session/gnome-session.schemas.in.h:2 -msgid "" -"For security reasons, on platforms which have _IceTcpTransNoListen() " -"(XFree86 systems), gnome-session does not listen for connections on TCP " -"ports. This option will allow connections from (authorized) remote hosts. " -"gnome-session must be restarted for this to take effect." -msgstr "" -"Atas sebab keselamatan, pada platform yang mempunyai _IceTcpTransNoListen() " -"(Sistem XFree86), gnome-session tidak akan mendengar sambungan pada liang " -"TCP. Opsyen ini akan membolehkan sambungan (sah) drpd hos jauh. gnome-" -"session mesti diulanghidupkan supaya ia bertindakbalas." +#: ../data/session-properties.ui.h:1 +msgid "Additional startup _programs:" +msgstr "Program permulaan _tambahan:" -#: gnome-session/gnome-session.schemas.in.h:3 -msgid "If enabled, gnome-session will prompt the user before ending a session." -msgstr "" -"Jika dihidupkan, gnome-session akan memaklum pengguna sebelum mengakhirkan " -"sesi." +#: ../data/session-properties.ui.h:2 +msgid "Startup Programs" +msgstr "Program Permulaan" -#: gnome-session/gnome-session.schemas.in.h:4 -msgid "" -"If enabled, gnome-session will save the session automatically. Otherwise, " -"the logout dialog will have an option to save the session." -msgstr "" -"Jika dihidupkan, gnome-session akan menyimpan sesi secara automatik. " -"Sebaliknya dialog logkeluar akan mempunyai opsyen untuk menyimpan sesi." +#: ../data/session-properties.ui.h:3 +msgid "_Automatically remember running applications when logging out" +msgstr "_Automatik mengingat aplikasi berjalan apabila log keluar" + +#: ../data/session-properties.ui.h:4 +msgid "_Remember Currently Running Applications" +msgstr "Ingat Aplikasi Sedang Be_rjalan" + +#: ../data/session-properties.ui.h:5 +msgid "Options" +msgstr "Opsyen" + +#: ../data/session-properties.ui.h:6 +msgid "Browse…" +msgstr "Selongkar..." -#: gnome-session/gnome-session.schemas.in.h:5 -msgid "Logout prompt" -msgstr "Maklum logkeluar" +# help-browser/toc-man.c:19 +# help-browser/toc2-man.c:21 +#: ../data/session-properties.ui.h:7 +msgid "Comm_ent:" +msgstr "Kom_en:" -#: gnome-session/gnome-session.schemas.in.h:6 +# help-browser/toc-man.c:19 +# help-browser/toc2-man.c:21 +#: ../data/session-properties.ui.h:8 +msgid "Co_mmand:" +msgstr "Ar_ahan:" + +#: ../data/session-properties.ui.h:9 +msgid "_Name:" +msgstr "_Nama:" + +#: ../gnome-session/gsm-fail-whale-dialog.c:321 +msgid "Oh no! Something has gone wrong." +msgstr "Tidak! Ada sesuatu yang tidak kena." + +#: ../gnome-session/gsm-fail-whale-dialog.c:328 +msgid "A problem has occurred and the system can't recover. Please contact a system administrator" +msgstr "Ada masalah telah terjadi dan sistem tidak dapat dipulihkan. Sila hubungi pentadbir sistem" + +#: ../gnome-session/gsm-fail-whale-dialog.c:330 +msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." +msgstr "Ada masalah telah terjadi dan sistem tidak dapat dipulihkan. Semua ciri tambahan telah dilumpuhkan sebagai pencegahan. " + +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" -"Preferred Image to use for the splash screen when logging in to the GNOME " -"Desktop" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." msgstr "" -"Imej digemari untuk digunakan bagi skrin splash bila menglogmasuk ke Desktop " -"GNOME" +"Ada masalah telah terjadi dan sistem tidak dapat dipulihkan.\n" +"Sila log keluar dan cuba semula." -#: gnome-session/gnome-session.schemas.in.h:7 -msgid "Save sessions" -msgstr "Simpan Sesi" - -#: gnome-session/gnome-session.schemas.in.h:8 -msgid "Show the splash screen" -msgstr "Papar skrin splash" - -#: gnome-session/gnome-session.schemas.in.h:9 -msgid "Show the splash screen when the session starts up" -msgstr "Papar skrin splash bila sesi bermula" - -#: gnome-session/gnome-session.schemas.in.h:10 -msgid "Splash Screen Image" -msgstr "Imej Skrin Splash" - -#: gnome-session/gsm-client-editor.c:97 gnome-session/startup-programs.c:314 -msgid "_Order:" -msgstr "_Turutan:" - -#: gnome-session/gsm-client-editor.c:99 -msgid "The order in which applications are started in the session." -msgstr "Turutan aplikasi yang mana dimulakan pada sesi." - -#: gnome-session/gsm-client-editor.c:106 -msgid "What happens to the application when it exits." -msgstr "Apa terjadi pada aplikasi bila ia keluar." - -#: gnome-session/gsm-client-editor.c:109 -msgid "_Style:" -msgstr "_Gaya:" - -#: gnome-session/gsm-client-list.c:150 -#: gnome-session/session-properties-capplet.c:412 -msgid "Order" -msgstr "Turutan:" - -#: gnome-session/gsm-client-list.c:155 -msgid "Style" -msgstr "Gaya:" - -#: gnome-session/gsm-client-list.c:160 -msgid "State" -msgstr "Keadaan:" - -#: gnome-session/gsm-client-list.c:165 -msgid "Program" -msgstr "Program" - -#: gnome-session/gsm-client-row.c:31 -msgid "Inactive" -msgstr "Tidak aktif" - -#: gnome-session/gsm-client-row.c:32 -msgid "Waiting to start or already finished." -msgstr "Menunggu untuk bermula atau sudah tamat." - -#: gnome-session/gsm-client-row.c:34 -msgid "Starting" -msgstr "Memulakan" - -#: gnome-session/gsm-client-row.c:35 -msgid "Started but has not yet reported state." -msgstr "Bermula tetapi tidak dilaporkan keadaannya" - -#: gnome-session/gsm-client-row.c:37 -msgid "Running" -msgstr "Terlaksana" - -#: gnome-session/gsm-client-row.c:38 -msgid "A normal member of the session." -msgstr "Ahli normal bagi sesi" - -#: gnome-session/gsm-client-row.c:40 -msgid "Saving" -msgstr "Menyimpan" - -#: gnome-session/gsm-client-row.c:41 -msgid "Saving session details." -msgstr "Menyimpan perincian sesi." - -#: gnome-session/gsm-client-row.c:43 -msgid "Unknown" -msgstr "Entah" - -#: gnome-session/gsm-client-row.c:44 -msgid "State not reported within timeout." -msgstr "Keadaan tidak dilaporkan dalam hadmasa." - -#: gnome-session/gsm-client-row.c:50 -msgid "Normal" -msgstr "Normal" - -#: gnome-session/gsm-client-row.c:51 -msgid "Unaffected by logouts but can die." -msgstr "Kebal oleh logkeluar tetapi boleh mati" - -#: gnome-session/gsm-client-row.c:53 -msgid "Restart" -msgstr "Ulanghidup" - -#: gnome-session/gsm-client-row.c:54 -msgid "Never allowed to die." -msgstr "Tidak diizinkan untuk mati." - -#: gnome-session/gsm-client-row.c:56 -msgid "Trash" -msgstr "Sampah" - -#: gnome-session/gsm-client-row.c:57 -msgid "Discarded on logout and can die." -msgstr "Abaikan ketika log keluar dan boleh mati" - -#: gnome-session/gsm-client-row.c:59 -msgid "Settings" -msgstr "Penetapan" - -#: gnome-session/gsm-client-row.c:60 -msgid "Always started on every login." -msgstr "Sentiasa dimulakan pada setiap logmasuk." +#: ../gnome-session/gsm-fail-whale-dialog.c:347 +msgid "_Log Out" +msgstr "_Log Keluar" + +#: ../gnome-session/gsm-fail-whale-dialog.c:369 +#: ../gnome-session/main.c:305 +msgid "Enable debugging code" +msgstr "Bolehkan nyahpepijat kod" + +#: ../gnome-session/gsm-fail-whale-dialog.c:370 +msgid "Allow logout" +msgstr "Benarkan log keluar" + +#: ../gnome-session/gsm-fail-whale-dialog.c:371 +msgid "Show extension warning" +msgstr "Tunjuk amaran penambahan" + +#: ../gnome-session/gsm-manager.c:1271 +#: ../gnome-session/gsm-manager.c:2043 +msgid "Not responding" +msgstr "Tiada maklumbalas" +#: ../gnome-session/gsm-util.c:382 +msgid "_Log out" +msgstr "_Log keluar" + +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. #. -#. * it would be nice to have a dialog which either: -#. * -#. * 1. lets you change the message on it -#. * 2. lets you append messages and has a "history" -#. * -#. * for now, we just kill the old dialog and pop up a new one. -#. -#: gnome-session/gsm-gsd.c:41 -msgid "" -"There was an error starting the GNOME Settings Daemon.\n" -"\n" -"Some things, such as themes, sounds, or background settings may not work " -"correctly." -msgstr "" -"Terdapat ralat memulakan Daemon Tetapan GNOME.\n" -"\n" -"Terdapat perkara seperti tetapan tema, bunyi atau latang belakang mungkin " -"tidak berkerja dengan betul." +#: ../gnome-session/gsm-xsmp-client.c:557 +msgid "Remembered Application" +msgstr "Aplikasi Diingati" + +#: ../gnome-session/gsm-xsmp-client.c:1207 +msgid "This program is blocking logout." +msgstr "Program ini menyekat dari log keluar." + +#: ../gnome-session/gsm-xsmp-server.c:340 +msgid "Refusing new client connection because the session is currently being shut down\n" +msgstr "Enggan menerima sambungan klien baharu kerana sesi ini sedang ditutup\n" + +#: ../gnome-session/gsm-xsmp-server.c:609 +#, c-format +msgid "Could not create ICE listening socket: %s" +msgstr "Tidak dapat mencipta soket mendengar ICE: %s" -#: gnome-session/gsm-gsd.c:53 +#: ../gnome-session/main.c:303 +msgid "Override standard autostart directories" +msgstr "Batal direktori automula standard" + +#: ../gnome-session/main.c:303 +msgid "AUTOSTART_DIR" +msgstr "AUTOSTART_DIR" + +#: ../gnome-session/main.c:304 +msgid "Session to use" +msgstr "Sesi hendak digunakan" + +#: ../gnome-session/main.c:304 +msgid "SESSION_NAME" +msgstr "NAMA_SESI" + +#: ../gnome-session/main.c:306 +msgid "Do not load user-specified applications" +msgstr "Jangan muatkan aplikasi spefisik untuk pengguna" + +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Versi aplikasi ini" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:309 +msgid "Show the fail whale dialog for testing" +msgstr "Tunjukkan dialog kegagalan untuk pengujian" + +#: ../gnome-session/main.c:342 +msgid " - the GNOME session manager" +msgstr "- Pengurus sesi GNOME" + +#: ../tools/gnome-session-inhibit.c:108 +#, c-format msgid "" +"%s [OPTION...] COMMAND\n" "\n" +"Execute COMMAND while inhibiting some session functionality.\n" "\n" -"The last error message was:\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" "\n" +"If no --inhibit option is specified, idle is assumed.\n" msgstr "" +"%s [PILIHAN...] ARAHAN\n" "\n" +"Laksanakan ARAHAN semasa merencat sesetengah fungsian sesi.\n" "\n" -"Mesej ralat terakhir adalah:\n" +" -h, --help Tunjuk ini\n" +" --version Tunjuk versi program\n" +" --app-id ID id aplikasi untuk digunakan\n" +" apabila mencegah (pilihan)\n" +" --reason REASON Alasan mencegah (pilihan)\n" +" --inhibit ARG Senarai untuk dicegah yang dipisahkan dengan kolon:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Jangan lancarkan ARAHAN dan tunggu selamanya\n" "\n" +"Andaikan melahu jika tiada pilihan --inhibit dinyatakan.\n" -#: gnome-session/gsm-gsd.c:58 -msgid "" -"\n" -"\n" -"GNOME will still try to restart the Settings Daemon next time you log in." -msgstr "" -"\n" -"\n" -"GNOME akan cuba mengulanghidupkan Daemon Tetapan bila anda log masuk kelak." +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Gagal untuk melaksanakan %s\n" -#: gnome-session/gsm-gsd.c:115 -msgid "There was an unknown activation error." -msgstr "Terdapat ralat pengaktifan yang tidak diketahui." +#: ../tools/gnome-session-inhibit.c:206 +#: ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s perlukan satu argumen\n" -#: gnome-session/gsm-gsd.c:157 -msgid "The Settings Daemon restarted too many times." -msgstr "Daemon Tetapan diulanghidup terlalu banyak kali." +#: ../tools/gnome-session-selector.c:61 +#, c-format +msgid "Session %d" +msgstr "Sesi %d" -#: gnome-session/logout.c:355 -msgid "Are you sure you want to log out?" -msgstr "Adakah anda pasti untuk log keluar?" +#: ../tools/gnome-session-selector.c:107 +msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "Nama sesi tidak dibenarkan bermula dengan ‘.’ atau mengandungi aksara ‘/’ " + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Nama sesi tidak boleh bermula dengan ‘.’" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Nama sesi tidak boleh mengandungi aksara ‘/’" -#: gnome-session/logout.c:372 -msgid "_Save current setup" -msgstr "_Simpan tetapan semasa" +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "Sesi bernama ‘%s’ sudah wujud" -#: gnome-session/logout.c:393 -msgid "Action" -msgstr "Aksi" +#: ../tools/gnome-session-quit.c:51 +msgid "Log out" +msgstr "Log keluar" + +#: ../tools/gnome-session-quit.c:52 +msgid "Power off" +msgstr "Padam" + +#: ../tools/gnome-session-quit.c:53 +msgid "Reboot" +msgstr "But Semula" + +#: ../tools/gnome-session-quit.c:54 +msgid "Ignoring any existing inhibitors" +msgstr "Mengabaikan sebarang perencat sedia wujud" + +#: ../tools/gnome-session-quit.c:55 +msgid "Don't prompt for user confirmation" +msgstr "Jangan minta pengesahan pengguna" -#: gnome-session/logout.c:410 -msgid "_Log out" -msgstr "_Log keluar" +#: ../tools/gnome-session-quit.c:89 +#: ../tools/gnome-session-quit.c:99 +msgid "Could not connect to the session manager" +msgstr "Tidak dapat menyambung ke pengurus sesi" -#: gnome-session/logout.c:416 -msgid "Sh_ut down" -msgstr "T_utup komputer" - -#: gnome-session/logout.c:423 -msgid "_Restart the computer" -msgstr "_Ulanghidup komputer" - -#: gnome-session/main.c:81 -msgid "Specify a session name to load" -msgstr "Nyatakan nama sesi untuk dimuatkan" - -#: gnome-session/main.c:82 -msgid "Only read saved sessions from the default.session file" -msgstr "Hanya membaca sesi tersimpan daripada fail default.session" +#: ../tools/gnome-session-quit.c:201 +msgid "Program called with conflicting options" +msgstr "Program dipanggil dengan pilihan bercanggah" -#: gnome-session/main.c:83 -msgid "Millisecond period spent waiting for clients to register (0=forever)" -msgstr "" -"Tempoh dalam milisaat diluangkan untuk menunggu klien mendaftar (0=selamanya)" +#~ msgid "Allow TCP connections" +#~ msgstr "Izinkan Sambungan TCP" -#: gnome-session/main.c:84 -msgid "Millisecond period spent waiting for clients to respond (0=forever)" -msgstr "" -"Tempoh dalam milisaat diluangkan untuk menunggu klien menjawap (0=selamanya)" +#~ msgid "" +#~ "For security reasons, on platforms which have _IceTcpTransNoListen() " +#~ "(XFree86 systems), gnome-session does not listen for connections on TCP " +#~ "ports. This option will allow connections from (authorized) remote hosts. " +#~ "gnome-session must be restarted for this to take effect." +#~ msgstr "" +#~ "Atas sebab keselamatan, pada platform yang mempunyai " +#~ "_IceTcpTransNoListen() (Sistem XFree86), gnome-session tidak akan " +#~ "mendengar sambungan pada liang TCP. Opsyen ini akan membolehkan sambungan " +#~ "(sah) drpd hos jauh. gnome-session mesti diulanghidupkan supaya ia " +#~ "bertindakbalas." -#: gnome-session/main.c:85 -msgid "Millisecond period spent waiting for clients to die (0=forever)" -msgstr "" -"Tempoh dalam milisaat diluangkan untuk menunggu klien mati (0=selamanya)" +#~ msgid "" +#~ "If enabled, gnome-session will prompt the user before ending a session." +#~ msgstr "" +#~ "Jika dihidupkan, gnome-session akan memaklum pengguna sebelum " +#~ "mengakhirkan sesi." -#: gnome-session/main.c:265 -#, c-format -msgid "" -"Could not look up internet address for %s.\n" -"This will prevent GNOME from operating correctly.\n" -"It may be possible to correct the problem by adding\n" -"%s to the file /etc/hosts." -msgstr "" -"Tak boleh mencari alamat internet untuk %s.\n" -"Ianya akan mengelakkan GNOME daripada bekerja dengan betul.\n" -"Anda boleh membetulkan maslaah ini dengan menambah\n" -" %s di fail /etc/hosts" - -#: gnome-session/main.c:272 -msgid "Log in Anyway" -msgstr "Log Masuk Juga" - -#: gnome-session/main.c:273 -msgid "Try Again" -msgstr "Cuba Lagi" - -#: gnome-session/manager.c:223 -msgid "Your session has been saved" -msgstr "Sesi anda telah pun disimpan" - -#: gnome-session/manager.c:527 -msgid "Wait abandoned due to conflict." -msgstr "Penantian diabaikan kerana konflik" +#~ msgid "" +#~ "If enabled, gnome-session will save the session automatically. Otherwise, " +#~ "the logout dialog will have an option to save the session." +#~ msgstr "" +#~ "Jika dihidupkan, gnome-session akan menyimpan sesi secara automatik. " +#~ "Sebaliknya dialog logkeluar akan mempunyai opsyen untuk menyimpan sesi." -#: gnome-session/manager.c:1035 -#, c-format -msgid "No response to the %s command." -msgstr "Tiada jawapan untuk arahan %s." +#~ msgid "Logout prompt" +#~ msgstr "Maklum logkeluar" -#: gnome-session/manager.c:1036 -msgid "The program may be slow, stopped or broken." -msgstr "Program mungkin perlahan, terhenti atau berderai." - -#: gnome-session/manager.c:1037 -msgid "You may wait for it to respond or remove it." -msgstr "Anda boleh menunggunya dijawap atau dibuang." - -#: gnome-session/manager.c:1760 -msgid "Restart abandoned due to failures." -msgstr "Ulanghidup diabaikan kerana kegagalan." - -#: gnome-session/manager.c:1956 -msgid "A session shutdown is in progress." -msgstr "Sesi penutupan dalam progres." - -#: gnome-session/save-session.c:46 -msgid "Set the current session" -msgstr "Tetapkan sesi semasa" - -#: gnome-session/save-session.c:47 -msgid "Kill session" -msgstr "Bunuh sesi" - -#: gnome-session/save-session.c:48 -msgid "Use dialog boxes" -msgstr "Guna kekotak dialog" +#~ msgid "" +#~ "Preferred Image to use for the splash screen when logging in to the GNOME " +#~ "Desktop" +#~ msgstr "" +#~ "Imej digemari untuk digunakan bagi skrin splash bila menglogmasuk ke " +#~ "Desktop GNOME" -#: gnome-session/save-session.c:146 gnome-session/save-session.c:179 -msgid "Could not connect to the session manager" -msgstr "Tak boleh menyambung ke pengurus sesi" +#~ msgid "Show the splash screen" +#~ msgstr "Papar skrin splash" -#: gnome-session/session-names.c:143 -msgid "The session name cannot be empty" -msgstr "Nama sesi tak boleh kosong" +#~ msgid "Show the splash screen when the session starts up" +#~ msgstr "Papar skrin splash bila sesi bermula" -#: gnome-session/session-names.c:154 -msgid "The session name already exists" -msgstr "Nama sesi sudah wujud" +#~ msgid "Splash Screen Image" +#~ msgstr "Imej Skrin Splash" -#: gnome-session/session-names.c:188 -msgid "Add a new session" -msgstr "Tambah sesi baru" +#~ msgid "_Order:" +#~ msgstr "_Turutan:" -#: gnome-session/session-names.c:218 -msgid "Edit session name" -msgstr "Edit nama sesi" +#~ msgid "The order in which applications are started in the session." +#~ msgstr "Turutan aplikasi yang mana dimulakan pada sesi." -#: gnome-session/session-properties-capplet.c:122 -msgid "_Edit" -msgstr "_Edit" +#~ msgid "What happens to the application when it exits." +#~ msgstr "Apa terjadi pada aplikasi bila ia keluar." -#: gnome-session/session-properties-capplet.c:190 -msgid "" -"Some changes are not saved.\n" -"Is it still OK to exit?" -msgstr "" -"Terdapat perubahan tidak disimpan\n" -"Masih OK untuk keluar?" +#~ msgid "_Style:" +#~ msgstr "_Gaya:" -#: gnome-session/session-properties-capplet.c:240 -#: gnome-session/session-properties.desktop.in.in.h:2 -msgid "Sessions" -msgstr "Sesi" - -#: gnome-session/session-properties-capplet.c:273 -msgid "Show splash screen on _login" -msgstr "Papar skrin splash pada _logmasuk" - -#: gnome-session/session-properties-capplet.c:284 -#, fuzzy -msgid "As_k on logout" -msgstr "_Maklum pada logkeluar" - -#: gnome-session/session-properties-capplet.c:295 -msgid "Automatically save chan_ges to session" -msgstr "Automatik simpan per_ubahan pada sesi" - -#: gnome-session/session-properties-capplet.c:306 -msgid "_Sessions:" -msgstr "_Sessi:" - -#: gnome-session/session-properties-capplet.c:324 -msgid "Session Name" -msgstr "Nama Sessi" - -#: gnome-session/session-properties-capplet.c:375 -msgid "Session Options" -msgstr "Opsyen Sessi" - -#: gnome-session/session-properties-capplet.c:384 -msgid "Current Session" -msgstr "Sessi Semasa" +#~ msgid "Order" +#~ msgstr "Turutan:" -#: gnome-session/session-properties-capplet.c:393 -msgid "Additional startup _programs:" -msgstr "_Program permulaan tambahan:" +#~ msgid "Style" +#~ msgstr "Gaya:" -# help-browser/toc-man.c:19 -# help-browser/toc2-man.c:21 -#: gnome-session/session-properties-capplet.c:414 -msgid "Command" -msgstr "Arahan" +#~ msgid "State" +#~ msgstr "Keadaan:" -#: gnome-session/session-properties-capplet.c:446 -msgid "Startup Programs" -msgstr "Program Permulaan" +#~ msgid "Program" +#~ msgstr "Program" -#: gnome-session/session-properties.c:49 -msgid "Remove the currently selected client from the session." -msgstr "Buang klien semasa dipilih dari sesi." - -#: gnome-session/session-properties.c:55 -msgid "Apply changes to the current session" -msgstr "Terapkan perubahan perubahan pada sesi" - -#: gnome-session/session-properties.c:61 -msgid "The list of programs in the session." -msgstr "Senarai program pada sesi." - -#: gnome-session/session-properties.c:88 -msgid "Currently running _programs:" -msgstr "_Program sedang terlaksana:" - -#: gnome-session/session-properties.c:104 -msgid "Initialize session settings" -msgstr "Initialisasi Tetapan sesi" - -#: gnome-session/session-properties.desktop.in.in.h:1 -msgid "Configure your sessions" -msgstr "Konfigurasi sesi anda" - -#: gnome-session/splash-widget.c:43 -msgid "Sawfish Window Manager" -msgstr "Pengurus Tetingkap Sawfish" - -#: gnome-session/splash-widget.c:44 -msgid "Metacity Window Manager" -msgstr "Pengurus Tetingkap Metacity" - -#: gnome-session/splash-widget.c:45 -msgid "Window Manager" -msgstr "Pengurus Tetingkap" - -#: gnome-session/splash-widget.c:46 -msgid "The Panel" -msgstr "Panel" - -#: gnome-session/splash-widget.c:47 -msgid "Session Manager Proxy" -msgstr "Pengurus Proksi Sesi" - -#: gnome-session/splash-widget.c:48 -msgid "Nautilus" -msgstr "Nautilus" - -#: gnome-session/splash-widget.c:49 -msgid "Desktop Settings" -msgstr "Tetapan Desktop" +#~ msgid "Inactive" +#~ msgstr "Tidak aktif" -# help-browser/toc-man.c:19 -# help-browser/toc2-man.c:21 -#: gnome-session/startup-programs.c:292 -msgid "_Startup Command:" -msgstr "Arahan _Permulaan:" +#~ msgid "Waiting to start or already finished." +#~ msgstr "Menunggu untuk bermula atau sudah tamat." -# help-browser/toc-man.c:19 -# help-browser/toc2-man.c:21 -#: gnome-session/startup-programs.c:298 -msgid "Startup Command" -msgstr "Arahan Permulaan" - -#: gnome-session/startup-programs.c:347 -msgid "The startup command cannot be empty" -msgstr "Arahan permulaan tak boleh kosong" - -#: gnome-session/startup-programs.c:384 -msgid "Add Startup Program" -msgstr "Tambah Program Permulaan" - -#: gnome-session/startup-programs.c:405 -msgid "Edit Startup Program" -msgstr "Edit Program Permulaan" +#~ msgid "Starting" +#~ msgstr "Memulakan" + +#~ msgid "Started but has not yet reported state." +#~ msgstr "Bermula tetapi tidak dilaporkan keadaannya" + +#~ msgid "Running" +#~ msgstr "Terlaksana" + +#~ msgid "A normal member of the session." +#~ msgstr "Ahli normal bagi sesi" + +#~ msgid "Saving" +#~ msgstr "Menyimpan" + +#~ msgid "Saving session details." +#~ msgstr "Menyimpan perincian sesi." + +#~ msgid "Unknown" +#~ msgstr "Entah" + +#~ msgid "State not reported within timeout." +#~ msgstr "Keadaan tidak dilaporkan dalam hadmasa." + +#~ msgid "Normal" +#~ msgstr "Normal" + +#~ msgid "Unaffected by logouts but can die." +#~ msgstr "Kebal oleh logkeluar tetapi boleh mati" + +#~ msgid "Restart" +#~ msgstr "Ulanghidup" + +#~ msgid "Never allowed to die." +#~ msgstr "Tidak diizinkan untuk mati." + +#~ msgid "Trash" +#~ msgstr "Sampah" + +#~ msgid "Discarded on logout and can die." +#~ msgstr "Abaikan ketika log keluar dan boleh mati" + +#~ msgid "Settings" +#~ msgstr "Penetapan" + +#~ msgid "Always started on every login." +#~ msgstr "Sentiasa dimulakan pada setiap logmasuk." + +#~ msgid "" +#~ "There was an error starting the GNOME Settings Daemon.\n" +#~ "\n" +#~ "Some things, such as themes, sounds, or background settings may not work " +#~ "correctly." +#~ msgstr "" +#~ "Terdapat ralat memulakan Daemon Tetapan GNOME.\n" +#~ "\n" +#~ "Terdapat perkara seperti tetapan tema, bunyi atau latang belakang mungkin " +#~ "tidak berkerja dengan betul." + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "The last error message was:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "Mesej ralat terakhir adalah:\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "GNOME will still try to restart the Settings Daemon next time you log in." +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "GNOME akan cuba mengulanghidupkan Daemon Tetapan bila anda log masuk " +#~ "kelak." + +#~ msgid "There was an unknown activation error." +#~ msgstr "Terdapat ralat pengaktifan yang tidak diketahui." + +#~ msgid "The Settings Daemon restarted too many times." +#~ msgstr "Daemon Tetapan diulanghidup terlalu banyak kali." + +#~ msgid "Are you sure you want to log out?" +#~ msgstr "Adakah anda pasti untuk log keluar?" + +#~ msgid "_Save current setup" +#~ msgstr "_Simpan tetapan semasa" + +#~ msgid "Action" +#~ msgstr "Aksi" + +#~ msgid "Sh_ut down" +#~ msgstr "T_utup komputer" + +#~ msgid "_Restart the computer" +#~ msgstr "_Ulanghidup komputer" + +#~ msgid "Specify a session name to load" +#~ msgstr "Nyatakan nama sesi untuk dimuatkan" + +#~ msgid "Only read saved sessions from the default.session file" +#~ msgstr "Hanya membaca sesi tersimpan daripada fail default.session" + +#~ msgid "Millisecond period spent waiting for clients to register (0=forever)" +#~ msgstr "" +#~ "Tempoh dalam milisaat diluangkan untuk menunggu klien mendaftar " +#~ "(0=selamanya)" + +#~ msgid "Millisecond period spent waiting for clients to respond (0=forever)" +#~ msgstr "" +#~ "Tempoh dalam milisaat diluangkan untuk menunggu klien menjawap " +#~ "(0=selamanya)" + +#~ msgid "Millisecond period spent waiting for clients to die (0=forever)" +#~ msgstr "" +#~ "Tempoh dalam milisaat diluangkan untuk menunggu klien mati (0=selamanya)" + +#~ msgid "" +#~ "Could not look up internet address for %s.\n" +#~ "This will prevent GNOME from operating correctly.\n" +#~ "It may be possible to correct the problem by adding\n" +#~ "%s to the file /etc/hosts." +#~ msgstr "" +#~ "Tak boleh mencari alamat internet untuk %s.\n" +#~ "Ianya akan mengelakkan GNOME daripada bekerja dengan betul.\n" +#~ "Anda boleh membetulkan maslaah ini dengan menambah\n" +#~ " %s di fail /etc/hosts" + +#~ msgid "Log in Anyway" +#~ msgstr "Log Masuk Juga" + +#~ msgid "Try Again" +#~ msgstr "Cuba Lagi" + +#~ msgid "Your session has been saved" +#~ msgstr "Sesi anda telah pun disimpan" + +#~ msgid "Wait abandoned due to conflict." +#~ msgstr "Penantian diabaikan kerana konflik" + +#~ msgid "No response to the %s command." +#~ msgstr "Tiada jawapan untuk arahan %s." + +#~ msgid "The program may be slow, stopped or broken." +#~ msgstr "Program mungkin perlahan, terhenti atau berderai." + +#~ msgid "You may wait for it to respond or remove it." +#~ msgstr "Anda boleh menunggunya dijawap atau dibuang." + +#~ msgid "Restart abandoned due to failures." +#~ msgstr "Ulanghidup diabaikan kerana kegagalan." + +#~ msgid "A session shutdown is in progress." +#~ msgstr "Sesi penutupan dalam progres." + +#~ msgid "Set the current session" +#~ msgstr "Tetapkan sesi semasa" + +#~ msgid "Kill session" +#~ msgstr "Bunuh sesi" + +#~ msgid "Use dialog boxes" +#~ msgstr "Guna kekotak dialog" + +#~ msgid "The session name cannot be empty" +#~ msgstr "Nama sesi tak boleh kosong" + +#~ msgid "Add a new session" +#~ msgstr "Tambah sesi baru" + +#~ msgid "Edit session name" +#~ msgstr "Edit nama sesi" + +#~ msgid "_Edit" +#~ msgstr "_Edit" + +#~ msgid "" +#~ "Some changes are not saved.\n" +#~ "Is it still OK to exit?" +#~ msgstr "" +#~ "Terdapat perubahan tidak disimpan\n" +#~ "Masih OK untuk keluar?" + +#~ msgid "Show splash screen on _login" +#~ msgstr "Papar skrin splash pada _logmasuk" + +#~ msgid "Automatically save chan_ges to session" +#~ msgstr "Automatik simpan per_ubahan pada sesi" + +#~ msgid "Session Name" +#~ msgstr "Nama Sessi" + +#~ msgid "Remove the currently selected client from the session." +#~ msgstr "Buang klien semasa dipilih dari sesi." + +#~ msgid "Apply changes to the current session" +#~ msgstr "Terapkan perubahan perubahan pada sesi" + +#~ msgid "The list of programs in the session." +#~ msgstr "Senarai program pada sesi." + +#~ msgid "Currently running _programs:" +#~ msgstr "_Program sedang terlaksana:" + +#~ msgid "Initialize session settings" +#~ msgstr "Initialisasi Tetapan sesi" + +#~ msgid "Configure your sessions" +#~ msgstr "Konfigurasi sesi anda" + +#~ msgid "Sawfish Window Manager" +#~ msgstr "Pengurus Tetingkap Sawfish" + +#~ msgid "Metacity Window Manager" +#~ msgstr "Pengurus Tetingkap Metacity" + +#~ msgid "Window Manager" +#~ msgstr "Pengurus Tetingkap" + +#~ msgid "The Panel" +#~ msgstr "Panel" + +#~ msgid "Session Manager Proxy" +#~ msgstr "Pengurus Proksi Sesi" -#~ msgid "Save Current Session" -#~ msgstr "Simpan Sessi semasa" +#~ msgid "Nautilus" +#~ msgstr "Nautilus" -#~ msgid "Save current state of desktop" -#~ msgstr "Simpan keadaan semasa bagi desktop" +#~ msgid "Desktop Settings" +#~ msgstr "Tetapan Desktop" diff -Nru gnome-session-3.9.90/po/nb.po gnome-session-3.14.0/po/nb.po --- gnome-session-3.9.90/po/nb.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/nb.po 2014-06-25 18:06:34.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-session 3.7.x\n" +"Project-Id-Version: gnome-session 3.9.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-25 18:36+0100\n" -"PO-Revision-Date: 2013-02-25 18:38+0100\n" +"POT-Creation-Date: 2013-09-24 19:36+0200\n" +"PO-Revision-Date: 2013-09-24 19:36+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: no\n" @@ -37,31 +37,31 @@ msgid "The startup command is not valid" msgstr "Oppstartskommandoen er ikke gyldig" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Aktivert" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikon" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Brukervalg for oppstartsprogrammer" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Uten navn" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Ingen beskrivelse" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versjon av dette programmet" @@ -69,14 +69,6 @@ msgid "Could not display help document" msgstr "Kunne ikke vise hjelp" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Denne økten logger inn i GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Egendefinert" @@ -85,10 +77,35 @@ msgid "This entry lets you select a saved session" msgstr "Denne oppføringen lar deg velge en lagret økt" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Denne økten logger inn i GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Oppstartsprogrammer" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Velg programmer som skal startes når du logger inn" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME på Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Denne økten logger inn i GNOME med Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Egendefinert økt" @@ -113,18 +130,6 @@ msgid "_Continue" msgstr "_Fortsett" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Noen programmer kjører fremdeles:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Oppstartsprogrammer" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Velg programmer som skal startes når du logger inn" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Flere oppstarts_programmer:" @@ -229,11 +234,11 @@ msgid "Show session management options" msgstr "Vis alternativer for økthåndtering" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Å nei! Noe har gått galt." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -241,7 +246,7 @@ "Et problem har oppstått og systemet kan ikke gjenopprettes. Vennligst " "kontakt en systemadmininstrator" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -249,7 +254,7 @@ "Et problem har oppstått og systemet kan ikke gjenopprettes. Alle utvidelser " "er slått av som følge av dette." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -257,140 +262,23 @@ "Et problem har oppstått og systemet kan ikke gjenopprettes.\n" "Vennligst logg ut og prøv igjen." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Logg ut" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Aktiver feilsøkingskode" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Tillat utlogging" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Vis advarsel om utvidelser" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Ukjent" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Et program kjører fremdeles:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Venter på at programmet skal avslutte. Hvis du avbryter programmet kan du " -"miste data." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Venter på at programmer skal avslutte. Hvis du avbryter disse programmene " -"kan du miste data." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Bytt bruker likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Logg ut likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Gå i hvilemodus likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Gå i dvalemodus likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Slå av likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Start på nytt likevel" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Lås skjerm" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Avbryt" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Du vil bli logget ut automatisk om %d sekund." -msgstr[1] "Du vil bli logget ut automatisk om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Systemet vil bli slått av automatisk om %d sekund." -msgstr[1] "Systemet vil bli slått automatisk av om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Systemet vil bli startet på nytt automatisk om %d sekund." -msgstr[1] "Systemet vil bli startet på nytt automatisk om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Du er logget inn som «%s»" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Logg ut av dette systemet nå?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Bytt bruker" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Slå av dette systemet nå?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "H_vilemodus" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Dvalemodus" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Sta_rt på nytt" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Slå av" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Start dette systemet på nytt nå?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Svarer ikke" @@ -402,11 +290,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Husket program" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Dette programmet hindrer utlogging." @@ -421,32 +309,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Kunne ikke opprette plugg for ICE-lytting: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Overstyr forvalgte kataloger for autostart" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Økt som skal brukes" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ikke last brukerdefinerte programmer" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Vis feildialog for testing" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOME økthåndterer" diff -Nru gnome-session-3.9.90/po/ne.po gnome-session-3.14.0/po/ne.po --- gnome-session-3.9.90/po/ne.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/ne.po 2014-09-22 14:18:16.000000000 +0000 @@ -8,621 +8,719 @@ # Nabin Gautam , 2007. msgid "" msgstr "" -"Project-Id-Version: gnome-session.HEAD.ne\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-13 11:19+0100\n" -"PO-Revision-Date: 2007-11-08 11:10+0545\n" -"Last-Translator: Nabin Gautam \n" -"Language-Team: Nepali \n" +"Project-Id-Version: gnome-session.HEAD.ne \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-12-18 21:34+0000\n" +"PO-Revision-Date: 2014-09-13 20:23+0400\n" +"Last-Translator: Pawan Chitrakar \n" +"Language-Team: Nepali Translation Team \n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=n !=1\n" +"X-Generator: Poedit 1.6.9\n" +"Plural-Forms: nplurals=2; plural=n !=1;\n" +"X-Poedit-SourceCharset: UTF-8\n" + +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "अनुकूलन" -#: ../data/gnome-session.schemas.in.h:1 -msgid "Allow TCP connections" -msgstr "टीसीपी (TCP) जडानलाई अनुमति दिनुहोस्" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "" -#: ../data/gnome-session.schemas.in.h:2 -msgid "" -"For security reasons, on platforms which have _IceTcpTransNoListen() " -"(XFree86 systems), gnome-session does not listen for connections on TCP " -"ports. This option will allow connections from (authorized) remote hosts. " -"gnome-session must be restarted for this to take effect." -msgstr "" -"सूरक्षाका कारणले, _IceTcpTransNoListen() " -"(XFree86 प्रणाली) भएको प्लेटफर्ममा, टीसीपी(TCP) पोर्टको जडानका जिनोम सत्रले ध्यान दिदैन । यस विकल्पले (आधिकारीक) टाढाको होस्टबाट जडानलाई अनुमति दिन्छ ।" -"यसको प्रभाव देखिनका लागि जिनोम-सत्र फेरि सुरु गर्नुपर्दछ ।" - -#: ../data/gnome-session.schemas.in.h:3 -msgid "If enabled, gnome-session will prompt the user before ending a session." -msgstr "सक्षम भएमा, जिनोम सत्रले सत्र अन्त्य हुनुभन्दा पहिला प्रयोगकर्तालाई प्रोत्साहन दिन्छ ।" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "जिनोम" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "यो सत्र जिनोम लगईन हुन्छ" + +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +msgid "GNOME dummy" +msgstr "जिनोम डम्मि" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "व्यल्यान्ड जिनोम" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "यो सत्र व्यल्यान्ड प्रोयोग गरि जिनोम लगईन हुन्छ" + +#: ../data/session-selector.ui.h:1 +msgid "Custom Session" +msgstr "अनुकूलन सत्र" -#: ../data/gnome-session.schemas.in.h:4 -msgid "" -"If enabled, gnome-session will save the session automatically. Otherwise, " -"the logout dialog will have an option to save the session." -msgstr "सक्षम भएमा, जिनोम-सत्रले आफैँ स्वचालित रूपमा बचत गर्दछ । अन्यथा सत्र बचत गर्न लगआउट बटनमा एउटा विकल्प हुनेछ ।" - -#: ../data/gnome-session.schemas.in.h:5 -msgid "Logout prompt" -msgstr "तत्काल लगआउट" - -#: ../data/gnome-session.schemas.in.h:6 -msgid "Preferred Image to use for login splash screen" -msgstr "स्प्लास पर्दामा लगइन गर्नका लागि प्रयोग गरिने रूचाइएको छवि" - -#: ../data/gnome-session.schemas.in.h:7 -msgid "Save sessions" -msgstr "सत्र बचत गर्नुहोस्" - -#: ../data/gnome-session.schemas.in.h:8 -msgid "Selected option in the log out dialog" -msgstr "लगआउट संवादमा चयन गरिएका विकल्प" - -#: ../data/gnome-session.schemas.in.h:9 -msgid "Show the splash screen" -msgstr "स्प्लास पर्दा देखाउनुहोस्" - -#: ../data/gnome-session.schemas.in.h:10 -msgid "Show the splash screen when the session starts up" -msgstr "सत्र सुरु हुदा स्प्लास पर्दा देखाउनुहोस्" +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +msgid "Please select a custom session to run" +msgstr "" -#: ../data/gnome-session.schemas.in.h:11 -msgid "" -"This is a relative path value based off the $datadir/pixmaps/ directory. Sub-" -"directories and image names are valid values. Changing this value will " -"effect the next session login." -msgstr "यो $datadir/pixmaps/ डाइरेक्टरी आधार नभएको सम्बन्धित मार्ग मान हो । उप-डाइरेक्टरी र छवि नाम वैध मान हुन् । यस मानको परिवर्तनले पछिल्लो सत्रको लगइनलाई प्रभाव पार्नेछ ।" +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "नया सत्र" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "सत्र हटाउनुहोस्" + +#: ../data/session-selector.ui.h:5 +msgid "Rena_me Session" +msgstr "सत्रको नाम फेर्ने" -#: ../data/gnome-session.schemas.in.h:12 -msgid "" -"This is the option that will be selected in the logout dialog, valid values " -"are \"logout\" for logging out, \"shutdown\" for halting the system and " -"\"restart\" for restarting the system." -msgstr "" -"यो लगआउट संवादमा चयन गरिने विकल्प हो, वैध मान " -"लगिङआउटका लागि \"लगआउट\" , प्रणाली रोक्न \"बन्द गर्नुहोस्\" र प्रणाली सुरु गर्न" -"\"फेरि सुरु गर्नुहोस्\" हुन् ।" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Configure your sessions" -msgstr "तपाईँको सत्र कन्फिगर गर्नुहोस्" - -#: ../data/session-properties.desktop.in.in.h:2 -#: ../gnome-session/session-properties-capplet.c:224 -msgid "Sessions" -msgstr "सत्र" +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "जारी राख्नुहोस्" -#: ../gnome-session/gsm-at-startup.c:39 -msgid "" -"Assistive technology support has been requested for this session, but the " -"accessibility registry was not found. Please ensure that the AT-SPI package " -"is installed. Your session has been started without assistive technology " -"support." -msgstr "यस सत्रका लागि मद्दत प्रविधि समर्थन अनुरोध गरिएको छ, तर मद्दत पहुँच दर्ता फेला परेन । कृपया AT-SPI प्याकेज स्थापना भएको निश्चित गर्नुहोस् । तपाईँको सत्र मद्दत प्रविधि समर्थन बिना सुरु भएको छ ।" - -#: ../gnome-session/gsm-client-editor.c:123 -msgid "_Order:" -msgstr "आदेश:" - -#: ../gnome-session/gsm-client-editor.c:125 -msgid "The order in which applications are started in the session." -msgstr "सत्रमा अनुप्रयोग सुरुआत गर्ने आदेश ।" - -#: ../gnome-session/gsm-client-editor.c:133 -msgid "What happens to the application when it exits." -msgstr "यो अवस्थित हुदा अनुप्रयोगमा के देखापर्दछ ।" - -#: ../gnome-session/gsm-client-editor.c:134 -msgid "_Style:" -msgstr "शैली:" - -#: ../gnome-session/gsm-client-list.c:44 -msgid "Inactive" -msgstr "निस्क्रिय" - -#: ../gnome-session/gsm-client-list.c:44 -msgid "Waiting to start or already finished." -msgstr "सुरुआतका लागि प्रतिक्षा गर्दैछ वा पहिले नै पूरा भएको छ ।" - -#: ../gnome-session/gsm-client-list.c:46 -msgid "Starting" -msgstr "सुरुआत" - -#: ../gnome-session/gsm-client-list.c:46 -msgid "Started but has not yet reported state." -msgstr "सुरुआत भएको छ तर स्थिति हालसम्म प्रतिवेदन गरिएको छैन ।" - -#: ../gnome-session/gsm-client-list.c:48 -msgid "Running" -msgstr "चलिरहेको" - -#: ../gnome-session/gsm-client-list.c:48 -msgid "A normal member of the session." -msgstr "सत्रको साधारण सदस्य ।" - -#: ../gnome-session/gsm-client-list.c:50 -msgid "Saving" -msgstr "बचत" - -#: ../gnome-session/gsm-client-list.c:50 -msgid "Saving session details." -msgstr "सत्र विवरण बचत ।" - -#. FIXME find better icon -#: ../gnome-session/gsm-client-list.c:53 -msgid "Unknown" -msgstr "अज्ञात" - -#: ../gnome-session/gsm-client-list.c:53 -msgid "State not reported within timeout." -msgstr "म्याद समाप्तीमा स्थिति प्रतिवेदन गरिएको छैन ।" - -#. FIXME find icon -#: ../gnome-session/gsm-client-list.c:60 -msgid "Normal" -msgstr "साधारण" - -#: ../gnome-session/gsm-client-list.c:60 -msgid "Unaffected by logouts but can die." -msgstr "लगआउटद्वारा प्रभावित भएन तर अन्त्य हुनसक्छ ।" - -#: ../gnome-session/gsm-client-list.c:62 -msgid "Restart" -msgstr "फेरि सुरु गर्नुहोस्" - -#: ../gnome-session/gsm-client-list.c:62 -msgid "Never allowed to die." -msgstr "अन्त्य गर्न कहिले पनि अनुमति नदिनुहोस् ।" - -#: ../gnome-session/gsm-client-list.c:64 -msgid "Trash" -msgstr "रद्दीटोकरी" - -#: ../gnome-session/gsm-client-list.c:64 -msgid "Discarded on logout and can die." -msgstr "लगआउट अस्वीकार गरियो र अन्त्य हुनसक्छ ।" - -#: ../gnome-session/gsm-client-list.c:66 -msgid "Settings" -msgstr "सेटिङ" - -#: ../gnome-session/gsm-client-list.c:66 -msgid "Always started on every login." -msgstr "सधैँ प्रत्येक लगइनमा सुरु गरिन्छ ।" - -#: ../gnome-session/gsm-client-list.c:190 -msgid "Order" -msgstr "आदेश" - -#: ../gnome-session/gsm-client-list.c:197 -msgid "Style" -msgstr "शैली" - -#: ../gnome-session/gsm-client-list.c:204 -msgid "State" -msgstr "स्थिति" - -#: ../gnome-session/gsm-client-list.c:211 -#: ../gnome-session/session-properties-capplet.c:283 -msgid "Program" -msgstr "कार्यक्रम" +#: ../data/session-properties.ui.h:1 +msgid "Additional startup _programs:" +msgstr "अतिरिक्त सुरुआत कार्यक्रम:" -#. -#. * it would be nice to have a dialog which either: -#. * -#. * 1. lets you change the message on it -#. * 2. lets you append messages and has a "history" -#. * -#. * for now, we just kill the old dialog and pop up a new one. -#. -#: ../gnome-session/gsm-gsd.c:45 -msgid "" -"There was an error starting the GNOME Settings Daemon.\n" -"\n" -"Some things, such as themes, sounds, or background settings may not work " -"correctly." +#: ../data/session-properties.ui.h:2 +msgid "Startup Programs" +msgstr "सुरुआत कार्यक्रम" + +#: ../data/session-properties.ui.h:3 +msgid "_Automatically remember running applications when logging out" +msgstr "लगआउट हुदा चलिरहेका अनुप्रयोग स्वत: याद गर्नुहोस्" + +#: ../data/session-properties.ui.h:4 +msgid "_Remember Currently Running Applications" +msgstr "हाल चलिरहेका अनुप्रयोग याद गर्नुहोस्" + +#: ../data/session-properties.ui.h:5 +msgid "Options" +msgstr "विकल्प" + +#: ../data/session-properties.ui.h:6 +msgid "Browse…" +msgstr "ब्राउज गर्नुहोस्" + +#: ../data/session-properties.ui.h:7 +msgid "Comm_ent:" +msgstr "टिप्पणी" + +#: ../data/session-properties.ui.h:8 +msgid "Co_mmand:" +msgstr " आदेश:" + +#: ../data/session-properties.ui.h:9 +msgid "_Name:" +msgstr "नाम:" + +#: ../gnome-session/gsm-fail-whale-dialog.c:323 +msgid "Oh no! Something has gone wrong." msgstr "" -"जिनोम सेटिङ डेइमोन सुरुआत गर्दा त्रुटि थियो ।\n" -"\n" -"केही विषयहरू, जस्तै; ध्वनि, वा पृष्टभूमि सेटिङले ठीक रूपमा कार्य नगर्न सक्छन् ।" -#: ../gnome-session/gsm-gsd.c:57 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" -"\n" -"\n" -"The last error message was:\n" -"\n" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" msgstr "" -"\n" -"\n" -"अन्तिम त्रुटि सन्देश यसरूपमा थियो:\n" -"\n" -#: ../gnome-session/gsm-gsd.c:62 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" -"\n" -"\n" -"GNOME will still try to restart the Settings Daemon next time you log in." +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." msgstr "" -"\n" -"\n" -"तपाईँले फेरि पछि लगइन गर्दा जिनोमले सेटिङ डेइमोन फेरि सुरु गर्ने प्रयास गर्नेछ ।" - -#: ../gnome-session/gsm-gsd.c:145 -msgid "The Settings Daemon restarted too many times." -msgstr "सेटिङ डेइमोन फेरि धेरै पटक सुरु हुनेछ ।" - -#. Name is mandatory and might not be set by the caller -#: ../gnome-session/gsm-keyfile.c:43 -msgid "No Name" -msgstr "नाम छैन" - -#: ../gnome-session/gnome-session-remove.c:50 -msgid "List registered clients, then exit" -msgstr "दर्ता गरिएका क्लाइन्ट सूचीबद्ध गर्नुहोस्, त्यसपछि बाहिरिनुहोस्" - -#: ../gnome-session/gnome-session-remove.c:52 -msgid "PROGRAM..." -msgstr "कार्यक्रम..." -#: ../gnome-session/gnome-session-remove.c:176 +#: ../gnome-session/gsm-fail-whale-dialog.c:334 msgid "" -"You must specify at least one program to remove. You can list the programs " -"with --list.\n" -msgstr "तपाईँले हटाउनका लागि कम्तिमा पनि एउटा कार्यक्रम निर्दिष्ट गर्नुपर्दछ । तपाईँले --सूचीसँग कार्यक्रम सूचीवद्ध गर्न सक्नुहुन्छ ।\n" - -#: ../gnome-session/gnome-session-remove.c:183 -msgid "Error: could not connect to the session manager\n" -msgstr "त्रुटि: सत्र प्रबन्धकमा जडान गर्न सकेन\n" - -#: ../gnome-session/gnome-session-remove.c:197 -msgid "Currently registered clients:\n" -msgstr "हालै दर्ता गरिएका क्लाइन्ट:\n" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." +msgstr "" -#: ../gnome-session/gnome-session-remove.c:207 -#, c-format -msgid "Couldn't find program %s in session\n" -msgstr "सत्रमा कार्यक्रम %s फेला पार्न सकेन\n" +#: ../gnome-session/gsm-fail-whale-dialog.c:349 +msgid "_Log Out" +msgstr "लगआउट" -#. At least try to tell the user something. -#: ../gnome-session/ice.c:355 -#, c-format -msgid "" -"The GNOME session manager cannot start properly. Please report this as a " -"GNOME bug. Please include this ICE failure message in the bug report: '%" -"s'. Meanwhile you could try logging in using the failsafe session." +#: ../gnome-session/gsm-fail-whale-dialog.c:371 ../gnome-session/main.c:307 +msgid "Enable debugging code" +msgstr "डिबगिङ सक्षम पार्नुहोस्" + +#: ../gnome-session/gsm-fail-whale-dialog.c:372 +msgid "Allow logout" +msgstr "लगआउट अनुमति दिनुहोस्" + +#: ../gnome-session/gsm-fail-whale-dialog.c:373 +#, fuzzy +msgid "Show extension warning" +msgstr "चेतावनी विकल्प देखाउनुहोस्" + +#: ../gnome-session/gsm-manager.c:1272 ../gnome-session/gsm-manager.c:2044 +msgid "Not responding" msgstr "" -"जिनोम सत्र प्रबन्धक राम्रोसँग सुरु गर्न सकिँदैन । कृपया यसलाई जिनोम बगका रूपमा प्रतिवेदन गर्नुहोस् । कृपया यस आईसीई(ICE) असफलता सन्देशलाई बग प्रतिवेदनमा समाविष्ट गर्नुहोस्: '%" -"s'. यही समयमा तपाईँले फेलसेफ सत्र प्रयोग गरेर लगइन गर्न सक्नुहुन्छ ।" -#: ../gnome-session/ice.c:511 -#, c-format -msgid "" -"The GNOME session manager was unable to lock the file '%s'. Please report " -"this as a GNOME bug. Sometimes this error may occur if the file's directory " -"is unwritable, you could try logging in via the failsafe session and " -"ensuring that it is." -msgstr "जिनोम सत्र प्रबन्धक फाइल '%s' ताल्चा लगाउन असफल भयो । कृपया यसलाई जिनोम बगका रूपमा प्रतिवेदन गर्नुहोस् । फाइलको डाइरेक्टरी लेख्न नसकिने भएमा यस प्रकारको त्रुटि कहिलेकाही उत्पन्न हुनसक्छ, तपाईँले फेलसेफ सत्रबाट लगइन गर्न र यो भएको निश्चित गर्न सक्नुहुन्छ ।" +#: ../gnome-session/gsm-util.c:411 +msgid "_Log out" +msgstr "लगआउट" -#: ../gnome-session/ice.c:538 -#, c-format +#. It'd be really surprising to reach this code: if we're here, +#. * then the XSMP client already has set several XSMP +#. * properties. But it could still be that SmProgram is not set. +#. +#: ../gnome-session/gsm-xsmp-client.c:559 +msgid "Remembered Application" +msgstr "सम्झिएको अनुप्रयोग" + +#: ../gnome-session/gsm-xsmp-client.c:1209 +msgid "This program is blocking logout." +msgstr "यो कार्यक्रमले लगआउट गर्न दिएन" + +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" -"The GNOME session manager was unable to read the file: '%s'. If this file " -"exists it must be readable by you for GNOME to work properly. Try logging " -"in with the failsafe session and removing this file." -msgstr "जिनोम सत्र प्रबन्धक फाइल पढ्न असमर्थ थियो: '%s'. यो फाइल अवस्थित भएमाजिनोमका लागि ठीक तरिकाले कार्य गर्न तपाईँले पढ्नयोग्य हुनुपर्दछ । फलसेफ सत्रसँग लगइन गर्ने प्रयास गर्नुहोस् र यस फाइललाई हटाउनुहोस् ।" +"Refusing new client connection because the session is currently being shut " +"down\n" +msgstr "" -#: ../gnome-session/ice.c:583 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format -msgid "" -"Could not write to file '%s'. This file must be writable in order for GNOME " -"to function properly. Try logging in with the failsafe session and removing " -"this file. Also make sure that the file's directory is writable." -msgstr "फाइल '%s'मा लेख्न सकेन । जिनोमले राम्रोसँग कार्य गर्न यो फाइल लेख्नयोग्य हुनुपर्दछ । फलसेफ सत्रसँग लगइन गर्ने प्रयास गर्नुहोस र यस फाइललाई हटाउनुहोस् । फाइलको डाइरेक्टरी लेख्नयोग्य भएको पनि निश्चित गर्नुहोस् ।" - -#: ../gnome-session/logout.c:372 -msgid "Are you sure you want to log out?" -msgstr "तपाईँ लगआउट गर्न निश्चित हुनुहुन्छ ?" - -#: ../gnome-session/logout.c:389 -msgid "Remember running applications" -msgstr "चलिरहेका अनुप्रयोग सम्झनुहोस्" - -#: ../gnome-session/logout.c:412 -msgid "Action" -msgstr "कार्य" +msgid "Could not create ICE listening socket: %s" +msgstr "" -#: ../gnome-session/logout.c:429 -msgid "_Log out" -msgstr "लगआउट" +#: ../gnome-session/main.c:305 +msgid "Override standard autostart directories" +msgstr "" -#: ../gnome-session/logout.c:436 -msgid "Sh_ut down" -msgstr "बन्द गर्नुहोस्" - -#: ../gnome-session/logout.c:444 -msgid "_Restart the computer" -msgstr "कम्प्युटर फेरि सुरु गर्नुहोस्" - -#: ../gnome-session/main.c:87 -msgid "Specify a session name to load" -msgstr "लोड गर्नका लागि सत्र नाम निर्दिष्ट गर्नुहोस्" - -#: ../gnome-session/main.c:87 ../gnome-session/gnome-session-save.c:48 -msgid "NAME" -msgstr "नाम" - -#: ../gnome-session/main.c:88 -msgid "Only read saved sessions from the default.session file" -msgstr "पुर्वनिर्धारित सत्र फाइलबाट मात्र बचत गरिएका सत्र पढ्नुहोस्" - -#: ../gnome-session/main.c:89 -msgid "Millisecond period spent waiting for clients to register (0=forever)" -msgstr "क्लाइन्टलाई रजिस्टर गर्नका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" - -#: ../gnome-session/main.c:89 ../gnome-session/main.c:90 -#: ../gnome-session/main.c:91 -msgid "DELAY" -msgstr "विलम्ब" - -#: ../gnome-session/main.c:90 -msgid "Millisecond period spent waiting for clients to respond (0=forever)" -msgstr "क्लाइन्टलाई प्रतिक्रिया दिनका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" - -#: ../gnome-session/main.c:91 -msgid "Millisecond period spent waiting for clients to die (0=forever)" -msgstr "क्लाइन्टलाई नष्ट गर्नका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" - -#: ../gnome-session/main.c:167 -msgid "This session is running as a privileged user" -msgstr "यो सत्र प्राथमिकता दिएको प्रयोगकर्ताका रूपमा चलिरहेको छ" +#: ../gnome-session/main.c:305 +msgid "AUTOSTART_DIR" +msgstr "AUTOSTART_DIR" + +#: ../gnome-session/main.c:306 +msgid "Session to use" +msgstr "प्रयोग गर्न सत्र " + +#: ../gnome-session/main.c:306 +msgid "SESSION_NAME" +msgstr "SESSION_NAME" -#: ../gnome-session/main.c:169 -msgid "" -"Running a session as a privileged user should be avoided for security " -"reasons. If possible, you should log in as a normal user." -msgstr "सूरक्षाका कारणले विशेषाधिकार दिइएको प्रयोगकर्ताको रूपमा चलिरहेको सत्रलाई परित्याग गरिएको हुनुपर्दछ । सम्भव भएमा, तपाईँले सामान्य प्रयोगकर्ताका रूपमा लगइन गर्नुपर्दछ ।" +#: ../gnome-session/main.c:308 +msgid "Do not load user-specified applications" +msgstr "" -#: ../gnome-session/main.c:173 -msgid "_Continue" -msgstr "जारी राख्नुहोस्" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "यो अनुप्रयोगको स‌सकरण" + +#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong +#: ../gnome-session/main.c:311 +msgid "Show the fail whale dialog for testing" +msgstr "" + +#: ../gnome-session/main.c:344 +msgid " - the GNOME session manager" +msgstr "GNOME सेसन प्रबन्धक" -#: ../gnome-session/main.c:220 +#: ../tools/gnome-session-inhibit.c:110 #, c-format msgid "" -"The session might encounter issues if the computer clock is not properly " -"configured. Please consider adjusting it.\n" +"%s [OPTION...] COMMAND\n" "\n" -"Current date is %s." -msgstr "" -"कम्प्युटर घडी ठीक रूपमा कन्फिगर गरिएको नभएमा सत्रले विभिन्न समस्या सामना गर्न सक्छ । कृपया यसलाई समायोजन गर्दा ध्यान दिनुहोस् ।\n" +"Execute COMMAND while inhibiting some session functionality.\n" "\n" -"हालको मिति %s हो ।" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" -#: ../gnome-session/main.c:338 +#: ../tools/gnome-session-inhibit.c:148 #, c-format -msgid "Failed to launch time configuration tool: %s" -msgstr "समय कन्फिगरेसन उपकरण सुरुआत गर्न असफल: %s" +msgid "Failed to execute %s\n" +msgstr "%s कार्यान्वयन गर्न असफल: \n" -#: ../gnome-session/main.c:369 -msgid "The computer clock appears to be wrong" -msgstr "कम्प्युटर घडी गलत हुने देखिन्छ" - -#: ../gnome-session/main.c:376 -msgid "_Ignore" -msgstr "उपेक्षा गर्नुहोस्" - -#: ../gnome-session/main.c:377 -msgid "_Adjust the Clock" -msgstr "घडी समायोजन गर्नुहोस्" +#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 +#: ../tools/gnome-session-inhibit.c:228 +#, c-format +msgid "%s requires an argument\n" +msgstr "%sलाई एउटा तर्क आवश्यक छ\n" -#: ../gnome-session/main.c:515 +#: ../tools/gnome-session-selector.c:62 #, c-format +msgid "Session %d" +msgstr "%d सत्र" + +#: ../tools/gnome-session-selector.c:108 msgid "" -"Could not look up internet address for %s.\n" -"This will prevent GNOME from operating correctly.\n" -"It may be possible to correct the problem by adding\n" -"%s to the file /etc/hosts." -msgstr "" -"%s का लागि इन्टरनेट ठगाना हेर्न सकेन ।\n" -"यसले जिनोमलाई ठीकसँग सञ्चालन हुनबाट बञ्चित गर्नेछ ।\n" -"file /etc/hosts\n" -"मा %s थपेर समस्या समाधान गर्न सम्भव हुनसक्छ ।" - -#: ../gnome-session/main.c:522 -msgid "Log in Anyway" -msgstr "जसरी पनि लगइन गर्नुहोस्" - -#: ../gnome-session/main.c:523 -msgid "Try Again" -msgstr "फेरि प्रयास गर्नुहोस्" - -#: ../gnome-session/main.c:651 -msgid "- Manage the GNOME session" -msgstr "- जिनोम सत्र प्रबन्ध गर्नुहोस्" - -#: ../gnome-session/manager.c:513 -msgid "Wait abandoned due to conflict." -msgstr "विवादका कारणले प्रतिक्षा परित्याग गरियो ।" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" -#: ../gnome-session/manager.c:1021 +#: ../tools/gnome-session-selector.c:112 +msgid "Session names are not allowed to start with ‘.’" +msgstr "" + +#: ../tools/gnome-session-selector.c:116 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "" + +#: ../tools/gnome-session-selector.c:124 #, c-format -msgid "No response to the %s command." -msgstr "आदेश %s लाई कुनै प्रतिक्रिया छैन ।" +msgid "A session named ‘%s’ already exists" +msgstr "‘%s’ सत्र पहिलेनै छ" + +#: ../tools/gnome-session-quit.c:53 +msgid "Log out" +msgstr "लगआउट" + +#: ../tools/gnome-session-quit.c:54 +msgid "Power off" +msgstr "पावर बन्द" + +#: ../tools/gnome-session-quit.c:55 +msgid "Reboot" +msgstr "फेरि सुरु गर्ने " -#: ../gnome-session/manager.c:1022 -msgid "The program may be slow, stopped or broken." -msgstr "कार्यक्रम ढीलो, रोकिएको वा विच्छेद गरिएको हुनसक्छ ।" - -#: ../gnome-session/manager.c:1023 -msgid "You may wait for it to respond or remove it." -msgstr "यसलाई प्रतिक्रिया दिन वा हटाउन तपाईँले प्रतिक्षा गर्नुपर्न सक्छ ।" - -#: ../gnome-session/manager.c:1749 -msgid "Restart abandoned due to failures." -msgstr "असफलताको कारणले फेरि सरुआत गर्न परित्याग गरियो ।" - -#: ../gnome-session/manager.c:1945 -msgid "A session shutdown is in progress." -msgstr "बन्द गर्ने सत्र प्रगतिमा छ ।" - -#: ../gnome-session/gnome-session-save.c:48 -msgid "Set the current session name" -msgstr "हालको सत्रनाम सेट गर्नुहोस्" - -#: ../gnome-session/gnome-session-save.c:49 -msgid "Kill session" -msgstr "सत्र अन्त्य गर्नुहोस्" - -#: ../gnome-session/gnome-session-save.c:50 -msgid "Use dialog boxes for errors" -msgstr "त्रुटिका लागि संवाद बाकस प्रयोग गर्नुहोस्" - -#: ../gnome-session/gnome-session-save.c:51 -msgid "Do not require confirmation" -msgstr "यकीन आवश्यक छैन" +#: ../tools/gnome-session-quit.c:56 +msgid "Ignoring any existing inhibitors" +msgstr "" + +#: ../tools/gnome-session-quit.c:57 +#, fuzzy +#| msgid "Do not require confirmation" +msgid "Don't prompt for user confirmation" +msgstr "प्रयोगकर्ताले मेट्दा प्रवर्धन गर्नुहोस्" -#: ../gnome-session/gnome-session-save.c:149 -#: ../gnome-session/gnome-session-save.c:186 +#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 msgid "Could not connect to the session manager" msgstr "सत्र प्रबन्धकमा जडान गर्न सकेन" -#: ../gnome-session/gnome-session-save.c:172 -msgid "- Save the current session" -msgstr "- हालको सत्र बचत गर्नुहोस्" - -#: ../gnome-session/session-properties-capplet.c:154 -msgid "Save changes to the current session before closing?" -msgstr "हालको सत्र बन्द गर्नुभन्दा पहिला यसका परिवर्तन बचत गर्नुहुन्छ ?" - -#: ../gnome-session/session-properties-capplet.c:156 -msgid "If you don't save, changes will be discarded." -msgstr "तपाईँले बचत नगरेमा, परिवर्तन परित्याग गरिन्छन् ।" - -#: ../gnome-session/session-properties-capplet.c:159 -msgid "_Close without Saving" -msgstr "बचत नगरी बन्द गर्नुहोस्" +#: ../tools/gnome-session-quit.c:203 +msgid "Program called with conflicting options" +msgstr "" -#: ../gnome-session/session-properties-capplet.c:250 -msgid "Additional startup _programs:" -msgstr "अतिरिक्त सुरुआत कार्यक्रम:" +#~ msgid "Allow TCP connections" +#~ msgstr "टीसीपी (TCP) जडानलाई अनुमति दिनुहोस्" -#: ../gnome-session/session-properties-capplet.c:274 -msgid "Enabled" -msgstr "सक्षम" +#~ msgid "" +#~ "For security reasons, on platforms which have _IceTcpTransNoListen() " +#~ "(XFree86 systems), gnome-session does not listen for connections on TCP " +#~ "ports. This option will allow connections from (authorized) remote hosts. " +#~ "gnome-session must be restarted for this to take effect." +#~ msgstr "" +#~ "सूरक्षाका कारणले, _IceTcpTransNoListen() (XFree86 प्रणाली) भएको प्लेटफर्ममा, " +#~ "टीसीपी(TCP) पोर्टको जडानका जिनोम सत्रले ध्यान दिदैन । यस विकल्पले (आधिकारीक) " +#~ "टाढाको होस्टबाट जडानलाई अनुमति दिन्छ ।यसको प्रभाव देखिनका लागि जिनोम-सत्र फेरि " +#~ "सुरु गर्नुपर्दछ ।" -#: ../gnome-session/session-properties-capplet.c:322 -msgid "Startup Programs" -msgstr "सुरुआत कार्यक्रम" +#~ msgid "" +#~ "If enabled, gnome-session will prompt the user before ending a session." +#~ msgstr "" +#~ "सक्षम भएमा, जिनोम सत्रले सत्र अन्त्य हुनुभन्दा पहिला प्रयोगकर्तालाई प्रोत्साहन दिन्छ ।" -#: ../gnome-session/session-properties-capplet.c:328 -msgid "Current Session" -msgstr "हालको सत्र" +#~ msgid "" +#~ "If enabled, gnome-session will save the session automatically. Otherwise, " +#~ "the logout dialog will have an option to save the session." +#~ msgstr "" +#~ "सक्षम भएमा, जिनोम-सत्रले आफैँ स्वचालित रूपमा बचत गर्दछ । अन्यथा सत्र बचत गर्न लगआउट " +#~ "बटनमा एउटा विकल्प हुनेछ ।" -#: ../gnome-session/session-properties-capplet.c:341 -msgid "_Automatically remember running applications when logging out" -msgstr "लगआउट हुदा चलिरहेका अनुप्रयोग स्वत: याद गर्नुहोस्" +#~ msgid "Logout prompt" +#~ msgstr "तत्काल लगआउट" -#: ../gnome-session/session-properties-capplet.c:356 -msgid "_Remember currently running applications" -msgstr "हाल चलिरहेका अनुप्रयोग याद गर्नुहोस्" +#~ msgid "Preferred Image to use for login splash screen" +#~ msgstr "स्प्लास पर्दामा लगइन गर्नका लागि प्रयोग गरिने रूचाइएको छवि" -#: ../gnome-session/session-properties-capplet.c:364 -msgid "Session Options" -msgstr "सत्र विकल्प" - -#: ../gnome-session/session-properties-capplet.c:460 -msgid "Your session has been saved." -msgstr "तपाईँको सत्र बचत गरिएको छ ।" - -#: ../gnome-session/session-properties-capplet.c:503 -msgid "could not connect to the session manager\n" -msgstr "सत्र प्रबन्धकमा जडान गर्न सकेन\n" - -#: ../gnome-session/session-properties-capplet.c:509 -msgid "session manager does not support GNOME extensions\n" -msgstr "सत्र प्रबन्धकले जिनोम विस्तार समर्थन गर्दैन\n" - -#: ../gnome-session/session-properties.c:51 -msgid "Remove the currently selected client from the session." -msgstr "सत्रबाट हाल चयन गरिएको क्लाइन्ट हटाउनुहोस् ।" - -#: ../gnome-session/session-properties.c:57 -msgid "Apply changes to the current session" -msgstr "हालको सत्रमा परिवर्तन लागू गर्नुहोस्" - -#: ../gnome-session/session-properties.c:63 -msgid "The list of programs in the session." -msgstr "सत्रका कार्यक्रमको सूची ।" - -#: ../gnome-session/session-properties.c:90 -msgid "Currently running _programs:" -msgstr "हाल चलिरहेका कार्यक्रम:" - -#: ../gnome-session/splash-widget.c:44 -msgid "Sawfish Window Manager" -msgstr "सफिस सञ्झ्याल प्रबन्धक" - -#: ../gnome-session/splash-widget.c:45 -msgid "Metacity Window Manager" -msgstr "मेटासिटी सञ्झ्याल प्रबन्धक" - -#: ../gnome-session/splash-widget.c:46 -msgid "Window Manager" -msgstr "सञ्झ्याल प्रबन्धक" - -#: ../gnome-session/splash-widget.c:47 -msgid "The Panel" -msgstr "प्यानल" - -#: ../gnome-session/splash-widget.c:48 -msgid "Nautilus" -msgstr "नटिलस" - -#: ../gnome-session/splash-widget.c:49 -msgid "Desktop Settings" -msgstr "डेस्कटप सेटिङ" - -#: ../gnome-session/startup-programs.c:351 -msgid "No description" -msgstr "वर्णन छैन" +#~ msgid "Selected option in the log out dialog" +#~ msgstr "लगआउट संवादमा चयन गरिएका विकल्प" -#: ../gnome-session/startup-programs.c:470 -msgid "_Name:" -msgstr "नाम:" +#~ msgid "Show the splash screen" +#~ msgstr "स्प्लास पर्दा देखाउनुहोस्" + +#~ msgid "Show the splash screen when the session starts up" +#~ msgstr "सत्र सुरु हुदा स्प्लास पर्दा देखाउनुहोस्" + +#~ msgid "" +#~ "This is a relative path value based off the $datadir/pixmaps/ directory. " +#~ "Sub-directories and image names are valid values. Changing this value " +#~ "will effect the next session login." +#~ msgstr "" +#~ "यो $datadir/pixmaps/ डाइरेक्टरी आधार नभएको सम्बन्धित मार्ग मान हो । उप-" +#~ "डाइरेक्टरी र छवि नाम वैध मान हुन् । यस मानको परिवर्तनले पछिल्लो सत्रको लगइनलाई " +#~ "प्रभाव पार्नेछ ।" + +#~ msgid "" +#~ "This is the option that will be selected in the logout dialog, valid " +#~ "values are \"logout\" for logging out, \"shutdown\" for halting the " +#~ "system and \"restart\" for restarting the system." +#~ msgstr "" +#~ "यो लगआउट संवादमा चयन गरिने विकल्प हो, वैध मान लगिङआउटका लागि \"लगआउट\" , " +#~ "प्रणाली रोक्न \"बन्द गर्नुहोस्\" र प्रणाली सुरु गर्न\"फेरि सुरु गर्नुहोस्\" हुन् ।" + +#~ msgid "Configure your sessions" +#~ msgstr "तपाईँको सत्र कन्फिगर गर्नुहोस्" + +#~ msgid "" +#~ "Assistive technology support has been requested for this session, but the " +#~ "accessibility registry was not found. Please ensure that the AT-SPI " +#~ "package is installed. Your session has been started without assistive " +#~ "technology support." +#~ msgstr "" +#~ "यस सत्रका लागि मद्दत प्रविधि समर्थन अनुरोध गरिएको छ, तर मद्दत पहुँच दर्ता फेला परेन " +#~ "। कृपया AT-SPI प्याकेज स्थापना भएको निश्चित गर्नुहोस् । तपाईँको सत्र मद्दत प्रविधि " +#~ "समर्थन बिना सुरु भएको छ ।" + +#~ msgid "_Order:" +#~ msgstr "आदेश:" + +#~ msgid "The order in which applications are started in the session." +#~ msgstr "सत्रमा अनुप्रयोग सुरुआत गर्ने आदेश ।" + +#~ msgid "What happens to the application when it exits." +#~ msgstr "यो अवस्थित हुदा अनुप्रयोगमा के देखापर्दछ ।" + +#~ msgid "_Style:" +#~ msgstr "शैली:" + +#~ msgid "Inactive" +#~ msgstr "निस्क्रिय" + +#~ msgid "Waiting to start or already finished." +#~ msgstr "सुरुआतका लागि प्रतिक्षा गर्दैछ वा पहिले नै पूरा भएको छ ।" + +#~ msgid "Starting" +#~ msgstr "सुरुआत" + +#~ msgid "Started but has not yet reported state." +#~ msgstr "सुरुआत भएको छ तर स्थिति हालसम्म प्रतिवेदन गरिएको छैन ।" + +#~ msgid "Running" +#~ msgstr "चलिरहेको" + +#~ msgid "A normal member of the session." +#~ msgstr "सत्रको साधारण सदस्य ।" + +#~ msgid "Saving" +#~ msgstr "बचत" + +#~ msgid "Saving session details." +#~ msgstr "सत्र विवरण बचत ।" + +#~ msgid "Unknown" +#~ msgstr "अज्ञात" + +#~ msgid "State not reported within timeout." +#~ msgstr "म्याद समाप्तीमा स्थिति प्रतिवेदन गरिएको छैन ।" + +#~ msgid "Normal" +#~ msgstr "साधारण" + +#~ msgid "Unaffected by logouts but can die." +#~ msgstr "लगआउटद्वारा प्रभावित भएन तर अन्त्य हुनसक्छ ।" + +#~ msgid "Restart" +#~ msgstr "फेरि सुरु गर्नुहोस्" + +#~ msgid "Never allowed to die." +#~ msgstr "अन्त्य गर्न कहिले पनि अनुमति नदिनुहोस् ।" + +#~ msgid "Trash" +#~ msgstr "रद्दीटोकरी" + +#~ msgid "Discarded on logout and can die." +#~ msgstr "लगआउट अस्वीकार गरियो र अन्त्य हुनसक्छ ।" + +#~ msgid "Settings" +#~ msgstr "सेटिङ" + +#~ msgid "Always started on every login." +#~ msgstr "सधैँ प्रत्येक लगइनमा सुरु गरिन्छ ।" + +#~ msgid "Order" +#~ msgstr "आदेश" + +#~ msgid "Style" +#~ msgstr "शैली" + +#~ msgid "State" +#~ msgstr "स्थिति" + +#~ msgid "Program" +#~ msgstr "कार्यक्रम" + +#~ msgid "" +#~ "There was an error starting the GNOME Settings Daemon.\n" +#~ "\n" +#~ "Some things, such as themes, sounds, or background settings may not work " +#~ "correctly." +#~ msgstr "" +#~ "जिनोम सेटिङ डेइमोन सुरुआत गर्दा त्रुटि थियो ।\n" +#~ "\n" +#~ "केही विषयहरू, जस्तै; ध्वनि, वा पृष्टभूमि सेटिङले ठीक रूपमा कार्य नगर्न सक्छन् ।" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "The last error message was:\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "अन्तिम त्रुटि सन्देश यसरूपमा थियो:\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "\n" +#~ "GNOME will still try to restart the Settings Daemon next time you log in." +#~ msgstr "" +#~ "\n" +#~ "\n" +#~ "तपाईँले फेरि पछि लगइन गर्दा जिनोमले सेटिङ डेइमोन फेरि सुरु गर्ने प्रयास गर्नेछ ।" + +#~ msgid "The Settings Daemon restarted too many times." +#~ msgstr "सेटिङ डेइमोन फेरि धेरै पटक सुरु हुनेछ ।" + +#~ msgid "No Name" +#~ msgstr "नाम छैन" + +#~ msgid "List registered clients, then exit" +#~ msgstr "दर्ता गरिएका क्लाइन्ट सूचीबद्ध गर्नुहोस्, त्यसपछि बाहिरिनुहोस्" + +#~ msgid "PROGRAM..." +#~ msgstr "कार्यक्रम..." + +#~ msgid "" +#~ "You must specify at least one program to remove. You can list the " +#~ "programs with --list.\n" +#~ msgstr "" +#~ "तपाईँले हटाउनका लागि कम्तिमा पनि एउटा कार्यक्रम निर्दिष्ट गर्नुपर्दछ । तपाईँले --" +#~ "सूचीसँग कार्यक्रम सूचीवद्ध गर्न सक्नुहुन्छ ।\n" + +#~ msgid "Error: could not connect to the session manager\n" +#~ msgstr "त्रुटि: सत्र प्रबन्धकमा जडान गर्न सकेन\n" + +#~ msgid "Currently registered clients:\n" +#~ msgstr "हालै दर्ता गरिएका क्लाइन्ट:\n" + +#~ msgid "Couldn't find program %s in session\n" +#~ msgstr "सत्रमा कार्यक्रम %s फेला पार्न सकेन\n" + +#~ msgid "" +#~ "The GNOME session manager cannot start properly. Please report this as a " +#~ "GNOME bug. Please include this ICE failure message in the bug report: " +#~ "'%s'. Meanwhile you could try logging in using the failsafe session." +#~ msgstr "" +#~ "जिनोम सत्र प्रबन्धक राम्रोसँग सुरु गर्न सकिँदैन । कृपया यसलाई जिनोम बगका रूपमा " +#~ "प्रतिवेदन गर्नुहोस् । कृपया यस आईसीई(ICE) असफलता सन्देशलाई बग प्रतिवेदनमा समाविष्ट " +#~ "गर्नुहोस्: '%s'. यही समयमा तपाईँले फेलसेफ सत्र प्रयोग गरेर लगइन गर्न सक्नुहुन्छ ।" + +#~ msgid "" +#~ "The GNOME session manager was unable to lock the file '%s'. Please " +#~ "report this as a GNOME bug. Sometimes this error may occur if the file's " +#~ "directory is unwritable, you could try logging in via the failsafe " +#~ "session and ensuring that it is." +#~ msgstr "" +#~ "जिनोम सत्र प्रबन्धक फाइल '%s' ताल्चा लगाउन असफल भयो । कृपया यसलाई जिनोम बगका " +#~ "रूपमा प्रतिवेदन गर्नुहोस् । फाइलको डाइरेक्टरी लेख्न नसकिने भएमा यस प्रकारको त्रुटि " +#~ "कहिलेकाही उत्पन्न हुनसक्छ, तपाईँले फेलसेफ सत्रबाट लगइन गर्न र यो भएको निश्चित गर्न " +#~ "सक्नुहुन्छ ।" + +#~ msgid "" +#~ "The GNOME session manager was unable to read the file: '%s'. If this " +#~ "file exists it must be readable by you for GNOME to work properly. Try " +#~ "logging in with the failsafe session and removing this file." +#~ msgstr "" +#~ "जिनोम सत्र प्रबन्धक फाइल पढ्न असमर्थ थियो: '%s'. यो फाइल अवस्थित भएमाजिनोमका " +#~ "लागि ठीक तरिकाले कार्य गर्न तपाईँले पढ्नयोग्य हुनुपर्दछ । फलसेफ सत्रसँग लगइन गर्ने " +#~ "प्रयास गर्नुहोस् र यस फाइललाई हटाउनुहोस् ।" + +#~ msgid "" +#~ "Could not write to file '%s'. This file must be writable in order for " +#~ "GNOME to function properly. Try logging in with the failsafe session and " +#~ "removing this file. Also make sure that the file's directory is writable." +#~ msgstr "" +#~ "फाइल '%s'मा लेख्न सकेन । जिनोमले राम्रोसँग कार्य गर्न यो फाइल लेख्नयोग्य हुनुपर्दछ । " +#~ "फलसेफ सत्रसँग लगइन गर्ने प्रयास गर्नुहोस र यस फाइललाई हटाउनुहोस् । फाइलको डाइरेक्टरी " +#~ "लेख्नयोग्य भएको पनि निश्चित गर्नुहोस् ।" + +#~ msgid "Are you sure you want to log out?" +#~ msgstr "तपाईँ लगआउट गर्न निश्चित हुनुहुन्छ ?" + +#~ msgid "Action" +#~ msgstr "कार्य" + +#~ msgid "Sh_ut down" +#~ msgstr "बन्द गर्नुहोस्" + +#~ msgid "_Restart the computer" +#~ msgstr "कम्प्युटर फेरि सुरु गर्नुहोस्" + +#~ msgid "Specify a session name to load" +#~ msgstr "लोड गर्नका लागि सत्र नाम निर्दिष्ट गर्नुहोस्" + +#~ msgid "NAME" +#~ msgstr "नाम" + +#~ msgid "Only read saved sessions from the default.session file" +#~ msgstr "पुर्वनिर्धारित सत्र फाइलबाट मात्र बचत गरिएका सत्र पढ्नुहोस्" + +#~ msgid "Millisecond period spent waiting for clients to register (0=forever)" +#~ msgstr "क्लाइन्टलाई रजिस्टर गर्नका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" + +#~ msgid "DELAY" +#~ msgstr "विलम्ब" + +#~ msgid "Millisecond period spent waiting for clients to respond (0=forever)" +#~ msgstr "क्लाइन्टलाई प्रतिक्रिया दिनका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" + +#~ msgid "Millisecond period spent waiting for clients to die (0=forever)" +#~ msgstr "क्लाइन्टलाई नष्ट गर्नका लागि प्रतिक्षा गरेको समय मिलिसेकेन्डमा (०=सधैँ)" + +#~ msgid "This session is running as a privileged user" +#~ msgstr "यो सत्र प्राथमिकता दिएको प्रयोगकर्ताका रूपमा चलिरहेको छ" + +#~ msgid "" +#~ "Running a session as a privileged user should be avoided for security " +#~ "reasons. If possible, you should log in as a normal user." +#~ msgstr "" +#~ "सूरक्षाका कारणले विशेषाधिकार दिइएको प्रयोगकर्ताको रूपमा चलिरहेको सत्रलाई परित्याग " +#~ "गरिएको हुनुपर्दछ । सम्भव भएमा, तपाईँले सामान्य प्रयोगकर्ताका रूपमा लगइन गर्नुपर्दछ ।" + +#~ msgid "" +#~ "The session might encounter issues if the computer clock is not properly " +#~ "configured. Please consider adjusting it.\n" +#~ "\n" +#~ "Current date is %s." +#~ msgstr "" +#~ "कम्प्युटर घडी ठीक रूपमा कन्फिगर गरिएको नभएमा सत्रले विभिन्न समस्या सामना गर्न सक्छ । " +#~ "कृपया यसलाई समायोजन गर्दा ध्यान दिनुहोस् ।\n" +#~ "\n" +#~ "हालको मिति %s हो ।" + +#~ msgid "Failed to launch time configuration tool: %s" +#~ msgstr "समय कन्फिगरेसन उपकरण सुरुआत गर्न असफल: %s" + +#~ msgid "The computer clock appears to be wrong" +#~ msgstr "कम्प्युटर घडी गलत हुने देखिन्छ" + +#~ msgid "_Ignore" +#~ msgstr "उपेक्षा गर्नुहोस्" + +#~ msgid "_Adjust the Clock" +#~ msgstr "घडी समायोजन गर्नुहोस्" + +#~ msgid "" +#~ "Could not look up internet address for %s.\n" +#~ "This will prevent GNOME from operating correctly.\n" +#~ "It may be possible to correct the problem by adding\n" +#~ "%s to the file /etc/hosts." +#~ msgstr "" +#~ "%s का लागि इन्टरनेट ठगाना हेर्न सकेन ।\n" +#~ "यसले जिनोमलाई ठीकसँग सञ्चालन हुनबाट बञ्चित गर्नेछ ।\n" +#~ "file /etc/hosts\n" +#~ "मा %s थपेर समस्या समाधान गर्न सम्भव हुनसक्छ ।" + +#~ msgid "Log in Anyway" +#~ msgstr "जसरी पनि लगइन गर्नुहोस्" + +#~ msgid "Try Again" +#~ msgstr "फेरि प्रयास गर्नुहोस्" + +#~ msgid "Wait abandoned due to conflict." +#~ msgstr "विवादका कारणले प्रतिक्षा परित्याग गरियो ।" + +#~ msgid "No response to the %s command." +#~ msgstr "आदेश %s लाई कुनै प्रतिक्रिया छैन ।" + +#~ msgid "The program may be slow, stopped or broken." +#~ msgstr "कार्यक्रम ढीलो, रोकिएको वा विच्छेद गरिएको हुनसक्छ ।" + +#~ msgid "You may wait for it to respond or remove it." +#~ msgstr "यसलाई प्रतिक्रिया दिन वा हटाउन तपाईँले प्रतिक्षा गर्नुपर्न सक्छ ।" + +#~ msgid "Restart abandoned due to failures." +#~ msgstr "असफलताको कारणले फेरि सरुआत गर्न परित्याग गरियो ।" + +#~ msgid "A session shutdown is in progress." +#~ msgstr "बन्द गर्ने सत्र प्रगतिमा छ ।" + +#~ msgid "Set the current session name" +#~ msgstr "हालको सत्रनाम सेट गर्नुहोस्" + +#~ msgid "Kill session" +#~ msgstr "सत्र अन्त्य गर्नुहोस्" + +#~ msgid "Use dialog boxes for errors" +#~ msgstr "त्रुटिका लागि संवाद बाकस प्रयोग गर्नुहोस्" + +#~ msgid "- Save the current session" +#~ msgstr "- हालको सत्र बचत गर्नुहोस्" + +#~ msgid "Save changes to the current session before closing?" +#~ msgstr "हालको सत्र बन्द गर्नुभन्दा पहिला यसका परिवर्तन बचत गर्नुहुन्छ ?" + +#~ msgid "If you don't save, changes will be discarded." +#~ msgstr "तपाईँले बचत नगरेमा, परिवर्तन परित्याग गरिन्छन् ।" + +#~ msgid "_Close without Saving" +#~ msgstr "बचत नगरी बन्द गर्नुहोस्" + +#~ msgid "Enabled" +#~ msgstr "सक्षम" + +#~ msgid "Your session has been saved." +#~ msgstr "तपाईँको सत्र बचत गरिएको छ ।" + +#~ msgid "could not connect to the session manager\n" +#~ msgstr "सत्र प्रबन्धकमा जडान गर्न सकेन\n" + +#~ msgid "session manager does not support GNOME extensions\n" +#~ msgstr "सत्र प्रबन्धकले जिनोम विस्तार समर्थन गर्दैन\n" + +#~ msgid "Remove the currently selected client from the session." +#~ msgstr "सत्रबाट हाल चयन गरिएको क्लाइन्ट हटाउनुहोस् ।" + +#~ msgid "Apply changes to the current session" +#~ msgstr "हालको सत्रमा परिवर्तन लागू गर्नुहोस्" + +#~ msgid "The list of programs in the session." +#~ msgstr "सत्रका कार्यक्रमको सूची ।" + +#~ msgid "Currently running _programs:" +#~ msgstr "हाल चलिरहेका कार्यक्रम:" + +#~ msgid "Sawfish Window Manager" +#~ msgstr "सफिस सञ्झ्याल प्रबन्धक" + +#~ msgid "Metacity Window Manager" +#~ msgstr "मेटासिटी सञ्झ्याल प्रबन्धक" + +#~ msgid "Window Manager" +#~ msgstr "सञ्झ्याल प्रबन्धक" + +#~ msgid "The Panel" +#~ msgstr "प्यानल" + +#~ msgid "Nautilus" +#~ msgstr "नटिलस" + +#~ msgid "Desktop Settings" +#~ msgstr "डेस्कटप सेटिङ" + +#~ msgid "No description" +#~ msgstr "वर्णन छैन" + +#~ msgid "The name of the startup program cannot be empty" +#~ msgstr "सुरुआत कार्यक्रमको नामलाई खाली गर्न सकिँदैन" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "सुरुआत आदेशलाई खाली गर्न सकिदैँन" + +#~ msgid "The startup command is not valid" +#~ msgstr "सुरुआत आदेश वैध छैन" -#: ../gnome-session/startup-programs.c:488 -msgid "_Command:" -msgstr "आदेश:" - -#: ../gnome-session/startup-programs.c:502 -msgid "_Browse..." -msgstr "ब्राउज..." - -#: ../gnome-session/startup-programs.c:515 -msgid "Co_mment:" -msgstr "टिप्पणी:" - -#: ../gnome-session/startup-programs.c:545 -msgid "The name of the startup program cannot be empty" -msgstr "सुरुआत कार्यक्रमको नामलाई खाली गर्न सकिँदैन" - -#: ../gnome-session/startup-programs.c:547 -msgid "The startup command cannot be empty" -msgstr "सुरुआत आदेशलाई खाली गर्न सकिदैँन" - -#: ../gnome-session/startup-programs.c:553 -msgid "The startup command is not valid" -msgstr "सुरुआत आदेश वैध छैन" - -#: ../gnome-session/startup-programs.c:610 -msgid "New Startup Program" -msgstr "नयाँ सुरुआत कार्यक्रम" - -#: ../gnome-session/startup-programs.c:654 -msgid "Edit Startup Program" -msgstr "सुरुआत कार्यक्रम सम्पादन गर्नुहोस्" +#~ msgid "New Startup Program" +#~ msgstr "नयाँ सुरुआत कार्यक्रम" +#~ msgid "Edit Startup Program" +#~ msgstr "सुरुआत कार्यक्रम सम्पादन गर्नुहोस्" diff -Nru gnome-session-3.9.90/po/nl.po gnome-session-3.14.0/po/nl.po --- gnome-session-3.9.90/po/nl.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/nl.po 2014-06-25 18:06:34.000000000 +0000 @@ -11,7 +11,7 @@ # Huib Kleinhout , 2002. # Ronald Hummelink , 2002. # Jeroen van der Vegt , 2002. -# Reinout van Schouwen , 2003. +# Reinout van Schouwen , 2003, 2013. (na 10 jaar!) # Tino Meinen 2005, 2006, 2008. # Wouter Bolsterlee , 2007–2013. # @@ -21,9 +21,9 @@ msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-23 23:31+0100\n" -"PO-Revision-Date: 2013-03-23 23:30+0100\n" -"Last-Translator: Wouter Bolsterlee \n" +"POT-Creation-Date: 2013-09-22 00:08+0200\n" +"PO-Revision-Date: 2013-09-22 00:10+0100\n" +"Last-Translator: Reinout van Schouwen \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -52,31 +52,31 @@ msgid "The startup command is not valid" msgstr "De opstartopdracht is ongeldig" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Ingeschakeld" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Pictogram" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programma" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Voorkeuren opstarttoepassingen" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Naamloos" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Geen beschrijving" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versie van deze toepassing" @@ -84,14 +84,6 @@ msgid "Could not display help document" msgstr "Kon hulpdocument niet weergeven" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "Gnome" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Deze sessie laat u in Gnome inloggen" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Aangepast" @@ -100,10 +92,35 @@ msgid "This entry lets you select a saved session" msgstr "Hiermee kunt u een opgeslagen sessie selecteren" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "Gnome" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Deze sessie laat u in Gnome inloggen" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Gnome dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Opstarttoepassingen" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Toepassingen kiezen die bij aanmelden opgestart worden" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Gnome op Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Deze sessie laat u in Gnome inloggen, met gebruik van Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Aangepaste sessie" @@ -128,18 +145,6 @@ msgid "_Continue" msgstr "_Doorgaan" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Er zijn nog toepassingen actief:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Opstarttoepassingen" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Toepassingen kiezen die bij aanmelden opgestart worden" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Extra te starten _programma's:" @@ -251,11 +256,11 @@ msgid "Show session management options" msgstr "Sessiebeheeropties tonen" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Oeps! Er is iets misgegaan." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -263,7 +268,7 @@ "Er is een probleem opgetreden dat het systeem niet kan herstellen. Neem " "contact op met een systeembeheerder." -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -271,7 +276,7 @@ "Er is een probleem opgetreden dat het systeem niet kan herstellen. Alle " "uitbreidingen zijn uit voorzorg uitgeschakeld." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -279,143 +284,23 @@ "Er is een probleem opgetreden dat het systeem niet kan herstellen.\n" "Probeer af te melden en opnieuw aan te melden." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Afmelden" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Debugging-code inschakelen" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Afmelden toestaan" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Waarschuwingen van uitbreidingen tonen" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Onbekend" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Er is nog een toepassing actief:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Wachten totdat de toepassing geëindigd is. Het onderbreken van de toepassing " -"kan er toe leiden dat er werk verloren gaat." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Wachten totdat de toepassingen geëindigd zijn. Het onderbreken van " -"toepassingen kan er toe leiden dat er werk verloren gaat." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Toch gebruiker _wisselen" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Toch afmelden" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Toch in pauzestand" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Toch in _slaapstand" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Toch afsluiten" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Toch herstarten" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Beeldscherm vergrendelen" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Annuleren" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Over %d seconde wordt u automatisch afgemeld." -msgstr[1] "Over %d seconden wordt u automatisch afgemeld." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Over %d seconde wordt de computer automatisch afgesloten." -msgstr[1] "Over %d seconden wordt de computer automatisch afgesloten." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Over %d seconde wordt de computer automatisch opnieuw opgestart." -msgstr[1] "Over %d seconden wordt de computer automatisch opnieuw opgestart." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "U bent momenteel aangemeld onder de naam ‘%s’." - -# afsluiten/uitschakelen/uitzetten -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Afmelden van deze computer?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "Gebruiker _wisselen" - -# afsluiten/uitschakelen/uitzetten -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Deze computer uitzetten?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Pauzestand" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Slaapstand" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Opnieuw opstarten" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Uitzetten" - -# afsluiten/uitschakelen/uitzetten -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Deze computer opnieuw opstarten?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Reageert niet" @@ -428,11 +313,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Onthouden toepassingen" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Deze toepassing verhindert het afmelden." @@ -450,32 +335,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Kon geen luister-socket voor ICE aanmaken: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Map voor automatisch te starten toepassingen" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_MAP" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Te gebruiken sessie" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NAAM_VAN_SESSIE" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Geen toepassingen laden die door de gebruiker opgegeven zijn" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Het misvis-venster tonen voor testen" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " — het Gnome-sessiebeheer" @@ -575,8 +460,98 @@ msgid "Program called with conflicting options" msgstr "Toepassing aangeroepen met conflicterende opties" -#~ msgid "GNOME fallback" -#~ msgstr "Gnome (terugval)" +#~ msgid "Some programs are still running:" +#~ msgstr "Er zijn nog toepassingen actief:" + +#~ msgid "Unknown" +#~ msgstr "Onbekend" + +#~ msgid "A program is still running:" +#~ msgstr "Er is nog een toepassing actief:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Wachten totdat de toepassing geëindigd is. Het onderbreken van de " +#~ "toepassing kan er toe leiden dat er werk verloren gaat." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Wachten totdat de toepassingen geëindigd zijn. Het onderbreken van " +#~ "toepassingen kan er toe leiden dat er werk verloren gaat." + +#~ msgid "Switch User Anyway" +#~ msgstr "Toch gebruiker _wisselen" + +#~ msgid "Log Out Anyway" +#~ msgstr "Toch afmelden" + +#~ msgid "Suspend Anyway" +#~ msgstr "Toch in pauzestand" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Toch in _slaapstand" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Toch afsluiten" + +#~ msgid "Restart Anyway" +#~ msgstr "Toch herstarten" + +#~ msgid "Lock Screen" +#~ msgstr "Beeldscherm vergrendelen" + +#~ msgid "Cancel" +#~ msgstr "Annuleren" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Over %d seconde wordt u automatisch afgemeld." +#~ msgstr[1] "Over %d seconden wordt u automatisch afgemeld." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Over %d seconde wordt de computer automatisch afgesloten." +#~ msgstr[1] "Over %d seconden wordt de computer automatisch afgesloten." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Over %d seconde wordt de computer automatisch opnieuw opgestart." +#~ msgstr[1] "" +#~ "Over %d seconden wordt de computer automatisch opnieuw opgestart." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "U bent momenteel aangemeld onder de naam ‘%s’." + +# afsluiten/uitschakelen/uitzetten +#~ msgid "Log out of this system now?" +#~ msgstr "Afmelden van deze computer?" + +#~ msgid "_Switch User" +#~ msgstr "Gebruiker _wisselen" + +# afsluiten/uitschakelen/uitzetten +#~ msgid "Shut down this system now?" +#~ msgstr "Deze computer uitzetten?" + +#~ msgid "S_uspend" +#~ msgstr "_Pauzestand" + +#~ msgid "_Hibernate" +#~ msgstr "_Slaapstand" + +#~ msgid "_Restart" +#~ msgstr "_Opnieuw opstarten" + +#~ msgid "_Shut Down" +#~ msgstr "_Uitzetten" + +# afsluiten/uitschakelen/uitzetten +#~ msgid "Restart this system now?" +#~ msgstr "Deze computer opnieuw opstarten?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/or.po gnome-session-3.14.0/po/or.po --- gnome-session-3.9.90/po/or.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/or.po 2014-09-22 14:18:16.000000000 +0000 @@ -3,14 +3,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. # # Subhransu Behera , 2006. -# Manoj Kumar Giri , 2009, 2010, 2011, 2012, 2013. +# Manoj Kumar Giri , 2009, 2010, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: gnome-session.master.or\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-20 18:05+0530\n" +"POT-Creation-Date: 2014-08-25 07:29+0000\n" +"PO-Revision-Date: 2014-08-25 17:04+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" "Language: or\n" @@ -27,57 +27,13 @@ "\n" "\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "ନିର୍ଦ୍ଦେଶ ବାଛନ୍ତୁ" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମକୁ ଯୋଗ କରନ୍ତୁ" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମକୁ ସଂଶୋଧନ କରନ୍ତୁ" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମଟି ଖାଲି ହୋଇ ପାରିବ ନାହିଁ" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "ପ୍ରାରମ୍ଭିକ ନିର୍ଦ୍ଦେଶଟି ବୈଧ ନୁହଁ" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "ସକ୍ରିୟ" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "ଚିତ୍ରସଙ୍କେତ" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "ପ୍ରୋଗ୍ରାମ" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୟୋଗ ପସନ୍ଦ" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "କୌଣସି ନାମ ନାହିଁ" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "କୌଣସି ବର୍ଣ୍ଣନା ନାହିଁ" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "ଇଚ୍ଛାରୂପଣ" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "ସାହାଯ୍ଯ ଦଲିଲ ଦେଖାଇହେଲା ନାହିଁ" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "ଏହି ଭରଣଟି ଆପଣଙ୍କୁ ଏକ ସଂରକ୍ଷିତ ଅଧିବେଶନ ବାଛିବାକୁ ଦେଇଥାଏ" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -87,40 +43,38 @@ msgid "This session logs you into GNOME" msgstr "ଏହି ଅଧିବେଶନ ଆପଣଙ୍କୁ ନୋମ ରେ ଲଗ କରାଇଥାଏ" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "ଇଚ୍ଛାରୂପଣ" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "ଏହି ଭରଣଟି ଆପଣଙ୍କୁ ଏକ ସଂରକ୍ଷିତ ଅଧିବେଶନ ବାଛିବାକୁ ଦେଇଥାଏ" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME ପ୍ରତିରୂପ" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "ୱେଲ୍ୟାଣ୍ଡ ଉପରେ GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "ୱେଲ୍ୟାଣ୍ଡ ବ୍ୟବହାର କରି, ଏହି ଅଧିବେଶନ ଆପଣଙ୍କୁ GNOME ରେ ଲଗଇନ୍‌ କରାଇଥାଏ" + #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "ଚଲାଇବା ପାଇଁ ଏକ ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ ବାଛନ୍ତୁ" #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "ନୂତନ ଅଧିବେଶନ (_N)" #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "ଅଧିବେଶନକୁ ବାହାର କରନ୍ତୁ (_R)" #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "ଅଧିବେଶନର ନାମ ପରିବର୍ତ୍ତନ କରନ୍ତୁ (_m)" @@ -128,18 +82,6 @@ msgid "_Continue" msgstr "ଅଗ୍ରସର ହୁଅନ୍ତୁ (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "କିଛି ପ୍ରଗ୍ରାମ ଏପର୍ଯ୍ୟନ୍ତ ଚାଲିଅଛି:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୟୋଗଗୁଡ଼ିକ" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ଆପଣ ଲଗଇନ ହେବା ସମୟରେ କେଉଁ ପ୍ରୟୋଗକୁ ଆରମ୍ଭ କରିବା ଉଚିତ ତାହା ବାଛନ୍ତୁ" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "ଅତିରିକ୍ତ ବ୍ଯବସ୍ଥାପକ ପ୍ରୋଗ୍ରାମ (_p):" @@ -176,79 +118,11 @@ msgid "_Name:" msgstr "ନାମ (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ଫାଇଲଟି ଗୋଟିଏ ବୈଧ .desktop ଫାଇଲ ନୁହଁ" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "ଅଚିହ୍ନା ଡେସ୍କଟପ ଫାଇଲ ସଂସ୍କରଣ '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s କୁ ଆରମ୍ଭ କରୁଅଛି" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "ନିର୍ଦ୍ଦେଶନାମାରେ ପ୍ରୟୋଗଟି ଦଲିଲ ଗ୍ରହଣ କରେନାହିଁ" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "ଅଚିହ୍ନା ଆରମ୍ଭ ବିକଳ୍ପ: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "ଦଲିଲ URI ଗୁଡ଼ିକୁ 'ପ୍ରକାର=ସଂଯୋଗ' ଡେସ୍କଟପ ଭରଣକୁ ପଠାଯାଇପାରିବ ନାହିଁ" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "ଗୋଟିଏ ଆରମ୍ଭ କରିବା ବସ୍ତୁ ନୁହଁ" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "ଅଧିବେଶନ ପରିଚାଳକଙ୍କ ପ୍ରତି ସଂଯୋଗ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "ସଂରକ୍ଷିତ ବିନ୍ୟାସ ଧାରଣ କରିଥିବା ଫାଇଲକୁ ଦର୍ଶାନ୍ତୁ" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "ଫାଇଲ" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "ଅଧିବେଶନ ପରିଚାଳନ ID ଉଲ୍ଲେଖ କରନ୍ତୁ" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକ:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "ଆହା! କିଛି ଗୋଟିଏ ଭୁଲ ହୋଇଗଲା।" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -256,7 +130,7 @@ "ଏକ ସମସ୍ୟା ଘଟିଛି ଏବଂ ତନ୍ତ୍ର ଠିକ ହୋଇପାରୁ ନାହିଁ। ଦୟାକରି ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ " "ସମ୍ପର୍କ କରନ୍ତୁ" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -265,7 +139,7 @@ "ଅନୁଲଗ୍ନଗୁଡ଼ିକୁ ନିଷ୍କ୍ରିୟ " "କରାଯାଇଛି।" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -273,154 +147,27 @@ "ଏକ ସମସ୍ୟା ଘଟିଛି ଏବଂ ତନ୍ତ୍ର ଠିକ ହୋଇପାରୁ ନାହିଁ। \n" "ଦୟାକରି ଲଗଆଉଟ କରି ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।" -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "ଲଗଆଉଟ କରନ୍ତୁ (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "ତ୍ରୁଟି ନିବାରଣ ସଂକେତକୁ ସକ୍ରିୟ କରନ୍ତୁ" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "ଲଗଆଉଟ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "ଅନୁଲଗ୍ନ ଚେତାବନି ଦର୍ଶାନ୍ତୁ" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "ଅଜଣା" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ଗୋଟିଏ ପ୍ରଗ୍ରାମ ଏପର୍ଯ୍ୟନ୍ତ ଚାଲିଅଛି:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"ପ୍ରଗ୍ରାମ ସମାପ୍ତ ହେବା ପାଇଁ ଅପେକ୍ଷା କରିଅଛି। ଏହି ପ୍ରଗ୍ରାମଗୁଡ଼ିକୁ ବାଧା ଦେବା " -"ଦ୍ୱାରା କାର୍ଯ୍ୟ ନଷ୍ଟ " -"ହୋଇପାରେ।" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"ପ୍ରଗ୍ରାମ ସମାପ୍ତ ହେବା ପାଇଁ ଅପେକ୍ଷା କରିଅଛି। ଏହି ପ୍ରଗ୍ରାମଗୁଡ଼ିକୁ ବାଧା ଦେବା " -"ଦ୍ୱାରା କାର୍ଯ୍ୟ ନଷ୍ଟ " -"ହୋଇପାରେ।" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "ଚାଳକଙ୍କୁ ଯେକୌଣସି ଉପାୟରେ ବଦଳାନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "ଯେକୌଣସି ପ୍ରକାରେ ଲଗଆଉଟ କରନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "ଯେକୌଣସି ଉପାୟରେ ନିଲମ୍ବନ କରନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "ଯେକୌଣସି ପ୍ରକାରେ ସୁପ୍ତ କରନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "ଯେକୌଣସି ପ୍ରକାରେ ବନ୍ଦ କରନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "ଯେକୌଣସି ଉପାୟରେ ପୁନର୍ଚାଳନ କରନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "ପରଦାକୁ ତାଲା ଦେଇ ରଖନ୍ତୁ" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ବାତିଲ କରନ୍ତୁ" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ." -msgstr[1] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ." -msgstr[1] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପୁନଃଚାଳନ ହେବ।" -msgstr[1] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପୁନଃଚାଳନ ହେବ।" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "ଆପଣ \"%s\" ପରି ଭାବରେ ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇଛନ୍ତି।" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "ଏହି ତନ୍ତ୍ରରୁ ବର୍ତ୍ତମାନ ଲଗଆଉଟ କରିବେ କି?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ବ୍ଯବହାରକାରୀ ବଦଳାନ୍ତୁ (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "ଯନ୍ତ୍ରକୁ ବର୍ତ୍ତମାନ ବନ୍ଦ କରିବେ କି?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "ନିଲମ୍ବନ କରନ୍ତୁ (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "ସୁପ୍ତ କରନ୍ତୁ (_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "ପୁନଃ ଚାଳନ କରନ୍ତୁ (_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "ବନ୍ଦ କରନ୍ତୁ (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ଏହି ତନ୍ତ୍ରକୁ ବର୍ତ୍ତମାନ ପୁନଃଚାଳନ କରିବେ କି?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "ଉତ୍ତର ଦେଉନାହିଁ" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "ଲଗଆଉଟ (_L)" @@ -428,56 +175,60 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "ମନେଥିବା ପ୍ରୟୋଗ" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "ଏହି ପ୍ରଗ୍ରାମଟି ଲଗଆଉଟ ହେବାକୁ ଦେଉନାହିଁ।" -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "ନୂତନ କ୍ଲାଏଣ୍ଟ ସଂଯୋଗକୁ ମନାକରୁଅଛି କାରଣ ସେହି ଅଧିବେଶନଟି ବର୍ତ୍ତମାନ ବନ୍ଦ ହୋଇଛି\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE କୁ ମାନୁଥିବା ସକେଟ ନିର୍ମାଣ କରିପାରିଲା ନାହିଁ: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "ମାନକ ସ୍ୱୟଂଚାଳିତ ଡିରେକ୍ଟୋରୀଗୁଡ଼ିକୁ ନବଲିଖନ କରନ୍ତୁ" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "ବ୍ୟବହାର କରିବାକୁ ଥିବା ଅଧିବେଶନ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "ଚାଳକ ନିର୍ଦ୍ଧାରିତ ପ୍ରୟୋଗଗୁଡ଼ିକୁ ଧାରଣ କରନ୍ତୁ ନାହିଁ" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "ପରୀକ୍ଷା ପାଇଁ ବିଫଳ ସଂଳାପକୁ ଦର୍ଶାନ୍ତୁ" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " - GNOME ଅଧିବେଶନ ପରିଚାଳକ" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -510,73 +261,248 @@ "\n" "If no --inhibit option is specified, idle is assumed.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s କୁ ନିଷ୍ପାଦନ କରିବାରେ ବିଫଳ\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s ଏକ ସ୍ୱତନ୍ତ୍ରଚର ଆବଶ୍ୟକ କରିଥାଏ\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "ଅଧିବେଶନ %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "" "ଅଧିବେଶନ ନାମଗୁଡ଼ିକ ‘.’ ରୁ ଆରମ୍ଭ କରିବା ପାଇଁ ଅନୁମତି ଦେଇନଥାଏ କିମ୍ବା ‘/’ ଅକ୍ଷର " "ଧାରଣ କରିନଥାଏ" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "ଅଧିବେଶନ ନାମଗୁଡ଼ିକ ‘.’ ରୁ ଆରମ୍ଭ ହେବା ପାଇଁ ଅନୁମତି ନଥାଏ" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "ଅଧିବେଶନ ନାମଗୁଡ଼ିକ ‘/’ ବର୍ଣ୍ଣ ଧାରଣ କରିବା ପାଇଁ ଅନୁମତି ନାହିଁ" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "‘%s’ ନାମକ ଅଧିବେଶନ ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "ଲଗଆଉଟ୍" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "ବିଦ୍ୟୁତ ପ୍ରବାହ ବନ୍ଦ କରନ୍ତୁ" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "ପୁନର୍ଚାଳନ କରନ୍ତୁ" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "ଯେକୌଣସି ସ୍ଥିତବାନ ବାଧାବିଘ୍ନକୁ ଅମାନ୍ୟ କରୁଅଛି" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "ଚାଳକ ପାଇଁ ନିଶ୍ଚିତକରଣ ଆବଶ୍ୟକ କରିନଥାଏ" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "ଅଧିବେଶନ ପରିଚାଳକଙ୍କ ସହିତ ସମ୍ପର୍କ ସ୍ଥାପିତ କରିପାରିଲା ନାହିଁ" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "ଦ୍ୱନ୍ଦମୟ ବିକଳ୍ପଗୁଡ଼ିକ ସହିତ ଡକାହେଉଥିବା ପ୍ରଗ୍ରାମ" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME ଆବର୍ତ୍ତନ" +#~ msgid "Select Command" +#~ msgstr "ନିର୍ଦ୍ଦେଶ ବାଛନ୍ତୁ" + +#~ msgid "Add Startup Program" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମକୁ ଯୋଗ କରନ୍ତୁ" + +#~ msgid "Edit Startup Program" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମକୁ ସଂଶୋଧନ କରନ୍ତୁ" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୋଗ୍ରାମଟି ଖାଲି ହୋଇ ପାରିବ ନାହିଁ" + +#~ msgid "The startup command is not valid" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ନିର୍ଦ୍ଦେଶଟି ବୈଧ ନୁହଁ" + +#~ msgid "Enabled" +#~ msgstr "ସକ୍ରିୟ" + +#~ msgid "Icon" +#~ msgstr "ଚିତ୍ରସଙ୍କେତ" + +#~ msgid "Program" +#~ msgstr "ପ୍ରୋଗ୍ରାମ" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୟୋଗ ପସନ୍ଦ" + +#~ msgid "No name" +#~ msgstr "କୌଣସି ନାମ ନାହିଁ" + +#~ msgid "No description" +#~ msgstr "କୌଣସି ବର୍ଣ୍ଣନା ନାହିଁ" + +#~ msgid "Could not display help document" +#~ msgstr "ସାହାଯ୍ଯ ଦଲିଲ ଦେଖାଇହେଲା ନାହିଁ" + +#~ msgid "Some programs are still running:" +#~ msgstr "କିଛି ପ୍ରଗ୍ରାମ ଏପର୍ଯ୍ୟନ୍ତ ଚାଲିଅଛି:" + +#~ msgid "Startup Applications" +#~ msgstr "ପ୍ରାରମ୍ଭିକ ପ୍ରୟୋଗଗୁଡ଼ିକ" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "ଆପଣ ଲଗଇନ ହେବା ସମୟରେ କେଉଁ ପ୍ରୟୋଗକୁ ଆରମ୍ଭ କରିବା ଉଚିତ ତାହା ବାଛନ୍ତୁ" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ଫାଇଲଟି ଗୋଟିଏ ବୈଧ .desktop ଫାଇଲ ନୁହଁ" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "ଅଚିହ୍ନା ଡେସ୍କଟପ ଫାଇଲ ସଂସ୍କରଣ '%s'" + +#~ msgid "Starting %s" +#~ msgstr "%s କୁ ଆରମ୍ଭ କରୁଅଛି" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "ନିର୍ଦ୍ଦେଶନାମାରେ ପ୍ରୟୋଗଟି ଦଲିଲ ଗ୍ରହଣ କରେନାହିଁ" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "ଅଚିହ୍ନା ଆରମ୍ଭ ବିକଳ୍ପ: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "ଦଲିଲ URI ଗୁଡ଼ିକୁ 'ପ୍ରକାର=ସଂଯୋଗ' ଡେସ୍କଟପ ଭରଣକୁ ପଠାଯାଇପାରିବ ନାହିଁ" + +#~ msgid "Not a launchable item" +#~ msgstr "ଗୋଟିଏ ଆରମ୍ଭ କରିବା ବସ୍ତୁ ନୁହଁ" + +#~ msgid "Disable connection to session manager" +#~ msgstr "ଅଧିବେଶନ ପରିଚାଳକଙ୍କ ପ୍ରତି ସଂଯୋଗ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "ସଂରକ୍ଷିତ ବିନ୍ୟାସ ଧାରଣ କରିଥିବା ଫାଇଲକୁ ଦର୍ଶାନ୍ତୁ" + +#~ msgid "FILE" +#~ msgstr "ଫାଇଲ" + +#~ msgid "Specify session management ID" +#~ msgstr "ଅଧିବେଶନ ପରିଚାଳନ ID ଉଲ୍ଲେଖ କରନ୍ତୁ" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକ:" + +#~ msgid "Show session management options" +#~ msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" + +#~ msgid "Unknown" +#~ msgstr "ଅଜଣା" + +#~ msgid "A program is still running:" +#~ msgstr "ଗୋଟିଏ ପ୍ରଗ୍ରାମ ଏପର୍ଯ୍ୟନ୍ତ ଚାଲିଅଛି:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "ପ୍ରଗ୍ରାମ ସମାପ୍ତ ହେବା ପାଇଁ ଅପେକ୍ଷା କରିଅଛି। ଏହି ପ୍ରଗ୍ରାମଗୁଡ଼ିକୁ ବାଧା ଦେବା ଦ୍ୱାରା କାର୍ଯ୍ୟ " +#~ "ନଷ୍ଟ ହୋଇପାରେ।" + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "ପ୍ରଗ୍ରାମ ସମାପ୍ତ ହେବା ପାଇଁ ଅପେକ୍ଷା କରିଅଛି। ଏହି ପ୍ରଗ୍ରାମଗୁଡ଼ିକୁ ବାଧା ଦେବା ଦ୍ୱାରା କାର୍ଯ୍ୟ " +#~ "ନଷ୍ଟ ହୋଇପାରେ।" + +#~ msgid "Switch User Anyway" +#~ msgstr "ଚାଳକଙ୍କୁ ଯେକୌଣସି ଉପାୟରେ ବଦଳାନ୍ତୁ" + +#~ msgid "Log Out Anyway" +#~ msgstr "ଯେକୌଣସି ପ୍ରକାରେ ଲଗଆଉଟ କରନ୍ତୁ" + +#~ msgid "Suspend Anyway" +#~ msgstr "ଯେକୌଣସି ଉପାୟରେ ନିଲମ୍ବନ କରନ୍ତୁ" + +#~ msgid "Hibernate Anyway" +#~ msgstr "ଯେକୌଣସି ପ୍ରକାରେ ସୁପ୍ତ କରନ୍ତୁ" + +#~ msgid "Shut Down Anyway" +#~ msgstr "ଯେକୌଣସି ପ୍ରକାରେ ବନ୍ଦ କରନ୍ତୁ" + +#~ msgid "Restart Anyway" +#~ msgstr "ଯେକୌଣସି ଉପାୟରେ ପୁନର୍ଚାଳନ କରନ୍ତୁ" + +#~ msgid "Lock Screen" +#~ msgstr "ପରଦାକୁ ତାଲା ଦେଇ ରଖନ୍ତୁ" + +#~ msgid "Cancel" +#~ msgstr "ବାତିଲ କରନ୍ତୁ" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ." +#~ msgstr[1] "ଆପଣଙ୍କୁ %d ସେକଣ୍ଡରେ ଆପେଆପେ ଲଗ ଆଉଟ କରାଦିଆଯିବ." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ." +#~ msgstr[1] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ଆପେଆପେ ବନ୍ଦ କରାଯିବ." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପୁନଃଚାଳନ ହେବ।" +#~ msgstr[1] "ଏହି ତନ୍ତ୍ର %d ସେକଣ୍ଡରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ପୁନଃଚାଳନ ହେବ।" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "ଆପଣ \"%s\" ପରି ଭାବରେ ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇଛନ୍ତି।" + +#~ msgid "Log out of this system now?" +#~ msgstr "ଏହି ତନ୍ତ୍ରରୁ ବର୍ତ୍ତମାନ ଲଗଆଉଟ କରିବେ କି?" + +#~ msgid "_Switch User" +#~ msgstr "ବ୍ଯବହାରକାରୀ ବଦଳାନ୍ତୁ (_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "ଯନ୍ତ୍ରକୁ ବର୍ତ୍ତମାନ ବନ୍ଦ କରିବେ କି?" + +#~ msgid "S_uspend" +#~ msgstr "ନିଲମ୍ବନ କରନ୍ତୁ (_u)" + +#~ msgid "_Hibernate" +#~ msgstr "ସୁପ୍ତ କରନ୍ତୁ (_H)" + +#~ msgid "_Restart" +#~ msgstr "ପୁନଃ ଚାଳନ କରନ୍ତୁ (_R)" + +#~ msgid "_Shut Down" +#~ msgstr "ବନ୍ଦ କରନ୍ତୁ (_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "ଏହି ତନ୍ତ୍ରକୁ ବର୍ତ୍ତମାନ ପୁନଃଚାଳନ କରିବେ କି?" #~ msgid "Icon '%s' not found" #~ msgstr "'%s' ଚିତ୍ରସଙ୍କେତ ମିଳିଲା ନାହଁ" diff -Nru gnome-session-3.9.90/po/pa.po gnome-session-3.14.0/po/pa.po --- gnome-session-3.9.90/po/pa.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/pa.po 2014-06-25 18:06:34.000000000 +0000 @@ -10,8 +10,8 @@ "Project-Id-Version: gnome-session.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-02-20 01:37+0000\n" +"POT-Creation-Date: 2013-09-16 12:25+0000\n" +"PO-Revision-Date: 2013-09-17 22:16-0500\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "Language: pa\n" @@ -46,33 +46,33 @@ msgid "The startup command is not valid" msgstr "ਸ਼ੁਰੂਆਤੀ ਕਮਾਂਡ ਠੀਕ ਨਹੀਂ ਹੈ" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "ਯੋਗ" # gnome-session/logout.c:266 -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "ਆਈਕਾਨ" # gnome-session/gsm-client-list.c:111 -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "ਪਰੋਗਰਾਮ" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "ਸ਼ੁਰੂਆਤੀ ਐਪਲੀਕੇਸ਼ਨ ਪਸੰਦ" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "ਕੋਈ ਨਾਂ ਨਹੀਂ" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "ਇਸ ਐਪਲੀਕੇਸ਼ਨ ਦਾ ਵਰਜਨ" @@ -80,14 +80,6 @@ msgid "Could not display help document" msgstr "ਮੱਦਦ ਡੌਕੂਮੈਂਟ ਨੂੰ ਵੇਖਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "ਗਨੋਮ" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਗਨੋਮ ਵਿੱਚ ਲਾਗ ਕਰਦਾ ਹੈ" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "ਕਸਟਮ" @@ -96,11 +88,36 @@ msgid "This entry lets you select a saved session" msgstr "ਇਹ ਐਂਟਰੀ ਤੁਹਾਨੂੰ ਸੰਭਾਲਿਆ ਸ਼ੈਸ਼ਨ ਚੁਣਨ ਦਿੰਦੀ ਹੈ" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "ਗਨੋਮ" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਗਨੋਮ ਵਿੱਚ ਲਾਗ ਕਰਦਾ ਹੈ" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "ਗਨੋਮ ਡੰਮੀ" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "ਸ਼ੁਰੂਆਤੀ ਐਪਲੀਕੇਸ਼ਨ" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੁਸੀਂ ਲਾਗਇਨ ਸਮੇਂ ਸ਼ੁਰੂ ਕਰਨੀਆਂ ਚਾਹੁੰਦੇ ਹੋ" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "ਵੇਲੈਂਡ ਉੱਤੇ ਗਨੋਮ" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "ਇਹ ਸ਼ੈਸ਼ਨ ਤੁਹਾਨੂੰ ਗਨੋਮ ਵਿੱਚ ਵੇਲੈਂਡ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਲਾਗ ਇਨ ਕਰਨ ਦਿੰਦਾ ਹੈ।" + # gnome-session/save-session.c:43 #: ../data/session-selector.ui.h:1 msgid "Custom Session" @@ -129,18 +146,6 @@ msgid "_Continue" msgstr "ਜਾਰੀ ਰੱਖੋ(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "ਕੁਝ ਪਰੋਗਰਾਮ ਹਾਲੇ ਵੀ ਚੱਲ ਰਹੇ ਹਨ:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "ਸ਼ੁਰੂਆਤੀ ਐਪਲੀਕੇਸ਼ਨ" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੀਆਂ ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੁਸੀਂ ਲਾਗਇਨ ਸਮੇਂ ਸ਼ੁਰੂ ਕਰਨੀਆਂ ਚਾਹੁੰਦੇ ਹੋ" - # gnome-session/startup-programs.c:372 #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -255,18 +260,18 @@ msgid "Show session management options" msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧਕ ਚੋਣਾਂ ਵੇਖੋ" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "ਓਹ ਹੋ! ਕੁਝ ਗਲਤ ਹੋ ਗਿਆ।" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "" "ਇੱਕ ਸਮੱਸਿਆ ਆਈ ਹੈ ਅਤੇ ਸਿਸਟਮ ਉਭਰ ਨਹੀਂ ਸਕਿਆ। ਆਪਣੇ ਸਿਸਟਮ ਐਡਮਿਸਟੇਟਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -274,7 +279,7 @@ "ਇੱਕ ਸਮੱਸਿਆ ਆਈ ਹੈ ਅਤੇ ਸਿਸਟਮ ਉਭਰ ਨਹੀਂ ਸਕਿਆ। ਬਚਾਅ ਵਜੋਂ ਸਭ ਇਕਸਟੈਸ਼ਨ ਨੂੰ ਬੰਦ ਕੀਤਾ " "ਜਾ ਚੁੱਕਾ ਹੈ।" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -283,147 +288,23 @@ "ਲਾਗ ਆਉਟ ਕਰਕੇ ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ।" # gnome-session/logout.c:274 -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "ਲਾਗ-ਆਉਟ(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "ਡੀਬੱਗ ਕੋਡ ਯੋਗ" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "ਲਾਗਆਉਟ ਮਨਜ਼ੂਰ" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "ਇਕਸਟੈਨਸ਼ਨ ਚੇਤਾਵਨੀ ਵੇਖਾਓ" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "ਅਣਜਾਣ" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ਇੱਕ ਪਰੋਗਰਾਮ ਹਾਲੇ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"ਪਰੋਗਰਾਮ ਨੂੰ ਪੂਰਾ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਪਰੋਗਰਾਮ 'ਚ ਦਖਲ ਦੇਣ ਨਾਲ ਤੁਹਾਡਾ " -"ਕੰਮ ਗੁਆਚ " -"ਸਕਦਾ ਹੈ।" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"ਪਰੋਗਰਾਮਾਂ ਨੂੰ ਪੂਰਾ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਇਹ ਪਰੋਗਰਾਮਾਂ 'ਚ ਦਖਲ ਦੇਣ ਨਾਲ " -"ਤੁਹਾਡਾ ਕੰਮ " -"ਗੁਆਚ ਸਕਦਾ ਹੈ।" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਯੂਜ਼ਰ ਬਦਲੋ" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਲਾਗ-ਆਉਟ ਕਰੋ" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਸਸਪੈਂਡ" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਹਾਈਬਰਨੇਟ" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਬੰਦ ਕਰੋ" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "ਕਿਵੇਂ ਵੀ ਮੁੜ-ਚਾਲੂ ਕਰੋ" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ" - -# gnome-session/splash.c:69 -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ਰੱਦ ਕਰੋ" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "ਤੁਹਾਨੂੰ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਲਾਗਆਉਟ ਕੀਤਾ ਜਾਵੇਗਾ।" -msgstr[1] "ਤੁਹਾਨੂੰ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਲਾਗਆਉਟ ਕੀਤਾ ਜਾਵੇਗਾ।" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।" -msgstr[1] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" -msgstr[1] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "ਹੁਣ ਤੁਸੀਂ \"%s\" ਵਜੋਂ ਲਾਗਇਨ ਹੋ।" - -# msgid "You are currently logged in as \"%s\"." -# msgstr "ਤੁਸੀਂ ਇਸ ਵੇਲੇ "%s\" ਵਜੋਂ ਲਾਗਇਨ ਹੋ।" -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "ਇਸ ਸਿਸਟਮ ਲਈ ਹੁਣੇ ਲਾਗ ਆਉਟ ਕਰਨਾ ਹੈ?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "ਯੂਜ਼ਰ ਬਦਲੋ(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "ਕੀ ਸਿਸਟਮ ਹੁਣੇ ਬੰਦ ਕਰਨਾ ਹੈ?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "ਸਸਪੈਂਡ(_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "ਹਾਈਬਰਨੇਟ(_H)" - -# gnome-session/session-properties.c:173 -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "ਰੀ-ਸਟਾਰਟ(_R)" - -# gnome-session/logout.c:277 -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "ਬੰਦ ਕਰੋ(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ਕੀ ਸਿਸਟਮ ਹੁਣ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਹੈ?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "ਕੋਈ ਜਵਾਬ ਨਹੀਂ" @@ -436,53 +317,53 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "ਯਾਦ ਰੱਖੇ ਹੋਏ ਐਪਲੀਕੇਸ਼ਨ" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "ਇਹ ਪਰੋਗਰਾਮ ਲਾਗ-ਆਉਟ ਨੂੰ ਰੋਕ ਰਿਹਾ ਹੈ।" -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" "ਨਵਾਂ ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ ਹੈ, ਕਿਉਂਕਿ ਸ਼ੈਸ਼ਨ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE ਲਿਸਨਿੰਗ ਸਾਕਟ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕੀ: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "ਸਟੈਂਡਰਡ ਆਟੋ-ਸਟਾਰਟ ਡਾਇਰੈਕਟਰੀਆਂ ਅਣਡਿੱਠੀਆਂ" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" # gnome-session/session-properties.c:272 -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "ਵਰਤਣ ਲਈ ਸ਼ੈਸ਼ਨ" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "ਯੂਜ਼ਰ-ਖਾਸ ਐਪਲੀਕੇਸ਼ਨ ਲੋਡ ਨਾ ਕਰੋ" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "ਟੈਸਟ ਕਰਨ ਲਈ ਵੇਲ੍ਹ ਡਾਈਲਾਗ ਵੇਖਾਓ" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- ਗਨੋਮ ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ" @@ -584,8 +465,99 @@ msgid "Program called with conflicting options" msgstr "ਪਰੋਗਰਾਮ ਨੂੰ ਚੋਣਾਂ ਨਾਲ ਅਪਵਾਦ ਮਿਲਿਆ" -#~ msgid "GNOME fallback" -#~ msgstr "ਗਨੋਮ ਫਾਲਬੈਕ" +#~ msgid "Some programs are still running:" +#~ msgstr "ਕੁਝ ਪਰੋਗਰਾਮ ਹਾਲੇ ਵੀ ਚੱਲ ਰਹੇ ਹਨ:" + +#~ msgid "Unknown" +#~ msgstr "ਅਣਜਾਣ" + +#~ msgid "A program is still running:" +#~ msgstr "ਇੱਕ ਪਰੋਗਰਾਮ ਹਾਲੇ ਵੀ ਚੱਲ ਰਿਹਾ ਹੈ:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "ਪਰੋਗਰਾਮ ਨੂੰ ਪੂਰਾ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਪਰੋਗਰਾਮ 'ਚ ਦਖਲ ਦੇਣ ਨਾਲ ਤੁਹਾਡਾ ਕੰਮ ਗੁਆਚ " +#~ "ਸਕਦਾ ਹੈ।" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "ਪਰੋਗਰਾਮਾਂ ਨੂੰ ਪੂਰਾ ਹੋਣ ਦੀ ਉਡੀਕ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ। ਇਹ ਪਰੋਗਰਾਮਾਂ 'ਚ ਦਖਲ ਦੇਣ ਨਾਲ ਤੁਹਾਡਾ ਕੰਮ " +#~ "ਗੁਆਚ ਸਕਦਾ ਹੈ।" + +#~ msgid "Switch User Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਯੂਜ਼ਰ ਬਦਲੋ" + +#~ msgid "Log Out Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਲਾਗ-ਆਉਟ ਕਰੋ" + +#~ msgid "Suspend Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਸਸਪੈਂਡ" + +#~ msgid "Hibernate Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਹਾਈਬਰਨੇਟ" + +#~ msgid "Shut Down Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਬੰਦ ਕਰੋ" + +#~ msgid "Restart Anyway" +#~ msgstr "ਕਿਵੇਂ ਵੀ ਮੁੜ-ਚਾਲੂ ਕਰੋ" + +#~ msgid "Lock Screen" +#~ msgstr "ਸਕਰੀਨ ਲਾਕ ਕਰੋ" + +# gnome-session/splash.c:69 +#~ msgid "Cancel" +#~ msgstr "ਰੱਦ ਕਰੋ" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "ਤੁਹਾਨੂੰ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਲਾਗਆਉਟ ਕੀਤਾ ਜਾਵੇਗਾ।" +#~ msgstr[1] "ਤੁਹਾਨੂੰ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਲਾਗਆਉਟ ਕੀਤਾ ਜਾਵੇਗਾ।" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।" +#~ msgstr[1] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਕੀਤਾ ਜਾਵੇਗਾ।" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" +#~ msgstr[1] "ਇਹ ਸਿਸਟਮ %d ਸਕਿੰਟਾਂ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "ਹੁਣ ਤੁਸੀਂ \"%s\" ਵਜੋਂ ਲਾਗਇਨ ਹੋ।" + +# msgid "You are currently logged in as \"%s\"." +# msgstr "ਤੁਸੀਂ ਇਸ ਵੇਲੇ "%s\" ਵਜੋਂ ਲਾਗਇਨ ਹੋ।" +#~ msgid "Log out of this system now?" +#~ msgstr "ਇਸ ਸਿਸਟਮ ਲਈ ਹੁਣੇ ਲਾਗ ਆਉਟ ਕਰਨਾ ਹੈ?" + +#~ msgid "_Switch User" +#~ msgstr "ਯੂਜ਼ਰ ਬਦਲੋ(_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "ਕੀ ਸਿਸਟਮ ਹੁਣੇ ਬੰਦ ਕਰਨਾ ਹੈ?" + +#~ msgid "S_uspend" +#~ msgstr "ਸਸਪੈਂਡ(_u)" + +#~ msgid "_Hibernate" +#~ msgstr "ਹਾਈਬਰਨੇਟ(_H)" + +# gnome-session/session-properties.c:173 +#~ msgid "_Restart" +#~ msgstr "ਰੀ-ਸਟਾਰਟ(_R)" + +# gnome-session/logout.c:277 +#~ msgid "_Shut Down" +#~ msgstr "ਬੰਦ ਕਰੋ(_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "ਕੀ ਸਿਸਟਮ ਹੁਣ ਮੁੜ-ਚਾਲੂ ਕਰਨਾ ਹੈ?" #~ msgid "Icon '%s' not found" #~ msgstr "ਆਈਕਾਨ '%s' ਨਹੀਂ ਲੱਭਿਆ" diff -Nru gnome-session-3.9.90/po/pl.po gnome-session-3.14.0/po/pl.po --- gnome-session-3.9.90/po/pl.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/pl.po 2014-06-25 18:06:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-24 01:47+0100\n" -"PO-Revision-Date: 2013-02-24 01:48+0100\n" +"POT-Creation-Date: 2013-09-10 01:10+0200\n" +"PO-Revision-Date: 2013-09-10 01:11+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -48,31 +48,31 @@ msgid "The startup command is not valid" msgstr "Polecenie startowe jest nieprawidłowe" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Włączone" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferencje programów startowych" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Bez nazwy" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Brak opisu" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Wersja tego programu" @@ -80,14 +80,6 @@ msgid "Could not display help document" msgstr "Nie można wyświetlić dokumentu pomocy" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Ta sesja loguje użytkownika do środowiska GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Sesja użytkownika" @@ -96,10 +88,35 @@ msgid "This entry lets you select a saved session" msgstr "Ten wpis umożliwia wybranie zapisanej sesji" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Ta sesja loguje użytkownika do środowiska GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Pusta sesja GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Programy startowe" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Wybór programów do uruchomienia podczas logowania" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME (Wayland)" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Ta sesja loguje użytkownika do środowiska GNOME, używając Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sesja użytkownika" @@ -124,18 +141,6 @@ msgid "_Continue" msgstr "_Kontynuuj" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Niektóre programy są nadal uruchomione:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Programy startowe" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Wybór programów do uruchomienia podczas logowania" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "D_odatkowe programy startowe:" @@ -242,11 +247,11 @@ msgid "Show session management options" msgstr "Wyświetla opcje zarządzania sesją" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Coś poszło źle." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -254,7 +259,7 @@ "Wystąpił problem i nie można przywrócić systemu. Proszę skontaktować się z " "jego administratorem" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -262,7 +267,7 @@ "Wystąpił problem i nie można przywrócić systemu. Wszystkie rozszerzenia " "zostały wyłączone w ramach środków ostrożności." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -270,143 +275,23 @@ "Wystąpił problem i nie można przywrócić systemu.\n" "Proszę się wylogować i spróbować ponownie." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Wyloguj" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Uruchomienie kodu debugowania" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Zezwolenie na wylogowanie" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Wyświetlanie ostrzeżeń rozszerzeń" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Nieznany" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Program jest nadal uruchomiony:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Oczekiwanie na zakończenie działania programów. Przerwanie działania " -"programów może spowodować utratę niezapisanych wyników pracy." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Oczekiwanie na zakończenie działania programów. Przerwanie działania " -"programów może spowodować utratę niezapisanych wyników pracy." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Przełącz użytkownika mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Wyloguj mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Uśpij mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Zahibernuj mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Wyłącz mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Uruchom ponownie mimo to" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Zablokuj ekran" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Anuluj" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Automatyczne wylogowanie nastąpi za %d sekundę." -msgstr[1] "Automatyczne wylogowanie nastąpi za %d sekundy." -msgstr[2] "Automatyczne wylogowanie nastąpi za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Automatyczne wyłączenie komputera nastąpi za %d sekundę." -msgstr[1] "Automatyczne wyłączenie komputera nastąpi za %d sekundy." -msgstr[2] "Automatyczne wyłączenie komputera nastąpi za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Automatyczne ponowne uruchomienie komputera nastąpi za %d sekundę." -msgstr[1] "Automatyczne ponowne uruchomienie komputera nastąpi za %d sekundy." -msgstr[2] "Automatyczne ponowne uruchomienie komputera nastąpi za %d sekund." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Użytkownik jest zalogowany jako \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Wylogować z systemu?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Przełącz użytkownika" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Wyłączyć komputer?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Uśpij" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernuj" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "U_ruchom ponownie" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Wyłącz komputer" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Uruchomić ponownie komputer?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Brak odpowiedzi" @@ -418,11 +303,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Zapamiętany program" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ten program uniemożliwia wylogowanie." @@ -437,33 +322,33 @@ msgid "Could not create ICE listening socket: %s" msgstr "Nie można utworzyć gniazda nasłuchującego ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Obejście standardowych katalogów automatycznego uruchamiania" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "KATALOG_AUTOMATYCZNEGO_URUCHAMIANIA" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sesja do użycia" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NAZWA_SESJI" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Bez wczytywania programów określonych przez użytkownika" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "" "Wyświetla okno niepowodzenia uruchomienia środowiska w celach testowych" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - menedżer sesji środowiska GNOME" diff -Nru gnome-session-3.9.90/po/POTFILES.in gnome-session-3.14.0/po/POTFILES.in --- gnome-session-3.9.90/po/POTFILES.in 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/POTFILES.in 2014-06-25 18:06:33.000000000 +0000 @@ -1,22 +1,14 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -capplet/gsm-app-dialog.c -capplet/gsm-properties-dialog.c -capplet/gsp-app.c -capplet/main.c -data/gnome.desktop.in data/gnome-custom-session.desktop.in +data/gnome.desktop.in data/gnome-dummy.session.desktop.in.in data/gnome.session.desktop.in.in +data/gnome-wayland.desktop.in +data/gnome-wayland.session.desktop.in.in [type: gettext/glade]data/session-selector.ui -[type: gettext/glade]data/gsm-inhibit-dialog.ui -data/session-properties.desktop.in.in [type: gettext/glade]data/session-properties.ui -egg/eggdesktopfile.c -egg/eggsmclient.c gnome-session/gsm-fail-whale-dialog.c -gnome-session/gsm-inhibit-dialog.c -gnome-session/gsm-logout-dialog.c gnome-session/gsm-manager.c gnome-session/gsm-process-helper.c gnome-session/gsm-util.c diff -Nru gnome-session-3.9.90/po/POTFILES.skip gnome-session-3.14.0/po/POTFILES.skip --- gnome-session-3.9.90/po/POTFILES.skip 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/POTFILES.skip 2014-06-25 18:06:33.000000000 +0000 @@ -1,6 +1,9 @@ # List of source files containing translatable strings that should not be # translated. # Please keep this file sorted alphabetically. +data/gnome-dummy.session.desktop.in +data/gnome.session.desktop.in +data/gnome-session-properties.desktop.in data/gnome-session.schemas.in +data/gnome-wayland.session.desktop.in data/gnome-wm.desktop.in -data/session-properties.desktop.in diff -Nru gnome-session-3.9.90/po/pt_BR.po gnome-session-3.14.0/po/pt_BR.po --- gnome-session-3.9.90/po/pt_BR.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/pt_BR.po 2014-06-25 18:06:34.000000000 +0000 @@ -20,16 +20,16 @@ "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-26 21:03+0000\n" -"PO-Revision-Date: 2013-02-26 23:10-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"POT-Creation-Date: 2013-09-18 14:27+0000\n" +"PO-Revision-Date: 2013-09-18 15:27-0300\n" +"Last-Translator: Antonio Fernandes C. Neto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" "X-Project-Style: gnome\n" #: ../capplet/gsm-app-dialog.c:120 @@ -52,31 +52,31 @@ msgid "The startup command is not valid" msgstr "O comando inicial não é válido" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Habilitado" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ícone" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Programa" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" -msgstr "Preferências dos aplicativos de sessão" +msgstr "Preferências dos aplicativos iniciais de sessão" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Sem nome" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Nenhuma descrição" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versão deste aplicativo" @@ -84,14 +84,6 @@ msgid "Could not display help document" msgstr "Não é possível exibir documento de ajuda" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Essa sessão o leva ao GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalizada" @@ -100,12 +92,39 @@ msgid "This entry lets you select a saved session" msgstr "Esta entrada permite a você selecionar uma sessão salva" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Essa sessão o leva ao GNOME" + # Adotado como GNOME experimental devido a definição de GNOME dummy: "allow to start a dummy gnome-session which does not start anything # but the autostart software and the DBus API with gnome-session" #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME experimental" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplicativos iniciais de sessão" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "" +"Escolha quais os aplicativos que irão iniciar quando sua sessão iniciar" + +# Traduzi como "sobre Wayland" pois é compatível com a definição usada nas Notas de lançamento do GNOME 3.10 (Sugestão de Rafael Ferreira -> Próxima parada, Wayland), bem porque subentende-se que rode-se GNOME sobre Wayland ao invés do sistema X.--Enrico +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sobre Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Essa sessão o leva ao GNOME, usando Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sessão personalizada" @@ -130,19 +149,6 @@ msgid "_Continue" msgstr "_Continuar" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Alguns programas ainda estão em execução:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicativos de sessão" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "" -"Escolha quais os aplicativos que irão iniciar quando sua sessão iniciar" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "_Programas iniciais adicionais:" @@ -250,11 +256,11 @@ msgid "Show session management options" msgstr "Mostra as opções de gerenciamento de sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Oh não! Alguma coisa está errada." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -262,15 +268,15 @@ "Ocorreu um problema e o sistema não pôde ser recuperado. Por favor, entre em " "contato com um administrador de sistemas" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "" -"Ocorreu um problema e o sistema não pôde ser recuperado. Todas as " -"extensõesforam desativadas por precaução." +"Ocorreu um problema e o sistema não pôde ser recuperado. Todas as extensões " +"foram desativadas por precaução." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -278,140 +284,23 @@ "Ocorreu um problema e o sistema não pôde ser recuperado.\n" "Por favor encerre a sessão e tente novamente." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Encerrar sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Habilitar código de depuração" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Permitir encerramento de sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Mostrar alerta de extensão" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconhecido" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Um programa ainda está em execução:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Aguardando o programa para finalizar. Interromper este programa pode " -"ocasionar em perda de trabalho." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Aguardando os programas para finalizar. Interromper estes programas pode " -"ocasionar em perda de trabalho." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Trocar usuário mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Encerrar mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Suspender mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Hibernar mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Desligar mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Reiniciar mesmo assim" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Bloquear tela" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancelar" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Essa sessão será encerrada automaticamente em %d segundo." -msgstr[1] "Essa sessão será encerrada automaticamente em %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Este sistema será automaticamente desligado em %d segundo." -msgstr[1] "Este sistema será automaticamente desligado em %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Este sistema será automaticamente reiniciado em %d segundo." -msgstr[1] "Este sistema será automaticamente reiniciado em %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Você está logado atualmente como \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Encerrar a sessão deste sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Trocar usuário" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Desligar este sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "S_uspender" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernar" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reiniciar" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Desligar" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Reiniciar este sistema agora?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Não respondendo" @@ -423,11 +312,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Lembrar dos aplicativos" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Este programa está bloqueando o encerramento da sessão." @@ -444,33 +333,33 @@ msgid "Could not create ICE listening socket: %s" msgstr "Não foi possível criar o soquete de escuta ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Substituir os diretórios padrões de início automático" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessões para usar" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Não carregar aplicativos especificados pelo usuário" # Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong. http://is.gd/Q4XOeq #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Mostrar o diálogo da \"falha da baleia\" para teste" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - gerenciador de sessões do GNOME" @@ -572,8 +461,94 @@ msgid "Program called with conflicting options" msgstr "Programa chamado com opções conflitantes" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME reserva" +#~ msgid "Some programs are still running:" +#~ msgstr "Alguns programas ainda estão em execução:" + +#~ msgid "Unknown" +#~ msgstr "Desconhecido" + +#~ msgid "A program is still running:" +#~ msgstr "Um programa ainda está em execução:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Aguardando o programa para finalizar. Interromper este programa pode " +#~ "ocasionar em perda de trabalho." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Aguardando os programas para finalizar. Interromper estes programas pode " +#~ "ocasionar em perda de trabalho." + +#~ msgid "Switch User Anyway" +#~ msgstr "Trocar usuário mesmo assim" + +#~ msgid "Log Out Anyway" +#~ msgstr "Encerrar mesmo assim" + +#~ msgid "Suspend Anyway" +#~ msgstr "Suspender mesmo assim" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Hibernar mesmo assim" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Desligar mesmo assim" + +#~ msgid "Restart Anyway" +#~ msgstr "Reiniciar mesmo assim" + +#~ msgid "Lock Screen" +#~ msgstr "Bloquear tela" + +#~ msgid "Cancel" +#~ msgstr "Cancelar" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Essa sessão será encerrada automaticamente em %d segundo." +#~ msgstr[1] "Essa sessão será encerrada automaticamente em %d segundos." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Este sistema será automaticamente desligado em %d segundo." +#~ msgstr[1] "Este sistema será automaticamente desligado em %d segundos." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Este sistema será automaticamente reiniciado em %d segundo." +#~ msgstr[1] "Este sistema será automaticamente reiniciado em %d segundos." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Você está logado atualmente como \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Encerrar a sessão deste sistema agora?" + +#~ msgid "_Switch User" +#~ msgstr "_Trocar usuário" + +#~ msgid "Shut down this system now?" +#~ msgstr "Desligar este sistema agora?" + +#~ msgid "S_uspend" +#~ msgstr "S_uspender" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernar" + +#~ msgid "_Restart" +#~ msgstr "_Reiniciar" + +#~ msgid "_Shut Down" +#~ msgstr "_Desligar" + +#~ msgid "Restart this system now?" +#~ msgstr "Reiniciar este sistema agora?" #~ msgid "Icon '%s' not found" #~ msgstr "Ícone \"%s\" não localizado" diff -Nru gnome-session-3.9.90/po/pt.po gnome-session-3.14.0/po/pt.po --- gnome-session-3.9.90/po/pt.po 2013-03-19 17:16:27.000000000 +0000 +++ gnome-session-3.14.0/po/pt.po 2014-06-25 18:06:34.000000000 +0000 @@ -1,22 +1,24 @@ -# gnome-session's Portuguese translation -# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 gnome-session -# Distributed under the same licence as the gnome-session package -# Nuno Ferreira , 1999 -# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. -# +# gnome-session's Portuguese translation +# Copyright © 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 gnome-session +# Distributed under the same licence as the gnome-session package +# Nuno Ferreira , 1999 +# Duarte Loreto , 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013. +# António Lima , 2013. +# msgid "" msgstr "" "Project-Id-Version: 3.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-12 13:30+0000\n" -"PO-Revision-Date: 2013-03-12 13:15+0000\n" -"Last-Translator: Duarte Loreto \n" +"POT-Creation-Date: 2013-09-22 23:47+0100\n" +"PO-Revision-Date: 2013-09-21 23:26-0100\n" +"Last-Translator: António Lima \n" "Language-Team: Português \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -38,31 +40,31 @@ msgid "The startup command is not valid" msgstr "O comando de arranque não é válido" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Ativo" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ícone" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Aplicação" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Preferências das Aplicações de Arranque" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Sem nome" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Sem descrição" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Versão desta aplicação" @@ -70,14 +72,6 @@ msgid "Could not display help document" msgstr "Incapaz de apresentar o documento de ajuda" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Esta é uma sessão no GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Personalizado" @@ -86,10 +80,35 @@ msgid "This entry lets you select a saved session" msgstr "Esta entrada permite-lhe selecionar uma sessão gravada" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Esta é uma sessão no GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME de teste" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplicações de Arranque" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Selecione que aplicações arrancar ao iniciar uma sessão" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME sobre Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Esta sessão faz com que entre no GNOME, utilizando o Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Sessão Personalizada" @@ -114,18 +133,6 @@ msgid "_Continue" msgstr "_Continuar" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Algumas aplicações ainda se encontram em execução:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplicações de Arranque" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Selecione que aplicações arrancar ao iniciar uma sessão" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "A_plicações de arranque adicionais:" @@ -233,11 +240,11 @@ msgid "Show session management options" msgstr "Apresentar as opções de gestão de sessões" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Ocorreu um erro inesperado." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -245,7 +252,7 @@ "Ocorreu um problema e o sistema é incapaz de recuperar. Contacte um " "administrador do sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -253,7 +260,7 @@ "Ocorreu um problema e o sistema é incapaz de recuperar. Por precaução, foram " "desativadas todas as extensões." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -261,140 +268,23 @@ "Ocorreu um problema e o sistema é incapaz de recuperar.\n" "Termine a sessão e tente novamente." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Terminar a Sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Ativar o código de depuração" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Permitir terminar sessão" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Apresentar aviso de extensão" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Desconhecido" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Uma aplicação ainda se encontra em execução:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"A aguardar que a aplicação termine. Interromper a aplicação pode causar a " -"perca de trabalho." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"A aguardar que as aplicações terminem. Interromper estas aplicações pode " -"causar a perca de trabalho." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Ainda Assim Alternar Utilizador" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Ainda Assim Terminar a Sessão" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Ainda Assim Suspender" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Ainda Assim Hibernar" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Ainda Assim Desligar" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Ainda Assim Reiniciar" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Trancar o Ecrã" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Cancelar" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "A sua sessão terminará automaticamente dentro de %d segundo." -msgstr[1] "A sua sessão terminará automaticamente dentro de %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "O sistema será automaticamente desligado dentro de %d segundo." -msgstr[1] "O sistema será automaticamente desligado dentro de %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Este sistema será reiniciado automaticamente dentro de %d segundo." -msgstr[1] "Este sistema será reiniciado automaticamente dentro de %d segundos." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "A sessão atual está iniciada com o utilizador \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Terminar a sessão neste sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Alternar Utilizador" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Desligar este sistema agora?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "S_uspender" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernar" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reiniciar" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Desligar" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Reiniciar este sistema agora?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Não está a responder" @@ -406,11 +296,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Aplicação Recordada" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Esta aplicação está a impedir o encerramento da sessão." @@ -427,32 +317,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Incapaz de criar socket de escuta ICE: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Especificar novos diretórios base de arranque automático" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "DIR_INICIOAUTO" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sessão a utilizar" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NOME_SESSAO" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Não ler as aplicações especificadas pelo utilizador" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Apresentar o diálogo de falha total para teste" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - o gestor de sessões do GNOME" @@ -554,8 +444,96 @@ msgid "Program called with conflicting options" msgstr "Aplicação invocada com conflito de opções" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME de recurso" +#~ msgid "Some programs are still running:" +#~ msgstr "Algumas aplicações ainda se encontram em execução:" + +#~ msgid "Unknown" +#~ msgstr "Desconhecido" + +#~ msgid "A program is still running:" +#~ msgstr "Uma aplicação ainda se encontra em execução:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "A aguardar que a aplicação termine. Interromper a aplicação pode causar a " +#~ "perca de trabalho." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "A aguardar que as aplicações terminem. Interromper estas aplicações pode " +#~ "causar a perca de trabalho." + +#~ msgid "Switch User Anyway" +#~ msgstr "Ainda Assim Alternar Utilizador" + +#~ msgid "Log Out Anyway" +#~ msgstr "Ainda Assim Terminar a Sessão" + +#~ msgid "Suspend Anyway" +#~ msgstr "Ainda Assim Suspender" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Ainda Assim Hibernar" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Ainda Assim Desligar" + +#~ msgid "Restart Anyway" +#~ msgstr "Ainda Assim Reiniciar" + +#~ msgid "Lock Screen" +#~ msgstr "Trancar o Ecrã" + +#~ msgid "Cancel" +#~ msgstr "Cancelar" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "A sua sessão terminará automaticamente dentro de %d segundo." +#~ msgstr[1] "A sua sessão terminará automaticamente dentro de %d segundos." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "O sistema será automaticamente desligado dentro de %d segundo." +#~ msgstr[1] "O sistema será automaticamente desligado dentro de %d segundos." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "" +#~ "Este sistema será reiniciado automaticamente dentro de %d segundo." +#~ msgstr[1] "" +#~ "Este sistema será reiniciado automaticamente dentro de %d segundos." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "A sessão atual está iniciada com o utilizador \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Terminar a sessão neste sistema agora?" + +#~ msgid "_Switch User" +#~ msgstr "_Alternar Utilizador" + +#~ msgid "Shut down this system now?" +#~ msgstr "Desligar este sistema agora?" + +#~ msgid "S_uspend" +#~ msgstr "S_uspender" + +#~ msgid "_Hibernate" +#~ msgstr "_Hibernar" + +#~ msgid "_Restart" +#~ msgstr "_Reiniciar" + +#~ msgid "_Shut Down" +#~ msgstr "_Desligar" + +#~ msgid "Restart this system now?" +#~ msgstr "Reiniciar este sistema agora?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/ru.po gnome-session-3.14.0/po/ru.po --- gnome-session-3.9.90/po/ru.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/ru.po 2014-06-25 18:06:34.000000000 +0000 @@ -14,16 +14,17 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-02-21 10:41+0400\n" -"Last-Translator: Yuri Myasoedov \n" +"POT-Creation-Date: 2013-09-10 13:37+0000\n" +"PO-Revision-Date: 2013-09-10 20:09+0600\n" +"Last-Translator: Dmitriy S. Seregin \n" "Language-Team: русский \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.7\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -45,31 +46,31 @@ msgid "The startup command is not valid" msgstr "Некорректная команда запуска" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Включено" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Значок" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Программа" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Настройки запуска приложений" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Нет имени" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Нет описания" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Версия этого приложения" @@ -77,14 +78,6 @@ msgid "Could not display help document" msgstr "Не удалось показать документ справки" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Этот сеанс позволяет вам войти в GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Другой сеанс" @@ -93,11 +86,35 @@ msgid "This entry lets you select a saved session" msgstr "Эта запись позволяет вам выбрать сохранённый сеанс" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Этот сеанс позволяет вам войти в GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Фиктивный сеанс GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Запускаемые приложения" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Выберите приложения, запускаемые при входе в систему" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME на Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Этот сеанс позволяет вам войти в GNOME с помощью Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Другой сеанс" @@ -122,18 +139,6 @@ msgid "_Continue" msgstr "_Продолжить" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Некоторые программы всё ещё работают:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Запускаемые приложения" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Выберите приложения, запускаемые при входе в систему" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Дополнительные _программы, запускаемые при старте:" @@ -238,11 +243,11 @@ msgid "Show session management options" msgstr "Отобразить параметры управления сеансами:" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "О, нет! Что-то пошло не так." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -250,7 +255,7 @@ "Произошла ошибка, и системе не удалось восстановиться. Обратитесь к " "системному администратору." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -258,7 +263,7 @@ "Произошла ошибка, и системе не удалось восстановиться. Все расширения были " "отключены в целях безопасности." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -266,154 +271,27 @@ "Произошла ошибка, и системе не удалось восстановиться.\n" "Нужно завершить сеанс и войти снова." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Завершить сеанс" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Включить отладочный код" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Разрешить завершение сеанса" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Показывать предупреждения от расширений" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Неизвестно" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Программа всё ещё работает:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Ожидание завершения работы программы. Прерывание программы может привести к " -"потере данных." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Ожидание завершения работы программ. Прерывание этих программ может привести " -"к потере данных." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Всё равно сменить пользователя" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Всё равно выйти" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Всё равно приостановить систему" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Всё равно перевести в режим сна" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Всё равно выключить" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Всё равно перезапустить" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Заблокировать экран" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Отмена" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Вы автоматически выйдете из системы через %d секунду." -msgstr[1] "Вы автоматически выйдете из системы через %d секунды." -msgstr[2] "Вы автоматически выйдете из системы через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Система будет выключена автоматически через %d секунду." -msgstr[1] "Система будет выключена автоматически через %d секунды." -msgstr[2] "Система будет выключена автоматически через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Система будет автоматически перезапущена через %d секунду." -msgstr[1] "Система будет автоматически перезапущена через %d секунды." -msgstr[2] "Система будет автоматически перезапущена через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Вы вошли в систему как пользователь «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Выйти из системы сейчас?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Сменить пользователя" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Выключить систему сейчас?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Ждущий режим" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Спящий режим" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Пе_резагрузить" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "В_ыключить" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Перезапустить систему сейчас?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Не отвечает" #: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" msgid "_Log out" msgstr "_Завершить сеанс" @@ -421,51 +299,51 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Запомненное приложение" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Эта программа блокирует выход из системы." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "Новые клиентские подключения отклоняются, т. к. сеанс завершается\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Не удалось создать сокет, слушающий ICE: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Заместить стандартные каталоги автозапуска" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "КАТАЛОГ_АВТОЗАПУСКА" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Использовать сеанс" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "НАЗВАНИЕ_СЕАНСА" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Не загружать указанные пользователем приложения" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Показать для отладки диалог с сообщением об ошибке" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "— менеджер сеансов GNOME" @@ -515,7 +393,6 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "Сеанс %d" @@ -565,44 +442,3 @@ #: ../tools/gnome-session-quit.c:203 msgid "Program called with conflicting options" msgstr "Программа вызвана с конфликтующими параметрами" - -#~ msgid "GNOME fallback" -#~ msgstr "Альтернативный режим GNOME" - -#~ msgid "Icon '%s' not found" -#~ msgstr "Значок «%s» не найден" - -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "Не удалось загрузить GNOME 3" - -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "К сожалению, GNOME 3 не смог корректно запуститься и был запущен в " -#~ "альтернативном режиме.\n" -#~ "\n" -#~ "Скорее всего, система (графическая подсистема или драйвер) не " -#~ "поддерживает в должной мере все возможности GNOME 3." - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "Узнайте больше о GNOME 3" - -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "Не удалось запустить сеанс (и подключиться к X-серверу)" - -#~ msgid "Some programs are still running:" -#~ msgstr "Некоторые программы всё еще работают:" - -#~ msgid "Exited with code %d" -#~ msgstr "Завершено с кодом %d" - -#~ msgid "Killed by signal %d" -#~ msgstr "Завершено сигналом %d" - -#~ msgid "Stopped by signal %d" -#~ msgstr "Остановлено сигналом %d" diff -Nru gnome-session-3.9.90/po/sk.po gnome-session-3.14.0/po/sk.po --- gnome-session-3.9.90/po/sk.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/sk.po 2014-06-25 18:06:34.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-21 22:02+0000\n" -"PO-Revision-Date: 2013-02-22 23:18+0000\n" +"POT-Creation-Date: 2013-09-10 19:20+0000\n" +"PO-Revision-Date: 2013-09-10 21:33+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -48,35 +48,35 @@ msgstr "Príkaz na spustenie pri štarte je neplatný" # tree_view_column -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Povolený" # tree_view_column -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikona" # tree_view_column -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" #  window title -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Nastavenia aplikácií spúšťaných pri štarte" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Bez názvu" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Bez popisu" # cmd desc -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Verzia tejto aplikácie" @@ -84,16 +84,6 @@ msgid "Could not display help document" msgstr "Nepodarilo sa zobraziť dokument pomocníka" -# desktop entry name; gnome session name -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -# desktop entry comment -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Táto relácia vás prihlási do GNOME" - # desktop entry name #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" @@ -104,11 +94,41 @@ msgid "This entry lets you select a saved session" msgstr "Táto položka vám umožní vybrať uloženú reláciu" +# desktop entry name; gnome session name +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +# desktop entry comment +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Táto relácia vás prihlási do GNOME" + # desktop entry name #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Fingované GNOME" +# desktop entry name +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Aplikácie spúšťané pri štarte" + +# desktop entry comment +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Umožňuje zvoliť aplikácie, ktoré sa majú spustiť, keď sa prihlásite" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME cez Wayland" + +# desktop entry comment +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Táto relácia vás prihlási do GNOME s použitím protokolu Wayland" + # GtkWindow title #: ../data/session-selector.ui.h:1 msgid "Custom Session" @@ -140,21 +160,6 @@ msgstr "_Pokračovať" # GtkLabel label -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Niektoré programy stále bežia:" - -# desktop entry name -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Aplikácie spúšťané pri štarte" - -# desktop entry comment -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Umožňuje zvoliť aplikácie, ktoré sa majú spustiť, keď sa prihlásite" - -# GtkLabel label #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Ďalšie _programy spúšťané pri štarte:" @@ -272,11 +277,11 @@ msgid "Show session management options" msgstr "Zobrazí voľby pre správu relácie" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Ale nie! Niekde sa stala chyba." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -286,7 +291,7 @@ # PK: extensions asi zasuvne moduly # DK: zasuvne moduly su "plugins".tu sa jedna o rozsirenia Shellu.mam overene v praxi. -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -294,7 +299,7 @@ "Vyskytla sa chyba a systém sa nedokáže obnoviť. Všetky rozšírenia boli " "preventívne zakázané." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -303,154 +308,26 @@ "Prosím, odhláste sa a skúste to znovu." # button -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Odhlásiť sa" # cmd desc -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Povolí ladiaci kód" # cmd desc -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Povolí odhlásenie" # cmd desc -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Zobrazí upozornenie rozšírenia" -# ide o program, preto mužský rod -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Neznámy" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Program stále beží:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Čaká sa na ukončenie programu. Prerušenie tohto programu môže spôsobiť " -"stratu vašej práce." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Čaká sa na ukončenie programov. Prerušenie týchto programov môže spôsobiť " -"stratu vašej práce." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Napriek tomu prepnúť používateľa" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Napriek tomu odhlásiť" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Napriek tomu uspať" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Napriek tomu hibernovať" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Napriek tomu vypnúť" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Napriek tomu reštartovať" - -# button -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Uzamknúť obrazovku" - -# button -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Zrušiť" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Budete automaticky odhlásený o %d sekúnd." -msgstr[1] "Budete automaticky odhlásený o %d sekundu." -msgstr[2] "Budete automaticky odhlásený o %d sekundy." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Tento systém sa automaticky vypne o %d sekúnd." -msgstr[1] "Tento systém sa automaticky vypne o %d sekundu." -msgstr[2] "Tento systém sa automaticky vypne o %d sekundy." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Tento systém sa automaticky reštartuje o %d sekúnd." -msgstr[1] "Tento systém sa automaticky reštartuje o %d sekundu." -msgstr[2] "Tento systém sa automaticky reštartuje o %d sekundy." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Momentálne ste prihlásený ako používateľ „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Odhlásiť sa teraz zo systému?" - -# button -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Prepnúť používateľa" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Vypnúť teraz počítač?" - -# button -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Uspať" - -# button -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Hibernovať" - -# button -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Reštartovať" - -# button -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Vypnúť" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Reštartovať teraz počítač?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Neodpovedá" @@ -463,11 +340,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Zapamätaná aplikácia" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Tento program blokuje odhlásenie." @@ -483,35 +360,35 @@ msgstr "Nepodarilo sa vytvoriť načúvajúci soket ICE: %s" # cmd desc -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Preváži predvolené adresáre automatického spúšťania" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "ADRESÁR_AUTOSPUSTENIA" # cmd desc -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Relácia, ktorá bude použitá" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NÁZOV_RELÁCIE" # cmd desc -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Nenačíta aplikácie špecifikované používateľom" # cmd desc #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Zobrazí dialógové okno s chybou slúžiace na testovanie" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - správca relácie GNOME" diff -Nru gnome-session-3.9.90/po/sl.po gnome-session-3.14.0/po/sl.po --- gnome-session-3.9.90/po/sl.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/sl.po 2014-06-25 18:06:34.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the gnome-session package. # # Andraž Tori 2000. -# Matej Urbančič , 2007 - 2013. +# Matej Urbančič , 2007-2013. # msgid "" msgstr "" "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-24 11:28+0000\n" -"PO-Revision-Date: 2013-02-24 21:31+0100\n" +"POT-Creation-Date: 2013-09-10 18:40+0000\n" +"PO-Revision-Date: 2013-09-10 21:07+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -43,31 +43,31 @@ msgid "The startup command is not valid" msgstr "Začetni ukaz ni veljaven" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Omogočeno" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikona" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Možnosti začetnih programov" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Brez imena" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Brez opisa" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Različica programa" @@ -75,14 +75,6 @@ msgid "Could not display help document" msgstr "Ni mogoče prikazati dokumenta pomoči" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Seja vas prijavi v GNOME namizje" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Po meri" @@ -91,10 +83,35 @@ msgid "This entry lets you select a saved session" msgstr "Možnost omogoča izbor shranjene seje" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Seja omogoča prijavo v namizje GNOME." + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Poskusni GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Začetni programi" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Izbor programov za samodejni zagon ob prijavi" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME na sistemu Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "Seja omogoča prijavo v namizje GNOME z uporabo sistema Wayland." + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Seja po meri" @@ -119,18 +136,6 @@ msgid "_Continue" msgstr "N_adaljuj" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Nekateri programi so še vedno zagnani:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Začetni programi" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Izbor programov za samodejni zagon ob prijavi" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Dodatni _začetni programi:" @@ -237,11 +242,11 @@ msgid "Show session management options" msgstr "Pokaži možnosti upravljanja seje" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Prišlo je do nepričakovane napake." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -249,7 +254,7 @@ "Prišlo je do napake, ki je ni mogoče samodejno odpraviti.\n" "Stopite v stik s skrbnikom." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -257,7 +262,7 @@ "Prišlo je do napake, ki je ni mogoče samodejno odpraviti. Priporočljivo je " "onemogočiti vse razširitve, dokler se napaka ne razreši." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -265,146 +270,23 @@ "Prišlo je do napake, ki je ni mogoče samodejno odpraviti.\n" "Odjavite se in poskusite znova." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Odjava" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Omogoči razhroščevanje kode" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Dovoli odjavo" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Pokaži opozorila razširitev" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Neznano" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Program je še vedno zagnan:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Čakanje na konec izvajanja programa. Prekinitev izvajanja lahko povzroči " -"izgubo vaših podatkov." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Čakanje na konec izvajanja programov. Prekinitev izvajanja lahko povzroči " -"izgubo vaših podatkov." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Vseeno preklopi uporabnika" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Vseeno se odjavi" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Vseeno postavi v pripravljenost" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Vseeno postavi v mirovanje" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Vseeno izklopi računalnik" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Vseeno ponovno zaženi" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Zakleni zaslon" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Prekliči" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Samodejno boste odjavljeni čez %d sekund." -msgstr[1] "Samodejno boste odjavljeni čez %d sekundo." -msgstr[2] "Samodejno boste odjavljeni čez %d sekundi." -msgstr[3] "Samodejno boste odjavljeni čez %d sekunde." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Sistem se bo samodejno izklopil čez %d sekund." -msgstr[1] "Sistem se bo samodejno izklopil čez %d sekundo." -msgstr[2] "Sistem se bo samodejno izklopil čez %d sekundi." -msgstr[3] "Sistem se bo samodejno izklopil čez %d sekunde." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Sistem se bo samodejno ponovno zagnal čez %d sekund." -msgstr[1] "Sistem se bo samodejno ponovno zagnal čez %d sekundo." -msgstr[2] "Sistem se bo samodejno ponovno zagnal čez %d sekundi." -msgstr[3] "Sistem se bo samodejno ponovno zagnal čez %d sekunde." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Trenutno ste prijavljeni kot \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Ali se želite odjaviti iz sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Preklop uporabnika" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Ali želite izklopiti računalnik?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "V _pripravljenost" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "V _mirovanje" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Ponoven zagon" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Izklopi" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Ali naj se sistem ponovno zažene?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Ni odziva" @@ -416,11 +298,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Zapomnjeni programi" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Program zavira postopek odjave." @@ -435,32 +317,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Ni mogoče ustvariti ICE vtiča za poslušanje: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Preskoči običajne mape samodejnega zagona" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "ZAČETNA_MAPA" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Seja za uporabo" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "IME_SEJE" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ne naloži uporabniško določenih programov" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Pokaži pogovorno okno napak med preizkušanjem." -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- upravljalnik seje GNOME" @@ -563,8 +445,100 @@ msgid "Program called with conflicting options" msgstr "Program zagnan z nasprotujočimi si možnostmi ukaza" -#~ msgid "GNOME fallback" -#~ msgstr "Povratni nabor GNOME" +#~ msgid "Some programs are still running:" +#~ msgstr "Nekateri programi so še vedno zagnani:" + +#~ msgid "Unknown" +#~ msgstr "Neznano" + +#~ msgid "A program is still running:" +#~ msgstr "Program je še vedno zagnan:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Čakanje na konec izvajanja programa. Prekinitev izvajanja lahko povzroči " +#~ "izgubo vaših podatkov." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Čakanje na konec izvajanja programov. Prekinitev izvajanja lahko povzroči " +#~ "izgubo vaših podatkov." + +#~ msgid "Switch User Anyway" +#~ msgstr "Vseeno preklopi uporabnika" + +#~ msgid "Log Out Anyway" +#~ msgstr "Vseeno se odjavi" + +#~ msgid "Suspend Anyway" +#~ msgstr "Vseeno postavi v pripravljenost" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Vseeno postavi v mirovanje" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Vseeno izklopi računalnik" + +#~ msgid "Restart Anyway" +#~ msgstr "Vseeno ponovno zaženi" + +#~ msgid "Lock Screen" +#~ msgstr "Zakleni zaslon" + +#~ msgid "Cancel" +#~ msgstr "Prekliči" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Samodejno boste odjavljeni čez %d sekund." +#~ msgstr[1] "Samodejno boste odjavljeni čez %d sekundo." +#~ msgstr[2] "Samodejno boste odjavljeni čez %d sekundi." +#~ msgstr[3] "Samodejno boste odjavljeni čez %d sekunde." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Sistem se bo samodejno izklopil čez %d sekund." +#~ msgstr[1] "Sistem se bo samodejno izklopil čez %d sekundo." +#~ msgstr[2] "Sistem se bo samodejno izklopil čez %d sekundi." +#~ msgstr[3] "Sistem se bo samodejno izklopil čez %d sekunde." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Sistem se bo samodejno ponovno zagnal čez %d sekund." +#~ msgstr[1] "Sistem se bo samodejno ponovno zagnal čez %d sekundo." +#~ msgstr[2] "Sistem se bo samodejno ponovno zagnal čez %d sekundi." +#~ msgstr[3] "Sistem se bo samodejno ponovno zagnal čez %d sekunde." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Trenutno ste prijavljeni kot \"%s\"." + +#~ msgid "Log out of this system now?" +#~ msgstr "Ali se želite odjaviti iz sistema?" + +#~ msgid "_Switch User" +#~ msgstr "_Preklop uporabnika" + +#~ msgid "Shut down this system now?" +#~ msgstr "Ali želite izklopiti računalnik?" + +#~ msgid "S_uspend" +#~ msgstr "V _pripravljenost" + +#~ msgid "_Hibernate" +#~ msgstr "V _mirovanje" + +#~ msgid "_Restart" +#~ msgstr "_Ponoven zagon" + +#~ msgid "_Shut Down" +#~ msgstr "_Izklopi" + +#~ msgid "Restart this system now?" +#~ msgstr "Ali naj se sistem ponovno zažene?" #~ msgid "%d hour" #~ msgid_plural "%d hours" diff -Nru gnome-session-3.9.90/po/sr@latin.po gnome-session-3.14.0/po/sr@latin.po --- gnome-session-3.9.90/po/sr@latin.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/sr@latin.po 2014-06-25 18:06:34.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-01 10:35+0200\n" +"POT-Creation-Date: 2013-09-16 12:25+0000\n" +"PO-Revision-Date: 2013-10-05 06:19+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -43,31 +43,31 @@ msgid "The startup command is not valid" msgstr "Naredba početnog programa nije ispravna" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Uključen" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Ikonica" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Program" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Postavke početnih programa" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Bez imena" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Bez opisa" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Izdanje ovog programa" @@ -75,14 +75,6 @@ msgid "Could not display help document" msgstr "Ne mogu da prikažem dokument pomoći" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "Gnom" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Ova sesija vas prijavljuje u Gnom" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Proizvoljno" @@ -91,11 +83,36 @@ msgid "This entry lets you select a saved session" msgstr "Ova stavka vam dopušta da izaberete sačuvanu sesiju" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "Gnom" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Ova sesija vas prijavljuje u Gnom" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Gnomov lažnjak" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Početni programi" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Izaberite koji će se programi pokrenuti kada se prijavite na računar" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Gnom na Vejlandu" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Ova sesija vas prijavljuje u Gnom, koristeći Vajland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Proizvoljna sesija" @@ -120,18 +137,6 @@ msgid "_Continue" msgstr "_Nastavi" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Neki programi su još uvek pokrenuti:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Početni programi" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Izaberite koji će se programi pokrenuti kada se prijavite na računar" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Dodatni početni _programi:" @@ -236,11 +241,11 @@ msgid "Show session management options" msgstr "Prikazuje mogućnosti upravljanja sesijom" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "O, ne! Nešto je pošlo naopako!" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -248,7 +253,7 @@ "Došlo je do problema i sistem ne može da se oporavi. Molim obratite se " "administratoru sistema" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -256,7 +261,7 @@ "Došlo je do problema i sistem ne može da se oporavi. Sva proširenja su " "isključena zarad predostrožnosti." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -264,148 +269,23 @@ "Došlo je do problema i sistem ne može da se oporavi.\n" "Molim odjavite se i pokušajte opet." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Odjavi me" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Uključuje kod za ispravljanje grešaka" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Dozvoljava odjavljivanje" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Prikazuje upozorenje proširenja" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Nepoznato" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Program je još uvek pokrenut:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Čekam na program da završi sa radom. Prekid programa može dovesti do gubitka " -"vašeg rada." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Čekam da programi završe sa radom. Izlazak iz ovih programa može dovesti do " -"gubitka vaših radova." - -# Kako je potrebno da bude što kraće usudih se da promenim konstrukciju -# „Promeni korisnika i pored toga“ u „Ipak promeni korisnika“ ~ Miloš -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Ipak promeni korisnika" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Ipak se odjavi" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Ipak obustavi rad" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Ipak zamrzni računar" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Ipak isključi računar" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Ipak ponovo pokreni" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Zaključaj ekran" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Otkaži" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Bićete odjavljeni u roku od %d sekunde." -msgstr[1] "Bićete odjavljeni u roku od %d sekunde." -msgstr[2] "Bićete odjavljeni u roku od %d sekundi." -msgstr[3] "Bićete odjavljeni u roku od jedne sekunde." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Računar će se sam isključiti za %d sekundu." -msgstr[1] "Računar će se sam isključiti za %d sekunde." -msgstr[2] "Računar će se sam isključiti za %d sekundi." -msgstr[3] "Računar će se sam isključiti za jednu sekundu." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Računar će se sam ponovo pokrenuti za %d sekundu." -msgstr[1] "Računar će se sam ponovo pokrenuti za %d sekunde." -msgstr[2] "Računar će se sam ponovo pokrenuti za %d sekundi." -msgstr[3] "Računar će se sam ponovo pokrenuti za jednu sekundu." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Trenutno ste prijavljeni kao „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Da li da se odjavim sa sistema?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Promeni korisnika" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Da li da isključim računar?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Obustavi" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Zamrzni" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Ponovo pokreni" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Isključi" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Da li da ponovo pokrenem računar?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Ne daje odziv" @@ -417,11 +297,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Zapamćeni program" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ovaj program onemogućava odjavu." @@ -436,32 +316,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Ne mogu da napravim priključak ICE osluškivanja: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Zaobilazi uobičajene direktorijume samopokretanja" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "DIREKTORIJUM_SAMOPOKRETANJA" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Sesije koje će biti korišćene" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "NAZIV_SESIJE" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Ne učitava programe koje je zadao korisnik" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Prikazuje prozorče neuspeha za isprobavanje" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " — upravnik Gnomovom sesijom" diff -Nru gnome-session-3.9.90/po/sr.po gnome-session-3.14.0/po/sr.po --- gnome-session-3.9.90/po/sr.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/sr.po 2014-06-25 18:06:34.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-23 07:03+0000\n" -"PO-Revision-Date: 2013-03-01 10:35+0200\n" +"POT-Creation-Date: 2013-09-16 12:25+0000\n" +"PO-Revision-Date: 2013-10-05 06:19+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -43,31 +43,31 @@ msgid "The startup command is not valid" msgstr "Наредба почетног програма није исправна" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Укључен" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Иконица" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Програм" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Поставке почетних програма" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Без имена" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Без описа" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Издање овог програма" @@ -75,14 +75,6 @@ msgid "Could not display help document" msgstr "Не могу да прикажем документ помоћи" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "Гном" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Ова сесија вас пријављује у Гном" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Произвољно" @@ -91,11 +83,36 @@ msgid "This entry lets you select a saved session" msgstr "Ова ставка вам допушта да изаберете сачувану сесију" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "Гном" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Ова сесија вас пријављује у Гном" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Гномов лажњак" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Почетни програми" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Изаберите који ће се програми покренути када се пријавите на рачунар" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Гном на Вејланду" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Ова сесија вас пријављује у Гном, користећи Вајланд" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Произвољна сесија" @@ -120,18 +137,6 @@ msgid "_Continue" msgstr "_Настави" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Неки програми су још увек покренути:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Почетни програми" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Изаберите који ће се програми покренути када се пријавите на рачунар" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Додатни почетни _програми:" @@ -236,11 +241,11 @@ msgid "Show session management options" msgstr "Приказује могућности управљања сесијом" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "О, не! Нешто је пошло наопако!" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -248,7 +253,7 @@ "Дошло је до проблема и систем не може да се опорави. Молим обратите се " "администратору система" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -256,7 +261,7 @@ "Дошло је до проблема и систем не може да се опорави. Сва проширења су " "искључена зарад предострожности." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -264,148 +269,23 @@ "Дошло је до проблема и систем не може да се опорави.\n" "Молим одјавите се и покушајте опет." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Одјави ме" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Укључује код за исправљање грешака" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Дозвољава одјављивање" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Приказује упозорење проширења" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Непознато" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Програм је још увек покренут:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Чекам на програм да заврши са радом. Прекид програма може довести до губитка " -"вашег рада." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Чекам да програми заврше са радом. Излазак из ових програма може довести до " -"губитка ваших радова." - -# Како је потребно да буде што краће усудих се да променим конструкцију -# „Промени корисника и поред тога“ у „Ипак промени корисника“ ~ Милош -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Ипак промени корисника" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Ипак се одјави" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Ипак обустави рад" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Ипак замрзни рачунар" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Ипак искључи рачунар" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Ипак поново покрени" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Закључај екран" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Откажи" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Бићете одјављени у року од %d секунде." -msgstr[1] "Бићете одјављени у року од %d секунде." -msgstr[2] "Бићете одјављени у року од %d секунди." -msgstr[3] "Бићете одјављени у року од једне секунде." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Рачунар ће се сам искључити за %d секунду." -msgstr[1] "Рачунар ће се сам искључити за %d секунде." -msgstr[2] "Рачунар ће се сам искључити за %d секунди." -msgstr[3] "Рачунар ће се сам искључити за једну секунду." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Рачунар ће се сам поново покренути за %d секунду." -msgstr[1] "Рачунар ће се сам поново покренути за %d секунде." -msgstr[2] "Рачунар ће се сам поново покренути за %d секунди." -msgstr[3] "Рачунар ће се сам поново покренути за једну секунду." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Тренутно сте пријављени као „%s“." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Да ли да се одјавим са система?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Промени корисника" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Да ли да искључим рачунар?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Обустави" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Замрзни" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Поново покрени" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Искључи" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Да ли да поново покренем рачунар?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Не даје одзив" @@ -417,11 +297,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Запамћени програм" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Овај програм онемогућава одјаву." @@ -436,32 +316,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Не могу да направим прикључак ИЦЕ ослушкивања: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Заобилази уобичајене директоријуме самопокретања" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "ДИРЕКТОРИЈУМ_САМОПОКРЕТАЊА" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Сесије које ће бити коришћене" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "НАЗИВ_СЕСИЈЕ" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Не учитава програме које је задао корисник" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Приказује прозорче неуспеха за испробавање" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " — управник Гномовом сесијом" diff -Nru gnome-session-3.9.90/po/sv.po gnome-session-3.14.0/po/sv.po --- gnome-session-3.9.90/po/sv.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/sv.po 2014-07-18 20:50:42.000000000 +0000 @@ -1,85 +1,38 @@ # Swedish messages for gnome-session. -# Copyright (C) 1998-2012 Free Software Foundation, Inc. +# Copyright © 1998-2012, 2014 Free Software Foundation, Inc. # Martin Wahlen , 1998. # Anders Carlsson , 1999. # Andreas Hyden , 2000. # Martin Norbäck , 2000, 2001. # Christian Rose , 2000, 2001, 2002, 2003, 2004, 2005. # Daniel Nylander , 2006, 2007, 2008, 2009, 2010, 2011, 2012. +# Anders Jonsson , 2014. # msgid "" msgstr "" "Project-Id-Version: gnome-session\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-02 20:52+0200\n" -"PO-Revision-Date: 2012-09-02 20:54+0100\n" -"Last-Translator: Daniel Nylander \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-04-07 07:49+0000\n" +"PO-Revision-Date: 2014-05-22 23:07+0100\n" +"Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Poedit 1.6.4\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Välj kommando" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Lägg till uppstartsprogram" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Redigera uppstartsprogram" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "Uppstartsprogrammets kommando får inte vara tomt" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "Uppstartsprogrammets kommando är inte giltigt" - -#: ../capplet/gsm-properties-dialog.c:518 -msgid "Enabled" -msgstr "Aktiverat" - -#: ../capplet/gsm-properties-dialog.c:530 -msgid "Icon" -msgstr "Ikon" - -#: ../capplet/gsm-properties-dialog.c:542 -msgid "Program" -msgstr "Program" - -#: ../capplet/gsm-properties-dialog.c:746 -msgid "Startup Applications Preferences" -msgstr "Inställningar för uppstartsprogram" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "Inget namn" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Ingen beskrivning" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Anpassad" + +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Denna post låter dig välja en sparad session" -#: ../capplet/main.c:35 -#: ../gnome-session/main.c:294 -msgid "Version of this application" -msgstr "Version av detta program" - -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Kunde inte visa hjälpdokumentet" - -#: ../data/gnome-fallback.session.desktop.in.in.h:1 -msgid "GNOME fallback" -msgstr "Fall tillbaka på GNOME" - -#: ../data/gnome.session.desktop.in.in.h:1 -#: ../data/gnome.desktop.in.h:1 +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" msgstr "GNOME" @@ -87,23 +40,49 @@ msgid "This session logs you into GNOME" msgstr "Denna session loggar in dig i GNOME" -#: ../data/gsm-inhibit-dialog.ui.h:1 -#: ../gnome-session/gsm-inhibit-dialog.c:643 -msgid "Some programs are still running:" -msgstr "Några program körs fortfarande:" - -#: ../data/gsm-inhibit-dialog.ui.h:2 -#: ../gnome-session/gsm-inhibit-dialog.c:640 -msgid "Waiting for the program to finish. Interrupting the program may cause you to lose work." -msgstr "Väntar på att programmet ska köras färdigt. Avbryta programmet kan innebära att du förlorar data." - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Uppstartsprogram" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Välj vilka program att starta när du loggar in" +# a dummy gnome-session which does not start anything +# but the autostart software and the DBus API +#: ../data/gnome-dummy.session.desktop.in.in.h:1 +#| msgid "GNOME" +msgid "GNOME dummy" +msgstr "GNOME-attrapp" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "GNOME med Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Denna session loggar in dig i GNOME och använder Wayland" + +#: ../data/session-selector.ui.h:1 +#| msgid "Default session" +msgid "Custom Session" +msgstr "Anpassad session" + +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 +msgid "Please select a custom session to run" +msgstr "Välj en anpassad session att köra" + +#: ../data/session-selector.ui.h:3 +msgid "_New Session" +msgstr "_Ny session" + +#: ../data/session-selector.ui.h:4 +msgid "_Remove Session" +msgstr "_Ta bort session" + +#: ../data/session-selector.ui.h:5 +#| msgid "Default session" +msgid "Rena_me Session" +msgstr "Byt na_mn på session" + +#: ../data/session-selector.ui.h:6 +msgid "_Continue" +msgstr "_Fortsätt" #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -127,7 +106,7 @@ #: ../data/session-properties.ui.h:6 msgid "Browse…" -msgstr "Bläddra..." +msgstr "Bläddra…" #: ../data/session-properties.ui.h:7 msgid "Comm_ent:" @@ -141,202 +120,27 @@ msgid "_Name:" msgstr "_Namn:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Filen är inte en giltig .desktop-fil" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Okänd version i skrivbordsfil \"%s\"" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "Startar %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Programmet tar inte emot dokument på kommandoraden" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Okänt startalternativ: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Kan inte skicka dokument-URI:er till en \"Type=Link\"-skrivbordspost" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Inte ett startbart objekt" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Inaktivera anslutning till sessionshanterare" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Ange fil som innehåller sparad konfiguration" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FIL" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Ange sessionshanterings-id" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Flaggor för sessionshantering:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Visa flaggor för sessionshantering" - -#: ../gnome-session/gsm-inhibit-dialog.c:253 -#, c-format -msgid "Icon '%s' not found" -msgstr "Ikonen \"%s\" hittades inte" - -#: ../gnome-session/gsm-inhibit-dialog.c:588 -msgid "Unknown" -msgstr "Okänt" - -#: ../gnome-session/gsm-inhibit-dialog.c:639 -msgid "A program is still running:" -msgstr "Ett program körs fortfarande:" - -#: ../gnome-session/gsm-inhibit-dialog.c:644 -msgid "Waiting for programs to finish. Interrupting these programs may cause you to lose work." -msgstr "Väntar på att programmen ska köras färdigt. Avbryta dessa program kan innebära att du förlorar data." - -#: ../gnome-session/gsm-inhibit-dialog.c:874 -msgid "Switch User Anyway" -msgstr "Växla användare ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:877 -msgid "Log Out Anyway" -msgstr "Logga ut ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:880 -msgid "Suspend Anyway" -msgstr "Försätt i vänteläge ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:883 -msgid "Hibernate Anyway" -msgstr "Försätt i viloläge ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:886 -msgid "Shut Down Anyway" -msgstr "Stäng av ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:889 -msgid "Restart Anyway" -msgstr "Starta om ändå" - -#: ../gnome-session/gsm-inhibit-dialog.c:897 -msgid "Lock Screen" -msgstr "Lås skärmen" - -#: ../gnome-session/gsm-inhibit-dialog.c:900 -msgid "Cancel" -msgstr "Avbryt" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:266 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Du kommer automatiskt att loggas ut om %d sekund." -msgstr[1] "Du kommer automatiskt att loggas ut om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:274 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Systemet kommer automatiskt att stängas av om %d sekund." -msgstr[1] "Systemet kommer automatiskt att stängas av om %d sekunder." - -#: ../gnome-session/gsm-logout-dialog.c:282 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Detta system kommer om %d sekund att automatiskt startas om." -msgstr[1] "Detta system kommer om %d sekunder att automatiskt startas om." - -#: ../gnome-session/gsm-logout-dialog.c:306 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Du är för närvarande inloggad som \"%s\"." - -#: ../gnome-session/gsm-logout-dialog.c:372 -msgid "Log out of this system now?" -msgstr "Logga ut ur detta system nu?" - -#: ../gnome-session/gsm-logout-dialog.c:378 -msgid "_Switch User" -msgstr "_Växla användare" - -#: ../gnome-session/gsm-logout-dialog.c:387 -#: ../gnome-session/gsm-fail-whale-dialog.c:337 -#: ../gnome-session/gsm-util.c:389 -msgid "_Log Out" -msgstr "_Logga ut" - -#: ../gnome-session/gsm-logout-dialog.c:393 -msgid "Shut down this system now?" -msgstr "Stäng av detta system nu?" - -#: ../gnome-session/gsm-logout-dialog.c:399 -msgid "S_uspend" -msgstr "Vä_nteläge" - -#: ../gnome-session/gsm-logout-dialog.c:405 -msgid "_Hibernate" -msgstr "Vilolä_ge" - -#: ../gnome-session/gsm-logout-dialog.c:411 -#: ../gnome-session/gsm-logout-dialog.c:437 -msgid "_Restart" -msgstr "Starta _om" - -#: ../gnome-session/gsm-logout-dialog.c:421 -msgid "_Shut Down" -msgstr "St_äng av" - -#: ../gnome-session/gsm-logout-dialog.c:427 -msgid "Restart this system now?" -msgstr "Starta om detta system nu?" - -#: ../gnome-session/gsm-fail-whale-dialog.c:311 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "Åh nej! Någonting har gått fel." -#: ../gnome-session/gsm-fail-whale-dialog.c:318 -msgid "A problem has occurred and the system can't recover. Please contact a system administrator" -msgstr "Ett problem har inträffat och systemet kan inte återhämta sig. Kontakta en systemadministratör" - -#: ../gnome-session/gsm-fail-whale-dialog.c:320 -msgid "A problem has occurred and the system can't recover. All extensions have been disabled as a precaution." -msgstr "Ett problem har inträffat och systemet kan inte återhämta sig. Alla tillägg har inaktiverats som en förebyggande åtgärd." +#: ../gnome-session/gsm-fail-whale-dialog.c:328 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "" +"Ett problem har inträffat och systemet kan inte återhämta sig. Kontakta en " +"systemadministratör" -#: ../gnome-session/gsm-fail-whale-dialog.c:322 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 +msgid "" +"A problem has occurred and the system can't recover. All extensions have " +"been disabled as a precaution." +msgstr "" +"Ett problem har inträffat och systemet kan inte återhämta sig. Alla tillägg " +"har inaktiverats som en säkerhetsåtgärd." + +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -344,201 +148,182 @@ "Ett problem har inträffat och systemet kan inte återhämta sig.\n" "Logga ut och försök igen." -#: ../gnome-session/gsm-manager.c:1393 -msgid "GNOME 3 Failed to Load" -msgstr "GNOME 3 kunde inte läsas in" +#: ../gnome-session/gsm-fail-whale-dialog.c:347 +msgid "_Log Out" +msgstr "_Logga ut" -#: ../gnome-session/gsm-manager.c:1394 -msgid "" -"Unfortunately GNOME 3 failed to start properly and started in the fallback mode.\n" -"\n" -"This most likely means your system (graphics hardware or driver) is not capable of delivering the full GNOME 3 experience." -msgstr "" -"Tyvärr gick det inte att starta GNOME 3 korrekt och startas därför i fallback-läge.\n" -"\n" -"Detta betyder oftast att ditt system (grafikmaskinvara eller drivrutin) inte kan dra nytta av den kompletta GNOME 3-upplevelsen." +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 +msgid "Enable debugging code" +msgstr "Aktivera felsökningskod" -#: ../gnome-session/gsm-manager.c:1396 -msgid "Learn more about GNOME 3" -msgstr "Lär dig mer om GNOME 3" +#: ../gnome-session/gsm-fail-whale-dialog.c:370 +#| msgid "Show logout dialog" +msgid "Allow logout" +msgstr "Tillåt utloggning" + +#: ../gnome-session/gsm-fail-whale-dialog.c:371 +msgid "Show extension warning" +msgstr "Visa tilläggsvarning" -#: ../gnome-session/gsm-manager.c:1493 -#: ../gnome-session/gsm-manager.c:2234 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Svarar inte" +#: ../gnome-session/gsm-util.c:409 +#| msgid "Log out" +msgid "_Log out" +msgstr "_Logga ut" + #. It'd be really surprising to reach this code: if we're here, #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:559 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" -msgstr "Ihågkomna program" +msgstr "Ihågkommet program" -#: ../gnome-session/gsm-xsmp-client.c:1197 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Detta program blockerar utloggningen." -#: ../gnome-session/gsm-xsmp-server.c:326 -msgid "Refusing new client connection because the session is currently being shut down\n" -msgstr "Avvisar ny klientanslutning på grund av att sessionen är på väg att stängas av\n" +#: ../gnome-session/gsm-xsmp-server.c:340 +msgid "" +"Refusing new client connection because the session is currently being shut " +"down\n" +msgstr "" +"Avvisar ny klientanslutning på grund av att sessionen är på väg att stängas " +"av\n" -#: ../gnome-session/gsm-xsmp-server.c:595 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "Kunde inte skapa lyssnande ICE-uttag: %s" -#. Oh well, no X for you! -#: ../gnome-session/gsm-util.c:373 -#, c-format -msgid "Unable to start login session (and unable to connect to the X server)" -msgstr "Kunde inte starta inloggningssession (och kan inte ansluta till X-servern)" - -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Åsidosätt standardkataloger för automatisk start" -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" -msgstr "AUTOSTART_DIR" +msgstr "AUTOSTARTKAT" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Session att använda" -#: ../gnome-session/main.c:291 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" -msgstr "SESSION_NAME" - -#: ../gnome-session/main.c:292 -msgid "Enable debugging code" -msgstr "Aktivera felsökningskod" +msgstr "SESSIONSNAMN" -#: ../gnome-session/main.c:293 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "Läs inte in användarspecifika program" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Version av detta program" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:296 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" -msgstr "Visa den \"felande valen\" för testning " +msgstr "Visa den ”felande valen” för testning " -#: ../gnome-session/main.c:316 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" -msgstr "- GNOME-sessionshanteraren" +msgstr " - GNOME-sessionshanteraren" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-inhibit.c:108 +#, c-format +msgid "" +"%s [OPTION...] COMMAND\n" +"\n" +"Execute COMMAND while inhibiting some session functionality.\n" +"\n" +" -h, --help Show this help\n" +" --version Show program version\n" +" --app-id ID The application id to use\n" +" when inhibiting (optional)\n" +" --reason REASON The reason for inhibiting (optional)\n" +" --inhibit ARG Things to inhibit, colon-separated list of:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Do not launch COMMAND and wait forever instead\n" +"\n" +"If no --inhibit option is specified, idle is assumed.\n" +msgstr "" +"%s [FLAGGA…] KOMMANDO\n" +"\n" +"Exekvera KOMMANDO medan någon funktionalitet förhindras.\n" +"\n" +" -h, --help Visa denna hjälp\n" +" --version Visa programversion\n" +" --app-id ID Program-ID att använda\n" +" vid förhindrande (valfri)\n" +" --reason ORSAK Orsaken till förhindrande (valfri)\n" +" --inhibit ARG Saker att förhindra, kolonseparerad lista av:\n" +" logout, switch-user, suspend, idle, automount\n" +" --inhibit-only Kör inte KOMMANDO utan vänta för alltid i stället\n" +"\n" +"Om ingen --inhibit-flagga angivits, antas idle.\n" + +#: ../tools/gnome-session-inhibit.c:146 +#, c-format +msgid "Failed to execute %s\n" +msgstr "Kunde inte exekvera %s\n" + +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 +#, c-format +msgid "%s requires an argument\n" +msgstr "%s kräver ett argument\n" + +#: ../tools/gnome-session-selector.c:61 +#, c-format +#| msgid "Session to use" +msgid "Session %d" +msgstr "Session %d" + +#: ../tools/gnome-session-selector.c:107 +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "Sessionsnamn får inte börja med ”.” eller innehålla ”/”-tecken" + +#: ../tools/gnome-session-selector.c:111 +msgid "Session names are not allowed to start with ‘.’" +msgstr "Sessionsnamn får inte börja med ”.”" + +#: ../tools/gnome-session-selector.c:115 +msgid "Session names are not allowed to contain ‘/’ characters" +msgstr "Sessionsnamn får inte innehålla ”/”-tecken" + +#: ../tools/gnome-session-selector.c:123 +#, c-format +msgid "A session named ‘%s’ already exists" +msgstr "En session med namnet ”%s” existerar redan" + +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Logga ut" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Stäng av" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Starta om" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Ignorera allt som förhindrar det" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "Fråga inte efter användarbekräftelse" -#: ../tools/gnome-session-quit.c:91 -#: ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "Kunde inte ansluta till sessionshanteraren" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Program anropat med motsägande flaggor" - -#~ msgid "Some programs are still running:" -#~ msgstr "Några program är fortfarande igång:" - -#~ msgid "Exited with code %d" -#~ msgstr "Avslutades med kod %d" - -#~ msgid "Killed by signal %d" -#~ msgstr "Dödad av signal %d" - -#~ msgid "Stopped by signal %d" -#~ msgstr "Stoppad av signal %d" - -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "Ett problem har inträffat och systemet kan inte återhämta sig. Några av " -#~ "utökningarna nedan kan ha orsakat detta.\n" -#~ "Prova att inaktivera några av dessa. Logga sedan ut och försök igen." - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "Det finns ett problem med konfigurationsservern.\n" -#~ "(%s avslutades med status %d)" - -#~ msgid "Try _Recovery" -#~ msgstr "Försök att _återhämta" - -#~ msgid "A system error has occurred: %s" -#~ msgstr "Ett systemfel har inträffat: %s" - -#~ msgid "A fatal system error has occurred: %s" -#~ msgstr "Ett ödesdigert systemfel har inträffat: %s" - -#~ msgid "Component '%s': %s" -#~ msgstr "Komponent \"%s\": %s" - -#~ msgid "Killed by signal" -#~ msgstr "Dödad av signal" - -#~ msgid "Timed out" -#~ msgstr "Tidsgränsen överstegs" - -#~ msgid "Show logout dialog" -#~ msgstr "Visa utloggningsdialogrutan" - -#~ msgid "Show shutdown dialog" -#~ msgstr "Visa avstängningsdialogrutan" - -#~ msgid "Use dialog boxes for errors" -#~ msgstr "Använd dialogrutor för fel" - -#~ msgid "Set the current session name" -#~ msgstr "Ange det aktuella sessionsnamnet" - -#~ msgid "NAME" -#~ msgstr "NAMN" - -#~ msgid "Kill session" -#~ msgstr "Döda session" - -#~ msgid "Classic GNOME" -#~ msgstr "Klassisk GNOME" - -#~ msgid "Window Manager" -#~ msgstr "Fönsterhanterare" - -#~ msgid "Default session" -#~ msgstr "Standardsession" - -#~ msgid "File Manager" -#~ msgstr "Filhanterare" - -#~ msgid "" -#~ "If enabled, gnome-session will prompt the user before ending a session." -#~ msgstr "" -#~ "Om detta är aktiverat kommer gnome-session att fråga användaren innan en " -#~ "session avslutas." - -#~ msgid "If enabled, gnome-session will save the session automatically." -#~ msgstr "" -#~ "Om detta är aktiverat kommer gnome-session att spara sessionen " -#~ "automatiskt." diff -Nru gnome-session-3.9.90/po/ta.po gnome-session-3.14.0/po/ta.po --- gnome-session-3.9.90/po/ta.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/ta.po 2014-06-25 18:06:34.000000000 +0000 @@ -12,79 +12,28 @@ msgid "" msgstr "" "Project-Id-Version: gnome-session.HEAD.ta\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-22 16:29+0530\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-11 12:53+0000\n" +"PO-Revision-Date: 2013-11-25 12:31+0530\n" "Last-Translator: Shantha kumar \n" "Language-Team: American English <>\n" -"Language: \n" +"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\\n" "\n" "\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.5\n" -# gsm/session-properties-capplet.c:292 -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "கட்டளையை தேர்ந்தெடுக்கவும்" - -# gsm/startup-programs.c:391 -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "துவக்க நிரலுக்கு சேர் " - -# gsm/startup-programs.c:391 -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "துவக்க நிரலை தொகு" - -# gsm/startup-programs.c:333 -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "துவக்க கட்டளை காலியாக இருக்க முடியாது" - -# gsm/startup-programs.c:333 -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "துவக்க கட்டளை செல்லுபடியாகாதது" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "செயலாக்கப்பட்டது" - -# gsm/logout.c:240 -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "சின்னம்" - -# gsm/gsm-client-list.c:112 -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "நிரல்" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "துவக்க பயன்பாடுகள் விருப்பங்கள்" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "பெயர் இல்லை" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "விவரணம் இல்லை" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "இந்த பயன்பாட்டின் பதிப்பு " +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "தனிப்பயன்" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "உதவி ஆவணத்தை காட்ட இயலவில்லை" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "இந்த உள்ளீடானது ஒரு சேமிக்கப்பட்ட அமர்வை தேர்ந்தெடுக்கிறது" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -94,22 +43,24 @@ msgid "This session logs you into GNOME" msgstr "இந்த அமர்வு க்நோம் இல் உங்களை நுழைக்கும் " -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "தனிப்பயன்" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "இந்த உள்ளீடானது ஒரு சேமிக்கப்பட்ட அமர்வை தேர்ந்தெடுக்கிறது" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "GNOME டம்மி" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "Wayland இல் GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "" +"இந்த அமர்வு உங்களை Wayland ஐப் பயன்படுத்தி GNOME இல் புகுபதிவு செய்யும்" + # gsm/save-session.c:43 #: ../data/session-selector.ui.h:1 -#| msgid "Default session" msgid "Custom Session" msgstr "தனிப்பயன் அமர்வு" @@ -119,19 +70,16 @@ # gsm/session-properties.c:272 #: ../data/session-selector.ui.h:3 -#| msgid "Save sessions" msgid "_New Session" msgstr "புதிய அமர்வு (_N)" # gsm/session-properties.c:272 #: ../data/session-selector.ui.h:4 -#| msgid "Save sessions" msgid "_Remove Session" msgstr "அமர்வை நீக்கு (_R)" # gsm/session-properties.c:272 #: ../data/session-selector.ui.h:5 -#| msgid "Save sessions" msgid "Rena_me Session" msgstr "அமர்வை மறுபெயரிடு (_m)" @@ -139,18 +87,6 @@ msgid "_Continue" msgstr "தொடரவும் (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "நிரல்கள் சில இன்னும் ஒடுகின்றன:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "துவக்க பயன்பாடுகள்" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "நீங்கள் புகுபதிவு செய்யும் போது எந்த பயன்பாடுகள் தேர்ந்தெடுக்கப்படவேண்டும்" - # gsm/startup-programs.c:373 #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -192,98 +128,28 @@ msgid "_Name:" msgstr "பெயர்: (_N)" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "கோப்பு செல்லுபடியாகும் (.desktop) மேல்மேசை கோப்பு அல்ல" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "இனம் காணா மேல்மேசை கோப்பு பதிப்பு '%s'" - -# gsm/gsm-client-row.c:36 -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s ஐ தொடங்குகிறது" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "பயன்பாடு ஆவணங்களை கட்டளை வரியில் ஒப்புக்கொள்ளவில்லை." - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "இனம் காண இயலாத துவக்க தேர்வு: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "'Type=Link' மேல்மேசை உள்ளீடுக்கு ஆவண யூஆர்ஐ ஐ கொடுக்க இயலாது." - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "தொடங்கக்கூடிய உருப்படி அல்ல." - -# gsm/save-session.c:93 -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "அமர்வு மேலாளருடன் இணைப்பை விலக்கு" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "சேமித்த வடிவமைப்பு உள்ள கோப்பை குறிப்பிடுக." - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "கோப்பு " - -# gsm/main.c:65 -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "அமர்வின் அடையாளத்தை குறிப்பிடு" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "அடையாளம் " - -# gsm/session-properties-capplet.c:262 -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "அமர்வு மேலாண்மை தேர்வுகள்:" - -# gsm/session-properties-capplet.c:262 -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "அமர்வு மேலாண்மை தேர்வுகளை காட்டுக" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "அடடா! ஏதோ தவறு நிகழ்ந்துவிட்டது" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" -msgstr "ஒரு பிரச்சினை நிகழ்ந்தது. கணினி மீள இயலாது. ஒரு கணினி மேலாளரை தொடர்பு கொள்ளவும்." +msgstr "" +"ஒரு பிரச்சினை நிகழ்ந்தது. கணினி மீள இயலாது. ஒரு கணினி மேலாளரை தொடர்பு " +"கொள்ளவும்." -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "" -"ஒரு பிரச்சினை நிகழ்ந்தது. கணினி மீள இயலாது. முன் எச்சரிக்கையாக எல்லா நீட்சிகளும் செயல் " +"ஒரு பிரச்சினை நிகழ்ந்தது. கணினி மீள இயலாது. முன் எச்சரிக்கையாக எல்லா " +"நீட்சிகளும் செயல் " "இழக்கப்பட்டுள்ளன." -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -292,155 +158,28 @@ "வெளியேறி மீண்டும் முயற்சிக்கவும்" # panel/logout.c:73 panel/menu.c:5339 -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "(_L) விலகவும்" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "பிழைத்திருத்த குறியீட்டை செயல்படுத்து." -#: ../gnome-session/gsm-fail-whale-dialog.c:346 -#| msgid "Show logout dialog" +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "வெளிசெல்ல அனுமதி" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "நீட்டிப்பு எச்சரிக்கையைக் காட்டு" -# gsm/gsm-client-row.c:45 -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "தெரியாத" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ஒரு நிரல் இன்னும் ஒடுகிறது:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"நிரல் இயங்கி முடிய காத்திருக்கிறது. நிரல் இயக்கத்தை தடை செய்வது உங்கள் வேலையை " -"சேமிக்காமல் போகச் செய்யும்." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"நிரல்கள் தங்கள் வேலையை முடிக்கக் காத்திருக்கிறது. குறுக்கிட்டால் நீங்கள் செய்த பணிகள் " -"இழக்கப்படலாம்." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "எப்படியும் பயனரை மாற்று" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "எப்படி இருந்தாலும் வெளியேறுக." - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "எப்படியும் இடை நிறுத்தம் செய்க" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "எப்படி இருந்தாலும் உள்நுழையவும்." - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "எப்படி இருந்தாலும் கணினியை நிறுத்தவும்" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "எப்படி இருந்தாலும் மீள்துவக்கவும்" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "திரையைப் பூட்டுக." - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "ரத்து செய்க" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "நீங்கள் தானாக %d வினாடியில் வெளியேற்றப்படுவீர்கள்." -msgstr[1] "நீங்கள் தானாக %d வினாடிகளில் வெளியேற்றப்படுவீர்கள்." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "இந்த கணினி தானாக %d வினாடியில் பணி நிறுத்தம் செய்யும்." -msgstr[1] "இந்த கணினி தானாக %d வினாடிகளில் பணி நிறுத்தம் செய்யும்." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "இந்த கணினி தானியங்கியாக %d வினாடியில் மீள் துவக்கம் செய்யும்." -msgstr[1] "இந்த கணினி தானியங்கியாக %d வினாடிகளில் மீள் துவக்கம் செய்யும்." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "நீங்கள் தற்போது \"%s\" ஆக புகுபதிவு செய்துள்ளீர்கள்." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "கணினியிலிருந்து இப்போது வெளிச்செல்லவா? " - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "(_S) பயனரை மாற்றுக" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "இப்போது இந்த கணினியை நிறுத்தவா? " - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "இடை நிறுத்தம் (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "செயலற்றிருத்தல் (_H)" - -# applets/tasklist/tasklist_menu.c:258 -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "(_R) மீட்டமை" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "(_S) பணி நிறுத்தம் செய்யவும்" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "இப்போது இந்த கணினியை மீண்டும் துவக்கவா? " - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "பதிலளிக்க இல்லை" # panel/logout.c:73 panel/menu.c:5339 #: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" msgid "_Log out" msgstr "வெளியேறு (_L)" @@ -448,51 +187,56 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "நினைவில் கொண்ட பயன்பாடு" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "இந்த நிரல் வெளியேறுவதை தடுக்கிறது" -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:341 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" -msgstr "புதிய சார்ந்தோன் இணைப்பை மறுக்கிறது; ஏனெனில் இப்போதைய அமர்வு மூடப்படுகிறது\n" +msgstr "" +"புதிய சார்ந்தோன் இணைப்பை மறுக்கிறது; ஏனெனில் இப்போதைய அமர்வு மூடப்படுகிறது\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:610 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ஐஸ் கேட்கும் பொருத்துவாயை உருவாக்க முடியவில்லை : %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "செந்தர தானியங்கி அடைவுகளை வலுவாக புறக்கணி" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "பயன்படுத்த அமர்வு" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "பயனர் குறித்த நிரல்களை ஏற்றாதே" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "இந்த பயன்பாட்டின் பதிப்பு " + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "சோதனைக்கு பெய்ல் வேல் உரையாடலை காட்டுக" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- க்னோம் அமர்வு மேலாலாளர்" @@ -542,13 +286,14 @@ #: ../tools/gnome-session-selector.c:62 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "அமர்வு %d" #: ../tools/gnome-session-selector.c:108 -msgid "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "அமர்வு பெயர்கள் ஒரு '.' அல்லது ‘/’ எழுத்துக்களுடன் துவக்க அனுமதிப்பதில்லை" +msgid "" +"Session names are not allowed to start with ‘.’ or contain ‘/’ characters" +msgstr "" +"அமர்வு பெயர்கள் ஒரு '.' அல்லது ‘/’ எழுத்துக்களுடன் துவக்க அனுமதிப்பதில்லை" #: ../tools/gnome-session-selector.c:112 msgid "Session names are not allowed to start with ‘.’" @@ -593,8 +338,198 @@ msgid "Program called with conflicting options" msgstr "நிரல் முரணான தேர்வுகளை அழைத்தது" -#~ msgid "GNOME fallback" -#~ msgstr "க்னோம் பின்சார்தல்" +# gsm/session-properties-capplet.c:292 +#~ msgid "Select Command" +#~ msgstr "கட்டளையை தேர்ந்தெடுக்கவும்" + +# gsm/startup-programs.c:391 +#~ msgid "Add Startup Program" +#~ msgstr "துவக்க நிரலுக்கு சேர் " + +# gsm/startup-programs.c:391 +#~ msgid "Edit Startup Program" +#~ msgstr "துவக்க நிரலை தொகு" + +# gsm/startup-programs.c:333 +#~ msgid "The startup command cannot be empty" +#~ msgstr "துவக்க கட்டளை காலியாக இருக்க முடியாது" + +# gsm/startup-programs.c:333 +#~ msgid "The startup command is not valid" +#~ msgstr "துவக்க கட்டளை செல்லுபடியாகாதது" + +#~ msgid "Enabled" +#~ msgstr "செயலாக்கப்பட்டது" + +# gsm/logout.c:240 +#~ msgid "Icon" +#~ msgstr "சின்னம்" + +# gsm/gsm-client-list.c:112 +#~ msgid "Program" +#~ msgstr "நிரல்" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "துவக்க பயன்பாடுகள் விருப்பங்கள்" + +#~ msgid "No name" +#~ msgstr "பெயர் இல்லை" + +#~ msgid "No description" +#~ msgstr "விவரணம் இல்லை" + +#~ msgid "Could not display help document" +#~ msgstr "உதவி ஆவணத்தை காட்ட இயலவில்லை" + +#~ msgid "Some programs are still running:" +#~ msgstr "நிரல்கள் சில இன்னும் ஒடுகின்றன:" + +#~ msgid "Startup Applications" +#~ msgstr "துவக்க பயன்பாடுகள்" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "நீங்கள் புகுபதிவு செய்யும் போது எந்த பயன்பாடுகள் தேர்ந்தெடுக்கப்படவேண்டும்" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "கோப்பு செல்லுபடியாகும் (.desktop) மேல்மேசை கோப்பு அல்ல" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "இனம் காணா மேல்மேசை கோப்பு பதிப்பு '%s'" + +# gsm/gsm-client-row.c:36 +#~ msgid "Starting %s" +#~ msgstr "%s ஐ தொடங்குகிறது" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "பயன்பாடு ஆவணங்களை கட்டளை வரியில் ஒப்புக்கொள்ளவில்லை." + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "இனம் காண இயலாத துவக்க தேர்வு: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "'Type=Link' மேல்மேசை உள்ளீடுக்கு ஆவண யூஆர்ஐ ஐ கொடுக்க இயலாது." + +#~ msgid "Not a launchable item" +#~ msgstr "தொடங்கக்கூடிய உருப்படி அல்ல." + +# gsm/save-session.c:93 +#~ msgid "Disable connection to session manager" +#~ msgstr "அமர்வு மேலாளருடன் இணைப்பை விலக்கு" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "சேமித்த வடிவமைப்பு உள்ள கோப்பை குறிப்பிடுக." + +#~ msgid "FILE" +#~ msgstr "கோப்பு " + +# gsm/main.c:65 +#~ msgid "Specify session management ID" +#~ msgstr "அமர்வின் அடையாளத்தை குறிப்பிடு" + +#~ msgid "ID" +#~ msgstr "அடையாளம் " + +# gsm/session-properties-capplet.c:262 +#~ msgid "Session management options:" +#~ msgstr "அமர்வு மேலாண்மை தேர்வுகள்:" + +# gsm/session-properties-capplet.c:262 +#~ msgid "Show session management options" +#~ msgstr "அமர்வு மேலாண்மை தேர்வுகளை காட்டுக" + +# gsm/gsm-client-row.c:45 +#~ msgid "Unknown" +#~ msgstr "தெரியாத" + +#~ msgid "A program is still running:" +#~ msgstr "ஒரு நிரல் இன்னும் ஒடுகிறது:" + +#~| msgid "" +#~| "Waiting for the program to finish. Interrupting the program may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "நிரல் இயங்கி முடிய காத்திருக்கிறது. நிரல் இயக்கத்தை தடை செய்வது உங்கள் வேலையை " +#~ "சேமிக்காமல் போகச் செய்யும்." + +#~| msgid "" +#~| "Waiting for programs to finish. Interrupting these programs may cause " +#~| "you to lose work." +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "நிரல்கள் தங்கள் வேலையை முடிக்கக் காத்திருக்கிறது. குறுக்கிட்டால் நீங்கள் செய்த பணிகள் " +#~ "இழக்கப்படலாம்." + +#~ msgid "Switch User Anyway" +#~ msgstr "எப்படியும் பயனரை மாற்று" + +#~ msgid "Log Out Anyway" +#~ msgstr "எப்படி இருந்தாலும் வெளியேறுக." + +#~ msgid "Suspend Anyway" +#~ msgstr "எப்படியும் இடை நிறுத்தம் செய்க" + +#~ msgid "Hibernate Anyway" +#~ msgstr "எப்படி இருந்தாலும் உள்நுழையவும்." + +#~ msgid "Shut Down Anyway" +#~ msgstr "எப்படி இருந்தாலும் கணினியை நிறுத்தவும்" + +#~ msgid "Restart Anyway" +#~ msgstr "எப்படி இருந்தாலும் மீள்துவக்கவும்" + +#~ msgid "Lock Screen" +#~ msgstr "திரையைப் பூட்டுக." + +#~ msgid "Cancel" +#~ msgstr "ரத்து செய்க" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "நீங்கள் தானாக %d வினாடியில் வெளியேற்றப்படுவீர்கள்." +#~ msgstr[1] "நீங்கள் தானாக %d வினாடிகளில் வெளியேற்றப்படுவீர்கள்." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "இந்த கணினி தானாக %d வினாடியில் பணி நிறுத்தம் செய்யும்." +#~ msgstr[1] "இந்த கணினி தானாக %d வினாடிகளில் பணி நிறுத்தம் செய்யும்." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "இந்த கணினி தானியங்கியாக %d வினாடியில் மீள் துவக்கம் செய்யும்." +#~ msgstr[1] "இந்த கணினி தானியங்கியாக %d வினாடிகளில் மீள் துவக்கம் செய்யும்." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "நீங்கள் தற்போது \"%s\" ஆக புகுபதிவு செய்துள்ளீர்கள்." + +#~ msgid "Log out of this system now?" +#~ msgstr "கணினியிலிருந்து இப்போது வெளிச்செல்லவா? " + +#~ msgid "_Switch User" +#~ msgstr "(_S) பயனரை மாற்றுக" + +#~ msgid "Shut down this system now?" +#~ msgstr "இப்போது இந்த கணினியை நிறுத்தவா? " + +#~ msgid "S_uspend" +#~ msgstr "இடை நிறுத்தம் (_u)" + +#~ msgid "_Hibernate" +#~ msgstr "செயலற்றிருத்தல் (_H)" + +# applets/tasklist/tasklist_menu.c:258 +#~ msgid "_Restart" +#~ msgstr "(_R) மீட்டமை" + +#~ msgid "_Shut Down" +#~ msgstr "(_S) பணி நிறுத்தம் செய்யவும்" + +#~ msgid "Restart this system now?" +#~ msgstr "இப்போது இந்த கணினியை மீண்டும் துவக்கவா? " #~ msgid "Icon '%s' not found" #~ msgstr "'%s' சின்னம் காணப்படவில்லை" diff -Nru gnome-session-3.9.90/po/te.po gnome-session-3.14.0/po/te.po --- gnome-session-3.9.90/po/te.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/te.po 2014-09-22 14:18:16.000000000 +0000 @@ -16,98 +16,51 @@ "Project-Id-Version: gnome-session.master.te\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-19 18:36+0000\n" -"PO-Revision-Date: 2013-03-25 14:32+0530\n" -"Last-Translator: Krishnababu Krothapalli \n" +"POT-Creation-Date: 2014-08-26 19:25+0000\n" +"PO-Revision-Date: 2014-08-27 09:30+0530\n" +"Last-Translator: Praveen Illa \n" "Language-Team: Telugu \n" "Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -"\n" -"\n" -"\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "ఆదేశాన్ని ఎంచుకోండి" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "ప్రారంభ కార్యక్రమాన్ని జతచేయి" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "ప్రారంభ కార్యక్రమాన్ని సవరించు" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "ప్రారంభ ఆదేశం ఖాళీగా ఉండరాదు" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "ప్రారంభ ఆదేశం సరియైనదికాదు" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "చేతనమైంది" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "ప్రతీక" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "ప్రోగామ్" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "ప్రారంభ అనువర్తనాల ప్రాధాన్యతలు" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "పేరు లేదు" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "వివరణ లేదు" - -#: ../capplet/main.c:35 ../gnome-session/main.c:269 -msgid "Version of this application" -msgstr "ఈ అనువర్తనం యొక్క రూపాంతరం" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "మలచిన" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "సహాయ పత్రమును ప్రదర్శించలేక పోయింది" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "ఈ ప్రవేశం అనునది మిమ్ములను దాచిన సెషన్ యెంపికచేయుటకు అనుమతించును" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" -msgstr "GNOME" +msgstr "గ్నోమ్" #: ../data/gnome.desktop.in.h:2 msgid "This session logs you into GNOME" msgstr "ఈ సెషన్ గ్నోమ్‌లోనికి లాగ్ చేస్తుంది" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "మలచిన" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "ఈ ప్రవేశం అనునది మిమ్ములను దాచిన సెషన్ యెంపికచేయుటకు అనుమతించును" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" -msgstr "GNOME డమ్మీ" +msgstr "గ్నోమ్ డమ్మీ" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "వేల్యాండ్ పై గ్నోమ్" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "వేల్యాండ్ ఉపయోగించి, ఈ సెషన్ గ్నోమ్‌లోనికి లాగ్ చేస్తుంది" #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "మలచిన సెషన్" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "నడుపుటకు మలచిన సెషన్ యెంపికచేయి" @@ -121,27 +74,15 @@ #: ../data/session-selector.ui.h:5 msgid "Rena_me Session" -msgstr "సెషన్ పునఃనామకరణచేయి (_m)" +msgstr "సెషన్ పేరుమార్చు (_m)" #: ../data/session-selector.ui.h:6 msgid "_Continue" msgstr "కొనసాగించు (_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "కొన్ని ప్రోగ్రాములు ఇప్పటికి నడుచుచున్నవి:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "ప్రారంభ అనువర్తనములు" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "మీరు లాగిన్ అయినప్పుడు ఏ అనువర్తనములు ప్రారంభము కావలెనో యెంచుకొనుము" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" -msgstr "అదనపు ప్రారంభ కార్యక్రమాలు (_p):" +msgstr "అదనపు ప్రారంభ కార్యక్రమాలు (_p):" #: ../data/session-properties.ui.h:2 msgid "Startup Programs" @@ -149,9 +90,7 @@ #: ../data/session-properties.ui.h:3 msgid "_Automatically remember running applications when logging out" -msgstr "" -"నిష్క్రమించేటప్పుడు నడుస్తున్న కార్యక్షేత్రాలని స్వయంచాలకంగా గుర్తుంచుకొనుము " -"(_A)" +msgstr "నిష్క్రమించేటప్పుడు నడుస్తున్న అనువర్తనాలను స్వయంచాలకంగా గుర్తుంచుకొనుము (_A)" #: ../data/session-properties.ui.h:4 msgid "_Remember Currently Running Applications" @@ -177,96 +116,26 @@ msgid "_Name:" msgstr "పేరు (_N):" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "ఫైలు సరయైన .desktop ఫైలు కాదు" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "గుర్తించబడని డెస్కుటాపు ఫైలు వర్షన్ '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s ప్రారంభిస్తున్నది" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "ఆదేశవరుస నందు అనువర్తనములు పత్రములను ఆంగీకరించవు" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "గుర్తించబడని ప్రారంభ ఐచ్చికము: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "పత్రము URIలను Type=Link' desktop entry కు పంపలేదు." - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "ప్రారంభించదగిన అంశము కాదు" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "విభాగము నిర్వాహికకు అనుసంధానమును అచేతనము చేయుము" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "దాచివున్న ఆకృతీకరణను కలిగివున్న ఫైలు తెలుపుము" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "FILE" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "విభాగము నిర్వహణా IDను తెలుపుము" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ఐడి" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "సెషన్ నిర్వాహణా ఐచ్చికములు:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "సెషన్ నిర్వాహణా ఐచ్చికాలను చూపుము" - -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "అయ్యో! ఎక్కడో పొరపాటు జరిగినది." -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "" -"ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు. దయచేసి మీ వ్యవస్థ " -"నిర్వాహకుడిని సంప్రదించండి" +"ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు. దయచేసి మీ వ్యవస్థ నిర్వాహకుడిని సంప్రదించండి" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "" -"ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు. ముందు జాగ్రత్తగా " -"దయచేసి మీ వ్యవస్థ " +"ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు. ముందు జాగ్రత్తగా దయచేసి మీ వ్యవస్థ " "నిర్వాహకుడిని సంప్రదించండి" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -274,152 +143,27 @@ "ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు.\n" "దయచేసి నిష్క్రమించి మరలా ప్రయత్నించండి." -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "నిష్క్రమించు (_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "దోషనిర్మూలన కోడ్‌ను చేతనపరుచు" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "నిష్క్రమణ అనుమతించు" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "పొడిగింపు హెచ్చరికను చూపుము" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "తెలియదు" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "ఒక ప్రోగ్రామ్ ఇంకా నడుచుచున్నది:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -#| msgid "" -#| "Waiting for the program to finish. Interrupting the program may cause " -#| "you to lose work." -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"పూర్తి చేయుటకు ప్రోగ్రామ్ కొరకు వేచివుంది. ప్రోగ్రామ్‌ను ఆటంక పరచుట మీ పని " -"కోల్పోవుటకు కారణం కావచ్చు." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -#| msgid "" -#| "Waiting for programs to finish. Interrupting these programs may cause " -#| "you to lose work." -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"ప్రాగ్రాముల ముగింపు కొరకు వేచివుంది. ఈ ప్రోగ్రాములను ఆటంకపరచుట అనునది మీ పని " -"కోల్పోవుటకు కారణం " -"కావచ్చును." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "ఏమైనప్పటికి వాడుకరిని మార్చు" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "ఏది ఏమైనప్పటికీ నిష్క్రమించు" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "ఏదిఏమైనప్పటికీ తాత్కాలికంగా నిలిపివేయి" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "ఏదిఏమైనప్పటికీ సుప్తావస్థలో ఉంచు" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "ఏది ఏమైనప్పటికీ మూసివేయి" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "ఏది ఏమైనప్పటికీ పునఃప్రారంభించు" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "తెరకు తాళంవేయి" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "రద్దుచేయి" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "మీరు %d సెకనులో స్వయంచాలకంగా నిష్క్రమిస్తారు." -msgstr[1] "మీరు %d సెకనులలో స్వయంచాలకంగా నిష్క్రమిస్తారు." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "ఈ వ్యవస్థ %d సెకనులో స్వయంచాలకంగా మూసివేయబడుతుంది." -msgstr[1] "ఈ వ్యవస్థ %d సెకనులలో స్వయంచాలకంగా మూసివేయబడుతుంది." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "ఈ వ్యవస్థ స్వయంచాలకంగా% d సెకను లో పునఃప్రారంబించ చేయబడుతుంది." -msgstr[1] "ఈ వ్యవస్థ స్వయంచాలకంగా% d సెకనులలో పునఃప్రారంబించ చేయబడుతుంది." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "మీరు ప్రస్తుతం \"%s\" వలె ప్రవేశించివున్నారు." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "ఈ వ్యవస్థ నుండి ఇప్పుడు నిష్క్రమించాలా?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "వాడుకరిని మార్చు (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "ఈ వ్యవస్థను ఇప్పుడు మూసివేయాలా?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "తాత్కాలికంగా నిలిపివేయి (_u)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "సుప్తావస్థ (_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "పునఃప్రారంభించు (_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "మూసివేయి (_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "ఈ వ్యవస్థను ఇప్పుడు పునఃప్రారంభంచండి?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2177 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "స్పందించుటలేదు" -#: ../gnome-session/gsm-util.c:411 -#| msgid "Log out" +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "నిష్క్రమించు (_L)" @@ -427,57 +171,60 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "గుర్తించుకున్న అనువర్తనము" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "ఈ ప్రోగ్రామ్ నిష్క్రమించుటను నిరోధిస్తోంది." -#: ../gnome-session/gsm-xsmp-server.c:333 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "" -"కొత్త కక్షిదారి అనుసంధానమును తిరస్కరిస్తోంది యెంచేతంటే విభాగము అనునది " -"ప్రస్తుతము మూసివేయబడుతోంది\n" +"కొత్త కక్షిదారి అనుసంధానమును తిరస్కరిస్తోంది యెంచేతంటే విభాగము అనునది ప్రస్తుతము మూసివేయబడుతోంది\n" -#: ../gnome-session/gsm-xsmp-server.c:602 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE లిజనింగ్ సాకెట్‌ను సృష్టించలేక పోయింది: %s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "ప్రామాణిక స్వయంచాలక డైరెక్టరీలను తిరిగివ్రాయుము" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "స్వయంప్రారంభ సంచయం (_D)" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "వాడవలసిన సెషన్" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "సెషన్ పేరు (_N)" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "వాడుకరి-తెలిపిన అనువర్తనములను లోడుచేయలేకపోయింది" +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "ఈ అనువర్తనం యొక్క రూపాంతరం" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "పరీక్షించుటకు ఫెయిల్ వేల్ డైలాగును చూపించు" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr " -గ్నోమ్ సెషన్ నిర్వాహకము" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -510,124 +257,157 @@ "\n" "If no --inhibit option is specified, idle is assumed.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s నిర్వర్తించుటకు విఫలమైంది\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s కు వొక ఆర్గుమెంట్ కావాలి\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format -#| msgid "Session to use" msgid "Session %d" msgstr "సెషన్ %d" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" -msgstr "" -"సెషన్ పేర్లు ‘.’ తో ప్రారంభమగుటకు లేదా ‘/’ అక్షరాలను కలిగివుండుటకు " -"అనుమతించబడవు" +msgstr "సెషన్ పేర్లు ‘.’ తో ప్రారంభమగుటకు లేదా ‘/’ అక్షరాలను కలిగివుండుటకు అనుమతించబడవు" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "సెషన్ పేర్లు ‘.’ తో ప్రారంభమగుటకు అనుమతించబడవు" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "సెషన్ పేర్లు ‘/’ అక్షరాలను కలిగివుండుటకు అనుమతించబడవు" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "సెషన్ పేరు ‘%s’ యిప్పటికే వుంది" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "నిష్క్రమించు" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "విద్యుత్ ఆపు" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "పునఃప్రారంభం" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "ఉన్నటువంటి ఏ అవరోధకాలనైనా వదిలివేస్తున్నది" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "వాడుకరి నిర్ధారణ కోసం అడగవద్దు" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "సెషన్ నిర్వాహకానికి అనుసంధానించలేకపోతుంది" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "విభేదిస్తున్న ఐచ్చికాలతో పిలువబడే ప్రోగ్రామ్" -#~ msgid "GNOME fallback" -#~ msgstr "గ్నోమ్ ఫాల్‌బ్యాక్" +#~ msgid "Select Command" +#~ msgstr "ఆదేశాన్ని ఎంచుకోండి" + +#~ msgid "Add Startup Program" +#~ msgstr "ప్రారంభ కార్యక్రమాన్ని జతచేయి" + +#~ msgid "Edit Startup Program" +#~ msgstr "ప్రారంభ కార్యక్రమాన్ని సవరించు" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "ప్రారంభ ఆదేశం ఖాళీగా ఉండరాదు" + +#~ msgid "The startup command is not valid" +#~ msgstr "ప్రారంభ ఆదేశం సరియైనదికాదు" + +#~ msgid "Enabled" +#~ msgstr "చేతనమైంది" + +#~ msgid "Icon" +#~ msgstr "ప్రతీక" + +#~ msgid "Program" +#~ msgstr "ప్రోగామ్" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "ప్రారంభ అనువర్తనాల ప్రాధాన్యతలు" + +#~ msgid "No name" +#~ msgstr "పేరు లేదు" + +#~ msgid "No description" +#~ msgstr "వివరణ లేదు" + +#~ msgid "Could not display help document" +#~ msgstr "సహాయ పత్రమును ప్రదర్శించలేక పోయింది" + +#~ msgid "Some programs are still running:" +#~ msgstr "కొన్ని ప్రోగ్రాములు ఇప్పటికి నడుచుచున్నవి:" + +#~ msgid "Startup Applications" +#~ msgstr "ప్రారంభ అనువర్తనములు" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "మీరు లాగిన్ అయినప్పుడు ఏ అనువర్తనములు ప్రారంభము కావలెనో యెంచుకొనుము" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "ఫైలు సరయైన .desktop ఫైలు కాదు" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "గుర్తించబడని డెస్కుటాపు ఫైలు వర్షన్ '%s'" + +#~ msgid "Starting %s" +#~ msgstr "%s ప్రారంభిస్తున్నది" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "ఆదేశవరుస నందు అనువర్తనములు పత్రములను ఆంగీకరించవు" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "గుర్తించబడని ప్రారంభ ఐచ్చికము: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "పత్రము URIలను Type=Link' desktop entry కు పంపలేదు." + +#~ msgid "Not a launchable item" +#~ msgstr "ప్రారంభించదగిన అంశము కాదు" + +#~ msgid "Disable connection to session manager" +#~ msgstr "విభాగము నిర్వాహికకు అనుసంధానమును అచేతనము చేయుము" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "దాచివున్న ఆకృతీకరణను కలిగివున్న ఫైలు తెలుపుము" + +#~ msgid "FILE" +#~ msgstr "FILE" + +#~ msgid "Specify session management ID" +#~ msgstr "విభాగము నిర్వహణా IDను తెలుపుము" + +#~ msgid "ID" +#~ msgstr "ఐడి" + +#~ msgid "Session management options:" +#~ msgstr "సెషన్ నిర్వాహణా ఐచ్చికములు:" -#~ msgid "Icon '%s' not found" -#~ msgstr "'%s' ప్రతీక కనబడలేదు" +#~ msgid "Show session management options" +#~ msgstr "సెషన్ నిర్వాహణా ఐచ్చికాలను చూపుము" -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "గ్నోమ్ 3 లోడుచేయుటలో విఫలమైంది" +#~ msgid "Unknown" +#~ msgstr "తెలియదు" -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "దురదృష్టశావత్తు గ్నోమ్ 3 సక్రమంగా ప్రారంభించుటలో విఫలమైంది అందువలన ఫాల్‌బ్యాక్ రీతిలో " -#~ "ప్రారంభమయినది.\n" -#~ "\n" -#~ "మీ వ్యవస్థ (గ్రాఫిక్స్ హార్డ్‍వేర్ లేదా డ్రైవర్) గ్నోమ్ 3 యొక్క పూర్తి అనుభవాన్ని ఇచ్చుటకు తగిన శక్తి " -#~ "సామర్ధ్యాలను కలిగిలేదు." - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "గ్నోమ్ 3 గురించి మరింత తెలుసుకోండి" - -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "లాగిన్ విభాగమును ప్రారంభించలేక పోయింది (మరియు X సేవికకు అనుసంధానము కాలేక పోయింది)" - -#~ msgid "Exited with code %d" -#~ msgstr "%d కోడ్ తో నిష్క్రమించింది" - -#~ msgid "Killed by signal %d" -#~ msgstr "%d సిగ్నల్ చే అంతముచేయబడింది" - -#~ msgid "Stopped by signal %d" -#~ msgstr "%d సిగ్నల్‌తో ఆపివేయబడింది" - -#~ msgid "Some programs are still running:" -#~ msgstr "కొన్ని ప్రోగ్రామ్లు యింకనూ నడుచుచున్నవి:" - -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "ఒక సమస్య ఎదురయింది మరియు వ్యవస్థ దానినుండి కోలుకోలేదు. క్రింద పేర్కొన్న పొడిగింతలు దీనికి కారణం " -#~ "కావచ్చు.\n" -#~ "దయచేసి వీటిలో కొన్నిటిని అచేతనపరిచి, తరువాత నిష్క్రమించి మరలా ప్రయత్నించండి." - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "ఆకృతీకరణ సేవికతో అక్కడ కొంత సమస్యవుంది.\n" -#~ "(%s అనునది %d స్థితితో నిష్క్రమించినది)" +#~ msgid "A program is still running:" +#~ msgstr "ఒక ప్రోగ్రామ్ ఇంకా నడుచుచున్నది:" diff -Nru gnome-session-3.9.90/po/tg.po gnome-session-3.14.0/po/tg.po --- gnome-session-3.9.90/po/tg.po 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/po/tg.po 2014-06-25 18:06:34.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: Tajik Gnome\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-06 04:38+0000\n" -"PO-Revision-Date: 2013-05-23 17:08+0500\n" +"POT-Creation-Date: 2013-09-09 23:10+0000\n" +"PO-Revision-Date: 2013-09-12 14:18+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: \n" "Language: Tajik\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=1;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.7\n" #: ../capplet/gsm-app-dialog.c:120 msgid "Select Command" @@ -39,31 +39,31 @@ msgid "The startup command is not valid" msgstr "Фармони худоғозӣ беэътибор аст" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Фаъол" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Нишона" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Барнома" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Хусусиятҳои барномаҳои худоғозӣ" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Бе ном" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Бе тавсиф" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Версияи ин барнома" @@ -71,14 +71,6 @@ msgid "Could not display help document" msgstr "Ҳуҷҷати кӯмак намоиш дода намешавад" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Ин ҷаласа шуморо ба GNOME ворид мекунад" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Фармоиш додан" @@ -88,11 +80,36 @@ msgstr "" "Ин вуруд ба шумо имкон медиҳад, ки тавонед ҷаласаи захирашударо интихоб кунед" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Ин ҷаласа шуморо ба GNOME ворид мекунад" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 -#| msgid "GNOME" msgid "GNOME dummy" msgstr "Сохти GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Барномаҳои худоғозӣ" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Интихоб кунед, ки кадом барномаҳо ҳангоми воридшавӣ кушода мешаванд" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME дар Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "Ин ҷаласа шуморо ба GNOME тавассути Wayland ворид мекунад" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Ҷаласаи фармоишӣ" @@ -117,18 +134,6 @@ msgid "_Continue" msgstr "_Идома додан" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Баъзе барномаҳо то ҳол иҷро шуда истодаанд:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Барномаҳои худоғозӣ" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Интихоб кунед, ки кадом барномаҳо ҳангоми воридшавӣ кушода мешаванд" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Барномаҳои худоғозии _иловагӣ:" @@ -235,11 +240,11 @@ msgid "Show session management options" msgstr "Намоиш додани имконоти идоракунии ҷаласа" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Ваҳ! Чизе вайрон шудааст." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -247,7 +252,7 @@ "Хатогӣ ба вуҷуд омад ва система барқарор карда натавонист. Лутфан, бо " "маъмури система дар тамос шавед" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -255,7 +260,7 @@ "Хатогӣ ба вуҷуд омад ва система барқарор карда натавонист. Ба сабабҳои " "бехатарӣ ҳамаи пасвандҳо ғайрифаъол карда шудаанд." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -263,140 +268,23 @@ "Хатогӣ ба вуҷуд омад ва система барқарор карда натавонист.\n" "Лутфан, бароед ва аз нав ворид шавед." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Баромадан" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Фаъол кардани ислоҳи хатоҳои барномарезӣ" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Иҷозат додани баромад" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Намоиш додани огоҳи пасванд" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Номаълум" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Барнома то ҳол иҷро шуда истодааст:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Дар ҳоли мунтазири пӯшидани барнома. Пӯшидани барнома метавонад сабаби гум " -"кардани кори шумо шавад." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Дар ҳоли мунтазири пӯшидани барномаҳо. Пӯшидани барномаҳо метавонад сабаби " -"гум кардани кори шумо шавад." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Ба ҳар ҳол корбарро қатъу васл кунед" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Ба ҳар ҳол бароед" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Ба ҳар ҳол таваққуф кунед" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Ба ҳар ҳол гибернатсия кунед" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Корро ба ҳар ҳол анҷом диҳед" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Ба ҳар ҳол бозоғозӣ кунед" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Экрани қулф" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Бекор кардан" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Шумо аз система баъд аз %d сония ба таври худкор мебароед." -msgstr[1] "Шумо аз система баъд аз %d сония ба таври худкор мебароед." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Кори ин система баъд аз %d сония ба таври худкор анҷом меёбад." -msgstr[1] "Кори ин система баъд аз %d сония ба таври худкор анҷом меёбад." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Ин система баъд аз %d сония ба таври худкор бозоғозӣ мешавад." -msgstr[1] "Ин система баъд аз %d сония ба таври худкор бозоғозӣ мешавад." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Шумо ҳамчун \"%s\" ворид шудаед." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Аз ин система ҳозир мебароед?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Таъвизи корбар" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Кори ин системаро ҳозир ба анҷом медиҳед?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Таваққуф кардан" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Гибернатсия кардан" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Бозоғозидан" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Анҷом додани кор" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Ин системаро ба ҳар ҳол бозоғозӣ мекунед?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Ҷавоб намедиҳад" @@ -408,11 +296,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Барномаҳои ба хотир гирифташуда" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ин барнома баромади шуморо манъ мекунад." @@ -429,32 +317,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Эҷоди бастагоҳи мунтазири ICE имконнопазир аст: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Аз нав таъинкунии феҳристҳои худоғозии стандартӣ" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Ҷаласа барои истифодабарӣ" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Бор накардани барномаҳои таъиншуда бо корбар" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "намоиш додани равзарани гуфтугӯи хатоҳо барои санҷиш" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - мудири ҷаласаи GNOME" @@ -556,6 +444,95 @@ msgid "Program called with conflicting options" msgstr "Барнома бо ихтилофи имконот дархост шудааст" +#~ msgid "Some programs are still running:" +#~ msgstr "Баъзе барномаҳо то ҳол иҷро шуда истодаанд:" + +#~ msgid "Unknown" +#~ msgstr "Номаълум" + +#~ msgid "A program is still running:" +#~ msgstr "Барнома то ҳол иҷро шуда истодааст:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Дар ҳоли мунтазири пӯшидани барнома. Пӯшидани барнома метавонад сабаби " +#~ "гум кардани кори шумо шавад." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Дар ҳоли мунтазири пӯшидани барномаҳо. Пӯшидани барномаҳо метавонад " +#~ "сабаби гум кардани кори шумо шавад." + +#~ msgid "Switch User Anyway" +#~ msgstr "Ба ҳар ҳол корбарро қатъу васл кунед" + +#~ msgid "Log Out Anyway" +#~ msgstr "Ба ҳар ҳол бароед" + +#~ msgid "Suspend Anyway" +#~ msgstr "Ба ҳар ҳол таваққуф кунед" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Ба ҳар ҳол гибернатсия кунед" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Корро ба ҳар ҳол анҷом диҳед" + +#~ msgid "Restart Anyway" +#~ msgstr "Ба ҳар ҳол бозоғозӣ кунед" + +#~ msgid "Lock Screen" +#~ msgstr "Экрани қулф" + +#~ msgid "Cancel" +#~ msgstr "Бекор кардан" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Шумо аз система баъд аз %d сония ба таври худкор мебароед." +#~ msgstr[1] "Шумо аз система баъд аз %d сония ба таври худкор мебароед." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Кори ин система баъд аз %d сония ба таври худкор анҷом меёбад." +#~ msgstr[1] "Кори ин система баъд аз %d сония ба таври худкор анҷом меёбад." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Ин система баъд аз %d сония ба таври худкор бозоғозӣ мешавад." +#~ msgstr[1] "Ин система баъд аз %d сония ба таври худкор бозоғозӣ мешавад." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Шумо ҳамчун \"%s\" ворид шудаед." + +#~ msgid "Log out of this system now?" +#~ msgstr "Аз ин система ҳозир мебароед?" + +#~ msgid "_Switch User" +#~ msgstr "_Таъвизи корбар" + +#~ msgid "Shut down this system now?" +#~ msgstr "Кори ин системаро ҳозир ба анҷом медиҳед?" + +#~ msgid "S_uspend" +#~ msgstr "_Таваққуф кардан" + +#~ msgid "_Hibernate" +#~ msgstr "_Гибернатсия кардан" + +#~ msgid "_Restart" +#~ msgstr "_Бозоғозидан" + +#~ msgid "_Shut Down" +#~ msgstr "_Анҷом додани кор" + +#~ msgid "Restart this system now?" +#~ msgstr "Ин системаро ба ҳар ҳол бозоғозӣ мекунед?" + #~ msgid "%d hour" #~ msgid_plural "%d hours" #~ msgstr[0] "%d соат" diff -Nru gnome-session-3.9.90/po/tr.po gnome-session-3.14.0/po/tr.po --- gnome-session-3.9.90/po/tr.po 2013-07-30 19:11:51.000000000 +0000 +++ gnome-session-3.14.0/po/tr.po 2014-07-18 20:50:42.000000000 +0000 @@ -9,76 +9,30 @@ # Baris Cicek , 2004, 2008, 2009. # Muhammed Eken , 2011. # Osman Karagöz , 2013. -# Muhammet Kara , 2011, 2012, 2013. # Ozan Çağlayan , 2013. +# Muhammet Kara , 2011, 2012, 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: gnome-session\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-05-07 12:25+0000\n" -"PO-Revision-Date: 2013-04-21 22:12+0300\n" -"Last-Translator: Ozan Çağlayan \n" -"Language-Team: Türkçe <>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2014-06-07 07:21+0000\n" +"PO-Revision-Date: 2014-06-05 23:50+0000\n" +"Last-Translator: Muhammet Kara \n" +"Language-Team: Türkçe \n" "Language: tr\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" -"X-Generator: Gtranslator 2.91.6\n" -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "Komut Seç" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "Başlangıç Programı Ekle" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "Başlangıç Programı Düzenle" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "Başlangıç komutu boş bırakılamaz" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "Başlangıç komutu geçerli değil" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "Etkin" - -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "Simge" - -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "Program" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "Açılış Uygulamaları Tercihleri" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "İsimsiz" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "Açıklama yok" - -#: ../capplet/main.c:35 ../gnome-session/main.c:288 -msgid "Version of this application" -msgstr "Bu uygulamanın sürümü" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "Özel" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "Yardım belgesi görüntülenemedi" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "Bu girdi kaydedilmiş bir oturumu seçmenizi sağlar" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -88,23 +42,24 @@ msgid "This session logs you into GNOME" msgstr "Bu oturum GNOME girişi yapmanızı sağlar" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "Özel" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "Bu girdi kaydedilmiş bir oturumu seçmenizi sağlar" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "Wayland üzerinde GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "GNOME'da Wayland kullanarak oturum açmanızı sağlar" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Özel Oturum" -#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:103 +#: ../data/session-selector.ui.h:2 ../tools/gnome-session-selector.c:102 msgid "Please select a custom session to run" msgstr "Lütfen çalıştırmak için özel oturum seçin" @@ -124,18 +79,6 @@ msgid "_Continue" msgstr "_Devam et" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Bazı programlar hala çalışıyor:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Başlangıç Uygulamaları" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Giriş yaptığınızda hangi uygulamaların başlatılacağını seçin" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Ek başlangıç _programları:" @@ -172,293 +115,109 @@ msgid "_Name:" msgstr "İ_sim:" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "Dosya geçerli bir .desktop dosyası değil" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "Tanınmayan desktop dosyası sürümü '%s'" - -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "%s Başlatılıyor" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "Uygulama belgeleri komut satırında kabul etmiyor" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "Tanınmayan başlatma seçeneği: %d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "Belge URI'lerini bir 'Tür=Bağ' masaüstü girişi olarak geçilemiyor" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "Başlatılabilir bir öğe değil" - -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "Oturum yöneticisine bağlantıyı kapat" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "Kayıtlı yapılandırmayı içeren dosyayı belirtin" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "DOSYA" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "Oturum yönetim ID'si belirtin" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "Oturum yönetim seçenekleri:" - -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "Oturum yönetim seçeneklerini göster" - -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "Oh no! Something has gone wrong." msgstr "Hay aksi! Birşeyler ters gitti." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:328 msgid "" -"A problem has occurred and the system can't recover. Please contact a system " -"administrator" -msgstr "" -"Bir sorun oluştu ve sistem kurtarılamıyor. Lütfen bir sistem yöneticisine " -"başvurun" +"A problem has occurred and the system can't recover. Please contact a system" +" administrator" +msgstr "Bir sorun oluştu ve sistem kurtarılamıyor. Lütfen bir sistem yöneticisine başvurun" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:330 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." -msgstr "" -"Bir sorun oluştu ve sistem kurtarılamıyor. Önlem olarak tüm eklentiler devre " -"dışı bırakıldı." +msgstr "Bir sorun oluştu ve sistem kurtarılamıyor. Önlem olarak tüm eklentiler devre dışı bırakıldı." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:332 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." -msgstr "" -"Bir sorun oluştu ve sistem kurtarılamıyor.\n" -"Lütfen çıkış yapın ve tekrar deneyin." +msgstr "Bir sorun oluştu ve sistem kurtarılamıyor.\nLütfen çıkış yapın ve tekrar deneyin." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:347 msgid "_Log Out" msgstr "Çı_kış" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:369 ../gnome-session/main.c:305 msgid "Enable debugging code" msgstr "Hata ayıklama kodunu etkinleştir" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:370 msgid "Allow logout" msgstr "Çıkışa İzin Ver" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:371 msgid "Show extension warning" msgstr "Eklenti uyarısını göster" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Bilinmiyor" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Bir program hala çalışıyor:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Programın bitmesi bekleniyor. Programı kesintiye uğratmak çalışmalarınızı " -"kaybetmenize sebep olabilir." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Programların bitmesi bekleniyor. Bu programları kesintiye uğratmak " -"yaptığınız işlerin kaybolmasına sebep olabilir." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Yine de Kullanıcıyı Değiştir" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Yine de Oturumu Kapat" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Yine de Beklemeye Geç" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Yine de Uyku Kipine Geç" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Yine de Bilgisayarı Kapat" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Yine de Yeniden Başlat" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Ekranı Kilitle" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "İptal" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "%d saniye içerisinde kendiliğinden çıkış yaptırılacaksınız." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Bu sistem %d saniye içerisinde kendiliğinden kapatılacak." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Bu sistem %d saniye içinde kendiliğinden yeniden başlatılacak." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Şu anda \"%s\" olarak giriş yaptınız." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Bu sistemden şimdi çıkılsın mı?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Kullanıcı Değiştir" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Sistem şimdi kapatılsın mı?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "_Beklemeye Al" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "_Uyku Kipi" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "_Yeniden Başlat" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Kapat" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Sistem şimdi yeniden başlatılsın mı?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Cevap vermiyor" -#: ../gnome-session/gsm-util.c:411 +#: ../gnome-session/gsm-util.c:382 msgid "_Log out" msgstr "_Çıkış" #. It'd be really surprising to reach this code: if we're here, #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. -#. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:557 msgid "Remembered Application" msgstr "Hatırlanan Uygulama" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1207 msgid "This program is blocking logout." msgstr "Bu program, oturumu kapatmayı engelliyor." -#: ../gnome-session/gsm-xsmp-server.c:341 +#: ../gnome-session/gsm-xsmp-server.c:340 msgid "" "Refusing new client connection because the session is currently being shut " "down\n" msgstr "Oturum şu anda kapatıldığı için yeni istemci bağlantısı reddediliyor\n" -#: ../gnome-session/gsm-xsmp-server.c:610 +#: ../gnome-session/gsm-xsmp-server.c:609 #, c-format msgid "Could not create ICE listening socket: %s" msgstr "ICE dinleme soketi oluşturulamadı: %s" -#: ../gnome-session/main.c:284 +#: ../gnome-session/main.c:303 msgid "Override standard autostart directories" msgstr "Standart kendiliğinden başlat dizinlerinin yerine geç" -#: ../gnome-session/main.c:284 +#: ../gnome-session/main.c:303 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:285 +#: ../gnome-session/main.c:304 msgid "Session to use" msgstr "Kullanılacak oturum" -#: ../gnome-session/main.c:285 +#: ../gnome-session/main.c:304 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:287 +#: ../gnome-session/main.c:306 msgid "Do not load user-specified applications" msgstr "Kullanıcıya özel programları yükleme" -#. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:290 +#: ../gnome-session/main.c:307 +msgid "Version of this application" +msgstr "Bu uygulamanın sürümü" + +#. Translators: the 'fail whale' is the black dialog we show when something +#. goes seriously wrong +#: ../gnome-session/main.c:309 msgid "Show the fail whale dialog for testing" msgstr "Sınama için büyük hata iletişim penceresini göster" -#: ../gnome-session/main.c:336 +#: ../gnome-session/main.c:342 msgid " - the GNOME session manager" msgstr "- GNOME oturum yöneticisi" -#: ../tools/gnome-session-inhibit.c:110 +#: ../tools/gnome-session-inhibit.c:108 #, c-format msgid "" "%s [OPTION...] COMMAND\n" @@ -475,622 +234,66 @@ " --inhibit-only Do not launch COMMAND and wait forever instead\n" "\n" "If no --inhibit option is specified, idle is assumed.\n" -msgstr "" -"%s [SEÇENEK...] KOMUT\n" -"\n" -"Bazı oturum işlevlerini kısıtlayarak KOMUT çalıştır.\n" -"\n" -" -h, --help Bu yardımı göster\n" -" --version Program sürümünü göster\n" -" --app-id ID Kısıtlama yapılırken kullanılacak\n" -" uygulama ID'si (isteğe bağlı)\n" -" --reason REASON Kısıtlama sebebi (isteğe bağlı)\n" -" --inhibit ARG Kısıtlamaların virgülle ayrılmış listesi:\n" -" logout, switch-user, suspend, idle, automount\n" -" --inhibit-only KOMUT'u çalıştırmak yerine sürekli bekle\n" -"\n" -"Eğer hiç --inhibit seçeneği verilmediyse, idle kısıtı kabul edilir.\n" +msgstr "%s [SEÇENEK...] KOMUT\n\nBazı oturum işlevlerini kısıtlayarak KOMUT çalıştır.\n\n -h, --help Bu yardımı göster\n --version Program sürümünü göster\n --app-id ID Kısıtlama yapılırken kullanılacak\n uygulama ID'si (isteğe bağlı)\n --reason REASON Kısıtlama sebebi (isteğe bağlı)\n --inhibit ARG Kısıtlamaların virgülle ayrılmış listesi:\n logout, switch-user, suspend, idle, automount\n --inhibit-only KOMUT'u çalıştırmak yerine sürekli bekle\n\nEğer hiç --inhibit seçeneği verilmediyse, idle kısıtı kabul edilir.\n" -#: ../tools/gnome-session-inhibit.c:148 +#: ../tools/gnome-session-inhibit.c:146 #, c-format msgid "Failed to execute %s\n" msgstr "%s çalıştırılamadı\n" -#: ../tools/gnome-session-inhibit.c:208 ../tools/gnome-session-inhibit.c:218 -#: ../tools/gnome-session-inhibit.c:228 +#: ../tools/gnome-session-inhibit.c:206 ../tools/gnome-session-inhibit.c:216 +#: ../tools/gnome-session-inhibit.c:226 #, c-format msgid "%s requires an argument\n" msgstr "%s için parametre eksik\n" -#: ../tools/gnome-session-selector.c:62 +#: ../tools/gnome-session-selector.c:61 #, c-format msgid "Session %d" msgstr "%d Oturumu" -#: ../tools/gnome-session-selector.c:108 +#: ../tools/gnome-session-selector.c:107 msgid "" "Session names are not allowed to start with ‘.’ or contain ‘/’ characters" msgstr "Oturum isimleri ‘.’ ile başlayamaz ve ‘/’ karakterini içeremez" -#: ../tools/gnome-session-selector.c:112 +#: ../tools/gnome-session-selector.c:111 msgid "Session names are not allowed to start with ‘.’" msgstr "Oturum isimleri ‘.’ ile başlayamaz" -#: ../tools/gnome-session-selector.c:116 +#: ../tools/gnome-session-selector.c:115 msgid "Session names are not allowed to contain ‘/’ characters" msgstr "Oturum isimleri ‘/’ karakterini içeremez" -#: ../tools/gnome-session-selector.c:124 +#: ../tools/gnome-session-selector.c:123 #, c-format msgid "A session named ‘%s’ already exists" msgstr "Zaten ‘%s’ isminde bir oturum mevcut" -#: ../tools/gnome-session-quit.c:53 +#: ../tools/gnome-session-quit.c:51 msgid "Log out" msgstr "Çıkış" -#: ../tools/gnome-session-quit.c:54 +#: ../tools/gnome-session-quit.c:52 msgid "Power off" msgstr "Bilgisayarı kapat" -#: ../tools/gnome-session-quit.c:55 +#: ../tools/gnome-session-quit.c:53 msgid "Reboot" msgstr "Yeniden Başlat" -#: ../tools/gnome-session-quit.c:56 +#: ../tools/gnome-session-quit.c:54 msgid "Ignoring any existing inhibitors" msgstr "Mevcut tüm engelleyiciler yok sayılıyor" -#: ../tools/gnome-session-quit.c:57 +#: ../tools/gnome-session-quit.c:55 msgid "Don't prompt for user confirmation" msgstr "Kullanıcıdan onay isteme" -#: ../tools/gnome-session-quit.c:91 ../tools/gnome-session-quit.c:101 +#: ../tools/gnome-session-quit.c:89 ../tools/gnome-session-quit.c:99 msgid "Could not connect to the session manager" msgstr "Oturum yöneticisine bağlanılamadı" -#: ../tools/gnome-session-quit.c:203 +#: ../tools/gnome-session-quit.c:201 msgid "Program called with conflicting options" msgstr "Program çakışan seçeneklerle çağırıldı" - -#~ msgid "GNOME fallback" -#~ msgstr "GNOME korumalı" - -#~ msgid "Icon '%s' not found" -#~ msgstr "Simge '%s' bulunamadı" - -#~ msgid "GNOME 3 Failed to Load" -#~ msgstr "GNOME 3'ün Yüklenmesi Başarısız Oldu" - -#~ msgid "" -#~ "Unfortunately GNOME 3 failed to start properly and started in the " -#~ "fallback mode.\n" -#~ "\n" -#~ "This most likely means your system (graphics hardware or driver) is not " -#~ "capable of delivering the full GNOME 3 experience." -#~ msgstr "" -#~ "Maalesef GNOME 3 düzgün şekilde başlatılamadı ve korumalı kipte " -#~ "başlatıldı.\n" -#~ "\n" -#~ "Büyük olasılıkla sisteminiz (grafik donanımı veya sürücüsü) tam GNOME 3 " -#~ "deneyimi sunmak için yeterli değil." - -#~ msgid "Learn more about GNOME 3" -#~ msgstr "GNOME 3 hakkında daha fazlasını öğren" - -#~ msgid "" -#~ "Unable to start login session (and unable to connect to the X server)" -#~ msgstr "Giriş oturumu başlatılamıyor (ve X sunucuya bağlanılamıyor)" - -#~ msgid "Some programs are still running:" -#~ msgstr "Bazı programlar hala çalışıyor:" - -#~ msgid "" -#~ "A problem has occurred and the system can't recover. Some of the " -#~ "extensions below may have caused this.\n" -#~ "Please try disabling some of these, and then log out and try again." -#~ msgstr "" -#~ "Bir sorun oluştu ve sistem kurtarılamıyor. Aşağıdaki uzantılardan " -#~ "bazıları buna sebep olmuş olabilir.\n" -#~ "Lütfen bunlardan bazılarını devre dışı bırakmayı deneyin ve sonra çıkış " -#~ "yapıp tekrar deneyin." - -#~ msgid "Exited with code %d" -#~ msgstr "%d kodu ile çıkıldı" - -#~ msgid "Killed by signal %d" -#~ msgstr "%d sinyali ile öldürüldü" - -#~ msgid "Stopped by signal %d" -#~ msgstr "%d sinyali ile durduruldu" - -#~ msgid "" -#~ "There is a problem with the configuration server.\n" -#~ "(%s exited with status %d)" -#~ msgstr "" -#~ "Yapılandırma sunucusu ile ilgili bir sorun var.\n" -#~ "(%s durum %d ile çıktı)" - -#~ msgid "" -#~ "Assistive technology support has been requested for this session, but the " -#~ "accessibility registry was not found. Please ensure that the AT-SPI " -#~ "package is installed. Your session has been started without assistive " -#~ "technology support." -#~ msgstr "" -#~ "Bu oturum için yardımcı teknoloji desteği istendi, ancak erişilebilirlik " -#~ "kaydı bulunamadı. Lütfen AT-SPI paketinin kurulu olduğundan emin olun. " -#~ "Oturumunuz yardımcı teknoloji desteği olmadan başlatıldı." - -#~ msgid "AT SPI Registry Wrapper" -#~ msgstr "AT SPI Kayıt Sarmallayıcı" - -#~ msgid "GNOME Settings Daemon Helper" -#~ msgstr "GNOME Ayarları Servis Yardımcısı" - -#~ msgid "Default session" -#~ msgstr "Öntanımlı oturum" - -#~ msgid "File Manager" -#~ msgstr "Dosya Yöneticisi" - -#~ msgid "" -#~ "If enabled, gnome-session will prompt the user before ending a session." -#~ msgstr "" -#~ "Eğer seçiliyse, gnome-session oturumu kapatmadan önce kullanıcı istemini " -#~ "sorar." - -#~ msgid "" -#~ "If enabled, gnome-session will save the session automatically. Otherwise, " -#~ "the logout dialog will have an option to save the session." -#~ msgstr "" -#~ "Eğer seçiliyse, gnome-session oturumu kendiliğinden kaydeder. Seçili " -#~ "değilse, iletişim kutusunda oturumu kaydetme seçeneği bulunur." - -#~ msgid "List of applications that are part of the default session." -#~ msgstr "Öntanımlı oturumun parçası olan uygulamaların listesi." - -#~ msgid "" -#~ "List of components that are required as part of the session. (Each " -#~ "element names a key under \"/desktop/gnome/session/required_components" -#~ "\"). The Startup Applications preferences tool will not normally allow " -#~ "users to remove a required component from the session, and the session " -#~ "manager will automatically add the required components back to the " -#~ "session at login time if they do get removed." -#~ msgstr "" -#~ "Oturumun parçası olarak gerekli bileşenlerin listesi. (Her öğe ismi \"/" -#~ "desktop/gnome/session/required-components\" anahtarı altındadır). " -#~ "Başlangıç Uygulamaları tercihleri aracı kullanıcıların normal olarak " -#~ "oturumdan gerekli bileşenleri silmesine izin vermez ve oturum yöneticisi " -#~ "gerekli bileşenleri silinirlerse oturuma kendiliğinden ekler." - -#~ msgid "Logout prompt" -#~ msgstr "Çıkış istemi" - -#~ msgid "Panel" -#~ msgstr "Panel" - -#~ msgid "Preferred Image to use for login splash screen" -#~ msgstr "Giriş başlangıç ekranı için tercih edilen resim" - -#~ msgid "Required session components" -#~ msgstr "Gerekli oturum bileşenleri" - -#~ msgid "Show the splash screen" -#~ msgstr "Açılış ekranı göster" - -#~ msgid "Show the splash screen when the session starts up" -#~ msgstr "Oturum başlatılırken açılış ekranını göster" - -#~ msgid "" -#~ "The file manager provides the desktop icons and allows you to interact " -#~ "with your saved files." -#~ msgstr "" -#~ "Dosya yöneticisi, masaüstü simgeleri ile kayıtlı dosyalarınızla etkileşim " -#~ "olanağı sağlar." - -#~ msgid "" -#~ "The number of minutes of inactivity before the session is considered idle." -#~ msgstr "" -#~ "Oturumun atıl olarak kabul edilmesi için etkin olmama dakikaları miktarı." - -#~ msgid "" -#~ "The panel provides the bar at the top or bottom of the screen containing " -#~ "menus, the window list, status icons, the clock, etc." -#~ msgstr "" -#~ "Panel, ekranın üstünde ya da altında menüler, pencere listesi, durum " -#~ "simgeleri, saat vb. öğeler içeren çubuk sağlar." - -#~ msgid "" -#~ "The window manager is the program that draws the title bar and borders " -#~ "around windows, and allows you to move and resize windows." -#~ msgstr "" -#~ "Pencere yöneticisi, pencerelerin başlıklarını ve çevrelerindeki " -#~ "kenarlıkları çizen ve pencereleri yeniden boyutlandırmanıza ve taşımanıza " -#~ "olanak sağlayan programdır." - -#~ msgid "" -#~ "This is a relative path value based off the $datadir/pixmaps/ directory. " -#~ "Sub-directories and image names are valid values. Changing this value " -#~ "will effect the next session login." -#~ msgstr "" -#~ "Bu $datadir/pixmaps/ dizinine göre bir yoldur. Alt dizinler ve resim " -#~ "isimleri geçerli değerlerdir. Bu değeri değiştirmek sonraki giriş " -#~ "oturumunu etkileyecektir." - -#~ msgid "Time before session is considered idle" -#~ msgstr "Oturum atıl kabul edilmeden önceki süre" - -#~ msgid "Window Manager" -#~ msgstr "Pencere Yöneticisi" - -#~ msgid "" -#~ "Waiting for program to finish. Interrupting program may cause you to " -#~ "lose work." -#~ msgstr "" -#~ "Programın bitmesi bekleniyor. Programı kesme yapmış olduğunuz işleri " -#~ "kaybetmenize neden olabilir." - -#~ msgid "GConf key used to lookup default session" -#~ msgstr "Öntanımlı oturuma bakmak için kullanılan GConf anahtarı" - -#~ msgid "- GNOME Splash Screen" -#~ msgstr "- GNOME Açılış Ekranı" - -#~ msgid "GNOME Splash Screen" -#~ msgstr "GNOME Başlangıç Ekranı" - -#~ msgid "Show shutdown dialog" -#~ msgstr "Kapatma penceresini göster" - -#~ msgid "Use dialog boxes for errors" -#~ msgstr "Hatalar için iletişim kutularını kullan" - -#~ msgid "Set the current session name" -#~ msgstr "Mevcut oturum ismini ayarla" - -#~ msgid "NAME" -#~ msgstr "İSİM" - -#~ msgid "Kill session" -#~ msgstr "Oturumu öldür" - -#~ msgid "The name of the startup program cannot be empty" -#~ msgstr "Başlangıç programının ismi boş olamaz" - -#~ msgid "Sessions Preferences" -#~ msgstr "Oturum Tercihleri" - -#~ msgid "GNOME Keyring Daemon Wrapper" -#~ msgstr "GNOME Anatharlık Servisi Sarmallayıcı" - -#~ msgid "Selected option in the log out dialog" -#~ msgstr "Çıkış penceresindeki seçilmiş seçenek" - -#~ msgid "" -#~ "This is the option that will be selected in the logout dialog, valid " -#~ "values are \"logout\" for logging out, \"shutdown\" for halting the " -#~ "system and \"restart\" for restarting the system." -#~ msgstr "" -#~ "Bu çıkış penceresindeki seçilmiş seçenektir, geçerli değerler çıkış için " -#~ "\"logout\", sistemi kapatmak için \"shutdown\" ve sistemi yeniden " -#~ "başlatmak için \"restart\"tır." - -#~ msgid "Configure your sessions" -#~ msgstr "Oturumlarınızı yapılandırın" - -#~ msgid "Session management" -#~ msgstr "Oturum yönetimi" - -#~ msgid "GNOME GUI Library + EggSMClient" -#~ msgstr "GNOME Grafiksel Arayüz Kütüphanesi + EggSMClient" - -#~ msgid "Allow TCP connections" -#~ msgstr "TCP bağlantılarına izin ver" - -#~ msgid "" -#~ "For security reasons, on platforms which have _IceTcpTransNoListen() " -#~ "(XFree86 systems), gnome-session does not listen for connections on TCP " -#~ "ports. This option will allow connections from (authorized) remote hosts. " -#~ "gnome-session must be restarted for this to take effect." -#~ msgstr "" -#~ "Güvenlik gerekçesiyle, gnome-session, _IceTcpTransNoListen() olan " -#~ "platformlarda (XFree86 sistemleri) TCP portlarını dinlemez. Bu seçenek " -#~ "(tekilendirilmemiş) uzaktan bağlantılara izin verir. Etkin olabilmesi " -#~ "için gnome-session yeniden başlatılmalıdır." - -#~ msgid "_Order:" -#~ msgstr "_Sıra:" - -#~ msgid "What happens to the application when it exits." -#~ msgstr "Uygulamadan çıkarken ne olacağı." - -#~ msgid "_Style:" -#~ msgstr "_Stil:" - -#~ msgid "Inactive" -#~ msgstr "Etkin değil" - -#~ msgid "Waiting to start or already finished." -#~ msgstr "Başlatmak için bekleniyor veya zaten bitmiş." - -#~ msgid "Started but has not yet reported state." -#~ msgstr "Başlatıldı ama henüz durum rapor edilmedi." - -#~ msgid "Running" -#~ msgstr "Çalışıyor" - -#~ msgid "A normal member of the session." -#~ msgstr "Oturumun sıradan bir üyesi." - -#~ msgid "Saving" -#~ msgstr "Kaydediliyor" - -#~ msgid "Saving session details." -#~ msgstr "Oturum ayrıntıları kaydediliyor." - -#~ msgid "State not reported within timeout." -#~ msgstr "Durum, gereken süre içinde bildirilmedi." - -#~ msgid "Normal" -#~ msgstr "Olağan" - -#~ msgid "Unaffected by logouts but can die." -#~ msgstr "Çıkıştan etkilenmez ama öldürülebilir." - -#~ msgid "Never allowed to die." -#~ msgstr "Kesinlikle öldürülemez." - -#~ msgid "Trash" -#~ msgstr "Çöp" - -#~ msgid "Discarded on logout and can die." -#~ msgstr "Çıkışta atılır ve öldürülebilir." - -#~ msgid "Settings" -#~ msgstr "Ayarlar" - -#~ msgid "Always started on every login." -#~ msgstr "Her zaman her girişte başlatılır." - -#~ msgid "Order" -#~ msgstr "Sıra" - -#~ msgid "Style" -#~ msgstr "Stil" - -#~ msgid "State" -#~ msgstr "Durum" - -#~ msgid "" -#~ "There was an error starting the GNOME Settings Daemon.\n" -#~ "\n" -#~ "Some things, such as themes, sounds, or background settings may not work " -#~ "correctly." -#~ msgstr "" -#~ "GNOME Ayarları Servisi başlatırken hata oluştu.\n" -#~ "\n" -#~ "Bazı şeyler, örneğin temalar, sesler veya arkaplan ayarları, doğru " -#~ "çalışmayabilir." - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "The last error message was:\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Son hata iletisi şuydu:\n" -#~ "\n" - -#~ msgid "" -#~ "\n" -#~ "\n" -#~ "GNOME will still try to restart the Settings Daemon next time you log in." -#~ msgstr "" -#~ "\n" -#~ "\n" -#~ "Yine de GNOME bir sonraki girişte Ayarlar Servisini yeniden başlatmayı " -#~ "deneyecek." - -#~ msgid "The Settings Daemon restarted too many times." -#~ msgstr "Ayarlar Servisi çok fazla kez yeniden başlatıldı." - -#~ msgid "List registered clients, then exit" -#~ msgstr "Kayıtlı istemcileri listele, sonra çık" - -#~ msgid "PROGRAM..." -#~ msgstr "PROGRAM..." - -#~ msgid "" -#~ "You must specify at least one program to remove. You can list the " -#~ "programs with --list.\n" -#~ msgstr "" -#~ "Kaldırmak için en az bir program belirtmelisiniz. Programları --list ile " -#~ "listeleyebilirsiniz.\n" - -#~ msgid "Error: could not connect to the session manager\n" -#~ msgstr "Hata: oturum yöneticisine bağlanılamadı\n" - -#~ msgid "Currently registered clients:\n" -#~ msgstr "Şu an kayıtlı istemciler:\n" - -#~ msgid "Couldn't find program %s in session\n" -#~ msgstr "Program %s oturum içinde bulunamadı\n" - -#~ msgid "" -#~ "The GNOME session manager cannot start properly. Please report this as a " -#~ "GNOME bug. Please include this ICE failure message in the bug report: " -#~ "'%s'. Meanwhile you could try logging in using the failsafe session." -#~ msgstr "" -#~ "GNOME ortam yöneticisi tam olarak başlatılamıyor. Lütfen bunu GNOME " -#~ "hatası olarak raporlayın. Lütfen ICE hata mesajınız da hata bildirimine " -#~ "ekleyin: '%s'. Bu sırada hata durumunda kullanılan oturuma giriş yapmayı " -#~ "deneyebilirsiniz." - -#~ msgid "" -#~ "The GNOME session manager was unable to lock the file '%s'. Please " -#~ "report this as a GNOME bug. Sometimes this error may occur if the file's " -#~ "directory is unwritable, you could try logging in via the failsafe " -#~ "session and ensuring that it is." -#~ msgstr "" -#~ "GNOME oturum yöneticisi '%s' dosyasını kilitleyemedi. Lütfen bunu bir " -#~ "GNOME hatası olarak bildirin. Bazen bu hata dosyanın dizini yazılabilir " -#~ "olmadığı zaman oluşur, hata durumunda kullanılan oturuma giriş yapmayı " -#~ "deneyebilir ve dizinin yazılabilir olduğundan emin olabilirsiniz." - -#~ msgid "" -#~ "The GNOME session manager was unable to read the file: '%s'. If this " -#~ "file exists it must be readable by you for GNOME to work properly. Try " -#~ "logging in with the failsafe session and removing this file." -#~ msgstr "" -#~ "GNOME oturum yöneticisi dosyayı okuyamadı: '%s'. Eğer bu dosya mevcutsa " -#~ "tam olarak çalışabilmesi için GNOME tarafından okunabilir olması " -#~ "gerekmektedir. Hata durumunda kullanılan oturumla giriş yapıp bu dosyayı " -#~ "silmeyi deneyin." - -#~ msgid "" -#~ "Could not write to file '%s'. This file must be writable in order for " -#~ "GNOME to function properly. Try logging in with the failsafe session and " -#~ "removing this file. Also make sure that the file's directory is writable." -#~ msgstr "" -#~ "Dosya '%s' yazılamadı. Bu dosya GNOME'un düzgün çalışabilmesi için " -#~ "yazılabilir olmalıdır. Hata durumunda kullanılan oturum ile giriş yapıp " -#~ "bu dosyayı silmeyi deneyin. Ayrıca bu dosyanın dizininin yazılabilir " -#~ "oldugundan da emin olun." - -#~ msgid "Are you sure you want to log out?" -#~ msgstr "Çıkmak istediğinizden emin misiniz?" - -#~ msgid "_Restart the computer" -#~ msgstr "Bilgisayarı _yeniden başlat" - -#~ msgid "Only read saved sessions from the default.session file" -#~ msgstr "Sadece default.session dosyasından kaydedilmiş oturumları oku" - -#~ msgid "Millisecond period spent waiting for clients to register (0=forever)" -#~ msgstr "" -#~ "İstemcilerin kaydolması için milisaniye cinsinden bekleme süresi " -#~ "(0=sınırsız)" - -#~ msgid "DELAY" -#~ msgstr "GECİKME" - -#~ msgid "Millisecond period spent waiting for clients to respond (0=forever)" -#~ msgstr "" -#~ "İstemcilerin yanıtı için milisaniye cinsinden bekleme süresi (0=sonsuz)" - -#~ msgid "Millisecond period spent waiting for clients to die (0=forever)" -#~ msgstr "" -#~ "İstemcilerin ölmesi için milisaniye cinsinden bekleme süresi (0=sonsuz)" - -#~ msgid "This session is running as a privileged user" -#~ msgstr "Bu oturum bir imtiyazlı kullanıcı olarak çalışıyor" - -#~ msgid "" -#~ "Running a session as a privileged user should be avoided for security " -#~ "reasons. If possible, you should log in as a normal user." -#~ msgstr "" -#~ "Bir imtiyazlı kullanıcı olarak oturum çalıştırmak güvenlik gerekçeleri " -#~ "yüzünden sakınılmalıdır. Eğer mümkünse, normal kullanıcı olarak giriş " -#~ "yapmalısınız." - -#~ msgid "" -#~ "The session might encounter issues if the computer clock is not properly " -#~ "configured. Please consider adjusting it.\n" -#~ "\n" -#~ "Current date is %s." -#~ msgstr "" -#~ "Bu oturumu bilgisayarın saati düzgün olarak yapılandırılmamışsa " -#~ "sorunlarla karşılaşabilir. Lütfen saati ayarlamayı düşünün.\n" -#~ "\n" -#~ "Mevcut tarih %s." - -#~ msgid "Failed to launch time configuration tool: %s" -#~ msgstr "Zaman yapılandırma aracı başlatılırken başarısız oldu: %s" - -#~ msgid "The computer clock appears to be wrong" -#~ msgstr "Bu bilgisayarın saati yanlış gibi görünüyor" - -#~ msgid "_Ignore" -#~ msgstr "_Yok Say" - -#~ msgid "_Adjust the Clock" -#~ msgstr "_Saati Ayarla" - -#~ msgid "" -#~ "Could not look up internet address for %s.\n" -#~ "This will prevent GNOME from operating correctly.\n" -#~ "It may be possible to correct the problem by adding\n" -#~ "%s to the file /etc/hosts." -#~ msgstr "" -#~ "%s'nin internet adresi bulunamadı.\n" -#~ "Bu GNOME'un düzgün çalışmasına engel olacaktır.\n" -#~ "Bu sorunu belki %s adresini /etc/hosts dosyasına\n" -#~ "ekleyerek çözebilirsiniz." - -#~ msgid "Try Again" -#~ msgstr "Yeniden Dene" - -#~ msgid "Wait abandoned due to conflict." -#~ msgstr "Bir çakışmadan dolayı bekleme bırakıldı." - -#~ msgid "No response to the %s command." -#~ msgstr "%s komutuna yanıt yok." - -#~ msgid "The program may be slow, stopped or broken." -#~ msgstr "Uygulama yavaş, durdurulmuş ya da bozuk olabilir." - -#~ msgid "You may wait for it to respond or remove it." -#~ msgstr "Yanıt vermesini bekleyebilir ya da kaldırabilirsiniz." - -#~ msgid "Restart abandoned due to failures." -#~ msgstr "Hatalardan dolayı yeniden başlatma iptal edildi." - -#~ msgid "A session shutdown is in progress." -#~ msgstr "Oturum kapatılması sürüyor." - -#~ msgid "- Save the current session" -#~ msgstr "- Mevcut oturumu kaydet" - -#~ msgid "Save changes to the current session before closing?" -#~ msgstr "Kapatmadan önce mevcut oturumdaki değişiklikleri kaydet?" - -#~ msgid "If you don't save, changes will be discarded." -#~ msgstr "Eğer kaydetmezseniz, değişiklikler kaybolacak." - -#~ msgid "_Close without Saving" -#~ msgstr "_Kaydetmeden Çık" - -#~ msgid "Your session has been saved." -#~ msgstr "Oturumunuz kaydedildi." - -#~ msgid "could not connect to the session manager\n" -#~ msgstr "oturum yöneticisine bağlanılamadı\n" - -#~ msgid "session manager does not support GNOME extensions\n" -#~ msgstr "oturum yöneticisi GNOME uzantılarını desteklemiyor\n" - -#~ msgid "Remove the currently selected client from the session." -#~ msgstr "Seçili istemciyi oturumdan kaldır." - -#~ msgid "Apply changes to the current session" -#~ msgstr "Değişiklikleri geçerli oturuma uygula" - -#~ msgid "The list of programs in the session." -#~ msgstr "Oturumdaki programların listesi." - -#~ msgid "Currently running _programs:" -#~ msgstr "Şu _anda çalışan programlar:" - -#~ msgid "Sawfish Window Manager" -#~ msgstr "Sawfish Pencere Yöneticisi" - -#~ msgid "Metacity Window Manager" -#~ msgstr "Metacity Pencere Yöneticisi" - -#~ msgid "Nautilus" -#~ msgstr "Nautilus" - -#~ msgid "Desktop Settings" -#~ msgstr "Masaüstü Ayarları" diff -Nru gnome-session-3.9.90/po/uk.po gnome-session-3.14.0/po/uk.po --- gnome-session-3.9.90/po/uk.po 2013-03-25 20:41:10.000000000 +0000 +++ gnome-session-3.14.0/po/uk.po 2014-06-25 18:06:34.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: gnome-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-23 12:57+0200\n" -"PO-Revision-Date: 2013-03-23 13:17+0300\n" +"POT-Creation-Date: 2013-09-21 11:35+0300\n" +"PO-Revision-Date: 2013-09-21 11:38+0300\n" "Last-Translator: Daniel Korostil \n" "Language-Team: linux.org.ua\n" "Language: uk\n" @@ -42,31 +42,31 @@ msgid "The startup command is not valid" msgstr "Початкова команда некоректна" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "Увімкнено" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "Піктограма" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "Програма" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "Налаштування початкових програм " -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "Без назви" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "Без опису" -#: ../capplet/main.c:35 ../gnome-session/main.c:284 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "Версія цієї програми" @@ -74,14 +74,6 @@ msgid "Could not display help document" msgstr "Не вдалось показати довідку" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "Це — сеанс входу в GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "Інше" @@ -90,10 +82,37 @@ msgid "This entry lets you select a saved session" msgstr "Цей запис дозволяє вибрати збережений сеанс" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "Це — сеанс входу в GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "Несправжній GNOME" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "Початкові програми" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "Виберіть програми, що запускаються при вході в сеанс" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME (Wayland)" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "" +"Це сеанс запускає вас у GNOME, який використовує графічну архітектуру " +"Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "Власний сеанс" @@ -118,18 +137,6 @@ msgid "_Continue" msgstr "Про_довжити" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "Деякі програми досі працюють:" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "Початкові програми" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "Виберіть програми, що запускаються при вході в сеанс" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "Додаткові по_чаткові програми для запуску:" @@ -234,11 +241,11 @@ msgid "Show session management options" msgstr "Показати параметри керування сеансами" -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "Отакої! Щось не так." -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" @@ -246,7 +253,7 @@ "Виникла помилка і систему неможливо відновити. Будь ласка, зв'яжіться з " "системним адміністратором" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." @@ -254,7 +261,7 @@ "Виникла помилка і систему неможливо відновити. Всі розширення вимкнуло як " "запобіжний засіб." -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -262,143 +269,23 @@ "Виникла помилка і систему неможливо відновити.\n" "Будь ласка, вийдіть і спробуйте знову." -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "_Завершити сеанс" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "Увімкнути код зневадження" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "Дозволити вихід" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "Показати зауваги розширення" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "Невідомо" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "Програма досі працює:" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "" -"Очікування завершення роботи програм. Переривання цих програм може привести " -"до втрати вашої напрацювань." - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "" -"Очікування завершення роботи програм. Переривання цих програм може привести " -"до втрати вашої роботи." - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "Однаково перемикнути користувача" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "Однаково вийти із системи" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "Однаково призупинити систему" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "Однаково приспати систему" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "Однаково вимкнути систему" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "Однаково перезавантажити" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "Заблокувати екран" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "Скасувати" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "Сеанс буде автоматично завершено через %d секунду." -msgstr[1] "Сеанс буде автоматично завершено через %d секунди." -msgstr[2] "Сеанс буде автоматично завершено через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "Систему буде вимкнено автоматично через %d секунду." -msgstr[1] "Систему буде вимкнено автоматично через %d секунди." -msgstr[2] "Систему буде вимкнено автоматично через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "Систему буде автоматично перезавантажено через %d секунду." -msgstr[1] "Систему буде автоматично перезавантажено через %d секунди." -msgstr[2] "Систему буде автоматично перезавантажено через %d секунд." - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "Ви зареєстровані у системі як користувач «%s»." - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "Вийти з системи зараз?" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "_Перемикнути користувача" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "Вимкнути систему зараз?" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "П_ризупинити" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "При_спати" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "Пере_завантажити" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "_Вимкнути" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "Перезавантажити систему зараз?" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "Не відповідає" @@ -410,11 +297,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "Запам'ятована програма" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "Ця програма блокує вихід з системи." @@ -429,32 +316,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "Не вдалось створити гніздо прослуховування ICE: %s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "Перевизначити стандартні каталоги автозапуску" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "САМОЗАПУСКНА_ТЕКА" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "Сеанси, які використовуються" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "НАЗВА_СЕАНСУ" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "Не завантажувати вибрані користувачем програми" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "Показувати величезне вікно помилок для випробування " -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " — керування сеансом GNOME" @@ -553,8 +440,97 @@ msgid "Program called with conflicting options" msgstr "Програму запущено з несумісними параметрами" -#~ msgid "GNOME fallback" -#~ msgstr "Запас GNOME" +#~ msgid "Some programs are still running:" +#~ msgstr "Деякі програми досі працюють:" + +#~ msgid "Unknown" +#~ msgstr "Невідомо" + +#~ msgid "A program is still running:" +#~ msgstr "Програма досі працює:" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Очікування завершення роботи програм. Переривання цих програм може " +#~ "привести до втрати вашої напрацювань." + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "" +#~ "Очікування завершення роботи програм. Переривання цих програм може " +#~ "привести до втрати вашої роботи." + +#~ msgid "Switch User Anyway" +#~ msgstr "Однаково перемикнути користувача" + +#~ msgid "Log Out Anyway" +#~ msgstr "Однаково вийти із системи" + +#~ msgid "Suspend Anyway" +#~ msgstr "Однаково призупинити систему" + +#~ msgid "Hibernate Anyway" +#~ msgstr "Однаково приспати систему" + +#~ msgid "Shut Down Anyway" +#~ msgstr "Однаково вимкнути систему" + +#~ msgid "Restart Anyway" +#~ msgstr "Однаково перезавантажити" + +#~ msgid "Lock Screen" +#~ msgstr "Заблокувати екран" + +#~ msgid "Cancel" +#~ msgstr "Скасувати" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "Сеанс буде автоматично завершено через %d секунду." +#~ msgstr[1] "Сеанс буде автоматично завершено через %d секунди." +#~ msgstr[2] "Сеанс буде автоматично завершено через %d секунд." + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "Систему буде вимкнено автоматично через %d секунду." +#~ msgstr[1] "Систему буде вимкнено автоматично через %d секунди." +#~ msgstr[2] "Систему буде вимкнено автоматично через %d секунд." + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "Систему буде автоматично перезавантажено через %d секунду." +#~ msgstr[1] "Систему буде автоматично перезавантажено через %d секунди." +#~ msgstr[2] "Систему буде автоматично перезавантажено через %d секунд." + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "Ви зареєстровані у системі як користувач «%s»." + +#~ msgid "Log out of this system now?" +#~ msgstr "Вийти з системи зараз?" + +#~ msgid "_Switch User" +#~ msgstr "_Перемикнути користувача" + +#~ msgid "Shut down this system now?" +#~ msgstr "Вимкнути систему зараз?" + +#~ msgid "S_uspend" +#~ msgstr "П_ризупинити" + +#~ msgid "_Hibernate" +#~ msgstr "При_спати" + +#~ msgid "_Restart" +#~ msgstr "Пере_завантажити" + +#~ msgid "_Shut Down" +#~ msgstr "_Вимкнути" + +#~ msgid "Restart this system now?" +#~ msgstr "Перезавантажити систему зараз?" #~ msgid "Icon '%s' not found" #~ msgstr "Піктограму «%s» не знайдено" diff -Nru gnome-session-3.9.90/po/zh_CN.po gnome-session-3.14.0/po/zh_CN.po --- gnome-session-3.9.90/po/zh_CN.po 2013-07-30 19:01:01.000000000 +0000 +++ gnome-session-3.14.0/po/zh_CN.po 2014-06-25 18:06:34.000000000 +0000 @@ -19,8 +19,8 @@ "Project-Id-Version: gnome-session master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "session&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-04-01 13:36+0000\n" -"PO-Revision-Date: 2013-04-02 11:41+0800\n" +"POT-Creation-Date: 2013-10-23 19:36+0000\n" +"PO-Revision-Date: 2013-11-01 23:04+0800\n" "Last-Translator: nhm <572348382@qq.com>\n" "Language-Team: Chinese/Simplified \n" "Language: \n" @@ -30,60 +30,13 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.5.5\n" -# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 -#: ../capplet/gsm-app-dialog.c:120 -msgid "Select Command" -msgstr "选择命令" - -#: ../capplet/gsm-app-dialog.c:193 -msgid "Add Startup Program" -msgstr "添加启动程序" - -#: ../capplet/gsm-app-dialog.c:197 -msgid "Edit Startup Program" -msgstr "编辑启动程序" - -#: ../capplet/gsm-app-dialog.c:484 -msgid "The startup command cannot be empty" -msgstr "启动命令不能为空" - -#: ../capplet/gsm-app-dialog.c:490 -msgid "The startup command is not valid" -msgstr "启动命令无效" - -#: ../capplet/gsm-properties-dialog.c:517 -msgid "Enabled" -msgstr "启用" - -# gsm/logout.c:240 -#: ../capplet/gsm-properties-dialog.c:529 -msgid "Icon" -msgstr "图标" - -# applets/gkb/gkb.c:262 -#: ../capplet/gsm-properties-dialog.c:541 -msgid "Program" -msgstr "程序" - -#: ../capplet/gsm-properties-dialog.c:745 -msgid "Startup Applications Preferences" -msgstr "启动应用程序首选项" - -#: ../capplet/gsp-app.c:274 -msgid "No name" -msgstr "无名称" - -#: ../capplet/gsp-app.c:280 -msgid "No description" -msgstr "无描述" - -#: ../capplet/main.c:35 ../gnome-session/main.c:284 -msgid "Version of this application" -msgstr "此应用程序的版本" +#: ../data/gnome-custom-session.desktop.in.h:1 +msgid "Custom" +msgstr "自定义" -#: ../capplet/main.c:61 -msgid "Could not display help document" -msgstr "不能显示帮助文档" +#: ../data/gnome-custom-session.desktop.in.h:2 +msgid "This entry lets you select a saved session" +msgstr "此项允许您选择一个已保存的会话" #: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 msgid "GNOME" @@ -93,17 +46,20 @@ msgid "This session logs you into GNOME" msgstr "此会话将您登录到 GNOME" -#: ../data/gnome-custom-session.desktop.in.h:1 -msgid "Custom" -msgstr "自定义" - -#: ../data/gnome-custom-session.desktop.in.h:2 -msgid "This entry lets you select a saved session" -msgstr "此项允许您选择一个已保存的会话" - #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" -msgstr "" +msgstr "GNOME dummy" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +#| msgid "GNOME fallback" +msgid "GNOME on Wayland" +msgstr "基于 Wayland 的 GNOME" + +#: ../data/gnome-wayland.desktop.in.h:2 +#| msgid "This session logs you into GNOME" +msgid "This session logs you into GNOME, using Wayland" +msgstr "此会话将您登录到使用 Wayland 的 GNOME" #: ../data/session-selector.ui.h:1 msgid "Custom Session" @@ -129,18 +85,6 @@ msgid "_Continue" msgstr "继续(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "有些程序仍在运行中：" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "启动应用程序" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "选择登录时要启动的应用程序" - # applets/gkb/gkb.c:262 #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" @@ -182,229 +126,46 @@ msgid "_Name:" msgstr "名称(_N)：" -#: ../egg/eggdesktopfile.c:165 -#, c-format -msgid "File is not a valid .desktop file" -msgstr "文件不是有效的 .desktop 文件" - -#. translators: 'Version' is from a desktop file, and -#. * should not be translated. '%s' would probably be a -#. * version number. -#: ../egg/eggdesktopfile.c:191 -#, c-format -msgid "Unrecognized desktop file Version '%s'" -msgstr "不识别的桌面文件版本“%s”" - -# gnome-terminal/gnome-terminal.c:1590 -#: ../egg/eggdesktopfile.c:974 -#, c-format -msgid "Starting %s" -msgstr "正在启动 %s" - -#: ../egg/eggdesktopfile.c:1116 -#, c-format -msgid "Application does not accept documents on command line" -msgstr "应用程序在命令行上不接受文档" - -#: ../egg/eggdesktopfile.c:1184 -#, c-format -msgid "Unrecognized launch option: %d" -msgstr "无法识别的调用选项：%d" - -#. translators: The 'Type=Link' string is found in a -#. * desktop file, and should not be translated. -#: ../egg/eggdesktopfile.c:1391 -#, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "无法将文档 URI 传送给“Type=Link”桌面项" - -#: ../egg/eggdesktopfile.c:1412 -#, c-format -msgid "Not a launchable item" -msgstr "不是可调用项" - -# gsm/save-session.c:86 -#: ../egg/eggsmclient.c:226 -msgid "Disable connection to session manager" -msgstr "禁止连接到会话管理器" - -#: ../egg/eggsmclient.c:229 -msgid "Specify file containing saved configuration" -msgstr "指定包含已保存配置的文件" - -#: ../egg/eggsmclient.c:229 -msgid "FILE" -msgstr "文件" - -#: ../egg/eggsmclient.c:232 -msgid "Specify session management ID" -msgstr "指定会话管理 ID" - -#: ../egg/eggsmclient.c:232 -msgid "ID" -msgstr "ID" - -# panel/menu.c:3509 -#: ../egg/eggsmclient.c:253 -msgid "Session management options:" -msgstr "会话管理选项：" - -# panel/menu.c:3509 -#: ../egg/eggsmclient.c:254 -msgid "Show session management options" -msgstr "显示会话管理选项" - -#: ../gnome-session/gsm-fail-whale-dialog.c:286 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "糟糕！出错啦！" -#: ../gnome-session/gsm-fail-whale-dialog.c:293 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "系统出错且无法恢复。请联系系统管理员。" -#: ../gnome-session/gsm-fail-whale-dialog.c:295 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "系统出错且无法恢复。为预防起见，已禁用了所有扩展。" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." msgstr "系统出错并无法恢复，请尝试注销并重新登录。" # gsm/logout.c:248 -#: ../gnome-session/gsm-fail-whale-dialog.c:312 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "注销(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:334 ../gnome-session/main.c:282 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "启用调试代码" -#: ../gnome-session/gsm-fail-whale-dialog.c:335 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "允许注销" -#: ../gnome-session/gsm-fail-whale-dialog.c:336 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "显示扩展警告" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "未知" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "有程序仍在运行中：" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "正在等候程序结束。中断程序可能导致您的工作成果丢失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "正在等候程序结束。中断程序可能导致您的工作成果丢失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "强制切换用户" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "强制注销" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "强制挂起" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "强制休眠" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "强制关机" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "强制重新启动" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "锁定屏幕" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "取消" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "您即将在 %d 秒后自动注销。" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "系统即将在 %d 秒后自动关闭。" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "系统将在 %d 秒后自动重启。" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "您目前以“%s”身份登录。" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "现在注销系统吗？" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "切换用户(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "现在关闭此系统吗？" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "挂起(_U)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "休眠(_H)" - -# gmenu/edit.c:336 gsm/session-properties.c:167 -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "重启(_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "关机(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "现在重启该系统吗？" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1272 ../gnome-session/gsm-manager.c:2044 msgid "Not responding" msgstr "无响应" @@ -417,11 +178,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "记住的应用程序" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "此程序正在阻止注销。" @@ -436,32 +197,36 @@ msgid "Could not create ICE listening socket: %s" msgstr "无法创建 ICE 监听套接字：%s" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "取代默认的自动启动目录" -#: ../gnome-session/main.c:280 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "自动启动目录" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "要使用的会话" -#: ../gnome-session/main.c:281 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "会话名称" -#: ../gnome-session/main.c:283 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "不装入用户指定的应用程序" +#: ../gnome-session/main.c:309 +msgid "Version of this application" +msgstr "此应用程序的版本" + #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "显示用于测试的鲸鱼失败对话框" -#: ../gnome-session/main.c:320 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr "- GNOME 会话管理器" @@ -561,8 +326,179 @@ msgid "Program called with conflicting options" msgstr "调用程序的选项互相冲突" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME 后备模式" +# help-browser/toc-man.c:19 help-browser/toc2-man.c:21 +#~ msgid "Select Command" +#~ msgstr "选择命令" + +#~ msgid "Add Startup Program" +#~ msgstr "添加启动程序" + +#~ msgid "Edit Startup Program" +#~ msgstr "编辑启动程序" + +#~ msgid "The startup command cannot be empty" +#~ msgstr "启动命令不能为空" + +#~ msgid "The startup command is not valid" +#~ msgstr "启动命令无效" + +#~ msgid "Enabled" +#~ msgstr "启用" + +# gsm/logout.c:240 +#~ msgid "Icon" +#~ msgstr "图标" + +# applets/gkb/gkb.c:262 +#~ msgid "Program" +#~ msgstr "程序" + +#~ msgid "Startup Applications Preferences" +#~ msgstr "启动应用程序首选项" + +#~ msgid "No name" +#~ msgstr "无名称" + +#~ msgid "No description" +#~ msgstr "无描述" + +#~ msgid "Could not display help document" +#~ msgstr "不能显示帮助文档" + +#~ msgid "Some programs are still running:" +#~ msgstr "有些程序仍在运行中：" + +#~ msgid "Startup Applications" +#~ msgstr "启动应用程序" + +#~ msgid "Choose what applications to start when you log in" +#~ msgstr "选择登录时要启动的应用程序" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "文件不是有效的 .desktop 文件" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "不识别的桌面文件版本“%s”" + +# gnome-terminal/gnome-terminal.c:1590 +#~ msgid "Starting %s" +#~ msgstr "正在启动 %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "应用程序在命令行上不接受文档" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "无法识别的调用选项：%d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "无法将文档 URI 传送给“Type=Link”桌面项" + +#~ msgid "Not a launchable item" +#~ msgstr "不是可调用项" + +# gsm/save-session.c:86 +#~ msgid "Disable connection to session manager" +#~ msgstr "禁止连接到会话管理器" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "指定包含已保存配置的文件" + +#~ msgid "FILE" +#~ msgstr "文件" + +#~ msgid "Specify session management ID" +#~ msgstr "指定会话管理 ID" + +#~ msgid "ID" +#~ msgstr "ID" + +# panel/menu.c:3509 +#~ msgid "Session management options:" +#~ msgstr "会话管理选项：" + +# panel/menu.c:3509 +#~ msgid "Show session management options" +#~ msgstr "显示会话管理选项" + +#~ msgid "Unknown" +#~ msgstr "未知" + +#~ msgid "A program is still running:" +#~ msgstr "有程序仍在运行中：" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "正在等候程序结束。中断程序可能导致您的工作成果丢失。" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "正在等候程序结束。中断程序可能导致您的工作成果丢失。" + +#~ msgid "Switch User Anyway" +#~ msgstr "强制切换用户" + +#~ msgid "Log Out Anyway" +#~ msgstr "强制注销" + +#~ msgid "Suspend Anyway" +#~ msgstr "强制挂起" + +#~ msgid "Hibernate Anyway" +#~ msgstr "强制休眠" + +#~ msgid "Shut Down Anyway" +#~ msgstr "强制关机" + +#~ msgid "Restart Anyway" +#~ msgstr "强制重新启动" + +#~ msgid "Lock Screen" +#~ msgstr "锁定屏幕" + +#~ msgid "Cancel" +#~ msgstr "取消" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "您即将在 %d 秒后自动注销。" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "系统即将在 %d 秒后自动关闭。" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "系统将在 %d 秒后自动重启。" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "您目前以“%s”身份登录。" + +#~ msgid "Log out of this system now?" +#~ msgstr "现在注销系统吗？" + +#~ msgid "_Switch User" +#~ msgstr "切换用户(_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "现在关闭此系统吗？" + +#~ msgid "S_uspend" +#~ msgstr "挂起(_U)" + +#~ msgid "_Hibernate" +#~ msgstr "休眠(_H)" + +# gmenu/edit.c:336 gsm/session-properties.c:167 +#~ msgid "_Restart" +#~ msgstr "重启(_R)" + +#~ msgid "_Shut Down" +#~ msgstr "关机(_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "现在重启该系统吗？" #~ msgid "Icon '%s' not found" #~ msgstr "图标“%s”未找到" diff -Nru gnome-session-3.9.90/po/zh_HK.po gnome-session-3.14.0/po/zh_HK.po --- gnome-session-3.9.90/po/zh_HK.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/zh_HK.po 2014-06-25 18:06:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: gnome-session 3.1.92\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 22:55+0800\n" -"PO-Revision-Date: 2013-02-27 22:55+0800\n" +"POT-Creation-Date: 2013-09-17 19:40+0800\n" +"PO-Revision-Date: 2013-09-17 19:40+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" "Language: \n" @@ -46,31 +46,31 @@ msgid "The startup command is not valid" msgstr "初始啟動指令無效" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "已啟用" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "圖示" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "程式" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "初始啟動程式偏好設定" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "沒有名稱" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "沒有描述" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "這個程式的版本" @@ -78,14 +78,6 @@ msgid "Could not display help document" msgstr "無法顯示求助文件" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "這個作業階段讓你登入 GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "自選" @@ -94,10 +86,35 @@ msgid "This entry lets you select a saved session" msgstr "這個項目讓你選擇儲存的作業階段" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "這個作業階段讓你登入 GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "初始啟動程式" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "選擇在你登入時要啟動哪些應用程式" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME 於 Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "這個作業階段讓你登入 GNOME，使用 Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "自選作業階段" @@ -122,18 +139,6 @@ msgid "_Continue" msgstr "繼續(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "有些程式仍在執行中：" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "初始啟動程式" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "選擇在你登入時要啟動哪些應用程式" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "初始啟動時額外執行以下的程式(_P):" @@ -238,23 +243,23 @@ msgid "Show session management options" msgstr "顯示作業階段管理選項" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "糟糕！有些地方出問題了。" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "有問題產生且系統不能恢復。請聯絡系統管理者" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "有問題產生且系統不能恢復。為了預防已先停用所有的擴充功能。" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -262,133 +267,23 @@ "有問題產生且系統不能恢復。\n" "請登出後再試一次。" -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "登出(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "啟用除錯碼" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "允許登出" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "顯示擴充功能警告" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "不明" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "一個程式仍在執行中：" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "正在等待程式結束。中斷這個程式可能造成你的工作遺失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "正在等待程式結束。中斷這些程式可能造成你進行中的工作遺失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "強制切換使用者" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "強制登出" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "強制暫停" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "強制休眠" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "強制關閉電腦" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "強制重新啟動" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "鎖定螢幕" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "取消" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "你會在 %d 秒後自動登出。" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "本系統會在 %d 秒後自動關閉。" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "本系統會在 %d 秒後自動重新啟動。" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "你目前以「%s」的身分登入。" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "是否立刻登出系統？" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "切換使用者(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "是否立刻關閉這個系統？" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "暫停(_U)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "休眠(_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "重新啟動(_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "關閉電腦(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "是否立刻重新啟動系統？" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "沒有回應" @@ -400,11 +295,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "記住的應用程式" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "這個程式正在阻擋登出。" @@ -419,32 +314,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "無法建立 ICE 監聽插槽：%s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "覆蓋標準的自動啟動目錄" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "要使用的作業階段" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "不要載入使用者指定的應用程式" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "顯示嚴重錯誤對話盒以供測試" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - GNOME 作業階段管理員" @@ -543,8 +438,87 @@ msgid "Program called with conflicting options" msgstr "以相衝突的選項呼叫程式" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME 後備" +#~ msgid "Some programs are still running:" +#~ msgstr "有些程式仍在執行中：" + +#~ msgid "Unknown" +#~ msgstr "不明" + +#~ msgid "A program is still running:" +#~ msgstr "一個程式仍在執行中：" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "正在等待程式結束。中斷這個程式可能造成您的工作遺失。" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "正在等待程式結束。中斷這些程式可能造成您進行中的工作遺失。" + +#~ msgid "Switch User Anyway" +#~ msgstr "強制切換使用者" + +#~ msgid "Log Out Anyway" +#~ msgstr "強制登出" + +#~ msgid "Suspend Anyway" +#~ msgstr "強制暫停" + +#~ msgid "Hibernate Anyway" +#~ msgstr "強制休眠" + +#~ msgid "Shut Down Anyway" +#~ msgstr "強制關閉電腦" + +#~ msgid "Restart Anyway" +#~ msgstr "強制重新啟動" + +#~ msgid "Lock Screen" +#~ msgstr "鎖定螢幕" + +#~ msgid "Cancel" +#~ msgstr "取消" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "您會在 %d 秒後自動登出。" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "本系統會在 %d 秒後自動關閉。" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "本系統會在 %d 秒後自動重新啟動。" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "您目前以「%s」的身分登入。" + +#~ msgid "Log out of this system now?" +#~ msgstr "是否立刻登出系統？" + +#~ msgid "_Switch User" +#~ msgstr "切換使用者(_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "是否立刻關閉這個系統？" + +#~ msgid "S_uspend" +#~ msgstr "暫停(_U)" + +#~ msgid "_Hibernate" +#~ msgstr "休眠(_H)" + +#~ msgid "_Restart" +#~ msgstr "重新啟動(_R)" + +#~ msgid "_Shut Down" +#~ msgstr "關閉電腦(_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "是否立刻重新啟動系統？" #~ msgid "Icon '%s' not found" #~ msgstr "找不到圖示「%s」" diff -Nru gnome-session-3.9.90/po/zh_TW.po gnome-session-3.14.0/po/zh_TW.po --- gnome-session-3.9.90/po/zh_TW.po 2013-03-06 04:47:33.000000000 +0000 +++ gnome-session-3.14.0/po/zh_TW.po 2014-06-25 18:06:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: gnome-session 3.1.92\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 22:55+0800\n" -"PO-Revision-Date: 2013-02-27 21:23+0800\n" +"POT-Creation-Date: 2013-09-17 19:40+0800\n" +"PO-Revision-Date: 2013-09-13 09:22+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: \n" @@ -46,31 +46,31 @@ msgid "The startup command is not valid" msgstr "初始啟動指令無效" -#: ../capplet/gsm-properties-dialog.c:517 +#: ../capplet/gsm-properties-dialog.c:519 msgid "Enabled" msgstr "已啟用" -#: ../capplet/gsm-properties-dialog.c:529 +#: ../capplet/gsm-properties-dialog.c:531 msgid "Icon" msgstr "圖示" -#: ../capplet/gsm-properties-dialog.c:541 +#: ../capplet/gsm-properties-dialog.c:543 msgid "Program" msgstr "程式" -#: ../capplet/gsm-properties-dialog.c:745 +#: ../capplet/gsm-properties-dialog.c:747 msgid "Startup Applications Preferences" msgstr "初始啟動程式偏好設定" -#: ../capplet/gsp-app.c:274 +#: ../capplet/gsp-app.c:276 msgid "No name" msgstr "沒有名稱" -#: ../capplet/gsp-app.c:280 +#: ../capplet/gsp-app.c:282 msgid "No description" msgstr "沒有描述" -#: ../capplet/main.c:35 ../gnome-session/main.c:269 +#: ../capplet/main.c:35 ../gnome-session/main.c:309 msgid "Version of this application" msgstr "這個程式的版本" @@ -78,14 +78,6 @@ msgid "Could not display help document" msgstr "無法顯示求助文件" -#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 -msgid "GNOME" -msgstr "GNOME" - -#: ../data/gnome.desktop.in.h:2 -msgid "This session logs you into GNOME" -msgstr "這個作業階段讓您登入 GNOME" - #: ../data/gnome-custom-session.desktop.in.h:1 msgid "Custom" msgstr "自訂" @@ -94,10 +86,35 @@ msgid "This entry lets you select a saved session" msgstr "這個項目讓您選擇儲存的作業階段" +#: ../data/gnome.desktop.in.h:1 ../data/gnome.session.desktop.in.in.h:1 +msgid "GNOME" +msgstr "GNOME" + +#: ../data/gnome.desktop.in.h:2 +msgid "This session logs you into GNOME" +msgstr "這個作業階段讓您登入 GNOME" + #: ../data/gnome-dummy.session.desktop.in.in.h:1 msgid "GNOME dummy" msgstr "GNOME dummy" +#: ../data/gnome-session-properties.desktop.in.in.h:1 +msgid "Startup Applications" +msgstr "初始啟動程式" + +#: ../data/gnome-session-properties.desktop.in.in.h:2 +msgid "Choose what applications to start when you log in" +msgstr "選擇在您登入時要啟動哪些應用程式" + +#: ../data/gnome-wayland.desktop.in.h:1 +#: ../data/gnome-wayland.session.desktop.in.in.h:1 +msgid "GNOME on Wayland" +msgstr "GNOME 於 Wayland" + +#: ../data/gnome-wayland.desktop.in.h:2 +msgid "This session logs you into GNOME, using Wayland" +msgstr "這個作業階段讓您登入 GNOME，使用 Wayland" + #: ../data/session-selector.ui.h:1 msgid "Custom Session" msgstr "自訂作業階段" @@ -122,18 +139,6 @@ msgid "_Continue" msgstr "繼續(_C)" -#: ../data/gsm-inhibit-dialog.ui.h:1 ../gnome-session/gsm-inhibit-dialog.c:514 -msgid "Some programs are still running:" -msgstr "有些程式仍在執行中：" - -#: ../data/session-properties.desktop.in.in.h:1 -msgid "Startup Applications" -msgstr "初始啟動程式" - -#: ../data/session-properties.desktop.in.in.h:2 -msgid "Choose what applications to start when you log in" -msgstr "選擇在您登入時要啟動哪些應用程式" - #: ../data/session-properties.ui.h:1 msgid "Additional startup _programs:" msgstr "初始啟動時額外執行以下的程式(_P):" @@ -238,23 +243,23 @@ msgid "Show session management options" msgstr "顯示作業階段管理選項" -#: ../gnome-session/gsm-fail-whale-dialog.c:297 +#: ../gnome-session/gsm-fail-whale-dialog.c:295 msgid "Oh no! Something has gone wrong." msgstr "糟糕！有些地方出問題了。" -#: ../gnome-session/gsm-fail-whale-dialog.c:304 +#: ../gnome-session/gsm-fail-whale-dialog.c:302 msgid "" "A problem has occurred and the system can't recover. Please contact a system " "administrator" msgstr "有問題產生且系統不能恢復。請連絡系統管理者" -#: ../gnome-session/gsm-fail-whale-dialog.c:306 +#: ../gnome-session/gsm-fail-whale-dialog.c:304 msgid "" "A problem has occurred and the system can't recover. All extensions have " "been disabled as a precaution." msgstr "有問題產生且系統不能恢復。為了預防已先停用所有的擴充功能。" -#: ../gnome-session/gsm-fail-whale-dialog.c:308 +#: ../gnome-session/gsm-fail-whale-dialog.c:306 msgid "" "A problem has occurred and the system can't recover.\n" "Please log out and try again." @@ -262,133 +267,23 @@ "有問題產生且系統不能恢復。\n" "請登出後再試一次。" -#: ../gnome-session/gsm-fail-whale-dialog.c:323 -#: ../gnome-session/gsm-logout-dialog.c:384 +#: ../gnome-session/gsm-fail-whale-dialog.c:321 msgid "_Log Out" msgstr "登出(_L)" -#: ../gnome-session/gsm-fail-whale-dialog.c:345 ../gnome-session/main.c:267 +#: ../gnome-session/gsm-fail-whale-dialog.c:343 ../gnome-session/main.c:307 msgid "Enable debugging code" msgstr "啟用除錯碼" -#: ../gnome-session/gsm-fail-whale-dialog.c:346 +#: ../gnome-session/gsm-fail-whale-dialog.c:344 msgid "Allow logout" msgstr "允許登出" -#: ../gnome-session/gsm-fail-whale-dialog.c:347 +#: ../gnome-session/gsm-fail-whale-dialog.c:345 msgid "Show extension warning" msgstr "顯示擴充功能警告" -#: ../gnome-session/gsm-inhibit-dialog.c:462 -msgid "Unknown" -msgstr "不明" - -#: ../gnome-session/gsm-inhibit-dialog.c:510 -msgid "A program is still running:" -msgstr "一個程式仍在執行中：" - -#: ../gnome-session/gsm-inhibit-dialog.c:511 -msgid "" -"Waiting for the program to finish. Interrupting the program may cause you to " -"lose work." -msgstr "正在等待程式結束。中斷這個程式可能造成您的工作遺失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:515 -msgid "" -"Waiting for programs to finish. Interrupting these programs may cause you to " -"lose work." -msgstr "正在等待程式結束。中斷這些程式可能造成您進行中的工作遺失。" - -#: ../gnome-session/gsm-inhibit-dialog.c:745 -msgid "Switch User Anyway" -msgstr "強制切換使用者" - -#: ../gnome-session/gsm-inhibit-dialog.c:748 -msgid "Log Out Anyway" -msgstr "強制登出" - -#: ../gnome-session/gsm-inhibit-dialog.c:751 -msgid "Suspend Anyway" -msgstr "強制暫停" - -#: ../gnome-session/gsm-inhibit-dialog.c:754 -msgid "Hibernate Anyway" -msgstr "強制休眠" - -#: ../gnome-session/gsm-inhibit-dialog.c:757 -msgid "Shut Down Anyway" -msgstr "強制關閉電腦" - -#: ../gnome-session/gsm-inhibit-dialog.c:760 -msgid "Restart Anyway" -msgstr "強制重新啟動" - -#: ../gnome-session/gsm-inhibit-dialog.c:768 -msgid "Lock Screen" -msgstr "鎖定螢幕" - -#: ../gnome-session/gsm-inhibit-dialog.c:771 -msgid "Cancel" -msgstr "取消" - -#. This string is shared with gsm-fail-whale-dialog.c -#: ../gnome-session/gsm-logout-dialog.c:263 -#, c-format -msgid "You will be automatically logged out in %d second." -msgid_plural "You will be automatically logged out in %d seconds." -msgstr[0] "您會在 %d 秒後自動登出。" - -#: ../gnome-session/gsm-logout-dialog.c:271 -#, c-format -msgid "This system will be automatically shut down in %d second." -msgid_plural "This system will be automatically shut down in %d seconds." -msgstr[0] "本系統會在 %d 秒後自動關閉。" - -#: ../gnome-session/gsm-logout-dialog.c:279 -#, c-format -msgid "This system will be automatically restarted in %d second." -msgid_plural "This system will be automatically restarted in %d seconds." -msgstr[0] "本系統會在 %d 秒後自動重新啟動。" - -#: ../gnome-session/gsm-logout-dialog.c:303 -#, c-format -msgid "You are currently logged in as \"%s\"." -msgstr "您目前以「%s」的身分登入。" - -#: ../gnome-session/gsm-logout-dialog.c:369 -msgid "Log out of this system now?" -msgstr "是否立刻登出系統？" - -#: ../gnome-session/gsm-logout-dialog.c:375 -msgid "_Switch User" -msgstr "切換使用者(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:390 -msgid "Shut down this system now?" -msgstr "是否立刻關閉這個系統？" - -#: ../gnome-session/gsm-logout-dialog.c:396 -msgid "S_uspend" -msgstr "暫停(_U)" - -#: ../gnome-session/gsm-logout-dialog.c:402 -msgid "_Hibernate" -msgstr "休眠(_H)" - -#: ../gnome-session/gsm-logout-dialog.c:408 -#: ../gnome-session/gsm-logout-dialog.c:434 -msgid "_Restart" -msgstr "重新啟動(_R)" - -#: ../gnome-session/gsm-logout-dialog.c:418 -msgid "_Shut Down" -msgstr "關閉電腦(_S)" - -#: ../gnome-session/gsm-logout-dialog.c:424 -msgid "Restart this system now?" -msgstr "是否立刻重新啟動系統？" - -#: ../gnome-session/gsm-manager.c:1429 ../gnome-session/gsm-manager.c:2178 +#: ../gnome-session/gsm-manager.c:1271 ../gnome-session/gsm-manager.c:2043 msgid "Not responding" msgstr "沒有回應" @@ -400,11 +295,11 @@ #. * then the XSMP client already has set several XSMP #. * properties. But it could still be that SmProgram is not set. #. -#: ../gnome-session/gsm-xsmp-client.c:558 +#: ../gnome-session/gsm-xsmp-client.c:559 msgid "Remembered Application" msgstr "記住的應用程式" -#: ../gnome-session/gsm-xsmp-client.c:1196 +#: ../gnome-session/gsm-xsmp-client.c:1209 msgid "This program is blocking logout." msgstr "這個程式正在阻擋登出。" @@ -419,32 +314,32 @@ msgid "Could not create ICE listening socket: %s" msgstr "無法建立 ICE 監聽插槽：%s" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "Override standard autostart directories" msgstr "覆蓋標準的自動啟動目錄" -#: ../gnome-session/main.c:265 +#: ../gnome-session/main.c:305 msgid "AUTOSTART_DIR" msgstr "AUTOSTART_DIR" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "Session to use" msgstr "要使用的作業階段" -#: ../gnome-session/main.c:266 +#: ../gnome-session/main.c:306 msgid "SESSION_NAME" msgstr "SESSION_NAME" -#: ../gnome-session/main.c:268 +#: ../gnome-session/main.c:308 msgid "Do not load user-specified applications" msgstr "不要載入使用者指定的應用程式" #. Translators: the 'fail whale' is the black dialog we show when something goes seriously wrong -#: ../gnome-session/main.c:271 +#: ../gnome-session/main.c:311 msgid "Show the fail whale dialog for testing" msgstr "顯示嚴重錯誤對話盒以供測試" -#: ../gnome-session/main.c:286 +#: ../gnome-session/main.c:344 msgid " - the GNOME session manager" msgstr " - GNOME 作業階段管理員" @@ -543,8 +438,87 @@ msgid "Program called with conflicting options" msgstr "以相衝突的選項呼叫程式" -#~ msgid "GNOME fallback" -#~ msgstr "GNOME 後備" +#~ msgid "Some programs are still running:" +#~ msgstr "有些程式仍在執行中：" + +#~ msgid "Unknown" +#~ msgstr "不明" + +#~ msgid "A program is still running:" +#~ msgstr "一個程式仍在執行中：" + +#~ msgid "" +#~ "Waiting for the program to finish. Interrupting the program may cause you " +#~ "to lose work." +#~ msgstr "正在等待程式結束。中斷這個程式可能造成您的工作遺失。" + +#~ msgid "" +#~ "Waiting for programs to finish. Interrupting these programs may cause you " +#~ "to lose work." +#~ msgstr "正在等待程式結束。中斷這些程式可能造成您進行中的工作遺失。" + +#~ msgid "Switch User Anyway" +#~ msgstr "強制切換使用者" + +#~ msgid "Log Out Anyway" +#~ msgstr "強制登出" + +#~ msgid "Suspend Anyway" +#~ msgstr "強制暫停" + +#~ msgid "Hibernate Anyway" +#~ msgstr "強制休眠" + +#~ msgid "Shut Down Anyway" +#~ msgstr "強制關閉電腦" + +#~ msgid "Restart Anyway" +#~ msgstr "強制重新啟動" + +#~ msgid "Lock Screen" +#~ msgstr "鎖定螢幕" + +#~ msgid "Cancel" +#~ msgstr "取消" + +#~ msgid "You will be automatically logged out in %d second." +#~ msgid_plural "You will be automatically logged out in %d seconds." +#~ msgstr[0] "您會在 %d 秒後自動登出。" + +#~ msgid "This system will be automatically shut down in %d second." +#~ msgid_plural "This system will be automatically shut down in %d seconds." +#~ msgstr[0] "本系統會在 %d 秒後自動關閉。" + +#~ msgid "This system will be automatically restarted in %d second." +#~ msgid_plural "This system will be automatically restarted in %d seconds." +#~ msgstr[0] "本系統會在 %d 秒後自動重新啟動。" + +#~ msgid "You are currently logged in as \"%s\"." +#~ msgstr "您目前以「%s」的身分登入。" + +#~ msgid "Log out of this system now?" +#~ msgstr "是否立刻登出系統？" + +#~ msgid "_Switch User" +#~ msgstr "切換使用者(_S)" + +#~ msgid "Shut down this system now?" +#~ msgstr "是否立刻關閉這個系統？" + +#~ msgid "S_uspend" +#~ msgstr "暫停(_U)" + +#~ msgid "_Hibernate" +#~ msgstr "休眠(_H)" + +#~ msgid "_Restart" +#~ msgstr "重新啟動(_R)" + +#~ msgid "_Shut Down" +#~ msgstr "關閉電腦(_S)" + +#~ msgid "Restart this system now?" +#~ msgstr "是否立刻重新啟動系統？" #~ msgid "Icon '%s' not found" #~ msgstr "找不到圖示「%s」" diff -Nru gnome-session-3.9.90/README gnome-session-3.14.0/README --- gnome-session-3.9.90/README 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/README 2014-07-18 20:50:42.000000000 +0000 @@ -17,7 +17,7 @@ Design notes ============ -See http://live.gnome.org/SessionManagement +See https://wiki.gnome.org/Projects/SessionManagement Installation diff -Nru gnome-session-3.9.90/tools/gnome-session-check-accelerated.c gnome-session-3.14.0/tools/gnome-session-check-accelerated.c --- gnome-session-3.9.90/tools/gnome-session-check-accelerated.c 2013-08-20 14:37:17.000000000 +0000 +++ gnome-session-3.14.0/tools/gnome-session-check-accelerated.c 2014-06-25 18:06:34.000000000 +0000 @@ -79,7 +79,7 @@ static gboolean wait_for_property_notify (void) { - GdkDisplay *display = NULL; + GdkDisplay *display; GdkScreen *screen; GdkWindow *root; Window rootwin; @@ -110,6 +110,14 @@ glong is_accelerated, is_software_rendering; GError *error = NULL; + /* gnome-session-check-accelerated gets run before X is started in the wayland + * case, and it currently requires X. Until we have that working, just always + * assume wayland will work + */ + if (g_strcmp0 (g_getenv ("XDG_SESSION_DESKTOP"), "gnome-wayland") == 0) { + return 0; + } + gtk_init (NULL, NULL); display = gdk_display_get_default (); diff -Nru gnome-session-3.9.90/tools/gnome-session-inhibit.c gnome-session-3.14.0/tools/gnome-session-inhibit.c --- gnome-session-3.9.90/tools/gnome-session-inhibit.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/tools/gnome-session-inhibit.c 2014-06-25 18:06:34.000000000 +0000 @@ -12,9 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - * 02111-1307, USA. + * along with this program; if not, see . */ #include "config.h" diff -Nru gnome-session-3.9.90/tools/gnome-session-quit.c gnome-session-3.14.0/tools/gnome-session-quit.c --- gnome-session-3.9.90/tools/gnome-session-quit.c 2012-12-14 17:14:05.000000000 +0000 +++ gnome-session-3.14.0/tools/gnome-session-quit.c 2014-06-25 18:06:34.000000000 +0000 @@ -15,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + along with this program; if not, see . */ #include diff -Nru gnome-session-3.9.90/tools/gnome-session-selector.c gnome-session-3.14.0/tools/gnome-session-selector.c --- gnome-session-3.9.90/tools/gnome-session-selector.c 2013-02-19 18:33:13.000000000 +0000 +++ gnome-session-3.14.0/tools/gnome-session-selector.c 2014-06-25 18:06:34.000000000 +0000 @@ -13,8 +13,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program; if not, see . * * Written by: Matthias Clasen */ diff -Nru gnome-session-3.9.90/tools/Makefile.in gnome-session-3.14.0/tools/Makefile.in --- gnome-session-3.9.90/tools/Makefile.in 2013-08-20 14:50:06.000000000 +0000 +++ gnome-session-3.14.0/tools/Makefile.in 2014-09-22 14:19:25.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -286,6 +286,7 @@ GTK3_LIBS = @GTK3_LIBS@ HAVE_XRENDER = @HAVE_XRENDER@ HAVE_XTEST = @HAVE_XTEST@ +HAVE_XTRANS = @HAVE_XTRANS@ ICE_CFLAGS = @ICE_CFLAGS@ ICE_LIBS = @ICE_LIBS@ INSTALL = @INSTALL@ @@ -353,6 +354,8 @@ STRIP = @STRIP@ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ SYSTEMD_LIBS = @SYSTEMD_LIBS@ +UPOWER_CFLAGS = @UPOWER_CFLAGS@ +UPOWER_LIBS = @UPOWER_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -367,6 +370,8 @@ XSLTPROC = @XSLTPROC@ XTEST_CFLAGS = @XTEST_CFLAGS@ XTEST_LIBS = @XTEST_LIBS@ +XTRANS_CFLAGS = @XTRANS_CFLAGS@ +XTRANS_LIBS = @XTRANS_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -700,14 +705,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<