June 2006 - openSUSE Commits - openSUSE Mailing Lists

commit compiz
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package compiz checked in at Sat Jun 3 00:52:40 CEST 2006. -------- --- compiz/compiz.changes 2006-05-26 22:53:00.000000000 +0200 +++ compiz/compiz.changes 2006-06-02 15:01:31.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Jun 2 14:39:17 CEST 2006 - dreveman(a)suse.de + +- Don't show fallback name in titlebar. (bnc 173059) +- Fix keyboard movement issues. (bnc 179902) +- Fix clipping issue with switcher. (bnc 179828) +- Disable skydome animation while cube is unfolded. (bnc 179833) +- Save initial viewport when startup notification is received. + (bnc 180224) +- Add hide_skip_taskbar_windows option. (bnc 180055) +- Set _NET_WM_DESKTOP on all windows to 0; KDE's pager and + tasklist require this to be set. (bnc 178320) +- Hide tooltips on NotifyGrab. (bnc 180692) +- Include java window placement workaround. (bnc 151836) + +------------------------------------------------------------------- Old: ---- compiz-0.0.11.tar.bz2 New: ---- compiz-0.0.12.tar.bz2 java-config-notify.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.ZS8PZd/_old 2006-06-03 00:52:14.000000000 +0200 +++ /var/tmp/diff_new_pack.ZS8PZd/_new 2006-06-03 00:52:14.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package compiz (Version cvs_060526) +# spec file for package compiz (Version cvs_060602) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,20 +17,21 @@ PreReq: %fillup_prereq Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526 Autoreqprov: on -Version: cvs_060526 -Release: 2 +Version: cvs_060602 +Release: 1 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 ### /bin/ls *.tar.{gz,bz2} 2>/dev/null|perl -ne 'print "Source$n: ".$_; $n++;' Source: Mesa-CVS-20060502.tar.bz2 -Source1: compiz-0.0.11.tar.bz2 +Source1: compiz-0.0.12.tar.bz2 Source2: gnome-xgl-settings-0.6.tar.gz ### /bin/ls *.{diff,patch} | perl -ne 'print "Patch$n: ".$_; $n++;' Patch: Mesa-6.4.1-x86_64-fixes-1.patch Patch1: Mesa-configs.diff Patch2: compiz-audible-bell-off.patch Patch3: compiz-wobbly-off.patch +Patch4: java-config-notify.diff %description Compiz is an OpenGL compositing manager that use @@ -51,8 +52,9 @@ %setup -q -n . -D -T -b 0 -b 1 -b 2 patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-6.4.1-x86_64-fixes-1.patch patch -d Mesa -p0 < $RPM_SOURCE_DIR/Mesa-configs.diff -patch -d compiz-0.0.11 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch -patch -d compiz-0.0.11 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch +patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch +patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch +patch -d compiz-0.0.12 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff %build PREFIX=/usr @@ -138,6 +140,18 @@ /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Fri Jun 02 2006 - dreveman(a)suse.de +- Don't show fallback name in titlebar. (bnc 173059) +- Fix keyboard movement issues. (bnc 179902) +- Fix clipping issue with switcher. (bnc 179828) +- Disable skydome animation while cube is unfolded. (bnc 179833) +- Save initial viewport when startup notification is received. + (bnc 180224) +- Add hide_skip_taskbar_windows option. (bnc 180055) +- Set _NET_WM_DESKTOP on all windows to 0; KDE's pager and + tasklist require this to be set. (bnc 178320) +- Hide tooltips on NotifyGrab. (bnc 180692) +- Include java window placement workaround. (bnc 151836) * Fri May 26 2006 - danw(a)suse.de - Update gnome-xgl-settings to 0.6, fixing: - Don't consider 3D to be configured unless it's configured with ++++++ compiz-0.0.11.tar.bz2 -> compiz-0.0.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/ChangeLog new/compiz-0.0.12/ChangeLog --- old/compiz-0.0.11/ChangeLog 2006-05-26 12:05:57.000000000 +0200 +++ new/compiz-0.0.12/ChangeLog 2006-06-02 14:10:09.000000000 +0200 @@ -1,3 +1,69 @@ +2006-06-02 David Reveman <davidr(a)novell.com> + + * configure.ac: Bump version to 0.0.12. + + * src/event.c (handleEvent): Fix typo. + + * gnome/window-decorator/gnome-window-decorator.c: + Hide tooltips on NotifyGrab. (bnc #180692) + +2006-06-01 Dan Winship <danw(a)novell.com> + + * src/event.c (handleEvent): If we receive a _NET_SHOWING_DESKTOP + request with no window set, set the flag on all screens. (Fixes + the KDE "show desktop" applet.) Also, don't allow a client to + change its _NET_WM_DESKTOP. + + * src/window.c (addWindow): Set _NET_WM_DESKTOP on all windows to + 0; KDE's pager and tasklist require this to be set. (bnc 178320) + +2006-06-01 David Reveman <davidr(a)novell.com> + + * include/compiz.h: + * src/window.c: Add updateWindowClass. + +2006-05-31 David Reveman <davidr(a)novell.com> + + * include/compiz.h: + * src/screen.c: + * src/display.c: Add hide_skip_taskbar_windows option. (bnc 180055) + + * include/compiz.h: + * src/window.c: Add getStartupId. + + * src/screen.c: Save initial viewport when startup notification + is received. Fix implementation of applyStartupProperties. + (bnc 180224) + + * src/event.c (handleEvent): Handle startup ID property changes. + + * plugins/place.c: Adjust work area to initial viewport. + + * plugins/cube.c (cubePaintTransformedScreen): Disable skydome + animation while cube is unfolded. (bnc 179833) + + * plugins/switcher.c (switchPaintWindow): Make sure selected window is + not clipped incorrectly when some window is transformed. (bnc 179828) + + * plugins/move.c (moveHandleEvent): Initialize xRoot and yRoot. + (bnc 179902) + + * src/Makefile.am (INCLUDES): Add @GL_CFLAGS@. (Eric Work) + +2006-05-30 Dan Winship <danw(a)novell.com> + + * configure.ac: Check libwnck for wnck_window_has_name (new in + HEAD). + + * gnome/window-decorator/gnome-window-decorator.c + (wnck_window_get_real_name): #if HAVE_WNCK_WINDOW_HAS_NAME, + redefine wnck_window_get_name to return NULL if the window only + has a fallback name. bnc 173059. + + * src/event.c (handleEvent): call moveInputFocusToOtherWindow() + before destroyWindow() when processing a DestroyNotify, or else + the input focus can get stranded. + 2006-05-26 David Reveman <davidr(a)novell.com> * plugins/compiz.schemas.in.in: Regen. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/config.h.in new/compiz-0.0.12/config.h.in --- old/compiz-0.0.11/config.h.in 2006-05-21 15:19:24.000000000 +0200 +++ new/compiz-0.0.12/config.h.in 2006-06-02 14:10:42.000000000 +0200 @@ -54,6 +54,9 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the `wnck_window_has_name' function. */ +#undef HAVE_WNCK_WINDOW_HAS_NAME + /* Name of package */ #undef PACKAGE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/configure new/compiz-0.0.12/configure --- old/compiz-0.0.11/configure 2006-05-21 15:19:14.000000000 +0200 +++ new/compiz-0.0.12/configure 2006-06-02 14:10:31.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for compiz 0.0.11. +# Generated by GNU Autoconf 2.59 for compiz 0.0.12. # # Report bugs to <davidr(a)novell.com>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='compiz' PACKAGE_TARNAME='compiz' -PACKAGE_VERSION='0.0.11' -PACKAGE_STRING='compiz 0.0.11' +PACKAGE_VERSION='0.0.12' +PACKAGE_STRING='compiz 0.0.12' PACKAGE_BUGREPORT='davidr(a)novell.com' # Factoring default headers for most tests. @@ -1013,7 +1013,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures compiz 0.0.11 to adapt to many kinds of systems. +\`configure' configures compiz 0.0.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1079,7 +1079,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of compiz 0.0.11:";; + short | recursive ) echo "Configuration of compiz 0.0.12:";; esac cat <<\_ACEOF @@ -1260,7 +1260,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -compiz configure 0.0.11 +compiz configure 0.0.12 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1274,7 +1274,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by compiz $as_me 0.0.11, which was +It was created by compiz $as_me 0.0.12, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1919,7 +1919,7 @@ # Define the identity of the package. PACKAGE='compiz' - VERSION='0.0.11' + VERSION='0.0.12' cat >>confdefs.h <<_ACEOF @@ -23153,6 +23153,116 @@ use_gnome=yes fi if test "x$use_gnome" = "xyes"; then + save_CFLAGS="$CFLAGS" + save_LIBSS="$LIBS" + CFLAGS="$CFLAGS $GNOME_WINDOW_DECORATOR_CFLAGS" + LIBS="$LIBS $GNOME_WINDOW_DECORATOR_LIBS" + +for ac_func in wnck_window_has_name +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + fi + if test "x$use_gnome" = "xyes"; then pkg_failed=no echo "$as_me:$LINENO: checking for GNOME_WINDOW_SETTINGS" >&5 @@ -23800,7 +23910,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by compiz $as_me 0.0.11, which was +This file was extended by compiz $as_me 0.0.12, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23863,7 +23973,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -compiz config.status 0.0.11 +compiz config.status 0.0.12 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/configure.ac new/compiz-0.0.12/configure.ac --- old/compiz-0.0.11/configure.ac 2006-05-21 15:18:30.000000000 +0200 +++ new/compiz-0.0.12/configure.ac 2006-06-02 14:09:48.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.57) -AC_INIT([compiz], [0.0.11], [davidr(a)novell.com] +AC_INIT([compiz], [0.0.12], [davidr(a)novell.com] AC_CONFIG_AUX_DIR(config) @@ -188,6 +188,15 @@ pangocairo, [use_gnome=yes], [use_gnome=no]) if test "x$use_gnome" = "xyes"; then + save_CFLAGS="$CFLAGS" + save_LIBSS="$LIBS" + CFLAGS="$CFLAGS $GNOME_WINDOW_DECORATOR_CFLAGS" + LIBS="$LIBS $GNOME_WINDOW_DECORATOR_LIBS" + AC_CHECK_FUNCS(wnck_window_has_name) + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" + fi + if test "x$use_gnome" = "xyes"; then PKG_CHECK_MODULES(GNOME_WINDOW_SETTINGS, gnome-window-settings-2.0 gnome-desktop-2.0, [use_gnome=yes], [use_gnome=no]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/gnome/window-decorator/gnome-window-decorator.c new/compiz-0.0.12/gnome/window-decorator/gnome-window-decorator.c --- old/compiz-0.0.11/gnome/window-decorator/gnome-window-decorator.c 2006-05-20 07:20:17.000000000 +0200 +++ new/compiz-0.0.12/gnome/window-decorator/gnome-window-decorator.c 2006-06-01 13:27:19.000000000 +0200 @@ -17,6 +17,10 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <X11/Xlib.h> #include <X11/Xatom.h> #include <X11/cursorfont.h> @@ -2407,6 +2411,15 @@ gdk_error_trap_pop (); } +#if HAVE_WNCK_WINDOW_HAS_NAME +static const char * +wnck_window_get_real_name (WnckWindow *win) +{ + return wnck_window_has_name (win) ? wnck_window_get_name (win) : NULL; +} +#define wnck_window_get_name wnck_window_get_real_name +#endif + static gint max_window_name_width (WnckWindow *win) { @@ -3439,8 +3452,7 @@ } break; case LeaveNotify: - if (xevent->xcrossing.mode != NotifyGrab) - hide_tooltip (); + hide_tooltip (); break; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/include/compiz.h new/compiz-0.0.12/include/compiz.h --- old/compiz-0.0.11/include/compiz.h 2006-05-25 05:43:37.000000000 +0200 +++ new/compiz-0.0.12/include/compiz.h 2006-06-02 04:41:57.000000000 +0200 @@ -420,7 +420,8 @@ #define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED 49 #define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_HORZ 50 #define COMP_DISPLAY_OPTION_TOGGLE_WINDOW_MAXIMIZED_VERT 51 -#define COMP_DISPLAY_OPTION_NUM 52 +#define COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS 52 +#define COMP_DISPLAY_OPTION_NUM 53 typedef CompOption *(*GetDisplayOptionsProc) (CompDisplay *display, int *count); @@ -487,6 +488,7 @@ Atom winBrightnessAtom; Atom winSaturationAtom; Atom winActiveAtom; + Atom winDesktopAtom; Atom workareaAtom; @@ -575,6 +577,8 @@ Atom versionAtom; Atom atomPairAtom; + Atom startupIdAtom; + unsigned int lastPing; CompTimeoutHandle pingHandle; @@ -1129,6 +1133,7 @@ typedef struct _CompStartupSequence { struct _CompStartupSequence *next; SnStartupSequence *sequence; + unsigned int viewport; } CompStartupSequence; typedef struct _CompFBConfig { @@ -1549,6 +1554,8 @@ int destroyRefCnt; int unmapRefCnt; + unsigned int initialViewport; + Bool placed; Bool minimized; Bool inShowDesktopMode; @@ -1676,6 +1683,12 @@ Window getClientLeader (CompWindow *w); +char * +getStartupId (CompWindow *w); + +void +updateWindowClass (CompWindow *w); + int getWmState (CompDisplay *display, Window id); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/plugins/cube.c new/compiz-0.0.12/plugins/cube.c --- old/compiz-0.0.11/plugins/cube.c 2006-05-25 16:22:05.000000000 +0200 +++ new/compiz-0.0.12/plugins/cube.c 2006-05-29 12:27:43.000000000 +0200 @@ -1097,7 +1097,7 @@ glPushMatrix (); - if (cs->animateSkyDome) + if (cs->animateSkyDome && cs->grabIndex == 0) { glRotatef (sAttrib->xRotate, 0.0f, 1.0f, 0.0f); glRotatef (sAttrib->vRotate / 5.0f + 90.0f, 1.0f, 0.0f, 0.0f); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/plugins/move.c new/compiz-0.0.12/plugins/move.c --- old/compiz-0.0.11/plugins/move.c 2006-05-25 06:17:45.000000000 +0200 +++ new/compiz-0.0.12/plugins/move.c 2006-05-31 16:37:11.000000000 +0200 @@ -492,10 +492,10 @@ if (event->xclient.data.l[2] == WmMoveResizeMoveKeyboard) { - warpPointer (d, - (w->attrib.x + w->width / 2) - pointerX, - (w->attrib.y + w->height / 2) - pointerY); + xRoot = w->attrib.x + (w->width / 2); + yRoot = w->attrib.y + (w->height / 2); + warpPointer (d, xRoot - pointerX, yRoot - pointerY); moveInitiate (w, xRoot, yRoot, 0); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/plugins/place.c new/compiz-0.0.12/plugins/place.c --- old/compiz-0.0.11/plugins/place.c 2006-05-12 13:07:17.000000000 +0200 +++ new/compiz-0.0.12/plugins/place.c 2006-05-31 17:45:13.000000000 +0200 @@ -593,6 +593,8 @@ getOuterRectOfWindow (window, &rect); work_area = window->screen->workArea; + work_area.x += (window->initialViewport - window->screen->x) * + window->screen->width; center_tile_rect_in_area (&rect, &work_area); @@ -675,9 +677,15 @@ { CompWindow *wi; GList *windows; + XRectangle work_area; + int x0 = (window->initialViewport - window->screen->x) * + window->screen->width; PLACE_SCREEN (window->screen); + work_area = window->screen->workArea; + work_area.x += x0; + windows = NULL; switch (window->type) { @@ -703,7 +711,8 @@ if (window->type & CompWindowTypeFullscreenMask) { - x = y = 0; + x = x0; + y = 0; goto done_no_constraints; } @@ -711,10 +720,10 @@ CompWindowStateMaximizedHorzMask)) { if (window->state & CompWindowStateMaximizedVertMask) - y = window->screen->workArea.y + window->input.top; + y = work_area.y + window->input.top; if (window->state & CompWindowStateMaximizedHorzMask) - x = window->screen->workArea.x + window->input.left; + x = work_area.x + window->input.left; goto done; } @@ -842,7 +851,13 @@ */ for (wi = window->screen->windows; wi; wi = wi->next) { - if (WINDOW_INVISIBLE (wi)) + if (wi->attrib.map_state != IsViewable) + continue; + + if (wi->attrib.x >= work_area.x + work_area.width || + wi->attrib.x + wi->width <= work_area.x || + wi->attrib.y >= work_area.y + work_area.height || + wi->attrib.y + wi->height <= work_area.y) continue; if (wi->state & (CompWindowTypeDesktopMask | @@ -856,7 +871,8 @@ } /* "Origin" placement algorithm */ - x = y = 0; + x = x0; + y = 0; if (find_first_fit (window, windows, x, y, &x, &y)) goto done_check_denied_focus; @@ -942,22 +958,20 @@ g_list_free (windows); done: - if (x + window->width + window->input.right > - window->screen->workArea.x + window->screen->workArea.width) - x = window->screen->workArea.x + window->screen->workArea.width - - window->width - window->input.right; + if (x + window->width + window->input.right > work_area.x + work_area.width) + x = work_area.x + work_area.width - window->width - window->input.right; - if (x - window->input.left < window->screen->workArea.x) - x = window->screen->workArea.x + window->input.left; + if (x - window->input.left < work_area.x) + x = work_area.x + window->input.left; done_no_x_constraints: if (y + window->height + window->input.bottom > - window->screen->workArea.y + window->screen->workArea.height) - y = window->screen->workArea.y + window->screen->workArea.height + work_area.y + work_area.height) + y = work_area.y + work_area.height - window->height - window->input.bottom; - if (y - window->input.top < window->screen->workArea.y) - y = window->screen->workArea.y + window->input.top; + if (y - window->input.top < work_area.y) + y = work_area.y + window->input.top; done_no_constraints: *new_x = x; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/plugins/switcher.c new/compiz-0.0.12/plugins/switcher.c --- old/compiz-0.0.11/plugins/switcher.c 2006-05-26 02:11:36.000000000 +0200 +++ new/compiz-0.0.12/plugins/switcher.c 2006-05-29 12:16:15.000000000 +0200 @@ -1665,10 +1665,15 @@ glTranslatef (0.0f, 0.0f, MIN (ss->translate, ss->sTranslate)); } + glPushAttrib (GL_STENCIL_BUFFER_BIT); + glDisable (GL_STENCIL_TEST); + UNWRAP (ss, s, paintWindow); status = (*s->paintWindow) (w, attrib, region, mask); WRAP (ss, s, paintWindow, switchPaintWindow); + glPopAttrib (); + glPopMatrix (); } else if (ss->switching) @@ -1689,10 +1694,15 @@ glPushMatrix (); glTranslatef (0.0f, 0.0f, MIN (ss->translate, ss->sTranslate)); + glPushAttrib (GL_STENCIL_BUFFER_BIT); + glDisable (GL_STENCIL_TEST); + UNWRAP (ss, s, paintWindow); status = (*s->paintWindow) (w, &sAttrib, region, mask); WRAP (ss, s, paintWindow, switchPaintWindow); + glPopAttrib (); + glPopMatrix (); } else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/Makefile.am new/compiz-0.0.12/src/Makefile.am --- old/compiz-0.0.11/src/Makefile.am 2006-03-03 11:06:41.000000000 +0100 +++ new/compiz-0.0.12/src/Makefile.am 2006-05-31 02:07:21.000000000 +0200 @@ -1,5 +1,6 @@ INCLUDES = \ @COMPIZ_CFLAGS@ \ + @GL_CFLAGS@ \ -I$(top_srcdir)/include \ -DPLUGINDIR=\"$(plugindir)\" \ -DIMAGEDIR=\"$(imagedir)\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/Makefile.in new/compiz-0.0.12/src/Makefile.in --- old/compiz-0.0.11/src/Makefile.in 2006-05-21 15:19:13.000000000 +0200 +++ new/compiz-0.0.12/src/Makefile.in 2006-06-02 14:10:29.000000000 +0200 @@ -258,6 +258,7 @@ windowsettingslibdir = @windowsettingslibdir@ INCLUDES = \ @COMPIZ_CFLAGS@ \ + @GL_CFLAGS@ \ -I$(top_srcdir)/include \ -DPLUGINDIR=\"$(plugindir)\" \ -DIMAGEDIR=\"$(imagedir)\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/display.c new/compiz-0.0.12/src/display.c --- old/compiz-0.0.11/src/display.c 2006-05-24 23:01:45.000000000 +0200 +++ new/compiz-0.0.12/src/display.c 2006-06-02 04:41:57.000000000 +0200 @@ -140,6 +140,8 @@ #define AUDIBLE_BELL_DEFAULT TRUE +#define HIDE_SKIP_TASKBAR_WINDOWS_DEFAULT TRUE + #define NUM_OPTIONS(d) (sizeof ((d)->opt) / sizeof (CompOption)) static char *textureFilter[] = { "Fast", "Good", "Best" }; @@ -498,6 +500,14 @@ o->value.bind.type = CompBindingTypeNone; o->value.bind.u.key.modifiers = 0; o->value.bind.u.key.keycode = 0; + + o = &display->opt[COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS]; + o->name = "hide_skip_taskbar_windows"; + o->shortDesc = "Hide Skip Taskbar Windows"; + o->longDesc = "Hide windows not in taskbar when entering show " + "desktop mode"; + o->type = CompOptionTypeBool; + o->value.b = HIDE_SKIP_TASKBAR_WINDOWS_DEFAULT; } CompOption * @@ -579,6 +589,7 @@ case COMP_DISPLAY_OPTION_CLICK_TO_FOCUS: case COMP_DISPLAY_OPTION_AUTORAISE: case COMP_DISPLAY_OPTION_RAISE_ON_CLICK: + case COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS: if (compSetBoolOption (o, value)) return TRUE; break; @@ -1780,6 +1791,8 @@ d->winActiveAtom = XInternAtom (dpy, "_NET_ACTIVE_WINDOW", 0); + d->winDesktopAtom = XInternAtom (dpy, "_NET_WM_DESKTOP", 0); + d->workareaAtom = XInternAtom (dpy, "_NET_WORKAREA", 0); d->desktopViewportAtom = XInternAtom (dpy, "_NET_DESKTOP_VIEWPORT", 0); @@ -1893,6 +1906,8 @@ d->versionAtom = XInternAtom (dpy, "VERSION", 0); d->atomPairAtom = XInternAtom (dpy, "ATOM_PAIR", 0); + d->startupIdAtom = XInternAtom (dpy, "_NET_STARTUP_ID", 0); + d->snDisplay = sn_display_new (dpy, NULL, NULL); if (!d->snDisplay) return FALSE; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/event.c new/compiz-0.0.12/src/event.c --- old/compiz-0.0.11/src/event.c 2006-05-25 15:54:12.000000000 +0200 +++ new/compiz-0.0.12/src/event.c 2006-06-02 14:06:20.000000000 +0200 @@ -313,8 +313,8 @@ w = findWindowAtDisplay (d, event->xdestroywindow.window); if (w) { - destroyWindow (w); moveInputFocusToOtherWindow (w); + destroyWindow (w); } break; case MapNotify: @@ -1012,6 +1012,24 @@ if (w) freeWindowIcons (w); } + else if (event->xproperty.atom == d->startupIdAtom) + { + w = findWindowAtDisplay (d, event->xproperty.window); + if (w) + { + if (w->startupId) + free (w->startupId); + + w->startupId = getStartupId (w); + } + } + else if (event->xproperty.atom == d->winDesktopAtom) + { + if (getWindowProp32 (d, event->xproperty.window, + d->winDesktopAtom, 1) != 0) + setWindowProp32 (d, event->xproperty.window, + d->winDesktopAtom, 0); + } break; case MotionNotify: break; @@ -1249,13 +1267,16 @@ } else if (event->xclient.message_type == d->showingDesktopAtom) { - s = findScreenAtDisplay (d, event->xclient.window); - if (s) + for (s = d->screens; s; s = s->next) { - if (event->xclient.data.l[0]) - enterShowDesktopMode (s); - else - leaveShowDesktopMode (s, NULL); + if (event->xclient.window == s->root || + event->xclient.window == None) + { + if (event->xclient.data.l[0]) + enterShowDesktopMode (s); + else + leaveShowDesktopMode (s, NULL); + } } } break; @@ -1275,6 +1296,10 @@ if (!(w->state & CompWindowStateHiddenMask)) { + w->initialViewport = w->screen->x; + + applyStartupProperties (w->screen, w); + XMapWindow (d->display, event->xmaprequest.window); updateWindowAttributes (w, FALSE); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/screen.c new/compiz-0.0.12/src/screen.c --- old/compiz-0.0.11/src/screen.c 2006-05-21 14:23:26.000000000 +0200 +++ new/compiz-0.0.12/src/screen.c 2006-05-31 15:36:15.000000000 +0200 @@ -368,6 +368,7 @@ s->next = screen->startupSequences; s->sequence = sequence; + s->viewport = screen->x; screen->startupSequences = s; @@ -2588,79 +2589,50 @@ applyStartupProperties (CompScreen *screen, CompWindow *window) { - CompStartupSequence *s = NULL; + CompStartupSequence *s; const char *startupId = window->startupId; - printf ("Applying startup props to %d id \"%s\"\n", - (int) window->id, window->startupId ? window->startupId : "(none)"); - if (!startupId) { - const char *wmClass; - - for (s = screen->startupSequences; s; s = s->next) - { - wmClass = sn_startup_sequence_get_wmclass (s->sequence); - if (!wmClass) - continue; - - if ((window->resClass && strcmp (wmClass, window->resClass) == 0) || - (window->resName && strcmp (wmClass, window->resName) == 0)) - { - startupId = sn_startup_sequence_get_id (s->sequence); + CompWindow *leader; - window->startupId = strdup (startupId); - - printf ("Ending legacy sequence %s due to window %d\n", - startupId, (int) window->id); - - sn_startup_sequence_complete (s->sequence); - break; - } - } + leader = findWindowAtScreen (screen, window->clientLeader); + if (leader) + startupId = leader->startupId; if (!startupId) return; } - if (!s) + for (s = screen->startupSequences; s; s = s->next) { const char *id; - for (s = screen->startupSequences; s; s = s->next) - { - id = sn_startup_sequence_get_id (s->sequence); - - if (strcmp (id, startupId) == 0) - break; - } + id = sn_startup_sequence_get_id (s->sequence); + if (strcmp (id, startupId) == 0) + break; } if (s) - { - printf ("Found startup sequence for window %d ID \"%s\"\n", - (int) window->id, startupId); - } - else - { - printf ("Did not find startup sequence for window %d ID \"%s\"\n", - (int) window->id, startupId); - } + window->initialViewport = s->viewport; } void enterShowDesktopMode (CompScreen *s) { + CompDisplay *d = s->display; CompWindow *w; unsigned long data = 1; int count = 0; + CompOption *st = &d->opt[COMP_DISPLAY_OPTION_HIDE_SKIP_TASKBAR_WINDOWS]; s->showingDesktopMask = ~(CompWindowTypeDesktopMask | CompWindowTypeDockMask); for (w = s->windows; w; w = w->next) { - if (s->showingDesktopMask & w->type) + if ((s->showingDesktopMask & w->type) && + (!(w->state & CompWindowStateSkipTaskbarMask) || st->value.b)) { if ((*s->focusWindow) (w)) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/compiz-0.0.11/src/window.c new/compiz-0.0.12/src/window.c --- old/compiz-0.0.11/src/window.c 2006-05-26 03:46:05.000000000 +0200 +++ new/compiz-0.0.12/src/window.c 2006-06-02 14:01:23.000000000 +0200 @@ -311,6 +311,63 @@ return getClientLeaderOfAncestor (w); } +char * +getStartupId (CompWindow *w) +{ + Atom actual; + int result, format; + unsigned long n, left; + unsigned char *data; + + result = XGetWindowProperty (w->screen->display->display, w->id, + w->screen->display->startupIdAtom, + 0L, 1024L, False, + w->screen->display->utf8StringAtom, + &actual, &format, + &n, &left, &data); + + if (result == Success && n && data) + { + char *id; + + id = strdup ((char *) data); + XFree ((void *) data); + + return id; + } + + return NULL; +} + +void +updateWindowClass (CompWindow *w) +{ + XClassHint classHint; + int status; + + if (w->resName) + { + free (w->resName); + w->resName = NULL; + } + + if (w->resClass) + { + free (w->resClass); + w->resClass = NULL; + } + + status = XGetClassHint (w->screen->display->display, w->id, &classHint); + if (status) + { + if (classHint.res_name) + w->resName = strdup (classHint.res_name); + + if (classHint.res_class) + w->resClass = strdup (classHint.res_class); + } +} + int getWmState (CompDisplay *display, Window id) @@ -1349,6 +1406,8 @@ w->inShowDesktopMode = FALSE; w->hidden = FALSE; + w->initialViewport = screen->x; + w->pendingUnmaps = 0; w->startupId = NULL; @@ -1537,10 +1596,16 @@ updateWmHints (w); + setWindowProp32 (w->screen->display, w->id, + w->screen->display->winDesktopAtom, + 0); + XGetTransientForHint (w->screen->display->display, w->id, &w->transientFor); w->clientLeader = getClientLeader (w); + if (!w->clientLeader) + w->startupId = getStartupId (w); w->wmType = getWindowType (w->screen->display, w->id); @@ -3531,6 +3596,9 @@ CompWindowTypeDockMask)) return FALSE; + if (w->initialViewport != w->screen->x) + return FALSE; + if (!w->inputHint && !(w->protocols & CompWindowProtocolTakeFocusMask)) return FALSE; ++++++ java-config-notify.diff ++++++ --- src/event.c 31 May 2006 21:50:37 -0000 1.45 +++ src/event.c 1 Jun 2006 12:01:07 -0000 @@ -1288,6 +1288,8 @@ { w->initialViewport = w->screen->x; + updateWindowClass (w); + applyStartupProperties (w->screen, w); XMapWindow (d->display, event->xmaprequest.window); --- src/window.c 1 Jun 2006 11:58:13 -0000 1.52 +++ src/window.c 1 Jun 2006 12:01:08 -0000 @@ -2286,6 +2286,9 @@ } XConfigureWindow (w->screen->display->display, w->id, xwcm, xwc); + + if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0) + sendConfigureNotify (w); } void @@ -2301,6 +2304,9 @@ XMoveWindow (w->screen->display->display, w->frame, w->attrib.x - w->input.left, w->attrib.y - w->input.top); + + if (w->resName && strncmp (w->resName, "sun-awt-X11", 11) == 0) + sendConfigureNotify (w); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit beagle
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package beagle checked in at Sat Jun 3 00:52:05 CEST 2006. -------- --- GNOME/beagle/beagle.changes 2006-05-30 19:01:37.000000000 +0200 +++ beagle/beagle.changes 2006-06-02 22:26:51.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 22:26:43 CEST 2006 - gekker(a)suse.de + +- UPdate translations for de + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ beagle.spec ++++++ --- /var/tmp/diff_new_pack.xVhJlb/_old 2006-06-03 00:51:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xVhJlb/_new 2006-06-03 00:51:50.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/Other Autoreqprov: on Version: 0.2.3 -Release: 50 +Release: 51 Summary: Desktop Search Application URL: http://www.gnome.org/projects/beagle/ Source: %{name}-%{version}.tar.gz @@ -483,6 +483,8 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n beagle +* Fri Jun 02 2006 - gekker(a)suse.de +- UPdate translations for de * Tue May 30 2006 - gekker(a)suse.de - Update translations for de,es,fr,hu,it,ja,pt_BR,zh_CN,zh_TW * Mon May 29 2006 - joeshaw(a)suse.de ++++++ beagle-po.tar.bz2 ++++++ ++++ 2113 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/po/de.po new/po/de.po --- old/po/de.po 2006-05-30 18:50:42.000000000 +0200 +++ new/po/de.po 2006-06-02 22:15:53.000000000 +0200 @@ -814,7 +814,7 @@ #: ../tools/Settings.cs:687 ../tools/Settings.cs:1074 msgid "Pattern" -msgstr "Muster" +msgstr "Schema" #: ../tools/Settings.cs:690 ../tools/Settings.cs:1069 #: ../tools/settings.glade.h:24 @@ -930,7 +930,7 @@ #: ../tools/settings.glade.h:21 msgid "Filename Pattern" -msgstr "Dateinamenmuster" +msgstr "Dateinamenschema" #: ../tools/settings.glade.h:22 msgid "Index my home directory" @@ -970,7 +970,7 @@ "objects you wish to exclude from indexing." msgstr "" "Legen Sie hier fest, welche Ressourcen, wie z.B. Pfade, E-Mail-Ordner, " -"Muster oder Objektarten von der Indizierung ausgeschlossen werden sollen." +"Schemata oder Objektarten von der Indizierung ausgeschlossen werden sollen." #: ../tools/settings.glade.h:33 msgid "Specify paths that should be available for external access" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/po/zh_CN.po.orig new/po/zh_CN.po.orig --- old/po/zh_CN.po.orig 1970-01-01 01:00:00.000000000 +0100 +++ new/po/zh_CN.po.orig 2006-05-31 17:31:07.000000000 +0200 @@ -0,0 +1,1088 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Funda Wang <fundawang(a)linux.net.cn>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: beagle HEAD\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-04-25 21:55+0200\n" +"PO-Revision-Date: 2006-05-19 11:48\n" +"Last-Translator: Novell Language <language(a)novell.com>\n" +"Language-Team: Novell Language <language(a)novell.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../glue/eggtrayicon.c:127 +msgid "Orientation" +msgstr "方向" + +#: ../glue/eggtrayicon.c:128 +msgid "The orientation of the tray." +msgstr "托盘的方向。" + +#: ../ImLogViewer/ImLogViewer.glade.h:1 +msgid "Conversations History" +msgstr "对话历史" + +#: ../ImLogViewer/ImLogViewer.glade.h:2 +msgid "IM Viewer" +msgstr "IM 查看器" + +#: ../ImLogViewer/ImLogWindow.cs:102 +#, csharp-format +msgid "Conversations in {0}" +msgstr "{0} 中的对话" + +#: ../ImLogViewer/ImLogWindow.cs:109 +#, csharp-format +msgid "Conversations with {0}" +msgstr "与 {0} 的对话" + +#: ../search/beagle-search.desktop.in.h:1 ../tools/settings.glade.h:30 +msgid "Search" +msgstr "搜索" + +#: ../search/beagle-search.desktop.in.h:2 +msgid "Search for data on your desktop" +msgstr "在桌面上搜索数据" + +#: ../search/Category.cs:108 +#, csharp-format +msgid "{0}-{1} of {2}" +msgstr "{0}-{1}(总数 {2}）" + +#: ../search/Pages/NoMatch.cs:19 +msgid "No results were found." +msgstr "未找到结果。" + +#: ../search/Pages/NoMatch.cs:20 +#, csharp-format +msgid "Your search for \"{0}\" did not match any files on your computer." +msgstr "在您计算机上没有搜索到与\"{0}\" 匹配的任何文件。" + +#: ../search/Pages/NoMatch.cs:24 +msgid "" +"You can change the scope of your search using the \"Search\" menu. A broader " +"search scope might produce more results." +msgstr "" +"您可以使用 \"搜索\" 菜单更改搜索范围。较大的搜索范围可能会生成更多的结果。" + +#: ../search/Pages/NoMatch.cs:26 +msgid "" +"You should check the spelling of your search words to see if you " +"accidentally misspelled any words." +msgstr "您应当对搜索词的拼写进行检查以确定是否无意间拼错了单词。" + +#: ../search/Pages/QuickTips.cs:10 +msgid "You can use upper and lower case; search is case-insensitive." +msgstr "您可以使用大小写形式；搜索是不区分大小写的。" + +#: ../search/Pages/QuickTips.cs:11 +msgid "To search for optional terms, use OR. ex: George OR Ringo" +msgstr "要搜索可选词，请使用 OR。例如：George OR Ringo" + +#: ../search/Pages/QuickTips.cs:12 +msgid "" +"To exclude search terms, use the minus symbol in front, such as -cats" +msgstr "要排除搜索词，请在前面使用减号，例如 -cats" + +#: ../search/Pages/QuickTips.cs:13 +msgid "" +"When searching for a phrase, add quotes. ex: \"There be dragons\"" +msgstr "在搜索短语时，请添加引号，例如 \"There be dragons\"" + +#: ../search/Pages/QuickTips.cs:19 ../search/UIManager.cs:65 +msgid "Quick Tips" +msgstr "快速提示" + +#: ../search/Pages/RootUser.cs:12 +msgid "Beagle cannot be run as root" +msgstr "不能以 root 用户的身份运行 Beagle。" + +#: ../search/Pages/RootUser.cs:13 +msgid "" +"For security reasons, Beagle cannot be run as root. You should restart as a " +"regular user." +msgstr "" +"出于安全性原因，不能以 root 用户的身份运行 Beagle。您应当以常规用户的身份重启" +"动。" + +#: ../search/Pages/StartDaemon.cs:19 +msgid "Search service not running" +msgstr "搜索服务未运行" + +#: ../search/Pages/StartDaemon.cs:21 +msgid "Start search service" +msgstr "启动搜索服务" + +#: ../search/Search.cs:147 +msgid "_Find:" +msgstr "查找(_F)：" + +#: ../search/Search.cs:161 +msgid "Find Now" +msgstr "立即查找" + +#: ../search/Search.cs:205 +msgid "Type in search terms" +msgstr "输入搜索条件" + +#: ../search/Search.cs:206 +msgid "Start searching" +msgstr "开始搜索" + +#: ../search/Tiles/Contact.cs:53 +msgid "E-Mail:" +msgstr "电子邮件：" + +#: ../search/Tiles/Contact.cs:56 +msgid "Mobile Phone:" +msgstr "移动电话：" + +#: ../search/Tiles/Contact.cs:60 +msgid "Work Phone:" +msgstr "工作电话：" + +#: ../search/Tiles/Contact.cs:64 +msgid "Home Phone:" +msgstr "宅电：" + +#: ../search/Tiles/File.cs:33 +msgid "Reveal in Folder" +msgstr "打开文件夹" + +#: ../search/Tiles/File.cs:34 +msgid "E-Mail" +msgstr "电子邮件" + +#. AddAction (new TileAction (Catalog.GetString ("Instant-Message"), InstantMessage)); +#. FIXME: s/"gtk-info"/Gtk.Stock.Info/ when we can depend on gtk# 2.8 +#. AddAction (new TileAction (Catalog.GetString ("Show Information"), "gtk-info", ShowInformation)); +#: ../search/Tiles/File.cs:36 ../search/Tiles/Folder.cs:38 +msgid "Move to Trash" +msgstr "移至回收站" + +#: ../search/Tiles/File.cs:132 ../search/Tiles/Note.cs:57 +#: ../search/Tiles/RSSFeed.cs:45 ../search/Tiles/WebHistory.cs:50 +msgid "Title:" +msgstr "标题：" + +#: ../search/Tiles/File.cs:135 ../search/Tiles/Note.cs:60 +msgid "Last Edited:" +msgstr "上次编辑：" + +#: ../search/Tiles/File.cs:139 +msgid "Author:" +msgstr "作者：" + +#: ../search/Tiles/File.cs:143 ../search/Tiles/Image.cs:72 +msgid "Full Path:" +msgstr "完整路径：" + +#: ../search/Tiles/Folder.cs:31 +msgid "Empty" +msgstr "空" + +#: ../search/Tiles/Folder.cs:33 +#, csharp-format +msgid "Contains {0} Item" +msgid_plural "Contains {0} Items" +msgstr[0] "包含 {0} 项" + +#: ../search/Tiles/Folder.cs:54 +msgid "Edited:" +msgstr "编辑时间：" + +#. AddAction (new TileAction (Catalog.GetString ("Add to Library"), Gtk.Stock.Add, AddToLibrary)); +#: ../search/Tiles/Image.cs:39 +msgid "Set as Wallpaper" +msgstr "设为壁纸" + +#: ../search/Tiles/Image.cs:69 +msgid "Modified:" +msgstr "修改时间：" + +#: ../search/Tiles/IMLog.cs:29 +msgid "IM Conversation" +msgstr "IM 会话" + +#: ../search/Tiles/IMLog.cs:89 +msgid "Name:" +msgstr "名称：" + +#: ../search/Tiles/IMLog.cs:90 ../search/Tiles/MailMessage.cs:69 +msgid "Date Received:" +msgstr "接收日期：" + +#: ../search/Tiles/MailAttachment.cs:45 +msgid "Mail attachment" +msgstr "电子邮件附件" + +#: ../search/Tiles/MailMessage.cs:33 +msgid "Send in Mail" +msgstr "以邮件发送" + +#: ../search/Tiles/MailMessage.cs:63 +msgid "Subject:" +msgstr "主题：" + +#: ../search/Tiles/MailMessage.cs:66 +msgid "From:" +msgstr "来自：" + +#: ../search/Tiles/Presentation.cs:33 +#, csharp-format +msgid "{0} slide" +msgid_plural "{0} slides" +msgstr[0] "{0} 张幻灯片" + +#: ../search/Tiles/RSSFeed.cs:48 +msgid "Site:" +msgstr "网站：" + +#: ../search/Tiles/RSSFeed.cs:51 +msgid "Date Viewed:" +msgstr "查看的日期：" + +#: ../search/Tiles/TextDocument.cs:37 +#, csharp-format +msgid "{0} page" +msgid_plural "{0} pages" +msgstr[0] "{0} 页" + +#: ../search/Tiles/Tile.cs:179 +msgid "Open" +msgstr "打开" + +#: ../search/Tiles/Utils.cs:23 +msgid "Application" +msgstr "应用程序" + +#: ../search/Tiles/Utils.cs:25 +msgid "Contact" +msgstr "联系人" + +#: ../search/Tiles/Utils.cs:27 +msgid "Folder" +msgstr "文件夹" + +#: ../search/Tiles/Utils.cs:29 +msgid "Image" +msgstr "图像" + +#: ../search/Tiles/Utils.cs:31 +msgid "Audio" +msgstr "音频" + +#: ../search/Tiles/Utils.cs:33 +msgid "Video" +msgstr "视频" + +#: ../search/Tiles/Utils.cs:35 +msgid "Documents" +msgstr "文档" + +#: ../search/Tiles/Utils.cs:37 +msgid "Conversations" +msgstr "对话" + +#: ../search/Tiles/Utils.cs:39 +msgid "Website" +msgstr "网站" + +#: ../search/Tiles/Utils.cs:41 +msgid "News Feed" +msgstr "新闻推送" + +#: ../search/Tiles/Utils.cs:43 +msgid "Archive" +msgstr "压缩包" + +#: ../search/Tiles/Utils.cs:155 +#, csharp-format +msgid "{0} week ago" +msgid_plural "{0} weeks ago" +msgstr[0] "{0} 周前" + +#. Lets say a year and a half to stop saying months +#: ../search/Tiles/Utils.cs:157 +#, csharp-format +msgid "{0} month ago" +msgid_plural "{0} months ago" +msgstr[0] "{0} 个月前" + +#: ../search/Tiles/Utils.cs:159 +#, csharp-format +msgid "{0} year ago" +msgid_plural "{0} years ago" +msgstr[0] "{0} 年前" + +#. FIXME: We need filters for video in Beagle. +#. They should land soon when entagged-sharp gets video support. +#: ../search/Tiles/Video.cs:27 +msgid "Unknown duration" +msgstr "未知时长" + +#: ../search/Tiles/WebHistory.cs:53 +msgid "URL:" +msgstr "URL：" + +#: ../search/Tiles/WebHistory.cs:56 +msgid "Accessed:" +msgstr "已访问：" + +#: ../search/Tray/TrayIcon.cs:32 +msgid "Desktop Search" +msgstr "桌面搜索" + +#: ../search/Tray/TrayIcon.cs:57 +msgid "No Recent Searches" +msgstr "没有最近的搜索" + +#: ../search/Tray/TrayIcon.cs:62 +msgid "Recent Searches" +msgstr "最近的搜索" + +#: ../search/Tray/TrayIcon.cs:78 +msgid "Clear" +msgstr "清除" + +#: ../search/Tray/TrayIcon.cs:86 +msgid "Quit" +msgstr "退出" + +#. Translators: the strings in TypeFilter.cs are for when the user +#. * wants to limit search results to a specific type. You don't need +#. * to give an exact translation of the exact same set of English +#. * words. Just provide a list of likely words the user might use +#. * after the "type:" keyword to refer to each type of match. +#. +#: ../search/TypeFilter.cs:36 +msgid "" +"file\n" +"files" +msgstr "文件" + +#: ../search/TypeFilter.cs:37 +msgid "" +"mail\n" +"email\n" +"e-mail" +msgstr "" +"邮件\n" +"电子邮件\n" +"电邮" + +#: ../search/TypeFilter.cs:38 +msgid "" +"im\n" +"ims\n" +"instant message\n" +"instant messages\n" +"instant-message\n" +"instant-messages\n" +"chat\n" +"chats" +msgstr "" +"聊天\n" +"即时通讯\n" +"im" + +#: ../search/TypeFilter.cs:39 +msgid "" +"presentation\n" +"presentations\n" +"slideshow\n" +"slideshows\n" +"slide\n" +"slides" +msgstr "" +"演示文稿\n" +"幻灯片\n" +"演示" + +#: ../search/TypeFilter.cs:41 +msgid "" +"application\n" +"applications\n" +"app\n" +"apps" +msgstr "" +"应用程序\n" +"程序" + +#: ../search/TypeFilter.cs:42 +msgid "" +"contact\n" +"contacts\n" +"vcard\n" +"vcards" +msgstr "" +"联系人\n" +"电话\n" +"电话簿\n" +"电话本" + +#: ../search/TypeFilter.cs:43 +msgid "" +"folder\n" +"folders" +msgstr "" +"文件夹\n" +"目录" + +#: ../search/TypeFilter.cs:44 +msgid "" +"image\n" +"images\n" +"img" +msgstr "" +"图像\n" +"图片\n" +"图" + +#: ../search/TypeFilter.cs:45 +msgid "audio" +msgstr "" +"歌\n" +"歌曲\n" +"音乐\n" +"音频" + +#: ../search/TypeFilter.cs:46 +msgid "video" +msgstr "" +"电影\n" +"视频" + +#: ../search/TypeFilter.cs:47 +msgid "media" +msgstr "媒体" + +#: ../search/TypeFilter.cs:48 +msgid "" +"document\n" +"documents\n" +"office document\n" +"office documents" +msgstr "" +"文档\n" +"办公" + +#: ../search/TypeFilter.cs:49 +msgid "" +"conversation\n" +"conversations" +msgstr "对话" + +#: ../search/TypeFilter.cs:50 +msgid "" +"web\n" +"www\n" +"website\n" +"websites" +msgstr "" +"www\n" +"网站\n" +"web\n" +"网" + +#: ../search/TypeFilter.cs:51 +msgid "" +"feed\n" +"news\n" +"blog\n" +"rss" +msgstr "" +"新闻推送\n" +"rss\n" +"feed\n" +"blog\n" +"博客\n" +"新闻" + +#: ../search/TypeFilter.cs:52 +msgid "" +"archive\n" +"archives" +msgstr "" +"压缩包\n" +"存档\n" +"压缩文件" + +#: ../search/TypeFilter.cs:53 +msgid "" +"person\n" +"people" +msgstr "人" + +#: ../search/UIManager.cs:35 +msgid "_Search" +msgstr "搜索(_S)" + +#: ../search/UIManager.cs:38 +msgid "_Actions" +msgstr "动作(_A)" + +#: ../search/UIManager.cs:41 +msgid "Sor_t" +msgstr "排序(_T)" + +#: ../search/UIManager.cs:44 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../search/UIManager.cs:49 ../search/UIManager.cs:53 +msgid "Exit Desktop Search" +msgstr "退出桌面搜索" + +#: ../search/UIManager.cs:56 +msgid "_Contents" +msgstr "目录(_C)" + +#: ../search/UIManager.cs:58 +msgid "Help - Table of Contents" +msgstr "帮助目录" + +#: ../search/UIManager.cs:62 +msgid "About Desktop Search" +msgstr "关于桌面搜索" + +#: ../search/UIManager.cs:75 +msgid "_Everywhere" +msgstr "任何地方(_E)" + +#: ../search/UIManager.cs:77 +msgid "Search everywhere" +msgstr "随处搜索" + +#: ../search/UIManager.cs:80 +msgid "_Applications" +msgstr "应用程序(_A)" + +#: ../search/UIManager.cs:82 +msgid "Search applications" +msgstr "搜索应用程序" + +#: ../search/UIManager.cs:85 +msgid "_Contacts" +msgstr "联系人(_C)" + +#: ../search/UIManager.cs:87 +msgid "Search contacts" +msgstr "搜索联系人" + +#: ../search/UIManager.cs:90 +msgid "_Documents" +msgstr "文档(_D)" + +#: ../search/UIManager.cs:92 +msgid "Search documents" +msgstr "搜索文档" + +#: ../search/UIManager.cs:95 +msgid "Conve_rsations" +msgstr "对话(_R)" + +#: ../search/UIManager.cs:97 +msgid "Search E-Mail and Instant Messaging logs" +msgstr "搜索电子邮件和即时通讯日志" + +#: ../search/UIManager.cs:100 +msgid "Images" +msgstr "图像" + +#: ../search/UIManager.cs:102 +msgid "Search images" +msgstr "搜索图像" + +#: ../search/UIManager.cs:105 +msgid "Media" +msgstr "媒体" + +#: ../search/UIManager.cs:107 +msgid "Search sound and video files" +msgstr "搜索影音文件" + +#: ../search/UIManager.cs:114 +msgid "Date _Modified" +msgstr "修改日期(_M)" + +#: ../search/UIManager.cs:115 +msgid "Sort the most-recently-modified matches first" +msgstr "将最近修改过的匹配项放在前面" + +#: ../search/UIManager.cs:118 +msgid "_Name" +msgstr "名称(_N)" + +#: ../search/UIManager.cs:119 +msgid "Sort matches by name" +msgstr "按照名称对匹配项排序" + +#: ../search/UIManager.cs:122 +msgid "_Relevance" +msgstr "相关度(_R)" + +#: ../search/UIManager.cs:123 +msgid "Sort the best matches first" +msgstr "将最佳的匹配放在前面" + +#: ../tools/Settings.cs:223 +msgid "Reload configuration" +msgstr "重新装入配置" + +#: ../tools/Settings.cs:224 +msgid "" +"The configuration file has been modified by another application. Do you wish " +"to discard the currently displayed values and reload configuration from disk?" +msgstr "" +"配置文件已经被其它应用程序修改。您是否像要丢弃目前显示的值，然后从磁盘重新装" +"入配置？" + +#: ../tools/Settings.cs:262 +msgid "Select Path" +msgstr "选择路径" + +#: ../tools/Settings.cs:281 +msgid "The selected path is already selected for indexing and wasn't added." +msgstr "选中的路径早已经选择进行索引了，因此没有添加。" + +#: ../tools/Settings.cs:284 +msgid "" +"The selected path wasn't added. The list contains items that supercedes it " +"and the data is already being indexed." +msgstr "选中的路径未添加。列表中包含与其类似的项目，而数据已经加入索引了。" + +#: ../tools/Settings.cs:295 ../tools/Settings.cs:487 +msgid "Path not added" +msgstr "路径未添加" + +#: ../tools/Settings.cs:304 +msgid "Remove obsolete paths" +msgstr "删除过期路径" + +#: ../tools/Settings.cs:305 +msgid "" +"Adding this path will obsolete some of the existing include paths. This will " +"result in the removal of the old obsolete paths. Do you still wish to add it?" +msgstr "" +"添加此路径将废弃某些现有的包含路径。这将使老的过时的路径被去除。仍然希望添加" +"吗？" + +#: ../tools/Settings.cs:331 +msgid "Remove path" +msgstr "删除路径" + +#: ../tools/Settings.cs:332 +msgid "" +"Are you sure you wish to remove this path from the list of directories to be " +"included for indexing?" +msgstr "您确实要将此路径从建立索引时要包括的目录列表中去除吗？" + +#: ../tools/Settings.cs:361 +msgid "Remove item" +msgstr "删除项目" + +#: ../tools/Settings.cs:362 +msgid "" +"Are you sure you wish to remove this item from the list of data to be " +"excluded from indexing?" +msgstr "您确实要将此项目从建立索引时要排除的数据列表中去除吗？" + +#: ../tools/Settings.cs:405 +msgid "Invalid host entry" +msgstr "无效的主机项" + +#: ../tools/Settings.cs:412 +msgid "Remote host already present in the list." +msgstr "远程主机已经位于列表中。" + +#: ../tools/Settings.cs:421 +msgid "Netbeagle Node not added" +msgstr "Netbeagle 节点未添加" + +#: ../tools/Settings.cs:437 +msgid "Remove host" +msgstr "删除主机" + +#: ../tools/Settings.cs:438 +msgid "Are you sure you wish to remove this host from the list?" +msgstr "您是否像要从列表中删除此主机？" + +#: ../tools/Settings.cs:459 +msgid "Select path" +msgstr "选择路径" + +#: ../tools/Settings.cs:478 +msgid "The selected path is already configured for external access." +msgstr "选中的路径已经配置为外部访问。" + +#: ../tools/Settings.cs:502 +msgid "Remove public path" +msgstr "删除公开路径" + +#: ../tools/Settings.cs:503 +msgid "" +"Are you sure you wish to remove this entry from the list of public paths?" +msgstr "您确定想要从公开路径列表中删除此项吗？" + +#: ../tools/Settings.cs:548 ../tools/Settings.cs:637 ../tools/Settings.cs:715 +#: ../tools/Settings.cs:791 ../tools/Settings.cs:1130 +msgid "Name" +msgstr "名称" + +#: ../tools/Settings.cs:631 ../tools/settings.glade.h:35 +msgid "Type" +msgstr "类型" + +#: ../tools/Settings.cs:684 ../tools/Settings.cs:1064 +#: ../tools/settings.glade.h:27 +msgid "Path" +msgstr "路径" + +#: ../tools/Settings.cs:687 ../tools/Settings.cs:1074 +msgid "Pattern" +msgstr "通配符" + +#: ../tools/Settings.cs:690 ../tools/Settings.cs:1069 +#: ../tools/settings.glade.h:24 +msgid "Mail Folder" +msgstr "邮件文件夹" + +#: ../tools/Settings.cs:1038 +msgid "Select Folder" +msgstr "选择文件夹" + +#: ../tools/Settings.cs:1098 +msgid "Error adding path" +msgstr "添加路径出错" + +#: ../tools/Settings.cs:1099 +msgid "" +"The specified path could not be found and therefore it could not be added to " +"the list of resources excluded for indexing." +msgstr "找不到指定的路径，因此无法将其添加到建立索引时要排除的资源列表中。" + +#: ../tools/Settings.cs:1129 +msgid "Show" +msgstr "显示" + +#: ../tools/settings.glade.h:1 +msgid "Add remote host" +msgstr "添加更多远程主机" + +#: ../tools/settings.glade.h:2 +msgid "Add resource" +msgstr "添加资源" + +#: ../tools/settings.glade.h:3 +msgid "Administration" +msgstr "管理" + +#: ../tools/settings.glade.h:4 +msgid "Display" +msgstr "显示" + +#: ../tools/settings.glade.h:5 +msgid "General" +msgstr "常规" + +#: ../tools/settings.glade.h:6 +msgid "Networking" +msgstr "联网" + +#: ../tools/settings.glade.h:7 +msgid "Privacy" +msgstr "隐私" + +#: ../tools/settings.glade.h:8 +msgid "Select mail folder" +msgstr "选择邮件文件夹" + +#: ../tools/settings.glade.h:9 +msgid "" +"Add a remote search-enabled host you wish \n" +"to network with." +msgstr "" +"请添加您希望连接的已启用搜索的\n" +"远程主机。" + +#: ../tools/settings.glade.h:11 +msgid "Add any additional paths to be included for indexing." +msgstr "请添加建立索引时要包含的任何其他路径。" + +#: ../tools/settings.glade.h:12 +msgid "Add any remote search-enabled hosts you wish to network with" +msgstr "请添加您希望连接的任何其他启用搜索的远程主机" + +#: ../tools/settings.glade.h:13 +msgid "Address" +msgstr "地址" + +#: ../tools/settings.glade.h:14 +msgid "" +"Adjust which types of results should be visible, and in what order they " +"should be presented when grouped by type." +msgstr "调整应显示的结果类型以及这些结果应按什么顺序显示（按类型分组时）。" + +#: ../tools/settings.glade.h:15 +msgid "Allow Beagle to be run as root" +msgstr "允许以 root 用户的身份运行 Beagle" + +#: ../tools/settings.glade.h:16 +msgid "Allow external access to local search services" +msgstr "允许外部访问本地搜索服务" + +#: ../tools/settings.glade.h:17 +msgid "Alt" +msgstr "Alt" + +#: ../tools/settings.glade.h:18 +msgid "Ctrl" +msgstr "Ctrl" + +#: ../tools/settings.glade.h:19 +msgid "Directory Path" +msgstr "目录路径" + +#: ../tools/settings.glade.h:20 +msgid "Display the search window by pressing" +msgstr "通过点击显示搜索窗口" + +#: ../tools/settings.glade.h:21 +msgid "Filename Pattern" +msgstr "文件名通配符" + +#: ../tools/settings.glade.h:22 +msgid "Index my home directory" +msgstr "对我的主目录进行索引" + +#: ../tools/settings.glade.h:23 +msgid "Indexing" +msgstr "索引" + +#: ../tools/settings.glade.h:25 +msgid "Maximum number of results displayed " +msgstr "显示的最大结果数" + +#: ../tools/settings.glade.h:26 +msgid "Networking" +msgstr "联网" + +#: ../tools/settings.glade.h:28 +msgid "Please select a resource you wish to exclude from indexing." +msgstr "请选择您想要从索引中排除的资源。" + +#: ../tools/settings.glade.h:29 +msgid "Please select the mail folder you wish to exclude from indexing. " +msgstr "请选择您想要从索引中排除的邮件文件夹。" + +#: ../tools/settings.glade.h:31 +msgid "Search Preferences" +msgstr "搜索首选项" + +#: ../tools/settings.glade.h:32 +msgid "" +"Specify any resources, such as paths, patterns, mail folders or type of " +"objects you wish to exclude from indexing." +msgstr "请指定建立索引时要排除的资源，例如路径、模式、邮件文件夹或对象类型。" + +#: ../tools/settings.glade.h:33 +msgid "Specify paths that should be available for external access" +msgstr "指定外部访问可用的路径" + +#: ../tools/settings.glade.h:34 +msgid "Start search & indexing services automatically " +msgstr "自动开始搜索和索引服务" + +#: ../tools/beagle-settings.desktop.in.h:1 +msgid "Configure Desktop Search & Indexing" +msgstr "配置桌面搜索和索引" + +#: ../tools/beagle-settings.desktop.in.h:2 +msgid "Configure search & indexing properties" +msgstr "配置搜索和索引属性" + +#: ../tools/beagle-settings.desktop.in.h:3 +msgid "Search & Indexing" +msgstr "搜索和索引" + +#: ../Util/Evolution.cs:45 ../Util/Evolution.cs:163 +msgid "On This Computer" +msgstr "于此计算机中" + +#: ../Util/ExifData.cs:226 +msgid "Image Directory" +msgstr "图像目录" + +#: ../Util/ExifData.cs:228 +msgid "Thumbnail Directory" +msgstr "缩略图目录" + +#: ../Util/ExifData.cs:230 +msgid "Exif Directory" +msgstr "Exif 目录" + +#: ../Util/ExifData.cs:232 +msgid "GPS Directory" +msgstr "GPS 目录" + +#: ../Util/ExifData.cs:234 +msgid "InterOperability Directory" +msgstr "InterOperability 目录" + +#: ../Util/ExifData.cs:236 +msgid "Unknown Directory" +msgstr "未知目录" + +#: ../Util/StringFu.cs:77 +msgid "Today" +msgstr "今天" + +#: ../Util/StringFu.cs:79 +msgid "Yesterday" +msgstr "昨天" + +#. Translators: Example output: Aug 9 +#: ../Util/StringFu.cs:82 +msgid "MMM d" +msgstr "MMM d" + +#. Translators: Example output: Aug 9, 2000 +#: ../Util/StringFu.cs:85 +msgid "MMM d, yyyy" +msgstr "MMM d, yyyy" + +#. Translators: Example output: 11:05 AM (note h = 12-hour time) +#: ../Util/StringFu.cs:88 +msgid "h:mm tt" +msgstr "h:mm tt" + +#. Translators: {0} is a date (e.g. 'Today' or 'Apr 23'), {1} is the time +#: ../Util/StringFu.cs:94 +#, csharp-format +msgid "{0}, {1}" +msgstr "{0} {1}" + +#. To translators: {0} is the time of the day, eg. 13:45 +#: ../Util/StringFu.cs:111 +#, csharp-format +msgid "Today, {0}" +msgstr "今天 {0}" + +#. To translators: {0} is the time of the day, eg. 13:45 +#: ../Util/StringFu.cs:114 +#, csharp-format +msgid "Yesterday, {0}" +msgstr "昨天 {0}" + +#. To translators: {0} is the number of days that have passed, {1} is the time of the day, eg. 13:45 +#: ../Util/StringFu.cs:117 +#, csharp-format +msgid "{0} days ago, {1}" +msgstr "{0} 天前 {1}" + +#. Translators: Example output: January 3, 3:45 PM +#: ../Util/StringFu.cs:122 +msgid "MMMM d, h:mm tt" +msgstr "MMMM d, h:mm tt" + +#. Translators: Example output: March 23 2001, 10:04 AM +#: ../Util/StringFu.cs:127 +msgid "MMMM d yyyy, h:mm tt" +msgstr "MMMM d yyyy, h:mm tt" + +#: ../Util/StringFu.cs:137 +#, csharp-format +msgid "{0} hour" +msgid_plural "{0} hours" +msgstr[0] "{0} 个小时" + +#: ../Util/StringFu.cs:144 +#, csharp-format +msgid "{0} minute" +msgid_plural "{0} minutes" +msgstr[0] "{0} 分钟" + +#. Translators: {0} is a file size in bytes +#: ../Util/StringFu.cs:160 +#, csharp-format +msgid "{0} bytes" +msgstr "{0} 字节" + +#. Translators: {0} is a file size in kilobytes +#: ../Util/StringFu.cs:164 +#, csharp-format +msgid "{0:0.0} KB" +msgstr "{0:0.0} KB" + +#. Translators: {0} is a file size in megabytes +#: ../Util/StringFu.cs:167 +#, csharp-format +msgid "{0:0.0} MB" +msgstr "{0:0.0} MB" + +#~ msgid "Top {0} Result" +#~ msgid_plural "Top {0} Results" +#~ msgstr[0] "头{0}个结果" + +#~ msgid "Previous {0}" +#~ msgid_plural "Previous {0}" +#~ msgstr[0] "前{0}个" + +#~ msgid "Next {0}" +#~ msgid_plural "Next {0}" +#~ msgstr[0] "后{0}个" + +#~ msgid "Move to trash" +#~ msgstr "移至回收站" + +#~ msgid "Add to Library" +#~ msgstr "添加到库中" + +#~ msgid "Open With" +#~ msgstr "打开方式" + +#~ msgid "Instant-Message" +#~ msgstr "即时通讯" + +#~ msgid "Show Information" +#~ msgstr "显示信息" + +#~ msgid "More application results..." +#~ msgstr "更多应用程序结果..." + +#~ msgid "More contact results..." +#~ msgstr "更多联系人结果..." + +#~ msgid "More folder results..." +#~ msgstr "更多文件夹结果..." + +#~ msgid "More image results..." +#~ msgstr "更多图像结果..." + +#~ msgid "More audio results..." +#~ msgstr "更多音频结果..." + +#~ msgid "More video results..." +#~ msgstr "更多视频结果..." + +#~ msgid "More document results..." +#~ msgstr "更多文档结果..." + +#~ msgid "More conversation results..." +#~ msgstr "更多对话结果..." + +#~ msgid "More website results..." +#~ msgstr "更多网站结果..." + +#~ msgid "More news feed results..." +#~ msgstr "更多新闻推送结果..." + +#~ msgid "More archive results..." +#~ msgstr "更多压缩包结果..." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit banshee
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package banshee checked in at Sat Jun 3 00:51:51 CEST 2006. -------- --- GNOME/banshee/banshee.changes 2006-06-01 00:25:19.000000000 +0200 +++ banshee/banshee.changes 2006-06-02 22:12:01.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 22:11:51 CEST 2006 - gekker(a)suse.de + +- Update translation for de + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ banshee.spec ++++++ --- /var/tmp/diff_new_pack.G1VkJC/_old 2006-06-03 00:51:39.000000000 +0200 +++ /var/tmp/diff_new_pack.G1VkJC/_new 2006-06-03 00:51:39.000000000 +0200 @@ -26,7 +26,7 @@ PreReq: filesystem gconf2 Requires: mono-core Version: 0.10.9 -Release: 34 +Release: 36 Source0: banshee-%{version}.tar.gz Source1: gstreamer-xing-0.10.0.tar.gz Source2: banshee-po.tar.bz2 @@ -302,6 +302,8 @@ %{prefix}/%{_lib}/banshee/Banshee.Plugins/Daap.dll* %changelog -n banshee +* Fri Jun 02 2006 - gekker(a)suse.de +- Update translation for de * Thu Jun 01 2006 - jpr(a)suse.de - Restore volume properly (#176255) - Actually display the dialog when CD burn is too big (#151332) ++++++ banshee-po.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/de.po new/po/de.po --- old/po/de.po 2006-05-31 17:44:18.000000000 +0200 +++ new/po/de.po 2006-06-02 22:09:07.000000000 +0200 @@ -301,7 +301,7 @@ #: ../data/banshee.schemas.in.h:5 msgid "File Name Pattern" -msgstr "Muster für Dateinamen" +msgstr "Schema für Dateinamen" #: ../data/banshee.schemas.in.h:7 #, no-c-format ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit NetworkManager
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package NetworkManager checked in at Sat Jun 3 00:51:15 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-30 17:03:29.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-06-02 22:03:42.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 22:02:51 CEST 2006 - rml(a)suse.de + +- Update translations (Novell bug #169096) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.pzzHSU/_old 2006-06-03 00:50:56.000000000 +0200 +++ /var/tmp/diff_new_pack.pzzHSU/_new 2006-06-03 00:50:56.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 43 +Release: 44 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -266,6 +266,8 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Fri Jun 02 2006 - rml(a)suse.de +- Update translations (Novell bug #169096) * Tue May 30 2006 - rml(a)suse.de - Fix crash in disposing of wireless objects before they are fully initialized (Novell bug #179525) ++++++ nm-po-update.patch ++++++ --- /var/tmp/diff_new_pack.pzzHSU/_old 2006-06-03 00:50:58.000000000 +0200 +++ /var/tmp/diff_new_pack.pzzHSU/_new 2006-06-03 00:50:59.000000000 +0200 @@ -1,6 +1,6 @@ Translation update - po/ChangeLog | 12 + po/ChangeLog | 16 po/bg.po | 605 +++++++++++++++++++++-------- po/bs.po | 955 +++++++++++++++++++++++++++++++++++++++++++--- po/ca.po | 509 ++++++++++++++++-------- @@ -15,7 +15,7 @@ po/fr.po | 1064 ++++++++++++++++++++++++++++++++++++++++++++-------- po/gu.po | 952 +++++++++++++++++++++++++++++++++++++++++++--- po/hr.po | 1045 ++++++++++++++++++++++++++++++++++++++++++++------- - po/hu.po | 566 ++++++++++++++++++--------- + po/hu.po | 486 ++++++++++++++--------- po/it.po | 1184 ++++++++++++++++++++++++++++++++++++++++++++++++---------- po/ja.po | 1013 +++++++++++++++++++++++++++++++++++++++++++------ po/ko.po | 456 +++++++++++++--------- @@ -37,7 +37,7 @@ po/wa.po | 962 +++++++++++++++++++++++++++++++++++++++++++---- po/zh_CN.po | 727 +++++++++++++++++++++++++---------- po/zh_TW.po | 867 +++++++++++++++++++++++++++++------------- - 37 files changed, 22213 insertions(+), 6125 deletions(-) + 37 files changed, 22142 insertions(+), 6120 deletions(-) diff -urN NetworkManager-0.6.2-tarball/po/bg.po NetworkManager/po/bg.po --- NetworkManager-0.6.2-tarball/po/bg.po 2006-02-27 01:53:33.000000000 -0500 @@ -3136,8 +3136,12 @@ #~ "different wireless network will be used if any are available." diff -urN NetworkManager-0.6.2-tarball/po/ChangeLog NetworkManager/po/ChangeLog --- NetworkManager-0.6.2-tarball/po/ChangeLog 2006-03-02 06:59:30.000000000 -0500 -+++ NetworkManager/po/ChangeLog 2006-05-30 11:37:53.000000000 -0400 -@@ -1,3 +1,15 @@ ++++ NetworkManager/po/ChangeLog 2006-06-02 16:01:43.000000000 -0400 +@@ -1,3 +1,19 @@ ++2006-06-02 Robert Love <rml(a)novell.com> ++ ++ * hu.po: Update. ++ +2006-05-30 Robert Love <rml(a)novell.com> + + * no.po: Remove. We have nb.po. @@ -14918,24 +14922,35 @@ +#~ msgstr "Žičana mreža" diff -urN NetworkManager-0.6.2-tarball/po/hu.po NetworkManager/po/hu.po --- NetworkManager-0.6.2-tarball/po/hu.po 2006-02-27 01:53:33.000000000 -0500 -+++ NetworkManager/po/hu.po 2006-05-29 12:58:08.000000000 -0400 -@@ -6,88 +6,86 @@ ++++ NetworkManager/po/hu.po 2006-06-02 16:01:43.000000000 -0400 +@@ -1,93 +1,91 @@ ++# translation of hu.po to Hungarian + # Hungarian translation of NetworkManager +-# Gabor Kelemen <kelemeng(a)gnome.hu>, 2005, 2006. + # This file is distributed under the same license as the NetworkManager package. + # Copyright (C) 2005, Free Software Foundation. Inc. ++# Gabor Kelemen <kelemeng(a)gnome.hu>, 2005, 2006. ++# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006. + msgid "" msgstr "" - "Project-Id-Version: NetworkManager.HEAD.hu\n" +-"Project-Id-Version: NetworkManager.HEAD.hu\n" ++"Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-28 20:28+0100\n" -"PO-Revision-Date: 2006-01-06 19:36+0100\n" -"Last-Translator: Gabor Kelemen <kelemeng(a)gnome.hu>\n" +-"Language-Team: Hungarian <gnome(a)gnome.hu>\n" +"POT-Creation-Date: 2006-05-29 18:33+0200\n" -+"PO-Revision-Date: 2006-05-08 23:42+0100\n" -+"Last-Translator: Szabolcs Varga <shirokuma(a)shirokuma.hu>\n" - "Language-Team: Hungarian <gnome(a)gnome.hu>\n" ++"PO-Revision-Date: 2006-05-30 12:00+0200\n" ++"Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n" ++"Language-Team: Hungarian <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +-"X-Generator: KBabel 1.11.1\n" +"Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: KBabel 1.11.1\n" ++"X-Generator: KBabel 1.10.2\n" -#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:923 +#: ../gnome/applet/applet-compat.c:171 ../gnome/applet/applet-dbus-info.c:919 @@ -14994,10 +15009,8 @@ msgstr "Copyright (C) 2004-2005 Red Hat, Inc." -#: ../gnome/applet/applet.c:324 ../gnome/applet/applet.c:349 --msgid "Notification area applet for managing your network devices and connections." +#: ../gnome/applet/applet.c:340 ../gnome/applet/applet.c:365 -+msgid "" -+"Notification area applet for managing your network devices and connections." + msgid "Notification area applet for managing your network devices and connections." msgstr "" "Értesítésiterület-kisalkalmazás a hálózati eszközök és kapcsolatok " "kezelésére." @@ -15020,9 +15033,7 @@ +#: ../gnome/applet/applet.c:427 #, c-format msgid "Could not start the VPN connection '%s' due to a login failure." --msgstr "Egy bejelentkezési hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." -+msgstr "" -+"Egy bejelentkezési hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." + msgstr "Egy bejelentkezési hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." -#: ../gnome/applet/applet.c:448 +#: ../gnome/applet/applet.c:431 @@ -15034,7 +15045,7 @@ #, c-format msgid "" "Could not start the VPN connection '%s' due to a failure launching the VPN " -@@ -96,25 +94,26 @@ +@@ -96,25 +94,25 @@ "Nem sikerült elindítani \"%s\" VPN kapcsolatot a VPN program indításakor " "fellépett hiba miatt." @@ -15047,9 +15058,7 @@ +#: ../gnome/applet/applet.c:437 #, c-format msgid "Could not start the VPN connection '%s' due to a connection error." --msgstr "Egy kapcsolódási hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." -+msgstr "" -+"Egy kapcsolódási hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." + msgstr "Egy kapcsolódási hiba miatt nem lehet elindítani \"%s\" VPN kapcsolatot." -#: ../gnome/applet/applet.c:458 +#: ../gnome/applet/applet.c:441 @@ -15067,7 +15076,7 @@ #, c-format msgid "" "Could not start the VPN connection '%s' because the VPN server did not " -@@ -123,185 +122,176 @@ +@@ -123,185 +121,175 @@ "Nem sikerült elindítani \"%s\" VPN kapcsolatot, mivel a VPN-kiszolgáló nem " "adott vissza megfelelő hálózati beállításokat." @@ -15100,9 +15109,7 @@ +#: ../gnome/applet/applet.c:753 #, c-format msgid "The network device \"%s (%s)\" does not support wireless scanning." --msgstr "A(z) \"%s (%s)\" hálózati eszköz nem támogatja a vezeték nélküli keresést." -+msgstr "" -+"A(z) \"%s (%s)\" hálózati eszköz nem támogatja a vezeték nélküli keresést." + msgstr "A(z) \"%s (%s)\" hálózati eszköz nem támogatja a vezeték nélküli keresést." -#: ../gnome/applet/applet.c:780 +#: ../gnome/applet/applet.c:761 @@ -15293,7 +15300,7 @@ msgid "" "The NetworkManager applet could not find some required resources. It cannot " "continue.\n" -@@ -317,61 +307,99 @@ +@@ -317,61 +305,99 @@ msgid "Shared Key" msgstr "Megosztott kulcs" @@ -15315,7 +15322,7 @@ + +#: ../gnome/applet/wireless-security-option.c:231 +msgid "Dynamic WEP" -+msgstr "" ++msgstr "Dinamikus WEP" + #: ../gnome/applet/wso-none.c:53 msgid "None" @@ -15415,7 +15422,7 @@ msgid " (invalid Unicode)" msgstr " (érvénytelen Unicode)" -@@ -380,7 +408,9 @@ +@@ -380,7 +406,9 @@ msgid "" "By default, the wireless network's name is set to your computer's name, %s, " "with no encryption enabled" @@ -15426,7 +15433,7 @@ #: ../gnome/applet/other-network-dialog.c:358 msgid "Create new wireless network" -@@ -390,7 +420,9 @@ +@@ -390,7 +418,9 @@ msgid "" "Enter the name and security settings of the wireless network you wish to " "create." @@ -15437,15 +15444,7 @@ #: ../gnome/applet/other-network-dialog.c:363 msgid "Create New Wireless Network" -@@ -402,19 +434,32 @@ - - #: ../gnome/applet/other-network-dialog.c:369 - msgid "Enter the name of the wireless network to which you wish to connect." --msgstr "Adja meg azon vezeték nélküli hálózat nevét, amelyhez kapcsolódni kíván." -+msgstr "" -+"Adja meg azon vezeték nélküli hálózat nevét, amelyhez kapcsolódni kíván." - - #: ../gnome/applet/other-network-dialog.c:371 +@@ -408,13 +438,25 @@ msgid "Connect to Other Wireless Network" msgstr "Kapcsolódás más vezeték nélküli hálózathoz" @@ -15474,7 +15473,7 @@ #, c-format msgid "" "Could not find the authentication dialog for VPN connection type '%s'. " -@@ -423,7 +468,7 @@ +@@ -423,7 +465,7 @@ "Nem található a hitelesítési párbeszédablak a(z) \"%s\" típusú VPN " "kapcsolathoz. Lépjen kapcsolatba a rendszergazdával." @@ -15483,20 +15482,7 @@ #, c-format msgid "" "There was a problem launching the authentication dialog for VPN connection " -@@ -437,8 +482,10 @@ - msgstr " " - - #: ../gnome/applet/applet.glade.h:2 --msgid "Active Connection Information" --msgstr "Aktív kapcsolatok információi" -+msgid "" -+"Active Connection Information" -+msgstr "" -+"Aktív kapcsolatok információi" - - #: ../gnome/applet/applet.glade.h:4 - #, no-c-format -@@ -486,58 +533,87 @@ +@@ -486,58 +528,86 @@ "későbbiekben kapcsolódik hozzá." #: ../gnome/applet/applet.glade.h:15 @@ -15569,9 +15555,8 @@ -#: ../gnome/applet/applet.glade.h:24 +#: ../gnome/applet/applet.glade.h:30 -+#, fuzzy +msgid "Key Type:" -+msgstr "Típus:" ++msgstr "Kulcs típusa:" + +#: ../gnome/applet/applet.glade.h:31 msgid "Key:" @@ -15601,7 +15586,7 @@ msgid "" "Open System\n" "Shared Key" -@@ -545,95 +621,111 @@ +@@ -545,95 +615,111 @@ "Nyílt rendszer\n" "Megosztott kulcs" @@ -15754,7 +15739,7 @@ msgid "" "No suitable VPN software was found on your system. Contact your system " "administrator." -@@ -641,11 +733,11 @@ +@@ -641,11 +727,11 @@ "Nem található megfelelő VPN szoftver a rendszerén. Lépjen kapcsolatba a " "rendszergazdával." @@ -15768,7 +15753,7 @@ #, c-format msgid "" "Cannot find suitable software for VPN connection type '%s' to import the " -@@ -654,12 +746,12 @@ +@@ -654,12 +740,12 @@ "Nem található a(z) \"%s\" kapcsolattípusnak megfelelő VPN szoftver a(z) \"%s" "\" fájl importálásához. Lépjen kapcsolatba a rendszergazdával." @@ -15783,7 +15768,7 @@ #, c-format msgid "" "Could not find the UI files for VPN connection type '%s'. Contact your " -@@ -668,12 +760,12 @@ +@@ -668,12 +754,12 @@ "Nem találhatóak a(z) \"%s\" VPN kapcsolathoz tartozó felhasználóifelület-" "fájlok. Lépjen kapcsolatba a rendszergazdával." @@ -15798,7 +15783,7 @@ #, c-format msgid "" "All information about the VPN connection \"%s\" will be lost and you may " -@@ -684,16 +776,16 @@ +@@ -684,16 +770,16 @@ "kapcsolat létrehozásához szükséges információkért lehetséges, hogy a " "rendszergazdára is szüksége lesz." @@ -15818,7 +15803,7 @@ msgid "Edit VPN Connection" msgstr "VPN kapcsolat szerkesztése" -@@ -767,11 +859,11 @@ +@@ -767,11 +853,11 @@ msgid "VPN Connections" msgstr "VPN kapcsolatok" @@ -15832,7 +15817,7 @@ msgid "104-bit WEP" msgstr "104 bites WEP" -@@ -783,28 +875,38 @@ +@@ -783,15 +869,23 @@ msgid "WPA CCMP" msgstr "WPA CCMP" @@ -15859,32 +15844,14 @@ msgid "none" msgstr "nincs" - #: ../src/nm-netlink-monitor.c:154 - #, c-format --msgid "unable to create netlink socket for monitoring wired ethernet devices - %s" -+msgid "" -+"unable to create netlink socket for monitoring wired ethernet devices - %s" - msgstr "" - "nem lehet netlink foglalatot létrehozni a vezetékes ethernet kártyák " - "megfigyelésére - %s" - - #: ../src/nm-netlink-monitor.c:172 - #, c-format --msgid "unable to bind to netlink socket for monitoring wired ethernet devices - %s" -+msgid "" -+"unable to bind to netlink socket for monitoring wired ethernet devices - %s" - msgstr "" - "nem lehet kapcsolódni a netlink foglalathoz a vezetékes ethernet kártyák " - "megfigyelésére - %s" -@@ -829,3 +931,91 @@ +@@ -829,3 +923,29 @@ msgid "error occurred while waiting for data on socket" msgstr "hiba lépett fel adatokra várakozás közben a foglalaton" +#: ../gnome/applet/applet-dbus-devices.c:898 +#, c-format +msgid "You are now connected to the Ad-Hoc wireless network '%s'." -+msgstr "" -+"Kapcsolódott a(z) \"%s\" ad-hoc vezeték nélküli hálózathoz kapcsolódva." ++msgstr "Kapcsolódott a(z) \"%s\" ad-hoc vezeték nélküli hálózathoz kapcsolódva." + +#: ../gnome/applet/applet-dbus-devices.c:903 +#, c-format @@ -15907,67 +15874,6 @@ +msgid "The network connection has been disconnected." +msgstr "A hálózati kapcsolat bontva." + -+#~ msgid "Stop automatically running the networking applet?" -+#~ msgstr "A hálózatkezelő kisalkalmazás automatikus futtatásának leállítása?" -+ -+#~ msgid "" -+#~ "The networking applet will now terminate, but will automatically launch " -+#~ "the next time you login. Would you like to stop automatically running " -+#~ "the networking applet on login?" -+#~ msgstr "" -+#~ "A hálózatkezelő kisalkalmazás most befejeződik, de a következő " -+#~ "bejelentkezéskor el fog indulni. Le szeretné tiltani a hálózatkezelő " -+#~ "kisalkalmazás automatikus futtatását bejelentkezéskor?" -+ -+#~ msgid "_Remove" -+#~ msgstr "_Eltávolítás" -+ -+#~ msgid "Error displaying connection information: " -+#~ msgstr "Hiba a kapcsolat információinak megjelenítése közben: " -+ -+#~ msgid "VPN Error" -+#~ msgstr "VPN hiba" -+ -+#~ msgid "The VPN service said: \"%s\"" -+#~ msgstr "A VPN szolgáltatás válasza: \"%s\"" -+ -+#~ msgid "VPN connection '%s' said:" -+#~ msgstr "A(z) \"%s\" VPN kapcsolat válasza:" -+ -+#~ msgid "TKIP (Default)" -+#~ msgstr "TKIP (alapértelmezett)" -+ -+#~ msgid "WEP 40/128-bit ASCII" -+#~ msgstr "WEP 40/128 bites ASCII" -+ -+#~ msgid "WEP 40/128-bit hex" -+#~ msgstr "WEP 40/128 bites hexadecimális" -+ -+#~ msgid "WEP Passphrase" -+#~ msgstr "WEP jelmondat" -+ -+#~ msgid "" -+#~ "None\n" -+#~ "WEP Passphrase\n" -+#~ "WEP 40/128-bit hex\n" -+#~ "WEP 40/128-bit ASCII\n" -+#~ msgstr "" -+#~ "Nincs\n" -+#~ "WEP jelmondat\n" -+#~ "WEP 40/128-bit hexadecimális\n" -+#~ "WEP 40/128-bit ASCII\n" -+ -+#~ msgid "leap_subwindow" -+#~ msgstr "leap_subwindow" -+ -+#~ msgid "wep_key_subwindow" -+#~ msgstr "wep_key_subwindow" -+ -+#~ msgid "wep_passphrase_subwindow" -+#~ msgstr "wep_passphrase_subwindow" -+ -+#~ msgid "wpa_psk_subwindow" -+#~ msgstr "wpa_psk_subwindow" diff -urN NetworkManager-0.6.2-tarball/po/it.po NetworkManager/po/it.po --- NetworkManager-0.6.2-tarball/po/it.po 2005-02-27 12:50:52.000000000 -0500 +++ NetworkManager/po/it.po 2006-05-29 12:58:08.000000000 -0400 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit procinfo
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package procinfo checked in at Fri Jun 2 14:31:18 CEST 2006. -------- --- procinfo/procinfo.changes 2006-05-26 19:16:40.000000000 +0200 +++ procinfo/procinfo.changes 2006-06-02 14:26:11.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 2 14:22:53 CEST 2006 - werner(a)suse.de + +- The members of the array used for storing irq are unsigned longs, + many thansk to Harald Koenig. + +------------------------------------------------------------------- +Fri Jun 2 12:59:42 CEST 2006 - werner(a)suse.de + +- The timer ticks on ix86 are given in kernel space HZ, use correct + factor to get them into user space HZ (bug #56081) + +------------------------------------------------------------------- New: ---- procinfo-irq.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procinfo.spec ++++++ --- /var/tmp/diff_new_pack.JaxaeM/_old 2006-06-02 14:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JaxaeM/_new 2006-06-02 14:31:12.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Monitoring Autoreqprov: on Version: 18 -Release: 55 +Release: 56 Summary: Display System Status Gathered from /proc Provides: ps:/usr/bin/lsdev Source: ftp://ftp.cistron.nl/pub/people/svm/%{name}-%{version}.tar.bz2 @@ -26,6 +26,7 @@ Patch3: procinfo-TERM.dif Patch4: procinfo-26.diff Patch5: procinfo-gccver.diff +Patch6: procinfo-irq.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,6 +48,7 @@ %patch3 %patch4 -p1 %patch5 -p1 +%patch6 %build CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ${RPM_OPT_FLAGS} -pipe" @@ -71,6 +73,12 @@ %{_mandir}/man8/socklist.8* %changelog -n procinfo +* Fri Jun 02 2006 - werner(a)suse.de +- The members of the array used for storing irq are unsigned longs, + many thansk to Harald Koenig. +* Fri Jun 02 2006 - werner(a)suse.de +- The timer ticks on ix86 are given in kernel space HZ, use correct + factor to get them into user space HZ (bug #56081) * Fri May 26 2006 - schwab(a)suse.de - Don't strip binaries. * Wed Jan 25 2006 - mls(a)suse.de ++++++ procinfo-hz ++++++ --- /var/tmp/diff_new_pack.JaxaeM/_old 2006-06-02 14:31:12.000000000 +0200 +++ /var/tmp/diff_new_pack.JaxaeM/_new 2006-06-02 14:31:12.000000000 +0200 @@ -52,6 +52,22 @@ static void first_page (long sl) { +@@ -424,13 +424,13 @@ + #ifdef __i386__ /* IRQ 0 is timer tick on i386's... */ + if (nr_irqs) { + if (fs && old.uptime) +- elapsed = DIFF (intr[0]); ++ elapsed = (DIFF(intr[0]) * HZ) / hz; + } else + #endif + #ifdef __sparc__ /* IRQ 10 is timer tick on sparc's... */ + if (nr_irqs) { + if (fs && old.uptime) +- elapsed = DIFF (intr[10]); ++ elapsed = (DIFF(intr[10]) * HZ) / hz; + } else + #endif + { @@ -702,8 +718,9 @@ main (int ac, char **av) uname(&ut); linux_version_code = (atol(strtok(ut.release, ".")) * 0x10000) + ++++++ procinfo-irq.dif ++++++ --- procinfo.c +++ procinfo.c 2006-06-02 14:19:13.000000000 +0200 @@ -992,10 +992,10 @@ for(i = 5; i < len; i++) if(line[i] == ' ') nr_irqs++; - new.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); - old.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); + new.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); + old.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); memset (&base, 0, sizeof (struct info)); - base.intr = my_xcalloc (nr_irqs, sizeof (unsigned int)); + base.intr = my_xcalloc (nr_irqs, sizeof (unsigned long int)); continue; } /* While we're at it, fill in booted. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit evolution-data-server
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package evolution-data-server checked in at Fri Jun 2 14:31:06 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-05-31 23:23:41.000000000 +0200 +++ evolution-data-server/evolution-data-server.changes 2006-06-02 12:50:01.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 12:48:15 CEST 2006 - sragavan(a)novell.com + +- Updated German Translations. + +------------------------------------------------------------------- New: ---- german-translation-eds.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.rilQUr/_old 2006-06-02 14:27:12.000000000 +0200 +++ /var/tmp/diff_new_pack.rilQUr/_new 2006-06-02 14:27:12.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 55 +Release: 56 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{v… #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -91,6 +91,7 @@ Patch70: camel-vfs-stream.diff Patch71: bnc-174255-honour-system-proxy-settings.patch Patch72: bnc-176277-2.patch +Patch73: german-translation-eds.diff Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -193,6 +194,7 @@ %patch70 %patch71 %patch72 +%patch73 %build rename no nb po/no.* @@ -243,6 +245,8 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Fri Jun 02 2006 - sragavan(a)novell.com +- Updated German Translations. * Wed May 31 2006 - fejj(a)suse.de - Added bnc-176277-2.patch which fixes a deadlock condition * Mon May 29 2006 - vvaradhan(a)novell.com ++++++ german-translation-eds.diff ++++++ --- /root/sragavan/602/build-eds/usr/src/packages/BUILD/evolution-data-server-1.6.0/po/de.po 2006-06-02 06:39:20.962276877 +0200 +++ po/de.po 2006-05-25 12:28:10.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: evolution-data-server\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-04 06:53+0000\n" -"PO-Revision-Date: 2006-05-17 11:25\n" +"PO-Revision-Date: 2006-05-25 11:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -656,7 +656,7 @@ #: ../calendar/backends/file/e-cal-backend-file.c:209 #, msgid "Can't save calendar data: " -msgstr "Can't save calendar data: " +msgstr "Kalenderdaten können nicht gespeichert werden: " #: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:872 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1582 @@ -2485,7 +2485,7 @@ #: ../camel/providers/groupwise/camel-groupwise-folder.c:966 msgid "Trash Folder Full. Please Empty." -msgstr "Trash Folder Full. Please Empty." +msgstr "Müllordner voll. Bitte leeren." #: ../camel/providers/groupwise/camel-groupwise-folder.c:1129 #: ../camel/providers/groupwise/camel-groupwise-store.c:632 @@ -2605,7 +2605,7 @@ #: ../camel/providers/groupwise/camel-groupwise-store.c:226 #, msgid "Unable to authenticate to GroupWise server. " -msgstr "Unable to authenticate to GroupWise server. " +msgstr "Authentifizierung beim GroupWise-Server nicht möglich. " #: ../camel/providers/groupwise/camel-groupwise-store.c:304 msgid "Some features may not work correctly with your current server version" @@ -4662,12 +4662,12 @@ #: ../libedataserverui/e-passwords.c:472 #, msgid "_Remember this passphrase" -msgstr "_Remember this passphrase" +msgstr "_An diesen Passwortsatz erinnern" #: ../libedataserverui/e-passwords.c:473 #, msgid "_Remember this passphrase for the remainder of this session" -msgstr "_Remember this passphrase for the remainder of this session" +msgstr "_Für den Rest dieser Sitzung an diesen Passwortsatz erinnern" #: ../libedataserverui/e-passwords.c:476 msgid "_Remember this password" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit evolution
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package evolution checked in at Fri Jun 2 14:27:03 CEST 2006. -------- --- GNOME/evolution/evolution.changes 2006-05-30 18:04:21.000000000 +0200 +++ evolution/evolution.changes 2006-06-02 12:49:38.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 2 12:48:15 CEST 2006 - sragavan(a)novell.com + +- Updated German Translations. + +------------------------------------------------------------------- New: ---- german-translation-evo.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.skxzYj/_old 2006-06-02 14:23:31.000000000 +0200 +++ /var/tmp/diff_new_pack.skxzYj/_new 2006-06-02 14:23:31.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.6.0 -Release: 58 +Release: 59 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.… Source1: summerdance-about2.png @@ -101,6 +101,7 @@ Patch82: evolution-cs.patch Patch83: bnc-176615-gnome-vfs-samba.diff Patch84: bnc-178631.patch +Patch85: german-translation-evo.diff URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 shared-mime-info @@ -389,6 +390,7 @@ %patch82 %patch83 %patch84 +%patch85 %build rename no nb po/no.* @@ -510,6 +512,8 @@ %{prefix}/share/gnome-pilot/conduits/*.conduit %changelog -n evolution +* Fri Jun 02 2006 - sragavan(a)novell.com +- Updated German Translations. * Tue May 30 2006 - fejj(a)suse.de - Added bnc-178631.patch fixing a crash when suers try to drop the "Home" icon from their desktop into a Composer window. ++++++ german-translation-evo.diff ++++++ --- /root/sragavan/602/build-evo/usr/src/packages/BUILD/evolution-2.6.0/po/de.po 2006-06-02 07:02:36.661484507 +0200 +++ po/de.po 2006-05-25 12:28:12.000000000 +0200 @@ -18,7 +18,7 @@ "Project-Id-Version: evolution\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-04 06:38+0000\n" -"PO-Revision-Date: 2006-05-17 11:25\n" +"PO-Revision-Date: 2006-05-25 11:28\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" "MIME-Version: 1.0\n" @@ -5403,7 +5403,7 @@ #: ../calendar/gui/dialogs/delete-comp.c:206 msgid "_Delete this item from all other recipient's mailboxes?" -msgstr "_Delete this item from all other recipient's mailboxes?" +msgstr "_Diese Nachricht aus den Postfächern aller anderen Empfänger löschen?" #: ../calendar/gui/dialogs/delete-error.c:54 msgid "The event could not be deleted due to a corba error" @@ -10829,7 +10829,7 @@ # CHECK #: ../mail/em-format-html-display.c:1178 msgid "Completed on %B %d, %Y, %l:%M %p" -msgstr "Fertiggestellt am %B %d, %Y, %l:%M %p" +msgstr "Fertiggestellt am %d. %B %Y, %R" #: ../mail/em-format-html-display.c:1186 msgid "Overdue:" @@ -10837,7 +10837,7 @@ #: ../mail/em-format-html-display.c:1189 msgid "by %B %d, %Y, %l:%M %p" -msgstr "am %B %d, %Y, %l:%M %p" +msgstr "am %d. %b, %k:%M" #: ../mail/em-format-html-display.c:1249 msgid "_View Inline" @@ -11791,7 +11791,7 @@ #: ../mail/mail-config.glade.h:7 #, msgid "This will make the filter more reliable, but slower" -msgstr "This will make the filter more reliable, but slower" +msgstr "Dadurch wird der Filter zuverlässiger, aber langsamer" #: ../mail/mail-config.glade.h:8 msgid "Account Information" @@ -12629,12 +12629,12 @@ #: ../mail/mail-session.c:205 #, , c-format msgid "Enter Passphrase for %s" -msgstr "Enter Passphrase for %s" +msgstr "Passwortsatz für %s eingeben" #: ../mail/mail-session.c:207 #, msgid "Enter Passphrase" -msgstr "Enter Passphrase" +msgstr "Passwortsatz eingeben" #: ../mail/mail-session.c:210 #: ../plugins/exchange-operations/exchange-config-listener.c:710 @@ -13208,7 +13208,7 @@ #: ../mail/message-list.c:1377 ../widgets/table/e-cell-date.c:102 msgid "%b %d %l:%M %p" -msgstr "%b %d %l:%M %p" +msgstr "%d. %b, %k:%M" #: ../mail/message-list.c:1379 ../widgets/table/e-cell-date.c:104 msgid "%b %d %Y" @@ -13934,7 +13934,7 @@ #: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:2 #, msgid "Subscribe to Other User's Exchange Contacts" -msgstr "Subscribe to Other User's Exchange Contacts" +msgstr "Exchange-Kontakte eines anderen Benutzers abonnieren" #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1 msgid "Subscribe to Other User's Calendar" @@ -13943,7 +13943,7 @@ #: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:2 #, msgid "Subscribe to Other User's Exchange Calendar" -msgstr "Subscribe to Other User's Exchange Calendar" +msgstr "Exchange-Kalender eines anderen Benutzers abonnieren" #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1 msgid "A plugin that handles a collection of Exchange account specific operations and features." @@ -14193,7 +14193,7 @@ #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1 #, msgid "Subscribe to Other User's Exchange Tasks" -msgstr "Subscribe to Other User's Exchange Tasks" +msgstr "Exchange-Aufgaben eines anderen Benutzers abonnieren" #: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:2 msgid "Subscribe to Other User's Tasks" @@ -14206,7 +14206,7 @@ #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1 #, msgid "Subscribe to Other User's Exchange Folder" -msgstr "Subscribe to Other User's Exchange Folder" +msgstr "Exchange-Ordner eines anderen Benutzers abonnieren" #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57 #, c-format @@ -15423,7 +15423,7 @@ #. * #: ../plugins/save-calendar/csv-format.c:171 msgid "%F %T" -msgstr "%F %T" +msgstr "%d.%m.%Y %T" #: ../plugins/save-calendar/csv-format.c:385 msgid "UID" @@ -15516,7 +15516,7 @@ #. * #: ../plugins/save-calendar/rdf-format.c:158 msgid "%FT%T" -msgstr "%FT%T" +msgstr "%d.%m.%YT%T" #: ../plugins/save-calendar/rdf-format.c:396 msgid "RDF format (.rdf)" @@ -15668,7 +15668,7 @@ #: ../shell/apps_evolution_shell.schemas.in.in.h:13 #, msgid "Statusbar is visible" -msgstr "Statusbar is visible" +msgstr "Statusleiste ist sichtbar" #: ../shell/apps_evolution_shell.schemas.in.in.h:14 msgid "The configuration version of Evolution, with major/minor/configuration level (for example \"2.6.0\")." @@ -15709,7 +15709,7 @@ #: ../shell/apps_evolution_shell.schemas.in.in.h:23 #, msgid "Whether the status bar should be visible." -msgstr "Whether the status bar should be visible." +msgstr "Soll die Statusleiste angezeigt werden?" #: ../shell/apps_evolution_shell.schemas.in.in.h:24 msgid "Whether the toolbar should be visible." @@ -16872,7 +16872,7 @@ #: ../ui/evolution-editor.xml.h:5 #, msgid "Click here to send" -msgstr "Click here to send" +msgstr "Klicken Sie hier, um zu senden" #: ../ui/evolution-editor.xml.h:6 msgid "Click here to view help available" @@ -18080,7 +18080,7 @@ #: ../ui/evolution.xml.h:12 #, msgid "Get Mail" -msgstr "Get Mail" +msgstr "Mail abrufen" #: ../ui/evolution.xml.h:13 msgid "Hide window buttons" @@ -18109,7 +18109,7 @@ #: ../ui/evolution.xml.h:20 #, msgid "Retrieve new items" -msgstr "Retrieve new items" +msgstr "Neue Nachrichten abrufen" #: ../ui/evolution.xml.h:21 msgid "Set up Pilot configuration" @@ -18971,7 +18971,7 @@ #: ../widgets/table/e-cell-date.c:64 msgid "%l:%M %p" -msgstr "%l:%M %p" +msgstr "%H:%M" #: ../widgets/table/e-cell-pixbuf.c:397 msgid "Selected Column" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit yast2-firstboot
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-firstboot checked in at Fri Jun 2 13:24:31 CEST 2006. -------- --- yast2-firstboot/yast2-firstboot.changes 2006-03-27 16:51:47.000000000 +0200 +++ yast2-firstboot/yast2-firstboot.changes 2006-06-02 11:06:19.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 2 10:56:57 CEST 2006 - jsrain(a)suse.cz + +- log Report messages by default (#180862) +- 2.13.2 + +------------------------------------------------------------------- Old: ---- yast2-firstboot-2.13.1.tar.bz2 New: ---- yast2-firstboot-2.13.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.9S8sfB/_old 2006-06-02 13:21:33.000000000 +0200 +++ /var/tmp/diff_new_pack.9S8sfB/_new 2006-06-02 13:21:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.13.1) +# spec file for package yast2-firstboot (Version 2.13.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-firstboot URL: http://www.suse.com/ -Version: 2.13.1 +Version: 2.13.2 Release: 1 License: X11/MIT, GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.13.1.tar.bz2 +Source0: yast2-firstboot-2.13.2.tar.bz2 prefix: /usr BuildRequires: update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml Requires: yast2 @@ -43,7 +43,7 @@ Anas Nashif<nashif(a)suse.de> %prep -%setup -n yast2-firstboot-2.13.1 +%setup -n yast2-firstboot-2.13.2 %build %{prefix}/bin/y2tool y2autoconf @@ -92,6 +92,9 @@ /etc/YaST2/*.xml %changelog -n yast2-firstboot +* Fri Jun 02 2006 - jsrain(a)suse.cz +- log Report messages by default (#180862) +- 2.13.2 * Mon Mar 27 2006 - jsrain(a)suse.de - updated BuildRequires - 2.13.1 ++++++ yast2-firstboot-2.13.1.tar.bz2 -> yast2-firstboot-2.13.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/Makefile.am new/yast2-firstboot-2.13.2/Makefile.am --- old/yast2-firstboot-2.13.1/Makefile.am 2006-03-27 16:51:31.000000000 +0200 +++ new/yast2-firstboot-2.13.2/Makefile.am 2006-06-02 11:05:21.000000000 +0200 @@ -8,6 +8,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -95,7 +96,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +117,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +144,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -200,12 +201,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/Makefile.in new/yast2-firstboot-2.13.2/Makefile.in --- old/yast2-firstboot-2.13.1/Makefile.in 2006-03-27 16:51:38.000000000 +0200 +++ new/yast2-firstboot-2.13.2/Makefile.in 2006-06-02 11:05:41.000000000 +0200 @@ -198,6 +198,7 @@ #where devtools are PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,15 +773,15 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local @@ -827,12 +828,12 @@ fi check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) + $(Y2TOOL) check-textdomain $(srcdir) stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/VERSION new/yast2-firstboot-2.13.2/VERSION --- old/yast2-firstboot-2.13.1/VERSION 2006-03-27 16:20:52.000000000 +0200 +++ new/yast2-firstboot-2.13.2/VERSION 2006-06-02 11:00:41.000000000 +0200 @@ -1 +1 @@ -2.13.1 +2.13.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/configure new/yast2-firstboot-2.13.2/configure --- old/yast2-firstboot-2.13.1/configure 2006-03-27 16:51:35.000000000 +0200 +++ new/yast2-firstboot-2.13.2/configure 2006-06-02 11:05:38.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-firstboot 2.13.1. +# Generated by GNU Autoconf 2.59 for yast2-firstboot 2.13.2. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,9 +269,9 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.13.1' -PACKAGE_STRING='yast2-firstboot 2.13.1' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.2' +PACKAGE_STRING='yast2-firstboot 2.13.2' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firstboot 2.13.1 to adapt to many kinds of systems. +\`configure' configures yast2-firstboot 2.13.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.13.1:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.13.2:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-firstboot configure 2.13.1 +yast2-firstboot configure 2.13.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.13.1, which was +It was created by yast2-firstboot $as_me 2.13.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.13.1' + VERSION='2.13.2' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.1" +VERSION="2.13.2" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-firstboot $as_me 2.13.1, which was +This file was extended by yast2-firstboot $as_me 2.13.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firstboot config.status 2.13.1 +yast2-firstboot config.status 2.13.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/configure.in new/yast2-firstboot-2.13.2/configure.in --- old/yast2-firstboot-2.13.1/configure.in 2006-03-27 16:51:31.000000000 +0200 +++ new/yast2-firstboot-2.13.2/configure.in 2006-06-02 11:05:20.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firstboot dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.13.1, http://www.suse.de/feedback, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.13.2, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.1" +VERSION="2.13.2" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/firstboot.pot new/yast2-firstboot-2.13.2/firstboot.pot --- old/yast2-firstboot-2.13.1/firstboot.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.13.2/firstboot.pot 2005-07-29 08:55:27.000000000 +0200 @@ -0,0 +1,194 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-07-29 08:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: src/Firstboot.ycp:30 +msgid "No Text Available" +msgstr "" + +#: src/firstboot_config.ycp:27 +msgid "Empty" +msgstr "" + +#: src/firstboot_config.ycp:28 +msgid "Enabled" +msgstr "" + +#: src/firstboot_config.ycp:29 +msgid "Disabled" +msgstr "" + +#: src/firstboot_config.ycp:50 +msgid "Help" +msgstr "" + +#: src/firstboot_config.ycp:53 +msgid "First Boot Configuration" +msgstr "" + +#: src/firstboot_config.ycp:55 +msgid "&Up" +msgstr "" + +#: src/firstboot_config.ycp:56 +msgid "D&own" +msgstr "" + +#: src/firstboot_config.ycp:57 +msgid "Enab&le or Disable" +msgstr "" + +#: src/firstboot_config.ycp:63 +msgid "Step" +msgstr "" + +#: src/firstboot_config.ycp:63 +msgid "Label" +msgstr "" + +#: src/firstboot_config.ycp:63 +msgid "Module Name" +msgstr "" + +#: src/firstboot_config.ycp:63 +msgid "Status" +msgstr "" + +#. translators: dialog text +#: src/firstboot_desktop.ycp:73 +msgid "" +"Select the desktop environment \n" +"to use from the list below.\n" +msgstr "" + +#. help text fro desktop dialog +#: src/firstboot_desktop.ycp:89 +msgid "" +"<h3>Desktop Selections</h3>\n" +"This system has more than one desktop environment installed. Select\n" +"the desktop to enable as the default desktop.\n" +msgstr "" + +#. translators: dialog title +#: src/firstboot_desktop.ycp:95 +msgid "Select Your Default Desktop" +msgstr "" + +#: src/firstboot_finish.ycp:42 +msgid "&Start YaST Control Center" +msgstr "" + +#. caption for dialog "Congratulation Dialog" +#: src/firstboot_finish.ycp:46 +msgid "Configuration Completed" +msgstr "" + +#. congratulation text 1/4 +#: src/firstboot_finish.ycp:49 +msgid "Congratulations!" +msgstr "" + +#. congratulation text 2/4 +#: src/firstboot_finish.ycp:52 +msgid "" +"The installation of &product; on your machine is complete.\n" +"After clicking Finish, you can log in to the system.\n" +msgstr "" + +#. congratulation text 3/4 +#. Translators: If there exists a SuSE web-page for your language +#. change the address accordingly. If in doubt leave the original. +#: src/firstboot_finish.ycp:59 +msgid "Visit us at www.suse.com." +msgstr "" + +#. congratulation text 4/4 +#: src/firstboot_finish.ycp:62 +msgid "Have a lot of fun! Your SuSE Development Team" +msgstr "" + +#. help 1/4 for dialog "Congratulation Dialog" +#: src/firstboot_finish.ycp:81 +msgid "Your system is ready for use." +msgstr "" + +#. help 2/4 for dialog "Congratulation Dialog" +#: src/firstboot_finish.ycp:84 +msgid "" +"Finish will close the YaST installation and continue\n" +"to the login screen.\n" +msgstr "" + +#. help 3/4 for dialog "Congratulation Dialog" +#: src/firstboot_finish.ycp:89 +msgid "" +"If you choose the default graphical desktop KDE, you can\n" +"adjust some KDE settings to your hardware. Also notice\n" +"our SuSE Welcome Dialog.\n" +msgstr "" + +#. help 4/4 for dialog "Congratulation Dialog" +#: src/firstboot_finish.ycp:97 +msgid "" +"If desired, experts can use the full range of SuSE's configuration\n" +"modules at this time. Check Start YaST Control Center and it will start\n" +"after Finish. Note: The Control Center does not have a back button to\n" +"return to this installation sequence.\n" +msgstr "" + +#. popup text +#: src/firstboot_language.ycp:87 +msgid "" +"Your language setting has been changed.\n" +"\n" +"If necessary, you may want to adapt your keyboard settings to the new\n" +"language. This is possible either in the YaST2 Control Center or by \n" +"starting \"yast2 keyboard\" directly." +msgstr "" + +#. progress stages +#: src/firstboot_write.ycp:20 +msgid "Update configuration" +msgstr "" + +#. progress stages +#: src/firstboot_write.ycp:22 +msgid "Prepare system for first login" +msgstr "" + +#. progress stages +#: src/firstboot_write.ycp:28 +msgid "Updating configuration..." +msgstr "" + +#. progress stages +#: src/firstboot_write.ycp:30 +msgid "Preparing system for first login..." +msgstr "" + +#. Help text for last dialog of base installation +#: src/firstboot_write.ycp:35 +msgid "" +"\n" +"Please wait while the system is being configured.\n" +"" +msgstr "" + +#. Headline for last dialog of first boot workflow +#: src/firstboot_write.ycp:44 +msgid "Completing the System Configuration" +msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firstboot-2.13.1/src/firstboot.ycp new/yast2-firstboot-2.13.2/src/firstboot.ycp --- old/yast2-firstboot-2.13.1/src/firstboot.ycp 2006-02-02 19:56:41.000000000 +0100 +++ new/yast2-firstboot-2.13.2/src/firstboot.ycp 2006-06-02 10:57:53.000000000 +0200 @@ -1,7 +1,7 @@ /** * Maintainer: Jiri Srain <jsrain(a)suse.cz> * - * $Id: firstboot.ycp 24902 2005-08-15 08:18:13Z jsrain $ + * $Id: firstboot.ycp 31281 2006-06-02 08:57:51Z jsrain $ */ { textdomain "firstboot"; @@ -21,10 +21,10 @@ list<map> stage_mode = [$["stage": "firstboot", "mode": wizard_mode ]]; ProductControl::AddWizardSteps(stage_mode); - // Don't log Report messages by default - Report::LogMessages(false); - Report::LogErrors(false); - Report::LogWarnings(false); + // Do log Report messages by default (#180862) + Report::LogMessages(true); + Report::LogErrors(true); + Report::LogWarnings(true); symbol ret = ProductControl::Run(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit yast2-installation
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package yast2-installation checked in at Fri Jun 2 13:21:05 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-06-01 15:20:12.000000000 +0200 +++ yast2-installation/yast2-installation.changes 2006-06-01 17:57:28.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Jun 1 17:57:23 CEST 2006 - mvidner(a)suse.cz + +- Do log Report::{Message,Warning,Error} messages by default (#180862). +- 2.13.119 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.118.tar.bz2 New: ---- yast2-installation-2.13.119.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.Li7JBb/_old 2006-06-02 13:20:39.000000000 +0200 +++ /var/tmp/diff_new_pack.Li7JBb/_new 2006-06-02 13:20:39.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.118) +# spec file for package yast2-installation (Version 2.13.119) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.118 +Version: 2.13.119 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.118.tar.bz2 +Source0: yast2-installation-2.13.119.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.118 +%setup -n yast2-installation-2.13.119 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,9 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Thu Jun 01 2006 - mvidner(a)suse.cz +- Do log Report::{Message,Warning,Error} messages by default (#180862). +- 2.13.119 * Thu Jun 01 2006 - jsrain(a)suse.cz - honor UPDATEURLS if installing add-on product in running system (#180417) ++++++ yast2-installation-2.13.118.tar.bz2 -> yast2-installation-2.13.119.tar.bz2 ++++++ ++++ 1802 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.118/VERSION new/yast2-installation-2.13.119/VERSION --- old/yast2-installation-2.13.118/VERSION 2006-06-01 15:13:42.000000000 +0200 +++ new/yast2-installation-2.13.119/VERSION 2006-06-01 17:56:46.000000000 +0200 @@ -1 +1 @@ -2.13.118 +2.13.119 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.118/configure.in new/yast2-installation-2.13.119/configure.in --- old/yast2-installation-2.13.118/configure.in 2006-06-01 15:18:45.000000000 +0200 +++ new/yast2-installation-2.13.119/configure.in 2006-06-02 11:27:11.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.118, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.13.119, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.118" +VERSION="2.13.119" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.118/control/docs/control-doc.xml new/yast2-installation-2.13.119/control/docs/control-doc.xml --- old/yast2-installation-2.13.118/control/docs/control-doc.xml 2005-01-24 07:41:33.000000000 +0100 +++ new/yast2-installation-2.13.119/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $ + $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.118/src/clients/installation.ycp new/yast2-installation-2.13.119/src/clients/installation.ycp --- old/yast2-installation-2.13.118/src/clients/installation.ycp 2006-05-15 13:00:17.000000000 +0200 +++ new/yast2-installation-2.13.119/src/clients/installation.ycp 2006-06-01 17:57:47.000000000 +0200 @@ -12,7 +12,7 @@ * Describing and calling all submodules, depending on * the installation should be started or continued. * - * $Id: installation.ycp 30913 2006-05-15 11:00:14Z jsrain $ + * $Id: installation.ycp 31259 2006-06-01 15:57:33Z mvidner $ */ { textdomain "installation"; @@ -165,11 +165,6 @@ Report::DisplayWarnings(true, 10); } - // Don't log Report messages by default - Report::LogMessages(false); - Report::LogErrors(false); - Report::LogWarnings(false); - /* * The Stage::cont () flag decides, if the installation * should be _started_ or _continued_. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0

commit seamonkey
by root＠suse.de 02 Jun '06

02 Jun '06

Hello community, here is the log from the commit of package seamonkey checked in at Fri Jun 2 13:20:04 CEST 2006. -------- --- seamonkey/seamonkey.changes 2006-04-25 11:38:31.000000000 +0200 +++ seamonkey/seamonkey.changes 2006-06-02 12:21:06.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Jun 2 12:20:24 CEST 2006 - stark(a)suse.de + +- update to security/stability release 1.0.2 (#179011) + (http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonk…) + +------------------------------------------------------------------- +Sun May 14 21:00:33 CEST 2006 - stark(a)suse.de + +- update to version 1.0.1+ +- save printer settings properly (#174082, bmo #324072) + +------------------------------------------------------------------- Old: ---- backports-20060425.patch imgRequest.patch seamonkey-1.0.1.patch.bz2 seamonkey-source-1.0.tar.bz2 New: ---- print-properties.patch seamonkey-source-1.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ seamonkey.spec ++++++ --- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:20.000000000 +0200 +++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package seamonkey (Version 1.0) +# spec file for package seamonkey (Version 1.0.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,8 +13,8 @@ BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel update-desktop-files zip License: MPL, GPL Provides: web_browser -Version: 1.0 -Release: 23 +Version: 1.0.2 +Release: 1 Summary: The successor of the Mozilla Application Suite URL: http://www.mozilla.org/projects/seamonkey Group: Productivity/Networking/Web/Browsers @@ -35,7 +35,6 @@ Source12: README.installed-chrome Source13: mozilla-make-package.pl Source14: mozex.jar -Patch0: seamonkey-1.0.1.patch.bz2 Patch1: system-nspr.patch Patch2: prefs.patch Patch3: pango-cairo.patch @@ -53,7 +52,6 @@ Patch15: autoconf.dif Patch16: system-nss.patch Patch17: mozilla-default-plugin-less-annoying.patch -Patch18: imgRequest.patch Patch19: mail-alert.patch Patch20: js-libm.patch Patch21: ppc64.patch @@ -63,12 +61,12 @@ Patch25: xul-picker.patch Patch26: localize.patch Patch27: postscript.patch -Patch28: cups-paper.patch -Patch29: backports-20060425.patch +Patch29: cups-paper.patch +Patch30: print-properties.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ fileutils textutils /bin/sh %define _unpackaged_files_terminate_build 0 -%define releasedate 2006031600 +%define releasedate 2006053000 %define progname seamonkey %define prefix /usr %define progdir %_libdir/%{progname} @@ -220,7 +218,6 @@ %prep %setup -n mozilla -b 1 -b 9 -q -%patch0 -p1 %if %suse_version > 930 %patch1 %patch3 @@ -242,7 +239,6 @@ %patch16 %endif %patch17 -p2 -%patch18 %patch19 %patch20 %patch21 -p1 @@ -252,8 +248,8 @@ %patch25 %patch26 %patch27 -%patch28 %patch29 +%patch30 # additional CA certificates cd $RPM_BUILD_DIR/mozilla/security/nss/lib/ckfw/builtins cat %{SOURCE8} >> certdata.txt @@ -754,6 +750,12 @@ %dir %{progdir}/components/myspell %changelog -n seamonkey +* Fri Jun 02 2006 - stark(a)suse.de +- update to security/stability release 1.0.2 (#179011) + (http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonk…) +* Sun May 14 2006 - stark(a)suse.de +- update to version 1.0.1+ +- save printer settings properly (#174082, bmo #324072) * Tue Apr 25 2006 - stark(a)suse.de - added patch for iframe crash (#169039, bmo #334515) - improved postscript output (bmo #334485) ++++++ cups-paper.patch ++++++ --- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:21.000000000 +0200 +++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:21.000000000 +0200 @@ -1,3 +1,10 @@ +From: Wolfgang Rosenauer <stark(a)suse.de>, Arne John Glenstrup <panic(a)itu.dk> +Subject: get paper sizes from CUPS +References: +https://bugzilla.novell.com/show_bug.cgi?id=65482 +https://bugzilla.mozilla.org/show_bug.cgi?id=324060 + + diff -urNU6 gfx/src.old/gtk/nsDeviceContextSpecG.cpp gfx/src/gtk/nsDeviceContextSpecG.cpp --- gfx/src.old/gtk/nsDeviceContextSpecG.cpp 2004-10-24 20:34:37.000000000 +0200 +++ gfx/src/gtk/nsDeviceContextSpecG.cpp 2006-04-21 22:58:48.000000000 +0200 ++++++ postscript.patch ++++++ --- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:23.000000000 +0200 +++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:23.000000000 +0200 @@ -29,7 +29,7 @@ " setpagedevice\n" // Install settings - "} if\n", + "} if\n" -+ "%%%%EndFeature: *PageSize\n", ++ "%%%%EndFeature\n", + mPrintSetup->paper_name, fpCString(NSTwipsToFloatPoints(paper_width)).get(), fpCString(NSTwipsToFloatPoints(paper_height)).get()); ++++++ print-properties.patch ++++++ Subject: Printer properties are not saved and displayed correctly References: https://bugzilla.mozilla.org/show_bug.cgi?id=324072 https://bugzilla.novell.com/show_bug.cgi?id=174082 diff -p -u -d -8 -r1.4 nsIPrintSettingsService.idl --- gfx/idl/nsIPrintSettingsService.idl 4 Mar 2006 16:37:11 -0000 1.4 +++ gfx/idl/nsIPrintSettingsService.idl 2 May 2006 22:59:39 -0000 @@ -67,17 +67,17 @@ interface nsIPrintSettingsService : nsIS * then it should use "globalPrintSettings" * * Initializes the newPrintSettings from the default printer * */ readonly attribute nsIPrintSettings newPrintSettings; /** - * The name of the default printer + * The name of the last printer used, or else the system default printer. */ readonly attribute wstring defaultPrinterName; /** * Initializes certain settings from the native printer into the PrintSettings * if aPrinterName is null then it uses the default printer name if it can * These settings include, but are not limited to: * Page Orientation @@ -85,28 +85,31 @@ interface nsIPrintSettingsService : nsIS * Number of Copies */ void initPrintSettingsFromPrinter(in wstring aPrinterName, in nsIPrintSettings aPrintSettings); /** * Reads PrintSettings values from Prefs, * the values to be read are indicated by the "flags" arg. * - * First it reads in the "generic" set of PrintSetings not associated with any printer - * then it uses the PrinterName in the PrinterSettings to read any settings that were saved + * aPrintSettings should be initialized with the name of a printer. First + * it reads in the PrintSettings from the last print job. Then it uses the + * PrinterName in the PrinterSettings to read any settings that were saved * just for that printer. * * aPS - PrintSettings to have its settings read * aUsePrinterNamePrefix - indicates whether to use the printer name as a prefix - * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the const values. + * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the + * const values. * * Items not read: * startPageRange, endPageRange, scaling, printRange, title * docURL, howToEnableFrameUI, isCancelled, printFrameTypeUsage - * printFrameType, printSilent, shrinkToFit, numCopies + * printFrameType, printSilent, shrinkToFit, numCopies, + * printerName * */ void initPrintSettingsFromPrefs(in nsIPrintSettings aPrintSettings, in boolean aUsePrinterNamePrefix, in unsigned long aFlags); /** * Writes PrintSettings values to Prefs, * the values to be written are indicated by the "flags" arg. * Index: gfx/src/nsPrintOptionsImpl.cpp =================================================================== RCS file: /cvsroot/mozilla/gfx/src/Attic/nsPrintOptionsImpl.cpp,v retrieving revision 1.76 diff -u -p -6 -r1.76 nsPrintOptionsImpl.cpp --- gfx/src/nsPrintOptionsImpl.cpp 9 Aug 2005 01:35:48 -0000 1.76 +++ gfx/src/nsPrintOptionsImpl.cpp 10 May 2006 06:22:28 -0000 @@ -599,19 +599,12 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin if (GETSTRPREF(kPrintCommand, str)) { aPS->SetPrintCommand(str.get()); DUMP_STR(kReadStr, kPrintCommand, str.get()); } } - if (aFlags & nsIPrintSettings::kInitSavePrinterName) { - if (GETSTRPREF(kPrinterName, str)) { - aPS->SetPrinterName(str.get()); - DUMP_STR(kReadStr, kPrinterName, str.get()); - } - } - if (aFlags & nsIPrintSettings::kInitSavePrintToFile) { if (GETBOOLPREF(kPrintToFile, &b)) { aPS->SetPrintToFile(b); DUMP_BOOL(kReadStr, kPrintToFile, b); } } @@ -867,16 +860,18 @@ nsPrintOptions::WritePrefs(nsIPrintSetti if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) { DUMP_STR(kWriteStr, kPrintCommand, uStr); WritePrefString(uStr, GetPrefName(kPrintCommand, aPrinterName)); } } - if (aFlags & nsIPrintSettings::kInitSavePrinterName) { + // Only the general version of this pref is saved + if ((aFlags & nsIPrintSettings::kInitSavePrinterName) + && aPrinterName.IsEmpty()) { if (NS_SUCCEEDED(aPS->GetPrinterName(&uStr))) { DUMP_STR(kWriteStr, kPrinterName, uStr); - WritePrefString(uStr, GetPrefName(kPrinterName, aPrinterName)); + WritePrefString(uStr, kPrinterName); } } if (aFlags & nsIPrintSettings::kInitSavePrintToFile) { if (NS_SUCCEEDED(aPS->GetPrintToFile(&b))) { DUMP_BOOL(kWriteStr, kPrintToFile, b); @@ -967,12 +962,18 @@ nsresult nsPrintOptions::_CreatePrintSet { // does not initially ref count nsPrintSettings * printSettings = new nsPrintSettings(); NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY); NS_ADDREF(*_retval = printSettings); // ref count + + nsXPIDLString printerName; + nsresult rv = GetDefaultPrinterName(getter_Copies(printerName)); + NS_ENSURE_SUCCESS(rv, rv); + (*_retval)->SetPrinterName(printerName.get()); + (void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE, nsIPrintSettings::kInitSaveAll); return NS_OK; } @@ -1005,12 +1006,38 @@ nsPrintOptions::GetDefaultPrinterName(PR { nsresult rv; nsCOMPtr<nsIPrinterEnumerator> prtEnum = do_GetService(kPrinterEnumeratorCID, &rv); NS_ENSURE_SUCCESS(rv, rv); + // Look up the printer from the last print job + nsAutoString lastPrinterName; + ReadPrefString(kPrinterName, lastPrinterName); + if (!lastPrinterName.IsEmpty()) { + // Verify it's still a valid printer + PRUnichar **printers; + PRUint32 ctPrinters; + rv = prtEnum->EnumeratePrinters(&ctPrinters, &printers); + if (NS_SUCCEEDED(rv)) { + PRBool isValid = PR_FALSE; + for (PRUint32 ii = ctPrinters - 1; ii >= 0; --ii) { + if (lastPrinterName.Equals(printers[ii])) { + isValid = PR_TRUE; + break; + } + } + NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(ctPrinters, printers); + if (isValid) { + *aDefaultPrinterName = ToNewUnicode(lastPrinterName); + return NS_OK; + } + } + } + + // There is no last printer preference, or it doesn't name a valid printer. + // Return the default from the printer enumeration. return prtEnum->GetDefaultPrinterName(aDefaultPrinterName); } NS_IMETHODIMP nsPrintOptions::InitPrintSettingsFromPrinter(const PRUnichar *aPrinterName, nsIPrintSettings *aPrintSettings) @@ -1126,15 +1153,20 @@ nsPrintOptions::InitPrintSettingsFromPre // with empty printer name nsresult rv = ReadPrefs(aPS, prtName, aFlags); NS_ENSURE_SUCCESS(rv, rv); // Get the Printer Name from the PrintSettings // to use as a prefix for Pref Names - GetAdjustedPrinterName(aPS, aUsePNP, prtName); - NS_ENSURE_FALSE(prtName.IsEmpty(), NS_OK); + rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName); + NS_ENSURE_SUCCESS(rv, rv); + if (prtName.IsEmpty()) { + NS_WARNING("Caller should supply a printer name."); + return NS_OK; + } + // Now read any printer specific prefs rv = ReadPrefs(aPS, prtName, aFlags); if (NS_SUCCEEDED(rv)) aPS->SetIsInitializedFromPrefs(PR_TRUE); return NS_OK; ++++++ seamonkey-source-1.0.tar.bz2 -> seamonkey-source-1.0.2.tar.bz2 ++++++ seamonkey/seamonkey-source-1.0.tar.bz2 seamonkey/seamonkey-source-1.0.2.tar.bz2 differ: char 11, line 1 ++++++ system-nss.patch ++++++ ++++ 5402 lines (skipped) ++++ between seamonkey/system-nss.patch ++++ and seamonkey/system-nss.patch ++++++ xul-picker.patch ++++++ --- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:24.000000000 +0200 +++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:24.000000000 +0200 @@ -12,8 +12,8 @@ } nsCOMPtr<nsIFilePicker> picker; -- if (gtk_check_version(2,4,0) == NULL) { -+ if ( (gtk_check_version(2,4,0) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) { +- if (gtk_check_version(2,6,3) == NULL) { ++ if ( (gtk_check_version(2,6,3) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) { picker = new nsFilePicker; } else { picker = do_CreateInstance(kXULFilePickerCID); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit-help(a)opensuse.org

1 0