Hello community, here is the log from the commit of package yast2-snapper for openSUSE:Factory checked in at 2012-06-13 22:46:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-snapper (Old) and /work/SRC/openSUSE:Factory/.yast2-snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-snapper", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-snapper/yast2-snapper.changes 2012-03-30 14:22:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-snapper.new/yast2-snapper.changes 2012-06-13 22:47:01.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jun 12 10:14:40 CEST 2012 - [email protected] + +- adapted to logging changes in libsnapper (fate #313242) +- 2.22.5 + +------------------------------------------------------------------- Old: ---- yast2-snapper-2.22.4.tar.bz2 New: ---- yast2-snapper-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-snapper.spec ++++++ --- /var/tmp/diff_new_pack.W20Vlp/_old 2012-06-13 22:47:02.000000000 +0200 +++ /var/tmp/diff_new_pack.W20Vlp/_new 2012-06-13 22:47:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-snapper -Version: 2.22.4 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,12 +26,12 @@ Requires: yast2 >= 2.21.22 BuildRequires: doxygen BuildRequires: gcc-c++ -BuildRequires: libsnapper-devel +BuildRequires: libsnapper-devel >= 0.0.11 BuildRequires: libtool BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-core-devel +BuildRequires: yast2-core-devel >= 2.23.1 BuildRequires: yast2-devtools BuildRequires: yast2-testsuite ++++++ yast2-snapper-2.22.4.tar.bz2 -> yast2-snapper-2.22.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/COPYING new/yast2-snapper-2.22.5/COPYING --- old/yast2-snapper-2.22.4/COPYING 2012-03-29 16:01:45.000000000 +0200 +++ new/yast2-snapper-2.22.5/COPYING 2012-06-13 14:01:48.000000000 +0200 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -303,17 +303,16 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -336,5 +335,5 @@ This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/Makefile.am.common new/yast2-snapper-2.22.5/Makefile.am.common --- old/yast2-snapper-2.22.4/Makefile.am.common 2012-03-16 08:58:12.000000000 +0100 +++ new/yast2-snapper-2.22.5/Makefile.am.common 2012-06-13 14:00:21.000000000 +0200 @@ -30,7 +30,7 @@ dist-hook: check-syntax CHECK_SYNTAX = true -check-syntax: $(client_DATA) $(ycpchook) +check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/VERSION new/yast2-snapper-2.22.5/VERSION --- old/yast2-snapper-2.22.4/VERSION 2012-03-29 16:01:12.000000000 +0200 +++ new/yast2-snapper-2.22.5/VERSION 2012-06-13 13:58:21.000000000 +0200 @@ -1 +1 @@ -2.22.4 +2.22.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/agent-snapper/doc/autodocs/Makefile.in new/yast2-snapper-2.22.5/agent-snapper/doc/autodocs/Makefile.in --- old/yast2-snapper-2.22.4/agent-snapper/doc/autodocs/Makefile.in 2012-03-16 08:58:21.000000000 +0100 +++ new/yast2-snapper-2.22.5/agent-snapper/doc/autodocs/Makefile.in 2012-06-13 14:00:27.000000000 +0200 @@ -20,7 +20,7 @@ # # -*- makefile -*- Automake include file -# $Id: autodocs-cc.ami 28248 2006-02-21 14:14:07Z mvidner $ +# $Id$ # Builds source documentation for C++ sources. # Builds and installs by default, intended for base packages where the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/agent-snapper/src/SnapperAgent.cc new/yast2-snapper-2.22.5/agent-snapper/src/SnapperAgent.cc --- old/yast2-snapper-2.22.4/agent-snapper/src/SnapperAgent.cc 2011-10-12 16:05:09.000000000 +0200 +++ new/yast2-snapper-2.22.5/agent-snapper/src/SnapperAgent.cc 2012-06-13 13:58:21.000000000 +0200 @@ -60,6 +60,25 @@ } +void +log_do(LogLevel level, const string& component, const char* file, const int line, const char* func, + const string& text) +{ + static const loglevel_t ln[4] = { LOG_DEBUG, LOG_MILESTONE, LOG_WARNING, LOG_ERROR }; + + y2_logger_function(ln[level], component, file, line, func, "%s", text.c_str()); +} + + +bool +log_query(LogLevel level, const string& component) +{ + static const loglevel_t ln[4] = { LOG_DEBUG, LOG_MILESTONE, LOG_WARNING, LOG_ERROR }; + + return should_be_logged(ln[level], component); +} + + /** * Constructor */ @@ -68,6 +87,9 @@ sh = NULL; snapper_initialized = false; snapper_error = ""; + + snapper::setLogDo(&log_do); + snapper::setLogQuery(&log_query); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/agent-snapper/src/SnapperAgent.h new/yast2-snapper-2.22.5/agent-snapper/src/SnapperAgent.h --- old/yast2-snapper-2.22.4/agent-snapper/src/SnapperAgent.h 2011-10-12 16:05:12.000000000 +0200 +++ new/yast2-snapper-2.22.5/agent-snapper/src/SnapperAgent.h 2012-06-13 13:58:21.000000000 +0200 @@ -18,6 +18,7 @@ #include <snapper/Snapshot.h> #include <snapper/Comparison.h> #include <snapper/File.h> +#include <snapper/Logger.h> /** * @short An interface class between YaST2 and Snapper Agent diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/autodocs-cc.ami new/yast2-snapper-2.22.5/autodocs-cc.ami --- old/yast2-snapper-2.22.4/autodocs-cc.ami 2012-03-16 08:58:12.000000000 +0100 +++ new/yast2-snapper-2.22.5/autodocs-cc.ami 2012-06-13 14:00:21.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-cc.ami 28248 2006-02-21 14:14:07Z mvidner $ +# $Id$ # Builds source documentation for C++ sources. # Builds and installs by default, intended for base packages where the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/autodocs-ycp.ami new/yast2-snapper-2.22.5/autodocs-ycp.ami --- old/yast2-snapper-2.22.4/autodocs-ycp.ami 2012-03-16 08:58:12.000000000 +0100 +++ new/yast2-snapper-2.22.5/autodocs-ycp.ami 2012-06-13 14:00:21.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ +# $Id$ # Builds source documentation for YCP sources # Uses ycpdoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/configure new/yast2-snapper-2.22.5/configure --- old/yast2-snapper-2.22.4/configure 2012-03-16 08:58:20.000000000 +0100 +++ new/yast2-snapper-2.22.5/configure 2012-06-13 14:00:26.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-snapper 2.22.3. +# Generated by GNU Autoconf 2.68 for yast2-snapper 2.22.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='yast2-snapper' PACKAGE_TARNAME='yast2-snapper' -PACKAGE_VERSION='2.22.3' -PACKAGE_STRING='yast2-snapper 2.22.3' +PACKAGE_VERSION='2.22.5' +PACKAGE_STRING='yast2-snapper 2.22.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1354,7 +1354,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-snapper 2.22.3 to adapt to many kinds of systems. +\`configure' configures yast2-snapper 2.22.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1425,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-snapper 2.22.3:";; + short | recursive ) echo "Configuration of yast2-snapper 2.22.5:";; esac cat <<\_ACEOF @@ -1541,7 +1541,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-snapper configure 2.22.3 +yast2-snapper configure 2.22.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1994,7 +1994,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-snapper $as_me 2.22.3, which was +It was created by yast2-snapper $as_me 2.22.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2924,7 +2924,7 @@ # Define the identity of the package. PACKAGE='yast2-snapper' - VERSION='2.22.3' + VERSION='2.22.5' cat >>confdefs.h <<_ACEOF @@ -3046,7 +3046,7 @@ -VERSION="2.22.3" +VERSION="2.22.5" RPMNAME="yast2-snapper" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -5232,7 +5232,7 @@ fi -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} @@ -16615,7 +16615,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-snapper $as_me 2.22.3, which was +This file was extended by yast2-snapper $as_me 2.22.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16681,7 +16681,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-snapper config.status 2.22.3 +yast2-snapper config.status 2.22.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/configure.in new/yast2-snapper-2.22.5/configure.in --- old/yast2-snapper-2.22.4/configure.in 2012-03-16 08:58:12.000000000 +0100 +++ new/yast2-snapper-2.22.5/configure.in 2012-06-13 14:00:21.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-snapper dnl -dnl -- This file is generated by y2autoconf 2.21.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-snapper, 2.22.3, http://bugs.opensuse.org/, yast2-snapper) +AC_INIT(yast2-snapper, 2.22.5, http://bugs.opensuse.org/, yast2-snapper) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.3" +VERSION="2.22.5" RPMNAME="yast2-snapper" MAINTAINER="Jiri Suchomel <[email protected]>" @@ -169,7 +169,7 @@ PKG_CHECK_MODULES(Y2CORE, yast2-core) ]) -CFLAGS="${CFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" +CFLAGS="${CFLAGS} -Wall -Wformat=2 -Wmissing-prototypes" CXXFLAGS="${CXXFLAGS} ${Y2CORE_CFLAGS} -Wall -Wformat=2" : ${AGENT_LIBADD:='-L$(libdir) -lscr'} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/doc/autodocs/Makefile.in new/yast2-snapper-2.22.5/doc/autodocs/Makefile.in --- old/yast2-snapper-2.22.4/doc/autodocs/Makefile.in 2012-03-16 08:58:21.000000000 +0100 +++ new/yast2-snapper-2.22.5/doc/autodocs/Makefile.in 2012-06-13 14:00:28.000000000 +0200 @@ -18,7 +18,7 @@ # Makefile.am for snapper/doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ +# $Id$ # Builds source documentation for YCP sources # Uses ycpdoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/snapper.pot new/yast2-snapper-2.22.5/snapper.pot --- old/yast2-snapper-2.22.4/snapper.pot 2011-10-05 10:11:03.000000000 +0200 +++ new/yast2-snapper-2.22.5/snapper.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ -# 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: 2011-10-05 10:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <[email protected]>\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. popup error -#: src/Snapper.ycp:84 -#, ycp-format -msgid "Snapshot '%1' was not found." -msgstr "" - -#. error popup -#: src/Snapper.ycp:195 -msgid "File /etc/sysconfig/snapper is not available" -msgstr "" - -#: src/Snapper.ycp:214 -msgid "Reason not known." -msgstr "" - -#: src/Snapper.ycp:217 -msgid "Configuration not found." -msgstr "" - -#: src/Snapper.ycp:221 -msgid "Configuration is not valid." -msgstr "" - -#. error popup -#: src/Snapper.ycp:226 -#, ycp-format -msgid "" -"Failed to initialize snapper library:\n" -"%1" -msgstr "" - -#. Snapper read dialog caption -#: src/Snapper.ycp:240 -msgid "Initializing Snapper" -msgstr "" - -#. Progress stage 1/3 -#: src/Snapper.ycp:247 -msgid "Read the list of snapshots" -msgstr "" - -#. Progress step 1/3 -#: src/Snapper.ycp:250 -msgid "Reading the database..." -msgstr "" - -#. Progress finished -#: src/Snapper.ycp:252 -msgid "Finished" -msgstr "" - -#. label for log window -#: src/Snapper.ycp:298 -msgid "Restoring Files..." -msgstr "" - -#. log entry (%1 is file name) -#: src/Snapper.ycp:315 -#, ycp-format -msgid "%1 does not exist in snapshot %2\n" -msgstr "" - -#. log entry (%1 is file name) -#: src/Snapper.ycp:340 -#, ycp-format -msgid "%1 skipped\n" -msgstr "" - -#. summary dialog caption -#: src/dialogs.ycp:68 -msgid "Snapshots" -msgstr "" - -#: src/dialogs.ycp:90 -msgid "Single" -msgstr "" - -#: src/dialogs.ycp:104 -msgid "Pre & Post" -msgstr "" - -#. combo box label -#: src/dialogs.ycp:117 -msgid "Current Configuration" -msgstr "" - -#. table header -#: src/dialogs.ycp:125 -msgid "ID" -msgstr "" - -#: src/dialogs.ycp:125 -msgid "Type" -msgstr "" - -#: src/dialogs.ycp:125 -msgid "Start Date" -msgstr "" - -#: src/dialogs.ycp:125 -msgid "End Date" -msgstr "" - -#: src/dialogs.ycp:125 -msgid "Description" -msgstr "" - -#: src/dialogs.ycp:129 -msgid "Show Changes" -msgstr "" - -#. busy popup message -#: src/dialogs.ycp:175 -msgid "Reading list of snapshots..." -msgstr "" - -#. dialog caption -#: src/dialogs.ycp:204 -msgid "Selected Snapshot Overview" -msgstr "" - -#. '%1: %2' means 'ID: description', adapt the order if necessary -#: src/dialogs.ycp:234 -#, ycp-format -msgid "%1: %2" -msgstr "" - -#. busy popup message -#: src/dialogs.ycp:251 -msgid "Calculating changed files..." -msgstr "" - -#. busy popup message -#: src/dialogs.ycp:320 -msgid "Calculating file modifications..." -msgstr "" - -#. text label, %1, %2 are file modes (like '-rw-r--r--') -#: src/dialogs.ycp:353 -#, ycp-format -msgid "File mode was changed from '%1' to '%2'." -msgstr "" - -#. text label, %1, %2 are user names -#: src/dialogs.ycp:361 -#, ycp-format -msgid "File user ownership was changed from '%1' to '%2'." -msgstr "" - -#. text label, %1, %2 are group names -#: src/dialogs.ycp:370 -#, ycp-format -msgid "File group ownership was changed from '%1' to '%2'." -msgstr "" - -#. button label -#: src/dialogs.ycp:391 -msgid "R&estore From First" -msgstr "" - -#. button label -#: src/dialogs.ycp:393 -msgid "Restore" -msgstr "" - -#: src/dialogs.ycp:393 -msgid "Res&tore From Second" -msgstr "" - -#. radio button label -#: src/dialogs.ycp:428 -msgid "Show the difference between snapshot and current system" -msgstr "" - -#. radio button label, snapshot selection will follow -#: src/dialogs.ycp:432 -msgid "Show the difference between current and selected snapshot:" -msgstr "" - -#. radio button label -#: src/dialogs.ycp:453 -msgid "Show the difference between first and second snapshot" -msgstr "" - -#. radio button label -#: src/dialogs.ycp:456 -msgid "Show the difference between first snapshot and current system" -msgstr "" - -#. radio button label -#: src/dialogs.ycp:459 -msgid "Show the difference between second snapshot and current system" -msgstr "" - -#. label, date string will follow at the end of line -#: src/dialogs.ycp:477 -msgid "Time of taking the first snapshot:" -msgstr "" - -#. label, date string will follow at the end of line -#: src/dialogs.ycp:482 -msgid "Time of taking the second snapshot:" -msgstr "" - -#. label, date string will follow at the end of line -#: src/dialogs.ycp:491 -msgid "Time of taking the snapshot:" -msgstr "" - -#. button label -#: src/dialogs.ycp:510 -msgid "&Open" -msgstr "" - -#. button label -#: src/dialogs.ycp:534 -msgid "Restore Selected" -msgstr "" - -#. popup message -#: src/dialogs.ycp:637 -msgid "No file was selected for restoring" -msgstr "" - -#. FIXME restore from PRE or POST? (PRE by default) -#. popup headline -#: src/dialogs.ycp:642 -msgid "Restoring files" -msgstr "" - -#. popup message, %1 is snapshot number, %2 list of files -#: src/dialogs.ycp:644 -#, ycp-format -msgid "These files will be copied from snapshot '%1' to current system: <p>%2</p>Are you sure?" -msgstr "" - -#. Read dialog help -#: src/helps.ycp:40 -msgid "" -"<p><b><big>Reading the list of snapshots</big></b><br>\n" -"Please wait...<br></p>\n" -msgstr "" - -#. Summary dialog help: -#: src/helps.ycp:45 -msgid "" -"<p><b><big>Snapshots Configuration</big></b><p>\n" -"<p>The table shows a list of root filesystem snapshots. There are three types of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are used for storing file system state in certain time, while Pre and Post are used to define the changes done by special operation proceeded between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n" -"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the file system changes new in specified snapshot.</p>\n" -msgstr "" - -#. Show snapshot dialog help -#: src/helps.ycp:51 -msgid "" -"<p><b><big>Snapshot Overview</big></b><p>\n" -"<p>\n" -"The tree shows all the files that were modified between creating first ('pre') and second ('post') snapshot. On the right side, you can see the description generated when the first snapshot was created and the time of creation for both snapshots.\n" -"</p>\n" -"<p>\n" -"When file is selected in the tree, you can see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n" -"</p>" -msgstr "" - -#. Show snapshot dialog help, alternative for single snapshots -#: src/helps.ycp:60 -msgid "" -"<p><b><big>Snapshot Overview</big></b><p>\n" -"<p>\n" -"The tree shows all the files that are different between selected snapshot and current system. On the right side, you can see the snapshot description and time of its creation.\n" -"</p>\n" -"<p>\n" -"When file is selected in the tree, you can see the its difference between snapshot version and current system.\n" -"</p>" -msgstr "" - -#: src/snapper.ycp:53 -msgid "Configuration of system snapshots" -msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/Makefile.in new/yast2-snapper-2.22.5/src/Makefile.in --- old/yast2-snapper-2.22.4/src/Makefile.in 2012-03-16 08:58:21.000000000 +0100 +++ new/yast2-snapper-2.22.5/src/Makefile.in 2012-06-13 14:00:28.000000000 +0200 @@ -598,7 +598,7 @@ rm ${NEWDEP} dist-hook: check-syntax -check-syntax: $(client_DATA) $(ycpchook) +check-syntax: $(client_DATA) $(ycpchook) $(ybcfiles) @if test "$(client_DATA)"; then \ if $(CHECK_SYNTAX); then \ TO_CHECK="$(filter %.ycp,$^)"; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/Snapper.ycp new/yast2-snapper-2.22.5/src/Snapper.ycp --- old/yast2-snapper-2.22.4/src/Snapper.ycp 2012-03-29 16:00:55.000000000 +0200 +++ new/yast2-snapper-2.22.5/src/Snapper.ycp 2012-06-13 13:58:21.000000000 +0200 @@ -23,7 +23,7 @@ * Summary: Snapper settings, input and output functions * Authors: Jiri Suchomel <[email protected]> * - * $Id: Snapper.ycp 67207 2012-01-16 15:09:57Z jsuchome $ + * $Id$ * * Representation of the configuration of snapper. * Input and output routines. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/dialogs.ycp new/yast2-snapper-2.22.5/src/dialogs.ycp --- old/yast2-snapper-2.22.4/src/dialogs.ycp 2012-03-29 16:01:29.000000000 +0200 +++ new/yast2-snapper-2.22.5/src/dialogs.ycp 2012-06-13 13:58:21.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <[email protected]> * - * $Id: dialogs.ycp 67811 2012-03-29 14:01:29Z jsuchome $ + * $Id$ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/helps.ycp new/yast2-snapper-2.22.5/src/helps.ycp --- old/yast2-snapper-2.22.4/src/helps.ycp 2012-03-29 16:00:55.000000000 +0200 +++ new/yast2-snapper-2.22.5/src/helps.ycp 2012-06-13 13:58:21.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Help texts of all the dialogs * Authors: Jiri Suchomel <[email protected]> * - * $Id: helps.ycp 67207 2012-01-16 15:09:57Z jsuchome $ + * $Id$ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/snapper.ycp new/yast2-snapper-2.22.5/src/snapper.ycp --- old/yast2-snapper-2.22.4/src/snapper.ycp 2012-03-29 16:00:55.000000000 +0200 +++ new/yast2-snapper-2.22.5/src/snapper.ycp 2012-06-13 13:58:21.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <[email protected]> * - * $Id: snapper.ycp 67207 2012-01-16 15:09:57Z jsuchome $ + * $Id$ * * Main file for snapper configuration. Uses all other files. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.22.4/src/wizards.ycp new/yast2-snapper-2.22.5/src/wizards.ycp --- old/yast2-snapper-2.22.4/src/wizards.ycp 2012-01-16 16:09:58.000000000 +0100 +++ new/yast2-snapper-2.22.5/src/wizards.ycp 2012-06-13 13:58:21.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Wizards definitions * Authors: Jiri Suchomel <[email protected]> * - * $Id: wizards.ycp 67207 2012-01-16 15:09:57Z jsuchome $ + * $Id$ */ { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
