diff -Nru gdm-3.6.0/Makefile.in gdm-3.6.1/Makefile.in --- gdm-3.6.0/Makefile.in 2012-09-25 18:04:04.000000000 +0000 +++ gdm-3.6.1/Makefile.in 2012-10-16 02:28:35.000000000 +0000 @@ -194,6 +194,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/NEWS gdm-3.6.1/NEWS --- gdm-3.6.0/NEWS 2012-09-25 18:02:56.000000000 +0000 +++ gdm-3.6.1/NEWS 2012-10-16 02:27:52.000000000 +0000 @@ -1,4 +1,18 @@ ============= +Version 3.6.1 +============= + +- Various InitialSetup fixes +- ignore pam info messages for automatic logins +- unlock fixes +- user switching fix on consolekit systems +- be more robust against empty user shells/home dirs +- create program session log file as root instead of after setuid +- properly reload gdm.schemas on SIGHUP +- bring back gdmflexiserver +- Translation updates + +============= Version 3.6.0 ============= diff -Nru gdm-3.6.0/common/Makefile.in gdm-3.6.1/common/Makefile.in --- gdm-3.6.0/common/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/common/Makefile.in 2012-10-16 02:28:35.000000000 +0000 @@ -257,6 +257,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/configure gdm-3.6.1/configure --- gdm-3.6.0/configure 2012-09-25 18:04:03.000000000 +0000 +++ gdm-3.6.1/configure 2012-10-16 02:28:32.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gdm 3.6.0. +# Generated by GNU Autoconf 2.69 for gdm 3.6.1. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gdm' PACKAGE_TARNAME='gdm' -PACKAGE_VERSION='3.6.0' -PACKAGE_STRING='gdm 3.6.0' +PACKAGE_VERSION='3.6.1' +PACKAGE_STRING='gdm 3.6.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gdm' PACKAGE_URL='' @@ -665,6 +665,7 @@ EXTRA_TEST_LIBS EXTRA_SETUP_LIBS EXTRA_DYNAMIC_LIBS +EXTRA_FLEXI_LIBS EXTRA_XNEST_LIBS EXTRA_CHOOSER_LIBS EXTRA_SLAVE_LIBS @@ -1618,7 +1619,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 gdm 3.6.0 to adapt to many kinds of systems. +\`configure' configures gdm 3.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1692,7 +1693,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gdm 3.6.0:";; + short | recursive ) echo "Configuration of gdm 3.6.1:";; esac cat <<\_ACEOF @@ -1948,7 +1949,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gdm configure 3.6.0 +gdm configure 3.6.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2492,7 +2493,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gdm $as_me 3.6.0, which was +It was created by gdm $as_me 3.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3320,7 +3321,7 @@ # Define the identity of the package. PACKAGE='gdm' - VERSION='3.6.0' + VERSION='3.6.1' cat >>confdefs.h <<_ACEOF @@ -22981,6 +22982,7 @@ EXTRA_SLAVE_LIBS="" EXTRA_CHOOSER_LIBS="" EXTRA_XNEST_LIBS="" +EXTRA_FLEXI_LIBS="" EXTRA_DYNAMIC_LIBS="" EXTRA_SETUP_LIBS="" EXTRA_TEST_LIBS="" @@ -23033,6 +23035,7 @@ EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lsocket" EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket" EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket" + EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket" EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket" EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket" EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -lsocket" @@ -25673,6 +25676,7 @@ + # Check for Solaris logindevperm support # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for di_devperm_login in -ldevinfo" >&5 @@ -26872,7 +26876,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gdm $as_me 3.6.0, which was +This file was extended by gdm $as_me 3.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26938,7 +26942,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gdm config.status 3.6.0 +gdm config.status 3.6.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gdm-3.6.0/configure.ac gdm-3.6.1/configure.ac --- gdm-3.6.0/configure.ac 2012-09-25 18:03:55.000000000 +0000 +++ gdm-3.6.1/configure.ac 2012-10-16 02:28:07.000000000 +0000 @@ -1,7 +1,7 @@ AC_PREREQ([2.60]) AC_INIT([gdm], - [3.6.0], + [3.6.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm]) AC_CONFIG_SRCDIR([daemon/gdm-manager.c]) @@ -368,6 +368,7 @@ EXTRA_SLAVE_LIBS="" EXTRA_CHOOSER_LIBS="" EXTRA_XNEST_LIBS="" +EXTRA_FLEXI_LIBS="" EXTRA_DYNAMIC_LIBS="" EXTRA_SETUP_LIBS="" EXTRA_TEST_LIBS="" @@ -379,6 +380,7 @@ EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lsocket" EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket" EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket" + EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket" EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket" EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket" EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -lsocket"])]) @@ -1200,6 +1202,7 @@ AC_SUBST(EXTRA_SLAVE_LIBS) AC_SUBST(EXTRA_CHOOSER_LIBS) AC_SUBST(EXTRA_XNEST_LIBS) +AC_SUBST(EXTRA_FLEXI_LIBS) AC_SUBST(EXTRA_DYNAMIC_LIBS) AC_SUBST(EXTRA_SETUP_LIBS) AC_SUBST(EXTRA_TEST_LIBS) diff -Nru gdm-3.6.0/daemon/Makefile.in gdm-3.6.1/daemon/Makefile.in --- gdm-3.6.0/daemon/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/daemon/Makefile.in 2012-10-16 02:28:35.000000000 +0000 @@ -351,6 +351,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/daemon/gdm-session-worker.c gdm-3.6.1/daemon/gdm-session-worker.c --- gdm-3.6.0/daemon/gdm-session-worker.c 2012-09-17 20:41:25.000000000 +0000 +++ gdm-3.6.1/daemon/gdm-session-worker.c 2012-10-16 02:21:07.000000000 +0000 @@ -1405,10 +1405,18 @@ *gidp = passwd_entry->pw_gid; } if (homep != NULL) { - *homep = g_strdup (passwd_entry->pw_dir); + if (passwd_entry->pw_dir != NULL && passwd_entry->pw_dir[0] != '\0') { + *homep = g_strdup (passwd_entry->pw_dir); + } else { + *homep = g_strdup ("/"); + } } if (shellp != NULL) { - *shellp = g_strdup (passwd_entry->pw_shell); + if (passwd_entry->pw_shell != NULL && passwd_entry->pw_shell[0] != '\0') { + *shellp = g_strdup (passwd_entry->pw_shell); + } else { + *shellp = g_strdup ("/bin/bash"); + } } ret = TRUE; out: @@ -1530,10 +1538,10 @@ return ret; } -static char ** +static const char * const * gdm_session_worker_get_environment (GdmSessionWorker *worker) { - return pam_getenvlist (worker->priv->pam_handle); + return (const char * const *) pam_getenvlist (worker->priv->pam_handle); } static void @@ -1644,8 +1652,6 @@ if (fd < 0) { char *temp_name; - close (fd); - temp_name = g_strdup_printf ("%s.XXXXXXXX", filename); fd = g_mkstemp (temp_name); @@ -1703,8 +1709,6 @@ if (fd < 0) { char *temp_name; - close (fd); - temp_name = g_strdup_printf ("%s.XXXXXXXX", filename); fd = g_mkstemp (temp_name); @@ -1775,11 +1779,19 @@ } if (session_pid == 0) { - char **environment; + const char * const * environment; char *kerberos_cache; char *home_dir; int fd; + fd = open ("/dev/null", O_RDWR); + dup2 (fd, STDIN_FILENO); + close (fd); + + if (worker->priv->is_program_session) { + fd = _open_program_session_log (worker->priv->log_file); + } + if (setuid (worker->priv->uid) < 0) { g_debug ("GdmSessionWorker: could not reset uid: %s", g_strerror (errno)); _exit (1); @@ -1791,7 +1803,6 @@ _exit (2); } - kerberos_cache = gdm_session_worker_get_environment_variable (worker, "KRB5CCNAME"); if (kerberos_cache == NULL) { @@ -1823,13 +1834,7 @@ g_chdir ("/"); } - fd = open ("/dev/null", O_RDWR); - dup2 (fd, STDIN_FILENO); - close (fd); - - if (worker->priv->is_program_session) { - fd = _open_program_session_log (worker->priv->log_file); - } else { + if (!worker->priv->is_program_session) { if (home_dir != NULL && home_dir[0] != '\0') { char *cache_dir; char *log_dir; @@ -1869,6 +1874,7 @@ gdm_session_execute (worker->priv->arguments[0], worker->priv->arguments, + (char **) environment, TRUE); @@ -2693,7 +2699,7 @@ GDBusMethodInvocation *invocation) { ReauthenticationRequest *request; - char **environment; + const char * const * environment; char *address; environment = gdm_session_worker_get_environment (worker); diff -Nru gdm-3.6.0/daemon/gdm-session.c gdm-3.6.1/daemon/gdm-session.c --- gdm-3.6.0/daemon/gdm-session.c 2012-09-18 21:18:51.000000000 +0000 +++ gdm-3.6.1/daemon/gdm-session.c 2012-10-16 02:14:54.000000000 +0000 @@ -713,15 +713,14 @@ const char *info, GdmSession *self) { - - g_return_val_if_fail (self->priv->user_verifier_interface != NULL, FALSE); - gdm_dbus_worker_manager_complete_info (worker_manager_interface, invocation); - gdm_dbus_user_verifier_emit_info (self->priv->user_verifier_interface, - service_name, - info); + if (self->priv->user_verifier_interface != NULL) { + gdm_dbus_user_verifier_emit_info (self->priv->user_verifier_interface, + service_name, + info); + } return TRUE; } @@ -1044,7 +1043,7 @@ NULL, GDM_WORKER_DBUS_PATH, NULL, NULL); - g_dbus_proxy_set_default_timeout (conversation->worker_proxy, G_MAXINT); + g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (conversation->worker_proxy), G_MAXINT); g_signal_connect (conversation->worker_proxy, "username-changed", diff -Nru gdm-3.6.0/daemon/gdm-simple-slave.c gdm-3.6.1/daemon/gdm-simple-slave.c --- gdm-3.6.0/daemon/gdm-simple-slave.c 2012-09-25 17:57:35.000000000 +0000 +++ gdm-3.6.1/daemon/gdm-simple-slave.c 2012-10-16 02:20:04.000000000 +0000 @@ -65,6 +65,7 @@ #define DEFAULT_PING_INTERVAL 15 #define INITIAL_SETUP_USERNAME "gnome-initial-setup" +#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup" struct GdmSimpleSlavePrivate { @@ -115,6 +116,8 @@ gpointer user_data, GCancellable *cancellable); +static gboolean wants_initial_setup (GdmSimpleSlave *slave); +static void destroy_initial_setup_user (GdmSimpleSlave *slave); G_DEFINE_TYPE (GdmSimpleSlave, gdm_simple_slave, GDM_TYPE_SLAVE) static void create_new_session (GdmSimpleSlave *slave); @@ -308,17 +311,18 @@ } static gboolean -try_migrate_session (GdmSimpleSlave *slave) +switch_to_and_unlock_session (GdmSimpleSlave *slave, + gboolean fail_if_already_switched) { char *username; gboolean res; - g_debug ("GdmSimpleSlave: trying to migrate session"); - username = gdm_session_get_username (slave->priv->session); + g_debug ("GdmSimpleSlave: trying to switch to session for user %s", username); + /* try to switch to an existing session */ - res = gdm_slave_switch_to_user_session (GDM_SLAVE (slave), username); + res = gdm_slave_switch_to_user_session (GDM_SLAVE (slave), username, fail_if_already_switched); g_free (username); return res; @@ -389,11 +393,18 @@ start_session_timeout (GdmSimpleSlave *slave) { gboolean migrated; - + gboolean fail_if_already_switched = TRUE; g_debug ("GdmSimpleSlave: accredited"); - migrated = try_migrate_session (slave); + /* If there's already a session running, jump to it. + * If the only session running is the one we just opened, + * start a session on it. + * + * We assume we're in the former case if we need to switch + * VTs, and we assume we're in the latter case if we don't. + */ + migrated = switch_to_and_unlock_session (slave, fail_if_already_switched); g_debug ("GdmSimpleSlave: migrated: %d", migrated); if (migrated) { /* We don't stop the slave here because @@ -435,7 +446,14 @@ const char *service_name, GdmSimpleSlave *slave) { - try_migrate_session (slave); + gboolean fail_if_already_switched = FALSE; + + /* There should already be a session running, so jump to it's + * VT. In the event we're already on the right VT, (i.e. user + * used an unlock screen instead of a user switched login screen), + * then silently succeed and unlock the session. + */ + switch_to_and_unlock_session (slave, fail_if_already_switched); } static void @@ -842,6 +860,9 @@ if (slave->priv->start_session_service_name == NULL) { gdm_slave_stop (GDM_SLAVE (slave)); } else { + if (wants_initial_setup (slave)) { + destroy_initial_setup_user (slave); + } start_session (slave); } @@ -1118,7 +1139,7 @@ start_launch_environment (slave, GDM_USERNAME, NULL); } -#define RULES_DIR LOCALSTATEDIR "/lib/polkit-1/localauthority/10-vendor.d/" +#define RULES_DIR DATADIR "/polkit-1/rules.d/" #define RULES_FILE "20-gnome-initial-setup.rules" static const gboolean @@ -1147,12 +1168,14 @@ ret = FALSE; goto out; } + + g_clear_error (&error); } else { g_object_unref (user); } /* Now, make sure the PolicyKit policy is in place */ - src_file = g_file_new_for_path (DATADIR "/gnome-initial-setup" RULES_FILE); + src_file = g_file_new_for_path (DATADIR "/gnome-initial-setup/" RULES_FILE); dest_file = g_file_new_for_path (RULES_DIR RULES_FILE); if (!g_file_copy (src_file, @@ -1195,12 +1218,17 @@ error = NULL; user = act_user_manager_get_user (act, INITIAL_SETUP_USERNAME); - if (!act_user_manager_delete_user (act, user, TRUE, &error)) { - g_warning ("Failed to delete user '%s': %s", INITIAL_SETUP_USERNAME, error->message); - g_error_free (error); + if (user != NULL) { + if (!act_user_manager_delete_user (act, user, TRUE, &error)) { + g_warning ("Failed to delete user '%s': %s", INITIAL_SETUP_USERNAME, error->message); + g_error_free (error); + } + g_object_unref (user); } - g_object_unref (user); + if (g_remove (INITIAL_SETUP_TRIGGER_FILE) < 0) { + g_warning ("Failed to remove '%s': %s", INITIAL_SETUP_TRIGGER_FILE, g_strerror (errno)); + } } static void @@ -1208,7 +1236,6 @@ { create_initial_setup_user (slave); start_launch_environment (slave, INITIAL_SETUP_USERNAME, "gnome-initial-setup"); - destroy_initial_setup_user (slave); } static gboolean @@ -1222,8 +1249,6 @@ return enabled && delay == 0; } -#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup" - static gboolean wants_initial_setup (GdmSimpleSlave *slave) { diff -Nru gdm-3.6.0/daemon/gdm-slave.c gdm-3.6.1/daemon/gdm-slave.c --- gdm-3.6.0/daemon/gdm-slave.c 2012-09-24 14:08:48.000000000 +0000 +++ gdm-3.6.1/daemon/gdm-slave.c 2012-10-16 02:20:04.000000000 +0000 @@ -545,11 +545,15 @@ si_entries[0].typelength = strlen ("localuser"); si_entries[1].type = "localuser"; si_entries[1].typelength = strlen ("localuser"); + si_entries[2].type = "localuser"; + si_entries[2].typelength = strlen ("localuser"); si_entries[0].value = "root"; si_entries[0].valuelength = strlen ("root"); si_entries[1].value = GDM_USERNAME; si_entries[1].valuelength = strlen (GDM_USERNAME); + si_entries[2].value = "gnome-initial-setup"; + si_entries[2].valuelength = strlen ("gnome-initial-setup"); host_entries[0].family = FamilyServerInterpreted; host_entries[0].address = (char *) &si_entries[0]; @@ -557,6 +561,9 @@ host_entries[1].family = FamilyServerInterpreted; host_entries[1].address = (char *) &si_entries[1]; host_entries[1].length = sizeof (XServerInterpretedAddress); + host_entries[2].family = FamilyServerInterpreted; + host_entries[2].address = (char *) &si_entries[2]; + host_entries[2].length = sizeof (XServerInterpretedAddress); } static void @@ -672,8 +679,8 @@ g_warning ("Unable to connect to display %s", slave->priv->display_name); ret = FALSE; } else if (slave->priv->display_is_local) { - XServerInterpretedAddress si_entries[2]; - XHostAddress host_entries[2]; + XServerInterpretedAddress si_entries[3]; + XHostAddress host_entries[3]; g_debug ("GdmSlave: Connected to display %s", slave->priv->display_name); ret = TRUE; @@ -909,8 +916,8 @@ const char *username, char **filenamep) { - XServerInterpretedAddress si_entries[2]; - XHostAddress host_entries[2]; + XServerInterpretedAddress si_entries[3]; + XHostAddress host_entries[3]; gboolean res; GError *error; char *filename; @@ -1467,15 +1474,6 @@ GError *error = NULL; GVariant *reply; - /* Can't activate what's already active. We want this - * to fail, because we don't want migration to succeed - * if the only active session is the one just created - * at the login screen. - */ - if (sd_session_is_active (session_id) > 0) { - return FALSE; - } - reply = g_dbus_connection_call_sync (slave->priv->connection, "org.freedesktop.login1", "/org/freedesktop/login1", @@ -1552,6 +1550,59 @@ #endif } +#ifdef WITH_CONSOLE_KIT +static gboolean +ck_session_is_active (GdmSlave *slave, + const char *seat_id, + const char *session_id) +{ + GError *error = NULL; + GVariant *reply; + gboolean is_active; + + reply = g_dbus_connection_call_sync (slave->priv->connection, + CK_NAME, + session_id, + "org.freedesktop.ConsoleKit.Session", + "IsActive", + NULL, + G_VARIANT_TYPE ("(b)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + if (reply == NULL) { + g_debug ("GdmSlave: ConsoleKit IsActive %s raised:\n %s\n\n", + g_dbus_error_get_remote_error (error), error->message); + g_error_free (error); + return FALSE; + } + + g_variant_get (reply, "(b)", &is_active); + g_variant_unref (reply); + + return is_active; +} +#endif + +static gboolean +session_is_active (GdmSlave *slave, + const char *seat_id, + const char *session_id) +{ +#ifdef WITH_SYSTEMD + if (sd_booted () > 0) { + return sd_session_is_active (session_id) > 0; + } +#endif + +#ifdef WITH_CONSOLE_KIT + return ck_session_is_active (slave, seat_id, session_id); +#else + return FALSE; +#endif +} + #ifdef WITH_SYSTEMD static gboolean session_unlock_for_systemd (GdmSlave *slave, @@ -1638,10 +1689,12 @@ gboolean gdm_slave_switch_to_user_session (GdmSlave *slave, - const char *username) + const char *username, + gboolean fail_if_already_switched) { gboolean res; gboolean ret; + gboolean session_already_switched; char *ssid_to_activate; ret = FALSE; @@ -1652,14 +1705,23 @@ goto out; } + session_already_switched = session_is_active (slave, slave->priv->display_seat_id, ssid_to_activate); + g_debug ("GdmSlave: Activating session: '%s'", ssid_to_activate); - res = activate_session_id (slave, slave->priv->display_seat_id, ssid_to_activate); - if (! res) { - g_debug ("GdmSlave: unable to activate session: %s", ssid_to_activate); + if (session_already_switched && fail_if_already_switched) { + g_debug ("GdmSlave: unable to activate session since it's already active: %s", ssid_to_activate); goto out; } + if (!session_already_switched) { + res = activate_session_id (slave, slave->priv->display_seat_id, ssid_to_activate); + if (! res) { + g_debug ("GdmSlave: unable to activate session: %s", ssid_to_activate); + goto out; + } + } + res = session_unlock (slave, ssid_to_activate); if (!res) { /* this isn't fatal */ diff -Nru gdm-3.6.0/daemon/gdm-slave.h gdm-3.6.1/daemon/gdm-slave.h --- gdm-3.6.0/daemon/gdm-slave.h 2012-09-06 18:33:20.000000000 +0000 +++ gdm-3.6.1/daemon/gdm-slave.h 2012-10-16 02:20:04.000000000 +0000 @@ -99,7 +99,8 @@ char **filename); gboolean gdm_slave_switch_to_user_session (GdmSlave *slave, - const char *username); + const char *username, + gboolean fail_if_already_switched); gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave); diff -Nru gdm-3.6.0/daemon/main.c gdm-3.6.1/daemon/main.c --- gdm-3.6.0/daemon/main.c 2012-09-06 18:33:20.000000000 +0000 +++ gdm-3.6.1/daemon/main.c 2012-10-16 02:21:45.000000000 +0000 @@ -366,7 +366,7 @@ g_object_unref (settings); settings = gdm_settings_new (); if (settings != NULL) { - if (! gdm_settings_direct_init (settings, GDMCONFDIR "/gdm.schemas", "/")) { + if (! gdm_settings_direct_init (settings, DATADIR "/gdm/gdm.schemas", "/")) { g_warning ("Unable to initialize settings"); } } diff -Nru gdm-3.6.0/data/Makefile.in gdm-3.6.1/data/Makefile.in --- gdm-3.6.0/data/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/Makefile.in 2012-10-16 02:28:35.000000000 +0000 @@ -206,6 +206,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/applications/Makefile.in gdm-3.6.1/data/applications/Makefile.in --- gdm-3.6.0/data/applications/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/applications/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/applications/gnome-mag.desktop gdm-3.6.1/data/applications/gnome-mag.desktop --- gdm-3.6.0/data/applications/gnome-mag.desktop 2012-09-25 18:07:42.000000000 +0000 +++ gdm-3.6.1/data/applications/gnome-mag.desktop 2012-10-16 02:30:33.000000000 +0000 @@ -44,7 +44,7 @@ Name[ko]=그놈 화면 돋보기 Name[ky]=GNOME экран лупасы Name[lt]=GNOME ekrano lupa -Name[lv]=GNOME ekrāna lupa +Name[lv]=GNOME ekrāna palielinātājs Name[mai]=गनोम स्क्रीन आवर्द्धक Name[mg]=GNOME Screen Magnifier Name[mk]=Зголемувач на екранот на GNOME diff -Nru gdm-3.6.0/data/applications/gnome-shell.desktop gdm-3.6.1/data/applications/gnome-shell.desktop --- gdm-3.6.0/data/applications/gnome-shell.desktop 2012-09-25 18:07:42.000000000 +0000 +++ gdm-3.6.1/data/applications/gnome-shell.desktop 2012-10-16 02:30:33.000000000 +0000 @@ -35,7 +35,7 @@ Name[ko]=그놈 셸 Name[ky]=GNOME Shell Name[lt]=GNOME apvalkalas -Name[lv]=GNOME Shell +Name[lv]=GNOME čaula Name[mk]=GNOME Shell Name[ml]=ഗ്നോം ഷല്‍ Name[mr]=GNOME शेल @@ -45,6 +45,7 @@ Name[pt]=Interface GNOME Name[pt_BR]=GNOME Shell Name[ru]=GNOME Shell +Name[sk]=GNOME Shell Name[sl]=Gnome lupina Name[sr]=Гномова шкољка Name[sr@latin]=Gnomova školjka @@ -102,6 +103,7 @@ Comment[pt]=Gestão de janelas e composição Comment[pt_BR]=Gerenciador de janelas e de composição Comment[ru]=Управление окнами и компоновкой +Comment[sk]=Správa a kompozícia okien Comment[sl]=Upravljanje oken in zaganjanje programov Comment[sr]=Управљање прозорима и састављање Comment[sr@latin]=Upravljanje prozorima i sastavljanje diff -Nru gdm-3.6.0/data/applications/polkit-gnome-authentication-agent-1.desktop gdm-3.6.1/data/applications/polkit-gnome-authentication-agent-1.desktop --- gdm-3.6.0/data/applications/polkit-gnome-authentication-agent-1.desktop 2012-09-25 18:07:42.000000000 +0000 +++ gdm-3.6.1/data/applications/polkit-gnome-authentication-agent-1.desktop 2012-10-16 02:30:33.000000000 +0000 @@ -13,7 +13,6 @@ Name[oc]=Agent d'autentificacion de PolicyKit Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ Name[ro]=Agent de autentificare PolicyKit -Name[sk]=Agent overovania totožnosti PolicyKit Name[ug]=PolicyKit دەلىللەش پروگراممىسى Exec=/usr/libexec/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; diff -Nru gdm-3.6.0/data/autostart/Makefile.in gdm-3.6.1/data/autostart/Makefile.in --- gdm-3.6.0/data/autostart/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/autostart/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/gdm.schemas gdm-3.6.1/data/gdm.schemas --- gdm-3.6.0/data/gdm.schemas 2012-09-25 18:07:42.000000000 +0000 +++ gdm-3.6.1/data/gdm.schemas 2012-10-16 02:30:32.000000000 +0000 @@ -50,7 +50,7 @@ daemon/InitialSetupEnable b - false + true diff -Nru gdm-3.6.0/data/gdm.schemas.in gdm-3.6.1/data/gdm.schemas.in --- gdm-3.6.0/data/gdm.schemas.in 2012-08-01 20:19:37.000000000 +0000 +++ gdm-3.6.1/data/gdm.schemas.in 2012-10-16 02:30:31.000000000 +0000 @@ -50,7 +50,7 @@ daemon/InitialSetupEnable b - false + true diff -Nru gdm-3.6.0/data/gdm.schemas.in.in gdm-3.6.1/data/gdm.schemas.in.in --- gdm-3.6.0/data/gdm.schemas.in.in 2012-08-01 18:24:21.000000000 +0000 +++ gdm-3.6.1/data/gdm.schemas.in.in 2012-10-16 02:20:22.000000000 +0000 @@ -50,7 +50,7 @@ daemon/InitialSetupEnable b - false + true diff -Nru gdm-3.6.0/data/pixmaps/16x16/Makefile.in gdm-3.6.1/data/pixmaps/16x16/Makefile.in --- gdm-3.6.0/data/pixmaps/16x16/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/pixmaps/16x16/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -163,6 +163,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/pixmaps/32x32/Makefile.in gdm-3.6.1/data/pixmaps/32x32/Makefile.in --- gdm-3.6.0/data/pixmaps/32x32/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/pixmaps/32x32/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -163,6 +163,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/pixmaps/48x48/Makefile.in gdm-3.6.1/data/pixmaps/48x48/Makefile.in --- gdm-3.6.0/data/pixmaps/48x48/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/pixmaps/48x48/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -163,6 +163,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/data/pixmaps/Makefile.in gdm-3.6.1/data/pixmaps/Makefile.in --- gdm-3.6.0/data/pixmaps/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/data/pixmaps/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -201,6 +201,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/debian/changelog gdm-3.6.1/debian/changelog --- gdm-3.6.0/debian/changelog 2012-10-06 21:34:13.000000000 +0000 +++ gdm-3.6.1/debian/changelog 2012-10-16 20:06:50.000000000 +0000 @@ -1,3 +1,18 @@ +gdm (3.6.1-0ubuntu1) quantal-proposed; urgency=low + + [ Jeremy Bicha ] + * New upstream release (LP: #1067492) + - Fix "Switch User" not working in Unity or GNOME Classic, + thanks Tim! (LP: #1057841) + * debian/patches/ubuntu_user_switching.patch: + - Dropped, applied in new version + + [ Tim Lunn ] + * debian/gdm.prerm: + - Do not try to stop gdm service if its not running. (LP: #1055359) + + -- Tim Lunn Tue, 16 Oct 2012 15:18:58 -0400 + gdm (3.6.0-0ubuntu4) quantal; urgency=low * debian/patches @@ -14,7 +29,7 @@ * debian/patches - add ubuntu_user_switching.patch: Fix user switching (upstream) (LP: #1058338) - -- Tim Lunn Sat, 29 Sep 2012 06:37:07 +1000 + -- Tim Lunn Sat, 29 Sep 2012 06:37:07 +1000 gdm (3.6.0-0ubuntu2) quantal; urgency=low diff -Nru gdm-3.6.0/debian/gdm.prerm gdm-3.6.1/debian/gdm.prerm --- gdm-3.6.0/debian/gdm.prerm 2012-10-06 21:34:13.000000000 +0000 +++ gdm-3.6.1/debian/gdm.prerm 2012-10-16 20:06:50.000000000 +0000 @@ -61,20 +61,6 @@ fi fi -if [ "$1" = "remove" ]; then - if [ -x /etc/init.d/gdm ]; then - nostop= - for hostname in "" "localhost" "$(hostname)" "$(hostname -f)"; do - if echo $DISPLAY | grep -q "^$hostname:0.*"; then - nostop=yes - fi - done - if [ -z $nostop ]; then - service gdm stop - fi - fi -fi - #DEBHELPER# exit 0 diff -Nru gdm-3.6.0/debian/patches/series gdm-3.6.1/debian/patches/series --- gdm-3.6.0/debian/patches/series 2012-10-06 21:34:13.000000000 +0000 +++ gdm-3.6.1/debian/patches/series 2012-10-16 20:06:50.000000000 +0000 @@ -18,7 +18,6 @@ ubuntu_no_debug.patch ubuntu_xresources_is_a_dir.patch ubuntu_no_LANG_setting_in_Xsession.patch -ubuntu_user_switching.patch ubuntu_ensure_dirs.patch ubuntu_slave-only-set-up-autologin.patch ubuntu_daemon_autologin_tracking.patch diff -Nru gdm-3.6.0/debian/patches/ubuntu_user_switching.patch gdm-3.6.1/debian/patches/ubuntu_user_switching.patch --- gdm-3.6.0/debian/patches/ubuntu_user_switching.patch 2012-10-06 21:34:13.000000000 +0000 +++ gdm-3.6.1/debian/patches/ubuntu_user_switching.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: gdm-3.6.0/gui/libgdm/gdm-user-switching.c -=================================================================== ---- gdm-3.6.0.orig/gui/libgdm/gdm-user-switching.c 2012-09-26 03:57:36.000000000 +1000 -+++ gdm-3.6.0/gui/libgdm/gdm-user-switching.c 2012-09-29 06:30:38.758485221 +1000 -@@ -251,7 +251,7 @@ - return FALSE; - } - -- g_variant_get (reply, "(&b)", &ret); -+ g_variant_get (reply, "(b)", &ret); - g_variant_unref (reply); - - return ret; diff -Nru gdm-3.6.0/docs/Makefile.in gdm-3.6.1/docs/Makefile.in --- gdm-3.6.0/docs/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/docs/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -131,6 +131,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/Makefile.in gdm-3.6.1/gui/Makefile.in --- gdm-3.6.0/gui/Makefile.in 2012-09-25 18:04:05.000000000 +0000 +++ gdm-3.6.1/gui/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -171,6 +171,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/libgdm/Makefile.in gdm-3.6.1/gui/libgdm/Makefile.in --- gdm-3.6.0/gui/libgdm/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/libgdm/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -213,6 +213,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/libgdm/gdm-client-glue.h gdm-3.6.1/gui/libgdm/gdm-client-glue.h --- gdm-3.6.0/gui/libgdm/gdm-client-glue.h 2012-09-04 21:53:43.000000000 +0000 +++ gdm-3.6.1/gui/libgdm/gdm-client-glue.h 2012-10-04 21:52:38.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.33.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.34.1. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gdm-3.6.0/gui/libgdm/gdm-user-switching.c gdm-3.6.1/gui/libgdm/gdm-user-switching.c --- gdm-3.6.0/gui/libgdm/gdm-user-switching.c 2012-09-25 17:57:36.000000000 +0000 +++ gdm-3.6.1/gui/libgdm/gdm-user-switching.c 2012-10-03 22:03:41.000000000 +0000 @@ -251,7 +251,7 @@ return FALSE; } - g_variant_get (reply, "(&b)", &ret); + g_variant_get (reply, "(b)", &ret); g_variant_unref (reply); return ret; diff -Nru gdm-3.6.0/gui/libgdm/gdm.pc gdm-3.6.1/gui/libgdm/gdm.pc --- gdm-3.6.0/gui/libgdm/gdm.pc 2012-09-25 18:07:24.000000000 +0000 +++ gdm-3.6.1/gui/libgdm/gdm.pc 2012-10-16 02:29:01.000000000 +0000 @@ -5,6 +5,6 @@ Name: GDM Client Library Description: Client Library for communicating with GDM daemon -Version: 3.6.0 +Version: 3.6.1 Libs: -L${libdir} -lgdm Cflags: -I${includedir}/gdm diff -Nru gdm-3.6.0/gui/simple-chooser/Makefile.in gdm-3.6.1/gui/simple-chooser/Makefile.in --- gdm-3.6.0/gui/simple-chooser/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-chooser/Makefile.in 2012-10-16 02:28:36.000000000 +0000 @@ -188,6 +188,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/Makefile.in gdm-3.6.1/gui/simple-greeter/Makefile.in --- gdm-3.6.0/gui/simple-greeter/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -334,6 +334,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -172,6 +172,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -238,6 +238,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/16x16/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/16x16/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/16x16/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/16x16/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/48x48/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/48x48/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/48x48/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/48x48/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/fingerprint/icons/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/fingerprint/icons/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -171,6 +171,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/password/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/password/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/password/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/password/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -199,6 +199,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/smartcard/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/smartcard/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/smartcard/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/smartcard/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -260,6 +260,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/16x16/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/16x16/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/16x16/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/16x16/Makefile.in 2012-10-16 02:28:37.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/48x48/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/48x48/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/48x48/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/48x48/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -161,6 +161,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/smartcard/icons/Makefile.in 2012-09-25 18:04:06.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/smartcard/icons/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -171,6 +171,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/extensions/unified/Makefile.in gdm-3.6.1/gui/simple-greeter/extensions/unified/Makefile.in --- gdm-3.6.0/gui/simple-greeter/extensions/unified/Makefile.in 2012-09-25 18:04:07.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/extensions/unified/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -198,6 +198,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/libgdmsimplegreeter/Makefile.in gdm-3.6.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.in --- gdm-3.6.0/gui/simple-greeter/libgdmsimplegreeter/Makefile.in 2012-09-25 18:04:07.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/libgdmsimplegreeter/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -206,6 +206,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc gdm-3.6.1/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc --- gdm-3.6.0/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc 2012-09-25 18:07:24.000000000 +0000 +++ gdm-3.6.1/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc 2012-10-16 02:29:01.000000000 +0000 @@ -6,6 +6,6 @@ Name: GDM Simple Greeter Description: Library for GDM Simple Greeter Plugins -Version: 3.6.0 +Version: 3.6.1 Libs: -L${libdir} -lgdmsimplegreeter Cflags: -I${includedir}/gdm/simple-greeter diff -Nru gdm-3.6.0/po/lt.po gdm-3.6.1/po/lt.po --- gdm-3.6.0/po/lt.po 2012-09-13 20:21:11.000000000 +0000 +++ gdm-3.6.1/po/lt.po 2012-10-03 22:03:41.000000000 +0000 @@ -1,30 +1,32 @@ # Lithuanian translation of GDM -# Copyright (C) 2001-2009 Free Software Foundation, Inc. +# Copyright © 2001-2012 Free Software Foundation, Inc. # Gediminas Paulauskas , 2001. # Mantas Kriaučiūnas , 2002-2003. # Eglė Girinaitė , 2002. -# Žygimantas Beručka , 2003-2006,2009, 2010. +# Žygimantas Beručka , 2003-2006,2009, 2010, 2012. # Justina Klingaitė , 2005. # Vytautas Liuolia , 2007. # Gintautas Miliauskas , 2008,2009. # Rimas Kudelis , 2010. # Aurimas Černius , 2010. # Algimantas Margevičius , 2011. -# msgid "" msgstr "" "Project-Id-Version: lt\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-04 19:23+0000\n" -"PO-Revision-Date: 2012-09-07 20:26+0300\n" -"Last-Translator: Aurimas Černius \n" -"Language-Team: Lietuvių <>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&ke" +"ywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-09-25 18:17+0000\n" +"PO-Revision-Date: 2012-09-30 11:36+0300\n" +"Last-Translator: Žygimantas Beručka \n" +"Language-Team: Lithuanian\n" "Language: lt\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%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Virtaal 0.6.1\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" +"100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" #: ../common/gdm-common.c:492 #, c-format @@ -36,44 +38,12 @@ msgid "could not find user \"%s\" on system" msgstr "nepavyko sistemoje rasti naudotojo „%s“" -#: ../daemon/gdm-display.c:1315 -#: ../daemon/gdm-display.c:1349 +#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 #, c-format msgid "No session available yet" msgstr "Nar nėra prieinamų seansų" -#: ../daemon/gdm-launch-environment.c:401 -#, c-format -msgid "User %s doesn't exist" -msgstr "Naudotojas %s neegzistuoja" - -#: ../daemon/gdm-launch-environment.c:408 -#, c-format -msgid "Group %s doesn't exist" -msgstr "Grupė %s neegzistuoja" - -#: ../daemon/gdm-launch-environment.c:427 -#: ../daemon/gdm-launch-environment.c:447 -#: ../daemon/gdm-server.c:463 -#: ../daemon/gdm-server.c:483 -#, c-format -msgid "Couldn't set groupid to %d" -msgstr "Nepavyko pakeisti groupid į %d" - -#: ../daemon/gdm-launch-environment.c:433 -#: ../daemon/gdm-server.c:469 -#, c-format -msgid "initgroups () failed for %s" -msgstr "initgroups() %s nepavyko" - -#: ../daemon/gdm-launch-environment.c:439 -#: ../daemon/gdm-server.c:475 -#, c-format -msgid "Couldn't set userid to %d" -msgstr "Nepavyko pakeisti userid į %d" - -#: ../daemon/gdm-manager.c:277 -#: ../daemon/gdm-manager.c:384 +#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 #, c-format msgid "Unable to look up UID of user %s" msgstr "Nepavyko ieškoti naudotojo %s UID" @@ -101,8 +71,7 @@ msgid "User doesn't own session" msgstr "Seansas nepriklauso naudotojui " -#: ../daemon/gdm-manager.c:687 -#: ../daemon/gdm-manager.c:768 +#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 msgid "No session available" msgstr "Nėra prieinamų seansų" @@ -114,15 +83,30 @@ #: ../daemon/gdm-server.c:452 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" -msgstr "Serveris turėjo būti sukurtas naudotojo %s, bet toks naudotojas neegzistuoja" +msgstr "" +"Serveris turėjo būti sukurtas naudotojo %s, bet toks naudotojas neegzistuoja" + +#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 +#, c-format +msgid "Couldn't set groupid to %d" +msgstr "Nepavyko pakeisti groupid į %d" + +#: ../daemon/gdm-server.c:469 +#, c-format +msgid "initgroups () failed for %s" +msgstr "initgroups() %s nepavyko" + +#: ../daemon/gdm-server.c:475 +#, c-format +msgid "Couldn't set userid to %d" +msgstr "Nepavyko pakeisti userid į %d" #: ../daemon/gdm-server.c:522 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: Nepavyko atverti ekrano %s žurnalo failo!" -#: ../daemon/gdm-server.c:533 -#: ../daemon/gdm-server.c:539 +#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 #: ../daemon/gdm-server.c:545 #, c-format msgid "%s: Error setting %s to %s" @@ -133,7 +117,7 @@ msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Serverio prioriteto nepavyko nustatyti į %d: %s" -#: ../daemon/gdm-server.c:718 +#: ../daemon/gdm-server.c:722 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Tuščia serverio komanda ekranui %s" @@ -162,89 +146,100 @@ msgid "The display device" msgstr "Vaizdavimo įrenginys" -#: ../daemon/gdm-session.c:1177 +#: ../daemon/gdm-session.c:1184 msgid "Could not create authentication helper process" msgstr "Nepavyko sukurti tapatybės patvirtinimo pagalbinio proceso" -#: ../daemon/gdm-session-worker.c:1025 +#: ../daemon/gdm-session-worker.c:1029 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "klaida užmezgant kontaktą su tapatybės patvirtinimo sistema - %s" -#: ../daemon/gdm-session-worker.c:1026 +#: ../daemon/gdm-session-worker.c:1030 msgid "general failure" msgstr "bendroji klaida" -#: ../daemon/gdm-session-worker.c:1027 +#: ../daemon/gdm-session-worker.c:1031 msgid "out of memory" msgstr "baigėsi atmintis" -#: ../daemon/gdm-session-worker.c:1028 +#: ../daemon/gdm-session-worker.c:1032 msgid "application programmer error" msgstr "programuotojo klaida" -#: ../daemon/gdm-session-worker.c:1029 +#: ../daemon/gdm-session-worker.c:1033 msgid "unknown error" msgstr "nežinoma klaida" -#: ../daemon/gdm-session-worker.c:1036 +#: ../daemon/gdm-session-worker.c:1040 msgid "Username:" msgstr "Naudotojo vardas:" -#: ../daemon/gdm-session-worker.c:1042 +#: ../daemon/gdm-session-worker.c:1046 #, c-format msgid "error informing authentication system of preferred username prompt: %s" -msgstr "klaida pranešant autentikacijos sistemai apie pageidaujamą naudotojo vardo užklausimą: %s" +msgstr "" +"klaida pranešant autentikacijos sistemai apie pageidaujamą naudotojo vardo " +"užklausimą: %s" -#: ../daemon/gdm-session-worker.c:1056 +#: ../daemon/gdm-session-worker.c:1060 #, c-format msgid "error informing authentication system of user's hostname: %s" -msgstr "klaida pranešant tapatybės nustatymo sistemai naudotojo kompiuterio vardą: %s" +msgstr "" +"klaida pranešant tapatybės nustatymo sistemai naudotojo kompiuterio vardą: %s" -#: ../daemon/gdm-session-worker.c:1073 +#: ../daemon/gdm-session-worker.c:1077 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "klaida pranešant tapatybės nustatymo sistemai naudotojo konsolę: %s" -#: ../daemon/gdm-session-worker.c:1097 +#: ../daemon/gdm-session-worker.c:1101 #, c-format msgid "error informing authentication system of display string: %s" msgstr "klaida pranešant tapatybės nustatymo sistemai ekrano eilutę: %s" -#: ../daemon/gdm-session-worker.c:1112 +#: ../daemon/gdm-session-worker.c:1116 #, c-format msgid "error informing authentication system of display xauth credentials: %s" -msgstr "klaida pranešant tapatybės nustatymo sistemai ekrano xauth kredencialus: %s" +msgstr "" +"klaida pranešant tapatybės nustatymo sistemai ekrano xauth kredencialus: %s" -#: ../daemon/gdm-session-worker.c:1442 -#: ../daemon/gdm-session-worker.c:1459 +#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 #, c-format msgid "no user account available" msgstr "naudotojų paskyrų nėra" -#: ../daemon/gdm-session-worker.c:1486 +#: ../daemon/gdm-session-worker.c:1490 msgid "Unable to change to user" msgstr "Nepavyko pakeisti naudotojo" -#: ../daemon/gdm-simple-slave.c:1356 -msgid "Could not start the X server (your graphical environment) due to an internal error. Please contact your system administrator or check your syslog to diagnose. In the meantime this display will be disabled. Please restart GDM when the problem is corrected." -msgstr "Nepavyko paleisti X serverio (Jūsų grafinės aplinkos) dėl vidinės klaidos. Susisiekite su sistemos administratoriumi arba patikrinkite syslog, jei norite diagnozuoti problemą. Kol kas šis ekranas bus išjungtas. Kai išspręsite problemą, paleiskite GDM iš naujo." +#: ../daemon/gdm-simple-slave.c:1374 +msgid "" +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Nepavyko paleisti X serverio (Jūsų grafinės aplinkos) dėl vidinės klaidos. " +"Susisiekite su sistemos administratoriumi arba patikrinkite syslog, jei " +"norite diagnozuoti problemą. Kol kas šis ekranas bus išjungtas. Kai " +"išspręsite problemą, paleiskite GDM iš naujo." -#: ../daemon/gdm-simple-slave.c:1397 +#: ../daemon/gdm-simple-slave.c:1415 #, c-format msgid "Can only be called before user is logged in" msgstr "Gali būti kviečiamas tik prieš naudotojui prisijungiant" -#: ../daemon/gdm-simple-slave.c:1407 +#: ../daemon/gdm-simple-slave.c:1425 #, c-format msgid "Caller not GDM" msgstr "Kvietėjas ne GDM" -#: ../daemon/gdm-simple-slave.c:1466 +#: ../daemon/gdm-simple-slave.c:1478 msgid "User not logged in" msgstr "Naudotojas neprisijungė" -#: ../daemon/gdm-xdmcp-chooser-slave.c:366 +#: ../daemon/gdm-xdmcp-chooser-slave.c:370 #, c-format msgid "Currently, only one client can be connected at once" msgstr "Šiuo metu tik vienas klientas gali būti prisijungęs vienu metu" @@ -253,8 +248,7 @@ msgid "Could not create socket!" msgstr "Nepavyko sukurti lizdo!" -#: ../daemon/main.c:126 -#: ../daemon/main.c:139 +#: ../daemon/main.c:126 ../daemon/main.c:139 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "Įrašyti PID failo %s nepavyko, tikriausiai diske nėra vietos: %s" @@ -329,18 +323,15 @@ msgid "GNOME Display Manager Session Worker" msgstr "GNOME ekrano valdyklės seanso darbininkas" -#: ../daemon/simple-slave-main.c:177 -#: ../daemon/xdmcp-chooser-slave-main.c:178 +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 msgid "Display ID" msgstr "Ekrano ID" -#: ../daemon/simple-slave-main.c:177 -#: ../daemon/xdmcp-chooser-slave-main.c:178 +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 msgid "ID" msgstr "ID" -#: ../daemon/simple-slave-main.c:187 -#: ../daemon/xdmcp-chooser-slave-main.c:188 +#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 msgid "GNOME Display Manager Slave" msgstr "GNOME ekrano valdyklės šalutinis modulis" @@ -373,49 +364,65 @@ msgid "Use an on-screen keyboard" msgstr "Naudoti klaviatūrą ekrane" -#: ../data/applications/orca-screen-reader.desktop.in.h:1 -msgid "Orca Screen Reader" -msgstr "Orca ekrano skaitytuvas" - -#: ../data/applications/orca-screen-reader.desktop.in.h:2 -msgid "Present on-screen information as speech or braille" -msgstr "Pateikti informaciją ekrane kaip kalbą arba Brailio raštą" - #: ../data/org.gnome.login-screen.gschema.xml.in.h:1 msgid "Whether or not to allow fingerprint readers for login" msgstr "Ar leisti pirštų atspaudų skaitykles prisijungimui" #: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -msgid "The login screen can optionally allow users who have enrolled their fingerprints to log in using those prints." -msgstr "Prisijungimo ekranas gali papildomai leisti naudotojams, kurie įrašė savo pirštų atspaudus, prisijungti naudojant šiuos atspaudus." +msgid "" +"The login screen can optionally allow users who have enrolled their " +"fingerprints to log in using those prints." +msgstr "" +"Prisijungimo ekranas gali papildomai leisti naudotojams, kurie įrašė savo " +"pirštų atspaudus, prisijungti naudojant šiuos atspaudus." #: ../data/org.gnome.login-screen.gschema.xml.in.h:3 msgid "Whether or not to allow smartcard readers for login" msgstr "Ar leisti apsaugos kortelių skaitykles prisijungimui" #: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -msgid "The login screen can optionally allow users who have smartcards to log in using those smartcards." -msgstr "Prisijungimo ekranas gali papildomai leisti naudotojams, kurie turi apsaugos korteles, prisijungti naudojant šias korteles." +msgid "" +"The login screen can optionally allow users who have smartcards to log in " +"using those smartcards." +msgstr "" +"Prisijungimo ekranas gali papildomai leisti naudotojams, kurie turi apsaugos " +"korteles, prisijungti naudojant šias korteles." #: ../data/org.gnome.login-screen.gschema.xml.in.h:5 msgid "Path to small image at top of user list" msgstr "Kelias iki mažo paveikslėlio naudotojų sąrašo viršuje" #: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -msgid "The login screen can optionally show a small image at the top of its user list to provide site administrators and distributions a way to provide branding." -msgstr "Prisijungimo ekranas gali papildomai parodyti mažą paveikslėlį virš naudotojų sąrašo, leisdamas distribucijų administratoriams pateikti brendus." +msgid "" +"The login screen can optionally show a small image at the top of its user " +"list to provide site administrators and distributions a way to provide " +"branding." +msgstr "" +"Prisijungimo ekranas gali papildomai parodyti mažą paveikslėlį virš " +"naudotojų sąrašo, leisdamas distribucijų administratoriams pateikti brendus." #: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -msgid "The fallback login screen can optionally show a small image at the top of its user list to provide site administrators and distributions a way to provide branding." -msgstr "Atsarginis prisijungimo ekranas gali papildomai parodyti mažą paveikslėlį virš naudotojų sąrašo, leisdamas distribucijų administratoriams pateikti brendus." +msgid "" +"The fallback login screen can optionally show a small image at the top of " +"its user list to provide site administrators and distributions a way to " +"provide branding." +msgstr "" +"Atsarginis prisijungimo ekranas gali papildomai parodyti mažą paveikslėlį " +"virš naudotojų sąrašo, leisdamas distribucijų administratoriams pateikti " +"brendus." #: ../data/org.gnome.login-screen.gschema.xml.in.h:8 msgid "Avoid showing user list" msgstr "Vengti rodyti naudotojų sąrašą" #: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -msgid "The login screen normally shows a list of available users to log in as. This setting can be toggled to disable showing the user list." -msgstr "Prisijungimo ekranas paprastai rodo naudotojų, prie kurių paskyrų galima prisijungti, sąrašą. Šį nustatymą galima perjungti ir naudotojų sąrašas nebebus rodomas." +msgid "" +"The login screen normally shows a list of available users to log in as. This " +"setting can be toggled to disable showing the user list." +msgstr "" +"Prisijungimo ekranas paprastai rodo naudotojų, prie kurių paskyrų galima " +"prisijungti, sąrašą. Šį nustatymą galima perjungti ir naudotojų sąrašas " +"nebebus rodomas." #: ../data/org.gnome.login-screen.gschema.xml.in.h:10 msgid "Enable showing the banner message" @@ -439,15 +446,21 @@ #: ../data/org.gnome.login-screen.gschema.xml.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "Nustatykite į teigiamą, jei norite paslėpti kompiuterio paleidimo iš naujo mygtukus prisijungimo lange." +msgstr "" +"Nustatykite į teigiamą, jei norite paslėpti kompiuterio paleidimo iš naujo " +"mygtukus prisijungimo lange." #: ../data/org.gnome.login-screen.gschema.xml.in.h:16 msgid "Number of allowed authentication failures" msgstr "Tapatybės patvirtinimo nesėkmių skaičius" #: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -msgid "The number of times a user is allowed to attempt authentication, before giving up and going back to user selection." -msgstr "Skaičius kartų, kiek naudotojui leidžiama mėginti patvirtinti tapatybę prieš grįžtant į naudotojų pasirinkimą." +msgid "" +"The number of times a user is allowed to attempt authentication, before " +"giving up and going back to user selection." +msgstr "" +"Skaičius kartų, kiek naudotojui leidžiama mėginti patvirtinti tapatybę prieš " +"grįžtant į naudotojų pasirinkimą." #: ../gui/libgdm/gdm-user-switching.c:72 msgid "Unable to create transient display: " @@ -459,7 +472,7 @@ msgstr "Nepavyko aktyvuoti seanso:" #: ../gui/libgdm/gdm-user-switching.c:344 -#: ../gui/libgdm/gdm-user-switching.c:483 +#: ../gui/libgdm/gdm-user-switching.c:512 #, c-format msgid "Could not identify the current session." msgstr "Nepavyko identifikuoti esamo seanso." @@ -469,17 +482,21 @@ msgid "User unable to switch sessions." msgstr "Naudotojas negali keisti seansų." -#: ../gui/libgdm/gdm-user-switching.c:492 +#: ../gui/libgdm/gdm-user-switching.c:521 #, c-format msgid "Could not identify the current seat." msgstr "Nepavyko identifikuoti esamo seanso." -#: ../gui/libgdm/gdm-user-switching.c:502 +#: ../gui/libgdm/gdm-user-switching.c:531 #, c-format -msgid "The system is unable to determine whether to switch to an existing login screen or start up a new login screen." -msgstr "Sistemai nepavyksta nustatyti, ar persijungti į esamą prisijungimo ekraną, ar paleisti naują prisijungimo ekraną." +msgid "" +"The system is unable to determine whether to switch to an existing login " +"screen or start up a new login screen." +msgstr "" +"Sistemai nepavyksta nustatyti, ar persijungti į esamą prisijungimo ekraną, " +"ar paleisti naują prisijungimo ekraną." -#: ../gui/libgdm/gdm-user-switching.c:510 +#: ../gui/libgdm/gdm-user-switching.c:539 #, c-format msgid "The system is unable to start up a new login screen." msgstr "Sistemai nepavyksta paleisti naujo prosijungimo ekrano." @@ -645,28 +662,28 @@ #. #: ../gui/simple-greeter/gdm-clock-widget.c:70 msgid "%a %b %e, %l:%M:%S %p" -msgstr "%a %b %e, %k:%M:%S" +msgstr "%a, %b %e d., %k:%M:%S" #. translators: This is the time format to use when both #. * the date and time without seconds are being shown together. #. #: ../gui/simple-greeter/gdm-clock-widget.c:76 msgid "%a %b %e, %l:%M %p" -msgstr "%a %b %e, %k:%M" +msgstr "%a, %b %e d., %k:%M" #. translators: This is the time format to use when there is #. * no date, just weekday and time with seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:83 msgid "%a %l:%M:%S %p" -msgstr "%a %k:%M:%S" +msgstr "%a, %k:%M:%S" #. translators: This is the time format to use when there is #. * no date, just weekday and time without seconds. #. #: ../gui/simple-greeter/gdm-clock-widget.c:92 msgid "%a %l:%M %p" -msgstr "%a %k:%M" +msgstr "%a, %k:%M" #: ../gui/simple-greeter/gdm-greeter-login-window.c:314 msgid "Automatically logging in…" @@ -811,7 +828,7 @@ #: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 msgctxt "user" msgid "Other…" -msgstr "Kita..." +msgstr "Kita…" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgid "Choose a different account" @@ -843,10 +860,21 @@ #: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" -msgstr "Ekrano paveikslėlis įrašytas" +msgstr "Ekranvaizdis įrašytas" #. Option parsing #: ../utils/gdm-screenshot.c:279 msgid "Take a picture of the screen" -msgstr "Įrašyti ekrano paveikslėlį" +msgstr "Įrašyti ekranvaizdį" + +#~ msgid "User %s doesn't exist" +#~ msgstr "Naudotojas %s neegzistuoja" + +#~ msgid "Group %s doesn't exist" +#~ msgstr "Grupė %s neegzistuoja" + +#~ msgid "Orca Screen Reader" +#~ msgstr "Orca ekrano skaitytuvas" +#~ msgid "Present on-screen information as speech or braille" +#~ msgstr "Pateikti informaciją ekrane kaip kalbą arba Brailio raštą" diff -Nru gdm-3.6.0/po/lv.po gdm-3.6.1/po/lv.po --- gdm-3.6.0/po/lv.po 2012-09-24 14:08:47.000000000 +0000 +++ gdm-3.6.1/po/lv.po 2012-10-03 22:03:41.000000000 +0000 @@ -12,7 +12,7 @@ "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-09-24 12:25+0300\n" -"PO-Revision-Date: 2012-09-24 12:47+0300\n" +"PO-Revision-Date: 2012-09-26 01:24+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -32,7 +32,7 @@ #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "sistēmā neizdevās atrast lietotāju \"%s\"" +msgstr "sistēmā neizdevās atrast lietotāju “%s”" #: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 #, c-format @@ -74,7 +74,7 @@ #: ../daemon/gdm-server.c:273 #, c-format msgid "%s: failed to connect to parent display '%s'" -msgstr "%s: neizdevās pieslēgties vecāka ekrānam '%s'" +msgstr "%s — neizdevās pieslēgties vecāka displejam “%s”" #: ../daemon/gdm-server.c:452 #, c-format @@ -84,7 +84,7 @@ #: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 #, c-format msgid "Couldn't set groupid to %d" -msgstr "Neizdevās iestatīt grupas id uz %d" +msgstr "Neizdevās iestatīt groupid uz %d" #: ../daemon/gdm-server.c:469 #, c-format @@ -94,28 +94,28 @@ #: ../daemon/gdm-server.c:475 #, c-format msgid "Couldn't set userid to %d" -msgstr "Neizdevās iestatīt lietotāja id uz %d" +msgstr "Neizdevās iestatīt userid uz %d" #: ../daemon/gdm-server.c:522 #, c-format msgid "%s: Could not open log file for display %s!" -msgstr "%s: neizdevās atvērt %s ekrāna žurnāla datni!" +msgstr "%s — neizdevās atvērt %s displeja žurnāla datni!" #: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 #: ../daemon/gdm-server.c:545 #, c-format msgid "%s: Error setting %s to %s" -msgstr "%s: Kļūda iestatot %s uz %s" +msgstr "%s — kļūda, iestatot %s uz %s" #: ../daemon/gdm-server.c:565 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" -msgstr "%s: Servera prioritāti neizdevās iestatīt uz %d: %s" +msgstr "%s — servera prioritāti neizdevās iestatīt uz %d — %s" #: ../daemon/gdm-server.c:722 #, c-format msgid "%s: Empty server command for display %s" -msgstr "%s: Tukša servera komanda displejam %s" +msgstr "%s — tukša servera komanda displejam %s" #: ../daemon/gdm-session-auditor.c:90 msgid "Username" @@ -127,11 +127,11 @@ #: ../daemon/gdm-session-auditor.c:95 msgid "Hostname" -msgstr "Saimniekdatora nosaukums" +msgstr "Resursdatora nosaukums" #: ../daemon/gdm-session-auditor.c:96 msgid "The hostname" -msgstr "Saimniekdatora nosaukums" +msgstr "Resursdatora nosaukums" #: ../daemon/gdm-session-auditor.c:101 msgid "Display Device" @@ -149,7 +149,7 @@ #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "" -"kļūda, inicializējot informācijas apmaiņu ar autentifikācijas sistēmu - %s" +"kļūda, inicializējot informācijas apmaiņu ar autentifikācijas sistēmu — %s" #: ../daemon/gdm-session-worker.c:1030 msgid "general failure" @@ -157,7 +157,7 @@ #: ../daemon/gdm-session-worker.c:1031 msgid "out of memory" -msgstr "beigusies atmiņa" +msgstr "nepietiek atmiņas" #: ../daemon/gdm-session-worker.c:1032 msgid "application programmer error" @@ -175,32 +175,32 @@ #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" -"kļūda, autentifikācijas sistēmas informēšanā par vēlamo lietotājvārda " -"ievades veidu: %s" +"kļūda, informējot autentifikācijas sistēmu par vēlamo lietotājvārda ievades " +"veidu — %s" #: ../daemon/gdm-session-worker.c:1060 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" -"kļūda, autentifikācijas sistēmas informēšanā par lietotāja saimniekdatora " -"vārdu: %s" +"kļūda, informējot autentifikācijas sistēmu par lietotāja resursdatora " +"nosaukumu — %s" #: ../daemon/gdm-session-worker.c:1077 #, c-format msgid "error informing authentication system of user's console: %s" -msgstr "kļūda, autentifikācijas sistēmas informēšanā par lietotāja konsoli: %s" +msgstr "kļūda, informējot autentifikācijas sistēmu par lietotāja konsoli — %s" #: ../daemon/gdm-session-worker.c:1101 #, c-format msgid "error informing authentication system of display string: %s" -msgstr "kļūda, autentifikācijas sistēmas informēšanā par displeja virkni: %s" +msgstr "kļūda, informējot autentifikācijas sistēmu par displeja virkni — %s" #: ../daemon/gdm-session-worker.c:1116 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" -"kļūda, autentifikācijas sistēmas informēšanā par displeja xauth " -"akreditācijas datiem: %s" +"kļūda, informējot autentifikācijas sistēmu par displeja xauth akreditācijas " +"datiem — %s" #: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 #, c-format @@ -219,7 +219,7 @@ "when the problem is corrected." msgstr "" "Neizdevās palaist X serveri (jūsu grafisko vidi) kādas iekšējas kļūdas dēļ. " -"Lūdzu, sazinieties ar jūsu sistēmas administratoru vai pārbaudiet sistēmas " +"Lūdzu, sazinieties ar savu sistēmas administratoru vai pārbaudiet sistēmas " "žurnālu, lai noteiktu problēmas cēloni. Pa to laiku displejs tiks " "deaktivēts. Lūdzu, pārstartējiet GDM, kad problēma ir novērsta." @@ -250,7 +250,7 @@ #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" -"Neizdodas ierakstīt PID datni %s — iespējams, beigusies diska brīvā vieta: %s" +"Neizdodas ierakstīt PID datni %s — iespējams, beigusies diska brīvā vieta — %s" #: ../daemon/main.c:160 #, c-format @@ -260,12 +260,12 @@ #: ../daemon/main.c:176 #, c-format msgid "Authdir %s does not exist. Aborting." -msgstr "Žurnālu direktorija %s neeksistē. Pārtrauc darbību." +msgstr "Autentifikācijas direktorija %s neeksistē. Pārtrauc darbību." #: ../daemon/main.c:180 #, c-format msgid "Authdir %s is not a directory. Aborting." -msgstr "Autentifikācijas direktorija %s nav direktorijs. Pārtrauc darbību." +msgstr "Autentifikācijas direktorija %s nav direktorija. Pārtrauc darbību." #: ../daemon/main.c:254 #, c-format @@ -284,7 +284,7 @@ #: ../daemon/main.c:298 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "Neizdodas atrast GDM lietotāju '%s'. Pārtrauc darbību!" +msgstr "Neizdodas atrast GDM lietotāju “%s”. Pārtrauc darbību!" #: ../daemon/main.c:304 msgid "The GDM user should not be root. Aborting!" @@ -293,7 +293,7 @@ #: ../daemon/main.c:310 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "Neizdodas atrast GDM grupu '%s'. pārtrauc darbību!" +msgstr "Neizdodas atrast GDM grupu “%s”. Pārtrauc darbību!" #: ../daemon/main.c:316 msgid "The GDM group should not be root. Aborting!" @@ -345,7 +345,7 @@ #: ../data/applications/gnome-mag.desktop.in.h:1 msgid "GNOME Screen Magnifier" -msgstr "GNOME ekrāna lupa" +msgstr "GNOME ekrāna palielinātājs" #: ../data/applications/gnome-mag.desktop.in.h:2 msgid "Magnify parts of the screen" @@ -353,7 +353,7 @@ #: ../data/applications/gnome-shell.desktop.in.h:1 msgid "GNOME Shell" -msgstr "GNOME Shell" +msgstr "GNOME čaula" #: ../data/applications/gnome-shell.desktop.in.h:2 msgid "Window management and compositing" @@ -431,11 +431,11 @@ "setting can be toggled to disable showing the user list." msgstr "" "Ierakstīšanās ekrānā parasti redzams pieejamo lietotāju kontu saraksts. Šo " -"iestatījumu var mainīt, lai lietotāju saraksts neparādītos." +"iestatījumu var pārslēgt, lai lietotāju saraksts neparādītos." #: ../data/org.gnome.login-screen.gschema.xml.in.h:10 msgid "Enable showing the banner message" -msgstr "Ieslēgt karoga joslas rādīšanu" +msgstr "Aktivēt karoga joslas rādīšanu" #: ../data/org.gnome.login-screen.gschema.xml.in.h:11 msgid "Set to true to show the banner message text." @@ -457,7 +457,7 @@ #: ../data/org.gnome.login-screen.gschema.xml.in.h:15 msgid "Set to true to disable showing the restart buttons in the login window." msgstr "" -"Iestatīt uz true (patiess), lai izslēgtu pārstartēšanas pogu rādīšanu " +"Iestatiet uz true (patiess), lai izslēgtu pārstartēšanas pogu rādīšanu " "ierakstīšanās logā." #: ../data/org.gnome.login-screen.gschema.xml.in.h:16 @@ -517,19 +517,19 @@ #: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 msgid "XDMCP: Could not create XDMCP buffer!" -msgstr "XDMCP: neizdevās izveidot XDMCP buferi!" +msgstr "XDMCP — neizdevās izveidot XDMCP buferi!" #: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 msgid "XDMCP: Could not read XDMCP header!" -msgstr "XDMCP: Neizdevās nolasīt XDMCP galveni!" +msgstr "XDMCP — neizdevās nolasīt XDMCP galveni!" #: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 msgid "XMDCP: Incorrect XDMCP version!" -msgstr "XMDCP: Nepareiza XDMCP versija!" +msgstr "XMDCP — nepareiza XDMCP versija!" #: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 msgid "XMDCP: Unable to parse address" -msgstr "XMDCP: Neizdevās parsēt adresi" +msgstr "XMDCP — neizdevās parsēt adresi" #: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 msgid "Fingerprint Authentication" @@ -615,12 +615,12 @@ #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 #, c-format msgid "smartcard driver '%s' could not be loaded" -msgstr "nevarēja ielādēt viedkartes dzini '%s'" +msgstr "nevarēja ielādēt viedkartes dzini “%s”" #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 #, c-format msgid "could not watch for incoming card events - %s" -msgstr "nevarēja novērto ienākošos kartes notikumus - %s" +msgstr "nevarēja novērto ienākošos kartes notikumus — %s" #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 #, c-format @@ -649,7 +649,7 @@ #: ../gui/simple-greeter/gdm-chooser-widget.c:1466 msgid "The text to use in the label if the user hasn't picked an item yet" -msgstr "Teksts, ko izmantot etiķetei, ja lietotājs vēl nav izvēlējies vienību" +msgstr "Teksts, ko izmantot etiķetei, ja lietotājs vēl nav izvēlējies vienumu" #: ../gui/simple-greeter/gdm-chooser-widget.c:1474 msgid "Active Text" @@ -657,7 +657,7 @@ #: ../gui/simple-greeter/gdm-chooser-widget.c:1475 msgid "The text to use in the label if the user has picked an item" -msgstr "Teksts, ko izmantot etiķetei, ja lietotājs ir izvēlējies vienību" +msgstr "Teksts, ko izmantot etiķetei, ja lietotājs ir izvēlējies vienumu" #: ../gui/simple-greeter/gdm-chooser-widget.c:1484 msgid "List Visible" @@ -697,7 +697,7 @@ #: ../gui/simple-greeter/gdm-greeter-login-window.c:314 msgid "Automatically logging in…" -msgstr "Automātiski piesakās…" +msgstr "Automātiski ierakstās…" #. need to wait for response from backend #: ../gui/simple-greeter/gdm-greeter-login-window.c:930 @@ -707,7 +707,7 @@ #. just wait for the user to select language and stuff #: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 msgid "Select language and click Log In" -msgstr "Izvēlieties valodu un klikšķiniet “Ierakstīties”" +msgstr "Izvēlieties valodu un spiediet “Ierakstīties”" #: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 msgctxt "customsession" @@ -732,7 +732,7 @@ #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" -msgstr "Atslēgt" +msgstr "Atbloķēt" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 msgid "Login" @@ -740,7 +740,7 @@ #: ../gui/simple-greeter/gdm-greeter-panel.c:953 msgid "Suspend" -msgstr "Iemidzināt" +msgstr "Iesnaudināt" #: ../gui/simple-greeter/gdm-greeter-panel.c:958 msgid "Restart" @@ -776,11 +776,11 @@ #: ../gui/simple-greeter/gdm-option-widget.c:522 msgid "Default Item" -msgstr "Noklusētā vienība" +msgstr "Noklusējuma vienums" #: ../gui/simple-greeter/gdm-option-widget.c:523 msgid "The ID of the default item" -msgstr "Noklusētās vienības ID" +msgstr "Noklusējuma vienuma ID" #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format @@ -838,7 +838,7 @@ #: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 msgctxt "user" msgid "Other…" -msgstr "Cits..." +msgstr "Cits…" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgid "Choose a different account" @@ -854,7 +854,7 @@ #: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 msgid "Automatic Login" -msgstr "Automātiskā pieslēgšanās" +msgstr "Automātiskā ierakstīšanās" #: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatically log into the system after selecting options" diff -Nru gdm-3.6.0/po/sk.po gdm-3.6.1/po/sk.po --- gdm-3.6.0/po/sk.po 2012-07-20 19:00:19.000000000 +0000 +++ gdm-3.6.1/po/sk.po 2012-10-16 02:18:05.000000000 +0000 @@ -1,126 +1,121 @@ # Slovak translation for gdm. -# Copyright (C) 2000-2011 Free Software Foundation, Inc. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. # This file is distributed under the same license as the gdm package. # Stanislav Višňovský , 2003. -# Stanislav Višňovský , 2000, 2001, 2002, 2003, 2004. +# Stanislav Višňovský , 2000-2004. # Marcel Telka , 2005. # Pavol Šimo , 2006-2011. +# Dušan Kazik , 2012. # msgid "" msgstr "" "Project-Id-Version: gdm\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gdm&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-29 16:34+0000\n" -"PO-Revision-Date: 2011-03-30 08:01+0200\n" -"Last-Translator: Pavol Šimo \n" +"POT-Creation-Date: 2012-10-11 21:35+0000\n" +"PO-Revision-Date: 2012-10-12 16:54+0100\n" +"Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" +"Language: sk\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) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"X-Generator: Poedit 1.5.4\n" -#: ../common/gdm-common.c:456 +#: ../common/gdm-common.c:492 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom nie je znakové zariadenie" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 -msgid "Display ID" -msgstr "Identifikátor displeja" - -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 -msgid "ID" -msgstr "IDENTIFIKÁTOR" - -#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 -#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 -msgid "GNOME Display Manager Slave" -msgstr "Klient Správcu prihlásenia GNOME" - #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" -msgstr "používateľ \"%s\" sa v systéme nenašiel" +msgstr "používateľ „%s“ sa v systéme nenašiel" -#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 -msgid "Unable to initialize login system" -msgstr "Nepodarilo sa inicializovať systém prihlásenia" - -#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 -msgid "Unable to authenticate user" -msgstr "Nepodarilo sa overiť totožnosť používateľa" - -#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 -msgid "Unable to authorize user" -msgstr "Nepodarilo sa autorizovať používateľa" - -#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 -msgid "Unable to establish credentials" -msgstr "Nepodarilo sa ustanoviť poverenia" - -#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 -msgid "Unable to open session" -msgstr "Nepodarilo sa začať reláciu" +#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 +#, c-format +msgid "No session available yet" +msgstr "Zatiaľ nie je dostupná žiadna relácia" -#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 -#: ../daemon/gdm-simple-slave.c:1366 -msgid "" -"Could not start the X server (your graphical environment) due to an internal " -"error. Please contact your system administrator or check your syslog to " -"diagnose. In the meantime this display will be disabled. Please restart GDM " -"when the problem is corrected." +#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 +#, c-format +msgid "Unable to look up UID of user %s" +msgstr "Nepodarilo sa nájsť UID používateľa %s" + +#: ../daemon/gdm-manager.c:291 +msgid "no sessions available" +msgstr "nie sú dostupné žiadne relácie" + +#: ../daemon/gdm-manager.c:352 +#, c-format +msgid "No sessions for %s available for reauthentication" msgstr "" -"Nepodarilo sa spustiť X server (vaše grafické prostredie) pre internú chybu. " -"Na určenie príčiny kontaktujte, prosím, vášho správcu systému, alebo " -"skontrolujte súbor so systémovým záznamom. Zatiaľ bude tento displej " -"vypnutý. Prosím, po oprave problému reštartujte GDM." +"Na opakované overenie totožnosti používateľa %s nie sú dostupné žiadne " +"relácie" -#: ../daemon/gdm-server.c:250 +#: ../daemon/gdm-manager.c:406 +#, c-format +msgid "Unable to find session for user %s" +msgstr "Nepodarilo sa nájsť reláciu pre používateľa %s" + +#: ../daemon/gdm-manager.c:476 +#, c-format +msgid "Unable to find appropriate session for user %s" +msgstr "Nepodarilo sa nájsť príslušnú reláciu pre používateľa %s" + +#: ../daemon/gdm-manager.c:671 +msgid "User doesn't own session" +msgstr "Používateľ nevlastní žiadnu reláciu" + +#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 +msgid "No session available" +msgstr "Nie je dostupná žiadna relácia" + +#: ../daemon/gdm-server.c:272 #, c-format msgid "%s: failed to connect to parent display '%s'" -msgstr "%s: zlyhalo pripojenie na rodičovský displej '%s'" +msgstr "%s: zlyhalo pripojenie na rodičovský displej „%s“" -#: ../daemon/gdm-server.c:365 +#: ../daemon/gdm-server.c:451 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "Server mal byť spustený používateľom %s, taký ale neexistuje" -#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 -#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 +# PK: prekladat alebo neprekladat? identifikator skupiny +#: ../daemon/gdm-server.c:462 ../daemon/gdm-server.c:482 #, c-format msgid "Couldn't set groupid to %d" -msgstr "Nepodarilo sa nastaviť groupid na %d" +msgstr "Nepodarilo sa nastaviť identifikátor skupiny na %d" -#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 +#: ../daemon/gdm-server.c:468 #, c-format msgid "initgroups () failed for %s" msgstr "initgroups () zlyhalo pre %s" -#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 +#  PK: prekladat alebo neprekladat? identifikator pouzivatela +#: ../daemon/gdm-server.c:474 #, c-format msgid "Couldn't set userid to %d" -msgstr "Nepodarilo sa nastaviť userid na %d" +msgstr "Nepodarilo sa nastaviť identifikátor používateľa na %d" -#: ../daemon/gdm-server.c:435 +#: ../daemon/gdm-server.c:521 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: Nepodarilo sa otvoriť súbor so záznamom pre displej %s!" -#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 -#: ../daemon/gdm-server.c:458 +#: ../daemon/gdm-server.c:532 ../daemon/gdm-server.c:538 +#: ../daemon/gdm-server.c:544 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: Chyba pri nastavovaní %s na %s" -#: ../daemon/gdm-server.c:478 +#: ../daemon/gdm-server.c:564 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Priorita servera nemohla byť nastavená na %d: %s" -#: ../daemon/gdm-server.c:631 +#: ../daemon/gdm-server.c:720 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: Prázdny príkaz servera pre displej %s" @@ -139,379 +134,400 @@ #: ../daemon/gdm-session-auditor.c:96 msgid "The hostname" -msgstr "Názov systému hostiteľa" +msgstr "Názov hostiteľského systému" +# PM: tu by som dal zobrazovacie zariadenie, teda ak sa tým nemyslí displej systému X #: ../daemon/gdm-session-auditor.c:101 +#, fuzzy msgid "Display Device" msgstr "Zariadenie displeja" +# PM: tu by som dal zariadenie pre zobrazovanie, v prípade že ide o displej systému x tak to treba preložiť inak #: ../daemon/gdm-session-auditor.c:102 +#, fuzzy msgid "The display device" msgstr "Zobrazovacie zariadenie" -#: ../daemon/gdm-session-worker.c:1066 +#: ../daemon/gdm-session.c:1183 +msgid "Could not create authentication helper process" +msgstr "Nepodarilo sa vytvoriť proces pomocníka pre overenie totožnosti" + +#: ../daemon/gdm-session-worker.c:1029 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "chyba pri započatí konverzácie so systémom overovania totožnosti - %s" -#: ../daemon/gdm-session-worker.c:1067 +#: ../daemon/gdm-session-worker.c:1030 msgid "general failure" msgstr "všeobecné zlyhanie" -#: ../daemon/gdm-session-worker.c:1068 +#: ../daemon/gdm-session-worker.c:1031 msgid "out of memory" msgstr "nedostatok pamäte" -#: ../daemon/gdm-session-worker.c:1069 +#: ../daemon/gdm-session-worker.c:1032 msgid "application programmer error" msgstr "chyba programátora aplikácie" -#: ../daemon/gdm-session-worker.c:1070 +#: ../daemon/gdm-session-worker.c:1033 msgid "unknown error" msgstr "neznáma chyba" -#: ../daemon/gdm-session-worker.c:1077 +#: ../daemon/gdm-session-worker.c:1040 msgid "Username:" msgstr "Používateľské meno:" -#: ../daemon/gdm-session-worker.c:1083 -#, c-format +# PM: o výzve pre zadanie používateľského mena +#: ../daemon/gdm-session-worker.c:1046 +#, fuzzy, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o preferovanej výzve na " "meno používateľa: %s" -#: ../daemon/gdm-session-worker.c:1097 -#, c-format +# PM: dal by som používateľovom názve hostiteľského systému +#: ../daemon/gdm-session-worker.c:1060 +#, fuzzy, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o názve hostiteľa " "používateľa: %s" -#: ../daemon/gdm-session-worker.c:1112 +#: ../daemon/gdm-session-worker.c:1077 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o používateľovej " "konzole: %s" -#: ../daemon/gdm-session-worker.c:1125 +#: ../daemon/gdm-session-worker.c:1101 #, c-format msgid "error informing authentication system of display string: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o reťazci displeja: %s" -#: ../daemon/gdm-session-worker.c:1140 -#, c-format +# PM: credentials sú tuším poverenia pozri do iných modulov +#: ../daemon/gdm-session-worker.c:1116 +#, fuzzy, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "chyba pri informovaní systému overovania totožnosti o xauth oprávneniach " "displeja: %s" -#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 +#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 #, c-format msgid "no user account available" msgstr "nie je k dispozícií žiaden používateľský účet" -#: ../daemon/gdm-session-worker.c:1506 +#: ../daemon/gdm-session-worker.c:1490 msgid "Unable to change to user" msgstr "Nepodarilo sa zmeniť na používateľa" -#: ../daemon/gdm-welcome-session.c:549 -#, c-format -msgid "User %s doesn't exist" -msgstr "Používateľ %s neexistuje" - -#: ../daemon/gdm-welcome-session.c:556 -#, c-format -msgid "Group %s doesn't exist" -msgstr "Skupina %s neexistuje" - -#: ../daemon/gdm-xdmcp-display-factory.c:604 -msgid "Could not create socket!" -msgstr "Nepodarilo sa vytvoriť soket!" - -#: ../daemon/gdm-xdmcp-display-factory.c:873 -#, c-format -msgid "Denied XDMCP query from host %s" -msgstr "Odmietnutá požiadavka XDMCP od hostiteľa %s" - -#: ../daemon/gdm-xdmcp-display-factory.c:1031 -#: ../daemon/gdm-xdmcp-display-factory.c:1255 -msgid "Could not extract authlist from packet" -msgstr "Nepodarilo sa získať authlist z paketu" - -#: ../daemon/gdm-xdmcp-display-factory.c:1044 -#: ../daemon/gdm-xdmcp-display-factory.c:1270 -msgid "Error in checksum" -msgstr "Chyba v kontrolnom súčte" - -#: ../daemon/gdm-xdmcp-display-factory.c:1523 -msgid "Bad address" -msgstr "Neplatná adresa" - -#: ../daemon/gdm-xdmcp-display-factory.c:1607 -#, c-format -msgid "%s: Could not read display address" -msgstr "%s: Nepodarilo sa prečítať adresu displeja" - -#: ../daemon/gdm-xdmcp-display-factory.c:1615 -#, c-format -msgid "%s: Could not read display port number" -msgstr "%s: Nepodarilo sa prečítať číslo portu displeja" - -#: ../daemon/gdm-xdmcp-display-factory.c:1624 -#, c-format -msgid "%s: Could not extract authlist from packet" -msgstr "%s: Nepodarilo sa získať authlist z paketu" - -#: ../daemon/gdm-xdmcp-display-factory.c:1644 -#, c-format -msgid "%s: Error in checksum" -msgstr "%s: Chyba v kontrolnom súčte" - -#: ../daemon/gdm-xdmcp-display-factory.c:2200 -#, c-format -msgid "%s: Got REQUEST from banned host %s" -msgstr "%s: Prijatý REQUEST od zakázaného hostiteľa %s" - -# nasledujúcich 7 reťazcov má veľkými písmenami určené názvy štruktúr z prijatého XDMCP paketu -#: ../daemon/gdm-xdmcp-display-factory.c:2210 -#: ../daemon/gdm-xdmcp-display-factory.c:2568 -#: ../daemon/gdm-xdmcp-display-factory.c:2822 -#, c-format -msgid "%s: Could not read Display Number" -msgstr "%s: Nepodarilo sa prečítať Číslo displeja" - -#: ../daemon/gdm-xdmcp-display-factory.c:2217 -#, c-format -msgid "%s: Could not read Connection Type" -msgstr "%s: Nepodarilo sa prečítať Typ spojenia" - -#: ../daemon/gdm-xdmcp-display-factory.c:2224 -#, c-format -msgid "%s: Could not read Client Address" -msgstr "%s: Nepodarilo sa prečítať Adresa klienta" - -#: ../daemon/gdm-xdmcp-display-factory.c:2232 -#, c-format -msgid "%s: Could not read Authentication Names" -msgstr "%s: Nepodarilo sa prečítať Overovacie mená" - -#: ../daemon/gdm-xdmcp-display-factory.c:2241 -#, c-format -msgid "%s: Could not read Authentication Data" -msgstr "%s: Nepodarilo sa prečítať Overovacie dáta" - -#: ../daemon/gdm-xdmcp-display-factory.c:2251 -#, c-format -msgid "%s: Could not read Authorization List" -msgstr "%s: Nepodarilo sa prečítať Zoznam oprávnení" - -#: ../daemon/gdm-xdmcp-display-factory.c:2270 -#, c-format -msgid "%s: Could not read Manufacturer ID" -msgstr "%s: Nepodarilo sa prečítať Identifikátor výrobcu" - -# %s je názov hostiteľa. Nemyslím, že by tam "z" bolo lepšie -#: ../daemon/gdm-xdmcp-display-factory.c:2297 -#, c-format -msgid "%s: Failed checksum from %s" -msgstr "%s: Chybný kontrolný súčet od %s" - -# Manage je typ XDMCP requestu. Nemyslím, že by sa to malo prekladať (ak nemáme ustálený preklad) -#: ../daemon/gdm-xdmcp-display-factory.c:2552 -#, c-format -msgid "%s: Got Manage from banned host %s" -msgstr "%s: Prijaté Manage zo zakázaného hostiteľa %s" +# PM: preklad druhej vety sa mi zdá ako strojový +#: ../daemon/gdm-simple-slave.c:1399 +#, fuzzy +msgid "" +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Nepodarilo sa spustiť X server (vaše grafické prostredie) kvôli vnútornej " +"chybe. Na určenie príčiny kontaktujte, prosím, vášho správcu systému, alebo " +"skontrolujte súbor so systémovým záznamom. Zatiaľ bude tento displej " +"vypnutý. Po oprave problému, prosím, reštartujte GDM." -# nasledujúce 2 reťazce majú veľkými písmenami určené názvy štruktúr z prijatého XDMCP paketu (tieto sú špeciálne pre Manage request) -#: ../daemon/gdm-xdmcp-display-factory.c:2561 -#: ../daemon/gdm-xdmcp-display-factory.c:2829 +#: ../daemon/gdm-simple-slave.c:1440 #, c-format -msgid "%s: Could not read Session ID" -msgstr "%s: Nepodarilo sa prečítať Identifikátor relácie" +msgid "Can only be called before user is logged in" +msgstr "Môže byť volaný iba pred prihlásením používateľa" -#: ../daemon/gdm-xdmcp-display-factory.c:2575 +#: ../daemon/gdm-simple-slave.c:1450 #, c-format -msgid "%s: Could not read Display Class" -msgstr "%s: Nepodarilo sa prečítať Triedu displeja" +msgid "Caller not GDM" +msgstr "" -#: ../daemon/gdm-xdmcp-display-factory.c:2681 -#: ../daemon/gdm-xdmcp-display-factory.c:2731 -#: ../daemon/gdm-xdmcp-display-factory.c:2737 -#, c-format -msgid "%s: Could not read address" -msgstr "%s: Nepodarilo sa prečítať adresu" +#: ../daemon/gdm-simple-slave.c:1503 +msgid "User not logged in" +msgstr "Používateľ nie je prihlásený" -#: ../daemon/gdm-xdmcp-display-factory.c:2812 +#: ../daemon/gdm-xdmcp-chooser-slave.c:370 #, c-format -msgid "%s: Got KEEPALIVE from banned host %s" -msgstr "%s: Prijaté KEEPALIVE od zakázaného hostiteľa %s" - -#: ../daemon/gdm-xdmcp-display-factory.c:2902 -msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -msgstr "GdmXdmcpDisplayFactory: Nepodarilo sa prečítať XDMCP hlavičku!" - -#: ../daemon/gdm-xdmcp-display-factory.c:2908 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -msgid "XMDCP: Incorrect XDMCP version!" -msgstr "XDMCP: Nesprávna verzia XDMCP!" +msgid "Currently, only one client can be connected at once" +msgstr "Teraz môže byť naraz prihlásený iba jeden klient" -#: ../daemon/gdm-xdmcp-display-factory.c:2914 -#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -msgid "XMDCP: Unable to parse address" -msgstr "XMDCP: Analýza adresy zlyhala" - -#: ../daemon/gdm-xdmcp-display-factory.c:3359 -#, c-format -msgid "Could not get server hostname: %s!" -msgstr "Nepodarilo sa získať názov hostiteľa servera: %s!" +#: ../daemon/gdm-xdmcp-display-factory.c:604 +msgid "Could not create socket!" +msgstr "Nepodarilo sa vytvoriť soket!" -#: ../daemon/main.c:237 ../daemon/main.c:250 +#: ../daemon/main.c:126 ../daemon/main.c:139 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "" "Nie je možné zapísať súbor PID %s: možno nedostatok miesta na disku: %s" -#: ../daemon/main.c:271 +#: ../daemon/main.c:183 #, c-format -msgid "Logdir %s does not exist or isn't a directory." -msgstr "" -"Priečinok pre súbory so záznamom %s neexistuje, alebo nie je priečinkom." +msgid "Failed to create AuthDir %s: %s" +msgstr "Nepodarilo sa vytvoriť AuthDir %s: %s" -#: ../daemon/main.c:287 +#: ../daemon/main.c:189 #, c-format -msgid "Authdir %s does not exist. Aborting." -msgstr "Priečinok pre overovanie %s neexistuje. Koniec." +msgid "Failed to create LogDir %s: %s" +msgstr "Nepodarilo sa vytvoriť LogDir %s: %s" -#: ../daemon/main.c:291 -#, c-format -msgid "Authdir %s is not a directory. Aborting." -msgstr "Priečinok pre overovanie %s nie je priečinkom. Koniec." - -#: ../daemon/main.c:365 -#, c-format -msgid "Authdir %s is not owned by user %d, group %d. Aborting." -msgstr "" -"Priečinok pre overovanie %s nie je vlastnený používateľom %d, skupinou %d. " -"Koniec." - -#: ../daemon/main.c:372 -#, c-format -msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -msgstr "" -"Priečinok pre overovanie %s má nesprávne prístupové práva %o. Majú byť %o. " -"Koniec." - -#: ../daemon/main.c:409 -#, c-format +# PM: myslí sa tým používateľ pod ktorým sa GDM spúšťa. dal by som používateľa procesu GDM, +# PM: na preklad aborting sa ešte opýtaj v ML. +#: ../daemon/main.c:224 +#, fuzzy, c-format msgid "Can't find the GDM user '%s'. Aborting!" -msgstr "Nie je možné nájsť GDM používateľa '%s'. Koniec!" +msgstr "Nie je možné nájsť GDM používateľa „%s“. Koniec!" -#: ../daemon/main.c:415 +#: ../daemon/main.c:230 msgid "The GDM user should not be root. Aborting!" msgstr "Používateľ GDM by nemal byť root. Koniec!" -#: ../daemon/main.c:421 -#, c-format +# PM: asi tiež skupinu procesu GDM +#: ../daemon/main.c:236 +#, fuzzy, c-format msgid "Can't find the GDM group '%s'. Aborting!" -msgstr "Nie je možné nájsť GDM skupinu '%s'. Koniec!" +msgstr "Nie je možné nájsť GDM skupinu „%s“. Koniec!" -#: ../daemon/main.c:427 +#: ../daemon/main.c:242 msgid "The GDM group should not be root. Aborting!" msgstr "Skupina pre GDM by nemala byť root. Koniec!" -#: ../daemon/main.c:533 +# PM: je to zrejme popis volby príkazového riadka, treba asi preložiť popisne +#: ../daemon/main.c:350 +#, fuzzy msgid "Make all warnings fatal" msgstr "Považovať všetky upozornenia za kritické" -#: ../daemon/main.c:534 +#: ../daemon/main.c:351 +#, fuzzy msgid "Exit after a time (for debugging)" -msgstr "Skončiť po nejakom čase (na ladenie)" +msgstr "Skončiť po nejakom čase (pre ladenie)" -#: ../daemon/main.c:535 +#: ../daemon/main.c:352 +#, fuzzy msgid "Print GDM version" msgstr "Vypísať verziu GDM" # PŠ: je to názov toho programu - Správca prihlásenia. Vždy sa tak volal... -#: ../daemon/main.c:550 +#: ../daemon/main.c:365 msgid "GNOME Display Manager" msgstr "Správca prihlásenia GNOME" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:616 +#: ../daemon/main.c:413 msgid "Only the root user can run GDM" msgstr "Len používateľ root môže spúšťať GDM" +# PM: to znie šialene, čo takto Správca relácií pre... #. Translators: worker is a helper process that does the work #. of starting up a session -#: ../daemon/session-worker-main.c:158 +#: ../daemon/session-worker-main.c:150 +#, fuzzy msgid "GNOME Display Manager Session Worker" -msgstr "Spracovávač relácie Správcu prihlásenia GNOME" +msgstr "Správcovač relácie Správcu prihlásenia GNOME" + +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 +msgid "Display ID" +msgstr "Identifikátor displeja" -#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 -msgid "AT-SPI Registry Wrapper" -msgstr "Obaľovač AT-SPI registra" +# PK: ma to byt velkym? +# DK: podla mna nema +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 +msgid "ID" +msgstr "IDENTIFIKÁTOR" + +#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 +msgid "GNOME Display Manager Slave" +msgstr "Klient Správcu prihlásenia GNOME" -#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 +#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 msgid "Login Window" msgstr "Prihlasovacie okno" -#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 -msgid "Power Manager" -msgstr "Správca napájania" - -#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 -msgid "Power management daemon" -msgstr "Démon správy napájania" - -#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 -msgid "GNOME Session Acceleration Checker" -msgstr "Overovač urýchľovania relácie GNOME" - -#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 -msgid "GNOME Settings Daemon" -msgstr "Démon nastavení GNOME" - -#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 +#: ../data/applications/gnome-mag.desktop.in.h:1 msgid "GNOME Screen Magnifier" msgstr "Lupa obrazovky GNOME" -#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 +#: ../data/applications/gnome-mag.desktop.in.h:2 msgid "Magnify parts of the screen" msgstr "Zväčšiť časti obrazovky" -#: ../data/greeter-autostart/gok.desktop.in.h:1 +#: ../data/applications/gnome-shell.desktop.in.h:1 +msgid "GNOME Shell" +msgstr "GNOME Shell" + +#: ../data/applications/gnome-shell.desktop.in.h:2 +msgid "Window management and compositing" +msgstr "Správa a kompozícia okien" + +#: ../data/applications/gok.desktop.in.h:1 msgid "GNOME On-Screen Keyboard" msgstr "Klávesnica na obrazovke GNOME" -#: ../data/greeter-autostart/gok.desktop.in.h:2 +#: ../data/applications/gok.desktop.in.h:2 msgid "Use an on-screen keyboard" msgstr "Použiť klávesnicu na obrazovke" -#: ../data/greeter-autostart/metacity.desktop.in.h:1 -msgid "Metacity" -msgstr "Metacity" - -#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 -msgid "Orca Screen Reader" -msgstr "Čítač obrazovky Orca" - -#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 -msgid "Present on-screen information as speech or braille" -msgstr "Poskytnúť informácie z obrazovky rečou alebo braillovým písmom" - -#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 -msgid "PolicyKit Authentication Agent" -msgstr "Agent overovania totožnosti PolicyKit" +#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 +msgid "Whether or not to allow fingerprint readers for login" +msgstr "Určuje, či povoliť alebo zakázať snímač odtlačku prsta pre prihlásenie" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 +msgid "" +"The login screen can optionally allow users who have enrolled their " +"fingerprints to log in using those prints." +msgstr "" +"Prihlasovacia obrazovka môže voliteľne povoliť prihlásenie používateľov na " +"základe odtlačku prstov, ktoré majú nasnímané pre prihlásenie." + +# DK: "smartcard" = čipová karta SmartCard +#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 +msgid "Whether or not to allow smartcard readers for login" +msgstr "" +"Určuje, či povoliť alebo zakázať čítačky čipových kariet smartcard pre " +"prihlásenie" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 +msgid "" +"The login screen can optionally allow users who have smartcards to log in " +"using those smartcards." +msgstr "" +"Prihlasovacia obrazovka môže voliteľne povoliť prihlásenie používateľov " +"pomocou čipových kariet smartcard." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 +msgid "Path to small image at top of user list" +msgstr "Cesta k malému obrázku navrchu zoznamu používateľov" + +# PM: propagácia sa mi nezdá byť vhodné slovo, skôr prezentácie +#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 +#, fuzzy +msgid "" +"The login screen can optionally show a small image at the top of its user " +"list to provide site administrators and distributions a way to provide " +"branding." +msgstr "" +"Prihlasovacia obrazovka môže voliteľne zobraziť obrázok navrchu zoznamu " +"používateľov a poskytnúť tak miesto pre propagáciu správcov a distribúcií." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 +#, fuzzy +msgid "" +"The fallback login screen can optionally show a small image at the top of " +"its user list to provide site administrators and distributions a way to " +"provide branding." +msgstr "" +"Núdzová prihlasovacia obrazovka môže voliteľne zobraziť malý obrázok navrchu " +"zoznamu používateľov a poskytnúť tak miesto pre propagáciu správcov a " +"distribúcií." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 +msgid "Avoid showing user list" +msgstr "Zabrániť zobrazeniu zoznamu používateľov" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 +msgid "" +"The login screen normally shows a list of available users to log in as. This " +"setting can be toggled to disable showing the user list." +msgstr "" +"Prihlasovacia obrazovka obvykle zobrazuje zoznam dostupných prihlásiteľných " +"používateľov. Týmto nastavením môže byť zobrazenie zoznamu používateľov " +"zakázané." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 +msgid "Enable showing the banner message" +msgstr "Povoliť zobrazenie uvítacej správy" + +# PK: prekladame true a false? viackrat +# DK: ja by som neprekladal +#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 +msgid "Set to true to show the banner message text." +msgstr "Nastavte na true, ak chcete zobraziť text uvítacej správy." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 +msgid "Banner message text" +msgstr "Text uvítacej správy" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 +msgid "Text banner message to show in the login window." +msgstr "Textová uvítacia správa zobrazená v prihlasovacom okne." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 +msgid "Disable showing the restart buttons" +msgstr "Zakázať zobrazenie tlačidiel reštartu" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 +msgid "Set to true to disable showing the restart buttons in the login window." +msgstr "" +"Nastavte na true, ak chcete v prihlasovacej obrazovke zakázať zobrazovanie " +"tlačidiel na reštartovanie." + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 +msgid "Number of allowed authentication failures" +msgstr "Počet povolených zlyhaní overení totožnosti" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 +msgid "" +"The number of times a user is allowed to attempt authentication, before " +"giving up and going back to user selection." +msgstr "" +"Počet overení totožnosti, o ktoré sa môže používateľ pokúsiť pred návratom k " +"výberu používateľa." + +#: ../gui/libgdm/gdm-user-switching.c:72 +msgid "Unable to create transient display: " +msgstr "Nepodarilo sa vytvoriť prechodovú obrazovku: " + +#: ../gui/libgdm/gdm-user-switching.c:183 +#: ../gui/libgdm/gdm-user-switching.c:395 +msgid "Unable to activate session: " +msgstr "Nepodarilo sa aktivovať reláciu: " + +#: ../gui/libgdm/gdm-user-switching.c:344 +#: ../gui/libgdm/gdm-user-switching.c:512 ../utils/gdmflexiserver.c:446 +#: ../utils/gdmflexiserver.c:613 +#, c-format +msgid "Could not identify the current session." +msgstr "Nepodarilo sa identifikovať aktuálnu reláciu." + +#: ../gui/libgdm/gdm-user-switching.c:351 ../utils/gdmflexiserver.c:453 +#, c-format +msgid "User unable to switch sessions." +msgstr "Používateľovi sa nepodarilo prepnúť relácie." + +#: ../gui/libgdm/gdm-user-switching.c:521 ../utils/gdmflexiserver.c:622 +#, c-format +msgid "Could not identify the current seat." +msgstr "Nepodarilo sa rozpoznať aktuálne sedenie." + +#: ../gui/libgdm/gdm-user-switching.c:531 ../utils/gdmflexiserver.c:632 +#, c-format +msgid "" +"The system is unable to determine whether to switch to an existing login " +"screen or start up a new login screen." +msgstr "" +"Systém nie je schopný zistiť, či má prepnúť na existujúcu prihlasovaciu " +"obrazovku alebo spustiť novú prihlasovaciu obrazovku." + +#: ../gui/libgdm/gdm-user-switching.c:539 ../utils/gdmflexiserver.c:640 +#, c-format +msgid "The system is unable to start up a new login screen." +msgstr "Systém nie je schopný spustiť novú prihlasovaciu obrazovku." #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Zvoľte systém" +# PM: ja by som buffer preložil ako komunikačnú schránku +# PM: teraz to vyznieva akoby XDMCP bol názov toho bufferu. dal by som tam nejaké slovo napr "pre XDMCP" #: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 +#, fuzzy msgid "XDMCP: Could not create XDMCP buffer!" msgstr "XDMCP: Nepodarilo sa vytvoriť medzipamäť XDMCP!" @@ -519,6 +535,127 @@ msgid "XDMCP: Could not read XDMCP header!" msgstr "XDMCP: Nepodarilo sa prečítať hlavičku XDMCP!" +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 +msgid "XMDCP: Incorrect XDMCP version!" +msgstr "XDMCP: Nesprávna verzia XDMCP!" + +#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 +msgid "XMDCP: Unable to parse address" +msgstr "XMDCP: Analýza adresy zlyhala" + +#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 +msgid "Fingerprint Authentication" +msgstr "Overenie totožnosti pomocou odtlačku prsta" + +#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 +msgid "Log into session with fingerprint" +msgstr "Prihlásiť do relácie pomocou odtlačku prsta" + +#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 +msgid "Password Authentication" +msgstr "Overenie totožnosti pomocou hesla" + +#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 +msgid "Log into session with username and password" +msgstr "Prihlásiť do relácie pomocou používateľského mena a hesla" + +# DK: hlavicka nad pouzivatelmi v prihlasovacom okne +#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 +#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 +msgid "Log In" +msgstr "Prihlásenie" + +# PM: Identifikátor slotu +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 +#, fuzzy +msgid "Slot ID" +msgstr "Slot identifikátora" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 +msgid "The slot the card is in" +msgstr "Slot, v ktorom je vložená karta" + +# PM: séria? to je čo? +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 +#, fuzzy +msgid "Slot Series" +msgstr "Séria slotu" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 +msgid "per-slot card identifier" +msgstr "" + +# PK: mal by to byt nazov podla zdrojaku, ale prever +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 +msgid "name" +msgstr "názov" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 +msgid "Module" +msgstr "Modul" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 +msgid "smartcard driver" +msgstr "ovládač pre smartcard" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 +msgid "Smartcard Authentication" +msgstr "Overenie totožnosti pomocou čipovej karty smartcard" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 +msgid "Log into session with smartcard" +msgstr "Prihlásiť do relácie pomocou čipovej karty smartcard" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 +msgid "Module Path" +msgstr "Cesta modulu" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 +msgid "path to smartcard PKCS #11 driver" +msgstr "cesta k ovládaču čipovej karty smartcard PKCS #11" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 +msgid "received error or hang up from event source" +msgstr "prijatá chyba alebo ukončenie zo zdrojovej udalosti" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 +#, c-format +msgid "NSS security system could not be initialized" +msgstr "nepodarilo sa spustiť bezpečnostný systém NSS" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 +#, c-format +msgid "no suitable smartcard driver could be found" +msgstr "nepodarilo sa nájsť vhodný ovládač pre čipovú kartu smartcard" + +# PK: pouzivaj spravne uvodzovky +# DK: ja ine na klavesnici nemam :-P +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 +#, c-format +msgid "smartcard driver '%s' could not be loaded" +msgstr "nepodarilo sa načítať ovládač „%s“ pre čipovú kartu smartcard" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 +#, c-format +msgid "could not watch for incoming card events - %s" +msgstr "nepodarilo sa sledovať prichádzajúce udalosti z karty - %s" + +#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 +#, c-format +msgid "encountered unexpected error while waiting for smartcard events" +msgstr "" +"nastala neočakávaná chyba pri čakaní na udalosti z čipovej karty smartcard" + +#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 +msgid "Authentication" +msgstr "Overenie totožnosti" + +#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 +msgid "Log into session" +msgstr "Prihlásiť do relácie" + #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 msgid "Value" msgstr "Hodnota" @@ -544,11 +681,15 @@ msgid "The text to use in the label if the user has picked an item" msgstr "Text použitý v popise, ak si už používateľ zvolil nejakú položku" +# PM: asi viditeľný zozmam/ viditeľnosť zoznamu #: ../gui/simple-greeter/gdm-chooser-widget.c:1484 +#, fuzzy msgid "List Visible" msgstr "Zoznam viditeľný" +# zoznam pre výber #: ../gui/simple-greeter/gdm-chooser-widget.c:1485 +#, fuzzy msgid "Whether the chooser list is visible" msgstr "Či je viditeľný vyberací zoznam" @@ -582,100 +723,69 @@ msgid "%a %l:%M %p" msgstr "%H:%M, %a" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 msgid "Automatically logging in…" msgstr "Prebieha automatické prihlásenie…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 -msgid "Select language and click Log In" -msgstr "Zvoľte jazyk a kliknite na Prihlásiť" - #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 msgid "Cancelling…" msgstr "Ruší sa…" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 +#. just wait for the user to select language and stuff +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 +msgid "Select language and click Log In" +msgstr "Zvoľte jazyk a kliknite na Prihlásiť" + +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 msgctxt "customsession" msgid "Custom" msgstr "Vlastná" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 msgid "Custom session" msgstr "Vlastná relácia" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -msgid "Cancel" -msgstr "Zrušiť" - -#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 msgid "Computer Name" msgstr "Názov počítača" +#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 +msgid "Version" +msgstr "Verzia" + #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 -msgid "Login" -msgstr "Prihlásiť" +msgid "Cancel" +msgstr "Zrušiť" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 msgid "Unlock" msgstr "Odomknúť" #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 -msgid "Version" -msgstr "Verzia" +msgid "Login" +msgstr "Prihlásiť" -#: ../gui/simple-greeter/gdm-greeter-panel.c:907 +#: ../gui/simple-greeter/gdm-greeter-panel.c:953 msgid "Suspend" msgstr "Uspať" -#: ../gui/simple-greeter/gdm-greeter-panel.c:912 +#: ../gui/simple-greeter/gdm-greeter-panel.c:958 msgid "Restart" msgstr "Reštartovať" -#: ../gui/simple-greeter/gdm-greeter-panel.c:916 +#: ../gui/simple-greeter/gdm-greeter-panel.c:962 msgid "Shut Down" msgstr "Vypnúť" -#: ../gui/simple-greeter/gdm-greeter-panel.c:965 +#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 msgid "Unknown time remaining" msgstr "Zostávajúci čas je neznámy" -#: ../gui/simple-greeter/gdm-greeter-panel.c:987 +#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 msgid "Panel" msgstr "Panel" -#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 -msgid "Languages" -msgstr "Jazyky" - -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 -msgid "_Languages:" -msgstr "_Jazyky:" - -#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 -msgid "_Language:" -msgstr "_Jazyk:" - -#. translators: This brings up a dialog -#. * with a list of languages to choose from -#. -#: ../gui/simple-greeter/gdm-language-option-widget.c:231 -msgctxt "language" -msgid "Other…" -msgstr "Ďalšie…" - -#: ../gui/simple-greeter/gdm-language-option-widget.c:232 -msgid "Choose a language from the full list of available languages." -msgstr "Zvoľte si jazyk z úplného zoznamu dostupných jazykov." - -#: ../gui/simple-greeter/gdm-language-option-widget.c:262 -msgid "Language" -msgstr "Jazyk" - -#: ../gui/simple-greeter/gdm-languages.c:709 -msgid "Unspecified" -msgstr "Nešpecifikovaný" - #: ../gui/simple-greeter/gdm-option-widget.c:505 msgid "Label Text" msgstr "Text popisu" @@ -700,14 +810,6 @@ msgid "The ID of the default item" msgstr "Identifikátor predvolenej položky" -#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 -msgid "Max Item Count" -msgstr "Maximálny počet položiek" - -#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 -msgid "The maximum number of items to keep around in the list" -msgstr "Maximálny počet položiek ponechaných v zozname" - #: ../gui/simple-greeter/gdm-remote-login-window.c:188 #, c-format msgid "Remote Login (Connecting to %s…)" @@ -726,184 +828,32 @@ msgid "Session" msgstr "Relácia" -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 -msgid "Banner message text" -msgstr "Text uvítacej správy" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 -msgid "Banner message text when chooser is empty" -msgstr "Text uvítacej správy, keď je vyberací zoznam prázdny" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 -msgid "Disable showing the restart buttons" -msgstr "Zakázať zobrazenie tlačidiel reštartu" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 -msgid "Do not show known users in the login window" -msgstr "Nezobrazovať známych používateľov v prihlasovacom okne" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 -msgid "Enable accessibility keyboard plugin" -msgstr "Povoliť modul sprístupnenia klávesnice" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 -msgid "Enable on-screen keyboard" -msgstr "Povoliť klávesnicu na obrazovke" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 -msgid "Enable screen magnifier" -msgstr "Povoliť lupu obrazovky" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 -msgid "Enable screen reader" -msgstr "Povoliť čítač obrazovky" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 -msgid "Enable showing the banner message" -msgstr "Povoliť zobrazenie uvítacej správy" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 -msgid "Icon name to use for greeter logo" -msgstr "Názov ikony použitej ako logo uvítania" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 -msgid "Recently selected languages" -msgstr "Nedávno zvolené jazyky" - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 -msgid "Set to a list of languages to be shown by default in the login window." -msgstr "" -"Nastavte na zoznam jazykov, ktorý sa predvolene zobrazí v prihlasovacej " -"obrazovke." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 -msgid "Set to the themed icon name to use for the greeter logo." -msgstr "" -"Nastavte na názov témovateľnej ikony, ktorá sa má použiť ako logo uvítania." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 -msgid "Set to true to disable showing known users in the login window." -msgstr "" -"Nastavte na true, ak chcete v prihlasovacej obrazovke zakázať zobrazovanie " -"známych používateľov." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 -msgid "Set to true to disable showing the restart buttons in the login window." -msgstr "" -"Nastavte na true, ak chcete v prihlasovacej obrazovke zakázať zobrazovanie " -"tlačidiel pre reštartovanie." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 -msgid "Set to true to enable the XRandR settings manager plugin." -msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení XRandR." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 -msgid "Set to true to enable the background settings manager plugin." -msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení pozadia." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 -msgid "Set to true to enable the media-keys settings manager plugin." -msgstr "" -"Nastavte na true, ak chcete povoliť modul správy nastavení multimediálnych " -"kláves." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 -msgid "Set to true to enable the on-screen keyboard." -msgstr "Nastavte na true, ak chcete povoliť klávesnicu na obrazovke." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 -msgid "" -"Set to true to enable the plugin to manage the accessibility keyboard " -"settings." -msgstr "" -"Nastavte na true, ak chcete povoliť modul nastavení sprístupnenia klávesnice." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 -msgid "Set to true to enable the screen magnifier." -msgstr "Nastavte na true, ak chcete povoliť lupu obrazovky." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 -msgid "Set to true to enable the screen reader." -msgstr "Nastavte na true, ak chcete povoliť čítač obrazovky." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 -msgid "Set to true to enable the sound settings manager plugin." -msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení zvuku." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 -msgid "Set to true to enable the xsettings settings manager plugin." -msgstr "Nastavte na true, ak chcete povoliť modul správy nastavení xsettings." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 -msgid "Set to true to show the banner message text." -msgstr "Nastavte na true, ak chcete zobraziť text uvítacej správy." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 -msgid "Set to true to use Compiz as the window manager." -msgstr "Nastavte na true, ak chcete použiť Compiz ako správcu okien." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 -msgid "" -"Text banner message to show in the login window when the user chooser is " -"empty, instead of banner_message_text." -msgstr "" -"Textová uvítacia správa zobrazená v prihlasovacom okne namiesto hodnoty " -"banner_message_text, keď je vyberací zoznam používateľov prázdny." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 -msgid "Text banner message to show in the login window." -msgstr "Textová uvítacia správa zobrazená v prihlasovacom okne." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 -msgid "True if the XRandR settings manager plugin is enabled." -msgstr "Ak je true, modul správy nastavení XRandR je povolený." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 -msgid "True if the background settings manager plugin is enabled." -msgstr "Ak je true, modul správy nastavení pozadia je povolený." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 -msgid "True if the media-keys settings manager plugin is enabled." -msgstr "Ak je true, modul správy nastavení multimediálnych kláves je povolený." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 -msgid "True if the sound settings manager plugin is enabled." -msgstr "Ak je true, modul správy nastavení zvuku je povolený." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 -msgid "True if the xsettings settings manager plugin is enabled." -msgstr "Ak je true, modul správy nastavení xsettings je povolený." - -#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 -msgid "Use Compiz as the window manager" -msgstr "Použiť Compiz ako správcu okien" - -#: ../gui/simple-greeter/gdm-timer.c:149 +#: ../gui/simple-greeter/gdm-timer.c:147 msgid "Duration" msgstr "Trvanie" -#: ../gui/simple-greeter/gdm-timer.c:150 +#: ../gui/simple-greeter/gdm-timer.c:148 msgid "Number of seconds until timer stops" msgstr "Počet sekúnd do zastavenia časovača" -#: ../gui/simple-greeter/gdm-timer.c:157 +#: ../gui/simple-greeter/gdm-timer.c:155 msgid "Start time" msgstr "Čas spustenia" -#: ../gui/simple-greeter/gdm-timer.c:158 +#: ../gui/simple-greeter/gdm-timer.c:156 msgid "Time the timer was started" msgstr "Čas, kedy bol časovač spustený" -#: ../gui/simple-greeter/gdm-timer.c:165 +#: ../gui/simple-greeter/gdm-timer.c:163 msgid "Is it Running?" msgstr "Beží?" -#: ../gui/simple-greeter/gdm-timer.c:166 +#: ../gui/simple-greeter/gdm-timer.c:164 msgid "Whether the timer is currently ticking" msgstr "Či časovač momentálne tiká" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 #, c-format msgid "Log in as %s" msgstr "Prihlásiť sa ako %s" @@ -913,536 +863,77 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 msgctxt "user" msgid "Other…" msgstr "Ďalší…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgid "Choose a different account" msgstr "Zvoľte iný účet" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 +# DK: guest prekladam ako klient miesto hosť +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 msgid "Guest" -msgstr "Návštevník" +msgstr "Hosť" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Log in as a temporary guest" -msgstr "Prihlásiť sa ako dočasný návštevník" +msgstr "Prihlásiť sa ako dočasný hosť" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 msgid "Automatic Login" msgstr "Automatické prihlásenie" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatically log into the system after selecting options" -msgstr "Automaticky prihlásiť do systému po zvolení možností" +msgstr "Automaticky prihlásiť do systému po výbere volieb" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 msgid "Currently logged in" msgstr "Už je prihlásený" -#: ../utils/gdmflexiserver.c:61 +#: ../utils/gdmflexiserver.c:64 msgid "Only the VERSION command is supported" msgstr "Podporovaný je len príkaz VERSION" -#: ../utils/gdmflexiserver.c:61 +#: ../utils/gdmflexiserver.c:64 msgid "COMMAND" msgstr "PRÍKAZ" -#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 +# PM: asi kvôli kompatibilite #: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 +#: ../utils/gdmflexiserver.c:68 ../utils/gdmflexiserver.c:69 +#, fuzzy msgid "Ignored — retained for compatibility" msgstr "Ignorované — ponechané pre kompatibilitu" -#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 +# PM: výstup pre ladenie +#: ../utils/gdmflexiserver.c:67 ../utils/gdm-screenshot.c:43 +#, fuzzy msgid "Debugging output" msgstr "Ladiaci výstup" -#: ../utils/gdmflexiserver.c:68 +#: ../utils/gdmflexiserver.c:71 msgid "Version of this application" msgstr "Verzia tejto aplikácie" -#: ../utils/gdmflexiserver.c:675 -#, c-format -msgid "Could not identify the current session." -msgstr "Nepodarilo sa identifikovať aktuálnu reláciu." - #. Option parsing -#: ../utils/gdmflexiserver.c:711 +#: ../utils/gdmflexiserver.c:706 msgid "- New GDM login" msgstr "- Nové prihlásenie GDM" -#: ../utils/gdmflexiserver.c:767 +#: ../utils/gdmflexiserver.c:762 msgid "Unable to start new display" -msgstr "Nie je možné spustiť nový displej" +msgstr "Nepodarilo sa spustiť nový displej" #: ../utils/gdm-screenshot.c:212 msgid "Screenshot taken" msgstr "Obrazovka zosnímaná" +# PM: je to asi nejaký popis volby, asi Vytvorí snímok obrazovky - prever to #. Option parsing #: ../utils/gdm-screenshot.c:279 +#, fuzzy msgid "Take a picture of the screen" msgstr "Odfotiť obrazovku" - -#~| msgid "Shutdown Options..." -#~ msgid "Shutdown Options…" -#~ msgstr "Možnosti vypnutia…" - -#~ msgid "Keyboard layouts" -#~ msgstr "Rozloženia klávesnice" - -#~ msgid "_Keyboard:" -#~ msgstr "_Klávesnica:" - -#, fuzzy -#~| msgid "Other" -#~ msgctxt "keyboard" -#~ msgid "Other…" -#~ msgstr "Ďalší" - -#~ msgid "Choose a keyboard layout from the full list of available layouts." -#~ msgstr "" -#~ "Zvoľte si rozloženie klávesnice z úplného zoznamu dostupných rozložení." - -#~| msgid "_Keyboard:" -#~ msgid "Keyboard" -#~ msgstr "Klávesnica" - -#~ msgid "Recently selected keyboard layouts" -#~ msgstr "Nedávno zvolené rozloženia klávesnice" - -#~| msgid "" -#~| "Set to a list of keyboard layouts to be shown by default at the login " -#~| "window." -#~ msgid "" -#~ "Set to a list of keyboard layouts to be shown by default in the login " -#~ "window." -#~ msgstr "" -#~ "Nastavte na zoznam rozložení klávesnice, ktorý sa predvolene zobrazí v " -#~ "prihlasovacej obrazovke." - -#~ msgid "" -#~ "The User Switch Applet 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." -#~ msgstr "" -#~ "Prepínač používateľov je slobodný softvér; môžete ho ďalej šíriť a/alebo " -#~ "modifikovať v súlade so znením Všeobecnej verejnej licencie GNU tak, ako " -#~ "bola vydaná organizáciou Free Software Foundation, a to buď verzie 2\n" -#~ "tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskoršej " -#~ "verzie." - -#~ msgid "" -#~ "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." -#~ msgstr "" -#~ "Tento program je rozširovaný v nádeji, že bude užitočný, avšak BEZ " -#~ "AKEJKOĽVEK ZÁRUKY; Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI " -#~ "alebo VHODNOSTI PRE URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte vo " -#~ "Všeobecnej verejnej licencii GNU." - -#~ msgid "" -#~ "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., " -#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " -#~ msgstr "" -#~ "Kópiu Všeobecnej verejnej licencie GNU ste mali dostať spolu s týmto\n" -#~ "programom; ak sa tak nestalo, napíšte na Free Software Foundation, Inc.,\n" -#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " - -#~ msgid "A menu to quickly switch between users." -#~ msgstr "Ponuka na rýchle prepnutie medzi používateľmi." - -#~ msgid "translator-credits" -#~ msgstr "" -#~ "Pavol Šimo \n" -#~ "Marcel Telka " - -#~ msgid "Can't lock screen: %s" -#~ msgstr "Nie je možné uzamknúť obrazovku: %s" - -#~ msgid "Can't temporarily set screensaver to blank screen: %s" -#~ msgstr "" -#~ "Nie je možné dočasne nastaviť šetrič obrazovky na prázdnu obrazovku: %s" - -#~| msgid "Can't logout: %s" -#~ msgid "Can't log out: %s" -#~ msgstr "Nie je možné odhlásiť sa: %s" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#~ msgid "Available" -#~ msgstr "Prítomný" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#~ msgid "Invisible" -#~ msgstr "Neviditeľný" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#~ msgid "Busy" -#~ msgstr "Zaneprázdnený" - -# je to stav (presence) používateľa (%s (%s), pričom prvé %s je meno, druhé tento stav) -#~ msgid "Away" -#~ msgstr "Neprítomný" - -#~ msgid "Account Information" -#~ msgstr "Informácie o účte" - -#~ msgid "System Preferences" -#~ msgstr "Nastavenia systému" - -#~ msgid "Lock Screen" -#~ msgstr "Uzamknúť obrazovku" - -#~ msgid "Switch User" -#~ msgstr "Prepnúť používateľa" - -#~ msgid "Unknown" -#~ msgstr "Neznámy" - -#~ msgid "User Switch Applet" -#~ msgstr "Aplet Prepínač používateľov" - -#~ msgid "Change account settings and status" -#~ msgstr "Zmeniť nastavenia účtu a stav" - -#~ msgid "A menu to quickly switch between users" -#~ msgstr "Ponuka na rýchle prepnutie medzi používateľmi" - -#~ msgid "User Switcher" -#~ msgstr "Prepínač používateľov" - -#~ msgid "User Switcher Applet Factory" -#~ msgstr "Vytváracie rozhranie pre aplet Prepínač používateľov" - -#~ msgid "Edit Personal _Information" -#~ msgstr "Upraviť osobné _informácie" - -#~ msgid "_About" -#~ msgstr "_O programe" - -#~ msgid "_Edit Users and Groups" -#~ msgstr "Upra_viť používateľov a skupiny" - -#~ msgid "Couldn't set groupid to 0" -#~ msgstr "Nepodarilo sa nastaviť groupid na 0" - -#~ msgid "%x" -#~ msgstr "%x" - -#~ msgctxt "language" -#~ msgid "Other..." -#~ msgstr "Ďalšie..." - -#~ msgctxt "keyboard" -#~ msgid "Other..." -#~ msgstr "Ďalšie..." - -#~ msgid "Manager" -#~ msgstr "Správca" - -#~ msgid "The user manager object this user is controlled by." -#~ msgstr "Objekt správcu používateľov, ktorým je tento používateľ riadený." - -#~ msgctxt "user" -#~ msgid "Other..." -#~ msgstr "Ďalšie..." - -#~ msgid "Quit..." -#~ msgstr "Ukončiť..." - -#~ msgid "Enable debugging code" -#~ msgstr "Povoliť ladiaci kód" - -#~ msgid "id" -#~ msgstr "id" - -#~ msgid "%a %b %e" -#~ msgstr "%a %e. %b" - -#~ msgid "%1$s, %2$s" -#~ msgstr "%2$s, %1$s" - -#~ msgid "Authentication Dialog" -#~ msgstr "Dialógové okno overenia totožnosti" - -#~ msgid "Enable debugging" -#~ msgstr "Povoliť ladenie" - -#~ msgid "Enable debugging mode for the greeter." -#~ msgstr "Povoliť ladiaci režim pre uvítaciu obrazovku." - -#~ msgid "worker exited with status %d" -#~ msgstr "spracovávač skončil so stavom %d" - -#~ msgid "Unable establish credentials" -#~ msgstr "Nepodarilo sa vytvoriť poverenia" - -#~ msgid "Failed to restart computer" -#~ msgstr "Reštartovanie počítača zlyhalo" - -#~ msgid "" -#~ "You are not allowed to restart the computer because multiple users are " -#~ "logged in" -#~ msgstr "" -#~ "Nemôžete reštartovať počítač, lebo je prihlásených viac používateľov" - -#~ msgid "Failed to stop computer" -#~ msgstr "Vypnutie počítača zlyhalo" - -#~ msgid "" -#~ "You are not allowed to stop the computer because multiple users are " -#~ "logged in" -#~ msgstr "Nemôžete vypnúť počítač, lebo je prihlásených viac používateľov" - -#~ msgid "page 5" -#~ msgstr "page 5" - -#~ msgid "You have the Caps Lock key on." -#~ msgstr "Máte zapnuté písanie veľkých písmen (Caps Lock)." - -#~ msgid "User" -#~ msgstr "Používateľ" - -#~ msgid "The user this menu item represents." -#~ msgstr "Používateľ, ktorého reprezentuje táto položka ponuky." - -#~ msgid "Icon Size" -#~ msgstr "Veľkosť ikony" - -#~ msgid "The size of the icon to use." -#~ msgstr "Aká veľkosť ikony sa má použiť." - -#~ msgid "Indicator Size" -#~ msgstr "Veľkosť indikátora" - -#~ msgid "Size of check indicator" -#~ msgstr "Veľkosť políčka indikátora" - -#~ msgid "Indicator Spacing" -#~ msgstr "Medzera indikátora" - -#~ msgid "Space between the username and the indicator" -#~ msgstr "Medzera medzi indikátorom a menom používateľa" - -#~ msgid "Main Options" -#~ msgstr "Hlavné voľby" - -#~ msgid "_Help" -#~ msgstr "_Pomocník" - -#~ msgid "user account not available on system" -#~ msgstr "používateľské konto nie je v systéme k dispozícií" - -#~ msgid "Accessibility Preferences" -#~ msgstr "Nastavenia prístupnosti" - -#~ msgid "Enable features that make your computer easier to use:" -#~ msgstr "Povoliť funkcie, ktoré spravia váš počítač ľahšie dostupným:" - -#~ msgid "Assistive Technology Preferences" -#~ msgstr "Nastavenia asistenčných technológií" - -#~ msgid "_Hear text read aloud (Reader)" -#~ msgstr "_Počúvať text nahlas (Čítanie obrazovky)" - -#~ msgid "_Ignore duplicate keypresses (Bounce Keys)" -#~ msgstr "_Ignorovať opakované stlačenia kláves (Odmietnuté klávesy)" - -#~ msgid "_Make items larger (Magnifier)" -#~ msgstr "_Zväčšiť detaily (Lupa)" - -#~ msgid "_Only accept long held keypresses (Slow Keys)" -#~ msgstr "_Akceptovať iba dlhé stlačenie kláves (Pomalé klávesy)" - -#~ msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)" -#~ msgstr "_Simulovať súčasné stlačenie kláves (Lepkavé klávesy)" - -#~ msgid "_See more contrast in colors (High Contrast)" -#~ msgstr "_Rozoznať väčšie kontrasty vo farbách (Vysoký kontrast)" - -#~ msgid "_Type without the keyboard (On-screen Keyboard)" -#~ msgstr "Písať _bez klávesnice (Klávesnica na obrazovke)" - -#~ msgid "_Use a larger font size (Large Print)" -#~ msgstr "Po_užiť väčšiu veľkosť písma (Veľké písmo)" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-disconnect" -#~ msgstr "gtk-disconnect" - -#~ msgid "Disable showing the accessibility button" -#~ msgstr "Zakázať zobrazenie tlačidla prístupnosti" - -#~ msgid "" -#~ "Set to TRUE to disable showing the accessibility button in the login " -#~ "window." -#~ msgstr "" -#~ "Ak je TRUE, tlačidlo nastavenia sprístupnenia klávesnice sa nezobrazí" - -#~ msgid "_Users:" -#~ msgstr "Po_užívatelia:" - -#~ msgid "_User:" -#~ msgstr "Po_užívateľ:" - -#~ msgid "Missing Required File" -#~ msgstr "Chýba potrebný súbor" - -#~ msgid "" -#~ "The User Selector's interfaces file, `%s', could not be opened. It is " -#~ "likely that this application was not properly installed or configured." -#~ msgstr "" -#~ "Súbor s rozhraniami Prepínača používateľov, `%s', nie je možné otvoriť. " -#~ "Pravdepodobne táto aplikácia nebola korektne nainštalovaná alebo " -#~ "nastavená." - -#~ msgid "Multiple Logins Found" -#~ msgstr "" -#~ "Našlo sa viacero prihlásení" - -#~ msgid "Appearance" -#~ msgstr "Vzhľad" - -#~ msgid "Continue" -#~ msgstr "Pokračovať" - -#~ msgid "Create new logins in _nested windows" -#~ msgstr "Nové prihlásenia vo v_norených oknách" - -#~ msgid "Details" -#~ msgstr "Podrobnosti" - -#~ msgid "Multiple Logins Found - User Switcher" -#~ msgstr "Našlo sa viacero prihlásení - Prepínač používateľov" - -#~ msgid "Options" -#~ msgstr "Možnosti" - -#~ msgid "Some preferences have been locked by the system adminstrator." -#~ msgstr "Niektoré nastavenia boli uzamknuté správcom systému." - -#~ msgid "" -#~ "The user you want to switch to is logged in multiple times on this " -#~ "computer. Which login do you want to switch to?" -#~ msgstr "" -#~ "Používateľ, na ktorého sa chcete prepnúť, je na tomto počítači prihlásený " -#~ "viackrát. Do ktorého prihlásenia sa chcete prepnúť?" - -#~ msgid "Use the `people' icon for the menu title" -#~ msgstr "Použije ikonku `ľudia' ako titulok ponuky" - -#~ msgid "Use the current user's name for the menu title" -#~ msgstr "Použije meno aktuálneho používateľa ako titulok ponuky" - -#~ msgid "Use the word `Users' as the menu title" -#~ msgstr "Použije slovo `Používatelia' ako titulok ponuky" - -#~ msgid "User Switcher Error" -#~ msgstr "Chyba Prepínača používateľov" - -#~ msgid "User Switcher Preferences" -#~ msgstr "Nastavenie Prepínača používateľov" - -#~ msgid "Users" -#~ msgstr "Používatelia" - -#~ msgid "" -#~ "When a new login must be created to switch users, create it in a window " -#~ "instead of on a new screen" -#~ msgstr "" -#~ "Ak má byť na prepnutie používateľov vytvorené nové prihlásenie, vytvorí " -#~ "sa v novom okne namiesto na novej obrazovke" - -#~ msgid "" -#~ "When changing to a different display, activate the screensaver for this " -#~ "display." -#~ msgstr "Po zmene obrazovky, aktivovať na tejto šetrič obrazovky." - -#~ msgid "_Lock the screen after switching users" -#~ msgstr "_Uzamknúť obrazovku po prepnutí používateľov" - -#~ msgid "Send the specified protocol command to GDM" -#~ msgstr "Odoslať GDM zadaný príkaz protokolu" - -#~ msgid "Xnest mode" -#~ msgstr "Režim Xnest" - -#~ msgid "Do not lock current screen" -#~ msgstr "Nezamykať aktuálnu obrazovku" - -#~ msgid "Authenticate before running --command" -#~ msgstr "Overiť sa pred spustením --command" - -#~ msgid "Start new flexible session; do not show popup" -#~ msgstr "Spustiť nové flexibilné sedenie; nezobraziť vyskakovacie okno" - -#~ msgid "Display Style" -#~ msgstr "Štýl zobrazenia" - -#~ msgid "Show \"Login Window\" Menuitem" -#~ msgstr "Zobraziť v ponuke položku \"Prihlásiť v okne\"" - -#~ msgid "Show \"Other\" Menuitem" -#~ msgstr "Zobraziť v ponuke položku \"Ďalší\"" - -#~ msgid "Show Active Users Only" -#~ msgstr "Zobraziť iba aktívnych používateľov" - -#~ msgid "" -#~ "Specifies how to display the applet in the panel. Use \"username\" to " -#~ "display the current user's name, \"icon\" to show the people icon, or " -#~ "\"text\" to use the word `Users.'" -#~ msgstr "" -#~ "Určuje spôsob zobrazenia apletu v paneli. Zvolením \"username\" sa " -#~ "zobrazuje meno aktuálne prihláseného používateľa, \"icon\" zobrazí ikonku " -#~ "ľudí, a nakoniec \"text\" zobrazí slovo `Používatelia'." - -#~ msgid "Use Xnest" -#~ msgstr "Použiť Xnest" - -#~ msgid "" -#~ "When to show the \"Login Window\" item. Possible values include: \"always" -#~ "\" to always show the item, \"never\" to never show the item, and \"auto" -#~ "\" (the default) to show the item when the applet is in Xnest mode." -#~ msgstr "" -#~ "Kedy zobraziť položku \"Prihlásiť v okne\". Možné hodnoty sú: \"always\" " -#~ "- vždy zobraziť, \"never\" - nezobraziť položku nikdy, a \"auto" -#~ "\" (predvolené) - zobraziť položku ak je aplet v režime Xnest." - -#~ msgid "" -#~ "When to show the \"Other\" item. Possible values include: \"always\" to " -#~ "always show the item, \"never\" to never show the item, and \"auto\" (the " -#~ "default) to show the item when the applet is in console (not Xnest) mode." -#~ msgstr "" -#~ "Kedy ukázať položku \"Ďalší\". Možné hodnoty zahŕňajú: \"always\" pre " -#~ "stále ukázanie položky, \"never\" pre neukázanie položky a \"auto" -#~ "\" (predvolené) pre ukázanie položky ak je aplet v konzolovom (nie Xnest) " -#~ "režime." - -#~ msgid "" -#~ "Whether or not to create new Xnest windows instead of spawning new " -#~ "consoles when switching users." -#~ msgstr "" -#~ "Určuje, či sa majú pri prepínaní užívateľov vytvárať vnorené Xnest okná " -#~ "namiesto vytvárania nových konzol." - -#~ msgid "" -#~ "Whether or not to lock the screen after switching to a different console." -#~ msgstr "Určuje, či uzamknúť plochu po prepnutí do inej konzoly." - -#~ msgid "" -#~ "Whether to show only users who are currently logged in, or all users." -#~ msgstr "" -#~ "Určuje, či zobraziť len aktuálne prihlásených používateľov, alebo " -#~ "všetkých." - -#~ msgid "_Setup Login Screen" -#~ msgstr "Na_staviť prihlasovaciu obrazovku" diff -Nru gdm-3.6.0/po/uk.po gdm-3.6.1/po/uk.po --- gdm-3.6.0/po/uk.po 2012-07-20 19:00:19.000000000 +0000 +++ gdm-3.6.1/po/uk.po 2012-10-03 22:03:41.000000000 +0000 @@ -5,14 +5,15 @@ # Oleksandr Kovalenko , 2009 # wanderlust , 2009. # Korostil Daniel , 2011, 2012. +# Re. , 2012. msgid "" msgstr "" "Project-Id-Version: gdm 2.5.90.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-18 17:43+0200\n" -"PO-Revision-Date: 2012-03-18 17:44+0300\n" -"Last-Translator: Korostil Daniel \n" -"Language-Team: translation@linux.org.ua\n" +"POT-Creation-Date: 2012-09-25 23:26+0300\n" +"PO-Revision-Date: 2012-09-25 23:43+0300\n" +"Last-Translator: Re. \n" +"Language-Team: linux.org.ua\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,107 +22,95 @@ "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.7.1\n" -#: ../common/gdm-common.c:488 +#: ../common/gdm-common.c:492 #, c-format msgid "/dev/urandom is not a character device" msgstr "/dev/urandom не є символьним пристроєм" -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 -msgid "Display ID" -msgstr "Ідентифікатор екрана" - -#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 -#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 -msgid "ID" -msgstr "Ідентифікатор" - -#: ../daemon/factory-slave-main.c:188 ../daemon/product-slave-main.c:192 -#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:194 -msgid "GNOME Display Manager Slave" -msgstr "Підлеглий менеджер стільниці GNOME" - #: ../daemon/gdm-display-access-file.c:300 #, c-format msgid "could not find user \"%s\" on system" msgstr "неможливо знайти користувача «%s» у системі" -#: ../daemon/gdm-factory-slave.c:210 ../daemon/gdm-simple-slave.c:314 -msgid "Unable to initialize login system" -msgstr "Неможливо запустити систему входу" - -#: ../daemon/gdm-factory-slave.c:244 ../daemon/gdm-simple-slave.c:352 -msgid "Unable to authenticate user" -msgstr "Не вдалось автентифікувати користувача" - -#: ../daemon/gdm-factory-slave.c:268 ../daemon/gdm-simple-slave.c:404 -msgid "Unable to authorize user" -msgstr "Неможливо авторизувати користувача" - -#: ../daemon/gdm-factory-slave.c:292 ../daemon/gdm-simple-slave.c:551 -msgid "Unable to establish credentials" -msgstr "Не вдалось встановити реєстраційні дані" - -#: ../daemon/gdm-factory-slave.c:317 ../daemon/gdm-simple-slave.c:589 -msgid "Unable to open session" -msgstr "Неможливо відкрити сеанс" +#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 +#, c-format +msgid "No session available yet" +msgstr "Поки що немає доступного сеансу" -#: ../daemon/gdm-factory-slave.c:709 ../daemon/gdm-product-slave.c:513 -#: ../daemon/gdm-simple-slave.c:1481 -msgid "" -"Could not start the X server (your graphical environment) due to an internal " -"error. Please contact your system administrator or check your syslog to " -"diagnose. In the meantime this display will be disabled. Please restart GDM " -"when the problem is corrected." -msgstr "" -"Не вдалось запустити сервер X (ваше графічне середовище) через внутрішню " -"помилку. Будь ласка, зверніться до системного адміністратора або перегляньте " -"системний журнал. Через деякий час цей дисплей буде вимкнено. Будь ласка, " -"перезавантажте GDM, коли проблема буде вирішено." +#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 +#, c-format +msgid "Unable to look up UID of user %s" +msgstr "Неможливо віднайти UID користувача %s" + +#: ../daemon/gdm-manager.c:291 +msgid "no sessions available" +msgstr "немає доступного сеансу" + +#: ../daemon/gdm-manager.c:352 +#, c-format +msgid "No sessions for %s available for reauthentication" +msgstr "Немає доступного сеансу %s для повторного розпізнавання" -#: ../daemon/gdm-server.c:258 +#: ../daemon/gdm-manager.c:406 +#, c-format +msgid "Unable to find session for user %s" +msgstr "Неможливо знайти сеанс для користувача %s" + +#: ../daemon/gdm-manager.c:476 +#, c-format +msgid "Unable to find appropriate session for user %s" +msgstr "Неможливо знайти відповідний сеанс для користувача %s" + +#: ../daemon/gdm-manager.c:671 +msgid "User doesn't own session" +msgstr "Користувач не володіє сеансом" + +#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 +msgid "No session available" +msgstr "Немає доступного сеансу" + +#: ../daemon/gdm-server.c:273 #, c-format msgid "%s: failed to connect to parent display '%s'" msgstr "%s: не вдалось з'єднатись з батьківським екраном «%s»" -#: ../daemon/gdm-server.c:436 +#: ../daemon/gdm-server.c:452 #, c-format msgid "Server was to be spawned by user %s but that user doesn't exist" msgstr "Сервер запущено користувачем %s, але цього користувача не існує" -#: ../daemon/gdm-server.c:447 ../daemon/gdm-server.c:467 -#: ../daemon/gdm-welcome-session.c:439 ../daemon/gdm-welcome-session.c:459 +#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 #, c-format msgid "Couldn't set groupid to %d" msgstr "Не вдалось встановити groupid для %d" -#: ../daemon/gdm-server.c:453 ../daemon/gdm-welcome-session.c:445 +#: ../daemon/gdm-server.c:469 #, c-format msgid "initgroups () failed for %s" msgstr "Помилка initgroups() для %s" -#: ../daemon/gdm-server.c:459 ../daemon/gdm-welcome-session.c:451 +#: ../daemon/gdm-server.c:475 #, c-format msgid "Couldn't set userid to %d" msgstr "Не вдалось встановити userid для %d" -#: ../daemon/gdm-server.c:506 +#: ../daemon/gdm-server.c:522 #, c-format msgid "%s: Could not open log file for display %s!" msgstr "%s: не вдалось відкрити файл журналу для екрана %s!" -#: ../daemon/gdm-server.c:517 ../daemon/gdm-server.c:523 -#: ../daemon/gdm-server.c:529 +#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 +#: ../daemon/gdm-server.c:545 #, c-format msgid "%s: Error setting %s to %s" msgstr "%s: помилка налаштування %s для %s" -#: ../daemon/gdm-server.c:549 +#: ../daemon/gdm-server.c:565 #, c-format msgid "%s: Server priority couldn't be set to %d: %s" msgstr "%s: Пріоритет сервера неможливо вказати для %d: %s" -#: ../daemon/gdm-server.c:702 +#: ../daemon/gdm-server.c:722 #, c-format msgid "%s: Empty server command for display %s" msgstr "%s: порожня команда програми сервера для екрана %s" @@ -150,159 +139,196 @@ msgid "The display device" msgstr "Пристрій показу" -#: ../daemon/gdm-session-worker.c:1106 +#: ../daemon/gdm-session.c:1184 +msgid "Could not create authentication helper process" +msgstr "Неможливо створити дію з помічника розпізнавання" + +#: ../daemon/gdm-session-worker.c:1029 #, c-format msgid "error initiating conversation with authentication system - %s" msgstr "помилка початкового обміну з системою автентифікації — %s" -#: ../daemon/gdm-session-worker.c:1107 +#: ../daemon/gdm-session-worker.c:1030 msgid "general failure" msgstr "загальна помилка" -#: ../daemon/gdm-session-worker.c:1108 +#: ../daemon/gdm-session-worker.c:1031 msgid "out of memory" msgstr "немає вільної пам'яті" -#: ../daemon/gdm-session-worker.c:1109 +#: ../daemon/gdm-session-worker.c:1032 msgid "application programmer error" msgstr "помилка програміста програми" -#: ../daemon/gdm-session-worker.c:1110 +#: ../daemon/gdm-session-worker.c:1033 msgid "unknown error" msgstr "невідома помилка" -#: ../daemon/gdm-session-worker.c:1117 +#: ../daemon/gdm-session-worker.c:1040 msgid "Username:" msgstr "Користувач:" -#: ../daemon/gdm-session-worker.c:1123 +#: ../daemon/gdm-session-worker.c:1046 #, c-format msgid "error informing authentication system of preferred username prompt: %s" msgstr "помилка сповіщення системи автентифікації запиту користувача: %s" -#: ../daemon/gdm-session-worker.c:1137 +#: ../daemon/gdm-session-worker.c:1060 #, c-format msgid "error informing authentication system of user's hostname: %s" msgstr "помилка сповіщення системи автентифікації назви вузла користувача: %s" -#: ../daemon/gdm-session-worker.c:1152 +#: ../daemon/gdm-session-worker.c:1077 #, c-format msgid "error informing authentication system of user's console: %s" msgstr "помилка сповіщення системи автентифікації консолі користувача: %s" -#: ../daemon/gdm-session-worker.c:1172 +#: ../daemon/gdm-session-worker.c:1101 #, c-format msgid "error informing authentication system of display string: %s" msgstr "помилка сповіщення системи автентифікації рядка екрана: %s" -#: ../daemon/gdm-session-worker.c:1187 +#: ../daemon/gdm-session-worker.c:1116 #, c-format msgid "error informing authentication system of display xauth credentials: %s" msgstr "" "помилка сповіщення системи автентифікації реєстрації даних екрана xauth: %s" -#: ../daemon/gdm-session-worker.c:1507 ../daemon/gdm-session-worker.c:1524 +#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 #, c-format msgid "no user account available" msgstr "недоступний обліковий запис користувача" -#: ../daemon/gdm-session-worker.c:1551 +#: ../daemon/gdm-session-worker.c:1490 msgid "Unable to change to user" msgstr "Неможливо змінити користувача" -#: ../daemon/gdm-welcome-session.c:413 +#: ../daemon/gdm-simple-slave.c:1374 +msgid "" +"Could not start the X server (your graphical environment) due to an internal " +"error. Please contact your system administrator or check your syslog to " +"diagnose. In the meantime this display will be disabled. Please restart GDM " +"when the problem is corrected." +msgstr "" +"Не вдалось запустити сервер X (ваше графічне середовище) через внутрішню " +"помилку. Будь ласка, зверніться до системного адміністратора або перегляньте " +"системний журнал. Через деякий час цей дисплей буде вимкнено. Будь ласка, " +"перезавантажте GDM, коли проблема буде вирішено." + +#: ../daemon/gdm-simple-slave.c:1415 +#, c-format +msgid "Can only be called before user is logged in" +msgstr "Можна тільки викликатись перед входом користувача" + +#: ../daemon/gdm-simple-slave.c:1425 #, c-format -msgid "User %s doesn't exist" -msgstr "Користувач %s не існує" +msgid "Caller not GDM" +msgstr "Викликач не GDM" -#: ../daemon/gdm-welcome-session.c:420 +#: ../daemon/gdm-simple-slave.c:1478 +msgid "User not logged in" +msgstr "Користувач не увійшов" + +#: ../daemon/gdm-xdmcp-chooser-slave.c:370 #, c-format -msgid "Group %s doesn't exist" -msgstr "Група %s не існує" +msgid "Currently, only one client can be connected at once" +msgstr "Наразі, тільки один клієнт можна з'єднати за раз" #: ../daemon/gdm-xdmcp-display-factory.c:604 msgid "Could not create socket!" msgstr "Не вдалось створити гніздо!" -#: ../daemon/main.c:237 ../daemon/main.c:250 +#: ../daemon/main.c:126 ../daemon/main.c:139 #, c-format msgid "Cannot write PID file %s: possibly out of disk space: %s" msgstr "Неможливо записати файл PID %s: можливо, немає місця на диску: %s" -#: ../daemon/main.c:271 +#: ../daemon/main.c:160 #, c-format msgid "Logdir %s does not exist or isn't a directory." msgstr "Каталог реєстрації %s не існує або він не є каталогом." -#: ../daemon/main.c:287 +#: ../daemon/main.c:176 #, c-format msgid "Authdir %s does not exist. Aborting." msgstr "Каталог авторизації %s не існує. Скасування." -#: ../daemon/main.c:291 +#: ../daemon/main.c:180 #, c-format msgid "Authdir %s is not a directory. Aborting." msgstr "Каталог авторизації %s не є каталогом. Скасування." -#: ../daemon/main.c:365 +#: ../daemon/main.c:254 #, c-format msgid "Authdir %s is not owned by user %d, group %d. Aborting." msgstr "" "Каталог авторизації %s не належить користувачу %d, групі %d. Скасування." -#: ../daemon/main.c:372 +#: ../daemon/main.c:261 #, c-format msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." msgstr "" "Каталог авторизації %s має помилкові права %o. Мають бути %o. Скасування." -#: ../daemon/main.c:409 +#: ../daemon/main.c:298 #, c-format msgid "Can't find the GDM user '%s'. Aborting!" msgstr "Не знайдено користувача GDM «%s». Скасування!" -#: ../daemon/main.c:415 +#: ../daemon/main.c:304 msgid "The GDM user should not be root. Aborting!" msgstr "Користувачем GDM не може бути root. Скасування!" -#: ../daemon/main.c:421 +#: ../daemon/main.c:310 #, c-format msgid "Can't find the GDM group '%s'. Aborting!" msgstr "Не знайдено групу GDM «%s». Скасування!" -#: ../daemon/main.c:427 +#: ../daemon/main.c:316 msgid "The GDM group should not be root. Aborting!" msgstr "Група GDM не повинна бути групою root. Скасування!" -#: ../daemon/main.c:533 +#: ../daemon/main.c:427 msgid "Make all warnings fatal" msgstr "Зробити всі попередження критичними" -#: ../daemon/main.c:534 +#: ../daemon/main.c:428 msgid "Exit after a time (for debugging)" msgstr "Вийти через деякий час (для зневадження)" -#: ../daemon/main.c:535 +#: ../daemon/main.c:429 msgid "Print GDM version" msgstr "Показати версію GDM" -#: ../daemon/main.c:548 +#: ../daemon/main.c:442 msgid "GNOME Display Manager" msgstr "Менеджер стільниці GNOME" #. make sure the pid file doesn't get wiped -#: ../daemon/main.c:614 +#: ../daemon/main.c:492 msgid "Only the root user can run GDM" msgstr "Лише адміністратор (root) може запускати GDM" #. Translators: worker is a helper process that does the work #. of starting up a session -#: ../daemon/session-worker-main.c:156 +#: ../daemon/session-worker-main.c:150 msgid "GNOME Display Manager Session Worker" msgstr "Менеджер роботи стільничого сеансу GNOME" +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 +msgid "Display ID" +msgstr "Ідентифікатор екрана" + +#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 +msgid "ID" +msgstr "Ідентифікатор" + +#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 +msgid "GNOME Display Manager Slave" +msgstr "Підлеглий менеджер стільниці GNOME" + #: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 -#: ../gui/simple-greeter/gdm-greeter-login-window.c:2569 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 msgid "Login Window" msgstr "Вікно входу в систему" @@ -330,14 +356,6 @@ msgid "Use an on-screen keyboard" msgstr "Використовувати екранну клавіатуру" -#: ../data/applications/orca-screen-reader.desktop.in.h:1 -msgid "Orca Screen Reader" -msgstr "Зчитувач екрана Orca" - -#: ../data/applications/orca-screen-reader.desktop.in.h:2 -msgid "Present on-screen information as speech or braille" -msgstr "Представляти інформацію на екрані як розмову або шрифтом Брайля" - #: ../data/org.gnome.login-screen.gschema.xml.in.h:1 msgid "Whether or not to allow fingerprint readers for login" msgstr "Чи дозволяти відбитки пальців для входу" @@ -424,6 +442,57 @@ msgstr "" "Встановити так, щоб вимкнути показ кнопки перезавантаження у вікні входу." +#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 +msgid "Number of allowed authentication failures" +msgstr "Кількість дозволених промахів розпізнавання" + +#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 +msgid "" +"The number of times a user is allowed to attempt authentication, before " +"giving up and going back to user selection." +msgstr "" +"Кількість разів, які дозволяють користувачу для спроби розпізнатись, перед " +"невдачею та переходом назад до вибирання. користувача." + +#: ../gui/libgdm/gdm-user-switching.c:72 +msgid "Unable to create transient display: " +msgstr "Неможливо створити змінний екран:" + +#: ../gui/libgdm/gdm-user-switching.c:183 +#: ../gui/libgdm/gdm-user-switching.c:395 +msgid "Unable to activate session: " +msgstr "Неможливо ввімкнути сеанс:" + +#: ../gui/libgdm/gdm-user-switching.c:344 +#: ../gui/libgdm/gdm-user-switching.c:512 +#, c-format +msgid "Could not identify the current session." +msgstr "Неможливо розпізнати поточний сеанс." + +#: ../gui/libgdm/gdm-user-switching.c:351 +#, c-format +msgid "User unable to switch sessions." +msgstr "Користувач не може перемкнути сеанс." + +#: ../gui/libgdm/gdm-user-switching.c:521 +#, c-format +msgid "Could not identify the current seat." +msgstr "Неможливо розпізнати поточне місце." + +#: ../gui/libgdm/gdm-user-switching.c:531 +#, c-format +msgid "" +"The system is unable to determine whether to switch to an existing login " +"screen or start up a new login screen." +msgstr "" +"Система не може визначити, чи перемкнутись на наявний вхідний екран чи " +"запустити новий. " + +#: ../gui/libgdm/gdm-user-switching.c:539 +#, c-format +msgid "The system is unable to start up a new login screen." +msgstr "Система не може запустити новий вхідний екран." + #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 msgid "Select System" msgstr "Виберіть систему" @@ -609,26 +678,26 @@ msgid "%a %l:%M %p" msgstr "%a %k:%M" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:317 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 msgid "Automatically logging in…" msgstr "Автоматичний вхід у систему…" #. need to wait for response from backend -#: ../gui/simple-greeter/gdm-greeter-login-window.c:933 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 msgid "Cancelling…" msgstr "Скасування..." #. just wait for the user to select language and stuff -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1489 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 msgid "Select language and click Log In" msgstr "Виберіть мову та натисніть «Увійти»" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1625 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 msgctxt "customsession" msgid "Custom" msgstr "Власне" -#: ../gui/simple-greeter/gdm-greeter-login-window.c:1626 +#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 msgid "Custom session" msgstr "Власний сеанс" @@ -652,23 +721,23 @@ msgid "Login" msgstr "Увійти" -#: ../gui/simple-greeter/gdm-greeter-panel.c:903 +#: ../gui/simple-greeter/gdm-greeter-panel.c:953 msgid "Suspend" msgstr "Приспати" -#: ../gui/simple-greeter/gdm-greeter-panel.c:908 +#: ../gui/simple-greeter/gdm-greeter-panel.c:958 msgid "Restart" msgstr "Перезапустити" -#: ../gui/simple-greeter/gdm-greeter-panel.c:912 +#: ../gui/simple-greeter/gdm-greeter-panel.c:962 msgid "Shut Down" msgstr "Вимкнути" -#: ../gui/simple-greeter/gdm-greeter-panel.c:961 +#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 msgid "Unknown time remaining" msgstr "Залишилась невідома кількість часу" -#: ../gui/simple-greeter/gdm-greeter-panel.c:983 +#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 msgid "Panel" msgstr "Панель" @@ -738,8 +807,8 @@ msgid "Whether the timer is currently ticking" msgstr "Чи таймер зараз увімкнено" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:460 -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:797 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 #, c-format msgid "Log in as %s" msgstr "Увійти як %s" @@ -749,107 +818,83 @@ #. * manually instead of choosing from #. * a list. #. -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 msgctxt "user" msgid "Other…" msgstr "Інший…" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:547 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 msgid "Choose a different account" msgstr "Вибрати інший обліковий запис" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 msgid "Guest" msgstr "Гість" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:562 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 msgid "Log in as a temporary guest" msgstr "Увійти як тимчасовий користувач" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 msgid "Automatic Login" msgstr "Автоматичний вхід" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:578 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 msgid "Automatically log into the system after selecting options" msgstr "Автоматично входити у систему після вибору параметрів" -#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1353 +#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 msgid "Currently logged in" msgstr "Уже увійшов" -#: ../utils/gdmflexiserver.c:68 -msgid "Only the VERSION command is supported" -msgstr "Підтримується лише команда VERSION" - -#: ../utils/gdmflexiserver.c:68 -msgid "COMMAND" -msgstr "КОМАНДА" - -#: ../utils/gdmflexiserver.c:69 ../utils/gdmflexiserver.c:70 -#: ../utils/gdmflexiserver.c:72 ../utils/gdmflexiserver.c:73 -msgid "Ignored — retained for compatibility" -msgstr "Пропущено — збережено для сумісності" - -#: ../utils/gdmflexiserver.c:71 ../utils/gdm-screenshot.c:43 +#: ../utils/gdm-screenshot.c:43 msgid "Debugging output" msgstr "Вивід зневадження" -#: ../utils/gdmflexiserver.c:75 -msgid "Version of this application" -msgstr "Версія цієї програми" +#: ../utils/gdm-screenshot.c:212 +msgid "Screenshot taken" +msgstr "Знімок екрана зроблено" -#: ../utils/gdmflexiserver.c:673 ../utils/gdmflexiserver.c:833 -#, c-format -msgid "Could not identify the current session." -msgstr "Неможливо розпізнати поточний сеанс." +#. Option parsing +#: ../utils/gdm-screenshot.c:279 +msgid "Take a picture of the screen" +msgstr "Зробити знімок екрана" -#: ../utils/gdmflexiserver.c:680 -#, c-format -msgid "User unable to switch sessions." -msgstr "Користувач не може перемкнути сеанс." +#~ msgid "Unable to initialize login system" +#~ msgstr "Неможливо запустити систему входу" -#: ../utils/gdmflexiserver.c:842 -#, c-format -msgid "Could not identify the current seat." -msgstr "Неможливо розпізнати поточне місце." +#~ msgid "Unable to authenticate user" +#~ msgstr "Не вдалось автентифікувати користувача" -#: ../utils/gdmflexiserver.c:852 -#, c-format -msgid "" -"The system is unable to determine whether to switch to an existing login " -"screen or start up a new login screen." -msgstr "" -"Система не може визначити, чи перемкнутись на наявний вхідний екран чи " -"запустити новий. " +#~ msgid "Unable to establish credentials" +#~ msgstr "Не вдалось встановити реєстраційні дані" -#: ../utils/gdmflexiserver.c:860 -#, c-format -msgid "The system is unable to start up a new login screen." -msgstr "Система не може запустити новий вхідний екран." +#~ msgid "Group %s doesn't exist" +#~ msgstr "Група %s не існує" -#: ../utils/gdmflexiserver.c:869 -#, c-format -msgid "The system is unable to find a login screen to switch to." -msgstr "Система не може знайти вхідний екран, щоб перемкнутись у нього." +#~ msgid "Orca Screen Reader" +#~ msgstr "Зчитувач екрана Orca" -#. Option parsing -#: ../utils/gdmflexiserver.c:934 -msgid "- New GDM login" -msgstr "— Новий вхід GDM" - -#: ../utils/gdmflexiserver.c:990 -msgid "Unable to start new display" -msgstr "Не вдалось запустити новий екран" +#~ msgid "Present on-screen information as speech or braille" +#~ msgstr "Представляти інформацію на екрані як розмову або шрифтом Брайля" -#: ../utils/gdm-screenshot.c:212 -msgid "Screenshot taken" -msgstr "Знімок екрана зроблено" +#~ msgid "Only the VERSION command is supported" +#~ msgstr "Підтримується лише команда VERSION" -#. Option parsing -#: ../utils/gdm-screenshot.c:279 -msgid "Take a picture of the screen" -msgstr "Зробити знімок екрана" +#~ msgid "COMMAND" +#~ msgstr "КОМАНДА" + +#~ msgid "Ignored — retained for compatibility" +#~ msgstr "Пропущено — збережено для сумісності" + +#~ msgid "Version of this application" +#~ msgstr "Версія цієї програми" + +#~ msgid "The system is unable to find a login screen to switch to." +#~ msgstr "Система не може знайти вхідний екран, щоб перемкнутись у нього." + +#~ msgid "- New GDM login" +#~ msgstr "— Новий вхід GDM" #~ msgid "Max Item Count" #~ msgstr "Найбільша кількість об'єктів" @@ -991,9 +1036,6 @@ #~ msgid "%s: Could not read Client Address" #~ msgstr "%s: не вдалось зчитати адресу клієнта" -#~ msgid "%s: Could not read Authentication Names" -#~ msgstr "%s: не вдалось зчитати назви автентифікації" - #~ msgid "%s: Could not read Authentication Data" #~ msgstr "%s: не вдалось зчитати дані автентифікації" diff -Nru gdm-3.6.0/tests/Makefile.in gdm-3.6.1/tests/Makefile.in --- gdm-3.6.0/tests/Makefile.in 2012-09-25 18:04:07.000000000 +0000 +++ gdm-3.6.1/tests/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -181,6 +181,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ diff -Nru gdm-3.6.0/utils/Makefile.am gdm-3.6.1/utils/Makefile.am --- gdm-3.6.0/utils/Makefile.am 2012-08-18 13:21:48.000000000 +0000 +++ gdm-3.6.1/utils/Makefile.am 2012-10-16 02:14:54.000000000 +0000 @@ -21,9 +21,20 @@ -e 's|@GDM_PID_FILE[@]|$(GDM_PID_FILE)|g' bin_PROGRAMS = \ + gdmflexiserver \ gdm-screenshot \ $(NULL) +gdmflexiserver_SOURCES = \ + gdmflexiserver.c \ + $(NULL) + +gdmflexiserver_LDADD = \ + $(GTK_LIBS) \ + $(COMMON_LIBS) \ + $(SYSTEMD_LIBS) \ + $(NULL) + gdm_screenshot_SOURCES = \ gdm-screenshot.c \ $(NULL) diff -Nru gdm-3.6.0/utils/Makefile.in gdm-3.6.1/utils/Makefile.in --- gdm-3.6.0/utils/Makefile.in 2012-09-25 18:04:07.000000000 +0000 +++ gdm-3.6.1/utils/Makefile.in 2012-10-16 02:28:38.000000000 +0000 @@ -50,7 +50,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = gdm-screenshot$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = gdmflexiserver$(EXEEXT) gdm-screenshot$(EXEEXT) \ + $(am__EXEEXT_1) subdir = utils DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/depcomp $(top_srcdir)/mkinstalldirs @@ -77,6 +78,11 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = +am_gdmflexiserver_OBJECTS = gdmflexiserver.$(OBJEXT) $(am__objects_1) +gdmflexiserver_OBJECTS = $(am_gdmflexiserver_OBJECTS) +gdmflexiserver_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -111,8 +117,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(gdm_screenshot_SOURCES) -DIST_SOURCES = $(gdm_screenshot_SOURCES) +SOURCES = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES) +DIST_SOURCES = $(gdm_screenshot_SOURCES) $(gdmflexiserver_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -171,6 +177,7 @@ EXTRA_CHOOSER_LIBS = @EXTRA_CHOOSER_LIBS@ EXTRA_DAEMON_LIBS = @EXTRA_DAEMON_LIBS@ EXTRA_DYNAMIC_LIBS = @EXTRA_DYNAMIC_LIBS@ +EXTRA_FLEXI_LIBS = @EXTRA_FLEXI_LIBS@ EXTRA_GREETER_LIBS = @EXTRA_GREETER_LIBS@ EXTRA_SETUP_LIBS = @EXTRA_SETUP_LIBS@ EXTRA_SLAVE_LIBS = @EXTRA_SLAVE_LIBS@ @@ -415,6 +422,16 @@ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@GDM_PID_FILE[@]|$(GDM_PID_FILE)|g' +gdmflexiserver_SOURCES = \ + gdmflexiserver.c \ + $(NULL) + +gdmflexiserver_LDADD = \ + $(GTK_LIBS) \ + $(COMMON_LIBS) \ + $(SYSTEMD_LIBS) \ + $(NULL) + gdm_screenshot_SOURCES = \ gdm-screenshot.c \ $(NULL) @@ -515,6 +532,9 @@ gdm-screenshot$(EXEEXT): $(gdm_screenshot_OBJECTS) $(gdm_screenshot_DEPENDENCIES) $(EXTRA_gdm_screenshot_DEPENDENCIES) @rm -f gdm-screenshot$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gdm_screenshot_OBJECTS) $(gdm_screenshot_LDADD) $(LIBS) +gdmflexiserver$(EXEEXT): $(gdmflexiserver_OBJECTS) $(gdmflexiserver_DEPENDENCIES) $(EXTRA_gdmflexiserver_DEPENDENCIES) + @rm -f gdmflexiserver$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(gdmflexiserver_OBJECTS) $(gdmflexiserver_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -523,6 +543,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdm-screenshot.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdmflexiserver.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff -Nru gdm-3.6.0/utils/gdmflexiserver.c gdm-3.6.1/utils/gdmflexiserver.c --- gdm-3.6.0/utils/gdmflexiserver.c 1970-01-01 00:00:00.000000000 +0000 +++ gdm-3.6.1/utils/gdmflexiserver.c 2012-10-16 02:18:05.000000000 +0000 @@ -0,0 +1,780 @@ +/* -*- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "config.h" + +#include +#include +#include +#include +#include + +#include +#include + +#ifdef WITH_SYSTEMD +#include +#include +#endif + +#define GDM_DBUS_NAME "org.gnome.DisplayManager" +#define GDM_DBUS_LOCAL_DISPLAY_FACTORY_PATH "/org/gnome/DisplayManager/LocalDisplayFactory" +#define GDM_DBUS_LOCAL_DISPLAY_FACTORY_INTERFACE "org.gnome.DisplayManager.LocalDisplayFactory" + +#ifdef WITH_CONSOLE_KIT +#define CK_NAME "org.freedesktop.ConsoleKit" +#define CK_PATH "/org/freedesktop/ConsoleKit" +#define CK_INTERFACE "org.freedesktop.ConsoleKit" + +#define CK_MANAGER_PATH "/org/freedesktop/ConsoleKit/Manager" +#define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager" +#define CK_SEAT_INTERFACE "org.freedesktop.ConsoleKit.Seat" +#define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session" +#endif + +static const char *send_command = NULL; +static gboolean use_xnest = FALSE; +static gboolean no_lock = FALSE; +static gboolean debug_in = FALSE; +static gboolean authenticate = FALSE; +static gboolean startnew = FALSE; +static gboolean monte_carlo_pi = FALSE; +static gboolean show_version = FALSE; +static char **args_remaining = NULL; + +/* Keep all config options for compatibility even if they are noops */ +GOptionEntry options [] = { + { "command", 'c', 0, G_OPTION_ARG_STRING, &send_command, "Only the VERSION command is supported", "COMMAND" }, + { "xnest", 'n', 0, G_OPTION_ARG_NONE, &use_xnest, "Ignored — retained for compatibility", NULL }, + { "no-lock", 'l', 0, G_OPTION_ARG_NONE, &no_lock, "Ignored — retained for compatibility", NULL }, + { "debug", 'd', 0, G_OPTION_ARG_NONE, &debug_in, "Debugging output", NULL }, + { "authenticate", 'a', 0, G_OPTION_ARG_NONE, &authenticate, "Ignored — retained for compatibility", NULL }, + { "startnew", 's', 0, G_OPTION_ARG_NONE, &startnew, "Ignored — retained for compatibility", NULL }, + { "monte-carlo-pi", 0, 0, G_OPTION_ARG_NONE, &monte_carlo_pi, NULL, NULL }, + { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, "Version of this application", NULL }, + { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_STRING_ARRAY, &args_remaining, NULL, NULL }, + { NULL } +}; + +#define GDM_FLEXISERVER_ERROR gdm_flexiserver_error_quark () +static GQuark +gdm_flexiserver_error_quark (void) +{ + static GQuark ret = 0; + if (ret == 0) { + ret = g_quark_from_static_string ("gdm_flexiserver_error"); + } + + return ret; +} + +static gboolean +is_program_in_path (const char *program) +{ + char *tmp = g_find_program_in_path (program); + if (tmp != NULL) { + g_free (tmp); + return TRUE; + } else { + return FALSE; + } +} + +static void +maybe_lock_screen (void) +{ + gboolean use_gscreensaver = FALSE; + GError *error = NULL; + char *command; + + if (is_program_in_path ("gnome-screensaver-command")) { + use_gscreensaver = TRUE; + } else if (! is_program_in_path ("xscreensaver-command")) { + return; + } + + if (use_gscreensaver) { + command = g_strdup ("gnome-screensaver-command --lock"); + } else { + command = g_strdup ("xscreensaver-command -lock"); + } + + if (! g_spawn_command_line_async (command, &error)) { + g_warning ("Cannot lock screen: %s", error->message); + g_error_free (error); + } + + g_free (command); + + if (! use_gscreensaver) { + command = g_strdup ("xscreensaver-command -throttle"); + if (! g_spawn_command_line_async (command, &error)) { + g_warning ("Cannot disable screensaver engines: %s", error->message); + g_error_free (error); + } + + g_free (command); + } +} + +static void +calc_pi (void) +{ + unsigned long n = 0, h = 0; + double x, y; + printf ("\n"); + for (;;) { + x = g_random_double (); + y = g_random_double (); + if (x*x + y*y <= 1) + h++; + n++; + if ( ! (n & 0xfff)) + printf ("pi ~~ %1.10f\t(%lu/%lu * 4) iteration: %lu \r", + ((double)h)/(double)n * 4.0, h, n, n); + } +} + +static gboolean +create_transient_display (GDBusConnection *connection, + GError **error) +{ + GError *local_error = NULL; + GVariant *reply; + const char *value; + + reply = g_dbus_connection_call_sync (connection, + GDM_DBUS_NAME, + GDM_DBUS_LOCAL_DISPLAY_FACTORY_PATH, + GDM_DBUS_LOCAL_DISPLAY_FACTORY_INTERFACE, + "CreateTransientDisplay", + NULL, /* parameters */ + G_VARIANT_TYPE ("(o)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to create transient display: %s", local_error->message); + g_propagate_error (error, local_error); + return FALSE; + } + + g_variant_get (reply, "(&o)", &value); + g_debug ("Started %s", value); + + g_variant_unref (reply); + return TRUE; +} + +#ifdef WITH_CONSOLE_KIT + +static gboolean +get_current_session_id (GDBusConnection *connection, + char **session_id) +{ + GError *local_error = NULL; + GVariant *reply; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + CK_MANAGER_PATH, + CK_MANAGER_INTERFACE, + "GetCurrentSession", + NULL, /* parameters */ + G_VARIANT_TYPE ("(o)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to determine session: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_get (reply, "(o)", session_id); + g_variant_unref (reply); + + return TRUE; +} + +static gboolean +get_seat_id_for_session (GDBusConnection *connection, + const char *session_id, + char **seat_id) +{ + GError *local_error = NULL; + GVariant *reply; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + session_id, + CK_SESSION_INTERFACE, + "GetSeatId", + NULL, /* parameters */ + G_VARIANT_TYPE ("(o)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to determine seat: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_get (reply, "(o)", seat_id); + g_variant_unref (reply); + + return TRUE; +} + +static char * +get_current_seat_id (GDBusConnection *connection) +{ + gboolean res; + char *session_id; + char *seat_id; + + session_id = NULL; + seat_id = NULL; + + res = get_current_session_id (connection, &session_id); + if (res) { + res = get_seat_id_for_session (connection, session_id, &seat_id); + } + g_free (session_id); + + return seat_id; +} + +static gboolean +activate_session_id_for_ck (GDBusConnection *connection, + const char *seat_id, + const char *session_id) +{ + GError *local_error = NULL; + GVariant *reply; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + seat_id, + CK_SEAT_INTERFACE, + "ActivateSession", + g_variant_new ("(o)", session_id), + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to activate session: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_unref (reply); + + return TRUE; +} + +static gboolean +session_is_login_window (GDBusConnection *connection, + const char *session_id) +{ + GError *local_error = NULL; + GVariant *reply; + const char *value; + gboolean ret; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + session_id, + CK_SESSION_INTERFACE, + "GetSessionType", + NULL, + G_VARIANT_TYPE ("(s)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to determine session type: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_get (reply, "(&s)", &value); + + if (value == NULL || value[0] == '\0' || strcmp (value, "LoginWindow") != 0) { + ret = FALSE; + } else { + ret = TRUE; + } + + g_variant_unref (reply); + + return ret; +} + +static gboolean +seat_can_activate_sessions (GDBusConnection *connection, + const char *seat_id) +{ + GError *local_error = NULL; + GVariant *reply; + gboolean ret; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + seat_id, + CK_SEAT_INTERFACE, + "CanActivateSessions", + NULL, + G_VARIANT_TYPE ("(b)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to determine if can activate sessions: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_get (reply, "(b)", &ret); + g_variant_unref (reply); + + return ret; +} + +static const char ** +seat_get_sessions (GDBusConnection *connection, + const char *seat_id) +{ + GError *local_error = NULL; + GVariant *reply; + const char **value; + + reply = g_dbus_connection_call_sync (connection, + CK_NAME, + seat_id, + CK_SEAT_INTERFACE, + "GetSessions", + NULL, + G_VARIANT_TYPE ("(ao)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to list sessions: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_get (reply, "(^ao)", &value); + g_variant_unref (reply); + + return value; +} + +static gboolean +get_login_window_session_id_for_ck (GDBusConnection *connection, + const char *seat_id, + char **session_id) +{ + gboolean can_activate_sessions; + const char **sessions; + int i; + + *session_id = NULL; + sessions = NULL; + + g_debug ("checking if seat can activate sessions"); + + can_activate_sessions = seat_can_activate_sessions (connection, seat_id); + if (! can_activate_sessions) { + g_debug ("seat is unable to activate sessions"); + return FALSE; + } + + sessions = seat_get_sessions (connection, seat_id); + for (i = 0; sessions [i] != NULL; i++) { + const char *ssid; + + ssid = sessions [i]; + + if (session_is_login_window (connection, ssid)) { + *session_id = g_strdup (ssid); + break; + } + } + g_free (sessions); + + return TRUE; +} + +static gboolean +goto_login_session_for_ck (GDBusConnection *connection, + GError **error) +{ + gboolean ret; + gboolean res; + char *session_id; + char *seat_id; + + ret = FALSE; + + /* First look for any existing LoginWindow sessions on the seat. + If none are found, create a new one. */ + + seat_id = get_current_seat_id (connection); + if (seat_id == NULL || seat_id[0] == '\0') { + g_debug ("seat id is not set; can't switch sessions"); + g_set_error (error, GDM_FLEXISERVER_ERROR, 0, "Could not identify the current session."); + + return FALSE; + } + + res = get_login_window_session_id_for_ck (connection, seat_id, &session_id); + if (! res) { + g_set_error (error, GDM_FLEXISERVER_ERROR, 1, "User unable to switch sessions."); + return FALSE; + } + + if (session_id != NULL) { + res = activate_session_id_for_ck (connection, seat_id, session_id); + if (res) { + ret = TRUE; + } + } + + if (! ret && g_strcmp0 (seat_id, "/org/freedesktop/ConsoleKit/Seat1") == 0) { + res = create_transient_display (connection, error); + if (res) { + ret = TRUE; + } + } + + return ret; +} +#endif + +#ifdef WITH_SYSTEMD + +static gboolean +activate_session_id_for_systemd (GDBusConnection *connection, + const char *seat_id, + const char *session_id) +{ + GError *local_error = NULL; + GVariant *reply; + + reply = g_dbus_connection_call_sync (connection, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "ActivateSessionOnSeat", + g_variant_new ("(ss)", session_id, seat_id), + NULL, + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, &local_error); + if (reply == NULL) { + g_warning ("Unable to activate session: %s", local_error->message); + g_error_free (local_error); + return FALSE; + } + + g_variant_unref (reply); + + return TRUE; +} + +static gboolean +get_login_window_session_id_for_systemd (const char *seat_id, + char **session_id) +{ + gboolean ret; + int res, i; + char **sessions; + char *service_id; + char *service_class; + char *state; + + res = sd_seat_get_sessions (seat_id, &sessions, NULL, NULL); + if (res < 0) { + g_debug ("Failed to determine sessions: %s", strerror (-res)); + return FALSE; + } + + if (sessions == NULL || sessions[0] == NULL) { + *session_id = NULL; + ret = TRUE; + goto out; + } + + for (i = 0; sessions[i]; i ++) { + + res = sd_session_get_class (sessions[i], &service_class); + if (res < 0) { + g_debug ("failed to determine class of session %s: %s", sessions[i], strerror (-res)); + ret = FALSE; + goto out; + } + + if (strcmp (service_class, "greeter") != 0) { + free (service_class); + continue; + } + + free (service_class); + + ret = sd_session_get_state (sessions[i], &state); + if (ret < 0) { + g_debug ("failed to determine state of session %s: %s", sessions[i], strerror (-res)); + ret = FALSE; + goto out; + } + + if (g_strcmp0 (state, "closing") == 0) { + free (state); + continue; + } + free (state); + + res = sd_session_get_service (sessions[i], &service_id); + if (res < 0) { + g_debug ("failed to determine service of session %s: %s", sessions[i], strerror (-res)); + ret = FALSE; + goto out; + } + + if (strcmp (service_id, "gdm-welcome") == 0) { + *session_id = g_strdup (sessions[i]); + ret = TRUE; + + free (service_id); + goto out; + } + + free (service_id); + } + + *session_id = NULL; + ret = TRUE; + +out: + for (i = 0; sessions[i]; i ++) { + free (sessions[i]); + } + + free (sessions); + + return ret; +} + +static gboolean +goto_login_session_for_systemd (GDBusConnection *connection, + GError **error) +{ + gboolean ret; + int res; + char *our_session; + char *session_id; + char *seat_id; + + ret = FALSE; + session_id = NULL; + seat_id = NULL; + + /* First look for any existing LoginWindow sessions on the seat. + If none are found, create a new one. */ + + /* Note that we mostly use free () here, instead of g_free () + * since the data allocated is from libsystemd-logind, which + * does not use GLib's g_malloc (). */ + + res = sd_pid_get_session (0, &our_session); + if (res < 0) { + g_debug ("failed to determine own session: %s", strerror (-res)); + g_set_error (error, GDM_FLEXISERVER_ERROR, 0, "Could not identify the current session."); + + return FALSE; + } + + res = sd_session_get_seat (our_session, &seat_id); + free (our_session); + if (res < 0) { + g_debug ("failed to determine own seat: %s", strerror (-res)); + g_set_error (error, GDM_FLEXISERVER_ERROR, 0, "Could not identify the current seat."); + + return FALSE; + } + + res = sd_seat_can_multi_session (seat_id); + if (res < 0) { + free (seat_id); + + g_debug ("failed to determine whether seat can do multi session: %s", strerror (-res)); + g_set_error (error, GDM_FLEXISERVER_ERROR, 0, "The system is unable to determine whether to switch to an existing login screen or start up a new login screen."); + + return FALSE; + } + + if (res == 0) { + free (seat_id); + + g_set_error (error, GDM_FLEXISERVER_ERROR, 0, "The system is unable to start up a new login screen."); + + return FALSE; + } + + res = get_login_window_session_id_for_systemd (seat_id, &session_id); + if (res && session_id != NULL) { + res = activate_session_id_for_systemd (connection, seat_id, session_id); + + if (res) { + ret = TRUE; + } + } + + if (! ret && g_strcmp0 (seat_id, "seat0") == 0) { + res = create_transient_display (connection, error); + if (res) { + ret = TRUE; + } + } + + free (seat_id); + g_free (session_id); + + return ret; +} +#endif + +static gboolean +goto_login_session (GError **error) +{ + GError *local_error; + GDBusConnection *connection; + + local_error = NULL; + connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &local_error); + if (connection == NULL) { + g_debug ("Failed to connect to the D-Bus daemon: %s", local_error->message); + g_propagate_error (error, local_error); + return FALSE; + } + +#ifdef WITH_SYSTEMD + if (sd_booted () > 0) { + return goto_login_session_for_systemd (connection, error); + } +#endif + +#ifdef WITH_CONSOLE_KIT + return goto_login_session_for_ck (connection, error); +#endif +} + +int +main (int argc, char *argv[]) +{ + GOptionContext *ctx; + gboolean res; + GError *error; + + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + setlocale (LC_ALL, ""); + + /* Option parsing */ + ctx = g_option_context_new ("- New GDM login"); + g_option_context_set_translation_domain (ctx, GETTEXT_PACKAGE); + g_option_context_add_main_entries (ctx, options, NULL); + g_option_context_parse (ctx, &argc, &argv, NULL); + g_option_context_free (ctx); + + + if (show_version) { + g_print ("%s %s\n", argv [0], VERSION); + exit (1); + } + + /* don't support commands other than VERSION */ + if (send_command != NULL) { + if (strcmp (send_command, "VERSION") == 0) { + g_print ("GDM %s \n", VERSION); + return 0; + } else { + g_warning ("No longer supported"); + } + return 1; + } + + gtk_init (&argc, &argv); + + if (monte_carlo_pi) { + calc_pi (); + return 0; + } + + if (args_remaining != NULL && args_remaining[0] != NULL) { + + } + + if (use_xnest) { + g_warning ("Not yet implemented"); + return 1; + } + + error = NULL; + res = goto_login_session (&error); + if (! res) { + GtkWidget *dialog; + char *message; + + if (error != NULL) { + message = g_strdup_printf ("%s", error->message); + g_error_free (error); + } else { + message = g_strdup (""); + } + + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + "%s", "Unable to start new display"); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + "%s", message); + g_free (message); + + gtk_window_set_title (GTK_WINDOW (dialog), ""); + gtk_window_set_icon_name (GTK_WINDOW (dialog), "session-properties"); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); + + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } else { + maybe_lock_screen (); + } + + return 1; +}