diff -Nru lxdm-0.2.0~svn2307+git20100209/config.h.in lxdm-0.2.0~svn2307+git20100408/config.h.in --- lxdm-0.2.0~svn2307+git20100209/config.h.in 2010-02-16 01:12:15.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/config.h.in 2010-04-09 18:09:45.000000000 +0100 @@ -30,8 +30,8 @@ /* Define to 1 if you have the `pam' library (-lpam). */ #undef HAVE_LIBPAM -/* Define to 1 if you have the `Xmu' library (-lXmu). */ -#undef HAVE_LIBXMU +/* Define to 1 if you have the `Xau' library (-lXau). */ +#undef HAVE_LIBXAU /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H diff -Nru lxdm-0.2.0~svn2307+git20100209/configure lxdm-0.2.0~svn2307+git20100408/configure --- lxdm-0.2.0~svn2307+git20100209/configure 2010-02-16 01:12:17.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/configure 2010-04-09 18:09:47.000000000 +0100 @@ -600,6 +600,8 @@ CONSOLEKIT_CFLAGS GTK_LIBS GTK_CFLAGS +XLIB_LIBS +XLIB_CFLAGS PKG_CONFIG DATADIRNAME ALL_LINGUAS @@ -718,6 +720,8 @@ enable_dependency_tracking with_x enable_nls +enable_password +enable_xauth ' ac_precious_vars='build_alias host_alias @@ -730,6 +734,8 @@ XMKMF CPP PKG_CONFIG +XLIB_CFLAGS +XLIB_LIBS GTK_CFLAGS GTK_LIBS CONSOLEKIT_CFLAGS @@ -1356,6 +1362,8 @@ --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support + --enable-password enable to load autologin password store at config file + --disable-xauth disable the xauth support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1373,6 +1381,8 @@ XMKMF Path to xmkmf, Makefile generator for X Window System CPP C preprocessor PKG_CONFIG path to pkg-config utility + XLIB_CFLAGS C compiler flags for XLIB, overriding pkg-config + XLIB_LIBS linker flags for XLIB, overriding pkg-config GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config CONSOLEKIT_CFLAGS @@ -3811,51 +3821,6 @@ # Checks for libraries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuClientWindow in -lXmu" >&5 -$as_echo_n "checking for XmuClientWindow in -lXmu... " >&6; } -if test "${ac_cv_lib_Xmu_XmuClientWindow+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXmu $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char XmuClientWindow (); -int -main () -{ -return XmuClientWindow (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_Xmu_XmuClientWindow=yes -else - ac_cv_lib_Xmu_XmuClientWindow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuClientWindow" >&5 -$as_echo "$ac_cv_lib_Xmu_XmuClientWindow" >&6; } -if test "x$ac_cv_lib_Xmu_XmuClientWindow" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBXMU 1 -_ACEOF - - LIBS="-lXmu $LIBS" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 $as_echo_n "checking for crypt in -lcrypt... " >&6; } if test "${ac_cv_lib_crypt_crypt+set}" = set; then : @@ -5418,7 +5383,6 @@ -pkg_modules="gtk+-2.0 >= 2.12.0" if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -5537,6 +5501,100 @@ fi pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5 +$as_echo_n "checking for XLIB... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$XLIB_CFLAGS"; then + pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$XLIB_LIBS"; then + pkg_cv_XLIB_LIBS="$XLIB_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` + else + XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` + fi + # Put the nasty error message in config.log where it belongs + echo "$XLIB_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (x11) were not met: + +$XLIB_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables XLIB_CFLAGS +and XLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables XLIB_CFLAGS +and XLIB_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details." "$LINENO" 5; } +else + XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS + XLIB_LIBS=$pkg_cv_XLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi + + + +pkg_modules="gtk+-2.0 >= 2.12.0" + +pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } @@ -5706,6 +5764,79 @@ fi +# Check whether --enable-password was given. +if test "${enable_password+set}" = set; then : + enableval=$enable_password; case "${enableval}" in + yes) enable_password=yes ;; + no) enable_password=no ;; + *) as_fn_error "bad value \"${enableval}\" for --enable-password, use \"yes\" (default) or \"no\"." "$LINENO" 5 ;; +esac +fi + + +if test "x$enable_password" = "xyes" ; then + CFLAGS="$CFLAGS -DENABLE_PASSWORD" +fi + +# Check whether --enable-xauth was given. +if test "${enable_xauth+set}" = set; then : + enableval=$enable_xauth; enable_xauth=$enablevar +else + enable_xauth=yes + +fi + + +if test "x$enable_xauth" = "x$no" ; then + CFLAGS="$CFLAGS -DDISABLE_XAUTH" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauWriteAuth in -lXau" >&5 +$as_echo_n "checking for XauWriteAuth in -lXau... " >&6; } +if test "${ac_cv_lib_Xau_XauWriteAuth+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXau $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XauWriteAuth (); +int +main () +{ +return XauWriteAuth (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xau_XauWriteAuth=yes +else + ac_cv_lib_Xau_XauWriteAuth=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauWriteAuth" >&5 +$as_echo "$ac_cv_lib_Xau_XauWriteAuth" >&6; } +if test "x$ac_cv_lib_Xau_XauWriteAuth" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBXAU 1 +_ACEOF + + LIBS="-lXau $LIBS" + +fi + +fi + GETTEXT_PACKAGE=lxdm @@ -5714,7 +5845,7 @@ _ACEOF -ac_config_files="$ac_config_files Makefile lxdm.spec src/Makefile po/Makefile.in pam/Makefile data/Makefile data/lxdm.conf" +ac_config_files="$ac_config_files Makefile lxdm.spec src/Makefile po/Makefile.in pam/Makefile data/Makefile data/lxdm.conf data/PostLogin data/PostLogout data/PreLogin data/PreReboot data/PreShutdown data/LoginReady" ac_config_files="$ac_config_files data/lxdm" @@ -6437,6 +6568,12 @@ "pam/Makefile") CONFIG_FILES="$CONFIG_FILES pam/Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; "data/lxdm.conf") CONFIG_FILES="$CONFIG_FILES data/lxdm.conf" ;; + "data/PostLogin") CONFIG_FILES="$CONFIG_FILES data/PostLogin" ;; + "data/PostLogout") CONFIG_FILES="$CONFIG_FILES data/PostLogout" ;; + "data/PreLogin") CONFIG_FILES="$CONFIG_FILES data/PreLogin" ;; + "data/PreReboot") CONFIG_FILES="$CONFIG_FILES data/PreReboot" ;; + "data/PreShutdown") CONFIG_FILES="$CONFIG_FILES data/PreShutdown" ;; + "data/LoginReady") CONFIG_FILES="$CONFIG_FILES data/LoginReady" ;; "data/lxdm") CONFIG_FILES="$CONFIG_FILES data/lxdm" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; diff -Nru lxdm-0.2.0~svn2307+git20100209/configure.ac lxdm-0.2.0~svn2307+git20100408/configure.ac --- lxdm-0.2.0~svn2307+git20100209/configure.ac 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/configure.ac 2010-04-08 21:14:51.000000000 +0100 @@ -14,7 +14,6 @@ AM_PROG_CC_C_O # Checks for libraries. -AC_CHECK_LIB([Xmu], [XmuClientWindow]) AC_CHECK_LIB([crypt], [crypt]) AC_CHECK_LIB([pam], [pam_open_session]) AC_CHECK_LIB([ck-connector],[ck_connector_open_session]) @@ -43,6 +42,10 @@ IT_PROG_INTLTOOL([0.40.0]) +PKG_CHECK_MODULES(XLIB,x11) +AC_SUBST(XLIB_CFLAGS) +AC_SUBST(XLIB_LIBS) + pkg_modules="gtk+-2.0 >= 2.12.0" PKG_CHECK_MODULES(GTK, [$pkg_modules]) AC_SUBST(GTK_CFLAGS) @@ -54,6 +57,30 @@ echo "ConsoleKit devel package not found" ]) +AC_ARG_ENABLE(password, +[ --enable-password enable to load autologin password store at config file ], +[case "${enableval}" in + yes) enable_password=yes ;; + no) enable_password=no ;; + *) AC_MSG_ERROR([bad value "${enableval}" for --enable-password, use "yes" (default) or "no".]) ;; +esac],[]) + +if test "x$enable_password" = "xyes" ; then + CFLAGS="$CFLAGS -DENABLE_PASSWORD" +fi + +AC_ARG_ENABLE(xauth, + AC_HELP_STRING([--disable-xauth],[disable the xauth support ]), + [enable_xauth=$enablevar], + [enable_xauth=yes] +) + +if test "x$enable_xauth" = "x$no" ; then + CFLAGS="$CFLAGS -DDISABLE_XAUTH" +else + AC_CHECK_LIB([Xau],[XauWriteAuth]) +fi + GETTEXT_PACKAGE=lxdm AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) @@ -65,7 +92,13 @@ po/Makefile.in pam/Makefile data/Makefile - data/lxdm.conf + data/lxdm.conf + data/PostLogin + data/PostLogout + data/PreLogin + data/PreReboot + data/PreShutdown + data/LoginReady ]) AC_CONFIG_FILES([data/lxdm], [chmod +x data/lxdm]) AC_OUTPUT @@ -74,4 +107,4 @@ if test "$sysconfdir" != "/etc"; then AC_MSG_WARN(sysconfdir is not /etc.) AC_MSG_WARN(Please consider passing --sysconfdir=/etc to configure.) -fi \ No newline at end of file +fi diff -Nru lxdm-0.2.0~svn2307+git20100209/data/LoginReady.in lxdm-0.2.0~svn2307+git20100408/data/LoginReady.in --- lxdm-0.2.0~svn2307+git20100209/data/LoginReady.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/LoginReady.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/Makefile.am lxdm-0.2.0~svn2307+git20100408/data/Makefile.am --- lxdm-0.2.0~svn2307+git20100209/data/Makefile.am 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/data/Makefile.am 2010-04-08 21:14:51.000000000 +0100 @@ -10,12 +10,19 @@ lxdm_confdir = /etc/lxdm lxdm_conf_DATA = \ + PostLogin \ + PostLogout \ + PreLogin \ + PreReboot \ + PreShutdown \ + LoginReady \ lxdm.conf \ Xsession \ $(NULL) install-data-hook: chmod +x $(DESTDIR)/etc/lxdm/Xsession + chmod 600 $(DESTDIR)/etc/lxdm/lxdm.conf themedir=$(datadir)/lxdm/themes/Industrial theme_DATA= \ @@ -34,3 +41,4 @@ $(lxdm_conf_DATA) \ $(theme_DATA) \ $(NULL) + diff -Nru lxdm-0.2.0~svn2307+git20100209/data/Makefile.in lxdm-0.2.0~svn2307+git20100408/data/Makefile.in --- lxdm-0.2.0~svn2307+git20100209/data/Makefile.in 2010-02-16 01:12:16.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/data/Makefile.in 2010-04-09 18:09:46.000000000 +0100 @@ -34,7 +34,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/LoginReady.in $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/PostLogin.in \ + $(srcdir)/PostLogout.in $(srcdir)/PreLogin.in \ + $(srcdir)/PreReboot.in $(srcdir)/PreShutdown.in \ $(srcdir)/lxdm.conf.in $(srcdir)/lxdm.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac @@ -42,7 +45,8 @@ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = lxdm.conf lxdm +CONFIG_CLEAN_FILES = lxdm.conf PostLogin PostLogout PreLogin PreReboot \ + PreShutdown LoginReady lxdm CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -133,6 +137,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XLIB_CFLAGS = @XLIB_CFLAGS@ +XLIB_LIBS = @XLIB_LIBS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -186,6 +192,12 @@ lxdm_confdir = /etc/lxdm lxdm_conf_DATA = \ + PostLogin \ + PostLogout \ + PreLogin \ + PreReboot \ + PreShutdown \ + LoginReady \ lxdm.conf \ Xsession \ $(NULL) @@ -243,6 +255,18 @@ $(am__aclocal_m4_deps): lxdm.conf: $(top_builddir)/config.status $(srcdir)/lxdm.conf.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +PostLogin: $(top_builddir)/config.status $(srcdir)/PostLogin.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +PostLogout: $(top_builddir)/config.status $(srcdir)/PostLogout.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +PreLogin: $(top_builddir)/config.status $(srcdir)/PreLogin.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +PreReboot: $(top_builddir)/config.status $(srcdir)/PreReboot.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +PreShutdown: $(top_builddir)/config.status $(srcdir)/PreShutdown.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +LoginReady: $(top_builddir)/config.status $(srcdir)/LoginReady.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ lxdm: $(top_builddir)/config.status $(srcdir)/lxdm.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-sbinSCRIPTS: $(sbin_SCRIPTS) @@ -497,6 +521,7 @@ install-data-hook: chmod +x $(DESTDIR)/etc/lxdm/Xsession + chmod 600 $(DESTDIR)/etc/lxdm/lxdm.conf # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/PostLogin.in lxdm-0.2.0~svn2307+git20100408/data/PostLogin.in --- lxdm-0.2.0~svn2307+git20100209/data/PostLogin.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/PostLogin.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/PostLogout.in lxdm-0.2.0~svn2307+git20100408/data/PostLogout.in --- lxdm-0.2.0~svn2307+git20100209/data/PostLogout.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/PostLogout.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/PreLogin.in lxdm-0.2.0~svn2307+git20100408/data/PreLogin.in --- lxdm-0.2.0~svn2307+git20100209/data/PreLogin.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/PreLogin.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/PreReboot.in lxdm-0.2.0~svn2307+git20100408/data/PreReboot.in --- lxdm-0.2.0~svn2307+git20100209/data/PreReboot.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/PreReboot.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/data/PreShutdown.in lxdm-0.2.0~svn2307+git20100408/data/PreShutdown.in --- lxdm-0.2.0~svn2307+git20100209/data/PreShutdown.in 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/data/PreShutdown.in 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh +# +# Note: this is a sample and will not be run as is. diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/changelog lxdm-0.2.0~svn2307+git20100408/debian/changelog --- lxdm-0.2.0~svn2307+git20100209/debian/changelog 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/changelog 2010-04-13 21:36:51.000000000 +0100 @@ -1,3 +1,20 @@ +lxdm (0.2.0~svn2307+git20100408-0ubuntu1) lucid; urgency=low + + * New upstream snapshot (735dbe5727f) + - Fix PAM support (LP: #550551) + - Fix use of encrypted partition (LP: #554583) + * debian/patches: + - 11-use-desktop-session.patch: Refresh to only add startlubuntu for Lubuntu + session. + - 15-path-replace.patch: Refresh. + - 17-last-session.patch: restore last session behavior (LP: #561377) + - 20-stderr_stdout_to_log.patch: Refresh. + * Update PAM file with current gdm one. + * debian/lxdm.1 & debian/manpages: Add a man page based the one from Sidux + (LP: #516703) + + -- Julien Lavergne Tue, 13 Apr 2010 01:25:35 +0200 + lxdm (0.2.0~svn2307+git20100209-0ubuntu2) lucid; urgency=low * debian/patches/15-path-replace.patch : From upstream, don't let lxdm diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/lxdm.1 lxdm-0.2.0~svn2307+git20100408/debian/lxdm.1 --- lxdm-0.2.0~svn2307+git20100209/debian/lxdm.1 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/lxdm.1 2010-04-13 21:36:51.000000000 +0100 @@ -0,0 +1,91 @@ +.TH LXDM 1 "March 2010" + +.SH NAME +lxdm \- LXDE Display Manager (Login screen) + +.SH SYNOPSIS +.B lxdm + [options] +.br +.SH DESCRIPTION +.B lxdm +is the LXDE display manager also known as login manager. It shows a graphical login screen for usernames and password and allows you to choose a desktop and language for the session. After authenticating a user it starts a session. + +lxdm works with various desktops like LXDE, KDE and others. + +.PP +.SH OPTIONS +.TP +.B \-d +daemon mode +.TP +.B \-h +help + +.SH FILES +.TP +.I /var/log/lxdm.log +log information +.TP +.I /etc/lxdm/Xsession +script to run as user after login of user +.TP +.I /etc/lxdm/default.conf +configuration file for lxdm. It's a symlink to the real configuration file +(/etc/lxdm/lxdm.conf for standard lxdm, /etc/xdg/lubuntu/lxdm/lxdm.conf for +Lubuntu). See above for details of the configuration file. + +.SH CONFIGURATION FILE +The configuration file is /etc/lxdm/default.conf, which is a symlink to the +real configuration file. (/etc/lxdm/lxdm.conf for standard lxdm, +/etc/xdg/lubuntu/lxdm/lxdm.conf for Lubuntu). + +To update the symlink, type "update-alternative --config lxdm.conf" and follow +the instructions. + +.B autologin +.TP +Enable autologin if you set autologin=user, when user is your login. Disable by default, you need to uncomment the line. +.TP + +.B session +.TP +Default session which will be started if "Default" session is provided at login. Disable by default, you need to uncomment the line. +.TP + +.B numlock +.TP +Enable numlock support. Disable by default, you need to uncomment the line. +.TP + +.B arg +.TP +Override arguments passed to the Xserver. Disable by default, you need to uncomment the line. +.TP +.B gtk_theme +.TP +Select the gtk theme for the greeter. +.TP +.B bg +.TP +Select the path of the background of the greeter. +.TP +.B bottom_pane +.TP +Select if the bottom panel is available. 1 to TRUE, 0 to FALSE. +.TP +.B lang +.TP +Select if the language choose if available. 1 to TRUE, 0 to FALSE. +.TP +.B theme +.TP +Select the theme for the greeter. Theme are located in /usr/share/lxdm/themes/ + + +.SH AUTHORS +This manual page was written by Trevor Walkley for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. + +Modified for specific settings on Ubuntu by Julien Lavergne + +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/lxdm.manpages lxdm-0.2.0~svn2307+git20100408/debian/lxdm.manpages --- lxdm-0.2.0~svn2307+git20100209/debian/lxdm.manpages 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/lxdm.manpages 2010-04-13 21:36:51.000000000 +0100 @@ -0,0 +1 @@ +debian/lxdm.1 diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/lxdm.pam lxdm-0.2.0~svn2307+git20100408/debian/lxdm.pam --- lxdm-0.2.0~svn2307+git20100209/debian/lxdm.pam 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/lxdm.pam 2010-04-13 21:36:51.000000000 +0100 @@ -2,6 +2,7 @@ auth requisite pam_nologin.so auth required pam_env.so readenv=1 auth required pam_env.so readenv=1 envfile=/etc/default/locale +auth sufficient pam_succeed_if.so user ingroup nopasswdlogin @include common-auth auth optional pam_gnome_keyring.so @include common-account diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/11-use-desktop-session.patch lxdm-0.2.0~svn2307+git20100408/debian/patches/11-use-desktop-session.patch --- lxdm-0.2.0~svn2307+git20100209/debian/patches/11-use-desktop-session.patch 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/11-use-desktop-session.patch 2010-04-13 21:36:51.000000000 +0100 @@ -1,20 +1,13 @@ Index: lxdm/src/lxdm.c =================================================================== ---- lxdm.orig/src/lxdm.c 2010-01-24 16:08:41.000000000 +0100 -+++ lxdm/src/lxdm.c 2010-01-24 22:58:09.000000000 +0100 -@@ -722,11 +722,13 @@ - session = g_key_file_get_string(config, "base", "session", 0); - if( !session && getenv("PREFERRED") ) - session = g_strdup( getenv("PREFERRED") ); -- if( !session && getenv("DESKTOP") ) -+ if( !session && getenv("DESKTOP_SESSION") ) - { -- char *p = getenv("DESKTOP"); -+ char *p = getenv("DESKTOP_SESSION"); - if( !strcmp(p, "LXDE") ) - session = g_find_program_in_path("startlxde"); -+ else if(!strcmp(p,"Lubuntu")) -+ session = g_find_program_in_path("startlubuntu"); - else if( !strcmp(p, "GNOME") ) - session = g_find_program_in_path("gnome-session"); - else if( !strcmp(p, "KDE") ) +--- lxdm.orig/src/lxdm.c 2010-04-05 17:13:06.000000000 +0200 ++++ lxdm/src/lxdm.c 2010-04-05 18:27:47.000000000 +0200 +@@ -921,6 +921,8 @@ + { + if(!strcmp(name,"LXDE")) + exec = g_strdup("startlxde"); ++ else if( !strcmp(name, "Lubuntu") ) ++ exec = g_strdup("startlubuntu"); + else if( !strcmp(name, "GNOME") ) + exec = g_strdup("gnome-session"); + else if( !strcmp(name, "KDE") ) diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/15-path-replace.patch lxdm-0.2.0~svn2307+git20100408/debian/patches/15-path-replace.patch --- lxdm-0.2.0~svn2307+git20100209/debian/patches/15-path-replace.patch 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/15-path-replace.patch 2010-04-13 21:36:51.000000000 +0100 @@ -1,19 +1,13 @@ -Index: lxdm-0.2.0~svn2307+git20100209/src/lxdm.c +Index: lxdm/src/lxdm.c =================================================================== ---- lxdm-0.2.0~svn2307+git20100209.orig/src/lxdm.c 2010-02-28 11:43:55.000000000 +0100 -+++ lxdm-0.2.0~svn2307+git20100209/src/lxdm.c 2010-02-28 11:45:46.000000000 +0100 -@@ -864,10 +864,10 @@ - - /* override $PATH if needed */ +--- lxdm.orig/src/lxdm.c 2010-04-05 17:03:43.000000000 +0200 ++++ lxdm/src/lxdm.c 2010-04-05 17:07:48.000000000 +0200 +@@ -996,7 +996,7 @@ path = g_key_file_get_string(config, "base", "path", 0); -- if( G_UNLIKELY(path) && path[0] ) -- replace_env(env, "PATH=", path); -- else -- replace_env(env, "PATH=","/usr/local/bin:/bin:/usr/bin"); -+ if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ -+ replace_env(env, "PATH=", path); /* override current $PATH with config value */ + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + replace_env(env, "PATH=", path); /* override current $PATH with config value */ +- else /* don't use the global env, they are bad for user */ + else if(!getenv("PATH")) /* if PATH is not set */ -+ replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin"); /* set proper default */ + replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"); /* set proper default */ g_free(path); /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ - if( lang && lang[0] ) diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/16-pam-support.patch lxdm-0.2.0~svn2307+git20100408/debian/patches/16-pam-support.patch --- lxdm-0.2.0~svn2307+git20100209/debian/patches/16-pam-support.patch 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/16-pam-support.patch 2010-04-13 21:36:51.000000000 +0100 @@ -0,0 +1,22 @@ +Index: lxdm/src/lxdm.c +=================================================================== +--- lxdm.orig/src/lxdm.c 2010-04-04 18:03:26.000000000 +0200 ++++ lxdm/src/lxdm.c 2010-04-04 18:07:07.000000000 +0200 +@@ -503,7 +503,7 @@ + { + char *env; + env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name); +- pam_putenv (pamh, env); ++ /*pam_putenv (pamh, env);*/ + g_free (env); + } + err = pam_open_session(pamh, 0); /* FIXME pam session failed */ +@@ -1005,7 +1005,7 @@ + replace_env(env, "LANGUAGE=", lang); + } + #if HAVE_LIBPAM +- append_pam_environ(env); ++ /*append_pam_environ(env);*/ + pam_end(pamh,0); + #endif + switch_user(pw, session_exec, env); diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/17-last-session.patch lxdm-0.2.0~svn2307+git20100408/debian/patches/17-last-session.patch --- lxdm-0.2.0~svn2307+git20100209/debian/patches/17-last-session.patch 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/17-last-session.patch 2010-04-13 21:36:51.000000000 +0100 @@ -0,0 +1,36 @@ +Index: lxdm/src/greeter.c +=================================================================== +--- lxdm.orig/src/greeter.c 2010-04-13 00:37:34.000000000 +0200 ++++ lxdm/src/greeter.c 2010-04-13 00:48:35.000000000 +0200 +@@ -44,7 +44,7 @@ + }; + + #ifndef VCONFIG_FILE +-#define VCONFIG_FILE "/var/run/lxdm/lxdm.ini" ++#define VCONFIG_FILE "/etc/lxdm/default.conf" + #endif + + static gboolean config_changed = FALSE; +@@ -781,8 +781,21 @@ + if( config_changed ) + { + gsize len; ++ gchar* config_file; ++ GError **error; ++ + char* data = g_key_file_to_data(var_config, &len, NULL); +- g_file_set_contents(VCONFIG_FILE, data, len, NULL); ++ if( g_file_test(VCONFIG_FILE, G_FILE_TEST_IS_SYMLINK) ) ++ { ++ config_file = g_file_read_link(VCONFIG_FILE, error); ++ g_file_set_contents(config_file, data, len, NULL); ++ g_free(config_file); ++ ++ } ++ else ++ { ++ g_file_set_contents(VCONFIG_FILE, data, len, NULL); ++ } + g_free(data); + } + g_key_file_free(config); diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/20-stderr_stdout_to_log.patch lxdm-0.2.0~svn2307+git20100408/debian/patches/20-stderr_stdout_to_log.patch --- lxdm-0.2.0~svn2307+git20100209/debian/patches/20-stderr_stdout_to_log.patch 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/20-stderr_stdout_to_log.patch 2010-04-13 21:36:51.000000000 +0100 @@ -1,8 +1,8 @@ -Index: lxdm-0.2.0~svn2307+git20100209/src/lxdm.c +Index: lxdm/src/lxdm.c =================================================================== ---- lxdm-0.2.0~svn2307+git20100209.orig/src/lxdm.c 2010-02-25 00:02:23.000000000 +0100 -+++ lxdm-0.2.0~svn2307+git20100209/src/lxdm.c 2010-02-25 00:07:20.000000000 +0100 -@@ -214,12 +214,27 @@ +--- lxdm.orig/src/lxdm.c 2010-04-09 00:18:08.000000000 +0200 ++++ lxdm/src/lxdm.c 2010-04-09 00:19:29.000000000 +0200 +@@ -227,12 +227,27 @@ exit(0); } @@ -30,24 +30,16 @@ va_start(ap, fmt); vfprintf(log, fmt, ap); va_end(ap); -@@ -585,6 +600,7 @@ +@@ -707,6 +722,8 @@ if( !getenv("DISPLAY") ) putenv("DISPLAY=:0"); + log_print("%s\n","start X"); ++ + #ifndef DISABLE_XAUTH create_server_auth(); - - arg = g_key_file_get_string(config, "server", "arg", 0); -@@ -598,6 +614,8 @@ - { - case 0: - setpgid( 0, getpid() ); -+ // required to catch output -+ log_print("%s\n", "lxdm forked"); - execvp(args[0], args); - break; - case -1: -@@ -1052,6 +1070,7 @@ + #endif +@@ -1164,6 +1181,7 @@ set_signal(); lxdm_get_tty(); diff -Nru lxdm-0.2.0~svn2307+git20100209/debian/patches/series lxdm-0.2.0~svn2307+git20100408/debian/patches/series --- lxdm-0.2.0~svn2307+git20100209/debian/patches/series 2010-04-13 21:36:50.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/debian/patches/series 2010-04-13 21:36:51.000000000 +0100 @@ -1,3 +1,6 @@ 11-use-desktop-session.patch 15-path-replace.patch +17-last-session.patch 20-stderr_stdout_to_log.patch +#Patch to not use DESKTOP_SESSION in PAM +#16-pam-support.patch diff -Nru lxdm-0.2.0~svn2307+git20100209/INSTALL lxdm-0.2.0~svn2307+git20100408/INSTALL --- lxdm-0.2.0~svn2307+git20100209/INSTALL 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/INSTALL 2010-04-08 21:14:51.000000000 +0100 @@ -1,10 +1,26 @@ -1 modify data/Xsession.am as your distribution - -2 compile and install +1 compile and install ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec make make install -here libexecdir should change as you system path. +libexecdir should change as you system path. +sysconfdir must be /etc + + +2 custom + +modify data/Xsession.in as your distribution + +/etc/lxdm/PreLogin +before login, have root's context + +/etc/lxdm/PostLogin +login, before Xsession, user's context + +/etc/lxdm/PostLogout +when session logout done and ui ready + +/etc/lxdm/LoginReady +lxdm start done, called after ui ready diff -Nru lxdm-0.2.0~svn2307+git20100209/lxdm.spec.in lxdm-0.2.0~svn2307+git20100408/lxdm.spec.in --- lxdm-0.2.0~svn2307+git20100209/lxdm.spec.in 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/lxdm.spec.in 2010-04-08 21:14:51.000000000 +0100 @@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} -BuildRequires: gtk2-devel libXmu-devel pam-devel intltool +BuildRequires: gtk2-devel pam-devel intltool %description Light weight X11 display manager @@ -28,14 +28,13 @@ %configure -# a make macro should be used here -# even a "job based" make if possible -# %__make %{?jobs:-j%{jobs}} - %__make %install make DESTDIR=${RPM_BUILD_ROOT} install +cd ${RPM_BUILD_ROOT}/%{_sysconfdir}/lxdm +rm -rf LoginReady PostLogin PreLogin PostLogout PreReboot PreShutdown +cd - %find_lang %{name} @@ -50,7 +49,6 @@ %postun -# exactly as "%find_lang" macro %files -f %{name}.lang %defattr (-,root,root,-) %doc AUTHORS NEWS README COPYING INSTALL ChangeLog diff -Nru lxdm-0.2.0~svn2307+git20100209/Makefile.in lxdm-0.2.0~svn2307+git20100408/Makefile.in --- lxdm-0.2.0~svn2307+git20100209/Makefile.in 2010-02-16 01:12:16.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/Makefile.in 2010-04-09 18:09:46.000000000 +0100 @@ -161,6 +161,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XLIB_CFLAGS = @XLIB_CFLAGS@ +XLIB_LIBS = @XLIB_LIBS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -Nru lxdm-0.2.0~svn2307+git20100209/pam/Makefile.in lxdm-0.2.0~svn2307+git20100408/pam/Makefile.in --- lxdm-0.2.0~svn2307+git20100209/pam/Makefile.in 2010-02-16 01:12:16.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/pam/Makefile.in 2010-04-09 18:09:46.000000000 +0100 @@ -129,6 +129,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +XLIB_CFLAGS = @XLIB_CFLAGS@ +XLIB_LIBS = @XLIB_LIBS@ XMKMF = @XMKMF@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ diff -Nru lxdm-0.2.0~svn2307+git20100209/po/af.po lxdm-0.2.0~svn2307+git20100408/po/af.po --- lxdm-0.2.0~svn2307+git20100209/po/af.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/af.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-14 11:42+0200\n" "Last-Translator: F Wolff \n" "Language-Team: LANGUAGE \n" -"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.0\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Taal:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Gebruiker:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Ongespesifiseerd" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Wagwoord:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Verstek" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "He_rbegin" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Skakel af" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ar.po lxdm-0.2.0~svn2307+git20100408/po/ar.po --- lxdm-0.2.0~svn2307+git20100209/po/ar.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ar.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/bg.po lxdm-0.2.0~svn2307+git20100408/po/bg.po --- lxdm-0.2.0~svn2307+git20100209/po/bg.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/bg.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,51 +3,58 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-05 20:10+0200\n" +"Last-Translator: Радослав \n" +"Language-Team: MIME-Version: 1.0\n" +"Language: bg\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" +"X-Poedit-Language: Bulgarian\n" +"X-Poedit-Country: BULGARIA\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Работен плот:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Клавиатурна подредба:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Език:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" -msgstr "" +msgstr "Потребител:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "Не е зададен" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" -msgstr "" +msgstr "Парола:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" -msgstr "" +msgstr "По подразбиране" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "_Рестартирай" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" -msgstr "" +msgstr "_Изключи" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Още..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/bn_IN.po lxdm-0.2.0~svn2307+git20100408/po/bn_IN.po --- lxdm-0.2.0~svn2307+git20100209/po/bn_IN.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/bn_IN.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,51 +3,57 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-05 12:57+0200\n" +"Last-Translator: Sankarshan \n" "Language-Team: LANGUAGE \n" +"Language: bn_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "ডেস্কটপ:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "কী-বোর্ড বিন্যাস:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "ভাষা:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" -msgstr "" +msgstr "ব্যবহারকারী:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "অনির্দিষ্ট" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" -msgstr "" +msgstr "পাসওয়ার্ড:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" -msgstr "" +msgstr "ডিফল্ট" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "রিবুট(_R)" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" -msgstr "" +msgstr "শাটডাউন(_S)" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "অধিক ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/bn.po lxdm-0.2.0~svn2307+git20100408/po/bn.po --- lxdm-0.2.0~svn2307+git20100209/po/bn.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/bn.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-02-01 11:45+0600\n" "Last-Translator: Israt Jahan \n" "Language-Team: Bengali \n" @@ -27,26 +27,30 @@ msgid "Language:" msgstr "ভাষা" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "ব্যবহারকারী:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "অনুল্লেখিত" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "পাসওয়ার্ড:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "পূর্বনির্ধারিত" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "রিবুট (_R)" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "বন্ধ (_S)" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ca.po lxdm-0.2.0~svn2307+git20100408/po/ca.po --- lxdm-0.2.0~svn2307+git20100209/po/ca.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ca.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-08 04:09+0000\n" "PO-Revision-Date: 2010-01-13 23:09+0200\n" "Last-Translator: Josep Sanchez \n" "Language-Team: LANGUAGE \n" -"Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.0\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Idioma:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Usuari:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Sense especificar" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Contrasenya:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Per defecte" -#: ../src/greeter.c:260 +#: ../src/greeter.c:439 msgid "_Reboot" msgstr "_Reinicia" -#: ../src/greeter.c:264 +#: ../src/greeter.c:443 msgid "_Shutdown" msgstr "_Atura" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Més ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/cs.po lxdm-0.2.0~svn2307+git20100408/po/cs.po --- lxdm-0.2.0~svn2307+git20100209/po/cs.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/cs.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,14 +2,16 @@ msgstr "" "Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: \n" -"Last-Translator: Michal Várady \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-03-29 22:55+0200\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Pootle 2.0.1\n" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" "X-Poedit-SourceCharset: utf-8\n" @@ -26,30 +28,34 @@ msgid "Language:" msgstr "Jazyk:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Uživatel:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "Neurčeno" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Heslo:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Výchozí" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Restartovat" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Vypnout" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" + #~ msgid "US English" #~ msgstr "Angličtina (USA)" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/da.po lxdm-0.2.0~svn2307+git20100408/po/da.po --- lxdm-0.2.0~svn2307+git20100209/po/da.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/da.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,36 +17,40 @@ #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Skrivebord:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Tastaturlayout:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Sprog:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" -msgstr "" +msgstr "Bruger:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "Uangivet:" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" -msgstr "" +msgstr "Adgangskode:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" -msgstr "" +msgstr "Standard" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "_Genstart" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" +msgstr "_Luk computeren" + +#: ../src/lang.c:88 +msgid "More ..." msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/de.po lxdm-0.2.0~svn2307+git20100408/po/de.po --- lxdm-0.2.0~svn2307+git20100209/po/de.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/de.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,12 +3,12 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Mark Trompell , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: lxdm r2100\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-05 04:09+0000\n" "PO-Revision-Date: 2010-01-13 00:24+0100\n" "Last-Translator: Christoph Wickert \n" "Language-Team: German\n" @@ -16,8 +16,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: German\n" +"X-Generator: Pootle 1.1.0\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" @@ -31,30 +31,34 @@ msgid "Language:" msgstr "Sprache:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Benutzer:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Nicht festgelegt" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Passwort:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Standard" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Neustarten" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Beenden" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Weitere…" + #~ msgid "US English" #~ msgstr "Englisch (USA)" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/el.po lxdm-0.2.0~svn2307+git20100408/po/el.po --- lxdm-0.2.0~svn2307+git20100209/po/el.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/el.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-08 04:09+0000\n" "PO-Revision-Date: 2010-01-12 14:24+0100\n" "Last-Translator: George Vasilakos \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "Γλώσσα:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Χρήστης:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Ακαθόριστο" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Κωδικός:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Προεπιλογή" -#: ../src/greeter.c:260 +#: ../src/greeter.c:439 msgid "_Reboot" msgstr "_Επανεκκίνηση" -#: ../src/greeter.c:264 +#: ../src/greeter.c:443 msgid "_Shutdown" msgstr "_Τερματισμός" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Περισσότερα ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/en_GB.po lxdm-0.2.0~svn2307+git20100408/po/en_GB.po --- lxdm-0.2.0~svn2307+git20100209/po/en_GB.po 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/po/en_GB.po 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,57 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-03-19 23:05:36 +0000\n" +"Last-Translator: Steve Cook \n" +"Language-Team: English UK en_GB\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_GB\n" + +#: ../data/lxdm.glade.h:1 +msgid "Desktop:" +msgstr "Desktop:" + +#: ../data/lxdm.glade.h:2 +msgid "Keyboard Layout:" +msgstr "Keyboard Layout:" + +#: ../data/lxdm.glade.h:3 +msgid "Language:" +msgstr "Language:" + +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 +msgid "User:" +msgstr "User:" + +#: ../src/gdm/gdm-languages.c:610 +msgid "Unspecified" +msgstr "Unspecified" + +#: ../src/greeter.c:100 +msgid "Password:" +msgstr "Password:" + +#: ../src/greeter.c:222 ../src/lang.c:76 +msgid "Default" +msgstr "Default" + +#: ../src/greeter.c:438 +msgid "_Reboot" +msgstr "_Reboot" + +#: ../src/greeter.c:442 +msgid "_Shutdown" +msgstr "_Shutdown" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/es.po lxdm-0.2.0~svn2307+git20100408/po/es.po --- lxdm-0.2.0~svn2307+git20100209/po/es.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/es.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,21 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-05 04:09+0000\n" "PO-Revision-Date: 2010-01-20 14:27+0200\n" "Last-Translator: Hugo Florentino \n" "Language-Team: LANGUAGE \n" -"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: es\n" "X-Generator: Pootle 2.0.1\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Idioma:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Usuario:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "No especificado" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Contraseña:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Predeterminado" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Reiniciar" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Apagar" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Más ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/es_VE.po lxdm-0.2.0~svn2307+git20100408/po/es_VE.po --- lxdm-0.2.0~svn2307+git20100209/po/es_VE.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/es_VE.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/et.po lxdm-0.2.0~svn2307+git20100408/po/et.po --- lxdm-0.2.0~svn2307+git20100209/po/et.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/et.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/eu.po lxdm-0.2.0~svn2307+git20100408/po/eu.po --- lxdm-0.2.0~svn2307+git20100209/po/eu.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/eu.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/fa.po lxdm-0.2.0~svn2307+git20100408/po/fa.po --- lxdm-0.2.0~svn2307+git20100209/po/fa.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/fa.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-25 11:50+0200\n" "Last-Translator: Ali \n" "Language-Team: LANGUAGE \n" -"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "زبان:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "کاربر:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "نامشخص" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "گذرواژه:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "پیش‌فرض" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "ـآغاز به کار مجدد" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "ـخاموش" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/fi.po lxdm-0.2.0~svn2307+git20100408/po/fi.po --- lxdm-0.2.0~svn2307+git20100209/po/fi.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/fi.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/fo.po lxdm-0.2.0~svn2307+git20100408/po/fo.po --- lxdm-0.2.0~svn2307+git20100209/po/fo.po 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/po/fo.po 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,59 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-06 11:14+0200\n" +"Last-Translator: Gunleif \n" +"Language-Team: LANGUAGE \n" +"Language: fo\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" + +#: ../data/lxdm.glade.h:1 +msgid "Desktop:" +msgstr "Skriviborð:" + +#: ../data/lxdm.glade.h:2 +msgid "Keyboard Layout:" +msgstr "Knappaborðssnið:" + +#: ../data/lxdm.glade.h:3 +msgid "Language:" +msgstr "Mál:" + +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 +msgid "User:" +msgstr "Brúkari:" + +#: ../src/gdm/gdm-languages.c:610 +msgid "Unspecified" +msgstr "Ikki tilskilað" + +#: ../src/greeter.c:100 +msgid "Password:" +msgstr "Atlát:" + +#: ../src/greeter.c:222 ../src/lang.c:76 +msgid "Default" +msgstr "Forsett" + +#: ../src/greeter.c:438 +msgid "_Reboot" +msgstr "_Endurbyrja" + +#: ../src/greeter.c:442 +msgid "_Shutdown" +msgstr "_Sløkk" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Meira ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/fr.po lxdm-0.2.0~svn2307+git20100408/po/fr.po --- lxdm-0.2.0~svn2307+git20100209/po/fr.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/fr.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,18 +2,21 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-06 15:33+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-07 09:38+0200\n" +"Last-Translator: Cilyan \n" "Language-Team: LANGUAGE \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" @@ -27,26 +30,30 @@ msgid "Language:" msgstr "Langage:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:123 ../src/greeter.c:171 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Utilisateur:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Non spécifié" -#: ../src/greeter.c:94 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Mot de passe:" -#: ../src/greeter.c:223 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Par défaut" -#: ../src/greeter.c:276 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Redémarrer" -#: ../src/greeter.c:280 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Éteindre" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Plus ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/frp.po lxdm-0.2.0~svn2307+git20100408/po/frp.po --- lxdm-0.2.0~svn2307+git20100209/po/frp.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/frp.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/gl.po lxdm-0.2.0~svn2307+git20100408/po/gl.po --- lxdm-0.2.0~svn2307+git20100209/po/gl.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/gl.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,51 +3,57 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-07 10:10+0200\n" +"Last-Translator: Indalecio \n" "Language-Team: LANGUAGE \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Escritorio:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Disposición de teclado:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Idioma:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" -msgstr "" +msgstr "Usuario:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "Sen especificar" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" -msgstr "" +msgstr "Contrasinal:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" -msgstr "" +msgstr "Predefinido" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "_Reiniciar" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" -msgstr "" +msgstr "_Apagar" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Máis ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/he.po lxdm-0.2.0~svn2307+git20100408/po/he.po --- lxdm-0.2.0~svn2307+git20100209/po/he.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/he.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,19 +2,19 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-05 04:09+0000\n" "PO-Revision-Date: 2010-01-13 23:22+0200\n" "Last-Translator: Yaron Shahrbani \n" "Language-Team: LANGUAGE \n" -"Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.0\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "שפה:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "משתמש:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "לא מוגדר" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "סיסמה:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "ברירת מחדל" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "ה_פעלה מחדש" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_כיבוי" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "עוד ..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/hr.po lxdm-0.2.0~svn2307+git20100408/po/hr.po --- lxdm-0.2.0~svn2307+git20100209/po/hr.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/hr.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/hu.po lxdm-0.2.0~svn2307+git20100408/po/hu.po --- lxdm-0.2.0~svn2307+git20100209/po/hu.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/hu.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-17 18:24+0100\n" "Last-Translator: SZERVÁC Attila \n" "Language-Team: HUNGARIAN \n" @@ -30,29 +30,30 @@ msgid "Language:" msgstr "Nyelv:" -#: ../data/lxdm.glade.h:4 -#: ../src/greeter.c:116 -#: ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Felhasználó" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Meghatározatlan" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Jelszó:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Alap" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "Újra_indítás" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Leállítás" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/id.po lxdm-0.2.0~svn2307+git20100408/po/id.po --- lxdm-0.2.0~svn2307+git20100209/po/id.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/id.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: 2010-01-30 06:01+0200\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-03-19 14:51+0200\n" "Last-Translator: Rahman Yusri Aftian \n" "Language-Team: LANGUAGE \n" -"Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Bahasa" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Pengguna" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Tidak spesifik" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Sandi" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Default" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "_Hidupkan Ulang" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Matikan" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/it.po lxdm-0.2.0~svn2307+git20100408/po/it.po --- lxdm-0.2.0~svn2307+git20100209/po/it.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/it.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: lxem r2100\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: 2010-01-16 17:58+0200\n" -"Last-Translator: Andrea \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-04 10:22+0100\n" +"Last-Translator: Andrea Florio \n" "Language-Team: Italian \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.0\n" "X-Poedit-Language: Italian\n" @@ -31,44 +31,47 @@ msgid "Language:" msgstr "Lingua:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 +#: ../src/greeter.c:129 +#: ../src/greeter.c:170 msgid "User:" msgstr "Utente:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Non specificato" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Password:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 +#: ../src/lang.c:76 msgid "Default" msgstr "Predefinito" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Riavvia" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Spegni" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Di più..." + #~ msgid "US English" #~ msgstr "Inglese US" - #~ msgid "Simpllified Chinese" #~ msgstr "Cinese Semplificato" - #~ msgid "Traditional Chinese" #~ msgstr "Cinese Tradizionale" - #~ msgid "German" #~ msgstr "Tedesco" - #~ msgid "Italian" #~ msgstr "Italiano" - #~ msgid "Portuguese" #~ msgstr "Portoghese" + diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ja.po lxdm-0.2.0~svn2307+git20100408/po/ja.po --- lxdm-0.2.0~svn2307+git20100209/po/ja.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ja.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxdm 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2009-10-24 14:42+0900\n" "Last-Translator: Hironao Komatsu \n" "Language-Team: Japanese \n" @@ -29,30 +29,34 @@ msgid "Language:" msgstr "言語:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "ユーザ:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "パスワード:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "デフォルト" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "再起動(_R)" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "シャットダウン(_S)" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" + #~ msgid "US English" #~ msgstr "英語(US)" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ko.po lxdm-0.2.0~svn2307+git20100408/po/ko.po --- lxdm-0.2.0~svn2307+git20100209/po/ko.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ko.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/lt.po lxdm-0.2.0~svn2307+git20100408/po/lt.po --- lxdm-0.2.0~svn2307+git20100209/po/lt.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/lt.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-14 10:53+0200\n" "Last-Translator: Julius Vitkauskas \n" "Language-Team: LANGUAGE \n" -"Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: lt\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: Pootle 2.0.0\n" @@ -31,26 +31,30 @@ msgid "Language:" msgstr "Kalba:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Vartotojas:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Nenurodyta" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Slaptažodis:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Numatyta" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Perkrauti" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Išjungti" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/lxdm.pot lxdm-0.2.0~svn2307+git20100408/po/lxdm.pot --- lxdm-0.2.0~svn2307+git20100209/po/lxdm.pot 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/lxdm.pot 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-24 21:50+0800\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:132 ../src/greeter.c:181 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:103 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:232 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:285 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:289 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ml.po lxdm-0.2.0~svn2307+git20100408/po/ml.po --- lxdm-0.2.0~svn2307+git20100209/po/ml.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ml.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ms.po lxdm-0.2.0~svn2307+git20100408/po/ms.po --- lxdm-0.2.0~svn2307+git20100209/po/ms.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ms.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/nb.po lxdm-0.2.0~svn2307+git20100408/po/nb.po --- lxdm-0.2.0~svn2307+git20100209/po/nb.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/nb.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/nl.po lxdm-0.2.0~svn2307+git20100408/po/nl.po --- lxdm-0.2.0~svn2307+git20100209/po/nl.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/nl.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: lxdm r2100\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-02-03 01:25+0200\n" "Last-Translator: Horatio \n" "Language-Team: Dutch\n" -"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" @@ -31,30 +31,34 @@ msgid "Language:" msgstr "Taal:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Gebruiker:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Geen specificatie" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Paswoord:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Standaard" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Herstarten" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Afsluiten" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" + #~ msgid "US English" #~ msgstr "Engels (US)" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/nn.po lxdm-0.2.0~svn2307+git20100408/po/nn.po --- lxdm-0.2.0~svn2307+git20100209/po/nn.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/nn.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/pl.po lxdm-0.2.0~svn2307+git20100408/po/pl.po --- lxdm-0.2.0~svn2307+git20100209/po/pl.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/pl.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,12 +3,12 @@ # Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Grzegorz Gibas , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-06 04:09+0000\n" "PO-Revision-Date: 2010-01-13 22:56+0200\n" "Last-Translator: Artur Kruszewski \n" "Language-Team: Polish\n" @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"Language: pl\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.0\n" #: ../data/lxdm.glade.h:1 @@ -32,30 +32,34 @@ msgid "Language:" msgstr "Język:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Użytkownik:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Niezdefiniowany" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Hasło:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Domyślny" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Uruchom ponownie" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Wyłącz komputer" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Więcej ..." + #~ msgid "US English" #~ msgstr "Angielski US" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/POTFILES.in lxdm-0.2.0~svn2307+git20100408/po/POTFILES.in --- lxdm-0.2.0~svn2307+git20100209/po/POTFILES.in 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/POTFILES.in 2010-04-08 21:14:51.000000000 +0100 @@ -1,4 +1,5 @@ data/lxdm.glade src/gdm/gdm-languages.c src/greeter.c +src/lang.c diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ps.po lxdm-0.2.0~svn2307+git20100408/po/ps.po --- lxdm-0.2.0~svn2307+git20100209/po/ps.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ps.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/pt_BR.po lxdm-0.2.0~svn2307+git20100408/po/pt_BR.po --- lxdm-0.2.0~svn2307+git20100209/po/pt_BR.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/pt_BR.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-07 04:34+0000\n" +"POT-Creation-Date: 2010-04-07 04:09+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,26 +27,30 @@ msgid "Language:" msgstr "Linguagem:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:123 ../src/greeter.c:171 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Usuário:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Não especificado" -#: ../src/greeter.c:94 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Senha:" -#: ../src/greeter.c:223 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Padrão" -#: ../src/greeter.c:276 +#: ../src/greeter.c:439 msgid "_Reboot" msgstr "_Reiniciar" -#: ../src/greeter.c:280 +#: ../src/greeter.c:443 msgid "_Shutdown" msgstr "De_sligar" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Mais..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/pt.po lxdm-0.2.0~svn2307+git20100408/po/pt.po --- lxdm-0.2.0~svn2307+git20100209/po/pt.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/pt.po 2010-04-08 21:14:51.000000000 +0100 @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-06 04:09+0000\n" "PO-Revision-Date: 2010-01-12 14:47+0100\n" "Last-Translator: Sérgio Marques \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" +"X-Generator: Pootle 1.1.0\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" @@ -29,30 +29,34 @@ msgid "Language:" msgstr "Idioma:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Utilizador:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Não especificado" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Palavra-passe:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Omissão" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Reiniciar" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Desligar" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Mais..." + #~ msgid "US English" #~ msgstr "Inglês US" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ro.po lxdm-0.2.0~svn2307+git20100408/po/ro.po --- lxdm-0.2.0~svn2307+git20100209/po/ro.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ro.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: LXDE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-24 11:10-0800\n" "Last-Translator: alexxed \n" "Language-Team: Romanian \n" @@ -25,26 +25,30 @@ msgid "Language:" msgstr "Limbă:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Utilizator:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Nespecificat" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Parolă:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Implicit" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Repornire" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Oprire" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ru.po lxdm-0.2.0~svn2307+git20100408/po/ru.po --- lxdm-0.2.0~svn2307+git20100209/po/ru.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ru.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,13 +2,17 @@ msgstr "" "Project-Id-Version: lxdm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: \n" -"Last-Translator: HsH \n" -"Language-Team: \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-06 16:06+0200\n" +"Last-Translator: Max \n" +"Language-Team: \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Pootle 2.0.1\n" "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" "X-Poedit-SourceCharset: utf-8\n" @@ -25,30 +29,34 @@ msgid "Language:" msgstr "Язык:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Пользователь:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Незадано" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Пароль:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "По умолчанию" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Перезагрузка" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Выключение" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Ещё ..." + #~ msgid "US English" #~ msgstr "Английский" @@ -66,5 +74,3 @@ #~ msgid "Portuguese" #~ msgstr "Португальский" - - diff -Nru lxdm-0.2.0~svn2307+git20100209/po/sk.po lxdm-0.2.0~svn2307+git20100408/po/sk.po --- lxdm-0.2.0~svn2307+git20100209/po/sk.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/sk.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-16 19:21+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: LANGUAGE \n" @@ -27,29 +27,30 @@ msgid "Language:" msgstr "Jazyk:" -#: ../data/lxdm.glade.h:4 -#: ../src/greeter.c:116 -#: ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Používateľ:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Neurčené" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Heslo:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Predvolené" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Reštartovať" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Vypnúť" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/sl.po lxdm-0.2.0~svn2307+git20100408/po/sl.po --- lxdm-0.2.0~svn2307+git20100209/po/sl.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/sl.po 2010-04-08 21:14:51.000000000 +0100 @@ -3,51 +3,58 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-02-17 15:23+0200\n" +"Last-Translator: Matej \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" +"X-Generator: Pootle 2.0.1\n" #: ../data/lxdm.glade.h:1 msgid "Desktop:" -msgstr "" +msgstr "Namizje:" #: ../data/lxdm.glade.h:2 msgid "Keyboard Layout:" -msgstr "" +msgstr "Razpored tipk:" #: ../data/lxdm.glade.h:3 msgid "Language:" -msgstr "" +msgstr "Jezik:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" -msgstr "" +msgstr "Uporabnik:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" -msgstr "" +msgstr "Nedoločeno" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" -msgstr "" +msgstr "Geslo:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" -msgstr "" +msgstr "Privzeto" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" -msgstr "" +msgstr "_Ponovni zagon" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" +msgstr "_Izklop" + +#: ../src/lang.c:88 +msgid "More ..." msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/sr.po lxdm-0.2.0~svn2307+git20100408/po/sr.po --- lxdm-0.2.0~svn2307+git20100209/po/sr.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/sr.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/sv.po lxdm-0.2.0~svn2307+git20100408/po/sv.po --- lxdm-0.2.0~svn2307+git20100209/po/sv.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/sv.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,16 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" -"PO-Revision-Date: 2010-01-12 01:52+0100\n" -"Last-Translator: Martin Bagge \n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" +"PO-Revision-Date: 2010-04-08 00:48+0200\n" +"Last-Translator: Martin \n" "Language-Team: Swedish \n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: Sweden\n" @@ -30,30 +32,34 @@ msgid "Language:" msgstr "Språk:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Användare:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Ospecificerat" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Lösenord:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Standard" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Starta om" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Avsluta" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Mer..." + #~ msgid "US English" #~ msgstr "Amerikansk engelska" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/th.po lxdm-0.2.0~svn2307+git20100408/po/th.po --- lxdm-0.2.0~svn2307+git20100209/po/th.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/th.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/tr.po lxdm-0.2.0~svn2307+git20100408/po/tr.po --- lxdm-0.2.0~svn2307+git20100209/po/tr.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/tr.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-26 03:29+0200\n" "Last-Translator: Kılıç \n" "Language-Team: LANGUAGE \n" -"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Dil:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Kullanıcı:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Belirlenmemiş" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Parola" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Öntanımlı" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Yeniden Başlat" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Kapat" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/uk.po lxdm-0.2.0~svn2307+git20100408/po/uk.po --- lxdm-0.2.0~svn2307+git20100209/po/uk.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/uk.po 2010-04-08 21:14:51.000000000 +0100 @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-07 04:09+0000\n" "PO-Revision-Date: 2010-01-12 23:31+0100\n" "Last-Translator: Y P \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "Мова:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Користувач:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Невизначено" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Пароль:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "По замовчуванню" -#: ../src/greeter.c:260 +#: ../src/greeter.c:439 msgid "_Reboot" msgstr "_Перезавантажити" -#: ../src/greeter.c:264 +#: ../src/greeter.c:443 msgid "_Shutdown" msgstr "_Виключити" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "Більше..." diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ur_PK.po lxdm-0.2.0~svn2307+git20100408/po/ur_PK.po --- lxdm-0.2.0~svn2307+git20100209/po/ur_PK.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ur_PK.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/ur.po lxdm-0.2.0~svn2307+git20100408/po/ur.po --- lxdm-0.2.0~svn2307+git20100209/po/ur.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/ur.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,26 +28,30 @@ msgid "Language:" msgstr "" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/vi.po lxdm-0.2.0~svn2307+git20100408/po/vi.po --- lxdm-0.2.0~svn2307+git20100209/po/vi.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/vi.po 2010-04-08 21:14:51.000000000 +0100 @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2010-01-26 11:48+0200\n" "Last-Translator: Hiếu \n" "Language-Team: LANGUAGE \n" -"Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" @@ -30,26 +30,30 @@ msgid "Language:" msgstr "Ngôn ngữ:" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "Người dùng:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "Chưa xác định" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "Mật khẩu:" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "Mặc định" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "_Khởi động lại" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "_Tắt máy" + +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/zh_CN.po lxdm-0.2.0~svn2307+git20100408/po/zh_CN.po --- lxdm-0.2.0~svn2307+git20100209/po/zh_CN.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/zh_CN.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxdm 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2009-10-21 22:30+0800\n" "Last-Translator: dgod \n" "Language-Team: Chinese (simplified)\n" @@ -28,30 +28,34 @@ msgid "Language:" msgstr "语言：" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "用户：" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "密码：" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "默认" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "重启(_R)" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "关机(_S)" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "更多 ..." + #~ msgid "US English" #~ msgstr "美国英语" diff -Nru lxdm-0.2.0~svn2307+git20100209/po/zh_TW.po lxdm-0.2.0~svn2307+git20100408/po/zh_TW.po --- lxdm-0.2.0~svn2307+git20100209/po/zh_TW.po 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/po/zh_TW.po 2010-04-08 21:14:51.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxdm 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-12 01:46+0100\n" +"POT-Creation-Date: 2010-04-04 14:44+0800\n" "PO-Revision-Date: 2009-11-07 19:32+0800\n" "Last-Translator: Hong Jen Yee (PCMan) \n" "Language-Team: Chinese (traditional)\n" @@ -28,30 +28,34 @@ msgid "Language:" msgstr "語言：" -#: ../data/lxdm.glade.h:4 ../src/greeter.c:116 ../src/greeter.c:165 +#: ../data/lxdm.glade.h:4 ../src/greeter.c:129 ../src/greeter.c:170 msgid "User:" msgstr "使用者:" -#: ../src/gdm/gdm-languages.c:609 +#: ../src/gdm/gdm-languages.c:610 msgid "Unspecified" msgstr "" -#: ../src/greeter.c:87 +#: ../src/greeter.c:100 msgid "Password:" msgstr "密碼：" -#: ../src/greeter.c:211 +#: ../src/greeter.c:222 ../src/lang.c:76 msgid "Default" msgstr "預設" -#: ../src/greeter.c:260 +#: ../src/greeter.c:438 msgid "_Reboot" msgstr "重新開機 (_R)" -#: ../src/greeter.c:264 +#: ../src/greeter.c:442 msgid "_Shutdown" msgstr "關機 (_S)" +#: ../src/lang.c:88 +msgid "More ..." +msgstr "" + #~ msgid "US English" #~ msgstr "美國英語" diff -Nru lxdm-0.2.0~svn2307+git20100209/src/gdm/gdm-languages.c lxdm-0.2.0~svn2307+git20100408/src/gdm/gdm-languages.c --- lxdm-0.2.0~svn2307+git20100209/src/gdm/gdm-languages.c 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/src/gdm/gdm-languages.c 2010-04-08 21:14:51.000000000 +0100 @@ -501,7 +501,7 @@ int ndirents; int cnt; - ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort); + ndirents = scandir (ISO_CODES_LOCALESDIR, &dirents, select_dirs, alphasort); for (cnt = 0; cnt < ndirents; ++cnt) { add_locale (dirents[cnt]->d_name); @@ -529,6 +529,7 @@ collect_locales_from_directory (); } + } static gboolean diff -Nru lxdm-0.2.0~svn2307+git20100209/src/greeter.c lxdm-0.2.0~svn2307+git20100408/src/greeter.c --- lxdm-0.2.0~svn2307+git20100209/src/greeter.c 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/src/greeter.c 2010-04-13 00:17:04.000000000 +0100 @@ -43,8 +43,13 @@ N_LANG_COLS }; +#ifndef VCONFIG_FILE +#define VCONFIG_FILE "/var/run/lxdm/lxdm.ini" +#endif + static gboolean config_changed = FALSE; static GKeyFile *config; +static GKeyFile * var_config; static GtkWidget* win; static GtkWidget* prompt; static GtkWidget* login_entry; @@ -56,6 +61,7 @@ static GtkWidget* exit; static GtkWidget* exit_menu; +static GtkWidget *lang_menu; static char* user = NULL; static char* pass = NULL; @@ -133,30 +139,22 @@ //FIXME: is session leaked? } - tmp = g_key_file_get_string(config, "base", "last_session", NULL); + tmp = g_key_file_get_string(var_config, "base", "last_session", NULL); if( g_strcmp0(tmp, session_desktop_file) ) { - g_key_file_set_string(config, "base", "last_session", session_desktop_file); + g_key_file_set_string(var_config, "base", "last_session", session_desktop_file); config_changed = TRUE; } g_free(tmp); - tmp = g_key_file_get_string(config, "base", "last_lang", NULL); + tmp = g_key_file_get_string(var_config, "base", "last_lang", NULL); if( g_strcmp0(tmp, session_lang) ) { - g_key_file_set_string(config, "base", "last_lang", session_lang); + g_key_file_set_string(var_config, "base", "last_lang", session_lang); config_changed = TRUE; } g_free(tmp); - if( config_changed ) - { - gsize len; - char* data = g_key_file_to_data(config, &len, NULL); - g_file_set_contents(CONFIG_FILE, data, len, NULL); - g_free(data); - } - printf("login user=%s pass=%s session=%s lang=%s\n", user, pass, session_exec, session_lang); @@ -186,7 +184,7 @@ if( !dir ) return; - last = g_key_file_get_string(config, "base", "last_session", NULL); + last = g_key_file_get_string(var_config, "base", "last_session", NULL); list = gtk_list_store_new(N_SESSION_COLS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); kf = g_key_file_new(); @@ -249,8 +247,8 @@ if(p) *p=0; //temp=g_strdup_printf("\xe2\x80\x8e%s\t\t\xe2\x80\xab%s",lang,desc); - if(lang2[0]) - temp=g_strdup_printf("%s\t%s",lang2,desc); + if(lang2[0] && lang2[0]!='~') + temp=g_strdup_printf("%s\t%s",lang2,desc?desc:""); else temp=g_strdup(desc); g_free(lang2); @@ -272,6 +270,121 @@ return ret; } +static void on_menu_lang_select(GtkMenuItem *item,gpointer user_data) +{ + GtkTreeIter iter; + char *sel=(char*)user_data; + int i; + gboolean res; + GtkTreeModel *list; + int active=-1; + char *temp; + GPtrArray *array; + if(!sel || !sel[0]) return; + + list=gtk_combo_box_get_model(GTK_COMBO_BOX(lang)); + res=gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list),&iter); + for(i=0;res==TRUE;i++) + { + gtk_tree_model_get(GTK_TREE_MODEL(list),&iter,1,&temp,-1); + if(!strcmp(temp,sel)) + { + g_free(temp); + active=i; + break; + } + g_free(temp); + res=gtk_tree_model_iter_next(GTK_TREE_MODEL(list),&iter); + } + if(active>=0) + { + gtk_combo_box_set_active(GTK_COMBO_BOX(lang),active); + return; + } + gtk_list_store_append((GtkListStore*)list, &iter); + temp=(char*)gtk_menu_item_get_label(item); + gtk_list_store_set((GtkListStore*)list, &iter, + COL_LANG_DISPNAME, temp, + COL_LANG, sel, -1); + gtk_combo_box_set_active_iter(GTK_COMBO_BOX(lang),&iter); + + array=g_ptr_array_new(); + res=gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list),&iter); + while(res==TRUE) + { + gtk_tree_model_get(GTK_TREE_MODEL(list),&iter,1,&temp,-1); + if(!temp || !temp[0] || temp[0]=='~') + { + g_free(temp); + } + else + { + g_ptr_array_add(array,temp); + } + res=gtk_tree_model_iter_next(GTK_TREE_MODEL(list),&iter); + } + g_key_file_set_string_list(var_config,"base","last_langs",(void*)array->pdata,array->len); + config_changed=TRUE; + g_ptr_array_foreach(array,(GFunc)g_free,0); + g_ptr_array_free(array,TRUE); +} + +static void load_menu_lang_cb(void *arg, char *lang, char *desc) +{ + GtkWidget *menu=GTK_WIDGET(arg); + GtkWidget* item; + + gchar *temp,*p,*lang2; + + lang2=g_strdup(lang); + p=strchr(lang2,'.'); + if(p) *p=0; + + if(lang2[0] && lang2[0]!='~') + temp=g_strdup_printf("%s\t%s",lang2,desc?desc:""); + else + temp=g_strdup(desc); + g_free(lang2); + + item = gtk_menu_item_new_with_label(temp); + g_signal_connect(item, "activate", G_CALLBACK(on_menu_lang_select), g_strdup(lang)); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); + g_free(temp); +} + +static void show_all_languages(void) +{ + if(!lang_menu) + { + lang_menu=gtk_menu_new(); + lxdm_load_langs(var_config,TRUE,lang_menu,load_menu_lang_cb); + gtk_widget_show_all(lang_menu); + } + gtk_menu_popup(GTK_MENU(lang_menu),NULL,NULL,NULL,NULL,0,gtk_get_current_event_time()); +} + +static void on_lang_changed(GtkComboBox *widget) +{ + GtkTreeIter it; + if( gtk_combo_box_get_active_iter(widget, &it) ) + { + GtkListStore *list=(GtkListStore*)gtk_combo_box_get_model(GTK_COMBO_BOX(lang)); + char *lang=NULL; + gtk_tree_model_get(GTK_TREE_MODEL(list), &it, 1, &lang, -1); + if(lang[0]=='~') + { + gtk_combo_box_set_active(widget,0); + show_all_languages(); + } + g_free(lang); + } + else + { + return; + } + +} + static void load_langs() { GtkListStore* list; @@ -281,8 +394,8 @@ list = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(list),0,GTK_SORT_ASCENDING); gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(list),0,lang_cmpr,NULL,NULL); - lxdm_load_langs(list, load_lang_cb); - lang_str = g_key_file_get_string(config, "base", "last_lang", NULL); + lxdm_load_langs(var_config,FALSE,list, load_lang_cb); + lang_str = g_key_file_get_string(var_config, "base", "last_lang", NULL); if(lang_str && lang_str[0]) { gboolean res; @@ -295,9 +408,11 @@ gtk_tree_model_get(GTK_TREE_MODEL(list),&iter,1,&lang,-1); if(!strcmp(lang,lang_str)) { + g_free(lang); active=i; break; } + g_free(lang); res=gtk_tree_model_iter_next(GTK_TREE_MODEL(list),&iter); if(!res) break; } @@ -307,6 +422,8 @@ gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(lang), 0); gtk_combo_box_set_active(GTK_COMBO_BOX(lang), active < 0 ? 0 : active); g_object_unref(list); + + g_signal_connect(G_OBJECT(lang),"changed",G_CALLBACK(on_lang_changed),NULL); } static void on_exit_clicked(GtkButton* exit_btn, gpointer user_data) @@ -470,7 +587,7 @@ load_langs(); } - if( w = (GtkWidget*)gtk_builder_get_object(builder, "time") ) + if( (w = (GtkWidget*)gtk_builder_get_object(builder, "time"))!=NULL ) { guint timeout = g_timeout_add(1000, (GSourceFunc)on_timeout, w); g_signal_connect_swapped(w, "destroy", @@ -551,7 +668,7 @@ if( ret != G_IO_STATUS_NORMAL ) return FALSE; - if( !strncmp(str, "quit", 4) ) + if( !strncmp(str, "quit", 4) || !strncmp(str, "exit",4)) gtk_main_quit(); else if( !strncmp(str, "reset", 5) ) { @@ -571,7 +688,6 @@ void set_root_background(void) { - char *p; GdkWindow *root = gdk_get_default_root_window(); /* set background */ @@ -627,6 +743,10 @@ config = g_key_file_new(); g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS, NULL); + var_config = g_key_file_new(); + g_key_file_set_list_separator(var_config, ' '); + g_key_file_load_from_file(var_config,VCONFIG_FILE,0,NULL); + gtk_init(&arc, &arg); set_background(); @@ -655,16 +775,18 @@ /* use line buffered stdout for inter-process-communcation of * single-line-commands */ setvbuf(stdout, NULL, _IOLBF, 0 ); + gtk_main(); if( config_changed ) { gsize len; - char* data = g_key_file_to_data(config, &len, NULL); - g_file_set_contents(CONFIG_FILE, data, len, NULL); + char* data = g_key_file_to_data(var_config, &len, NULL); + g_file_set_contents(VCONFIG_FILE, data, len, NULL); g_free(data); } g_key_file_free(config); + g_key_file_free(var_config); return 0; } diff -Nru lxdm-0.2.0~svn2307+git20100209/src/lang.c lxdm-0.2.0~svn2307+git20100408/src/lang.c --- lxdm-0.2.0~svn2307+git20100209/src/lang.c 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/src/lang.c 2010-04-08 21:14:51.000000000 +0100 @@ -22,7 +22,9 @@ #include "lang.h" #include +#include #include +#include #include #ifdef HAVE_CONFIG_H @@ -35,21 +37,82 @@ #include "gdm/gdm-languages.h" -void lxdm_load_langs(void *arg, void (*cb)(void *arg, char *lang, char *desc)) +static int cmpstr(const void *p1, const void *p2) { - char **langs, **lang; + return strcmp(* (char * const *) p1, * (char * const *) p2); +} + +static char **lxdm_get_all_language_names(void) +{ +#if 0 + GPtrArray *array; + FILE *fp; + array=g_ptr_array_new(); + fp=fopen(LXDM_DATA_DIR "/lang.txt","r"); + if(fp) + { + char line[128]; + while(fgets(line,128,fp)!=NULL) + { + char *p=strchr(line,'\n'); + if(*p) *p=0; + g_ptr_array_add(array,g_strdup(line)); + } + fclose(fp); + } + g_ptr_array_add (array, NULL); + return (char **) g_ptr_array_free (array, FALSE); +#else + char **list,**lang; + int len; + list=gdm_get_all_language_names(); + if(!list) return NULL; + for(lang=list;*lang!=NULL;lang++) + { + char *normal=gdm_normalize_language_name(*lang); + if(normal) + { + g_free(*lang); + *lang=normal; + } + } + len=g_strv_length(list); + qsort(list,len,sizeof(char*),(void*)cmpstr); + return list; +#endif +} + +static char **lxdm_get_config_language_names(GKeyFile *config) +{ + char **list; - //cb(arg,"C","Default"); - cb(arg, "", "Default"); /* default is to use the system wide settings ,not use the "C" */ + list=g_key_file_get_string_list(config,"base","last_langs",NULL,NULL); + if(!list) + { + list=g_malloc0(sizeof(char*)); + } + return list; +} - /* come up with available languages with gdm-languages */ - langs = gdm_get_all_language_names(); - for( lang = langs; *lang; ++lang ) +void lxdm_load_langs(GKeyFile *config, gboolean all, void *arg, void (*cb)(void *arg, char *lang, char *desc)) +{ + char **lang; + int i; + + cb(arg, "", _("Default")); /* default is to use the system wide settings ,not use the "C" */ + + lang = all?lxdm_get_all_language_names():lxdm_get_config_language_names(config); + if(!lang) return; + + for(i=0;lang[i]!=NULL;i++) { - char* normal = gdm_normalize_language_name(*lang); - char* readable = gdm_get_language_from_name(normal, normal); - cb(arg, normal, readable); + char *readable=gdm_get_language_from_name(lang[i],lang[i]); + cb(arg,lang[i],readable); g_free(readable); - g_free(normal); } + + g_strfreev(lang); + + if(!all) cb(arg,"~",_("More ...")); } + diff -Nru lxdm-0.2.0~svn2307+git20100209/src/lang.h lxdm-0.2.0~svn2307+git20100408/src/lang.h --- lxdm-0.2.0~svn2307+git20100209/src/lang.h 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/src/lang.h 2010-04-08 21:14:51.000000000 +0100 @@ -23,7 +23,8 @@ #ifndef _LXDM_LANG_H_ #define _LXDM_LANG_H_ -void lxdm_load_langs(void *arg,void (*cb)(void *arg,char *lang,char *desc)); +#include +void lxdm_load_langs(GKeyFile *config,gboolean all,void *arg,void (*cb)(void *arg,char *lang,char *desc)); #endif/*_LXDM_LANG_H_*/ diff -Nru lxdm-0.2.0~svn2307+git20100209/src/langlist.c lxdm-0.2.0~svn2307+git20100408/src/langlist.c --- lxdm-0.2.0~svn2307+git20100209/src/langlist.c 1970-01-01 01:00:00.000000000 +0100 +++ lxdm-0.2.0~svn2307+git20100408/src/langlist.c 2010-04-08 21:14:51.000000000 +0100 @@ -0,0 +1,17 @@ +#include +#include +#include "gdm/gdm-languages.h" + +int main(void) +{ + char **list,**lang; + list=gdm_get_all_language_names(); + for(lang=list;*lang!=NULL;lang++) + { + char *normal=gdm_normalize_language_name(*lang); + printf("%s\n",normal); + g_free(normal); + } + return 0; +} + diff -Nru lxdm-0.2.0~svn2307+git20100209/src/lxdm.c lxdm-0.2.0~svn2307+git20100408/src/lxdm.c --- lxdm-0.2.0~svn2307+git20100209/src/lxdm.c 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/src/lxdm.c 2010-04-13 00:17:04.000000000 +0100 @@ -53,25 +53,31 @@ #include #include +#include #include -#if HAVE_LIBXMU -#include -#endif +#include #if HAVE_LIBPAM #include +#include #endif #if HAVE_LIBCK_CONNECTOR -#include "ck-connector.h" +#include +#endif + +#if HAVE_LIBXAU +#include +#include #endif #include "lxdm.h" GKeyFile *config; static pid_t server; +static guint server_watch; #if HAVE_LIBCK_CONNECTOR static CkConnector *ckc; #endif @@ -80,15 +86,22 @@ static char *self; static pid_t child; static int reason; -static char mcookie[33]; static int old_tty=1,tty = 7; +#ifndef DISABLE_XAUTH +static char mcookie[33]; +#endif + +#if HAVE_LIBXAU +static Xauth x_auth; +#endif + static int get_active_vt(void) { int console_fd; struct vt_stat console_state = { 0 }; - console_fd = open("/dev/tty0", O_RDONLY | O_NOCTTY); + console_fd = open("/dev/console", O_RDONLY | O_NOCTTY); if( console_fd < 0 ) goto out; @@ -137,7 +150,7 @@ static void plymouth_prepare_transition(void) { -// g_spawn_command_line_sync ("/bin/plymouth deactivate",NULL,NULL,NULL,NULL); + g_spawn_command_line_sync ("/bin/plymouth deactivate",NULL,NULL,NULL,NULL); } void lxdm_get_tty(void) @@ -208,9 +221,9 @@ exit(0); } -void lxdm_quit_self(void) +void lxdm_quit_self(int code) { - reason = 1; + reason = (code?code:255); exit(0); } @@ -293,15 +306,21 @@ g_slist_free(l); } +#ifndef DISABLE_XAUTH void create_server_auth(void) { GRand *h; - const char *digits = "0123456789abcdef"; - int i, r, hex = 0; + int i; char *authfile; char *tmp; h = g_rand_new(); +#if HAVE_LIBXAU + for (i=0;i<16;i++) + mcookie[i]=(char)g_rand_int(h); +#else + const char *digits = "0123456789abcdef"; + int r,hex=0; for( i = 0; i < 31; i++ ) { r = g_rand_int(h) % 16; @@ -315,25 +334,54 @@ r = g_rand_int(h) % 5 + 10; mcookie[31] = digits[r]; mcookie[32] = 0; +#endif g_rand_free(h); authfile = g_key_file_get_string(config, "base", "authfile", 0); - if( !authfile ) - authfile = g_strdup("/var/run/lxdm.auth"); + if(!authfile) + { + mkdir("/var/run/lxdm",0700); + authfile = g_strdup("/var/run/lxdm/lxdm.auth"); + } tmp = g_strdup_printf("XAUTHORITY=%s", authfile); putenv(tmp); g_free(tmp); remove(authfile); +#if HAVE_LIBXAU + FILE *fp=fopen(authfile,"wb"); + if(fp) + { + static char xau_address[80]; + static char xau_number[16]; + static char xau_name[]="MIT-MAGIC-COOKIE-1"; + struct utsname uts; + uname(&uts); + sprintf(xau_address, "%s", uts.nodename); + strcpy(xau_number,getenv("DISPLAY")+1); // DISPLAY always exist at lxdm + x_auth.family = FamilyLocal; + x_auth.address = xau_address; + x_auth.number = xau_number; + x_auth.name = xau_name; + x_auth.address_length = strlen(xau_address); + x_auth.number_length = strlen(xau_number); + x_auth.name_length = strlen(xau_name); + x_auth.data = mcookie; + x_auth.data_length = 16; + XauWriteAuth(fp,&x_auth); + fclose(fp); + } +#else tmp = g_strdup_printf("xauth -q -f %s add %s . %s", authfile, getenv("DISPLAY"), mcookie); system(tmp); g_free(tmp); + +#endif g_free(authfile); } void create_client_auth(char *home) { - char *tmp; char *authfile; if( getuid() == 0 ) /* root don't need it */ @@ -341,13 +389,50 @@ authfile = g_strdup_printf("%s/.Xauthority", home); remove(authfile); - tmp = g_strdup_printf("xauth -q -f %s add %s . %s", +#if HAVE_LIBXAU + FILE *fp=fopen(authfile,"wb"); + if(fp) + { + XauWriteAuth(fp,&x_auth); + fclose(fp); + } +#else + char *tmp = g_strdup_printf("xauth -q -f %s add %s . %s", authfile, getenv("DISPLAY"), mcookie); system(tmp); - g_free(authfile); g_free(tmp); +#endif + g_free(authfile); +} +#endif + +#if HAVE_LIBPAM +static char *user_pass[2]; + +static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg) +{ + int result = PAM_SUCCESS; + int i; + *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response)); + for(i=0;imsg_style){ + case PAM_PROMPT_ECHO_ON: + resp[i]->resp=strdup(user_pass[0]); + break; + case PAM_PROMPT_ECHO_OFF: + resp[i]->resp=strdup(user_pass[1]); + break; + default: + break; + } + } + return result; } +static pam_handle_t *pamh; +static struct pam_conv conv={.conv=do_conv,.appdata_ptr=user_pass}; + int lxdm_auth_user(char *user, char *pass, struct passwd **ppw) { struct passwd *pw; @@ -388,36 +473,44 @@ if( strstr(pw->pw_shell, "nologin") ) return AUTH_PRIV; *ppw = pw; +#if HAVE_LIBPAM + if(pamh) pam_end(pamh,0); + if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &pamh)) + pamh=NULL; + else + { + user_pass[0]=user;user_pass[1]=pass; + pam_authenticate(pamh,PAM_SILENT); + user_pass[0]=0;user_pass[1]=0; + } +#endif return AUTH_SUCCESS; } -#if HAVE_LIBPAM -static pam_handle_t *pamh; -static struct pam_conv conv; - void setup_pam_session(struct passwd *pw,char *session_name) { int err; char x[256]; - - if( PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &pamh) ) + + if(!pamh && PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, &pamh)) { pamh = NULL; return; } + if(!pamh) return; sprintf(x, "tty%d", tty); pam_set_item(pamh, PAM_TTY, x); #ifdef PAM_XDISPLAY - pam_set_item( pamh, PAM_XDISPLAY, getenv("DISPLAY") ); + pam_set_item( pamh, PAM_XDISPLAY, getenv("DISPLAY") ); #endif - if(session_name && session_name[0]) - { - char *env; - env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name); - pam_putenv (pamh, env); - g_free (env); - } + if(session_name && session_name[0]) + { + char *env; + env = g_strdup_printf ("DESKTOP_SESSION=%s", session_name); + pam_putenv (pamh, env); + g_free (env); + } err = pam_open_session(pamh, 0); /* FIXME pam session failed */ if( err != PAM_SUCCESS ) log_print( "pam open session error \"%s\"\n", pam_strerror(pamh, err) ); @@ -432,7 +525,6 @@ pamh = NULL; } -#if 0 void append_pam_environ(char **env) { int i,j,n; @@ -442,6 +534,7 @@ if(!penv) return; for(i=0;penv[i]!=NULL;i++) { + //printf("PAM %s\n",penv[i]); n=strcspn(penv[i],"=")+1; for(j=0;env[j]!=NULL;j++) { @@ -458,17 +551,29 @@ } free(penv); } -#endif #endif void switch_user(struct passwd *pw, char *run, char **env) { + int fd; + + g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL); + if( !pw || initgroups(pw->pw_name, pw->pw_gid) || setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 ) exit(EXIT_FAILURE); chdir(pw->pw_dir); + fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR); + if(fd!=-1) + { + dup2(fd,STDERR_FILENO); + close(fd); + } +#ifndef DISABLE_XAUTH create_client_auth(pw->pw_dir); +#endif + g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL); execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, env); exit(EXIT_FAILURE); } @@ -488,13 +593,29 @@ int ret; ret = fscanf(fp, "%d", &pid); fclose(fp); - if( ret == 1 ) - if( kill(pid, 0) == 0 || (ret == -1 && errno == EPERM) ) - exit(EXIT_SUCCESS); + if(ret == 1 && pid!=getpid()) + { + if(kill(pid, 0) == 0 || (ret == -1 && errno == EPERM)) + { + /* we should only quit if the pid running is lxdm */ +#ifdef __linux__ + char path[64],buf[128]; + sprintf(path,"/proc/%d/exe",pid); + ret=readlink(path,buf,128); + if(ret<128 && ret>0 && strstr(buf,"lxdm-binary")) + lxdm_quit_self(1); +#else + lxdm_quit_self(1); +#endif + } + } } fp = fopen(lockfile, "w"); if( !fp ) - exit(EXIT_FAILURE); + { + log_print("open lock file %s fail\n",lockfile); + lxdm_quit_self(0); + } fprintf( fp, "%d", getpid() ); fclose(fp); g_free(lockfile); @@ -541,6 +662,7 @@ static void on_xserver_stop(GPid pid, gint status, gpointer data) { + //log_print("xserver stop, restart. return status %x\n",status); stop_pid(server); server = -1; lxdm_restart_self(); @@ -585,7 +707,9 @@ if( !getenv("DISPLAY") ) putenv("DISPLAY=:0"); +#ifndef DISABLE_XAUTH create_server_auth(); +#endif arg = g_key_file_get_string(config, "server", "arg", 0); if( !arg ) arg = g_strdup("/usr/bin/X"); @@ -597,17 +721,20 @@ switch( server ) { case 0: - setpgid( 0, getpid() ); execvp(args[0], args); + log_print("exec %s fail\n",args[0]); + lxdm_quit_self(0); break; case -1: - exit(EXIT_FAILURE); + /* fatal error, should not restart self */ + log_print("fork proc fail\n"); + lxdm_quit_self(0); break; default: break; } g_strfreev(args); - g_child_watch_add(server, on_xserver_stop, 0); + server_watch=g_child_watch_add(server, on_xserver_stop, 0); } void exit_cb(void) @@ -618,9 +745,14 @@ stop_pid(child); child = -1; } + ui_clean(); #if HAVE_LIBPAM close_pam_session(); #endif + if(server_watch>0) + { + g_source_remove(server_watch); + } if( server > 0 ) { stop_pid(server); @@ -629,7 +761,8 @@ put_lock(); if( reason == 0 ) execlp(self, self, NULL); - set_active_vt(old_tty); + if(reason!=1) + set_active_vt(old_tty); } int CatchErrors(Display *dpy, XErrorEvent *ev) @@ -661,13 +794,12 @@ my_xid = 0; } -void stop_clients(int top) +static void stop_clients(void) { Window dummy, parent; Window *children; unsigned int nchildren; unsigned int i; - XWindowAttributes attr; Display *Dpy = gdk_x11_get_default_xdisplay(); Window Root = gdk_x11_get_default_root_xwindow(); @@ -676,43 +808,43 @@ nchildren = 0; XQueryTree(Dpy, Root, &dummy, &parent, &children, &nchildren); - if( !top ) - { - for( i = 0; i < nchildren; i++ ) - { - if( XGetWindowAttributes(Dpy, children[i], &attr) && (attr.map_state == IsViewable) ) -#if HAVE_LIBXMU - children[i] = XmuClientWindow(Dpy, children[i]); -#else - children[i] = children[i]; -#endif - else - children[i] = 0; - } - } for( i = 0; i < nchildren; i++ ) if( children[i] && !is_my_id(children[i]) ) XKillClient(Dpy, children[i]); + //printf("kill %d\n",i); XFree( (char *)children ); XSync(Dpy, 0); XSetErrorHandler(NULL); } -static void on_session_stop(GPid pid, gint status, gpointer data) +static int get_run_level(void) { - int code = WEXITSTATUS(status); + int res=0; + struct utmp *ut,tmp; + + setutent(); + tmp.ut_type=RUN_LVL; + ut=getutid(&tmp); + if(!ut) return 0; + res=ut->ut_pid & 0xff; + endutent(); + //log_print("runlevel %c\n",res); + return res; +} +static void on_session_stop(GPid pid, gint status, gpointer data) +{ killpg(pid, SIGHUP); stop_pid(pid); child = -1; + int level; if( server > 0 ) { /* FIXME just work around lxde bug of focus can't set */ - //stop_clients(0); - stop_clients(1); + stop_clients(); free_my_xid(); } #if HAVE_LIBPAM @@ -727,13 +859,17 @@ unsetenv("XDG_SESSION_COOKIE"); } #endif - if( code == 0 ) - /* xterm will quit use this, but we shul not quit here */ - /* so wait someone to kill me may better */ - //lxdm_quit_self(); - sleep(2); - + level=get_run_level(); + if(level=='0' || level=='6') + { + if(level=='0') + g_spawn_command_line_sync("/etc/lxdm/PreShutdown",0,0,0,0); + else + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); + lxdm_quit_self(0); + } ui_prepare(); + g_spawn_command_line_async("/etc/lxdm/PostLogout",NULL); } static void replace_env(char** env, const char* name, const char* new_val) @@ -838,7 +974,8 @@ d = x; n = getenv("DISPLAY"); if( ck_connector_open_session_with_parameters(ckc, &error, "unix-user", &pw->pw_uid, - "display-device", &d, +// disable this, follow the gdm way + //"display-device", &d, "x11-display-device", &d, "x11-display", &n, NULL) ) @@ -864,10 +1001,10 @@ /* override $PATH if needed */ path = g_key_file_get_string(config, "base", "path", 0); - if( G_UNLIKELY(path) && path[0] ) - replace_env(env, "PATH=", path); - else - replace_env(env, "PATH=","/usr/local/bin:/bin:/usr/bin"); + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + replace_env(env, "PATH=", path); /* override current $PATH with config value */ + else /* don't use the global env, they are bad for user */ + replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"); /* set proper default */ g_free(path); /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ if( lang && lang[0] ) @@ -875,42 +1012,13 @@ replace_env(env, "LANG=", lang); replace_env(env, "LC_MESSAGES=", lang); replace_env(env, "LANGUAGE=", lang); - } - + } #if HAVE_LIBPAM -#if 0 - append_pam_environ(env); -#endif -#endif - -#if 0 - if( !session || !session[0] ) /* this means use default session */ - session = g_key_file_get_string(config, "base", "session", 0); - if( !session && getenv("PREFERRED") ) - session = g_strdup( getenv("PREFERRED") ); - if( !session && getenv("DESKTOP") ) - { - char *p = getenv("DESKTOP"); - if( !strcmp(p, "LXDE") ) - session = g_find_program_in_path("startlxde"); - else if( !strcmp(p, "GNOME") ) - session = g_find_program_in_path("gnome-session"); - else if( !strcmp(p, "KDE") ) - session = g_find_program_in_path("startkde"); - else if( !strcmp(p, "XFCE") ) - session = g_strdup("startxfce4"); - else - session = g_strdup(p); - } - if( !session ) - session = g_strdup(""); - - switch_user(pw, session, env); -#else - switch_user(pw, session_exec, env); + append_pam_environ(env); + pam_end(pamh,0); #endif - reason = 4; - exit(EXIT_FAILURE); + switch_user(pw, session_exec, env); + lxdm_quit_self(4); } g_free(session_name); g_free(session_exec); @@ -922,10 +1030,10 @@ char *cmd; cmd = g_key_file_get_string(config, "cmd", "reboot", 0); if( !cmd ) cmd = g_strdup("reboot"); - reason = 1; - system(cmd); + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); + g_spawn_command_line_async(cmd,0); g_free(cmd); - lxdm_quit_self(); + lxdm_quit_self(0); } void lxdm_do_shutdown(void) @@ -933,10 +1041,11 @@ char *cmd; cmd = g_key_file_get_string(config, "cmd", "shutdown", 0); if( !cmd ) cmd = g_strdup("shutdown -h now"); + g_spawn_command_line_sync("/etc/lxdm/PreReboot",0,0,0,0); reason = 1; - system(cmd); + g_spawn_command_line_async(cmd,0); g_free(cmd); - lxdm_quit_self(); + lxdm_quit_self(0); } int lxdm_cur_session(void) @@ -948,11 +1057,22 @@ { struct passwd *pw; char *user; + char *pass=NULL; + int ret; + user = g_key_file_get_string(config, "base", "autologin", 0); if( !user ) return 0; - if( AUTH_SUCCESS != lxdm_auth_user(user, 0, &pw) ) + +#ifdef ENABLE_PASSWORD + pass = g_key_file_get_string(config, "base", "password", 0); +#endif + ret=lxdm_auth_user(user, pass, &pw); + g_free(user); + g_free(pass); + if(ret!=AUTH_SUCCESS) + return 0; lxdm_do_login(pw, NULL, NULL); return 1; @@ -980,10 +1100,11 @@ { case SIGTERM: case SIGINT: - lxdm_quit_self(); + lxdm_quit_self(0); break; case SIGSEGV: log_sigsegv(); + lxdm_quit_self(0); break; default: break; @@ -1014,6 +1135,7 @@ { int tmp; int daemonmode = 0; + int i; if( getuid() != 0 ) { @@ -1021,24 +1143,14 @@ exit(EXIT_FAILURE); } - while( ( tmp = getopt(arc, arg, "hd") ) != EOF ) + for(i=1;i #include #include +#include + +#include #include "lxdm.h" @@ -269,7 +272,10 @@ greeter_io = NULL; close(greeter_pipe[1]); close(greeter_pipe[0]); - kill(greeter, SIGTERM); + + g_source_remove(greeter_watch); + waitpid(greeter, 0, 0) ; + greeter=-1; } } @@ -372,13 +378,6 @@ static void greeter_setup(gpointer user) { - struct passwd *pw; - if( AUTH_SUCCESS == lxdm_auth_user("lxdm", NULL, &pw) ) - { - initgroups(pw->pw_name, pw->pw_gid); - setgid(pw->pw_gid); - setuid(pw->pw_uid); - } } static gchar *greeter_param(char *str, char *name) @@ -470,6 +469,8 @@ dpy = gdk_x11_get_default_xdisplay(); root = gdk_get_default_root_window(); + XSetInputFocus(dpy,GDK_WINDOW_XWINDOW(root),RevertToNone,CurrentTime); + /* if session is running */ if( lxdm_cur_session() > 0 ) return; @@ -590,7 +591,8 @@ /* draw the first time */ gdk_window_show(win); - gdk_window_focus(win, 0); + //gdk_window_focus(win, GDK_CURRENT_TIME); + XSetInputFocus(dpy,GDK_WINDOW_XWINDOW(win),RevertToNone,CurrentTime); } void ui_add_cursor(void) @@ -605,11 +607,23 @@ int ui_main(void) { GMainLoop *loop = g_main_loop_new(NULL, 0); - ui_add_cursor(); ui_prepare(); + ui_add_cursor(); if(greeter == -1) /* if greeter is not used */ gdk_event_handler_set(ui_event_cb, 0, 0); + g_spawn_command_line_async("/etc/lxdm/LoginReady",NULL); g_main_loop_run(loop); return 0; } +void ui_clean(void) +{ + if(greeter>0) + { + extern void stop_pid(int); + g_source_remove(greeter_watch); + stop_pid(greeter); + greeter=-1; + } +} + diff -Nru lxdm-0.2.0~svn2307+git20100209/TODO lxdm-0.2.0~svn2307+git20100408/TODO --- lxdm-0.2.0~svn2307+git20100209/TODO 2010-02-08 15:24:41.000000000 +0000 +++ lxdm-0.2.0~svn2307+git20100408/TODO 2010-04-08 21:14:51.000000000 +0100 @@ -2,4 +2,3 @@ 1. user list in greeter ui 2. lxdm-config tool to custom the lxdm -