Hello community,
here is the log from the commit of package yast2-update for openSUSE:Factory
checked in at 2011-11-16 17:23:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
and /work/SRC/openSUSE:Factory/.yast2-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-update", Maintainer is "jsuch...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes
2011-10-03 09:27:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes
2011-11-16 17:23:54.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 16 11:22:38 CET 2011 - jsuch...@suse.cz
+
+- merged texts from proofreading
+- 2.22.0
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.21.1.tar.bz2
New:
----
yast2-update-2.22.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.5M3zEV/_old 2011-11-16 17:23:55.000000000 +0100
+++ /var/tmp/diff_new_pack.5M3zEV/_new 2011-11-16 17:23:55.000000000 +0100
@@ -19,16 +19,14 @@
Name: yast2-update
-Version: 2.21.1
+Version: 2.22.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-update-%{version}.tar.bz2
-Prefix: /usr
-
Group: System/YaST
-License: GPL v2 or later
+License: GPL-2.0+
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools
yast2-testsuite
# FileSystems::possible_root_fs
BuildRequires: yast2-storage >= 2.19.12
@@ -88,23 +86,23 @@
%setup -n yast2-update-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
# so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -114,7 +112,7 @@
%files
%defattr(-,root,root)
-%{prefix}/lib/YaST2/bin/*
+%{_prefix}/lib/YaST2/bin/*
/usr/share/YaST2/modules/*
/usr/share/YaST2/clients/inst_rootpart.ycp
@@ -131,11 +129,11 @@
/usr/share/YaST2/include/update
/usr/share/YaST2/include/update/rootpart.ycp
-%doc %{prefix}/share/doc/packages/yast2-update
+%doc %{_prefix}/share/doc/packages/yast2-update
%files FACTORY
%defattr(-,root,root)
-%{prefix}/share/applications/YaST2/update.desktop
+%{_prefix}/share/applications/YaST2/update.desktop
%dir /usr/share/YaST2/control
/usr/share/YaST2/control/update.xml
/usr/share/YaST2/clients/update.ycp
++++++ yast2-update-2.21.1.tar.bz2 -> yast2-update-2.22.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/Makefile.am
new/yast2-update-2.22.0/Makefile.am
--- old/yast2-update-2.21.1/Makefile.am 2011-09-23 16:58:53.000000000 +0200
+++ new/yast2-update-2.22.0/Makefile.am 2011-10-05 10:01:48.000000000 +0200
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/Makefile.in
new/yast2-update-2.22.0/Makefile.in
--- old/yast2-update-2.21.1/Makefile.in 2011-09-23 16:58:56.000000000 +0200
+++ new/yast2-update-2.22.0/Makefile.in 2011-10-05 10:01:52.000000000 +0200
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/VERSION
new/yast2-update-2.22.0/VERSION
--- old/yast2-update-2.21.1/VERSION 2011-09-23 16:56:36.000000000 +0200
+++ new/yast2-update-2.22.0/VERSION 2011-11-16 11:22:47.000000000 +0100
@@ -1 +1 @@
-2.21.1
+2.22.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/configure.in
new/yast2-update-2.22.0/configure.in
--- old/yast2-update-2.21.1/configure.in 2011-09-23 16:58:53.000000000
+0200
+++ new/yast2-update-2.22.0/configure.in 2011-10-05 10:01:48.000000000
+0200
@@ -1,6 +1,6 @@
dnl configure.in for yast2-update
dnl
-dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
AC_INIT(yast2-update, 2.21.1, http://bugs.opensuse.org/, yast2-update)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/kernel-update-tool.pot
new/yast2-update-2.22.0/kernel-update-tool.pot
--- old/yast2-update-2.21.1/kernel-update-tool.pot 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-update-2.22.0/kernel-update-tool.pot 2011-10-05
10:01:54.000000000 +0200
@@ -0,0 +1,34 @@
+# 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:01+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/clients/kernel-update.ycp:189
+msgid "Warning"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:190
+msgid "Abort the kernel upgrade?"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:247
+msgid "Alternate Download Location"
+msgstr ""
+
+#: src/clients/kernel-update.ycp:510
+msgid "Kernel Update Status Log"
+msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/src/clients/inst_backup.ycp
new/yast2-update-2.22.0/src/clients/inst_backup.ycp
--- old/yast2-update-2.21.1/src/clients/inst_backup.ycp 2008-04-14
13:27:50.000000000 +0200
+++ new/yast2-update-2.22.0/src/clients/inst_backup.ycp 2011-11-16
11:21:34.000000000 +0100
@@ -112,7 +112,7 @@
// help text for backup dialog during update 1/7
string help_text = _("<p>To avoid any loss of information during update,
-it is possible to create a <b>backup</b> prior to updating.</p>
+create a <b>backup</b> prior to updating.</p>
");
// help text for backup dialog during update 2/7
@@ -126,13 +126,13 @@
// help text for backup dialog during update 4/7
help_text = help_text + _("<p><b>Create a Backup of Modified Files:</b>
-Stores those modified files that are replaced during update.</p>
+Stores only those modified files that will be replaced during update.</p>
");
// help text for backup dialog during update 5/7
help_text = help_text + _("<p><b>Create a Complete Backup of
/etc/sysconfig:</b> This covers all configuration files that are part of the
-sysconfig mechanism, even those that are not replaced.</p>
+sysconfig mechanism, even those that will not be replaced.</p>
");
// help text for backup dialog during update 6/7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/src/clients/inst_update.ycp
new/yast2-update-2.22.0/src/clients/inst_update.ycp
--- old/yast2-update-2.21.1/src/clients/inst_update.ycp 2011-09-23
13:02:18.000000000 +0200
+++ new/yast2-update-2.22.0/src/clients/inst_update.ycp 2011-11-16
11:21:34.000000000 +0100
@@ -95,8 +95,8 @@
// help text for dialog "update options" 1/4
- string helptext = _("<p>The update option differs between two modes. In
-either case, it is recommended to make a backup of your personal data.</p>
+ string helptext = _("<p>The update option offers two different modes. In
+either case, we recommend to make a backup of your personal data.</p>
");
// help text for dialog "update options" 2/4, %1 is a product name
@@ -110,7 +110,7 @@
helptext = helptext + _("<p><b>Only Installed Packages:</b> This selection
only updates the packages already installed on your system. <i>Note:</i>
New software in the predefined software selection, such as new YaST modules, is
-not available after the update. You might miss advertised features.</p>
+not available after the update. You might miss new features.</p>
");
// help text for dialog "update options" 4/4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/src/clients/update_proposal.ycp
new/yast2-update-2.22.0/src/clients/update_proposal.ycp
--- old/yast2-update-2.21.1/src/clients/update_proposal.ycp 2011-09-23
13:05:57.000000000 +0200
+++ new/yast2-update-2.22.0/src/clients/update_proposal.ycp 2011-11-16
11:21:35.000000000 +0100
@@ -332,8 +332,9 @@
// TRANSLATORS: proposal error, %1 is the version of
installed system
// %2 is the version being installed
_("Updating system to another version (%1 -> %2) is not
supported on the running system.<br>
-Please, boot from the installation media and use a normal upgrade
-or disable software repositories of products with different versions."),
+Boot from the installation media and use a normal upgrade
+or disable software repositories of products with different versions.
+"),
update_from, update_to
),
"warning_level" : `fatal,
@@ -406,10 +407,11 @@
SpaceCalculation::GetPartitionInfo();
// TRANSLATORS: proposal dialog help
- string update_options_help = _("<p><b><big>Update Options</big></b>
-Here you can choose how your system is going to be updated.
-Choose whether only installed packages should be updated or whether new ones
should be installed also
-(the default selection), and whether unmaintained packages should be
deleted.</p>");
+ string update_options_help = _("<p><b><big>Update Options</big></b>
Select how your system will be updated.
+Choose if only installed packages should be updated or new ones should be
+installed as well (default). Decide whether unmaintained packages should be
+deleted.</p>
+");
ret = $[
"preformatted_proposal" : HTML::ListStart() + summary_text +
HTML::ListEnd(),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/src/include/rootpart.ycp
new/yast2-update-2.22.0/src/include/rootpart.ycp
--- old/yast2-update-2.21.1/src/include/rootpart.ycp 2011-01-25
10:07:49.000000000 +0100
+++ new/yast2-update-2.22.0/src/include/rootpart.ycp 2011-11-16
11:21:35.000000000 +0100
@@ -327,7 +327,8 @@
cont = Popup::ContinueCancel (
// continue-cancel popup
_("The architecture of the system installed in the selected partition
-is different than the one of this product."));
+is different from the one of this product.
+"));
}
if (! cont)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/src/modules/RootPart.ycp
new/yast2-update-2.22.0/src/modules/RootPart.ycp
--- old/yast2-update-2.21.1/src/modules/RootPart.ycp 2011-07-08
10:53:11.000000000 +0200
+++ new/yast2-update-2.22.0/src/modules/RootPart.ycp 2011-11-16
11:21:35.000000000 +0100
@@ -443,7 +443,8 @@
// %1 is a device name such as /dev/hda5
_("The file system check of device %1 has failed.
-Would you like to continue in the mounting the device?"), device
+Do you want to continue mounting the device?
+"), device
),
Label::ContinueButton(),
// button
@@ -961,11 +962,12 @@
// %2 with the recommended size
sformat (
_("Your /boot partition is too small (%1 MB).
-We recommend a size not less than %2 MB. It might happen, that the
-new Kernel does not fit, so it would be safer to either enlarge that partition
-or not to use the /boot partition at all.
+We recommend a size of no less than %2 MB or else the new Kernel may not fit.
+It is safer to either enlarge the partition
+or not use a /boot partition at all.
-Would you like to continue updating the current system?"),
+Do you want to continue updating the current system?
+"),
current_bs,
suggested_bs
)
@@ -1037,9 +1039,10 @@
%2
If you are sure that the partition is not necessary for the
-update (it is not any system partition), click Continue.
+update (not a system partition), click Continue.
To check or fix the mount options, click Specify Mount Options.
-To abort update, click Cancel."),
+To abort the update, click Cancel.
+"),
spec, mount_err)
),
`VSpacing (1),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-update-2.21.1/update.pot
new/yast2-update-2.22.0/update.pot
--- old/yast2-update-2.21.1/update.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-update-2.22.0/update.pot 2011-10-05 10:01:54.000000000 +0200
@@ -0,0 +1,772 @@
+# 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:01+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <l...@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Proposal for backup during update
+#: src/clients/backup_proposal.ycp:46
+msgid "Create Backup of Modified Files"
+msgstr ""
+
+#. Proposal for backup during update
+#: src/clients/backup_proposal.ycp:51
+msgid "Create Backup of /etc/sysconfig Directory"
+msgstr ""
+
+#. Proposal for backup during update
+#: src/clients/backup_proposal.ycp:56
+msgid "Do Not Create Backups"
+msgstr ""
+
+#. Proposal for backup during update
+#: src/clients/backup_proposal.ycp:61
+msgid "Remove Backups from Previous Updates"
+msgstr ""
+
+#. this is a heading
+#: src/clients/backup_proposal.ycp:92
+msgid "Backup"
+msgstr ""
+
+#. this is a menu entry
+#: src/clients/backup_proposal.ycp:94
+msgid "&Backup"
+msgstr ""
+
+#. error popup, user did not enter a valid directory specification
+#: src/clients/inst_backup.ycp:40
+msgid "Invalid backup path."
+msgstr ""
+
+#. there is not enough space for the backup during update
+#. inform the user about this (MB==megabytes)
+#: src/clients/inst_backup.ycp:80
+#, ycp-format
+msgid "Minimum disk space of %1 MB required."
+msgstr ""
+
+#. screen title for software selection
+#: src/clients/inst_backup.ycp:92
+msgid "Backup System Before Update"
+msgstr ""
+
+#. checkbox label if user wants to backup modified files
+#: src/clients/inst_backup.ycp:102
+msgid "Create &Backup of Modified Files"
+msgstr ""
+
+#. checkbox label if user wants to backup /etc/sysconfig
+#: src/clients/inst_backup.ycp:105
+msgid "Create a &Complete Backup of /etc/sysconfig"
+msgstr ""
+
+#. checkbox label if user wants remove old backup stuff
+#: src/clients/inst_backup.ycp:109
+msgid "Remove &Old Backups from the Backup Directory"
+msgstr ""
+
+#. help text for backup dialog during update 1/7
+#: src/clients/inst_backup.ycp:114
+msgid ""
+"<p>To avoid any loss of information during update,\n"
+"it is possible to create a <b>backup</b> prior to updating.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 2/7
+#: src/clients/inst_backup.ycp:119
+msgid ""
+"<p><b>Warning:</b> This will not be a complete\n"
+"backup. Only modified files will be saved.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 3/7
+#: src/clients/inst_backup.ycp:124
+msgid "<p>Select the desired options.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 4/7
+#: src/clients/inst_backup.ycp:128
+msgid ""
+"<p><b>Create a Backup of Modified Files:</b>\n"
+"Stores those modified files that are replaced during update.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 5/7
+#: src/clients/inst_backup.ycp:133
+msgid ""
+"<p><b>Create a Complete Backup of\n"
+"/etc/sysconfig:</b> This covers all configuration files that are part of
the\n"
+"sysconfig mechanism, even those that are not replaced.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 6/7
+#: src/clients/inst_backup.ycp:139
+msgid ""
+"<p><b>Remove Old Backups from the Backup\n"
+"Directory:</b> If your current system already is the result of an earlier\n"
+"update, there may be old configuration file backups. Select this option to\n"
+"remove them.</p>\n"
+msgstr ""
+
+#. help text for backup dialog during update 7/7
+#: src/clients/inst_backup.ycp:146
+#, ycp-format
+msgid "<p>All backups are placed in %1.</p>"
+msgstr ""
+
+#. screen title for update options
+#. this is a heading
+#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:453
+msgid "Update Options"
+msgstr ""
+
+#. push button label
+#: src/clients/inst_update.ycp:29
+msgid "Select Patterns"
+msgstr ""
+
+#. Display warning message
+#: src/clients/inst_update.ycp:38
+msgid ""
+"You have already chosen software from \"Detailed selection\".\n"
+"You will lose that selection if you change the basic selection."
+msgstr ""
+
+#. Build and show dialog
+#. Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...])
+#. Table item (unknown architecture)
+#. Table item (unknown file system)
+#. label - name of sustem to update
+#. label for an unknown installed system
+#: src/clients/inst_update.ycp:45 src/clients/inst_update.ycp:46
+#: src/include/rootpart.ycp:70 src/include/rootpart.ycp:76
+#: src/include/rootpart.ycp:93 src/modules/RootPart.ycp:131
+#: src/modules/RootPart.ycp:1189 src/modules/RootPart.ycp:1193
+#: src/modules/RootPart.ycp:1601
+msgid "Unknown"
+msgstr ""
+
+#. label showing to which version we are updating
+#. TRANSLATORS: proposal summary item, %1 is a product name
+#: src/clients/inst_update.ycp:51 src/clients/update_proposal.ycp:374
+#, ycp-format
+msgid "Update to %1"
+msgstr ""
+
+#. label showing from which version to which version we are updating
+#: src/clients/inst_update.ycp:54
+#, ycp-format
+msgid "Update from %1 to %2"
+msgstr ""
+
+#. frame title for update selection
+#: src/clients/inst_update.ycp:62
+msgid "Update Mode"
+msgstr ""
+
+#. radio button label for update including new packages
+#: src/clients/inst_update.ycp:69
+msgid ""
+"&Update with Installation of New Software and Features\n"
+"Based on the Selection:\n"
+msgstr ""
+
+#. radio button label for update of already installed packages only
+#: src/clients/inst_update.ycp:80
+msgid "Only U&pdate Installed Packages"
+msgstr ""
+
+#. help text for dialog "update options" 1/4
+#: src/clients/inst_update.ycp:98
+msgid ""
+"<p>The update option differs between two modes. In\n"
+"either case, it is recommended to make a backup of your personal data.</p>\n"
+msgstr ""
+
+#. help text for dialog "update options" 2/4, %1 is a product name
+#: src/clients/inst_update.ycp:103
+#, ycp-format
+msgid ""
+"<p><b>With New Software:</b> This default setting\n"
+"updates the existing software and installs all new features and benefits of\n"
+"the new <tt>%1</tt> version. The selection is based on the former
predefined\n"
+"software selection.</p>\n"
+msgstr ""
+
+#. help text for dialog "update options" 3/4
+#: src/clients/inst_update.ycp:110
+msgid ""
+"<p><b>Only Installed Packages:</b> This selection\n"
+"only updates the packages already installed on your system. <i>Note:</i>\n"
+"New software in the predefined software selection, such as new YaST modules,
is\n"
+"not available after the update. You might miss advertised features.</p>\n"
+msgstr ""
+
+#. help text for dialog "update options" 4/4
+#: src/clients/inst_update.ycp:117
+msgid ""
+"<p>After the update, some software might not\n"
+"function anymore. Activate <b>Delete Unmaintained Packages</b> to delete
those\n"
+"packages during the update.</p>\n"
+msgstr ""
+
+#. yes/no question
+#: src/clients/inst_update.ycp:168
+msgid ""
+"Do you really want\n"
+"to reset your detailed selection?"
+msgstr ""
+
+#. error report
+#. inform user in the proposal about the failed mount
+#. error report
+#: src/clients/inst_update_partition_auto.ycp:46
+#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:348
+msgid "Failed to mount target system"
+msgstr ""
+
+#: src/clients/inst_update_partition_auto.ycp:50
+msgid "A possibly incomplete installation has been detected."
+msgstr ""
+
+#. proposal for packages during update, %1 is count of packages
+#: src/clients/packages_proposal.ycp:105
+#, ycp-format
+msgid "Packages to Update: %1"
+msgstr ""
+
+#. proposal for packages during update, %1 is count of packages
+#: src/clients/packages_proposal.ycp:108
+#, ycp-format
+msgid "New Packages to Install: %1"
+msgstr ""
+
+#. proposal for packages during update, %1 is count of packages
+#: src/clients/packages_proposal.ycp:111
+#, ycp-format
+msgid "Packages to Remove: %1"
+msgstr ""
+
+#. part of summary, %1 is size of packages (in MB or GB)
+#: src/clients/packages_proposal.ycp:114
+#, ycp-format
+msgid "Total Size of Packages to Update: %1"
+msgstr ""
+
+#. warning text
+#: src/clients/packages_proposal.ycp:122
+msgid "Cannot solve all conflicts. Manual intervention is required."
+msgstr ""
+
+#. this is a heading
+#: src/clients/packages_proposal.ycp:172
+msgid "Packages"
+msgstr ""
+
+#. this is a menu entry
+#: src/clients/packages_proposal.ycp:174
+msgid "&Packages"
+msgstr ""
+
+#. Proposal for system to update
+#: src/clients/rootpart_proposal.ycp:51
+msgid "No root partition found"
+msgstr ""
+
+#. Proposal for system to update
+#: src/clients/rootpart_proposal.ycp:86
+#, ycp-format
+msgid "%1 on root partition %2"
+msgstr ""
+
+#. this is a heading
+#: src/clients/rootpart_proposal.ycp:139
+msgid "Selected for Update"
+msgstr ""
+
+#. this is a menu entry
+#: src/clients/rootpart_proposal.ycp:141
+msgid "&Selected for Update"
+msgstr ""
+
+#: src/clients/run_update.ycp:37
+msgid "&Update"
+msgstr ""
+
+#. TRANSLATORS: error message - the module does not provide command line
interface
+#: src/clients/update.ycp:25
+msgid "There is no user interface available for this module."
+msgstr ""
+
+#. part of error popup message
+#. error message in proposal
+#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:292
+msgid "Cannot read the current RPM Database."
+msgstr ""
+
+#. part of error popup message, %1 stands for newline-separated list of files
+#: src/clients/update_proposal.ycp:115
+#, ycp-format
+msgid "None of these files exist:%1"
+msgstr ""
+
+#. continue-cancel popup
+#: src/clients/update_proposal.ycp:251
+msgid ""
+"The installed product is not compatible with the product\n"
+"on the installation media. If you try to update using the\n"
+"current installation media, the system may not start or\n"
+"some applications may not run properly."
+msgstr ""
+
+#. error message in proposal
+#: src/clients/update_proposal.ycp:307
+msgid "The installed product is not compatible with the product on the
installation media."
+msgstr ""
+
+#. TRANSLATORS: unknown product (label)
+#. TRANSLATORS: unknown product name
+#: src/clients/update_proposal.ycp:314 src/clients/update_proposal.ycp:322
+#: src/clients/update_proposal.ycp:351 src/clients/update_proposal.ycp:353
+msgid "Unknown product"
+msgstr ""
+
+#. TRANSLATORS: proposal error, %1 is the version of installed system
+#. %2 is the version being installed
+#: src/clients/update_proposal.ycp:334
+#, ycp-format
+msgid ""
+"Updating system to another version (%1 -> %2) is not supported on the running
system.<br>\n"
+"Please, boot from the installation media and use a normal upgrade\n"
+"or disable software repositories of products with different versions."
+msgstr ""
+
+#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product
names
+#: src/clients/update_proposal.ycp:349
+#, ycp-format
+msgid "Warning: Updating from '%1' to '%2', products do not exactly match."
+msgstr ""
+
+#. Proposal for backup during update
+#: src/clients/update_proposal.ycp:385
+msgid "Only update installed packages"
+msgstr ""
+
+#. proposal string
+#: src/clients/update_proposal.ycp:392
+msgid "Update based on patterns"
+msgstr ""
+
+#. TRANSLATORS: proposal dialog help
+#: src/clients/update_proposal.ycp:409
+msgid ""
+"<p><b><big>Update Options</big></b>\n"
+"Here you can choose how your system is going to be updated.\n"
+"Choose whether only installed packages should be updated or whether new ones
should be installed also \n"
+"(the default selection), and whether unmaintained packages should be
deleted.</p>"
+msgstr ""
+
+#. this is a menu entry
+#: src/clients/update_proposal.ycp:455
+msgid "&Update Options"
+msgstr ""
+
+#: src/config/update.glade:18 src/config/update.glade:42
+msgid "Update Settings"
+msgstr ""
+
+#: src/config/update.glade:34
+msgid "Update"
+msgstr ""
+
+#: src/config/update.glade:48 src/config/update.glade:52
+msgid "Perform Update"
+msgstr ""
+
+#: src/config/update.glade:63
+msgid "Clean Up"
+msgstr ""
+
+#: src/config/update.glade:67
+msgid "Update System Configuration"
+msgstr ""
+
+#: src/config/update.glade:75
+msgid "Update Configuration"
+msgstr ""
+
+#. Table item (unknown system)
+#: src/include/rootpart.ycp:63
+msgid "Unknown Linux"
+msgstr ""
+
+#. Table item (unknown system)
+#: src/include/rootpart.ycp:66
+msgid "Unknown or Non-Linux"
+msgstr ""
+
+#: src/include/rootpart.ycp:86
+#, ycp-format
+msgid "%1 (%2)"
+msgstr ""
+
+#. label for selection of root partition (for boot)
+#: src/include/rootpart.ycp:154
+msgid "Partition or System to Boot:"
+msgstr ""
+
+#. help text for root partition dialog (for boot)
+#: src/include/rootpart.ycp:157
+msgid ""
+"<p>\n"
+"Select the partition or system to boot.\n"
+"</p>\n"
+msgstr ""
+
+#. label for selection of root partition (for update)
+#: src/include/rootpart.ycp:165
+msgid "Partition or System to Update:"
+msgstr ""
+
+#. help text for root partition dialog (for update)
+#: src/include/rootpart.ycp:168
+msgid ""
+"<p>\n"
+"Select the partition or system to update.\n"
+"</p>\n"
+msgstr ""
+
+#. headline for dialog "Select for update"
+#: src/include/rootpart.ycp:176
+msgid "Select for Update"
+msgstr ""
+
+#. help text for root partition dialog (general part)
+#: src/include/rootpart.ycp:181
+msgid ""
+"<p>\n"
+"<b>Show All Partitions</b> expands the list to a\n"
+"general overview of your system's partitions.\n"
+"</p>\n"
+msgstr ""
+
+#. table header
+#: src/include/rootpart.ycp:198
+msgid "System"
+msgstr ""
+
+#. table header item
+#: src/include/rootpart.ycp:200
+msgid "Partition"
+msgstr ""
+
+#. table header item
+#: src/include/rootpart.ycp:202
+msgid "Architecture"
+msgstr ""
+
+#. table header item
+#: src/include/rootpart.ycp:204
+msgid "File System"
+msgstr ""
+
+#. table header item
+#: src/include/rootpart.ycp:206
+msgid "Label"
+msgstr ""
+
+#. check box
+#: src/include/rootpart.ycp:213
+msgid "&Show All Partitions"
+msgstr ""
+
+#. pushbutton to (rightaway) boot the system selected above
+#: src/include/rootpart.ycp:245
+msgid "&Boot"
+msgstr ""
+
+#. continue-cancel popup
+#: src/include/rootpart.ycp:322
+msgid ""
+"No installed system that can be upgraded with this product was found\n"
+"on the selected partition."
+msgstr ""
+
+#. continue-cancel popup
+#: src/include/rootpart.ycp:329
+msgid ""
+"The architecture of the system installed in the selected partition\n"
+"is different than the one of this product."
+msgstr ""
+
+#. pop-up question
+#: src/include/rootpart.ycp:357
+msgid ""
+"A possibly incomplete installation has been detected on the selected
partition.\n"
+"Are sure you want to use it anyway?"
+msgstr ""
+
+#. button label
+#: src/include/rootpart.ycp:360
+msgid "&Yes, Use It"
+msgstr ""
+
+#: src/include/rootpart.ycp:390 src/include/rootpart.ycp:411
+msgid ""
+"Initializing the system for upgrade has failed for unknown reason.\n"
+"It is highly recommended not to continue the upgrade process.\n"
+"\n"
+"Are you sure you want to continue?"
+msgstr ""
+
+#: src/include/rootpart.ycp:394 src/include/rootpart.ycp:415
+msgid "&Yes, Continue"
+msgstr ""
+
+#. *
+#. * Link to SDB article concerning renaming of devices.
+#.
+#: src/modules/RootPart.ycp:102
+#, ycp-format
+msgid ""
+"See the SDB article at %1 for details\n"
+"about how to solve this problem."
+msgstr ""
+
+#. label - name of sustem to update
+#: src/modules/RootPart.ycp:122
+msgid "Unknown Linux System"
+msgstr ""
+
+#. label - name of sustem to update
+#: src/modules/RootPart.ycp:127
+msgid "Non-Linux System"
+msgstr ""
+
+#. error report, %1 is device (eg. /dev/hda1)
+#: src/modules/RootPart.ycp:224
+#, ycp-format
+msgid ""
+"Cannot unmount partition %1.\n"
+"\n"
+"It is currently in use. If the partition stays mounted,\n"
+"the data may be lost. Unmount the partition manually\n"
+"or restart your computer.\n"
+msgstr ""
+
+#. label, %1 is partition
+#: src/modules/RootPart.ycp:289
+#, ycp-format
+msgid "Checking partition %1"
+msgstr ""
+
+#: src/modules/RootPart.ycp:329
+msgid "Show &Details"
+msgstr ""
+
+#: src/modules/RootPart.ycp:416
+#, ycp-format
+msgid "Checking file system on %1..."
+msgstr ""
+
+#. popup headline
+#: src/modules/RootPart.ycp:440
+msgid "File System Check Failed"
+msgstr ""
+
+#. popup question (continue/cancel dialog)
+#. %1 is a device name such as /dev/hda5
+#: src/modules/RootPart.ycp:444
+#, ycp-format
+msgid ""
+"The file system check of device %1 has failed.\n"
+"\n"
+"Would you like to continue in the mounting the device?"
+msgstr ""
+
+#. button
+#: src/modules/RootPart.ycp:450
+msgid "&Skip Mounting"
+msgstr ""
+
+#. yes-no popup
+#: src/modules/RootPart.ycp:871
+msgid "Incorrect password. Try again?"
+msgstr ""
+
+#. TRANSLATORS: a popup headline
+#: src/modules/RootPart.ycp:958
+msgid "Warning"
+msgstr ""
+
+#: src/modules/RootPart.ycp:963
+#, ycp-format
+msgid ""
+"Your /boot partition is too small (%1 MB).\n"
+"We recommend a size not less than %2 MB. It might happen, that the\n"
+"new Kernel does not fit, so it would be safer to either enlarge that
partition\n"
+"or not to use the /boot partition at all.\n"
+"\n"
+"Would you like to continue updating the current system?"
+msgstr ""
+
+#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount'
command
+#: src/modules/RootPart.ycp:1035
+#, ycp-format
+msgid ""
+"The partition %1 could not be mounted.\n"
+"\n"
+"%2\n"
+"\n"
+"If you are sure that the partition is not necessary for the\n"
+"update (it is not any system partition), click Continue.\n"
+"To check or fix the mount options, click Specify Mount Options.\n"
+"To abort update, click Cancel."
+msgstr ""
+
+#. push button
+#: src/modules/RootPart.ycp:1049
+msgid "&Specify Mount Options"
+msgstr ""
+
+#. popup heading
+#: src/modules/RootPart.ycp:1068
+msgid "Mount Options"
+msgstr ""
+
+#. text entry label
+#: src/modules/RootPart.ycp:1071
+msgid "&Mount Point"
+msgstr ""
+
+#. tex entry label
+#: src/modules/RootPart.ycp:1074
+msgid "&Device"
+msgstr ""
+
+#. text entry label
+#: src/modules/RootPart.ycp:1077
+msgid ""
+"&File System\n"
+"(empty for autodetection)"
+msgstr ""
+
+#. error message
+#: src/modules/RootPart.ycp:1155
+#, ycp-format
+msgid "The /var partition %1 could not be mounted.\n"
+msgstr ""
+
+#. Informational text about selected partition, %x are replaced with values
later
+#: src/modules/RootPart.ycp:1183
+#, ycp-format
+msgid ""
+"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
+"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
+"<b>udev IDs:</b> %5,<br>\n"
+"<b>udev path:</b> %6"
+msgstr ""
+
+#: src/modules/RootPart.ycp:1190
+msgid "None"
+msgstr ""
+
+#. a popup caption
+#: src/modules/RootPart.ycp:1207
+msgid "Unable to find the /var partition automatically"
+msgstr ""
+
+#. a popup message
+#: src/modules/RootPart.ycp:1209
+msgid ""
+"Your system uses a separate /var partition which is required for the
upgrade\n"
+"process to detect the disk-naming changes. Select the /var partition
manually\n"
+"to continue the upgrade process."
+msgstr ""
+
+#. a combo-box label
+#: src/modules/RootPart.ycp:1217
+msgid "&Select /var Partition Device"
+msgstr ""
+
+#. an informational rich-text widget label
+#: src/modules/RootPart.ycp:1222
+msgid "Device Info"
+msgstr ""
+
+#. error message
+#: src/modules/RootPart.ycp:1339
+msgid "Unable to mount /var partition with this disk configuration.\n"
+msgstr ""
+
+#. popup message, %1 will be replace with the name of the logfile
+#: src/modules/RootPart.ycp:1364
+#, ycp-format
+msgid ""
+"Partitions could not be mounted.\n"
+"\n"
+"Check the log file %1."
+msgstr ""
+
+#: src/modules/RootPart.ycp:1394
+#, ycp-format
+msgid ""
+"Some partitions in the system on %1 are mounted by kernel-device name. This
is\n"
+"not reliable for the update since kernel-device names are unfortunately not\n"
+"persistent. It is strongly recommended to start the old system and change
the\n"
+"mount-by method to any other method for all partitions."
+msgstr ""
+
+#. error message
+#: src/modules/RootPart.ycp:1409
+msgid "No fstab found."
+msgstr ""
+
+#. message part 1
+#: src/modules/RootPart.ycp:1429
+msgid "The root partition in /etc/fstab has an invalid root device.\n"
+msgstr ""
+
+#. message part 2
+#: src/modules/RootPart.ycp:1431
+#, ycp-format
+msgid "It is currently mounted as %1 but listed as %2.\n"
+msgstr ""
+
+#: src/modules/RootPart.ycp:1697
+msgid "Evaluating root partition. One moment please..."
+msgstr ""
+
+#. intermediate popup while mounting partitions
+#: src/modules/RootPart.ycp:1756
+msgid "Mounting partitions. One moment please..."
+msgstr ""
+
+#. TRANSLATORS: dialog caption
+#: src/modules/RootPart.ycp:1771
+msgid "Searching for Available Systems"
+msgstr ""
+
+#. TRANSLATORS: "Update to: $product_name"
+#: src/modules/Update.ycp:282
+msgid "Unknown Product"
+msgstr ""
+
+#. TRANSLATORS: check-box, it might happen that we need to downgrade some
packages during update
+#: src/modules/Update.ycp:648
+msgid "Allow Package Downgrade"
+msgstr ""
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
