openSUSE Commits

Download

commit@lists.opensuse.org

April 2015

1 participants
1958 discussions

commit karchive for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package karchive for openSUSE:13.2:Update checked in at 2015-04-28 12:33:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/karchive (Old) and /work/SRC/openSUSE:13.2:Update/.karchive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "karchive" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.LsHIUP/_old 2015-04-28 12:33:24.000000000 +0200 +++ /var/tmp/diff_new_pack.LsHIUP/_new 2015-04-28 12:33:24.000000000 +0200 @@ -1 +1 @@ -<link package='karchive.3666' cicount='copy' /> +<link package='karchive.3714' cicount='copy' />

1 0

commit kapidox for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package kapidox for openSUSE:13.2:Update checked in at 2015-04-28 12:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/kapidox (Old) and /work/SRC/openSUSE:13.2:Update/.kapidox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kapidox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.SpeiXV/_old 2015-04-28 12:33:20.000000000 +0200 +++ /var/tmp/diff_new_pack.SpeiXV/_new 2015-04-28 12:33:20.000000000 +0200 @@ -1 +1 @@ -<link package='kapidox.3666' cicount='copy' /> +<link package='kapidox.3714' cicount='copy' />

1 0

commit kactivities5 for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package kactivities5 for openSUSE:13.2:Update checked in at 2015-04-28 12:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/kactivities5 (Old) and /work/SRC/openSUSE:13.2:Update/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kactivities5" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.XLUGgX/_old 2015-04-28 12:33:18.000000000 +0200 +++ /var/tmp/diff_new_pack.XLUGgX/_new 2015-04-28 12:33:18.000000000 +0200 @@ -1 +1 @@ -<link package='kactivities5.3666' cicount='copy' /> +<link package='kactivities5.3714' cicount='copy' />

1 0

commit extra-cmake-modules for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package extra-cmake-modules for openSUSE:13.2:Update checked in at 2015-04-28 12:33:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/extra-cmake-modules (Old) and /work/SRC/openSUSE:13.2:Update/.extra-cmake-modules.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "extra-cmake-modules" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.QkXNU6/_old 2015-04-28 12:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.QkXNU6/_new 2015-04-28 12:33:15.000000000 +0200 @@ -1 +1 @@ -<link package='extra-cmake-modules.3666' cicount='copy' /> +<link package='extra-cmake-modules.3714' cicount='copy' />

1 0

commit frameworkintegration for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package frameworkintegration for openSUSE:13.2:Update checked in at 2015-04-28 12:33:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/frameworkintegration (Old) and /work/SRC/openSUSE:13.2:Update/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frameworkintegration" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.MAvBqu/_old 2015-04-28 12:33:15.000000000 +0200 +++ /var/tmp/diff_new_pack.MAvBqu/_new 2015-04-28 12:33:15.000000000 +0200 @@ -1 +1 @@ -<link package='frameworkintegration.3666' cicount='copy' /> +<link package='frameworkintegration.3714' cicount='copy' />

1 0

commit breeze4-style for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package breeze4-style for openSUSE:13.2:Update checked in at 2015-04-28 12:33:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/breeze4-style (Old) and /work/SRC/openSUSE:13.2:Update/.breeze4-style.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "breeze4-style" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.JXPrKU/_old 2015-04-28 12:33:11.000000000 +0200 +++ /var/tmp/diff_new_pack.JXPrKU/_new 2015-04-28 12:33:11.000000000 +0200 @@ -1 +1 @@ -<link package='breeze4-style.3666' cicount='copy' /> +<link package='breeze4-style.3714' cicount='copy' />

1 0

commit breeze for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package breeze for openSUSE:13.2:Update checked in at 2015-04-28 12:33:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/breeze (Old) and /work/SRC/openSUSE:13.2:Update/.breeze.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "breeze" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.0WWHmV/_old 2015-04-28 12:33:07.000000000 +0200 +++ /var/tmp/diff_new_pack.0WWHmV/_new 2015-04-28 12:33:07.000000000 +0200 @@ -1 +1 @@ -<link package='breeze.3666' cicount='copy' /> +<link package='breeze.3714' cicount='copy' />

1 0

commit attica-qt5 for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package attica-qt5 for openSUSE:13.2:Update checked in at 2015-04-28 12:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/attica-qt5 (Old) and /work/SRC/openSUSE:13.2:Update/.attica-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "attica-qt5" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.y5AzqG/_old 2015-04-28 12:33:06.000000000 +0200 +++ /var/tmp/diff_new_pack.y5AzqG/_new 2015-04-28 12:33:06.000000000 +0200 @@ -1 +1 @@ -<link package='attica-qt5.3666' cicount='copy' /> +<link package='attica-qt5.3714' cicount='copy' />

1 0

commit patchinfo.3715 for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package patchinfo.3715 for openSUSE:13.2:Update checked in at 2015-04-28 12:32:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/patchinfo.3715 (Old) and /work/SRC/openSUSE:13.2:Update/.patchinfo.3715.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.3715" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo incident="3715"> <category>recommended</category> <rating>moderate</rating> <packager>flavio_castelli</packager> <summary>Recommended udpate for docker</summary> <description>This recommended udpate for docker provides version 1.6.0 with several fixes and improvements: - Updated to version 1.6.0 (2015-04-07) + Builder: * Building images from an image ID * build containers with resource constraints, ie `docker build --cpu-shares=100 --memory=1024m...` * `commit --change` to apply specified Dockerfile instructions while committing the image * `import --change` to apply specified Dockerfile instructions while importing the image * basic build cancellation + Client: * Windows Support + Runtime: * Container and image Labels * `--cgroup-parent` for specifying a parent cgroup to place container cgroup within * Logging drivers, `json-file`, `syslog`, or `none` * Pulling images by ID * `--ulimit` to set the ulimit on a container * `--default-ulimit` option on the daemon which applies to all created containers (and overwritten by `--ulimit` on run) - Support of Docker Registry API v2. (bnc#908033) - Enable build for armv7l - Fix building with the latest version of our Go pacakge. - Fix check made by the docker daemon against the dockerinit binary. - Updated systemd service and socket units to fix socket activation and to align with best practices recommended by upstream. Moreover socket activation fixes bnc#920645.</description> <issue tracker="bnc" id="908033">docker-registry needs to be included in sle 12 tech preview of docker</issue> <issue tracker="bnc" id="920645">[yast2-docker] error: connection refused - connect(2) for /var/run/docker.sock</issue> </patchinfo>

1 0

commit docker for openSUSE:13.2:Update
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package docker for openSUSE:13.2:Update checked in at 2015-04-28 12:32:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.2:Update/docker (Old) and /work/SRC/openSUSE:13.2:Update/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.ngk8gU/_old 2015-04-28 12:32:06.000000000 +0200 +++ /var/tmp/diff_new_pack.ngk8gU/_new 2015-04-28 12:32:06.000000000 +0200 @@ -1 +1 @@ -<link package='docker.3526' cicount='copy' /> +<link package='docker.3715' cicount='copy' />

1 0

commit squid for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '15

28 Apr '15

Hello community, here is the log from the commit of package squid for openSUSE:Factory checked in at 2015-04-28 11:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/squid (Old) and /work/SRC/openSUSE:Factory/.squid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "squid" Changes: -------- --- /work/SRC/openSUSE:Factory/squid/squid.changes 2015-04-27 13:05:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.squid.new/squid.changes 2015-04-28 11:47:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 28 08:59:41 UTC 2015 - mpluskal(a)suse.com + +- Fix update from 3.4 to 3.5 + +------------------------------------------------------------------- @@ -4 +9 @@ -- fix SLE 11 build with older kerberos libraries +- Fix SLE 11 build with older kerberos libraries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squid.spec ++++++ --- /var/tmp/diff_new_pack.AsgkRD/_old 2015-04-28 11:47:12.000000000 +0200 +++ /var/tmp/diff_new_pack.AsgkRD/_new 2015-04-28 11:47:12.000000000 +0200 @@ -301,6 +301,16 @@ %{_sbindir}/usermod -G winbind %{name} 2>/dev/null fi +%pretrans +# Directory to symlink is not working in RPM so workaround it +# Occurs when updating from 3.4 to 3.5 +error_dir="%{_datadir}/%{name}/errors" +for i in zh-cn zh-tw; do + if [ -d "$error_dir/$i" ]; then + rm -rf "$error_dir/$i" || true + fi +done + %if 0%{?has_systemd} %service_add_pre %{name}.service %endif

1 0

commit java-1_9_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package java-1_9_0-openjdk for openSUSE:Factory checked in at 2015-04-27 22:08:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_9_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_9_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/java-1_9_0-openjdk.changes 2015-04-21 10:52:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/java-1_9_0-openjdk.changes 2015-04-27 22:09:23.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 22 08:06:05 UTC 2015 - fstrba(a)suse.com + +- Upgrade to upstream tag jdk9-b60 +- Updated patches: + * memory-limits.patch + * ppc-zero-hotspot.patch + - rediff to correspond to the uintx -> size_t changes +- Added patch: + * configure-errors.patch + - revert hunks of upstream commit that break the build in our + build environment + +------------------------------------------------------------------- Old: ---- 17c4241395e9.tar.bz2 2c417f7d7b0d.tar.bz2 3bcfcb13c234.tar.bz2 56a85ffe743d.tar.bz2 c76339e86ea7.tar.bz2 d8ebf1a5b18c.tar.bz2 ec977a00cecb.tar.bz2 f25ee9f62427.tar.bz2 New: ---- 81bdc4545337.tar.bz2 84c5527f742b.tar.bz2 9c916db4bf3b.tar.bz2 9fa2185bee17.tar.bz2 c12db18748da.tar.bz2 c55ce3738888.tar.bz2 caa330b275f3.tar.bz2 configure-errors.patch f31835b59035.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_9_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:26.000000000 +0200 +++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:26.000000000 +0200 @@ -33,17 +33,17 @@ %global minorver 9 %global microver 0 %global updatever 0 -%global buildver b57 +%global buildver b60 %global root_project jdk9 %global root_repository jdk9 -%global root_revision f25ee9f62427 -%global corba_revision d8ebf1a5b18c -%global hotspot_revision 56a85ffe743d -%global jaxp_revision 2c417f7d7b0d -%global jaxws_revision 17c4241395e9 -%global jdk_revision c76339e86ea7 -%global langtools_revision ec977a00cecb -%global nashorn_revision 3bcfcb13c234 +%global root_revision 9fa2185bee17 +%global corba_revision caa330b275f3 +%global hotspot_revision 9c916db4bf3b +%global jaxp_revision c12db18748da +%global jaxws_revision f31835b59035 +%global jdk_revision 84c5527f742b +%global langtools_revision 81bdc4545337 +%global nashorn_revision c55ce3738888 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority %(echo "10000 * %{majorver} + 1000 * %{minorver} + 100 * %{microver} + %{updatever}" | bc) @@ -200,6 +200,8 @@ Patch5: multiple-pkcs11-library-init.patch # Disable doclint for compatibility Patch6: disable-doclint-by-default.patch +# Revert some configure changes +Patch7: configure-errors.patch # From icedtea: Increase default memory limits Patch10: memory-limits.patch # Fix use of unintialized memory in adlc parser @@ -480,6 +482,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %patch10 -p1 %patch12 -p1 %patch13 -p1 ++++++ 17c4241395e9.tar.bz2 -> 81bdc4545337.tar.bz2 ++++++ ++++ 1182861 lines of diff (skipped) ++++++ 2c417f7d7b0d.tar.bz2 -> 84c5527f742b.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/2c417f7d7b0d.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/84c5527f742b.tar.bz2 differ: char 11, line 1 ++++++ 17c4241395e9.tar.bz2 -> 9c916db4bf3b.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_9_0-openjdk/17c4241395e9.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_9_0-openjdk.new/9c916db4bf3b.tar.bz2 differ: char 11, line 1 ++++++ 17c4241395e9.tar.bz2 -> 9fa2185bee17.tar.bz2 ++++++ ++++ 696123 lines of diff (skipped) ++++++ 17c4241395e9.tar.bz2 -> c12db18748da.tar.bz2 ++++++ ++++ 1260184 lines of diff (skipped) ++++++ 17c4241395e9.tar.bz2 -> c55ce3738888.tar.bz2 ++++++ ++++ 984715 lines of diff (skipped) ++++++ 17c4241395e9.tar.bz2 -> caa330b275f3.tar.bz2 ++++++ ++++ 791817 lines of diff (skipped) ++++++ configure-errors.patch ++++++ --- jdk9/common/autoconf/basics.m4 2015-04-22 10:44:41.403887706 +0200 +++ jdk9/common/autoconf/basics.m4 2015-04-22 10:45:06.750438857 +0200 @@ -658,8 +658,6 @@ fi OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" $MKDIR -p "$OUTPUT_ROOT" - CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support" - $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR" if test ! -d "$OUTPUT_ROOT"; then AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) fi @@ -705,7 +703,6 @@ AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) AC_SUBST(CONF_NAME, $CONF_NAME) AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) - AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) # The spec.gmk file contains all variables for the make system. AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) --- jdk9/common/autoconf/basics_windows.m4 2015-04-22 10:44:41.404887688 +0200 +++ jdk9/common/autoconf/basics_windows.m4 2015-04-22 10:45:06.751438839 +0200 @@ -383,46 +383,45 @@ if test "x$OPENJDK_BUILD_OS" = xwindows; then AC_MSG_CHECKING([if fixpath can be created]) FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c" - FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe" - FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath" + FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe" if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then + FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC` + FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN` # Important to keep the .exe suffix on Cygwin for Hotspot makefiles - FIXPATH="$FIXPATH_BIN -c" + FIXPATH="$OUTPUT_ROOT/fixpath.exe -c" elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then + FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC` + FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN` + # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line # @ was chosen as separator to minimize risk of other tools messing around with it - all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" \ - | tr ' ' '\n' | grep '^/./' | sort | uniq` + all_unique_prefixes=`echo "${all_fixpath_prefixes@<:@@@:>@}" | tr ' ' '\n' | grep '^/./' | sort | uniq` fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'` - FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list" + + FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list" fi - FIXPATH_SRC_W="$FIXPATH_SRC" - FIXPATH_BIN_W="$FIXPATH_BIN" - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W]) - BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W]) - $RM -rf $FIXPATH_BIN $FIXPATH_DIR - $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin - cd $FIXPATH_DIR - $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1 + rm -f $OUTPUT_ROOT/fixpath* + cd $OUTPUT_ROOT + $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1 cd $CURDIR - if test ! -x $FIXPATH_BIN; then + if test ! -x $OUTPUT_ROOT/fixpath.exe; then AC_MSG_RESULT([no]) - cat $FIXPATH_DIR/fixpath1.log - AC_MSG_ERROR([Could not create $FIXPATH_BIN]) + cat $OUTPUT_ROOT/fixpath1.log + AC_MSG_ERROR([Could not create $OUTPUT_ROOT/fixpath.exe]) fi AC_MSG_RESULT([yes]) AC_MSG_CHECKING([if fixpath.exe works]) - cd $FIXPATH_DIR - $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \ - > $FIXPATH_DIR/fixpath2.log 2>&1 + cd $OUTPUT_ROOT + $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 cd $CURDIR - if test ! -x $FIXPATH_DIR/fixpath2.exe; then + if test ! -x $OUTPUT_ROOT/fixpath2.exe; then AC_MSG_RESULT([no]) - cat $FIXPATH_DIR/fixpath2.log + cat $OUTPUT_ROOT/fixpath2.log AC_MSG_ERROR([fixpath did not work!]) fi AC_MSG_RESULT([yes]) + rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj fi AC_SUBST(FIXPATH) --- jdk9/common/autoconf/build-performance.m4 2015-04-22 10:44:41.404887688 +0200 +++ jdk9/common/autoconf/build-performance.m4 2015-04-22 10:45:06.751438839 +0200 @@ -336,4 +336,11 @@ AC_MSG_CHECKING([whether to use sjavac]) AC_MSG_RESULT([$ENABLE_SJAVAC]) AC_SUBST(ENABLE_SJAVAC) + + if test "x$ENABLE_SJAVAC" = xyes; then + SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" + else + SJAVAC_SERVER_DIR= + fi + AC_SUBST(SJAVAC_SERVER_DIR) ]) --- jdk9/common/autoconf/configure.ac 2015-04-22 10:44:41.404887688 +0200 +++ jdk9/common/autoconf/configure.ac 2015-04-22 10:45:06.751438839 +0200 @@ -261,7 +261,7 @@ # We're messing a bit with internal autoconf variables to put the config.status # in the output directory instead of the current directory. -CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status" +CONFIG_STATUS="$OUTPUT_ROOT/config.status" # Create the actual output files. Now the main work of configure is done. AC_OUTPUT @@ -269,7 +269,7 @@ # Try to move the config.log file to the output directory. if test -e ./config.log; then - $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null + $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null fi # Make the compare script executable --- jdk9/common/autoconf/generated-configure.sh 2015-04-22 10:44:41.409887600 +0200 +++ jdk9/common/autoconf/generated-configure.sh 2015-04-22 10:45:06.765438591 +0200 @@ -632,6 +632,7 @@ CFLAGS_CCACHE CCACHE USE_PRECOMPILED_HEADER +SJAVAC_SERVER_DIR ENABLE_SJAVAC SJAVAC_SERVER_JAVA_FLAGS SJAVAC_SERVER_JAVA @@ -883,7 +884,6 @@ CHECK_MAKE CHECK_GMAKE PKGHANDLER -CONFIGURESUPPORT_OUTPUTDIR OUTPUT_ROOT CONF_NAME SPEC @@ -4365,7 +4365,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1428676283 +DATE_WHEN_GENERATED=1428017006 ############################################################################### # @@ -15266,8 +15266,6 @@ fi OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" $MKDIR -p "$OUTPUT_ROOT" - CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support" - $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR" if test ! -d "$OUTPUT_ROOT"; then as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5 fi @@ -27625,7 +27622,7 @@ $as_echo "$as_me: Trying to extract Visual Studio environment variables" >&6;} # We need to create a couple of temporary files. - VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env" + VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env" $MKDIR -p $VS_ENV_TMP_DIR # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment). @@ -43139,69 +43136,50 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5 $as_echo_n "checking if fixpath can be created... " >&6; } FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c" - FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe" - FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath" + FIXPATH_BIN="$OUTPUT_ROOT/fixpath.exe" if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then + FIXPATH_SRC=`$CYGPATH -m $FIXPATH_SRC` + FIXPATH_BIN=`$CYGPATH -m $FIXPATH_BIN` # Important to keep the .exe suffix on Cygwin for Hotspot makefiles - FIXPATH="$FIXPATH_BIN -c" + FIXPATH="$OUTPUT_ROOT/fixpath.exe -c" elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.msys; then + FIXPATH_SRC=`cmd //c echo $FIXPATH_SRC` + FIXPATH_BIN=`cmd //c echo $FIXPATH_BIN` + # Take all collected prefixes and turn them into a -m/c/foo@/c/bar@... command line # @ was chosen as separator to minimize risk of other tools messing around with it - all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" \ - | tr ' ' '\n' | grep '^/./' | sort | uniq` + all_unique_prefixes=`echo "${all_fixpath_prefixes[@]}" | tr ' ' '\n' | grep '^/./' | sort | uniq` fixpath_argument_list=`echo $all_unique_prefixes | tr ' ' '@'` - FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list" - fi - FIXPATH_SRC_W="$FIXPATH_SRC" - FIXPATH_BIN_W="$FIXPATH_BIN" - unix_path="$FIXPATH_SRC_W" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - windows_path=`$CYGPATH -m "$unix_path"` - FIXPATH_SRC_W="$windows_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - windows_path=`cmd //c echo $unix_path` - FIXPATH_SRC_W="$windows_path" + FIXPATH="$OUTPUT_ROOT/fixpath -m$fixpath_argument_list" fi - - - unix_path="$FIXPATH_BIN_W" - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then - windows_path=`$CYGPATH -m "$unix_path"` - FIXPATH_BIN_W="$windows_path" - elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then - windows_path=`cmd //c echo $unix_path` - FIXPATH_BIN_W="$windows_path" - fi - - $RM -rf $FIXPATH_BIN $FIXPATH_DIR - $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin - cd $FIXPATH_DIR - $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1 + rm -f $OUTPUT_ROOT/fixpath* + cd $OUTPUT_ROOT + $CC $FIXPATH_SRC -Fe$FIXPATH_BIN > $OUTPUT_ROOT/fixpath1.log 2>&1 cd $CURDIR - if test ! -x $FIXPATH_BIN; then + if test ! -x $OUTPUT_ROOT/fixpath.exe; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - cat $FIXPATH_DIR/fixpath1.log - as_fn_error $? "Could not create $FIXPATH_BIN" "$LINENO" 5 + cat $OUTPUT_ROOT/fixpath1.log + as_fn_error $? "Could not create $OUTPUT_ROOT/fixpath.exe" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath.exe works" >&5 $as_echo_n "checking if fixpath.exe works... " >&6; } - cd $FIXPATH_DIR - $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \ - > $FIXPATH_DIR/fixpath2.log 2>&1 + cd $OUTPUT_ROOT + $FIXPATH $CC $SRC_ROOT/common/src/fixpath.c -Fe$OUTPUT_ROOT/fixpath2.exe > $OUTPUT_ROOT/fixpath2.log 2>&1 cd $CURDIR - if test ! -x $FIXPATH_DIR/fixpath2.exe; then + if test ! -x $OUTPUT_ROOT/fixpath2.exe; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - cat $FIXPATH_DIR/fixpath2.log + cat $OUTPUT_ROOT/fixpath2.log as_fn_error $? "fixpath did not work!" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + rm -f $OUTPUT_ROOT/fixpath?.??? $OUTPUT_ROOT/fixpath.obj fi @@ -51437,6 +51415,13 @@ $as_echo "$ENABLE_SJAVAC" >&6; } + if test "x$ENABLE_SJAVAC" = xyes; then + SJAVAC_SERVER_DIR="$OUTPUT_ROOT/javacservers" + else + SJAVAC_SERVER_DIR= + fi + + # Can the C/C++ compiler use precompiled headers? @@ -51864,7 +51849,7 @@ # We're messing a bit with internal autoconf variables to put the config.status # in the output directory instead of the current directory. -CONFIG_STATUS="$CONFIGURESUPPORT_OUTPUTDIR/config.status" +CONFIG_STATUS="$OUTPUT_ROOT/config.status" # Create the actual output files. Now the main work of configure is done. cat >confcache <<\_ACEOF @@ -53032,7 +53017,7 @@ # Try to move the config.log file to the output directory. if test -e ./config.log; then - $MV -f ./config.log "$CONFIGURESUPPORT_OUTPUTDIR/config.log" 2> /dev/null + $MV -f ./config.log "$OUTPUT_ROOT/config.log" 2> /dev/null fi # Make the compare script executable --- jdk9/common/autoconf/spec.gmk.in 2015-04-22 10:44:41.410887582 +0200 +++ jdk9/common/autoconf/spec.gmk.in 2015-04-22 10:45:06.766438573 +0200 @@ -237,8 +237,6 @@ IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/test-make MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support -# This does not get overridden in a bootcycle build -CONFIGURESUPPORT_OUTPUTDIR:=@CONFIGURESUPPORT_OUTPUTDIR@ HOTSPOT_DIST=@HOTSPOT_DIST@ @@ -260,7 +258,7 @@ ENABLE_SJAVAC:=@ENABLE_SJAVAC@ # Store sjavac server synchronization files here, and # the sjavac server log files. -SJAVAC_SERVER_DIR=$(MAKESUPPORT_OUTPUTDIR)/javacservers +SJAVAC_SERVER_DIR:=@SJAVAC_SERVER_DIR@ # Number of parallel jobs to use for compilation JOBS?=@JOBS@ --- jdk9/common/autoconf/toolchain_windows.m4 2015-04-22 10:44:41.410887582 +0200 +++ jdk9/common/autoconf/toolchain_windows.m4 2015-04-22 10:45:06.767438555 +0200 @@ -270,7 +270,7 @@ AC_MSG_NOTICE([Trying to extract Visual Studio environment variables]) # We need to create a couple of temporary files. - VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env" + VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env" $MKDIR -p $VS_ENV_TMP_DIR # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment). ++++++ 17c4241395e9.tar.bz2 -> f31835b59035.tar.bz2 ++++++ ++++ 4465 lines of diff (skipped) ++++++ memory-limits.patch ++++++ --- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:46.000000000 +0200 +++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:46.000000000 +0200 @@ -1,11 +1,11 @@ --- jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-04-23 22:06:29.000000000 +0100 +++ jdk8/hotspot/src/share/vm/runtime/globals.hpp 2014-05-12 20:42:01.633428300 +0100 @@ -3113,7 +3113,7 @@ - product(uintx, InitialHeapSize, 0, \ + product(size_t, InitialHeapSize, 0, \ "Initial heap size (in bytes); zero means use ergonomics") \ \ -- product(uintx, MaxHeapSize, ScaleForWordSize(96*M), \ -+ product(uintx, MaxHeapSize, ScaleForWordSize(512*M), \ +- product(size_t, MaxHeapSize, ScaleForWordSize(96*M), \ ++ product(size_t, MaxHeapSize, ScaleForWordSize(512*M), \ "Maximum heap size (in bytes)") \ \ - product(uintx, OldSize, ScaleForWordSize(4*M), \ + product(size_t, OldSize, ScaleForWordSize(4*M), \ ++++++ ppc-zero-hotspot.patch ++++++ --- /var/tmp/diff_new_pack.FDqWu1/_old 2015-04-27 22:09:46.000000000 +0200 +++ /var/tmp/diff_new_pack.FDqWu1/_new 2015-04-27 22:09:46.000000000 +0200 @@ -1,6 +1,5 @@ -diff -up jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp ---- jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.ppc64 2013-02-22 19:02:06.000000000 +0100 -+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2013-04-18 16:21:24.897403406 +0200 +--- jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2015-04-10 02:38:28.000000000 +0200 ++++ jdk9/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp 2015-04-23 08:39:28.282139950 +0200 @@ -32,11 +32,15 @@ // @@ -19,4 +18,4 @@ +define_pd_global(intx, VMThreadStackSize, 640); #endif // _LP64 define_pd_global(intx, CompilerThreadStackSize, 0); - define_pd_global(uintx, JVMInvokeMethodSlack, 8192); + define_pd_global(size_t, JVMInvokeMethodSlack, 8192);

1 0

commit optipng for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package optipng for openSUSE:Factory checked in at 2015-04-27 22:08:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/optipng (Old) and /work/SRC/openSUSE:Factory/.optipng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "optipng" Changes: -------- --- /work/SRC/openSUSE:Factory/optipng/optipng.changes 2014-03-31 20:44:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.optipng.new/optipng.changes 2015-04-27 22:09:20.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 27 14:23:20 UTC 2015 - mpluskal(a)suse.com + +- Cleanup spec file with spec-clener +- Update dependencies +- Enable checks + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ optipng.spec ++++++ --- /var/tmp/diff_new_pack.Jm9lm9/_old 2015-04-27 22:09:21.000000000 +0200 +++ /var/tmp/diff_new_pack.Jm9lm9/_new 2015-04-27 22:09:21.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package optipng # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,8 +25,8 @@ Url: http://optipng.sourceforge.net/ Source0: http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-%{version}… Source1: macros.optipng -# patch sent at cosmin(a)cs.toronto.edu BuildRequires: libpng-devel +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,8 +39,14 @@ %setup -q %build +# not autotools generated configure export CFLAGS="%{optflags}" -./configure -with-system-zlib -with-system-libpng -prefix=%{_prefix} -mandir=%{_mandir} +./configure \ + -with-system-zlib \ + -with-system-libpng \ + -prefix=%{_prefix} \ + -mandir=%{_mandir} + #don't strip binaries sed -i "s:$LDFLAGS = $-s:\1:" src/optipng/Makefile make %{?_smp_mflags} @@ -49,11 +55,14 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} install -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.optipng +%check +make %{?_smp_mflags} check + %files %defattr(-,root,root) %doc README.txt doc %{_bindir}/optipng %{_mandir}/man1/optipng.1.gz -%{_sysconfdir}/rpm/macros.optipng +%config %{_sysconfdir}/rpm/macros.optipng %changelog

1 0

commit cantor for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2015-04-27 22:08:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cantor" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2015-03-11 09:44:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2015-04-27 22:09:19.000000000 +0200 @@ -1,0 +2,29 @@ +Mon Apr 27 13:57:22 UTC 2015 - tittiatcoke(a)gmail.com + +- Add patch fix-build-with-latest-R.diff to resolve the buildissue + with R-base >= 3.2 + +------------------------------------------------------------------- +Sat Apr 11 12:40:29 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 17:16:42 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + +- Drop patch cantor-bko296546.patch + +------------------------------------------------------------------- +Sun Mar 8 12:34:40 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- Old: ---- cantor-14.12.3.tar.xz cantor-bko296546.patch New: ---- cantor-15.04.0.tar.xz fix-build-with-latest-R.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.Jhd0fz/_old 2015-04-27 22:09:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Jhd0fz/_new 2015-04-27 22:09:20.000000000 +0200 @@ -16,40 +16,48 @@ # -%global libMAJOR 1 +%global libMAJOR 6 Name: cantor -Version: 14.12.3 +Version: 15.04.0 Release: 0 Summary: Worksheet GUI for mathematical software License: GPL-2.0+ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -Patch0: %{name}-bko296546.patch -BuildRequires: R-base-devel -%if 0%{?suse_version} > 1230 +Patch1: fix-build-with-latest-R.diff BuildRequires: R-base -%endif +BuildRequires: R-base-devel BuildRequires: analitza-devel BuildRequires: fdupes BuildRequires: gcc-fortran BuildRequires: help2man -BuildRequires: libkde4-devel -BuildRequires: libqalculate-devel +BuildRequires: extra-cmake-modules +BuildRequires: karchive-devel +BuildRequires: kconfig-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kdelibs4support-devel +BuildRequires: kpty-devel +BuildRequires: kf5-filesystem +BuildRequires: knewstuff-devel +BuildRequires: kparts-devel +BuildRequires: ktexteditor-devel BuildRequires: libspectre-devel -%if 0%{?suse_version} > 1310 -BuildRequires: luajit-devel -%endif BuildRequires: perl BuildRequires: python-devel BuildRequires: xz +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Test) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Xml) +BuildRequires: pkgconfig(Qt5XmlPatterns) Recommends: maxima Recommends: octave -Provides: kde4-cantor = 4.3.0 -Obsoletes: kde4-cantor < 4.3.0 +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires %description A frontend to several existing mathematical software such as R, Sage @@ -75,7 +83,8 @@ %prep %setup -q -%patch0 -p1 +%patch1 -p1 + mkdir .doc cd src/backends for d in * @@ -86,33 +95,12 @@ %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif -# bnc#753292 - %{lua: z = rpm .expand ("%cmake_kde4 -d build") - f, t = string .find (z, "-DCMAKE_SKIP_RPATH=ON", 0, true) - print (string .sub (z, 0, f - 01), "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON", string .sub (z, t + 01)) } + %cmake_kf5 -d build %make_jobs - # generate manual pages for cantor - ! mkdir man1 - for a in cantor - do m="man1/${a}.1" - help2man>"${m}" "src/${a}.shell" - gzip "${m}" - done - for a in cantor_rserver - do m="man1/${a}.1" - R>"${m}" CMD help2man "src/backends/R/rserver/${a}.shell" - gzip "${m}" - done %install - cd build - %kde4_makeinstall - for m in '%{buildroot}%{_mandir}/man1' - do install -d "${m}" - install "-t${m}" -ma=r man1/* - done - cd .. - %kde_post_install + %kf5_makeinstall -C build + %post -n libcantorlibs%{libMAJOR} -p /sbin/ldconfig @@ -121,32 +109,31 @@ %files devel %defattr(-,root,root) %doc COPYING -%{_kde4_libdir}/libcantorlibs.so -%{_kde4_includedir}/cantor/ +%{_kf5_libdir}/libcantorlibs.so +%{_kf5_prefix}/include/cantor/ %files %defattr(-,root,root) %doc COPYING COPYING.DOC README TODO DESIGN .doc/* -%doc %{_kde4_htmldir}/en/cantor/ -%doc %{_mandir}/man1/* -%dir %{_kde4_datadir}/appdata -%{_kde4_applicationsdir}/cantor.desktop -%{_kde4_appsdir}/cantor/ -%{_kde4_bindir}/cantor -%{_kde4_bindir}/cantor_rserver -%{_kde4_configdir}/cantor*.knsrc -%{_kde4_configkcfgdir}/*.kcfg -%{_kde4_datadir}/appdata/cantor.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/* -%{_kde4_libdir}/libcantor_config.so -%{_kde4_servicesdir}/cantor/ -%{_kde4_servicetypesdir}/cantor* +%{_kf5_sharedir}/cantor/ +%{_kf5_applicationsdir}/org.kde.cantor.desktop +%{_kf5_bindir}/cantor +%{_kf5_bindir}/cantor_rserver +%{_kf5_configkcfgdir}/ +%doc %lang(en) %{_kf5_htmldir}/en/*/ +%{_kf5_iconsdir}/hicolor/*/apps/* +%{_kf5_libdir}/libcantor_config.so +%{_kf5_libdir}/libcantor_pythonbackend.so +%{_kf5_servicesdir}/ +%{_kf5_servicetypesdir}/ +%{_kf5_sharedir}/appdata/ +%{_kf5_plugindir}/ +%{_kf5_kxmlguidir}/cantor/ +%(config) %{_kf5_configdir}/*.knsrc %files -n libcantorlibs%{libMAJOR} %defattr(-,root,root) %doc COPYING -%{_kde4_libdir}/libcantorlibs.so.* -%{_kde4_modulesdir}/cantor*so -%{_kde4_modulesdir}/libcantor*so +%{_kf5_libdir}/libcantorlibs.so.* %changelog ++++++ cantor-14.12.3.tar.xz -> cantor-15.04.0.tar.xz ++++++ ++++ 22041 lines of diff (skipped) ++++++ fix-build-with-latest-R.diff ++++++ diff -urB cantor-15.04.0/src/backends/R/rserver/rcallbacks.cpp new/src/backends/R/rserver/rcallbacks.cpp --- cantor-15.04.0/src/backends/R/rserver/rcallbacks.cpp 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rcallbacks.cpp 2015-04-27 15:53:51.583984954 +0200 @@ -26,6 +26,7 @@ #include <QStringList> #include <stdio.h> +#include <Rinterface.h> RServer* server; Expression* currentExpression; diff -urB cantor-15.04.0/src/backends/R/rserver/rcallbacks.h new/src/backends/R/rserver/rcallbacks.h --- cantor-15.04.0/src/backends/R/rserver/rcallbacks.h 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rcallbacks.h 2015-04-27 15:52:55.503987836 +0200 @@ -30,7 +30,6 @@ #include <Rversion.h> #include <Rdefines.h> #define R_INTERFACE_PTRS -#include <Rinterface.h> #include <R_ext/Parse.h> //This File implements the necessary callbacks for R diff -urB cantor-15.04.0/src/backends/R/rserver/rserver.cpp new/src/backends/R/rserver/rserver.cpp --- cantor-15.04.0/src/backends/R/rserver/rserver.cpp 2015-04-06 13:34:01.000000000 +0200 +++ new/src/backends/R/rserver/rserver.cpp 2015-04-27 15:55:16.895980571 +0200 @@ -42,7 +42,6 @@ #include <Rversion.h> #include <Rdefines.h> #define R_INTERFACE_PTRS -#include <Rinterface.h> #include <R_ext/Parse.h> // Not making a member to prevent pulling R headers into rserver.h

1 0

commit khangman for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package khangman for openSUSE:Factory checked in at 2015-04-27 22:08:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khangman (Old) and /work/SRC/openSUSE:Factory/.khangman.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "khangman" Changes: -------- --- /work/SRC/openSUSE:Factory/khangman/khangman.changes 2014-11-19 20:29:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.khangman.new/khangman.changes 2015-04-27 22:09:17.000000000 +0200 @@ -1,0 +2,72 @@ +Mon Apr 20 10:41:59 UTC 2015 - wbauer(a)tmo.at + +- Do not require libkhangmanengine5, this doesn't exist any more + +------------------------------------------------------------------- +Sat Apr 11 13:55:45 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.04.0 + * KDE Applications 15.04.0 + * https://www.kde.org/announcements/announce-applications-15.04.0.php + + +------------------------------------------------------------------- +Sat Mar 21 18:59:03 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.03.95 + * KDE Applications 15.04 RC + + +------------------------------------------------------------------- +Sun Mar 8 12:59:17 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 15.03.80 + * KDE Applications 15.04 Beta + + +------------------------------------------------------------------- +Tue Mar 3 10:50:29 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 14.12.3 + * KDE Applications 14.12.3 + * See https://www.kde.org/announcements/announce-applications-14.12.3.php + +------------------------------------------------------------------- +Sun Feb 1 11:26:24 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- +Mon Jan 12 20:16:40 UTC 2015 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 14.12.1 + * KDE Applications 14.12.1 + * See https://www.kde.org/announcements/announce-applications-14.12.1.php + +- Add also a conflict for the devel package. + +------------------------------------------------------------------- +Wed Dec 17 20:44:08 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 17 20:18:27 UTC 2014 - tittiatcoke(a)gmail.com + +- Update to KDE Applications 14.12.0 + * KDE Applications 14.12.0 + * See https://www.kde.org/announcements/announce-applications-14.12.0.php + +------------------------------------------------------------------- +Wed Dec 3 07:55:28 UTC 2014 - tittiatcoke(a)gmail.com + +Update to KDE Applications 14.11.97 + * KDE Applications 14.12 Release Candidate + * See http://www.kde.org/announcements/announce-applications-14.12-rc.php + * KHangman is now KDE Frameworks based + +------------------------------------------------------------------- Old: ---- khangman-4.14.3.tar.xz New: ---- khangman-15.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khangman.spec ++++++ --- /var/tmp/diff_new_pack.JG7qON/_old 2015-04-27 22:09:18.000000000 +0200 +++ /var/tmp/diff_new_pack.JG7qON/_new 2015-04-27 22:09:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package khangman # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,85 +17,70 @@ Name: khangman -Version: 4.14.3 +Version: 15.04.0 Release: 0 Summary: Hangman Game License: GPL-2.0+ Group: Amusements/Teaching/Language Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz -BuildRequires: libkde4-devel -BuildRequires: libkdeedu4-devel -BuildRequires: xz -Requires: libkhangmanengine4 >= %version -Provides: kde4-khangman = 4.3.0 -Obsoletes: kde4-khangman < 4.3.0 +BuildRequires: kcompletion-devel +BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel +BuildRequires: kcoreaddons-devel +BuildRequires: kcrash-devel +BuildRequires: kdoctools-devel +BuildRequires: kf5-filesystem +BuildRequires: ki18n-devel +BuildRequires: knewstuff-devel +BuildRequires: knotifications-devel +BuildRequires: kxmlgui-devel +BuildRequires: libkeduvocdocument-devel +BuildRequires: phonon4qt5-devel +BuildRequires: kdeclarative-devel +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Qml) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(Qt5QuickWidgets) +BuildRequires: pkgconfig(Qt5Svg) +Conflicts: khangman +Requires: kdeedu-data +Obsoletes: %{name}5 < %{version} +Provides: %{name}5 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%kde4_runtime_requires +Obsoletes: khangman5 < %{version} +Obsoletes: khangman-devel < %{version} +Obsoletes: libkhangmanengine5 < %{version} %description Classical hangman game for KDE. -%package devel -Summary: Khangman engine library - Development Files -Group: Development/Libraries/KDE -Requires: libkde4-devel -Requires: libkhangmanengine4 = %version - -%description devel -This package contains development files for the KHangman engine library. - -%package -n libkhangmanengine4 -Summary: Khangman Engine library -Group: Productivity/Graphics/Other - -%description -n libkhangmanengine4 -This package contains a library for the Khangman game. - %prep -%setup -q +%setup -q -n %{name}-%{version} %build -%ifarch ppc ppc64 -export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" -%endif - %cmake_kde4 -d build + %cmake_kf5 -d build %make_jobs %install - %kde4_makeinstall -C build - %kde_post_install - -%post -n libkhangmanengine4 -p /sbin/ldconfig - -%postun -n libkhangmanengine4 -p /sbin/ldconfig + %kf5_makeinstall -C build %files %defattr(-,root,root) %doc COPYING* AUTHORS ChangeLog README -%dir %{_kde4_datadir}/appdata -%dir %{_kde4_iconsdir}/hicolor/80x80 -%dir %{_kde4_iconsdir}/hicolor/80x80/apps -%doc %{_kde4_htmldir}/en/khangman/ -%doc %{_kde4_mandir}/man6/khangman.6.gz -%{_kde4_applicationsdir}/khangman.desktop -%{_kde4_appsdir}/khangman/ -%{_kde4_bindir}/khangman -%{_kde4_configdir}/khangman.knsrc -%{_kde4_configkcfgdir}/khangman.kcfg -%{_kde4_datadir}/appdata/khangman.appdata.xml -%{_kde4_iconsdir}/hicolor/*/apps/khangman-harmattan.* -%{_kde4_iconsdir}/hicolor/*/apps/khangman.* - -%files devel -%defattr(-,root,root) -# FIXME check with upstream why they deviate from KDE4Defaults -%{_includedir}/khangman/ -%{_kde4_libdir}/libkhangmanengine.so - -%files -n libkhangmanengine4 -%defattr(-,root,root) -%doc COPYING -%{_kde4_libdir}/libkhangmanengine.so.* +%dir %{_kf5_iconsdir}/hicolor/80x80 +%dir %{_kf5_iconsdir}/hicolor/80x80/apps +%doc %{_kf5_htmldir}/en/khangman/ +%doc %{_kf5_mandir}/man6/khangman.6.gz +%{_kf5_applicationsdir}/org.kde.khangman.desktop +%{_kf5_sharedir}/khangman/ +%{_kf5_bindir}/khangman +%config %{_kf5_configdir}/khangman.knsrc +%dir %{_kf5_configkcfgdir} +%{_kf5_configkcfgdir}/khangman.kcfg +%{_kf5_sharedir}/appdata/ +%{_kf5_iconsdir}/hicolor/*/apps/khangman-harmattan.* +%{_kf5_iconsdir}/hicolor/*/apps/khangman.* %changelog ++++++ khangman-4.14.3.tar.xz -> khangman-15.04.0.tar.xz ++++++ ++++ 11004 lines of diff (skipped)

1 0

commit calamaris for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package calamaris for openSUSE:Factory checked in at 2015-04-27 22:08:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calamaris (Old) and /work/SRC/openSUSE:Factory/.calamaris.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calamaris" Changes: -------- --- /work/SRC/openSUSE:Factory/calamaris/calamaris.changes 2011-09-23 01:53:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calamaris.new/calamaris.changes 2015-04-27 22:09:16.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Apr 27 10:55:51 UTC 2015 - mpluskal(a)suse.com + +- Update download url +- Clenup spec file with spec-cleaner +- Build as noarch + +------------------------------------------------------------------- Old: ---- calamaris-2.59.tar.bz2 New: ---- calamaris-2.59.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calamaris.spec ++++++ --- /var/tmp/diff_new_pack.VoscQf/_old 2015-04-27 22:09:17.000000000 +0200 +++ /var/tmp/diff_new_pack.VoscQf/_new 2015-04-27 22:09:17.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package calamaris (Version 2.59) +# spec file for package calamaris # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,51 +15,37 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: calamaris -Provides: calamari -Obsoletes: calamari -License: GPL-2.0+ -Url: http://calamaris.cord.de -Group: Productivity/Networking/Web/Utilities -AutoReqProv: on Version: 2.59 -Release: 137 +Release: 0 Summary: A Report Generator -Source: http://calamaris.cord.de/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ +Group: Productivity/Networking/Web/Utilities +Url: http://calamaris.cord.de +Source: http://cord.de/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Calamaris parses log files from Squid V1.1.x, V1.2.x, V2.x, and NetCache in native log format and generates a report. It is written in Perl 5. - - -Authors: --------- - Cord Beermann <Calamaris(a)Cord.de> - %prep -%setup -n %{name}-%{version} +%setup -q %build %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/%{_mandir}/man1 -install -m 755 calamaris $RPM_BUILD_ROOT/usr/bin -install -m 644 calamaris.1 $RPM_BUILD_ROOT/%{_mandir}/man1 - -%clean -rm -rf "$RPM_BUILD_ROOT" +mkdir -p %{buildroot}%{_bindir} %{buildroot}/%{_mandir}/man1 +install -m 755 calamaris %{buildroot}%{_prefix}/bin +install -m 644 calamaris.1 %{buildroot}/%{_mandir}/man1 %files %defattr(-,root,root) %doc CHANGES COPYRIGHT EXAMPLES README -%doc %{_mandir}/man1/calamaris.1.gz -/usr/bin/calamaris +%{_mandir}/man1/calamaris.1.gz +%{_bindir}/calamaris %changelog

1 0

commit python-Beaker for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-Beaker for openSUSE:Factory checked in at 2015-04-27 22:08:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Beaker (Old) and /work/SRC/openSUSE:Factory/.python-Beaker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Beaker" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Beaker/python-Beaker.changes 2013-10-01 08:25:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-Beaker.new/python-Beaker.changes 2015-04-27 22:09:15.000000000 +0200 @@ -1,0 +2,26 @@ +Sat Apr 25 18:36:03 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 1.7.0: + * Beaker no longer supports python 2.4 and 2.5 + * Beaker now supports Python 2.6, 2.7, 3.2, 3.3, 3.4 without + 2to3 usage + * Fixed Encrypted Cookie Session on Python3 #57 + * New pbkdf2 mobule working on Python3 #21 + * Fixed Test suite on Python 3.3 #53, #51 +- additional changes from version 1.6.5: + * @cached decorator now keeps docstring of decorated method. + * Fix crash when Session ``accessed_time`` is not available, + this happened when session ``encrypt_key`` was changed. + * Fix cache regions not providing a default key length even + though this was required and examples in the doc didn't + provide it. + * Fix crash when cache expire wasn't an int, this happened when + caching options were loaded from a config file. +- remove everything related to tests: + upstream deleted them from archive +- drop Beaker-1.6.4-setup_test.patch: only used by the tests +- do not delete the shebang of pbkdf2.py: fixed upstream +- remove CHANGELOG and LICENSE from package: deleted from archive +- add README.rst to the package documentation + +------------------------------------------------------------------- Old: ---- Beaker-1.6.4-setup_test.patch Beaker-1.6.4.tar.gz New: ---- Beaker-1.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Beaker.spec ++++++ --- /var/tmp/diff_new_pack.yuKy04/_old 2015-04-27 22:09:16.000000000 +0200 +++ /var/tmp/diff_new_pack.yuKy04/_new 2015-04-27 22:09:16.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-Beaker # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,35 +16,19 @@ # -# memcached with both bindings can be a bit heavy at times, thus only enable -# with a build conditional (off by default): -%bcond_with tests - Name: python-Beaker -Version: 1.6.4 +Version: 1.7.0 Release: 0 Url: http://beaker.rtfd.org/ Summary: A Session and Caching library with WSGI Middleware License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/B/Beaker/Beaker-%{version}.tar.gz -Patch: Beaker-1.6.4-setup_test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-cryptopp >= 0.5.12 BuildRequires: fdupes BuildRequires: python-cryptopp >= 0.5.12 BuildRequires: python-setuptools -%if %{with tests} -# Testing requirements: -BuildRequires: memcached -BuildRequires: python-SQLAlchemy -BuildRequires: python-WebTest -BuildRequires: python-mock -BuildRequires: python-nose -# it tests against both memcached libs! -BuildRequires: python-pylibmc -BuildRequires: python-python-memcached -%endif Provides: python-beaker = %{version} Obsoletes: python-beaker < %{version} %if 0%{?suse_version} && 0%{?suse_version} <= 1110 @@ -88,8 +72,6 @@ %prep %setup -q -n Beaker-%{version} -%patch -p1 -sed -i "1d" beaker/crypto/pbkdf2.py # Fix non-executable script %build python setup.py build @@ -98,17 +80,9 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot} %fdupes %buildroot/%_prefix -%if %{with tests} -%check -/usr/sbin/memcached& -# test_container.test_dbm_container_{2,3} fail more often than not on BS, -# but succeed on a local build -python setup.py test || true -%endif - %files %defattr(-,root,root,-) -%doc CHANGELOG LICENSE +%doc README.rst %{python_sitelib}/beaker/ %{python_sitelib}/Beaker-%{version}-py%{py_ver}.egg-info ++++++ Beaker-1.6.4.tar.gz -> Beaker-1.7.0.tar.gz ++++++ ++++ 3912 lines of diff (skipped)

1 0

commit gnome-weather for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package gnome-weather for openSUSE:Factory checked in at 2015-04-27 22:08:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-weather (Old) and /work/SRC/openSUSE:Factory/.gnome-weather.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-weather" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-weather/gnome-weather.changes 2015-04-23 07:59:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-weather.new/gnome-weather.changes 2015-04-27 22:09:13.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 27 09:25:09 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 3.16.2: + + Honor 12/24 time format in city view (bgo#741533). + +------------------------------------------------------------------- Old: ---- gnome-weather-3.16.1.tar.xz New: ---- gnome-weather-3.16.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-weather.spec ++++++ --- /var/tmp/diff_new_pack.lpI8GZ/_old 2015-04-27 22:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.lpI8GZ/_new 2015-04-27 22:09:14.000000000 +0200 @@ -18,7 +18,7 @@ Name: gnome-weather %define _name org.gnome.Weather -Version: 3.16.1 +Version: 3.16.2 Release: 0 Summary: Weather App for GNOME License: GPL-2.0+ ++++++ gnome-weather-3.16.1.tar.xz -> gnome-weather-3.16.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/gnome-weather/gnome-weather-3.16.1.tar.xz /work/SRC/openSUSE:Factory/.gnome-weather.new/gnome-weather-3.16.2.tar.xz differ: char 26, line 1

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2015-04-27 22:08:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2015-03-25 21:33:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2015-04-27 22:09:12.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 26 19:38:50 UTC 2015 - astieger(a)suse.com + +- GNU parallel 20150422: + * Security fix: A local attacker could make a user overwrite one + of his own files with a single byte when using --compress, + --tmux, --pipe, --cat or --fifo when guessing random file names + within a time window of 15 ms. [boo#928664] + * --shuf will generate all jobs, and shuffle them before running + them. This is useful to get a quick preview of the results before + running the full batch. + * Bug fixes and man page updates. + +------------------------------------------------------------------- Old: ---- parallel-20150322.tar.bz2 parallel-20150322.tar.bz2.sig New: ---- parallel-20150422.tar.bz2 parallel-20150422.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.Mdfjsw/_old 2015-04-27 22:09:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Mdfjsw/_new 2015-04-27 22:09:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20150322 +Version: 20150422 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0+ ++++++ parallel-20150322.tar.bz2 -> parallel-20150422.tar.bz2 ++++++ ++++ 6632 lines of diff (skipped) ++++++ parallel-20150322.tar.bz2.sig -> parallel-20150422.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20150322.tar.bz2.sig 2015-03-25 21:33:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20150422.tar.bz2.sig 2015-04-27 22:09:12.000000000 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20150322.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20150422.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQTwBAABCgAGBQJVDhiXAAoJENGrRRaIiIiImo0mn1BT8qCAB2eBGZzxsECQuaih -FA3jeebRLraZiG6/VK6XtUYQnOrOADyGIkuy68eYdNiK4g5MH7iCbPblJfXaQIlW -7jTNi2ZIDO4SookQbEts+BiI6Ykjk/owIyRh49OTRLD7uUoIsFNC143B64NHj/zJ -N99gGoa9u24G3ynBbRNjXtJqUmJ1XAbcCasUrwvD85iEIomcjSUJrt5V1EJzARkx -XOXagv3+cdN6b3sDFjkKW1X/gCN9ThuxMq+TJuxTD7OzjLt7wrXUhSlQiNSJFFr2 -8a7X1bfbTuoyZzf2Li0jOTnxGmRZp/JuMqY9LxosB2XGxO+X691aff+4fIIUMCx+ -AhM2bo0y6y/AN8vHfPsLM0+MeBxBj5Ks25Wjn+YvYYmk3CcO9o0E42w3Cm8f1ONa -15wzGZk+g+XJ8geN3EAg4FUNCAvvNMVRh/LyrwapXcztv5Ii9jSLRInjEmLfl6oX -GOaduTFXolgwTWRocjUrobADNoiXtMh+iTOLZMRe0215cR4Vo9x+/oSqkXDFRdbe -Q7vxCMf/Ust4Ss9GuOY5fPF3MdwyFrVgSYaSV2ghr16FG2or5le7hGDpC1g3HnNG -3gw3wasOAl3fy4CobaroPAK13+BR4ieBOnLb/nX9FxRI7mrZL3cLBzKkLzXQbz3E -yBbXaEmH2vVfhrH0ECC1a0/IL6pCoBkdGyB1KngEg+/Oo7gyyOzbdKlrpgBnaFGm -uaOx+KLXUpH2ttz/MqkkQMLN1dIOyOT9p2yGrEf+yn0dHs166mTt0rueHWLFPoA5 -0s70u8SEHz2v/KRcjX+Ezhd7zkRDSi2OChBVWz2r1hgol61e8EiOYw16Br8+STTf -nLkHAMlDrYaBwX2OTW4C46pKVwcHFdj9g/IMZ1sMYA07qOJUxEeT4C34cCPGzgHa -aoOZxj+VC0baOzmqX1T0J1q8OqCNob66OHDVhVfL8QW/6en8yGmnzvENQTzxKCmN -xwv72OgJUMjXHtmhCn699SZ0Dn9k59nLmHfs89dYBolrSteke4VWO/DqaiJT444U -rW5JQlXqQBcXCdb0ldpYhJ5TEzDMKKQtS47XFP8oQqPEogAIeSaxPAEp94XM2pyT -pNlEmOqGtyl4EbxoJVX67YTQDhKUhvuSyvLJN3WhM73OKLEEf3BUkp3m4pR955Z+ -xpws8srPSe1/GoSLlEMBo/Ffar3aM05mo5pSXXqcpvO4AWZ+Oc28fiqtIQv0XImi -Mp8PmAan1uuC2HGXCD0uEWU/sjjRMOdS3/HEyrY5V9rXdnVtcV6SRvU9g5w/PecY -hWOrcUSGvEL+blyRRX45WE2tz2uuHF2JelfMJiZXfCcaI4EDfx++jgSrH6DUR7Fa -P+0rzEGDLyvccqJqMnR/iRx4Vyn/m/Xc4mK21VDOofUWIr8unY8IWs0PcaRUCb1z -z0OngaPbqG4J7OBsg+0xBbjjS8UC/CwXtBFRLFoDdzNS4Oa9f4ioeKEB6rVfRXAq -hoPoIqjuDKDYLuEp26gbbbjcCiZDHUScP0B7yDprrGjiVdB4oPCr1zR+z/2j1M3w -R8vr3dcJabpeeRxgfG2TCGrKLtk+Tube31mqyhHFFxZNc2b1iISQBYGcHYKGV7mr -GmTirrxAnPwnkuP2wor+r4xqOA== -=X53f +iQTwBAABCgAGBQJVOCnuAAoJENGrRRaIiIiIXZkmmQHHtzQPMWzetWZgOW1O6xdA +bqi8+9hOQxLaOoZIX+K1hLLYsiTQ3fjOGOmLPqy5ISGbI9cCqKO54OR+OMOvplit +6YYmGgs1A8NBZThoXjga87tMu4mfbMqiacQVcXTVUzTT3PG5JWNgJ7dmhgbOeLb0 +B2esDduIm8TUNmTEb+AcAF6sg3B3nSPLqYgpAILUWxscbHEoffuKEzCXP6NhOMMw +gtEz2EEDoIR49/4MgWBs6ocCKNgY+1q5/4X8UgxsoEKBW7gkvXzZnFF934syYW/w +n5yWXpelJix8GxNjASK7U461WpZ9s7RR9vuemekJYYBHWCsM6HquRL0NTKBBvjht +uAINwBp2KAY4YyRf3FI7h4cR7EkAOiqi1WPVL7KlA9uwa03TcL6yAF5CsKMUsLQ4 +i5Mv8ifhdBWs4LoUsBmgtrNih7BSOQhlOrkOz7d7GTYWRDB6gTrarj26K9LXXpcy +j/DzhHf8ENnfTiKTgGMqanplJlsztMPZ4OCUde3D7bDlWhUZYvWxPt0xQ8/Rk16k +V80FulTJjm4AHRkb+Vmw+tHOsT8sJ3Fq+ROhFhJJ/c0O8VMob5HKWQd6NveLAfbd +AK0Tnj3bjiJ7RPyvDLqV+OTkmW3aB+MdJILyYD0VjXlftxZkhM7jjw/2D5YUa/bZ +Q9mEjkgf/AF9O/GbZ822DWPOLME5PftQ4NXQNuGXfbvTJ3VpZI3t55NyWx4GBFLh +y+XWSMgo2suZzp5ML1NlBhs+uoTopXrtMGXIBOJB9OYY23jMsNzg23v7hWzROoWh +qBfxsyr5m5DZugoplzhgEBObSt6PuebfnIe/74n41yoXvBFwSFfjc2btyfEtLmik +oq8RynaEcvuli32iGsZBoCqyYJ/d9lo31SYENBx3m6LzW64DcQnjlDQBQi7+5Zni +spMJ4TrCGOpHDeq1bqbuyKsGIzODFV0GF2hsbXUzIEuABN2mtGhF3Vss2S73q8l4 +O1BA6IkyAe7jCA7Iv3BzWnWqmfGD1Zi18qeEmUYm+2kg/2Tg2vmO3OjMTzGyoqTi +/Uk0tSkPrqpKGaf5oU0nbpDIdNQbB4iMEJCF4gGcgRe76Q5iNT2x+Z288aJk3ULq +rQ72h1KLVM0mRYwVhJq8PP2dV/r7ePZW3PYa2xPZH/WL2nG1N9ZegzwDhtgznVnU +KSZihoMAD9OxqCd6pwyTQfcf9O+gnDLJS3KogzNEJIVa6zQMwXdHJU0tu+8lwbPR +I2ir/NcVoibfBINPP9ttPZ6s6Rzk4LlYHaihwqoNyh7LcJFTbwiGq0uYkypr41WG +hTcRAnwinXcMfB4O33ogvySNxs5WtlQYMu06TlvMwRMVRspP9dD9rKrIx+O/7RDY +GezQDyorEH2dHwjCh2mEMm8deThlAF6xVOk7AbI0aLccHuNfWyuLkA2ltkRZz8oi +3pN0syzX5X6lAujz/1y967peI8Fvexg9wxiYfxuAlLhiAuO3qDCcrFV7jAQ2eH+l +huvIELGbffLBC9rFEwobyQe9+go3XAuJBDtQpcMPn2QXDHNYDrmxUgtPNyfAgsNG +BZlpMfSKuMeJysOg4+2s6X8CbD3tiNm2nAFD2lbTN7k/npBiTtsHmkTCuK/G4kjR ++0StKFRKIo4qOoG5sMXLYwfH0A== +=7QLH -----END PGP SIGNATURE-----

1 0

commit perl-WWW-Pastebin-PastebinCom-Create for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package perl-WWW-Pastebin-PastebinCom-Create for openSUSE:Factory checked in at 2015-04-27 22:08:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-WWW-Pastebin-PastebinCom-Create (Old) and /work/SRC/openSUSE:Factory/.perl-WWW-Pastebin-PastebinCom-Create.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-WWW-Pastebin-PastebinCom-Create" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-WWW-Pastebin-PastebinCom-Create/perl-WWW-Pastebin-PastebinCom-Create.changes 2013-06-17 10:16:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-WWW-Pastebin-PastebinCom-Create.new/perl-WWW-Pastebin-PastebinCom-Create.changes 2015-04-27 22:09:11.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Apr 27 05:17:56 UTC 2015 - coolo(a)suse.com + +- disable tesing + +------------------------------------------------------------------- +Sun Feb 9 13:34:25 UTC 2014 - coolo(a)suse.com + +- updated to 1.003 + - Fixed a bug where the module died when a network error occured + - Fixed the module and the tests to handle properly the case + when we reach the daily 10-pastes limit. + - Resurrected the module for use with App::Nopaste + +------------------------------------------------------------------- Old: ---- WWW-Pastebin-PastebinCom-Create-0.004.tar.gz New: ---- WWW-Pastebin-PastebinCom-Create-1.003.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-WWW-Pastebin-PastebinCom-Create.spec ++++++ --- /var/tmp/diff_new_pack.Vggegq/_old 2015-04-27 22:09:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Vggegq/_new 2015-04-27 22:09:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-WWW-Pastebin-PastebinCom-Create # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,30 +17,30 @@ Name: perl-WWW-Pastebin-PastebinCom-Create -Version: 0.004 +Version: 1.003 Release: 0 %define cpan_name WWW-Pastebin-PastebinCom-Create -Summary: paste to L<http://pastebin.com> from Perl. -License: Artistic-1.0 or GPL-1.0+ +Summary: Paste On Www.Pastebin.Com Without Api Keys +License: Artistic-2.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/WWW-Pastebin-PastebinCom-Create/ -Source: http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/Z/ZO/ZOFFIX/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(LWP::UserAgent) >= 2.036 -BuildRequires: perl(Module::Build) >= 0.36 -BuildRequires: perl(URI) >= 1.35 -#BuildRequires: perl(Test::Kwalitee) -#BuildRequires: perl(WWW::Pastebin::PastebinCom::Create) -Requires: perl(LWP::UserAgent) >= 2.036 -Requires: perl(URI) >= 1.35 +BuildRequires: perl(Module::Build) +BuildRequires: perl(Moo) >= 1.004001 +BuildRequires: perl(WWW::Mechanize) >= 1.73 +Requires: perl(Moo) >= 1.004001 +Requires: perl(WWW::Mechanize) >= 1.73 %{perl_requires} %description -The module provides means of pasting large texts into the -http://pastebin.com manpage pastebin site. +This module provides the means to paste on the www.pastebin.com manpage +pastebin, without the need for http://pastebin.com/api. See the WARNING!!! +section above. %prep %setup -q -n %{cpan_name}-%{version} @@ -50,7 +50,8 @@ ./Build build flags=%{?_smp_mflags} %check -./Build test +# MANUAL no testing (accesses pastebin) +#./Build test %install ./Build install destdir=%{buildroot} create_packlist=0 @@ -58,6 +59,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes examples README +%doc Changes examples LICENSE README %changelog ++++++ WWW-Pastebin-PastebinCom-Create-0.004.tar.gz -> WWW-Pastebin-PastebinCom-Create-1.003.tar.gz ++++++ ++++ 2091 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 no_testing: accesses pastebin #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit python-botocore for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-botocore for openSUSE:Factory checked in at 2015-04-27 22:08:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-botocore (Old) and /work/SRC/openSUSE:Factory/.python-botocore.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-botocore" Changes: -------- --- /work/SRC/openSUSE:Factory/python-botocore/python-botocore.changes 2015-03-30 19:32:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-botocore.new/python-botocore.changes 2015-04-27 22:09:09.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Apr 26 16:49:41 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 0.105.0: no upstream changelog +- point source URL to pypi +- increase minimum required version of python-jmespath to 0.6.2 +- remove python as BuildRequires, unneeded +- add fdupes as BuildRequires and call it after install + +------------------------------------------------------------------- Old: ---- botocore-0.97.0.tar.gz New: ---- botocore-0.105.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-botocore.spec ++++++ --- /var/tmp/diff_new_pack.v9t1L4/_old 2015-04-27 22:09:09.000000000 +0200 +++ /var/tmp/diff_new_pack.v9t1L4/_new 2015-04-27 22:09:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-botocore # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,22 +19,22 @@ %define baseName botocore Name: python-botocore -Version: 0.97.0 +Version: 0.105.0 Release: 0 Summary: Python interface for AWS License: Apache-2.0 Group: Development/Languages/Python Url: https://github.com/boto/botocore -Source0: %{baseName}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/b/%{baseName}/%{baseName}-%{version… Patch0: hide_py_pckgmgmt.patch Requires: python Requires: python-dateutil >= 2.1 -Requires: python-jmespath >= 0.6.1 +Requires: python-jmespath >= 0.6.2 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-ordereddict >= 1.1 Requires: python-simplejson >= 3.3.0 %endif -BuildRequires: python +BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +58,7 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} --install-scripts=%{_bindir} +%fdupes %buildroot/%_prefix %files %defattr(-,root,root,-) ++++++ botocore-0.97.0.tar.gz -> botocore-0.105.0.tar.gz ++++++ ++++ 32287 lines of diff (skipped) ++++++ hide_py_pckgmgmt.patch ++++++ --- /var/tmp/diff_new_pack.v9t1L4/_old 2015-04-27 22:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.v9t1L4/_new 2015-04-27 22:09:10.000000000 +0200 @@ -4,10 +4,12 @@ from setuptools import setup, find_packages --requires = ['jmespath==0.6.1', +-requires = ['jmespath==0.6.2', - 'python-dateutil>=2.1,<3.0.0'] -- -- ++#requires = ['jmespath==0.6.2', ++# 'python-dateutil>=2.1,<3.0.0'] + + -if sys.version_info[:2] == (2, 6): - # For python2.6 we have a few other dependencies. - # First we need an ordered dictionary so we use the @@ -19,10 +21,6 @@ - # JSON objects. The 2.7 json module has this. For 2.6 - # we need simplejson. - requires.append('simplejson==3.3.0') -+#requires = ['jmespath==0.6.1', -+# 'python-dateutil>=2.1,<3.0.0'] -+ -+ +#if sys.version_info[:2] == (2, 6): +# # For python2.6 we have a few other dependencies. +# # First we need an ordered dictionary so we use the @@ -37,7 +35,7 @@ setup( -@@ -42,7 +42,7 @@ setup( +@@ -41,7 +41,7 @@ setup( 'botocore.vendored.requests': ['*.pem']}, package_dir={'botocore': 'botocore'}, include_package_data=True,

1 0

commit python3-blosc for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python3-blosc for openSUSE:Factory checked in at 2015-04-27 22:08:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-blosc (Old) and /work/SRC/openSUSE:Factory/.python3-blosc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-blosc" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-blosc/python3-blosc.changes 2015-04-25 11:25:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-blosc.new/python3-blosc.changes 2015-04-27 22:09:10.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 26 22:03:50 UTC 2015 - arun(a)gmx.de + +- specfile: + * added tests + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-blosc.spec ++++++ --- /var/tmp/diff_new_pack.moFlEv/_old 2015-04-27 22:09:10.000000000 +0200 +++ /var/tmp/diff_new_pack.moFlEv/_new 2015-04-27 22:09:10.000000000 +0200 @@ -27,6 +27,7 @@ BuildRequires: blosc-devel BuildRequires: gcc-c++ BuildRequires: python3-devel +BuildRequires: python3-numpy Requires: blosc-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -40,6 +41,9 @@ %build CFLAGS="%{optflags}" python3 setup.py build_ext --inplace --blosc=%{_prefix} +%check +PYTHONPATH="." python3 blosc/test.py + %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}

1 0

commit perl-Mojolicious-Plugin-CHI for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package perl-Mojolicious-Plugin-CHI for openSUSE:Factory checked in at 2015-04-27 22:08:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-CHI (Old) and /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-CHI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Mojolicious-Plugin-CHI" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Mojolicious-Plugin-CHI/perl-Mojolicious-Plugin-CHI.changes 2014-04-25 16:11:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Mojolicious-Plugin-CHI.new/perl-Mojolicious-Plugin-CHI.changes 2015-04-27 22:09:07.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Apr 25 07:24:15 UTC 2015 - coolo(a)suse.com + +- updated to 0.11 + see /usr/share/doc/packages/perl-Mojolicious-Plugin-CHI/Changes + + 0.11 2015-01-16 + - Improve error handling in commands. + + 0.10 2015-01-16 + - Improve documentation regarding precedence of configuration. + - Improve config check. + - Improve license information in M::P::CHI::chi. + - Update year. + +------------------------------------------------------------------- Old: ---- Mojolicious-Plugin-CHI-0.09.tar.gz New: ---- Mojolicious-Plugin-CHI-0.11.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Mojolicious-Plugin-CHI.spec ++++++ --- /var/tmp/diff_new_pack.GfgXXe/_old 2015-04-27 22:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.GfgXXe/_new 2015-04-27 22:09:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Mojolicious-Plugin-CHI # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,31 +17,33 @@ Name: perl-Mojolicious-Plugin-CHI -Version: 0.09 +Version: 0.11 Release: 0 %define cpan_name Mojolicious-Plugin-CHI -Summary: Use CHI caches in Mojolicious +Summary: Use CHI Caches in Mojolicious License: Artistic-2.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Mojolicious-Plugin-CHI/ -Source: http://www.cpan.org/authors/id/A/AK/AKRON/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/A/AK/AKRON/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(CHI) BuildRequires: perl(Mojolicious) >= 4.77 -BuildRequires: perl(Test::More) -BuildRequires: perl(Test::Output) >= 1.0 +BuildRequires: perl(Test::Output) >= 1 Requires: perl(CHI) Requires: perl(Mojolicious) >= 4.77 %{perl_requires} %description -Mojolicious::Plugin::CHI is a simple plugin to work with CHI caches within Mojolicious. +the Mojolicious::Plugin::CHI manpage is a simple plugin to work with the +CHI manpage caches within Mojolicious. %prep %setup -q -n %{cpan_name}-%{version} +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor ++++++ Mojolicious-Plugin-CHI-0.09.tar.gz -> Mojolicious-Plugin-CHI-0.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/Changes new/Mojolicious-Plugin-CHI-0.11/Changes --- old/Mojolicious-Plugin-CHI-0.09/Changes 2014-04-20 20:27:56.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/Changes 2015-01-16 03:34:16.000000000 +0100 @@ -1,3 +1,12 @@ +0.11 2015-01-16 + - Improve error handling in commands. + +0.10 2015-01-16 + - Improve documentation regarding precedence of configuration. + - Improve config check. + - Improve license information in M::P::CHI::chi. + - Update year. + 0.09 2014-04-20 - Bugfix test suite. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/META.json new/Mojolicious-Plugin-CHI-0.11/META.json --- old/Mojolicious-Plugin-CHI-0.09/META.json 2014-04-20 20:31:41.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/META.json 2015-01-16 04:08:36.000000000 +0100 @@ -4,7 +4,7 @@ "Nils Diewald" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.82, CPAN::Meta::Converter version 2.120351", + "generated_by" : "ExtUtils::MakeMaker version 6.82, CPAN::Meta::Converter version 2.141170", "license" : [ "artistic_2" ], @@ -48,5 +48,5 @@ "url" : "https://github.com/Akron/Mojolicious-Plugin-CHI" } }, - "version" : "0.09" + "version" : "0.11" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/META.yml new/Mojolicious-Plugin-CHI-0.11/META.yml --- old/Mojolicious-Plugin-CHI-0.09/META.yml 2014-04-20 20:31:41.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/META.yml 2015-01-16 04:08:36.000000000 +0100 @@ -8,7 +8,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.82, CPAN::Meta::Converter version 2.120351' +generated_by: 'ExtUtils::MakeMaker version 6.82, CPAN::Meta::Converter version 2.141170' license: artistic_2 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -25,4 +25,4 @@ resources: license: http://www.opensource.org/licenses/artistic-license-2.0 repository: https://github.com/Akron/Mojolicious-Plugin-CHI -version: '0.09' +version: '0.11' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/lib/Mojolicious/Plugin/CHI/chi.pm new/Mojolicious-Plugin-CHI-0.11/lib/Mojolicious/Plugin/CHI/chi.pm --- old/Mojolicious-Plugin-CHI-0.09/lib/Mojolicious/Plugin/CHI/chi.pm 2014-04-17 17:39:45.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/lib/Mojolicious/Plugin/CHI/chi.pm 2015-01-16 04:05:20.000000000 +0100 @@ -1,12 +1,16 @@ package Mojolicious::Plugin::CHI::chi; use Mojo::Base 'Mojolicious::Command'; -use Mojo::Util 'tablify'; +use Mojo::Util qw/tablify quote/; use Getopt::Long qw/GetOptions :config no_auto_abbrev no_ignore_case/; has description => 'Interact with CHI caches.'; has usage => sub { shift->extract_usage }; +sub _unknown { + return 'Unknown cache handle ' . quote($_[0]) . ".\n\n" +}; + # Run chi sub run { my $self = shift; @@ -36,6 +40,9 @@ my $chi = $app->chi($cache); + # Cache is unknown + print _unknown($cache) and return unless $chi; + # Do not modify non-persistant in-process caches! if ($chi->short_driver_name =~ /^(?:Raw)?Memory$/) { $log->warn("You are trying to $command a ". @@ -61,6 +68,9 @@ my $chi = $app->chi($cache); + # Cache is unknown + print _unknown($cache) and return unless $chi;; + # Do not modify non-persistant in-process caches! if ($chi->short_driver_name =~ /^(?:Raw)?Memory$/) { $log->warn("You are trying to $command " . @@ -194,10 +204,10 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2013-2014, L<Nils Diewald||http://nils-diewald.de>. +Copyright (C) 2013-2015, L<Nils Diewald||http://nils-diewald.de>. This program is free software, you can redistribute it -and/or modify it under the same terms as Perl. +and/or modify it under the terms of the Artistic License version 2.0. The documentation is based on L<Mojolicious::Command::eval>, written by Sebastian Riedel. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/lib/Mojolicious/Plugin/CHI.pm new/Mojolicious-Plugin-CHI-0.11/lib/Mojolicious/Plugin/CHI.pm --- old/Mojolicious-Plugin-CHI-0.09/lib/Mojolicious/Plugin/CHI.pm 2014-04-20 20:23:47.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/lib/Mojolicious/Plugin/CHI.pm 2015-01-16 03:33:02.000000000 +0100 @@ -3,7 +3,7 @@ use Scalar::Util 'weaken'; use CHI; -our $VERSION = '0.09'; +our $VERSION = '0.11'; # Register Plugin sub register { @@ -11,7 +11,7 @@ # Load parameter from config file if (my $config_param = $mojo->config('CHI')) { - $param = { %$config_param, %$param }; + $param = { %$param, %$config_param }; }; # Hash of cache handles @@ -47,6 +47,8 @@ foreach my $name (keys %$param) { my $cache_param = $param->{$name}; + next unless ref $cache_param && ref $cache_param eq 'HASH'; + # Already exists if (exists $caches->{$name}) { $mojo->log->warn(qq{Multiple attempts to establish cache "$name"}); @@ -191,8 +193,9 @@ overridden using L<on_get_error|CHI/CONSTRUCTOR> and L<on_set_error|CHI/CONSTRUCTOR>. -All parameters can be set either on registration or -as part of the configuration file with the key C<CHI>. +All parameters can be set as part of the configuration +file with the key C<CHI> or on registration +(that can be overwritten by configuration). =head1 HELPERS @@ -280,7 +283,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright (C) 2012-2014, L<Nils Diewald|http://nils-diewald.de/>. +Copyright (C) 2012-2015, L<Nils Diewald|http://nils-diewald.de/>. This program is free software, you can redistribute it and/or modify it under the terms of the Artistic License version 2.0. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Mojolicious-Plugin-CHI-0.09/t/CHI-Command.t new/Mojolicious-Plugin-CHI-0.11/t/CHI-Command.t --- old/Mojolicious-Plugin-CHI-0.09/t/CHI-Command.t 2014-04-18 15:03:26.000000000 +0200 +++ new/Mojolicious-Plugin-CHI-0.11/t/CHI-Command.t 2015-01-16 04:07:25.000000000 +0100 @@ -92,6 +92,12 @@ ok($flat_file->get_object('key_2')->is_expired, 'Key is expired'); stdout_is( + sub { $chi->run('purge', 'Unknown') }, + "Unknown cache handle \"Unknown\".\n\n", + 'Purge cache' +); + +stdout_is( sub { $chi->run('purge', 'MyFlatFile') }, "Cache \"MyFlatFile\" was purged.\n\n", 'Purge cache' @@ -101,6 +107,12 @@ is($flat_file->get('key_1'), 'value_1', 'Get key'); stdout_is( + sub { $chi->run('clear', 'Unknown') }, + "Unknown cache handle \"Unknown\".\n\n", + 'Clear cache' +); + +stdout_is( sub { $chi->run('clear', 'MyFlatFile') }, "Cache \"MyFlatFile\" was cleared.\n\n", 'Clear cache' @@ -114,6 +126,12 @@ is($flat_file->get('key_4'), 'value_4', 'Get key'); stdout_is( + sub { $chi->run('remove', 'Unknown', 'key') }, + "Unknown cache handle \"Unknown\".\n\n", + 'Remove key' +); + +stdout_is( sub { $chi->run('remove', 'MyFlatFile', 'key_3') }, "Key \"key_3\" from cache \"MyFlatFile\" was removed.\n\n", 'Remove key' @@ -123,6 +141,12 @@ is($flat_file->get('key_4'), 'value_4', 'Get key'); stdout_is( + sub { $chi->run('expire', 'Unknown', 'key') }, + "Unknown cache handle \"Unknown\".\n\n", + 'Expire key' +); + +stdout_is( sub { $chi->run('expire', 'MyFlatFile', 'key_4') }, "Key \"key_4\" from cache \"MyFlatFile\" was expired.\n\n", 'Expire key' ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit perl-Task-Kensho-Scalability for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package perl-Task-Kensho-Scalability for openSUSE:Factory checked in at 2015-04-27 22:08:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Task-Kensho-Scalability (Old) and /work/SRC/openSUSE:Factory/.perl-Task-Kensho-Scalability.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Task-Kensho-Scalability" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Task-Kensho-Scalability/perl-Task-Kensho-Scalability.changes 2014-03-21 12:15:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Task-Kensho-Scalability.new/perl-Task-Kensho-Scalability.changes 2015-04-27 22:09:06.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Apr 25 07:37:49 UTC 2015 - coolo(a)suse.com + +- updated to 0.38 + see /usr/share/doc/packages/perl-Task-Kensho-Scalability/Changes + + 0.38 2014-09-13 + - WebDev: Template::Toolkit is not indexed (see RT#92588) - + refer to Template instead + - subtask distributions now just use regular prereqs on their + component modules, rather than using optional_features metadata + - Task-Kensho now once again prompts at install time for each + subtask to be optionally installed + + 0.37 2014-08-16 + - ModuleDev: Switch Carp::Always over to Devel::Confess (per mst) + - ModuleDev: Add Data::Printer (per Sawyer X) + - ModuleDev: Add Devel::Dwarn (per mst) + - Toolchain: Add Pinto (per Sawyer X) + - Toolchain: Add App::FatPacker (per perigrin) + +------------------------------------------------------------------- Old: ---- Task-Kensho-Scalability-0.36.tar.gz New: ---- Task-Kensho-Scalability-0.38.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Task-Kensho-Scalability.spec ++++++ --- /var/tmp/diff_new_pack.6HKvc6/_old 2015-04-27 22:09:07.000000000 +0200 +++ /var/tmp/diff_new_pack.6HKvc6/_new 2015-04-27 22:09:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Task-Kensho-Scalability # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,24 @@ Name: perl-Task-Kensho-Scalability -Version: 0.36 +Version: 0.38 Release: 0 %define cpan_name Task-Kensho-Scalability -Summary: A Glimpse at an Enlightened Perl: Scalability +Summary: Glimpse at an Enlightened Perl: Scalability License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Task-Kensho-Scalability/ -Source: http://www.cpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(CHI) -BuildRequires: perl(Module::Build::Tiny) >= 0.035 +BuildRequires: perl(Module::Build::Tiny) >= 0.038 BuildRequires: perl(Redis) -BuildRequires: perl(version) -Recommends: perl(CHI) -Recommends: perl(Redis) +Requires: perl(CHI) +Requires: perl(Redis) %{perl_requires} %description @@ -86,6 +86,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README README.md +%doc Changes LICENSE README %changelog ++++++ Task-Kensho-Scalability-0.36.tar.gz -> Task-Kensho-Scalability-0.38.tar.gz ++++++ ++++ 2274 lines of diff (skipped) ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit perl-CHI for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package perl-CHI for openSUSE:Factory checked in at 2015-04-27 22:08:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-CHI (Old) and /work/SRC/openSUSE:Factory/.perl-CHI.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-CHI" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-CHI/perl-CHI.changes 2015-04-15 16:22:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-CHI.new/perl-CHI.changes 2015-04-27 22:09:05.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Apr 24 16:13:34 UTC 2015 - coolo(a)suse.com + +- fix requires to Time::Duration + +------------------------------------------------------------------- New: ---- cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-CHI.spec ++++++ --- /var/tmp/diff_new_pack.GUo5av/_old 2015-04-27 22:09:06.000000000 +0200 +++ /var/tmp/diff_new_pack.GUo5av/_new 2015-04-27 22:09:06.000000000 +0200 @@ -24,7 +24,8 @@ License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/CHI/ -Source: http://www.cpan.org/authors/id/J/JS/JSWARTZ/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/J/JS/JSWARTZ/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl @@ -48,7 +49,7 @@ BuildRequires: perl(Test::Deep) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Warn) -BuildRequires: perl(Time::Duration) >= 1.06 +BuildRequires: perl(Time::Duration) >= 1.060000 BuildRequires: perl(Time::Duration::Parse) >= 0.03 BuildRequires: perl(Try::Tiny) >= 0.05 Requires: perl(Carp::Assert) >= 0.20 @@ -65,7 +66,7 @@ Requires: perl(MooX::Types::MooseLike::Numeric) Requires: perl(String::RewritePrefix) Requires: perl(Task::Weaken) -Requires: perl(Time::Duration) >= 1.06 +Requires: perl(Time::Duration) >= 1.060000 Requires: perl(Time::Duration::Parse) >= 0.03 Requires: perl(Try::Tiny) >= 0.05 %{perl_requires} @@ -101,6 +102,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE perltidy.LOG README +%doc Changes LICENSE README %changelog ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: - #./Build build flags=%{?_smp_mflags} --myflag #ignore_requires: Bizarre::Module

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2015-04-27 22:07:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2015-04-02 16:01:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2015-04-27 22:08:56.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Apr 10 10:48:04 CEST 2015 - schubi(a)suse.de + +- New autoinst flag in general/mode section: + activate_systemd_default_target. + The default target of systemd will be activated in the second + stage of autoyast installation. + The default is "true" which is a backward compatible value. + (bnc#923992) +- 3.1.74 + +------------------------------------------------------------------- +Tue Apr 7 15:26:44 UTC 2015 - igonzalezsosa(a)suse.com + +- Avoid ayast_probe module crashing when called from an installed + system. + (bnc#926241) +- 3.1.73 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.72.tar.bz2 New: ---- autoyast2-3.1.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.MqxT48/_old 2015-04-27 22:08:57.000000000 +0200 +++ /var/tmp/diff_new_pack.MqxT48/_new 2015-04-27 22:08:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.72 +Version: 3.1.74 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.72.tar.bz2 -> autoyast2-3.1.74.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/CONTRIBUTING.md new/autoyast2-3.1.74/CONTRIBUTING.md --- old/autoyast2-3.1.72/CONTRIBUTING.md 2015-03-27 09:54:14.000000000 +0100 +++ new/autoyast2-3.1.74/CONTRIBUTING.md 2015-04-27 10:29:12.000000000 +0200 @@ -12,13 +12,13 @@ ----------- If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount… if you don't have an account yet.) If you find a problem, please report it either using -[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +[Bugzilla](https://bugzilla.suse.com/) or GitHub issues. We can't guarantee that every bug will be fixed, but we'll try. When creating a bug report, please follow our [bug reporting @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-message…. -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#refe… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/README.md new/autoyast2-3.1.74/README.md --- old/autoyast2-3.1.72/README.md 2015-03-27 09:54:14.000000000 +0100 +++ new/autoyast2-3.1.74/README.md 2015-04-27 10:29:12.000000000 +0200 @@ -1,5 +1,66 @@ -# YaST - The AutoYaST Framework # +YaST - The AutoYaST Framework +============================= [![Travis Build](https://travis-ci.org/yast/yast-autoinstallation.svg?branch=master)]… [![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-autoinsta… + +Development +=========== + +This module is developed as part of YaST. See the +[development documentation](http://yastgithubio.readthedocs.org/en/latest/development/). + + +Getting the Sources +=================== + +To get the source code, clone the GitHub repository: + + $ git clone https://github.com/yast/yast-autoinstallation.git + +If you want to contribute into the project you can +[fork](https://help.github.com/articles/fork-a-repo/) the repository and clone your fork. + + +Testing Environment +=================== + +There are several possibilities how test an updated code. It also depends on +the fact in which stage of installation it comes into effect. First stage runs +between the start from installation media to reboot (or kexec), then continues +second stage. + +### First Stage ### + +Either use *StartShell=1* option in [Linuxrc](https://en.opensuse.org/SDB:Linuxrc), +edit the installation system and run *yast* manually or use +a [DriverUpdate](https://en.opensuse.org/SDB:Linuxrc#p_dud) via Linuxrc. + +### Second Stage ### + +There are two possible ways how to rerun this stage, just keep in mind that +the system might be already configured and thus it might behave +a bit differently: + + ``` + cp /var/lib/YaST2/install.inf /etc/ + touch /var/lib/YaST2/runme_at_boot + cp /var/adm/autoinstall/cache/installedSystem.xml \ + /var/lib/autoinstall/autoconf/autoconf.xml + reboot + ``` + +or faster without rebooting but with possible side-effects: + + ``` + yast ayast_setup setup filename=/var/adm/autoinstall/cache/installedSystem.xml + ``` + + +Contact +======= + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/package/autoyast2.changes new/autoyast2-3.1.74/package/autoyast2.changes --- old/autoyast2-3.1.72/package/autoyast2.changes 2015-03-27 09:54:14.000000000 +0100 +++ new/autoyast2-3.1.74/package/autoyast2.changes 2015-04-27 10:29:12.000000000 +0200 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Fri Apr 10 10:48:04 CEST 2015 - schubi(a)suse.de + +- New autoinst flag in general/mode section: + activate_systemd_default_target. + The default target of systemd will be activated in the second + stage of autoyast installation. + The default is "true" which is a backward compatible value. + (bnc#923992) +- 3.1.74 + +------------------------------------------------------------------- +Tue Apr 7 15:26:44 UTC 2015 - igonzalezsosa(a)suse.com + +- Avoid ayast_probe module crashing when called from an installed + system. + (bnc#926241) +- 3.1.73 + +------------------------------------------------------------------- Thu Mar 26 17:00:32 CET 2015 - schubi(a)suse.de - New autoinst flag in general/mode section: final_restart_services. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/package/autoyast2.spec new/autoyast2-3.1.74/package/autoyast2.spec --- old/autoyast2-3.1.72/package/autoyast2.spec 2015-03-27 09:54:14.000000000 +0100 +++ new/autoyast2-3.1.74/package/autoyast2.spec 2015-04-27 10:29:12.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.72 +Version: 3.1.74 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/src/clients/inst_autoconfigure.rb new/autoyast2-3.1.74/src/clients/inst_autoconfigure.rb --- old/autoyast2-3.1.72/src/clients/inst_autoconfigure.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/src/clients/inst_autoconfigure.rb 2015-04-27 10:29:12.000000000 +0200 @@ -39,7 +39,8 @@ "Profile general,mode:%1", Ops.get_map(Profile.current, ["general", "mode"], {}) ) - @need_systemd_isolate = true + @need_systemd_isolate = Ops.get_boolean( + Profile.current,["general", "mode", "activate_systemd_default_target"], true) final_restart_services = Ops.get_boolean( Profile.current,["general", "mode", "final_restart_services"], true) @max_steps = Y2ModuleConfig.ModuleMap.size + 3 # additional for scripting and finished message @@ -299,6 +300,8 @@ Builtins.y2milestone("after calling \"%1\"", @cmd) Builtins.y2milestone("ret=%1", @out) wait_systemd_finished(@max_wait, @ser_ignore) + else + Builtins.y2milestone("Do not activate systemd default target (defined in autoyast.xml)") end # Just in case, remove this file to avoid reconfiguring... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/src/include/autoinstall/ask.rb new/autoyast2-3.1.74/src/include/autoinstall/ask.rb --- old/autoyast2-3.1.72/src/include/autoinstall/ask.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/src/include/autoinstall/ask.rb 2015-04-27 10:29:12.000000000 +0200 @@ -144,6 +144,10 @@ if Ops.greater_than(Ops.get_integer(ask, "height", 0), min_height) min_height = Ops.get_integer(ask, "height", 0) end + + # + # Script to calculate the default value (optional) + # if Builtins.haskey(ask, "default_value_script") interpreter = Ops.get_string( ask, @@ -192,6 +196,10 @@ Ops.get_string(out, "stderr", "") ) end + + # + # Start to handle questions: widgets creation (checkbox, combobox) + # dlg = Dummy() if type == "boolean" on = Ops.get(ask, "default") == "true" ? true : false @@ -216,7 +224,7 @@ elsif type == "static_text" widget = Label(Id(entry_id), Ops.get_string(ask, "default", "")) dlg = createWidget(widget, frametitle) - else + else # integer or string if Ops.get_boolean(ask, "password", false) == true widget1 = Password( Id(entry_id), @@ -225,7 +233,7 @@ Ops.get_string(ask, "default", "") ) widget2 = Password( - Id(:pass2), + Id("#{entry_id}_pass2"), Opt(:notify), "", Ops.get_string(ask, "default", "") @@ -261,35 +269,47 @@ end end end - if frametitle != "" - if frameBuffer == nil - frameBufferVBox = VBox(dlg) - else - if frametitle == frameBufferTitle - frameBufferVBox = Builtins.add(frameBufferVBox, dlg) - else - dialog_term = Builtins.add(dialog_term, frameBuffer) + # + # At this time, widgets are created. + # + + # + # Add the widget to the correct frame (using the frametitle). + # + if frametitle != "" # some frametitle is set + if frameBuffer == nil # and no frameBuffer exists + frameBufferVBox = VBox(dlg) # create a new frameBuffer + else # a frameBuffer exists + if frametitle == frameBufferTitle # with same title + frameBufferVBox = Builtins.add(frameBufferVBox, dlg) # add current to frameBuffer + else # with different title + dialog_term = Builtins.add(dialog_term, frameBuffer) # add frameBuffer to dialog dialog_term = Builtins.add(dialog_term, VSpacing(1)) - frameBufferVBox = VBox(dlg) + frameBufferVBox = VBox(dlg) # populate the frameBuffer with the new frame end end - frameBuffer = Frame(frametitle, frameBufferVBox) + frameBuffer = Frame(frametitle, frameBufferVBox) # set frameBuffer values for the next iteration frameBufferTitle = frametitle - else - if frameBuffer != nil - dialog_term = Builtins.add(dialog_term, frameBuffer) + else # frametitle is in blank + if frameBuffer != nil # a previous frameBuffer exists + dialog_term = Builtins.add(dialog_term, frameBuffer) # add frameBuffer to dialog dialog_term = Builtins.add(dialog_term, VSpacing(1)) frameBuffer = nil frameBufferVBox = nil end - dialog_term = Builtins.add(dialog_term, dlg) + dialog_term = Builtins.add(dialog_term, dlg) # add new element (with no frame) to dialog dialog_term = Builtins.add(dialog_term, VSpacing(1)) end end + + # If some frameBuffer left after iterations, it's added to the dialog. if frameBuffer != nil dialog_term = Builtins.add(dialog_term, frameBuffer) end + # + # Let's build the dialog + # help_term = HWeight(30, RichText(helptext)) if helptext != "" title_term = Heading(title) if title != "" backButton = PushButton(Id(:back), back_label) @@ -316,6 +336,10 @@ if Ops.less_than(Builtins.size(history), 2) UI.ChangeWidget(Id(:back), :Enabled, false) end + + # + # Wait for user input + # while true ret = nil if timeout == 0 @@ -324,13 +348,13 @@ ret = UI.TimeoutUserInput(Ops.multiply(timeout, 1000)) end timeout = 0 - if ret == :ok || ret == :timeout + if ret == :ok || ret == :timeout # Process users' input and save asks into dialogs hash. runAgain = 0 element_cnt2 = 0 Ops.set( dialogs, dialog_nr, - Builtins.maplist( + Builtins.maplist( # Iterate through widgets building a list of asks (containing responses) Convert.convert( Ops.get(dialogs, dialog_nr, []), :from => "list", @@ -350,10 +374,10 @@ val = Builtins.tointeger(Convert.to_string(val)) end if Ops.get_boolean(ask, "password", false) == true - pass2 = Convert.to_string(UI.QueryWidget(Id(:pass2), :Value)) + pass2 = Convert.to_string(UI.QueryWidget(Id("#{entry_id}_pass2"), :Value)) if pass2 != Convert.to_string(val) Popup.Error("The two passwords mismatch.") - runAgain = 1 + runAgain = 1 # Run the same dialog again. end end Builtins.y2debug( @@ -361,9 +385,11 @@ Ops.get_string(ask, "question", ""), val ) + + # Save the value in the profile (and also as default value) Ops.set(ask, "default", val) pos = path2pos(Ops.get_string(ask, "path", "")) - if Ops.get_string(ask, "path", "") != "" + if Ops.get_string(ask, "path", "") != "" # Set value in the profile Profile.current = Profile.setElementByList( pos, val, @@ -378,6 +404,8 @@ Profile.current ) end + + # Save the value into a file (if 'file' property was set) if file != "" if Ops.get_string(ask, "type", "string") == "boolean" if !SCR.Write( @@ -400,6 +428,8 @@ end end end + + # If ask must run an script, let's run it if script != {} scriptName = Ops.get_string( script, @@ -426,7 +456,7 @@ SCR.Execute(path(".target.mkdir"), current_logdir) end executionString = "" - if Ops.get_boolean(script, "environment", false) + if Ops.get_boolean(script, "environment", false) # FIXME: why not pass the variable always? if Ops.get_string(ask, "type", "string") == "boolean" val = Builtins.sformat( "%1", @@ -461,15 +491,19 @@ executionString ) end - runAgain = Ops.add( - runAgain, - Convert.to_integer( - SCR.Execute(path(".target.bash"), executionString) + Popup.Feedback("", _("A user defined script is running. This may take a while.")) do + runAgain = Ops.add( + runAgain, + Convert.to_integer( + SCR.Execute(path(".target.bash"), executionString) + ) ) - ) + end if Ops.get_boolean(script, "rerun_on_error", false) == false runAgain = 0 end + + # Show feedback in a dialog showFeedback = Ops.get_boolean(script, "feedback", false) feedback = "" if showFeedback @@ -487,10 +521,12 @@ Popup.LongText( "", RichText(Opt(:plainText), feedback), - 40, + 70, 15 ) end + + # Save the next_dialog if Ops.greater_than( SCR.Read(path(".target.size"), "/tmp/next_dialog"), 0 @@ -511,7 +547,7 @@ end ) break if runAgain == 0 - elsif ret == :back + elsif ret == :back # back button pressed: one step back on history. jumpToDialog = Ops.get( history, Ops.subtract(Builtins.size(history), 2), @@ -529,7 +565,7 @@ end end UI.CloseDialog - if jumpToDialog != -2 + if jumpToDialog != -2 # If we must jump to another dialog (as read on /tmp/next_dialog) dialog_nr = jumpToDialog jumpToDialog = -2 i = 0 @@ -540,7 +576,7 @@ end i = Ops.add(i, 1) end - else + else # Next dialog dialogCounter = Ops.add(dialogCounter, 1) dialog_nr = Ops.get(keys, dialogCounter, -1) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/src/modules/AutoInstallRules.rb new/autoyast2-3.1.74/src/modules/AutoInstallRules.rb --- old/autoyast2-3.1.72/src/modules/AutoInstallRules.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/src/modules/AutoInstallRules.rb 2015-04-27 10:29:12.000000000 +0200 @@ -36,6 +36,15 @@ Yast.include self, "autoinstall/io.rb" + reset + end + + # Reset the module's state + # + # @return nil + # + # @see #AutoInstallRules + def reset @userrules = false @dontmergeIsDefault = true @dontmergeBackup = [] @@ -50,19 +59,12 @@ @ATTR = {} @installed_product = "" - @installed_product_version = "" - @hostname = "" - @hostaddress = "" - @network = "" - @domain = "" - @arch = "" - @karch = "" # Taken from smbios @@ -78,31 +80,19 @@ @board = "" @memsize = 0 - @disksize = [] - @totaldisk = 0 - @hostid = "" - @mac = "" - @linux = 0 - @others = 0 - @xserver = "" - @haspcmcia = "0" #/////////////////////////////////////////// #/////////////////////////////////////////// - @NonLinuxPartitions = [] - @LinuxPartitions = [] - - @UserRules = {} # Local Variables @@ -110,7 +100,6 @@ @env = {} @tomerge = [] - @element2file = {} AutoInstallRules() end @@ -322,8 +311,8 @@ distro_str = SCR.Read(path(".content.DISTRO")) log.info "DISTRO: #{distro_str}" - distro = distro_map(distro_str) - cpe = distro ? cpeid_map(distro["cpeid"]) : {} + distro = distro_map(distro_str) || {} + cpe = cpeid_map(distro["cpeid"]) || {} @installed_product = distro["name"] || "" @installed_product_version = cpe["version"] || "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/src/modules/AutoinstClass.rb new/autoyast2-3.1.74/src/modules/AutoinstClass.rb --- old/autoyast2-3.1.72/src/modules/AutoinstClass.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/src/modules/AutoinstClass.rb 2015-04-27 10:29:12.000000000 +0200 @@ -19,7 +19,10 @@ class AutoinstClassClass < Module include Yast::Logger + MERGE_XSLT_PATH = "/usr/share/autoinstall/xslt/merge.xslt" + def main + Yast.import "AutoinstConfig" Yast.import "XML" Yast.import "Summary" @@ -38,21 +41,21 @@ AutoinstClass() end - # find a profile path + # Finds a profile path # @param string profile name # @return [String] profile Path def findPath(name, class_) - result = @confs.find { |c| c['name'] == name && c['class'] == class_ } - result ||= { 'class' => '', 'name' => 'default' } - File.join(@classDir, result['class'], result['name']) + result = @confs.find { |c| c["name"] == name && c["class"] == class_ } + result ||= { "class" => "", "name" => "default" } + File.join(@classDir, result["class"], result["name"]) end - # Read classes + # Reads classes def Read if SCR.Read(path(".target.size"), @classPath) != -1 # TODO: use XML module classes_map = Convert.to_map(SCR.Read(path(".xml"), @classPath)) - @Classes = (classes_map && classes_map['classes']) || [] + @Classes = (classes_map && classes_map["classes"]) || [] else @Classes = [] end @@ -64,15 +67,15 @@ # classes.xml files, one for each repository def Compat if !class_file_exists? && compat_class_file_exists? - log.info "Compat: #{@classPath} no found but #{compat_class_file} exists" - new_classes_map = { 'classes' => read_old_classes } + log.info "Compat: #{@classPath} not found but #{compat_class_file} exists" + new_classes_map = { "classes" => read_old_classes } log.info "creating #{new_classes_map}" XML.YCPToXMLFile(:class, new_classes_map, @classPath) end nil end - # Change the directory and read the class definitions + # Changes the directory and reads the class definitions # # @param [String] Path of the new directory # @return nil @@ -84,7 +87,7 @@ nil end - # Change the directory of classes definitions. + # Changes the directory of classes definitions. # # AutoinstConfig#classDir= is called to set the new value # in the configuration. It does not check if the directory @@ -108,76 +111,39 @@ nil end - # Merge Classes + # Merge classes # def MergeClasses(configuration, base_profile, resultFileName) - configuration = deep_copy(configuration) dontmerge_str = "" - i = 1 - Builtins.foreach(AutoinstConfig.dontmerge) do |dm| - dontmerge_str = Ops.add( - dontmerge_str, - Builtins.sformat(" --param dontmerge%1 \"'%2'\" ", i, dm) - ) - i = Ops.add(i, 1) + AutoinstConfig.dontmerge.each_with_index do |dm, i| + dontmerge_str << " --param dontmerge#{i+1} \"'#{dm}'\" " end - tmpdir = AutoinstConfig.tmpDir - _MergeCommand = Builtins.sformat( - "/usr/bin/xsltproc --novalid --param replace \"'false'\" %1 --param with ", - dontmerge_str - ) - - _MergeCommand = Ops.add( - Ops.add( - Ops.add(_MergeCommand, "\"'"), - findPath( - Ops.get_string(configuration, "name", ""), - Ops.get_string(configuration, "class", "") - ) - ), - "'\" " - ) - _MergeCommand = Ops.add( - Ops.add( - Ops.add(Ops.add(Ops.add(_MergeCommand, "--output "), tmpdir), "/"), - resultFileName - ), - " " - ) - _MergeCommand = Ops.add( - _MergeCommand, - " /usr/share/autoinstall/xslt/merge.xslt " - ) - _MergeCommand = Ops.add(Ops.add(_MergeCommand, base_profile), " ") - - - Builtins.y2milestone("Merge command: %1", _MergeCommand) - - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), _MergeCommand, {}) - ) - Builtins.y2milestone( - "Merge stdout: %1, stderr: %2", - Ops.get_string(out, "stdout", ""), - Ops.get_string(out, "stderr", "") - ) - deep_copy(out) + merge_command = + "/usr/bin/xsltproc --novalid --param replace \"'false'\" #{dontmerge_str} --param with " \ + "\"'#{findPath(configuration["name"], configuration["class"])}'\" " \ + "--output #{File.join(AutoinstConfig.tmpDir, resultFileName)} " \ + "#{MERGE_XSLT_PATH} #{base_profile} " + + out = SCR.Execute(path(".target.bash_output"), merge_command, {}) + log.info "Merge command: #{merge_command}" + log.info "Merge stdout: #{out["stdout"]}, stderr: #{out["stderr"]}" + out end - # Read files from class directories + # Reads files from class directories # @return [void] def Files @confs = [] @Classes.each do |class_| - class_name_ = class_['name'] || 'xxx' + class_name_ = class_["name"] || "xxx" files_path = File.join(@classDir, class_name_) - files = Convert.convert(SCR.Read(path('.target.dir'), files_path), + files = Convert.convert(SCR.Read(path(".target.dir"), files_path), :from => "any", :to => "list <string>") next if files.nil? log.info "Files in class #{class_name_}: #{files}" - new_confs = files.map { |f| { 'class' => class_name_, 'name' => f } } + new_confs = files.map { |f| { "class" => class_name_, "name" => f } } log.info "Configurations: #{new_confs}" @confs.concat(new_confs) end @@ -185,15 +151,11 @@ nil end - # Save Class definitions + # Saves classes definitions def Save - Builtins.foreach(@deletedClasses) do |c| - toDel = Builtins.sformat( - "/bin/rm -rf %1/%2", - AutoinstConfig.classDir, - c - ) - SCR.Execute(path(".target.bash"), toDel) + @deletedClasses.each do |c| + to_del = "/bin/rm -rf #{File.join(AutoinstConfig.classDir, c)}" + SCR.Execute(path(".target.bash"), to_del) end @deletedClasses = [] tmp = { "classes" => @Classes } @@ -202,34 +164,29 @@ end - # Import configuration + # Imports configuration + # @params [Array<Hash>] settings Configuration + # @return true def Import(settings) - settings = deep_copy(settings) @profile_conf = deep_copy(settings) true end - # Export configuration + # Exports configuration + # @return [Array<Hash>] Copy of the configuration def Export deep_copy(@profile_conf) end - # Configuration Summary + # Builds the configuration summary + # @return [String] Configuration summary def Summary summary = "" - - Builtins.foreach(@profile_conf) do |c| - summary = Summary.AddHeader( - summary, - Ops.get_string(c, "class_name", "None") - ) - summary = Summary.AddLine( - summary, - Ops.get_string(c, "configuration", "None") - ) + @profile_conf.each do |conf| + summary = Summary.AddHeader(summary, conf["class_name"] || "None") + summary = Summary.AddLine(summary, conf["configuration"] || "None") end - return Summary.NotConfigured if Builtins.size(summary) == 0 - summary + summary.empty? ? Summary.NotConfigured : summary end publish :variable => :classDir, :type => "string" @@ -276,10 +233,10 @@ # Builds a map of classes to import from /etc/autoinstall/classes.xml # @return [Array<Hash>] Classes defined in the file. def read_old_classes - old_classes_map = Convert.to_map(SCR.Read(path('.xml'), compat_class_file)) - old_classes = old_classes_map['classes'] || [] + old_classes_map = Convert.to_map(SCR.Read(path(".xml"), compat_class_file)) + old_classes = (old_classes_map && old_classes_map["classes"]) || [] old_classes.each_with_object([]) do |class_, new_classes| - class_path_ = File.join(@classDir, class_['name'] || '') + class_path_ = File.join(@classDir, class_["name"] || "") log.info "looking for #{class_path_}" new_classes << class_ unless SCR.Read(path(".target.dir"), class_path_).nil? end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/AutoInstallRules_test.rb new/autoyast2-3.1.74/test/AutoInstallRules_test.rb --- old/autoyast2-3.1.72/test/AutoInstallRules_test.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/test/AutoInstallRules_test.rb 2015-04-27 10:29:12.000000000 +0200 @@ -1,12 +1,10 @@ #!/usr/bin/env rspec -ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) - -require "yast" +require_relative "test_helper" Yast.import "AutoInstallRules" -describe "Yast::AutoInstallRules" do +describe Yast::AutoInstallRules do subject { Yast::AutoInstallRules } describe "#cpeid_map" do @@ -96,6 +94,22 @@ expect(Yast::AutoInstallRules.installed_product).to eq("SUSE Linux Enterprise Server 12") expect(Yast::AutoInstallRules.installed_product_version).to eq("12") end + + context "when .content.DISTRO is not found" do + before(:each) do + subject.reset + allow(Yast::SCR).to receive(:Read).with(any_args) + allow(Yast::Arch).to receive(:architecture).and_return("x86_64") + end + + it 'set installed_product and installed_product_version to blank string' do + expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".content.DISTRO")). + and_return(nil) + subject.ProbeRules + expect(Yast::AutoInstallRules.installed_product).to eq('') + expect(Yast::AutoInstallRules.installed_product_version).to eq('') + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/AutoinstClass_test.rb new/autoyast2-3.1.74/test/AutoinstClass_test.rb --- old/autoyast2-3.1.72/test/AutoinstClass_test.rb 2015-03-27 09:54:15.000000000 +0100 +++ new/autoyast2-3.1.74/test/AutoinstClass_test.rb 2015-04-27 10:29:12.000000000 +0200 @@ -1,19 +1,17 @@ #!/usr/bin/env rspec -root_path = File.expand_path('../..', __FILE__) -ENV["Y2DIR"] = File.join(root_path, 'src') - -require "yast" +require_relative "test_helper" Yast.import "AutoinstClass" describe Yast::AutoinstClass do subject { Yast::AutoinstClass } + let(:root_path) { File.expand_path('../..', __FILE__) } let(:test_xml_dir) { File.join(root_path, 'test', 'fixtures') } let(:class_dir) { File.join(test_xml_dir, 'classes') } let(:class_path) { File.join(class_dir, 'classes.xml') } - let(:faked_autoinstall_dir) { File.join(test_xml_dir, 'etc', 'autoinstall') } + let(:settings) { [ { 'class_name' => 'swap', 'configuration' => 'largeswap.xml' } ] } before(:each) do subject.class_dir = class_dir @@ -159,20 +157,27 @@ describe '#Compat' do let(:faked_autoinstall_dir) { File.join(test_xml_dir, 'etc', 'autoinstall') } - context 'when /etc/autoinstall/classes.xml exists' do - around(:each) do |example| - subject.ClassConf = faked_autoinstall_dir - example.call - subject.ClassConf = '/etc/autoinstall' + around(:each) do |example| + subject.ClassConf = faked_autoinstall_dir + example.call + subject.ClassConf = '/etc/autoinstall' + end + + context 'when a classes.xml file exists in the new location' do + it 'does not overwrite classes.xml file' do + expect(Yast::XML).to_not receive(:YCPToXMLFile) + subject.Compat end + end - context 'and a classes.xml file does not exist in the new location' do - before(:each) do - allow(Yast::SCR).to receive(:Read).and_call_original - allow(Yast::SCR).to receive(:Read). - with(Yast::Path.new('.target.size'), class_path).and_return(-1) - end + context 'when a classes.xml file does not exist in the new location' do + before(:each) do + allow(Yast::SCR).to receive(:Read).and_call_original + allow(Yast::SCR).to receive(:Read). + with(Yast::Path.new('.target.size'), class_path).and_return(-1) + end + context 'and /etc/autoinstall/classes.xml exists' do it 'creates a classes.xml file in the new location' do expect(Yast::XML).to receive(:YCPToXMLFile) do |type, data, path| expect(type).to eq(:class) @@ -183,9 +188,16 @@ end end - context 'and a classes.xml file exists in the new location' do - it 'does not create a classes.xml file' do - expect(Yast::XML).to_not receive(:YCPToXMLFile) + context 'and /etc/autoinstall/classes.xml is empty or not valid XML' do + before(:each) do + allow(Yast::SCR).to receive(:Read). + with(Yast::Path.new('.xml'), File.join(faked_autoinstall_dir, 'classes.xml')). + and_return(nil) + end + + it 'creates a classes.xmlfile in the new location with no classes' do + expect(Yast::XML).to receive(:YCPToXMLFile). + with(:class, {"classes" => []}, File.join(class_dir, 'classes.xml')) subject.Compat end end @@ -198,4 +210,176 @@ expect(subject.classDir).to eq(test_xml_dir) end end + + describe '#MergeClasses' do + let(:base_profile_path) { File.join('test', 'fixtures', 'profiles', 'partitions.xml') } + let(:tmp_dir) { File.join(root_path, 'tmp') } + let(:expected_xml) { File.read(expected_xml_path) } + let(:output_path) { File.join(tmp_dir, 'output.xml') } + let(:output_xml) { File.read(output_path) } + let(:dontmerge) { [] } + let(:merge_xslt_path) { File.join('xslt', 'merge.xslt') } + let(:xsltproc_command) { + "/usr/bin/xsltproc --novalid --param replace \"'false'\" " \ + "--param with \"'#{subject.findPath("largeswap.xml", "swap")}'\" "\ + "--output #{File.join(tmp_dir, "output.xml")} " \ + "#{merge_xslt_path} test/fixtures/profiles/partitions.xml " + } + + before(:each) do + stub_const("Yast::AutoinstClassClass::MERGE_XSLT_PATH", merge_xslt_path) + end + + around(:each) do |example| + FileUtils.rm_rf(tmp_dir) if Dir.exist?(tmp_dir) + FileUtils.mkdir(tmp_dir) + example.run + FileUtils.rm_rf(tmp_dir) + end + + before(:each) do + allow(Yast::AutoinstConfig).to receive(:tmpDir).and_return(tmp_dir) + allow(Yast::AutoinstConfig).to receive(:dontmerge).and_return(dontmerge) + subject.Files + end + + it 'executes xsltproc and returns a hash with info about the result' do + expect(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.bash_output"), xsltproc_command, {}).and_call_original + out = subject.MergeClasses(subject.confs[0], base_profile_path, 'output.xml') + expect(out).to eq({ 'exit' => 0, 'stderr' => '', 'stdout' => '' }) + end + + context 'when all elements must be merged' do + let(:expected_xml_path) { File.join(root_path, 'test', 'fixtures', 'output', 'partitions-merged.xml') } + + it 'merges elements from profile and configuration' do + expect(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.bash_output"), xsltproc_command, {}).and_call_original + subject.MergeClasses(subject.confs[0], base_profile_path, 'output.xml') + expect(output_xml).to eq(expected_xml) + end + end + + context 'when some elements are not intended to be merged' do + let(:expected_xml_path) { File.join(root_path, 'test', 'fixtures', 'output', 'partitions-dontmerge.xml') } + let(:dontmerge) { ['partition'] } + let(:xsltproc_command) { + "/usr/bin/xsltproc --novalid --param replace \"'false'\" " \ + "--param dontmerge1 \"'partition'\" " \ + "--param with \"'#{subject.findPath("largeswap.xml", "swap")}'\" "\ + "--output #{File.join(tmp_dir, "output.xml")} " \ + "#{merge_xslt_path} test/fixtures/profiles/partitions.xml " + } + + it 'does not merge those elements' do + expect(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.bash_output"), xsltproc_command, {}).and_call_original + subject.MergeClasses(subject.confs[0], base_profile_path, 'output.xml') + expect(output_xml).to eq(expected_xml) + end + end + end + + describe '#Import' do + it 'sets profile_conf variable as a copy of the given settings' do + subject.Import(settings) + expect(subject.profile_conf).to eq(settings) + expect(subject.profile_conf).to_not equal(settings) + end + + after(:each) do + subject.Import([]) + end + end + + describe '#Export' do + around(:each) do |example| + subject.Import(settings) + example.call + subject.Import([]) # reset settings + end + + it 'returns a copy of profile_conf' do + exported = subject.Export + expect(exported).to eq(settings) + expect(exported).to_not equal(settings) + end + end + + describe '#Summary' do + context 'when some settings are given' do + around(:each) do |example| + subject.Import(settings) + example.call + subject.Import([]) # reset settings + end + + it 'returns a summary containing class names and configurations' do + expect(Yast::Summary).to receive(:AddHeader).with(anything, 'swap'). + and_return('<h3>swap</h3>') + expect(Yast::Summary).to receive(:AddLine).with(anything, 'largeswap.xml'). + and_return('<h3>swap</h3>largeswap.xml') + expect(subject.Summary).to eq('<h3>swap</h3>largeswap.xml') + end + + context 'when no class name is given' do + let(:settings) { [ { 'configuration' => 'largeswap.xml' } ] } + + it "'None' is used instead" do + expect(Yast::Summary).to receive(:AddHeader).with(anything, 'None'). + and_return('<h3>None</h3>') + subject.Summary + end + end + + context 'when no configuration is given' do + let(:settings) { [ { 'class_name' => 'swap' } ] } + + it "'None' is used instead" do + expect(Yast::Summary).to receive(:AddLine).with(anything, 'None'). + and_return('<h3>None</h3>largeswap.xml') + subject.Summary + end + end + end + + context 'when no settings are given' do + it 'returns an empty summary' do + expect(subject.Summary).to eq(Yast::Summary.NotConfigured) + end + end + end + + describe '#Save' do + before(:each) do + subject.Read + end + + it 'creates a classes.xml file in the new location' do + expect(Yast::XML).to receive(:YCPToXMLFile) do |type, data, path| + expect(type).to eq(:class) + expect(data['classes']).to be_kind_of(Array) + expect(path).to eq(File.join(class_dir, 'classes.xml')) + end + subject.Save + end + + context 'when classes are marked for deletion' do + around(:each) do |example| + subject.deletedClasses = ['swap'] + example.call + subject.deletedClasses = [] + end + + it 'deletes classes files' do + allow(Yast::XML).to receive(:YCPToXMLFile).with(any_args) + expect(Yast::SCR).to receive(:Execute).with( + Yast::Path.new('.target.bash'), + "/bin/rm -rf #{class_dir}/swap") + + subject.Save + end + end + end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/fixtures/output/partitions-dontmerge.xml new/autoyast2-3.1.74/test/fixtures/output/partitions-dontmerge.xml --- old/autoyast2-3.1.72/test/fixtures/output/partitions-dontmerge.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.74/test/fixtures/output/partitions-dontmerge.xml 2015-04-27 10:29:12.000000000 +0200 @@ -0,0 +1,48 @@ +<?xml version="1.0"?> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device><disklabel>msdos</disklabel><enable_snapshots config:type="boolean">true</enable_snapshots><initialize config:type="boolean">true</initialize><partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">uuid</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <resize config:type="boolean">false</resize> + <size>1043496448</size> + </partition><partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext4</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">uuid</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <resize config:type="boolean">false</resize> + <size>5381455360</size> + </partition><partition> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <mount>swap</mount> + <partition_id config:type="integer">130</partition_id> + <size>2000mb</size> + </partition> + <partition> + <filesystem config:type="symbol">ext3</filesystem> + <partition_type>primary</partition_type> + <size>4Gb</size> + <mount>/</mount> + </partition> + </partitions> + <pesize/><type config:type="symbol">CT_DISK</type><use>all</use> + </drive> + </partitioning> +</profile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/fixtures/output/partitions-merged.xml new/autoyast2-3.1.74/test/fixtures/output/partitions-merged.xml --- old/autoyast2-3.1.72/test/fixtures/output/partitions-merged.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.74/test/fixtures/output/partitions-merged.xml 2015-04-27 10:29:12.000000000 +0200 @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device><disklabel>msdos</disklabel><enable_snapshots config:type="boolean">true</enable_snapshots><initialize config:type="boolean">true</initialize><partitions config:type="list"> + <partition> + <create config:type="boolean">true</create><crypt_fs config:type="boolean">false</crypt_fs><filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs><mount>swap</mount> + <mountby config:type="symbol">uuid</mountby><partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr><resize config:type="boolean">false</resize><size>2000mb</size> + </partition> + <partition> + <create config:type="boolean">true</create><crypt_fs config:type="boolean">false</crypt_fs><filesystem config:type="symbol">ext3</filesystem> + <format config:type="boolean">true</format><fstopt>acl,user_xattr</fstopt><loop_fs config:type="boolean">false</loop_fs><partition_type>primary</partition_type> + <size>4Gb</size> + <mount>/</mount> + <mountby config:type="symbol">uuid</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <resize config:type="boolean">false</resize> + <size>5381455360</size> + </partition> + </partitions> + <pesize/><type config:type="symbol">CT_DISK</type><use>all</use> + </drive> + </partitioning> +</profile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/fixtures/profiles/partitions.xml new/autoyast2-3.1.74/test/fixtures/profiles/partitions.xml --- old/autoyast2-3.1.72/test/fixtures/profiles/partitions.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.74/test/fixtures/profiles/partitions.xml 2015-04-27 10:29:12.000000000 +0200 @@ -0,0 +1,44 @@ +<?xml version="1.0"?> +<!DOCTYPE profile> +<profile xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> + <partitioning config:type="list"> + <drive> + <device>/dev/sda</device> + <disklabel>msdos</disklabel> + <enable_snapshots config:type="boolean">true</enable_snapshots> + <initialize config:type="boolean">true</initialize> + <partitions config:type="list"> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">swap</filesystem> + <format config:type="boolean">true</format> + <loop_fs config:type="boolean">false</loop_fs> + <mount>swap</mount> + <mountby config:type="symbol">uuid</mountby> + <partition_id config:type="integer">130</partition_id> + <partition_nr config:type="integer">1</partition_nr> + <resize config:type="boolean">false</resize> + <size>1043496448</size> + </partition> + <partition> + <create config:type="boolean">true</create> + <crypt_fs config:type="boolean">false</crypt_fs> + <filesystem config:type="symbol">ext4</filesystem> + <format config:type="boolean">true</format> + <fstopt>acl,user_xattr</fstopt> + <loop_fs config:type="boolean">false</loop_fs> + <mount>/</mount> + <mountby config:type="symbol">uuid</mountby> + <partition_id config:type="integer">131</partition_id> + <partition_nr config:type="integer">2</partition_nr> + <resize config:type="boolean">false</resize> + <size>5381455360</size> + </partition> + </partitions> + <pesize/> + <type config:type="symbol">CT_DISK</type> + <use>all</use> + </drive> + </partitioning> +</profile> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/include/ask_test.rb new/autoyast2-3.1.74/test/include/ask_test.rb --- old/autoyast2-3.1.72/test/include/ask_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.74/test/include/ask_test.rb 2015-04-27 10:29:12.000000000 +0200 @@ -0,0 +1,337 @@ +#!/usr/bin/env rspec + +require_relative "../test_helper" + +require "yast" + +Yast.import "Profile" +Yast.import "Stage" +Yast.import "UI" + +describe "Yast::AutoinstallAskInclude" do + module DummyYast + class AutoinstallAskClient < Yast::Client + def main + Yast.include self, "autoinstall/ask.rb" + end + + def initialize + main + end + end + end + + BASE_ASK = { + "type" => "string", "question" => "hostname?", "default" => "my.site.de", + "help" => "Some help", "dialog" => 0, "element" => 0, + "stage" => "initial" } + + subject(:client) { DummyYast::AutoinstallAskClient.new } + let(:profile) { { "general" => { "ask-list" => ask_list } } } + let(:pressed_button) { :ok } + + describe "#askDialog" do + let(:ask_list) { [ask] } + + before do + allow(Yast::Profile).to receive(:current).and_return(profile) + allow(Yast::Stage).to receive(:initial).and_return(true) + allow(Yast::UI).to receive(:UserInput).and_return(pressed_button) + end + + context "when ask-list is empty" do + let(:ask_list) { [] } + + it "no dialog is shown" do + expect(Yast::UI).to_not receive(:OpenDialog) + client.askDialog + end + end + + describe "dialogs creation" do + context "when the ask-list contains a question with type 'string'" do + let(:ask) { BASE_ASK } + + it "creates a TextEntry widget" do + expect(Yast::UI).to receive(:OpenDialog) + expect(client).to receive(:TextEntry). + with(Id("0_0"), Opt(:notify), ask["question"], ask["default"]). + and_call_original + client.askDialog + end + end + + context "when ask-list contains a question with type 'selection'" do + let(:ask) { BASE_ASK.merge("selection" => items, "default" => "desktop") } + let(:items) { + %w(desktop server).map { |i| { "value" => i, "label" => i.capitalize } } + } + + it "creates a ComboBox widget" do + expect(Yast::UI).to receive(:OpenDialog) + expected_options = [ + Item(Id("desktop"), "Desktop", true), + Item(Id("server"), "Server", false) + ] + expect(client).to receive(:ComboBox). + with(Id("0_0"), Opt(:notify), ask["question"], expected_options). + and_call_original + client.askDialog + end + end + + context "when ask-list contains a question with type 'password'" do + let(:ask) { BASE_ASK.merge("password" => true) } + + it "creates two Password widgets" do + expect(Yast::UI).to receive(:OpenDialog) + expect(client).to receive(:Password). + with(Id("0_0"), Opt(:notify), ask["question"], ask["default"]). + and_call_original + expect(client).to receive(:Password). + with(Id("0_0_pass2"), Opt(:notify), "", ask["default"]). + and_call_original + client.askDialog + end + end + + context "when ask-list contains a question with type 'static_text'" do + let(:ask) { BASE_ASK.merge("type" => "static_text") } + + it "creates a Label widget" do + expect(Yast::UI).to receive(:OpenDialog) + expect(client).to receive(:Label). + with(Id("0_0"), ask["default"]). + and_call_original + client.askDialog + end + end + + context "when ask-list contains question with type 'symbol'" do + let(:ask) { + BASE_ASK.merge("type" => "symbol", "default" => :desktop, "selection" => items) + } + let(:items) { + %w(desktop server).map { |i| { "value" => i.to_sym, "label" => i.capitalize } } + } + + it "creates a ComboBox widget" do + expect(Yast::UI).to receive(:OpenDialog) + expected_options = [ + Item(Id(:desktop), "Desktop", true), + Item(Id(:server), "Server", false) + ] + expect(client).to receive(:ComboBox). + with(Id("0_0"), Opt(:notify), ask["question"], expected_options). + and_call_original + client.askDialog + end + end + + context "when ask-list contains a question with type 'boolean'" do + let(:ask) do + BASE_ASK.merge("type" => "boolean", "question" => "Register system?", "default" => "true") + end + + it "creates a CheckBox widget" do + expect(Yast::UI).to receive(:OpenDialog) + expect(client).to receive(:CheckBox). + with(Id("0_0"), Opt(:notify), ask["question"], true). + and_call_original + client.askDialog + end + end + + context "when ask-list contains more than one question" do + let(:string_ask) { BASE_ASK } + let(:boolean_ask) do + BASE_ASK.merge("type" => "boolean", "element" => 1, "default" => "true") + end + let(:ask_list) { [string_ask, boolean_ask] } + + it "creates one widget for each one of them" do + expect(Yast::UI).to receive(:OpenDialog) + expect(client).to receive(:TextEntry). + with(Id("0_0"), Opt(:notify), string_ask["question"], string_ask["default"]). + and_call_original + expect(client).to receive(:CheckBox). + with(Id("0_1"), Opt(:notify), boolean_ask["question"], true). + and_call_original + client.askDialog + end + end + + context "when ask-list contains more than one password question" do + let(:first_pass_ask) { BASE_ASK.merge("password" => true)} + let(:second_pass_ask) { BASE_ASK.merge("password" => true, "element" => 1)} + let(:ask_list) { [first_pass_ask, second_pass_ask] } + + it "creates two password widgets for each question without repeating the Ids" do + expect(Yast::UI).to receive(:OpenDialog) + ["0_0", "0_0_pass2", "0_1", "0_1_pass2"].each do |wid| + expect(client).to receive(:Password). + with(Id(wid), anything, anything, anything).and_call_original + end + client.askDialog + end + end + end + + describe "dialogs actions" do + + context "when ok button is pressed" do + let(:pressed_button) { :ok } + let(:response) { "some-user-response" } + + before do + allow(Yast::UI).to receive(:QueryWidget). + with(Id("0_0"), :Value).and_return(response) + end + + context "when a path was specified" do + let(:ask) { BASE_ASK.merge("path" => "users,0,gecos") } + + it "response is saved into the Profile at the specified path" do + expect(Yast::Profile).to receive(:setElementByList). + with(["users", 0, "gecos"], response, profile) + client.askDialog + end + end + + context "when a pathlist was specified" do + let(:ask) { BASE_ASK.merge("pathlist" => ["users,1000,login", "groups,1000,name"]) } + + it "saves response into Profile at the paths specified in the pathlist" do + expect(Yast::Profile).to receive(:setElementByList). + with(["users", 1000, "login"], response, profile) + expect(Yast::Profile).to receive(:setElementByList). + with(["groups", 1000, "name"], response, profile) + client.askDialog + end + end + + context "when a file was specified" do + let(:file_path) { "/tmp/response" } + let(:ask) { BASE_ASK.merge("file" => file_path) } + + it "saves the user answer in the file" do + expect(Yast::SCR).to receive(:Write). + with(Yast::Path.new(".target.string"), file_path, response). + and_return(true) + client.askDialog + end + + context "when response is a boolean" do + let(:response) { true } + let(:ask) { BASE_ASK.merge("type" => "boolean", "file" => file_path)} + + it "converts the answer to a string and saves it in the file" do + expect(Yast::SCR).to receive(:Write). + with(Yast::Path.new(".target.string"), file_path, "true"). + and_return(true) + client.askDialog + end + end + + context "when asking for a 'password' and values don't match" do + let(:ask) { BASE_ASK.merge("password" => true) } + + it "shows an error message and try run the dialog again" do + expect(Yast::UI).to receive(:QueryWidget). + with(Id("0_0_pass2"), :Value).and_return("some-other-thing", response) + expect(Yast::Popup).to receive(:Error).with("The two passwords mismatch.") + client.askDialog + end + end + end + + context "when a script was specified" do + let(:script) { { "source" => "echo", "filename" => "test.sh" } } + let(:ask) { BASE_ASK.merge("script" => script) } + let(:tmp_dir) { "/tmp" } + let(:log_dir) { "/var/log/YaST2" } + + before do + allow(Yast::AutoinstConfig).to receive(:tmpDir).and_return(tmp_dir) + allow(Yast::AutoinstConfig).to receive(:logs_dir). + and_return(log_dir) + script_path = "#{tmp_dir}/#{script["filename"]}" + allow(Yast::SCR).to receive(:Write). + with(Yast::Path.new(".target.string"), script_path, script["source"]). + and_return(true) + allow(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.mkdir"), File.join(tmp_dir, "ask_scripts_log")) + end + + context "when 'environment' property is not set" do + it "runs the script without passing the ask response" do + expect(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.bash"), + "/bin/sh -x /tmp/test.sh 2&> /tmp/ask_scripts_log/test.sh.log ") + client.askDialog + end + end + + context "when 'environment' property is set" do + let(:script) { { "source" => "echo", "filename" => "test.sh", "environment" => true } } + + it "runs the script passing the ask response" do + expect(Yast::SCR).to receive(:Execute). + with(Yast::Path.new(".target.bash"), + "VAL=\"some-user-response\" /bin/sh -x /tmp/test.sh 2&> /tmp/ask_scripts_log/test.sh.log ") + client.askDialog + end + end + + it "shows some feedback while script is running" do + message = "A user defined script is running. This may take a while." + allow(Yast::SCR).to receive(:Execute) + expect(Yast::Popup).to receive(:Feedback). + with("", client._(message)) + client.askDialog + end + end + + context "when more dialogs left" do + let(:ask_list) { [BASE_ASK, BASE_ASK.merge("dialog" => "1")] } + + it "next dialog is shown" do + expect(Yast::UI).to receive(:UserInput).twice + client.askDialog + end + end + + context "when no more dialogs left" do + let(:ask_list) { [BASE_ASK] } + + it "finishes dialog processing and returns" do + expect(Yast::UI).to receive(:UserInput).once + client.askDialog + end + end + + context "when a value for 'next dialog' is set" do + let(:ask_list) { [BASE_ASK, BASE_ASK.merge("dialog" => 1), BASE_ASK.merge("dialog" => 2)] } + + before do + expect(Yast::SCR).to receive(:Read). + with(Yast::Path.new(".target.size"), "/tmp/next_dialog"). + and_return(1) + expect(Yast::SCR).to receive(:Read). + with(Yast::Path.new(".target.string"), "/tmp/next_dialog"). + and_return("2") + end + + it "jumps to that dialog" do + expect(Yast::UI).to_not receive(:QueryWidget). + with(Id("1_0"), :Value) # Skips dialog 1. + expect(Yast::UI).to receive(:QueryWidget). + with(Id("2_0"), :Value) + expect(Yast::UI).to receive(:UserInput).twice.and_return(:ok) + client.askDialog + end + end + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.72/test/test_helper.rb new/autoyast2-3.1.74/test/test_helper.rb --- old/autoyast2-3.1.72/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.74/test/test_helper.rb 2015-04-27 10:29:12.000000000 +0200 @@ -0,0 +1,12 @@ +root_location = File.expand_path("../../", __FILE__) +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +require "yast/rspec" +require "fileutils" + +if ENV["COVERAGE"] + STDERR.puts "COVERAGE is disabled because when requiring some modules (like AutoinstPartition) "\ + "errors are raised in other YaST components." +end +

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2015-04-27 22:07:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes 2015-04-15 17:42:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes 2015-04-27 22:08:43.000000000 +0200 @@ -1,0 +2,57 @@ +Wed Apr 22 16:37:02 CEST 2015 - pmladek(a)suse.cz + +- ftrace/x86/xen: use kernel identity mapping only when really needed + (bsc#873195, bsc#886272, bsc#903727, bsc#927725) +- commit 63ed720 + +------------------------------------------------------------------- +Wed Apr 22 13:54:15 CEST 2015 - mmarek(a)suse.cz + +- scripts/refresh: Obsoleted by refresh_patch.sh +- commit d1dd729 + +------------------------------------------------------------------- +Wed Apr 22 09:26:15 CEST 2015 - mmarek(a)suse.cz + +- rpm/kernel-obs-build.spec.in: Add .build.hostarch.kvm to the filelist +- commit c65f3ca + +------------------------------------------------------------------- +Tue Apr 21 17:04:11 CEST 2015 - jbeulich(a)suse.com + +- Update Xen patches to 4.0-final. +- commit eee4e07 + +------------------------------------------------------------------- +Tue Apr 21 16:33:44 CEST 2015 - mmarek(a)suse.cz + +- rpm/mkspec: Do not build kernel-obs-* on 32bit ppc + The buildservice uses the ppc64 kernel-obs-build package for 32bit + workers. +- commit d1e0beb + +------------------------------------------------------------------- +Tue Apr 21 16:23:11 CEST 2015 - dvaleev(a)suse.com + +- create .build.hostarch.kvm for kernel-obs-build + OBS needs to know hostarch, with ppc64/ppc64le this is not that easy. + Lets create a marker file to help with it. + See obs-build commit: e47399d738e51 +- commit e5d9da9 + +------------------------------------------------------------------- +Tue Apr 14 15:36:11 CEST 2015 - mmarek(a)suse.cz + +- rpm/kernel-obs-qa.spec.in: Do not fail if the kernel versions do not match +- commit 28e9e74 + +------------------------------------------------------------------- +Tue Apr 14 08:32:12 CEST 2015 - jlee(a)suse.com + +- Update config files. (boo#925479) + Do not set CONFIG_SYSTEM_TRUSTED_KEYRING until we need it in future + openSUSE version: + e.g. MODULE_SIG, IMA, PKCS7(new), KEXEC_BZIMAGE_VERIFY_SIG(new) +- commit 5c4d917 + +------------------------------------------------------------------- @@ -10,0 +68,6 @@ +Mon Apr 13 16:11:20 CEST 2015 - jeffm(a)suse.com + +- Update to 4.0-final. +- commit 6dbc1a6 + +------------------------------------------------------------------- @@ -16,0 +80,20 @@ +Fri Apr 10 16:44:35 CEST 2015 - jeffm(a)suse.com + +- Update to 4.0-rc7. +- Config changes: + - x86_64/pv: + - CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 (default) +- commit 1925449 + +------------------------------------------------------------------- +Thu Apr 9 21:17:01 CEST 2015 - agraf(a)suse.de + +- of: Fix size when dma-range is not used. +- of: Move of_dma_configure() to device.c to help re-use. +- of: iommu: Add ptr to OF node arg to of_iommu_configure(). +- PCI: Add helper functions pci_get[put]_host_bridge_device(). +- PCI: Update DMA configuration from DT. +- of/pci: Add of_pci_dma_configure() to update DMA configuration. +- commit 7d1f328 + +------------------------------------------------------------------- @@ -20 +103 @@ -- commit 0f5134a +- commit ba5700e @@ -34,0 +118,97 @@ +Tue Apr 7 18:45:12 CEST 2015 - agraf(a)suse.de + +- Update XGBE-A0 support to latest code +- commit 2121347 + +------------------------------------------------------------------- +Mon Apr 6 11:40:41 CEST 2015 - dmueller(a)suse.com + +- ARMv7: config: Enable more features + Sync over config settings that have been enabled on x86_64 in the + last few years also to ARMv7 +- commit d480a34 + +------------------------------------------------------------------- +Sun Apr 5 18:06:56 CEST 2015 - dmueller(a)suse.com + +- ARMv8: config: Enable more modules / feature flags +- commit 107eae5 + +------------------------------------------------------------------- +Sun Apr 5 06:25:25 CEST 2015 - dmueller(a)suse.com + +- ARM64: config: Disable CONFIG_INPUT_E3X0_BUTTON +- commit 9774a1b + +------------------------------------------------------------------- +Sun Apr 5 06:16:00 CEST 2015 - dmueller(a)suse.com + +- ARMv6/v7/v8: config: Disable ISA bus related drivers + There is no ISA bus here +- commit 469d5c3 + +------------------------------------------------------------------- +Sun Apr 5 06:09:18 CEST 2015 - dmueller(a)suse.com + +- ARMv7/v8: config: Disable IIO dummy drivers + Not enabled on any other arch either. +- commit b10b70d + +------------------------------------------------------------------- +Sun Apr 5 05:59:33 CEST 2015 - dmueller(a)suse.com + +- ARMv7: config: Disable accessibility + Its not enabled on any other architecture, and enablement was + an accident. +- commit 7197f38 + +------------------------------------------------------------------- +Sun Apr 5 05:47:29 CEST 2015 - dmueller(a)suse.com + +- ARMv6/v7/v8: config: Disable debug/compat/self test options + Disable those options that shouldn't be enabled on a production + kernel and are not either enabled on x86_64 +- commit 5f7e741 + +------------------------------------------------------------------- +Sun Apr 5 05:04:45 CEST 2015 - dmueller(a)suse.com + +- ARMv8/v7: config: Sync more features from x86_64 + Enable various feature flags on ARM if they're also set on x86_64 + to ensure that the feature sets available is roughly compareable +- commit f250654 + +------------------------------------------------------------------- +Sat Apr 4 14:39:27 CEST 2015 - dmueller(a)suse.com + +- ARMv6/v7: config: build uncommon HID drivers as modules + 92db3f1ad forgot to update ARM configs accordingly. +- commit a83ec68 + +------------------------------------------------------------------- +Sat Apr 4 13:46:11 CEST 2015 - dmueller(a)suse.com + +- ARM64: config: Sync vanilla with default config +- commit 7be032d + +------------------------------------------------------------------- +Sat Apr 4 13:40:00 CEST 2015 - dmueller(a)suse.com + +- ARM64/ARMv6/ARMv7: config: Sync tunables with x86_64 + Set numeric tunables to the same values as on x86_64 if they're + available for both platforms. +- commit e4e34f2 + +------------------------------------------------------------------- +Fri Apr 3 17:49:40 CEST 2015 - mmarek(a)suse.cz + +- Automatically Provide/Obsolete all subpackages of old flavors (bnc#925567) +- commit e3547a5 + +------------------------------------------------------------------- +Thu Apr 2 13:32:51 CEST 2015 - dmueller(a)suse.com + +- ARMv6: config: Update and reenable for 4.0-rc6 +- commit e32301a + +------------------------------------------------------------------- @@ -41 +221,7 @@ -- commit a30f81d +- commit f54483c + +------------------------------------------------------------------- +Tue Mar 31 22:38:51 CEST 2015 - dmueller(a)suse.com + +- ARM: config: Enable Stack Protector +- commit 0f06efd @@ -52 +238,26 @@ -- commit b5dbf85 ++++ 500 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/kernel-debug.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/kernel-debug.changes kernel-default.changes: same change kernel-desktop.changes: same change kernel-docs.changes: same change kernel-ec2.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa-xen.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-pv.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-vanilla.changes: same change kernel-xen.changes: same change Old: ---- linux-3.19.tar.xz New: ---- linux-4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-debug.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: A Debug Version of the Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -149,7 +149,11 @@ Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -955,7 +959,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif @@ -994,7 +1001,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch ppc64 +Provides: kernel-kdump-extra = 2.6.28 +Obsoletes: kernel-kdump-extra <= 2.6.28 +%endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) @@ -1046,7 +1056,10 @@ Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) - +%ifarch ppc64 +Provides: kernel-kdump-devel = 2.6.28 +Obsoletes: kernel-kdump-devel <= 2.6.28 +%endif PreReq: coreutils %description devel ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -150,8 +150,6 @@ Obsoletes: kernel-smp <= 2.6.17 Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 %endif %ifarch ppc64 Provides: kernel-kdump = 2.6.28 @@ -160,20 +158,34 @@ %ifarch s390x Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 %endif %ifarch x86_64 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 Provides: kernel-trace = 3.13 Obsoletes: kernel-trace <= 3.13 -Provides: kernel-trace-base = 3.13 -Obsoletes: kernel-trace-base <= 3.13 Provides: kernel-bigsmp = 3.1 Obsoletes: kernel-bigsmp <= 3.1 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch %ix86 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +%ifarch s390x +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch x86_64 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +Provides: kernel-bigsmp-base = 3.1 +Obsoletes: kernel-bigsmp-base <= 3.1 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -978,7 +990,24 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch %ix86 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch ppc64 +Provides: kernel-kdump-base = 2.6.28 +Obsoletes: kernel-kdump-base <= 2.6.28 +%endif +%ifarch s390x +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +%endif +%ifarch x86_64 +Provides: kernel-trace-base = 3.13 +Obsoletes: kernel-trace-base <= 3.13 +Provides: kernel-bigsmp-base = 3.1 +Obsoletes: kernel-bigsmp-base <= 3.1 +%endif %ifarch %ix86 Conflicts: libc.so.6()(64bit) %endif @@ -1020,6 +1049,10 @@ Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 %endif +%ifarch ppc64 +Provides: kernel-kdump-extra = 2.6.28 +Obsoletes: kernel-kdump-extra <= 2.6.28 +%endif %ifarch s390x Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 @@ -1027,6 +1060,8 @@ %ifarch x86_64 Provides: kernel-trace-extra = 3.13 Obsoletes: kernel-trace-extra <= 3.13 +Provides: kernel-bigsmp-extra = 3.1 +Obsoletes: kernel-bigsmp-extra <= 3.1 %endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 @@ -1082,6 +1117,10 @@ Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 %endif +%ifarch ppc64 +Provides: kernel-kdump-devel = 2.6.28 +Obsoletes: kernel-kdump-devel <= 2.6.28 +%endif %ifarch s390x Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 @@ -1089,6 +1128,8 @@ %ifarch x86_64 Provides: kernel-trace-devel = 3.13 Obsoletes: kernel-trace-devel <= 3.13 +Provides: kernel-bigsmp-devel = 3.1 +Obsoletes: kernel-bigsmp-devel <= 3.1 %endif PreReq: coreutils ++++++ kernel-desktop.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: Kernel optimized for the desktop License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -27,9 +27,9 @@ Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif ++++++ kernel-ec2.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Amazon EC2 Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh kernel-lpae.spec: same change ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -33,7 +33,7 @@ %ifarch %ix86 x86_64 BuildRequires: kernel-xen %endif -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1315 # For SLE 11 BuildRequires: mkinitrd @@ -45,9 +45,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -147,9 +147,14 @@ cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen %endif +#inform worker about arch +#see obs-build commit e47399d738e51 +uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm + %files %defattr(-,root,root) /.build.kernel.* /.build.initrd.* +/.build.hostarch.* %changelog ++++++ kernel-obs-qa-xen.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-xen - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 3.19.4 +%define patchversion 4.0.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -28,7 +28,7 @@ # here as well to avoid that qa and build package build parallel BuildRequires: kernel-obs-build BuildRequires: modutils -ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc ppc64 ppc64le s390x x86_64 +ExclusiveArch: aarch64 armv6hl armv7hl %ix86 ppc64 ppc64le s390x x86_64 %if 0%{?suse_version} < 1200 # for SLE 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-default - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -151,7 +151,11 @@ Provides: kernel-vmi = 2.6.38 Obsoletes: kernel-vmi <= 2.6.38 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +%ifarch %ix86 +Provides: kernel-vmi-base = 2.6.38 +Obsoletes: kernel-vmi-base <= 2.6.38 +%endif +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh @@ -1011,7 +1015,10 @@ Requires(post): modutils Requires(post): perl-Bootloader Requires(post): mkinitrd - +%ifarch %ix86 +Provides: kernel-vmi-extra = 2.6.38 +Obsoletes: kernel-vmi-extra <= 2.6.38 +%endif Supplements: packageand(product(SUSE_SLED):%{name}_%_target_cpu) %ifarch %ix86 Conflicts: libc.so.6()(64bit) @@ -1069,7 +1076,10 @@ Provides: multiversion(kernel) Requires: kernel-devel%variant = %version-%source_rel Supplements: packageand(%name:kernel-devel%variant) - +%ifarch %ix86 +Provides: kernel-vmi-devel = 2.6.38 +Obsoletes: kernel-vmi-devel <= 2.6.38 +%endif PreReq: coreutils %description devel ++++++ kernel-pv.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The para-virtualized Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -45,7 +45,7 @@ Provides: %name = %version-%source_rel Provides: linux Provides: multiversion(kernel) -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 3.19.4 +Version: 4.0.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif ++++++ kernel-vanilla.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Standard Kernel - without any SUSE patches License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -146,7 +146,8 @@ %endif Provides: kernel = %version-%source_rel -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ kernel-xen.spec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:52.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:52.000000000 +0200 @@ -19,8 +19,8 @@ # This makes the OBS store the project cert as %_sourcedir/_projectcert.crt # needssslcertforbuild -%define srcversion 3.19 -%define patchversion 3.19.4 +%define srcversion 4.0 +%define patchversion 4.0.0 %define variant %{nil} %define vanilla_only 0 @@ -59,9 +59,9 @@ Summary: The Xen Kernel License: GPL-2.0 Group: System/Kernel -Version: 3.19.4 +Version: 4.0.0 %if 0%{?is_kotd} -Release: <RELEASE>.g74c332b +Release: <RELEASE>.g27299c0 %else Release: 0 %endif @@ -149,7 +149,8 @@ Provides: kernel-xenpae = 2.6.17 Obsoletes: kernel-xenpae <= 2.6.17 %endif -Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%srcversion.tar.xz + +Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%srcversion.tar.xz Source2: source-post.sh Source3: kernel-source.rpmlintrc Source8: devel-pre.sh ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.19 +SRCVERSION=4.0 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 30154 lines of diff (skipped) ++++++ guards ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -53,7 +53,17 @@ my $dh = new FileHandle; my (@files, $file); - + # @<file> syntax + if ($path =~ s/^@//) { + my $fh; + open($fh, '<', $path) or die "$path: $!\n"; + @files = <$fh>; + close($fh); + chomp(@files); + s:^$dir:: for @files; + return @files; + } + $path = slashme($path); opendir $dh, length("$dir$path") ? "$dir$path" : '.' or die "$dir$path: $!\n"; while ($file = readdir($dh)) { @@ -112,8 +122,8 @@ print "SYNOPSIS: $0 [--prefix=dir] [--path=dir1:dir2:...]\n" . " [--default=0|1] [--check|--list] [--invert-match]\n" . " [--with-guards] [--config=file] symbol ...\n\n" . - " (Default values: --path='" . join(':', @path) . "', " . - "--default=$default)\n"; + " Defaults: --default=$default\n" . + " Use --path=\@<file> to read the list of entries from <file>\n"; exit 0; } @@ -158,7 +168,7 @@ my @files; foreach (@path) { - @files = (@files, files_in($dir, slashme($_))); + @files = (@files, files_in($dir,$_)); } my %files = map { $_ => 0 } @files; @@ -167,7 +177,11 @@ if (exists $files{$patch}) { $files{$patch}++; } else { - print "Not found: $dir$patch\n"; + if ($config eq '-') { + print "Not found: $dir$patch\n"; + } else { + print "Not found in $config: $dir$patch\n"; + } $problems++; }}); ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -146,6 +146,7 @@ %endif Provides: kernel = %version-%source_rel @PROVIDES_OBSOLETES@ +@PROVIDES_OBSOLETES_BASE@ @SOURCES@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: @ARCHS@ ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -147,9 +147,14 @@ cp -v /tmp/initrd.xen $RPM_BUILD_ROOT/.build.initrd.xen %endif +#inform worker about arch +#see obs-build commit e47399d738e51 +uname -m > $RPM_BUILD_ROOT/.build.hostarch.kvm + %files %defattr(-,root,root) /.build.kernel.* /.build.initrd.* +/.build.hostarch.* %changelog ++++++ kernel-obs-qa.spec.in ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -59,15 +59,12 @@ # test suites should be packaged in other packages, but build required # and called here. -if ! /sbin/modprobe loop; then - echo "ERROR: Unable to load the kernel loop module." - echo "Usually the wrong kernel is running, this is atm" - cat /proc/version - echo "Installed kernel modules are:" - rpm -q kernel-@FLAVOR@ - exit 1 +krel=$(uname -r) +if test ! -d "/lib/modules/$krel/kernel"; then + echo "Kernel package for $krel not installed; exiting" + exit 0 fi - +/sbin/modprobe loop %install mkdir -p %{buildroot}/usr/share/%name ++++++ linux-3.19.tar.xz -> linux-4.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-3.19.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.0.tar.xz differ: char 26, line 1 ++++++ mkspec ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -99,19 +99,19 @@ $description = $binary_descriptions{"kernel-$flavor"}->[1]; } + my %obsolete_macros; + for my $subpac ("", "-base", "-extra", "-devel", "-hmac") { + (my $macro = "PROVIDES_OBSOLETES" . uc($subpac)) =~ s/-/_/; + $obsolete_macros{$macro} = + provides_obsoletes($flavor, $subpac, @{$flavor_archs{$flavor}}); + } + do_spec('binary', "kernel-$flavor.spec", %macros, FLAVOR => $flavor, SUMMARY => $summary, DESCRIPTION => $description, ARCHS => join(" ", arch2rpm(@{$flavor_archs{$flavor}})), - PROVIDES_OBSOLETES => - provides_obsoletes($flavor, @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_BASE => - provides_obsoletes("$flavor-base", @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_EXTRA => - provides_obsoletes("$flavor-extra", @{$flavor_archs{$flavor}}), - PROVIDES_OBSOLETES_DEVEL => - provides_obsoletes("$flavor-devel", @{$flavor_archs{$flavor}}), + %obsolete_macros ); } # kernel-source.spec @@ -144,7 +144,10 @@ # kernel-obs-*.spec { - my $default_archs = join(" ", arch2rpm(@{$flavor_archs{default}})); + my @default_archs = arch2rpm(@{$flavor_archs{default}}); + # No kernel-obs-* for 32bit ppc + @default_archs = grep { $_ ne "ppc" } @default_archs; + my $default_archs = join(" ", @default_archs); my $xen_archs = join(" ", arch2rpm(@{$flavor_archs{xen} || []})); if (!$variant) { do_spec('obs-build', "kernel-obs-build.spec", %macros, @@ -329,22 +332,34 @@ sub provides_obsoletes { my $flavor = shift; + my $subpac = shift; my @archs = @_; my $res = ""; for my $arch (@archs) { my @packs = @{$obsolete_packages{$arch}{$flavor} || []}; + my $printed; + next if (!@packs); my $rpmarch = arch2rpm($arch); chomp $rpmarch; - $res .= "\%ifarch $rpmarch\n"; for my $pack (@packs) { - my $name = $pack->[0]; + my $name = $pack->[0] . $subpac; my $version = $pack->[1]; + if ($subpac) { + # The -base and -extra split has been + # introduced in SLE11 (2.6.27) + my ($v1, $v2, $v3) = split(/\./, $version); + next if ($v1 <= 2 && $v2 <= 6 && $v3 < 27); + } + if (!$printed) { + $res .= "\%ifarch $rpmarch\n"; + $printed = 1; + } $res .= "Provides: $name = $version\n"; $res .= "Obsoletes: $name <= $version\n"; } - $res .= "\%endif\n"; + $res .= "\%endif\n" if $printed; } chomp $res; return $res; ++++++ old-flavors ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:53.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:53.000000000 +0200 @@ -26,21 +26,11 @@ # SLES 11 GA only / 11.4 i386/pae vmi 2.6.38 -i386/pae-base vmi-base 2.6.38 # SLES 11 SP3 / openSUSE 13.1 i386/default trace 3.13 -i386/default trace-base 3.13 -i386/default-extra trace-extra 3.13 -i386/default-devel trace-devel 3.13 x86_64/default trace 3.13 -x86_64/default trace-base 3.13 -x86_64/default-extra trace-extra 3.13 -x86_64/default-devel trace-devel 3.13 x86_64/default bigsmp 3.1 s390x/default trace 3.13 -s390x/default trace-base 3.13 -s390x/default-extra trace-extra 3.13 -s390x/default-devel trace-devel 3.13 ++++++ patches.arch.tar.bz2 ++++++ ++++ 8653 lines of diff (skipped) ++++++ patches.drivers.tar.bz2 ++++++ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch --- old/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -From f06b6b4778a54a4b5af39b59af01ff6106c8ab68 Mon Sep 17 00:00:00 2001 -From: Michal Marek <mmarek(a)suse.cz> -Date: Mon, 26 Jan 2015 11:25:26 +0100 -Subject: [PATCH] DocBook: Do not exceed argument list limit -Patch-mainline: Submitted 2015-01-26 - -Use find + xargs to compress the generated manpages. Without this patch, -the build can fail with - - gzip -f Documentation/DocBook/man/*.9 - /bin/bash: /usr/bin/gzip: Argument list too long - -This happened with qemu user mode emulation on aarch64. - -Signed-off-by: Michal Marek <mmarek(a)suse.cz> ---- - Documentation/DocBook/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile -index 9c7d92d..b6a6a2e 100644 ---- a/Documentation/DocBook/Makefile -+++ b/Documentation/DocBook/Makefile -@@ -56,7 +56,7 @@ htmldocs: $(HTML) - - MAN := $(patsubst %.xml, %.9, $(BOOKS)) - mandocs: $(MAN) -- $(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9) -+ find $(obj)/man -name '*.9' | xargs gzip -f - - installmandocs: mandocs - mkdir -p /usr/local/man/man9/ --- -2.1.2 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/btrfs-simplify-insert_orphan_item.patch new/patches.fixes/btrfs-simplify-insert_orphan_item.patch --- old/patches.fixes/btrfs-simplify-insert_orphan_item.patch 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/btrfs-simplify-insert_orphan_item.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -From: David Sterba <dsterba(a)suse.cz> -Date: Fri, 2 Jan 2015 19:12:57 +0100 -Subject: [PATCH 13/97] btrfs: simplify insert_orphan_item -References: boo#926385 -Git-commit: 9c4f61f01d269815bb7c37be3ede59c5587747c6 -Patch-mainline: 4.0 - -We can search and add the orphan item in one go, -btrfs_insert_orphan_item will find out if the item already exists. - -[Bug introduced in 3.19.1 stable, depends on -381cf6587f8a8a8e981bc0c1aaaa8859b51dc756 ] - -Signed-off-by: David Sterba <dsterba(a)suse.cz> ---- - fs/btrfs/tree-log.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c -index 5be45c12dd71..25a1c363a5f4 100644 ---- a/fs/btrfs/tree-log.c -+++ b/fs/btrfs/tree-log.c -@@ -1254,21 +1254,13 @@ out: - } - - static int insert_orphan_item(struct btrfs_trans_handle *trans, -- struct btrfs_root *root, u64 offset) -+ struct btrfs_root *root, u64 ino) - { - int ret; -- struct btrfs_path *path; -- -- path = btrfs_alloc_path(); -- if (!path) -- return -ENOMEM; - -- ret = btrfs_find_item(root, path, BTRFS_ORPHAN_OBJECTID, -- offset, BTRFS_ORPHAN_ITEM_KEY, NULL); -- if (ret > 0) -- ret = btrfs_insert_orphan_item(trans, root, offset); -- -- btrfs_free_path(path); -+ ret = btrfs_insert_orphan_item(trans, root, ino); -+ if (ret == -EEXIST) -+ ret = 0; - - return ret; - } --- -2.1.3 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable new/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable --- old/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable 2015-04-08 15:45:02.000000000 +0200 +++ new/patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable 1970-01-01 01:00:00.000000000 +0100 @@ -1,73 +0,0 @@ -From 8218c3f4df3bb1c637c17552405039a6dd3c1ee1 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter <daniel.vetter(a)ffwll.ch> -Date: Fri, 27 Feb 2015 12:58:13 +0100 -Subject: [PATCH] drm: Fixup racy refcounting in plane_force_disable -Git-commit: 8218c3f4df3bb1c637c17552405039a6dd3c1ee1 -Patch-mainline: 4.0-rc6 -References: boo#925946 - -Originally it was impossible to be dropping the last refcount in this -function since there was always one around still from the idr. But in - -commit 83f45fc360c8e16a330474860ebda872d1384c8c -Author: Daniel Vetter <daniel.vetter(a)ffwll.ch> -Date: Wed Aug 6 09:10:18 2014 +0200 - - drm: Don't grab an fb reference for the idr - -we've switched to weak references, broke that assumption but forgot to -fix it up. - -Since we still force-disable planes it's only possible to hit this -when racing multiple rmfb with fbdev restoring or similar evil things. -As long as userspace is nice it's impossible to hit the BUG_ON. - -But the BUG_ON would most likely be hit from fbdev code, which usually -invovles the console_lock besides all modeset locks. So very likely -we'd never get the bug reports if this was hit in the wild, hence -better be safe than sorry and backport. - -Spotted by Matt Roper while reviewing other patches. - -[airlied: pull this back into 4.0 - the oops happens there] - -Cc: stable(a)vger.kernel.org -Cc: Matt Roper <matthew.d.roper(a)intel.com> -Reviewed-by: Matt Roper <matthew.d.roper(a)intel.com> -Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> -Signed-off-by: Dave Airlie <airlied(a)redhat.com> -Acked-by: Takashi Iwai <tiwai(a)suse.de> - ---- - drivers/gpu/drm/drm_crtc.c | 13 +------------ - 1 file changed, 1 insertion(+), 12 deletions(-) - ---- a/drivers/gpu/drm/drm_crtc.c -+++ b/drivers/gpu/drm/drm_crtc.c -@@ -531,17 +531,6 @@ void drm_framebuffer_reference(struct dr - } - EXPORT_SYMBOL(drm_framebuffer_reference); - --static void drm_framebuffer_free_bug(struct kref *kref) --{ -- BUG(); --} -- --static void __drm_framebuffer_unreference(struct drm_framebuffer *fb) --{ -- DRM_DEBUG("%p: FB ID: %d (%d)\n", fb, fb->base.id, atomic_read(&fb->refcount.refcount)); -- kref_put(&fb->refcount, drm_framebuffer_free_bug); --} -- - /** - * drm_framebuffer_unregister_private - unregister a private fb from the lookup idr - * @fb: fb to unregister -@@ -1322,7 +1311,7 @@ void drm_plane_force_disable(struct drm_ - return; - } - /* disconnect the plane from the fb and crtc: */ -- __drm_framebuffer_unreference(plane->old_fb); -+ drm_framebuffer_unreference(plane->old_fb); - plane->old_fb = NULL; - plane->fb = NULL; - plane->crtc = NULL; ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 22023 lines of diff (skipped) ++++++ patches.rpmify.tar.bz2 ++++++ ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch new/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch --- old/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch 2015-04-24 13:46:53.000000000 +0200 @@ -0,0 +1,82 @@ +From: Petr Mladek <pmladek(a)suse.cz> +Date: Tue, 3 Jun 2014 16:19:24 +0200 +Subject: [PATCH 3/3] ftrace/x86/xen: use kernel identity mapping only when + really needed +Patch-mainline: Cleaner solution is needed once the related Xen part gets upstream +Reference: bsc#873195, bsc#886272, bsc#903727, bsc#927725 + +The dynamic ftrace is not correctly initialized when the kernel is being loaded +using the Xen hypervisor: + +[ 0.150025] ftrace: allocating 27371 entries in 107 pages +[ 0.156405] ------------[ cut here ]------------ +[ 0.156594] WARNING: CPU: 0 PID: 0 at kernel/trace/ftrace.c:1759 ftrace_bug+0x21f/0x250() +[ 0.156909] Modules linked in: +[ 0.157126] Supported: Yes +[ 0.157282] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 3.12.20-77.gb9ca132-xen+ #402 +[ 0.157563] Hardware name: /DG965WH, BIOS MQ96510J.86A.1687.2007.0510.0258 05/10/2007 +[ 0.157869] ffffffff809c4902 ffffffff80c2fee8 ffffffff80737e9d ffffffff80c2fee8 +[ 0.158406] ffffffff800361bc ffff880000004018 0000000000000000 ffffffff80004018 +[ 0.158915] 0000000000000000 ffff8800abc87820 0000000000000000 ffffffff80004018 +[ 0.159426] Call Trace: +[ 0.159616] [<ffffffff80008e38>] dump_trace+0x78/0x1c0 +[ 0.159808] [<ffffffff80008b00>] show_stack_log_lvl+0xf0/0x150 +[ 0.160000] [<ffffffff8000a5b5>] show_stack+0x25/0x50 +[ 0.160000] [<ffffffff80737e9d>] dump_stack+0x6a/0x7d +[ 0.160000] [<ffffffff800361bc>] warn_slowpath_common+0x8c/0xc0 +[ 0.160000] [<ffffffff800d835f>] ftrace_bug+0x21f/0x250 +[ 0.160000] [<ffffffff800d8642>] ftrace_update_code+0x212/0x330 +[ 0.160000] [<ffffffff800dac29>] ftrace_process_locs+0x1b9/0x270 +[ 0.160000] [<ffffffff80d27ed4>] ftrace_init+0xd2/0x15e +[ 0.160000] [<ffffffff80d14cff>] start_kernel+0x407/0x4c8 +[ 0.160000] ---[ end trace 0b1cf71181aff5a9 ]--- +[ 0.160000] ftrace faulted on writing [<ffffffff80004018>] do_one_initcall+0x18/0x1e0 + +The problem is that the kernel identity mapping is set read only very early +in this situation, see make_readonly() that is called from xen_init_pt(). + +This patch uses the fact that the kernel text mapping is set read only in +kernel_init() that is called after ftrace_init(). Therefore we could safely +use the kernel text mapping during the ftrace initialization. + +The change of the kernel text mapping permissions is signalized by the global +variable "kernel_set_to_readonly", see mark_rodata_ro(). + +A cleaner solution would be to introduce another global variable that would +signalize the change of permissions in the kernel identity mapping. Then we +could create another helper functions that could modify permission only +of the kernel identity mapping and call them from ftrace_init(). Note that +the existing set_kernel_text_rw() and set_kernel_text_ro() modify the kernel +text mapping as well. But this is complicated and can not be accepted upstream +because the Xen code is still not there. + +Signed-off-by: Petr Mladek <pmladek(a)suse.cz> +--- + arch/x86/kernel/ftrace.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/arch/x86/kernel/ftrace.c ++++ b/arch/x86/kernel/ftrace.c +@@ -84,12 +84,20 @@ static unsigned long text_ip_addr(unsign + * CONFIG_DEBUG_RODATA. So we use the kernel identity mapping instead + * of the kernel text mapping to modify the kernel text. + * ++ * This is not needed when the kernel is not set read only. In fact, ++ * the kernel text mapping might be read only when this function is ++ * called from ftrace_init() and the kernel was loaded under ++ * Xen hypervisor. In this situation, we could safely use the ++ * kernel text mapping. ++ * + * For 32bit kernels, these mappings are same and we can use + * kernel identity mapping to modify code. + */ +- if (within(ip, (unsigned long)_text, (unsigned long)_etext)) ++#ifdef CONFIG_DEBUG_RODATA ++ if (kernel_set_to_readonly && ++ within(ip, (unsigned long)_text, (unsigned long)_etext)) + ip = (unsigned long)__va(__pa_symbol(ip)); +- ++#endif + return ip; + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2015-01-21 19:22:32.000000000 +0100 +++ new/patches.suse/supported-flag 2015-04-24 13:46:53.000000000 +0200 @@ -48,9 +48,9 @@ --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -843,6 +843,18 @@ can be ORed together: - 8192 - An unsigned module has been loaded in a kernel supporting module signature. 16384 - A soft lockup has previously occurred on the system. + 32768 - The kernel has been live patched. + 0x40000000 - An unsupported kernel module was loaded. + 0x80000000 - An kernel module with external support was loaded. + @@ -93,8 +93,8 @@ /* * Only to be used by arch init code. If the user over-wrote the default @@ -472,6 +475,15 @@ extern enum system_states { - #define TAINT_UNSIGNED_MODULE 13 #define TAINT_SOFTLOCKUP 14 + #define TAINT_LIVEPATCH 15 +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED +/* @@ -322,9 +322,9 @@ --- a/kernel/panic.c +++ b/kernel/panic.c @@ -226,6 +226,10 @@ static const struct tnt tnts[] = { - { TAINT_OOT_MODULE, 'O', ' ' }, { TAINT_UNSIGNED_MODULE, 'E', ' ' }, { TAINT_SOFTLOCKUP, 'L', ' ' }, + { TAINT_LIVEPATCH, 'K', ' ' }, +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED + { TAINT_NO_SUPPORT, 'N', ' ' }, + { TAINT_EXTERNAL_SUPPORT, 'X', ' ' }, @@ -333,9 +333,9 @@ /** @@ -246,6 +250,8 @@ static const struct tnt tnts[] = { - * 'O' - Out-of-tree module has been loaded. * 'E' - Unsigned module has been loaded. * 'L' - A soft lockup has previously occurred. + * 'K' - Kernel has been live patched. + * 'N' - Unsuported modules loaded. + * 'X' - Modules with external support loaded. * ++++++ patches.xen.tar.bz2 ++++++ ++++ 11480 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:55.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:55.000000000 +0200 @@ -27,10 +27,6 @@ # DO NOT MODIFY THEM! # Send separate patches upstream if you find a problem... ######################################################## - patches.kernel.org/patch-3.19.1 - patches.kernel.org/patch-3.19.1-2 - patches.kernel.org/patch-3.19.2-3 - patches.kernel.org/patch-3.19.3-4 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -66,7 +62,6 @@ patches.suse/supported-flag-external patches.suse/genksyms-add-override-flag.diff patches.suse/kconfig-automate-kernel-desktop - patches.fixes/0001-DocBook-Do-not-exceed-argument-list-limit.patch ######################################################## # Simple export additions/removals @@ -174,8 +169,26 @@ patches.arch/arm64-0007-arm64-Do-not-call-enable-PCI-resources-when-specify-.patch patches.arch/arm64-0010-KVM-ARM-Hack-to-enable-VGIC-mapping-on-64k-PAGE_SIZE.patch patches.arch/arm64-0011-Enable-CONFIG_COMPAT-also-for-64k-page-size.patch - patches.arch/arm64-0012-generic-pci.patch - patches.arch/arm64-fix-mmap2-compat-syscall.patch + patches.arch/arm64-0012-fix-mmap2-compat-syscall.patch + + # Generic PCIe host bridge, necessary for QEMU and Seattle, upstreaming wip + patches.arch/arm64-gpex-0001-device-core-Introduce-per-device-MSI-domain-pointer.patch + patches.arch/arm64-gpex-0002-PCI-MSI-add-hooks-to-populate-the-msi_domain-field.patch + patches.arch/arm64-gpex-0003-PCI-MSI-of-add-support-for-OF-provided-msi_domain.patch + patches.arch/arm64-gpex-0004-PCI-MSI-Let-pci_msi_get_domain-use-struct-device-s-m.patch + patches.arch/arm64-gpex-0005-irqchip-GICv2m-Get-rid-of-struct-msi_controller.patch + patches.arch/arm64-gpex-0006-irqchip-gicv3-its-Get-rid-of-struct-msi_controller.patch + patches.arch/arm64-gpex-0007-PCI-MSI-Drop-domain-field-from-msi_controller.patch + patches.arch/arm64-gpex-0008-PCI-MSI-of-Allow-msi_domain-lookup-using-the-PHB-nod.patch + patches.arch/arm64-gpex-0009-pci-Enable-pci-host-generic-support-for-ARM64.patch + + # DMA Cache coherency fixups with PCIe, necessary for m400, all are backports from 4.1 + patches.arch/arm64-pci-0001-of-pci-Add-of_pci_dma_configure-to-update-DMA-config.patch + patches.arch/arm64-pci-0002-PCI-Update-DMA-configuration-from-DT.patch + patches.arch/arm64-pci-0003-PCI-Add-helper-functions-pci_get-put-_host_bridge_de.patch + patches.arch/arm64-pci-0004-of-iommu-Add-ptr-to-OF-node-arg-to-of_iommu_configur.patch + patches.arch/arm64-pci-0005-of-Move-of_dma_configure-to-device.c-to-help-re-use.patch + patches.arch/arm64-pci-0006-of-Fix-size-when-dma-range-is-not-used.patch ######################################################## # S/390 @@ -261,7 +274,6 @@ # btrfs ######################################################## patches.suse/btrfs-use-correct-device-for-maps.patch - patches.fixes/btrfs-simplify-insert_orphan_item.patch patches.fixes/btrfs-fix-inode-eviction-infinite-loop-after-cloning.patch ######################################################## @@ -347,7 +359,6 @@ # DRM/Video ######################################################## +jeffm patches.fixes/nouveau-fix-race-with-fence-signaling - patches.fixes/drm-Fixup-racy-refcounting-in-plane_force_disable ######################################################## # video4linux @@ -486,6 +497,9 @@ # Performance Monitoring, Tracing etc ######################################################## + # failed to initialize ftrace in kernel-xen (bsc#873195) + patches.suse/ftrace-x86-xen-use-kernel-identity-mapping-only-when.patch + ######################################################## # KVM patches ######################################################## @@ -588,6 +602,7 @@ patches.xen/xen3-patch-3.17 patches.xen/xen3-patch-3.18 patches.xen/xen3-patch-3.19 + patches.xen/xen3-patch-4.0 # ports of other patches patches.xen/xen3-stack-unwind ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.bGKv3H/_old 2015-04-27 22:08:56.000000000 +0200 +++ /var/tmp/diff_new_pack.bGKv3H/_new 2015-04-27 22:08:56.000000000 +0200 @@ -1,3 +1,3 @@ -2015-04-14 06:39:50 +0200 -GIT Revision: 74c332ba11409dc319e7ed43fbf41416eabe8534 +2015-04-24 14:39:28 +0200 +GIT Revision: 27299c0b9ca0fe19144d2e22df9bbf0acfa01938 GIT Branch: stable

1 0

commit valgrind for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package valgrind for openSUSE:Factory checked in at 2015-04-27 22:07:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/valgrind (Old) and /work/SRC/openSUSE:Factory/.valgrind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "valgrind" Changes: -------- --- /work/SRC/openSUSE:Factory/valgrind/valgrind.changes 2015-04-06 00:25:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.valgrind.new/valgrind.changes 2015-04-27 22:08:42.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 07:08:01 UTC 2015 - dimstar(a)opensuse.org + +- Add valgrind-linux-4.0.patch: Fix build with linux kernel 4.0+. + Taken from svn, rev 14955. + +------------------------------------------------------------------- New: ---- valgrind-linux-4.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ valgrind.spec ++++++ --- /var/tmp/diff_new_pack.pj6Zkf/_old 2015-04-27 22:08:43.000000000 +0200 +++ /var/tmp/diff_new_pack.pj6Zkf/_new 2015-04-27 22:08:43.000000000 +0200 @@ -38,6 +38,7 @@ Patch2: armv6-support.diff Patch3: glibc-version.patch Patch4: gcc-version.patch +Patch5: valgrind-linux-4.0.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook_4 @@ -113,6 +114,7 @@ %patch2 %patch3 -p1 %patch4 +%patch5 %build %ifarch %arm ++++++ valgrind-linux-4.0.patch ++++++ Index: configure.ac =================================================================== --- configure.ac (revision 14954) +++ configure.ac (revision 14955) @@ -325,20 +325,14 @@ kernel=`uname -r` case "${kernel}" in - 2.6.*|3.*) - AC_MSG_RESULT([2.6.x/3.x family (${kernel})]) - AC_DEFINE([KERNEL_2_6], 1, [Define to 1 if you're using Linux 2.6.x or Linux 3.x]) + 0.*|1.*|2.0.*|2.1.*|2.2.*|2.3.*|2.4.*|2.5.*) + AC_MSG_RESULT([unsupported (${kernel})]) + AC_MSG_ERROR([Valgrind needs a Linux kernel >= 2.6]) ;; - 2.4.*) - AC_MSG_RESULT([2.4 family (${kernel})]) - AC_DEFINE([KERNEL_2_4], 1, [Define to 1 if you're using Linux 2.4.x]) - ;; - - *) - AC_MSG_RESULT([unsupported (${kernel})]) - AC_MSG_ERROR([Valgrind works on kernels 2.4, 2.6]) - ;; + *) + AC_MSG_RESULT([2.6 or later (${kernel})]) + ;; esac ;;

1 0

commit yast2-trans for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at 2015-04-27 22:07:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-trans (Old) and /work/SRC/openSUSE:Factory/.yast2-trans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-trans" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-trans/yast2-trans.changes 2014-12-21 12:03:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-trans.new/yast2-trans.changes 2015-04-27 22:07:57.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 20 18:21:46 CEST 2015 - ke(a)suse.de + +- Updated languages: af am ar be bg bn bs ca cs cy da de el eo es et eu + fa fi fr gl gu he hi hr hu id it ja jv ka km kn ko ku lo lt mk mr ms my + nb nl nn pa pl pt ro ru si sk sl sr sv sw ta tg th tk tr uk vi wa xh zu + en_GB en_US pt_BR zh_CN zh_TW ast nds. + +------------------------------------------------------------------------ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.LbfZXe/_old 2015-04-27 22:08:04.000000000 +0200 +++ /var/tmp/diff_new_pack.LbfZXe/_new 2015-04-27 22:08:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-trans # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed ++++++ yast2-trans-af-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-af-3.1.0/po/installation.af.po new/yast2-trans-af-3.1.0/po/installation.af.po --- old/yast2-trans-af-3.1.0/po/installation.af.po 2014-10-29 16:46:36.000000000 +0100 +++ new/yast2-trans-af-3.1.0/po/installation.af.po 2015-04-20 18:12:11.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-11-03 14:26\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Fop" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Fop" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -44,15 +34,19 @@ " benodig 'n profiel om te weet hoe die geïnstalleerde stelsel daar behoort uit te sien. As hierdie opsie \n" " gekies word, word 'n profiel van die huidige stelsel in /root/autoyast.xml geberg.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Skryf van die stelselkonfigurasie" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -60,27 +54,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopieer van lêers na geïnstalleerde stelsel ..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopieer van opgawelêers na geïnstalleerde stelsel ..." @@ -1099,7 +1089,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Wysig ..." @@ -1511,161 +1501,161 @@ "Staak van installasie." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Verwyder" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Ontsperde" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Versperde" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Kies bykomende hulpbronne:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Huidige status:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "&Profielbewaarplek:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Knikkerstatus" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Onbekend" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Bronne om te registreer" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "program is nie gekonfigureer nie" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Kies bykomende hulpbronne:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "Wag asseblief terwyl die afbeelding onttrek word.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Lees konfigurasie wat voorheen geberg is" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Lees van konfigurasie wat voorheen geberg is ..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Lees konfigurasie wat voorheen geberg is" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Kies bykomende hulpbronne:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Lees konfigurasie wat voorheen geberg is" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Kies bykomende hulpbronne:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1675,7 +1665,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1685,7 +1675,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1697,7 +1687,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1707,7 +1697,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1718,7 +1708,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1843,13 +1833,6 @@ msgstr "Lees van veiligheidsinstellings ..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Berg van klankkaartinstellings ..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Berg van hardewarekonfigurasie ..." @@ -2036,19 +2019,19 @@ " Nota: U sal dalk weer van die inligting moet invoer." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Bevestig installasie" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Alle inligting wat vir die basisinstallasie vereis word, is nou volledig." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2062,7 +2045,7 @@ " ooreenkomstig die installasie-instellings in die vorige dialoë." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2075,24 +2058,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "As u onseker is, gaan terug en gaan die instellings na." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Bevestig bywerking" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Alle inligting wat vereis word om 'n bywerking uit te voer, is nou volledig." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2104,7 +2087,7 @@ " ooreenkomstig die instellings in die vorige dialoë." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Begin &bywerking" @@ -2197,6 +2180,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Fop" + +#~ msgid "&Dummy" +#~ msgstr "&Fop" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Berg van klankkaartinstellings ..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "moet weer geïnstalleer word" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-af-3.1.0/po/status.txt new/yast2-trans-af-3.1.0/po/status.txt --- old/yast2-trans-af-3.1.0/po/status.txt 2014-12-16 14:20:09.000000000 +0100 +++ new/yast2-trans-af-3.1.0/po/status.txt 2015-04-20 18:12:27.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7362 -Fuzzy : 6271 +Translated : 7360 +Fuzzy : 6270 Untranslated : 3841 -------------------- - All strings : 17474 + All strings : 17471 42 % are translated ++++++ yast2-trans-am-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-am-3.1.0/po/installation.am.po new/yast2-trans-am-3.1.0/po/installation.am.po --- old/yast2-trans-am-3.1.0/po/installation.am.po 2014-10-29 16:52:21.000000000 +0100 +++ new/yast2-trans-am-3.1.0/po/installation.am.po 2015-04-20 17:54:41.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2002-07-18 14:04+0200\n" "Last-Translator: Alemayehu Gemeda <netsasoft(a)gmail.com>\n" "Language-Team: Amharic <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-am-3.1.0/po/status.txt new/yast2-trans-am-3.1.0/po/status.txt --- old/yast2-trans-am-3.1.0/po/status.txt 2014-12-16 15:00:00.000000000 +0100 +++ new/yast2-trans-am-3.1.0/po/status.txt 2015-04-20 17:54:43.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 Fuzzy : 0 -Untranslated : 17474 +Untranslated : 17471 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-ar-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ar-3.1.0/po/installation.ar.po new/yast2-trans-ar-3.1.0/po/installation.ar.po --- old/yast2-trans-ar-3.1.0/po/installation.ar.po 2014-10-29 17:09:17.000000000 +0100 +++ new/yast2-trans-ar-3.1.0/po/installation.ar.po 2015-04-20 18:01:51.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2014-09-07 10:12+0300\n" "Last-Translator: malhargan <malham1(a)gmail.com>\n" "Language-Team: openSUSE\n" @@ -24,16 +24,6 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Virtaal 0.7.1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "وهمي" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "و&همي" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -52,39 +42,39 @@ "المستخدم. AutoYaST يحتاج تشكيل جانبي لمعرفة كيف ينبغي أن يبدو نظام التثبيت. إذا تم تحديد هذا الخيار، يتم تخزين ملف تعريف \n" "للنظام الحالي في <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "إعداد نظام الاستنساخ" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "إعداد نظام الاستنساخ" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "ستتم كتابة ملف تعريف AutoYaST في/root/autoinst.xml (<a href=\"%1\">لا تكتب عليه</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "لن يتم حفظ تشكيل AutoYaST الجانبي (<a href=\"%1\">كتابة</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "كتابة ملف تعريف AutoYaST في/root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "يتم الآن نسخ الملفات إلى النظام المثبَّت..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "يتم الآن نسخ ملفات السجل إلى النظام المثبَّت..." @@ -1050,7 +1040,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "ت&غيير..." @@ -1420,31 +1410,31 @@ "إحباط عملية التثبيت." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "تمت إزالته" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "مُمكّن" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "معطل" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "المستودعات المستخدمة سابقا" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1453,27 +1443,27 @@ "أنت تقوم بالترقية:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "الوضع الحالي" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "المتسودع" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "رابط" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "تبدي&ل الحالة" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1482,7 +1472,7 @@ "على النظام الذي تقوم بترقيتة. تمكين تلك التي تريد تضمينها في عملية الترقية." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1491,30 +1481,30 @@ "فوق العنصر الذي تريد في الجدول." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "لتغيير عنوان المسار، انقر فوق الزر تغيير... ." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "غير معروف" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "مسار المستودع" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "لم يتم إعداد شبكة الاتصال" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1523,49 +1513,49 @@ "إعداده؟" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "إضافة وإزالة المستودعات..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "الرجاء الانتظار بينما يتم الآن إضافة وإزالة المستودعات." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "إزالة المستودعات غير المستخدمة" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "يتم الآن إزالة المستودعات غير المستخدمة..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "إضافة المستودعات الممكنة" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "يتم الآن إضافة المستودعات الممكنة..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "إضافة المستودعات المعطلة" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "يتم الآن إضافة المستودعات المعطلة..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "الوسائط الصحيحة التي طلبت" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1579,7 +1569,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1594,7 +1584,7 @@ "سيتم إضافة مستودع ووضعه في حالة تعطيل." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1606,7 +1596,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1618,7 +1608,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1629,7 +1619,7 @@ "المسار: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1742,11 +1732,6 @@ msgstr "يتم الآن حفظ إعدادات الأمان..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "يتم الآن حفظ مخططات الإعدادات الإقلاع..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "يتم الآن حفظ إعداد الأجهزة..." @@ -1918,17 +1903,17 @@ "ملاحظة: قد يلزم إدخال بعض المعلومات مرة أخرى." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "تأكيد التثبيت" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "اكتملت كافة المعلومات المطلوبة للتثبيت الأساسي الآن." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1941,7 +1926,7 @@ "التثبيت في مربعات الحوار السابقة." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1953,22 +1938,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "ارجع إلى الإعدادات وراجعها إذا كنت غير متأكد." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "تأكيد التحديث" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "اكتملت كافة المعلومات المطلوبة لإجراء تحديث الآن." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1979,7 +1964,7 @@ "وفقا للإعدادات الموجودة في مربعات الحوار السابقة." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "بدء الت&حديث" @@ -2063,6 +2048,18 @@ "التثبيت غير قادر على حل تبعيات الحزمة تلقائياً.\n" "سيفتتح مدير البرامج لكي تتمكن من حل هذه المشاكل يدوياً." +#~ msgid "Dummy" +#~ msgstr "وهمي" + +#~ msgid "&Dummy" +#~ msgstr "و&همي" + +#~ msgid "Write AutoYaST profile to /root/autoinst.xml" +#~ msgstr "كتابة ملف تعريف AutoYaST في/root/autoinst.xml" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "يتم الآن حفظ مخططات الإعدادات الإقلاع..." + #~ msgid "Search for Linux partitions" #~ msgstr "البحث عن أقسام لينكس" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ar-3.1.0/po/network.ar.po new/yast2-trans-ar-3.1.0/po/network.ar.po --- old/yast2-trans-ar-3.1.0/po/network.ar.po 2014-10-29 17:09:19.000000000 +0100 +++ new/yast2-trans-ar-3.1.0/po/network.ar.po 2015-04-20 18:01:52.000000000 +0200 @@ -5,13 +5,13 @@ # محمد الحرقان <malham1(a)gmail.com>, 2012, 2013. # Mohammad Alhargan <malham1(a)gmail.com>, 2012. # mohammad <malham1(a)gmail.com>, 2012. -# malhargan <malham1(a)gmail.com>, 2014. +# malhargan <malham1(a)gmail.com>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-09-10 14:54+0300\n" +"PO-Revision-Date: 2015-01-11 09:48+0300\n" "Last-Translator: malhargan <malham1(a)gmail.com>\n" "Language-Team: openSUSE\n" "Language: ar\n" @@ -4600,6 +4600,9 @@ "To take the changes in remote administration into account, \n" "please restart it manually or log out and log in again." msgstr "" +"يجب إعادة تشغيل مدير العرض.\n" +"ليتم تطبيق التغييرات في الإدارة عن بعد، \n" +"يرجى إعادة التشغيل يدوياً أو قم بالخروج وتسجيل الدخول مرة أخرى." #. description in proposal #: src/modules/Remote.rb:409 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ar-3.1.0/po/status.txt new/yast2-trans-ar-3.1.0/po/status.txt --- old/yast2-trans-ar-3.1.0/po/status.txt 2014-12-16 14:58:45.000000000 +0100 +++ new/yast2-trans-ar-3.1.0/po/status.txt 2015-04-20 18:01:53.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 16565 +Translated : 16562 Fuzzy : 60 Untranslated : 849 -------------------- - All strings : 17474 + All strings : 17471 95 % are translated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ar-3.1.0/po/storage.ar.po new/yast2-trans-ar-3.1.0/po/storage.ar.po --- old/yast2-trans-ar-3.1.0/po/storage.ar.po 2014-10-29 17:09:19.000000000 +0100 +++ new/yast2-trans-ar-3.1.0/po/storage.ar.po 2015-04-20 18:01:53.000000000 +0200 @@ -5,13 +5,13 @@ # mohammad <malham1(a)gmail.com>, 2012. # Mohammad Alhargan <malham1(a)hotmail.com>, 2012. # Mohammad Alhargan <malham1(a)gmail.com>, 2012. -# malhargan <malham1(a)gmail.com>, 2014. +# malhargan <malham1(a)gmail.com>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: YaST2 (partitioning)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-09-07 07:57+0300\n" +"PO-Revision-Date: 2015-01-11 09:08+0300\n" "Last-Translator: malhargan <malham1(a)gmail.com>\n" "Language-Team: openSUSE\n" "Language: ar\n" @@ -4369,7 +4369,7 @@ #. tree node label #: src/include/partitioning/ep-main.rb:429 msgid "Btrfs" -msgstr "btrfs" +msgstr "Btrfs" #. tree node label #: src/include/partitioning/ep-main.rb:436 ++++++ yast2-trans-ast-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ast-3.1.0/po/installation.ast.po new/yast2-trans-ast-3.1.0/po/installation.ast.po --- old/yast2-trans-ast-3.1.0/po/installation.ast.po 2014-10-29 17:05:03.000000000 +0100 +++ new/yast2-trans-ast-3.1.0/po/installation.ast.po 2015-04-20 17:53:12.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2009-10-29 21:04+0100\n" "Last-Translator: Xandru Armesto <xandru(a)softastur.org>\n" "Language-Team: Asturian <alministradores(a)softastur.org>\n" @@ -16,16 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Simuláu" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "Simulá&u" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -51,15 +41,19 @@ "el sistema instaláu. Si esta opción ta escoyida, se almacenará un perfil del sistema actual en\n" " <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Escribiendo la configuración del sistema" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -67,27 +61,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiando los ficheros al sistema instaláu..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiando los ficheros de rexistru al sistema instaláu..." @@ -1157,7 +1147,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Camudar..." @@ -1583,31 +1573,31 @@ "Cancelando la instalación." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Activado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Desactivado" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repositorios usados anteriormente" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1616,27 +1606,27 @@ "que ta actualizando:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Estáu actual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repositorio" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Direición URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Camudar estáu" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1646,7 +1636,7 @@ "desee incluyir nel procesu de anovamientu." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1659,30 +1649,30 @@ "Camudar estáuo calca dos vegaes nel elementu respectivo de la tabla." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Pa camudar la direición URL, calca sobro el botón Camudar.... ." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Desconocíu" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Direición URL del &repositorio" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "La red no ta configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1691,53 +1681,53 @@ "¿Quies configurarla?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Amestando y desaniciando repositorios..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Por favor, espere mientres se añaden y se eliminan los repositorios." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Quitar repositorios sin usar" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Quitando repositorios sin usar..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Amestar repositorios habilitados" # include/users/ui.ycp:515 menuentries/menuentry_add_user.ycp:51 #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Amestando repositorios habilitaos..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Amestar repositorios deshabilitados" # include/users/ui.ycp:515 menuentries/menuentry_add_user.ycp:51 #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Amestando repositorios deshabilitaos..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1747,7 +1737,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1757,7 +1747,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1774,7 +1764,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1786,7 +1776,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1802,7 +1792,7 @@ "URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1931,13 +1921,6 @@ msgstr "Escribiendo la configuración del proxy..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving automatical installation settings..." -msgid "Saving boot scripts settings..." -msgstr "Guardando los axustes automáticos de la instalación..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Guardando la configuración del hardware..." @@ -2132,19 +2115,19 @@ "Nota: es posible que ten introducir dellos datos de nuevu." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmar la instalación" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Toda la información necesaria pa la instalación básica ta completa." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2157,7 +2140,7 @@ "nos diálogos anteriores." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2168,24 +2151,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Si no ta seguru, entá puede retroceder y revisar les opciones escoyíes." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmar anovamientu" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Toda la información necesaria pa realizar una anovamientu ta completa." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2196,7 +2179,7 @@ "conforme a les opciones escoyíes nos diálogos anteriores." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Entamar &anovamientu" @@ -2301,6 +2284,17 @@ "La instalación no ha lográu resolver les dependencias de paquetes automáticamente.\n" "Se abrirá el xestor de paquetes pa resolverlas manualmente." +#~ msgid "Dummy" +#~ msgstr "Simuláu" + +#~ msgid "&Dummy" +#~ msgstr "Simulá&u" + +#, fuzzy +#~| msgid "Saving automatical installation settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Guardando los axustes automáticos de la instalación..." + # clients/online_update_load.ycp:1004 #~ msgid "License needs to be accepted" #~ msgstr "Tien d'aceutar la llicencia" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ast-3.1.0/po/status.txt new/yast2-trans-ast-3.1.0/po/status.txt --- old/yast2-trans-ast-3.1.0/po/status.txt 2014-12-16 14:21:17.000000000 +0100 +++ new/yast2-trans-ast-3.1.0/po/status.txt 2015-04-20 17:53:15.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 1645 -Fuzzy : 928 +Translated : 1643 +Fuzzy : 927 Untranslated : 14901 -------------------- - All strings : 17474 + All strings : 17471 9 % are translated ++++++ yast2-trans-be-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-be-3.1.0/po/installation.be.po new/yast2-trans-be-3.1.0/po/installation.be.po --- old/yast2-trans-be-3.1.0/po/installation.be.po 2014-10-29 17:09:02.000000000 +0100 +++ new/yast2-trans-be-3.1.0/po/installation.be.po 2015-04-20 17:49:59.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2009-09-03 00:21-0700\n" "Last-Translator: \n" "Language-Team: Belarusian <>\n" @@ -21,16 +21,6 @@ "Plural-Forms: Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Фіктыўны" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Фіктыўны" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -57,15 +47,19 @@ " Калі выбранаКланіраваць,то профіль бягучай \n" " сістэмы будзе запісаны ў <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Запіс сістэмнай канфігурацыі" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -73,27 +67,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Капіраванне файлаў ва ўсталяваную сістэму..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Капіраванне файлаў журналаў ва усталяваную сістэму..." @@ -1131,7 +1121,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Змяніць..." @@ -1551,33 +1541,33 @@ "Перапыненне ўсталёўкі." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remo&ve" msgid "Removed" msgstr "Выдаліць" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Уключана" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Выключана" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Раней скарыстаныя сховішча" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1586,27 +1576,27 @@ "перад абнаўленнем:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Бягучы стан" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Сховішча" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Пераключыць стан" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1615,7 +1605,7 @@ "у сістэме перад абнаўленнем. Уключыце тыя, якія вы жадаеце выкарыстоўваць падчас абнаўленні." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1628,30 +1618,30 @@ "кнопку Пераключыць стан ці двойчы пстрыкніце на адпаведным запісе ў табліцы." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Каб змяніць URL, націсніце кнопку Змяніць... " #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Невядомы" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&URL сховішча" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Сетка не наладжана" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1660,51 +1650,51 @@ "Наладзіць яго цяпер?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Даданне і выдаленне сховішчаў..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Калі ласка,пачакайце пакуль ідзе апрацоўка сховішчаў." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Выдаліць непатрэбныя сховішчы" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Выдаленне непатрэбных сховішчаў..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Дадаць уключаныя сховішчы" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Даданне ўключаных сховішчаў..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Дадаць выключаныя сховішчы" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Даданне выключаных сховішчаў..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1714,7 +1704,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1724,7 +1714,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1741,7 +1731,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1753,7 +1743,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1769,7 +1759,7 @@ "URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1898,13 +1888,6 @@ msgstr "Запіс наладаў сеткі..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving automatical installation settings..." -msgid "Saving boot scripts settings..." -msgstr "Захаванне наладаў аўтаматычнай усталёўкі..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Захаванне канфігурацыі абсталявання..." @@ -2095,19 +2078,19 @@ "Заўвага: Можа запатрабавацца паўторны ўвод некаторых звестак." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Падцверджанне ўсталёўкі..." #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Сабрана ўся інфармацыя, неабходная для базавай усталёўкі." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2120,7 +2103,7 @@ "у адпаведнасці з наладамі ўсталёўкі ў папярэдніх дыялогах." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2131,24 +2114,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Вярніцеся назад і праверце налады, калі вы не ўпэўнены." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Пацвердзіць абнаўленне" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Сабрана ўся інфармацыя для выканання абнаўлення." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2159,7 +2142,7 @@ "у адпаведнасці з наладамі ў папярэдніх дыялогах." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Пачаць &Абнаўленне" @@ -2257,6 +2240,17 @@ "Усталёўка не змагла дазволіць залежнасці пакетаў аўтаматычна.\n" "Будзе адкрыты мэнэджар пакетаў, каб вы дазволілі іх уручную." +#~ msgid "Dummy" +#~ msgstr "Фіктыўны" + +#~ msgid "&Dummy" +#~ msgstr "&Фіктыўны" + +#, fuzzy +#~| msgid "Saving automatical installation settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Захаванне наладаў аўтаматычнай усталёўкі..." + #~ msgid "License needs to be accepted" #~ msgstr "Неабходна прыняць ліцэнзію" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-be-3.1.0/po/status.txt new/yast2-trans-be-3.1.0/po/status.txt --- old/yast2-trans-be-3.1.0/po/status.txt 2014-12-16 14:22:07.000000000 +0100 +++ new/yast2-trans-be-3.1.0/po/status.txt 2015-04-20 17:50:05.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 3549 -Fuzzy : 1548 +Translated : 3547 +Fuzzy : 1547 Untranslated : 12377 -------------------- - All strings : 17474 + All strings : 17471 20 % are translated ++++++ yast2-trans-bg-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bg-3.1.0/po/installation.bg.po new/yast2-trans-bg-3.1.0/po/installation.bg.po --- old/yast2-trans-bg-3.1.0/po/installation.bg.po 2014-10-29 17:04:19.000000000 +0100 +++ new/yast2-trans-bg-3.1.0/po/installation.bg.po 2015-04-20 17:47:02.000000000 +0200 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: installation.bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2012-06-05 17:28+0300\n" "Last-Translator: Borislav Mitev <morbid_viper(a)tkzs.org>\n" "Language-Team: Bulgarian <kde-i18n-doc(a)kde.org>\n" @@ -25,16 +25,6 @@ "X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Фиктивно" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Фиктивно" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -61,15 +51,19 @@ "С избирането на тази отметка настоящата система ще бъде\n" "описана и съхранена в <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Записване на системните настройки…" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -77,27 +71,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Копиране на файловете върху инсталираната система…" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Копиране на файловете-дневници върху инсталираната система…" @@ -1100,7 +1090,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Пром&яна" @@ -1487,31 +1477,31 @@ "Инсталацията ще бъде преустановена." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Премахнат" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Включено" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Изключено" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Предварително използвани хранилища" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1520,27 +1510,27 @@ "В процес на обновяване" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Текущ статус" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Хранилище" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Промяна на статуса" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1549,7 +1539,7 @@ "на системата, която обновявате. Позволете тези, които искате да бъдат включени в процеса на обновяване." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1558,30 +1548,30 @@ "Промяна на статуса или натиснете два пъти върху съответния елемент от списъка." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "За да промените избрания адрес, натиснете върху Промени…." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Неизвестно" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Хранилище URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Мрежата не е конфигурирана" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1590,49 +1580,49 @@ "Желаете ли да я конфигурираме сега?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Добавяне и отстраняване на хранилища…" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Хранилищата се добавят и/или премахват." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Премахни ненужните хранилища" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Премахване на ненужните хранилища…" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Добави разрешените хранилища" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Добавяне на разрешените хранилища…" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Добави изключените хранилища" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Добавяне на изключените хранилища…" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Изискан е правилен носител" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1646,7 +1636,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1656,7 +1646,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1668,7 +1658,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1680,7 +1670,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1691,7 +1681,7 @@ "Адрес: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1805,11 +1795,6 @@ msgstr "Запазване настройките на сигурността..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Запазване настройките на зареждащите скриптове..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Запазване настройката на хардуера…" @@ -1981,17 +1966,17 @@ "информацията отново." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Потвърждение на инсталацията" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Вече е събрана цялата информация, която е необходима за основната инсталация." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2004,7 +1989,7 @@ "в съответствие с настройките, които са направени в предишните екрани." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2016,22 +2001,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Ако сте несигурен все още може да се върнете назад и да проверите настройките." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Потвърждение на надграждането" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Вече е събрана цялата информация, която е необходима за извършване надграждането." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2043,7 +2028,7 @@ "които са направени в предишните екрани." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Надграждане" @@ -2137,6 +2122,15 @@ "Инсталацията не можа да разреши автоматично зависимостите на пакетите.\n" "Мениджърът на пакети ще бъде зареден и ще трябва да го направите ръчно." +#~ msgid "Dummy" +#~ msgstr "Фиктивно" + +#~ msgid "&Dummy" +#~ msgstr "&Фиктивно" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Запазване настройките на зареждащите скриптове..." + #~ msgid "License needs to be accepted" #~ msgstr "Лицензът изисква да бъде приет" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bg-3.1.0/po/status.txt new/yast2-trans-bg-3.1.0/po/status.txt --- old/yast2-trans-bg-3.1.0/po/status.txt 2014-12-16 14:12:38.000000000 +0100 +++ new/yast2-trans-bg-3.1.0/po/status.txt 2015-04-20 17:47:25.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 9499 +Translated : 9496 Fuzzy : 4472 Untranslated : 3503 -------------------- - All strings : 17474 + All strings : 17471 54 % are translated ++++++ yast2-trans-bn-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bn-3.1.0/po/installation.bn.po new/yast2-trans-bn-3.1.0/po/installation.bn.po --- old/yast2-trans-bn-3.1.0/po/installation.bn.po 2014-10-29 16:53:51.000000000 +0100 +++ new/yast2-trans-bn-3.1.0/po/installation.bn.po 2015-04-20 17:45:13.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2007-08-10 04:33+0600\n" "Last-Translator: Mahay Alam Khan (মাহে আলম খান) <mahayalamkhan(a)gmail.com>\n" "Language-Team: Ankur <core(a)bengalinux.org>\n" @@ -12,16 +12,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "নকল" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "নকল (&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -41,15 +31,19 @@ "একটা প্রোফাইল দরকার হয়. এই বিকল্প নির্বাচন করলে বর্তমান সিস্টেমের একটা\n" "প্রোফাইল /root/autoyast.xml. এ সংরক্ষিতহয়.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "সিস্টেম কনফিগারেশন লেখা হচ্ছে" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -57,27 +51,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "ইনস্টলকৃত সিস্টেমে ফাইল কপি করা হচ্ছে..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "ইনস্টলকৃত সিস্টেমে লগ ফাইল কপি করা হচ্ছে..." @@ -1098,7 +1088,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "পরিবর্তন... (&C)" @@ -1509,77 +1499,77 @@ msgstr "প্রয়োজনীয় প্যাকেজগুলোর ইনস্টলেশন ব্যর্থ হয়েছে।" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "সরাও" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "সক্রিয় হয়েছে" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "নিষ্ক্রিয়" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "অতিরিক্ত ভান্ডারসমূহ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "বর্তমান অবস্থা: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "এবং প্রোফাইল ভাণ্ডার:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "ইউ-আর-এল" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&টগল স্টেটাস" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" @@ -1588,84 +1578,84 @@ #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "অজানা" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "ভান্ডারসমূহ যা রেজিস্টার করা হবে" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "গঠন করতে নেটওয়ার্ক কার্ডগুলি" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "অতিরিক্ত ভান্ডারসমূহ" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "ছবি উদ্ধার না হওয়া অবধি অপেক্ষা করুন.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "পূর্বে সংরক্ষিত সংরূপণ পড়ুন" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "পূর্বে সংরক্ষিত সংরূপণ পড়ছে..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "অতিরিক্ত ভান্ডারসমূহ" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "অতিরিক্ত ভান্ডারসমূহ" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "অতিরিক্ত ভান্ডারসমূহ" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "অতিরিক্ত ভান্ডারসমূহ" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1675,7 +1665,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1685,7 +1675,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1697,7 +1687,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1707,7 +1697,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1718,7 +1708,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1846,13 +1836,6 @@ msgstr "নিরাপত্তা সেটিংগুলি পড়িতেছি..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "ভাষা এবং কনসোল সেটিংসমূহ সংরক্ষন করা হচ্ছে..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "হার্ডওয়্যার কনফিগারেশন সংরক্ষন করা হচ্ছে..." @@ -2039,19 +2022,19 @@ "টীকা: আপনাকে কিছু তথ্য আবার লিখতে হতে পারে।" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "ইনস্টলেশন নিশ্চিতকরণ" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "প্রাথমিক ইনস্টলেশনর জন্য দরকারী সকল তথ্য নেয়া সম্পন্ন হয়েছে।" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2066,7 +2049,7 @@ "তথ্য পুনরায় লেখা হবে।" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2079,24 +2062,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "আপনি নিশ্চিত না হলে আবার পেছনে গিয়ে বৈশিষ্ট্যসমুহ পরীক্ষা করুন।" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "পরিবর্ধন নিশ্চিতকরণ" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "পরিবর্ধন করার জন্য দরকারী সকল তথ্য নেয়া সমপন্ন।" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2108,7 +2091,7 @@ "সকল তথ্য মুছে যাবে।" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "পরিবর্ধন আরম্ভ করো (&U)" @@ -2205,6 +2188,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "নকল" + +#~ msgid "&Dummy" +#~ msgstr "নকল (&D)" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "ভাষা এবং কনসোল সেটিংসমূহ সংরক্ষন করা হচ্ছে..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "আবারো ইনস্টল করা প্রয়োজন" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bn-3.1.0/po/status.txt new/yast2-trans-bn-3.1.0/po/status.txt --- old/yast2-trans-bn-3.1.0/po/status.txt 2014-12-16 15:16:49.000000000 +0100 +++ new/yast2-trans-bn-3.1.0/po/status.txt 2015-04-20 17:45:34.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7429 -Fuzzy : 5415 +Translated : 7427 +Fuzzy : 5414 Untranslated : 4630 -------------------- - All strings : 17474 + All strings : 17471 43 % are translated ++++++ yast2-trans-bs-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bs-3.1.0/po/installation.bs.po new/yast2-trans-bs-3.1.0/po/installation.bs.po --- old/yast2-trans-bs-3.1.0/po/installation.bs.po 2014-10-29 17:12:16.000000000 +0100 +++ new/yast2-trans-bs-3.1.0/po/installation.bs.po 2015-04-20 18:04:36.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-12-20 21:56+1000\n" "Last-Translator: Haris Hromadžić <harishromadzic(a)gmail.com>\n" "Language-Team: Bosnian <lokal(a)lugbih.org>\n" @@ -19,16 +19,6 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Poedit 1.6.3\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Model" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Model" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -53,41 +43,41 @@ "treba profil, da bi znao kako bi instalirani sistem trebao izgledati. Ako je ova opcija\n" "odabrana, profil trenutnog sistema je zabilježen u <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "Nadogradi konfiguraciju" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "Nadogradi konfiguraciju" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiraj datoteke na instalirani sistem..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiram log datoteke na instalirani sistem..." @@ -1065,7 +1055,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Promijeni..." @@ -1469,115 +1459,115 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Uključeno" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Isključeno" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Podesi dodatne servise" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "&Koristi trenutnu vrijednost" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "&Profil repository:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "Status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nepoznato" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Trenutni odabir:" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "Podešavanje inetd-a" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Podesi dodatne servise" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1585,45 +1575,45 @@ "Molim sačekajte dok se sistem konfiguriše.\n" "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Učitaj prethodne postavke" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Učitavam informacije o paketima; Moment molim..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Učitaj prethodne postavke" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Podesi dodatne servise" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Učitaj prethodne postavke" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Podesi dodatne servise" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1633,7 +1623,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1643,7 +1633,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1653,7 +1643,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1663,7 +1653,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1672,7 +1662,7 @@ msgstr "Učitavam informacije o paketima; Moment molim..." #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1785,13 +1775,6 @@ msgstr "Snimam postavke..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving settings..." -msgid "Saving boot scripts settings..." -msgstr "Snimam postavke..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 #, fuzzy msgid "Saving hardware configuration..." @@ -1959,19 +1942,19 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 #, fuzzy msgid "Confirm Installation" msgstr "&Nastavi instalaciju" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy msgid "Information required for the base installation is now complete." msgstr "Inicijalizujem uobičajeni window menadžer" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1980,7 +1963,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1989,7 +1972,7 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 #, fuzzy msgid "Go back and check the settings if you are unsure." msgstr "" @@ -1998,18 +1981,18 @@ "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 #, fuzzy msgid "Confirm Update" msgstr "Nadogradnja sistema" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2017,7 +2000,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 #, fuzzy msgid "Start &Update" msgstr "Start-up States" @@ -2111,6 +2094,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Model" + +#~ msgid "&Dummy" +#~ msgstr "&Model" + +#, fuzzy +#~| msgid "Saving settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Snimam postavke..." + #~ msgid "License needs to be accepted" #~ msgstr "Licenca mora biti prihvaćena" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-bs-3.1.0/po/status.txt new/yast2-trans-bs-3.1.0/po/status.txt --- old/yast2-trans-bs-3.1.0/po/status.txt 2014-12-16 14:30:43.000000000 +0100 +++ new/yast2-trans-bs-3.1.0/po/status.txt 2015-04-20 18:04:39.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 2128 -Fuzzy : 5999 +Translated : 2126 +Fuzzy : 5998 Untranslated : 9347 -------------------- - All strings : 17474 + All strings : 17471 12 % are translated ++++++ yast2-trans-ca-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ca-3.1.0/po/base.ca.po new/yast2-trans-ca-3.1.0/po/base.ca.po --- old/yast2-trans-ca-3.1.0/po/base.ca.po 2014-12-16 14:15:52.000000000 +0100 +++ new/yast2-trans-ca-3.1.0/po/base.ca.po 2015-04-20 18:11:45.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:22+0100\n" -"PO-Revision-Date: 2014-11-28 17:36+0100\n" +"PO-Revision-Date: 2015-01-23 18:41+0100\n" "Last-Translator: David Medina <opensusecatala(a)gmail.com>\n" "Language-Team: Catalan <opensusecatala(a)gmail.com>\n" "Language: ca\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 1.6.11\n" #. Translators: a warning message in a continue-cancel question #. Opscode Chef is a different way to configure the system. @@ -3427,7 +3427,7 @@ "Ask PackageKit to quit again?" msgstr "" "El PackageKit encara està funcionant (probablement ocupat).\n" -"Torno a demano al PackageKit que ho deixi estar?" +"Torno a demanar al PackageKit que ho deixi estar?" #: library/packages/src/modules/PackageLock.rb:61 msgid "" @@ -3439,7 +3439,7 @@ msgstr "" "El PackageKit està bloquejant la gestió de programari.\n" "Això passa quan l'aplicació d'actualització o algun altre gestor de programari\n" -"s'estan executant.\n" +"s'està executant.\n" "\n" "Demano al PackageKit que ho deixi estar?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ca-3.1.0/po/installation.ca.po new/yast2-trans-ca-3.1.0/po/installation.ca.po --- old/yast2-trans-ca-3.1.0/po/installation.ca.po 2014-12-16 14:15:50.000000000 +0100 +++ new/yast2-trans-ca-3.1.0/po/installation.ca.po 2015-04-20 18:11:44.000000000 +0200 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-11-28 09:09+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-02-02 11:54+0100\n" "Last-Translator: David Medina <opensusecatala(a)gmail.com>\n" "Language-Team: Softcatalà\n" "Language: ca\n" @@ -20,16 +20,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.9\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Fictici" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Fictici" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -48,39 +38,39 @@ "necessita un perfil per saber quina aparença ha de tenir el sistema instal·lat. Si se selecciona\n" "aquesta opció, s'emmagatzema un perfil del sistema actual a <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Escriure el perfil d'AutoYaST a /root/autoinst.xml al final de la instal·lació?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Clona la configuració de sistema" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Clona la configuració de sistema" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "El perfil d'AutoYaST serà desat a /root/autoinst.xml (<a href=\"%1\">no l'escriguis</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "El perfil d'AutoYaST no es desarà (<a href=\"%1\">escriu-lo</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Escriure el perfil AutoYaST a /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiant els fitxers al sistema instal·lat..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiant els fitxers de registre al sistema instal·lat..." @@ -1045,7 +1035,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Canvia..." @@ -1414,31 +1404,31 @@ "Interrompent la instal·lació." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Eliminat" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Habilitat" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Inhabilitat" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Dipòsits utilitzats anteriorment" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1447,27 +1437,27 @@ "que esteu actualitzant:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Estat actual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Dipòsit" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Commuta l'estat" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1477,7 +1467,7 @@ "vulgueu incloure en el procés d'actualització." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1486,30 +1476,30 @@ "Commuta l'estat o feu doble clic a l'element respectiu de la taula." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Per canviar l'URL, feu clic al botó Canvia.... ." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Desconegut" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL del &dipòsit" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "La xarxa no està configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1518,49 +1508,49 @@ "Voleu configurar-la?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Afegint i eliminant repositoris..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Espereu mentre s'afegeixen i s'eliminen dipòsits." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Elimina els dipòsits no utilitzats" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Eliminant els repositoris no utilitzats..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Afegeix els dipòsits habilitats" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Afegint els repositoris habilitats..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Afegeix els dipòsits inhabilitats" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Afegint els repositoris inhabilitats..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "S'ha sol·licitat un mitjà correcte" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1574,7 +1564,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1589,7 +1579,7 @@ "S'afegirà el repositori com a inhabilitat." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1601,7 +1591,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1613,7 +1603,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1624,7 +1614,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1737,11 +1727,6 @@ msgstr "Desant els paràmetres de seguretat..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Desant els paràmetres d'scripts d'arrencada..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Desant la configuració del maquinari..." @@ -1913,17 +1898,17 @@ "Nota: és possible que hagueu de tornar a introduir informació." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirma la instal·lació" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Tota la informació necessària per a la instal·lació bàsica és ara completa." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1936,7 +1921,7 @@ "segons els paràmetres d'instal·lació dels quadres de diàleg anteriors." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1948,22 +1933,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Aneu enrere i comproveu els paràmetres si no esteu segur." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirma l'actualització" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Tota la informació necessària per fer una actualització és ara completa." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1974,7 +1959,7 @@ "segons els paràmetres dels quadres de diàleg anteriors." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Inicia &l'actualització" @@ -2058,6 +2043,15 @@ "La instal·lació no ha estat capaç de resoldre les dependències dels paquets automàticament\n" "S'obrirà el gestor de programari perquè les resolgueu manualment." +#~ msgid "Dummy" +#~ msgstr "Fictici" + +#~ msgid "&Dummy" +#~ msgstr "&Fictici" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Desant els paràmetres d'scripts d'arrencada..." + #~ msgid "Search for Linux partitions" #~ msgstr "Cerca particions Linux" @@ -2120,291 +2114,3 @@ #~ msgid "No additional information" #~ msgstr "No hi ha informació addicional" - -#~| msgid "" -#~| "No network card has been selected.\n" -#~| "\n" -#~| "Please select a network card to configure it later." -#~ msgid "" -#~ "No network card has been selected.\n" -#~ "\n" -#~ "Select a network card to configure it later.\n" -#~ msgstr "" -#~ "No s'ha seleccionat cap targeta de xarxa.\n" -#~ "\n" -#~ "Seleccioneu una targeta de xarxa per configurar-la més endavant.\n" - -#~ msgid "Warning" -#~ msgstr "Advertiment" - -#~ msgid "" -#~ "The link of the selected interface %1 is disconnected.\n" -#~ "It needs to be connected for a proper network configuration.\n" -#~ "Are you sure you want to use it?" -#~ msgstr "" -#~ "L'enllaç de la interfície seleccionada %1 està desconnectat.\n" -#~ "S'ha de connectar perquè la configuració de xarxa sigui correcta.\n" -#~ "Segur que voleu utilitzar-la?" - -#~| msgid "&Yes, Use It" -#~ msgid "&Yes, Use it" -#~ msgstr "&Sí, utilitza-la" - -#~| msgid "Please, select a network card to be configured" -#~ msgid "Select a network card to be configured." -#~ msgstr "Seleccioneu una targeta de xarxa per configurar." - -#~ msgid "Network Card" -#~ msgstr "Targeta de xarxa" - -#~ msgid "Device" -#~ msgstr "Dispositiu" - -#~ msgid "Hardware Information of the Selected Network Card" -#~ msgstr "Informació de maquinari de la targeta de xarxa seleccionada" - -#~ msgid "Here you can configure your network cards to be used immediately." -#~ msgstr "Aquí podeu configurar les targetes de xarxa per utilitzar-les immediatament." - -#~ msgid "" -#~ "If you do not need a network connection now,\n" -#~ "you can safely skip the configuration." -#~ msgstr "" -#~ "Si no necessiteu una connexió de xarxa ara,\n" -#~ "podeu ometre la configuració." - -#~| msgid "" -#~| "To configure a network card, select it from the list\n" -#~| "and click the Next button.\n" -#~| "Otherwise,clickCancel." -#~ msgid "" -#~ "To configure a network card, select it from the list\n" -#~ "and click the Next button.\n" -#~ "Otherwise, click Cancel.\n" -#~ msgstr "" -#~ "Per configurar una targeta de xarxa, seleccioneu-la de la llista\n" -#~ "i feu clic al botó Següent button.\n" -#~ "En cas contrari, feu clic a Cancel·la.\n" - -#~ msgid "IP address cannot be empty." -#~ msgstr "L'adreça IP no pot estar en blanc." - -#~ msgid "'%1' is an invalid IP address." -#~ msgstr "'%1' no és una adreça d'IP vàlida." - -#~ msgid "Netmask cannot be empty." -#~ msgstr "La màscara de subxarxa no pot ser buida." - -#~ msgid "'%1' is an invalid netmask." -#~ msgstr "'%1' no és una màscara de subxarxa vàlida." - -#~ msgid "Gateway IP address cannot be empty." -#~ msgstr "L'adreça IP de la màscara de subxarxa no pot ser buida." - -#~ msgid "'%1' is an invalid IP address of the gateway." -#~ msgstr "'%1' no és una adreça IP de la màscara de subxarxa vàlida." - -#~ msgid "DNS server IP address cannot be empty." -#~ msgstr "L'adreça IP del servidor DNS no pot ser buida." - -#~ msgid "'%1' is an invalid IP address of the DNS server." -#~ msgstr "'%1' no és una adreça IP del servidor de DNS vàlida." - -#~ msgid "Proxy server name or IP address must be set." -#~ msgstr "Heu d'establir l'adreça IP o el nom del servidor intermediari." - -#~ msgid "" -#~ "'%1' is an invalid IP address or invalid hostname\n" -#~ "of a proxy server." -#~ msgstr "" -#~ "'%1' no és una adreça IP o un nom d'ordinador central vàlid\n" -#~ "de servidor intermediari." - -#~ msgid "Proxy port must be set." -#~ msgstr "S'ha de definir un port de servidor intermediari." - -#~ msgid "" -#~ "'%1' is an invalid proxy port number.\n" -#~ "\n" -#~ "Port number must be between 1 and 65535 inclusive." -#~ msgstr "" -#~ "'%1' no és un número de port del servidor intermediari vàlid.\n" -#~ "\n" -#~ "El número de port ha d'estar comprès entre l'1 i el 65535." - -#~| msgid "Please, select your network setup type for %1" -#~ msgid "Select your network setup type for %1" -#~ msgstr "Seleccioneu el tipus de configuració de xarxa per a %1" - -#~ msgid "Automatic Address Setup (via &DHCP)" -#~ msgstr "Configuració d'adreça automàtica (mitjançant &DHCP)" - -#~ msgid "&Static Address Setup" -#~ msgstr "Configuració de l'adreça &estàtica" - -#~ msgid "Static Address Settings" -#~ msgstr "Configuració de l'adreça estàtica" - -#~ msgid "&IP Address" -#~ msgstr "Adreça &IP" - -#~ msgid "Net&mask" -#~ msgstr "&Màscara de subxarxa" - -#~ msgid "Default &Gateway IP" -#~ msgstr "IP de la &passarel·la predeterminada" - -#~ msgid "D&NS Server IP" -#~ msgstr "IP del servidor D&NS" - -#~ msgid "&Use Proxy for Accessing the Internet" -#~ msgstr "&Utilitza el servidor intermediari per accedir a Internet" - -#~ msgid "&HTTP Proxy Server" -#~ msgstr "Servidor intermediari &HTTP" - -#~ msgid "&Port" -#~ msgstr "&Port" - -#~| msgid "Us&er (Optional)" -#~ msgid "Us&er (optional)" -#~ msgstr "Usuari (opcional)" - -#~| msgid "Pass&word (Optional)" -#~ msgid "Pass&word (optional)" -#~ msgstr "Contrasenya (opcional)" - -#~| msgid "" -#~| "<big>Network Setup</big>\n" -#~| " Here you can configure your network card.\n" -#~| "Select either DHCP or static setup. DHCP fits for most cases.\n" -#~| "For details contact your Internet provider or your network\n" -#~| "administrator." -#~ msgid "" -#~ "<big>Network Setup</big>\n" -#~ " Configure your network card.\n" -#~ "Select either DHCP or static setup. DHCP fits for most cases.\n" -#~ "For details contact your Internet provider or your network\n" -#~ "administrator.\n" -#~ msgstr "" -#~ "<big>Configuració de la xarxa</big>\n" -#~ " Aquí podeu configurar la targeta de xarxa.\n" -#~ "Seleccioneu la configuració de DHCP o estàtica. En la majoria de casos, podeu utilitzar DHCP.\n" -#~ "Per obtenir-ne més informació, poseu-vos en contacte amb el proveïdor d'accés\n" -#~ "a Internet o amb l'administrador de la xarxa.\n" - -#~| msgid "" -#~| "<big>Proxy</big>\n" -#~| " Proxy is a server-based cache for accessing the web.\n" -#~| "In most cases, if you have a direct connection to the Internet,\n" -#~| "it doesn't need to be used." -#~ msgid "" -#~ "<big>Proxy</big>\n" -#~ " Proxy is a server-based cache for accessing the web.\n" -#~ "In most cases, if you have a direct connection to the Internet,\n" -#~ "you do not need to use one.\n" -#~ msgstr "" -#~ "<big>Servidor intermediari</big>\n" -#~ " Un servidor intermediari és un servidor amb memòria cau\n" -#~ "que s'utilitza per accedir a Internet.\n" -#~ "En la majoria de casos, si teniu connexió directa a Internet\n" -#~ "no us caldrà utilitzar-lo.\n" - -#~ msgid "" -#~ "Command: <tt>%1</tt> has failed.\n" -#~ "The output of the command was:\n" -#~ "<pre>%2</pre>" -#~ msgstr "" -#~ "S'ha produït un error en l'ordre: <tt>%1</tt>.\n" -#~ "La sortida de l'ordre ha estat la següent:\n" -#~ "<pre>%2</pre>" - -#~ msgid "Setting up Network Failed" -#~ msgstr "S'ha produït un error en configurar la xarxa" - -#~ msgid "" -#~ "A failure occurred during preparing\n" -#~ "the installation system for writing the proxy configuration." -#~ msgstr "" -#~ "S'ha produït un error en mentre es preparava\n" -#~ "el sistema d'instal·lació per escriure la configuració del servidor intermediari." - -#~ msgid "Internet Test Failed" -#~ msgstr "Ha fallat la comprovació d'Internet" - -#~ msgid "" -#~ "The Internet connection test failed. You should be\n" -#~ "redirected to the previous dialog to change the configuration.\n" -#~ "Go back and change it?" -#~ msgstr "" -#~ "Ha fallat la prova de connexió a Internet. Hauríeu d'anar\n" -#~ "al diàleg anterior i canviar la configuració.\n" -#~ "Voleu tornar enrere?" - -#~ msgid "Go Back" -#~ msgstr "Enrere" - -#~ msgid "Skip" -#~ msgstr "Omet" - -#~ msgid "Adjust automatic network setup (via DHCP)" -#~ msgstr "Ajusta la configuració automàtica (mitjançant el DHCP)" - -#~ msgid "Adjusting automatic network setup (via DHCP)..." -#~ msgstr "S'està ajustant la configuració automàtica (mitjançant el DHCP)..." - -#~ msgid "Adjust static network setup" -#~ msgstr "Ajusta la configuració de la xarxa estàtica" - -#~ msgid "Adjusting static network setup..." -#~ msgstr "S'està ajustant la configuració de la xarxa automàtica..." - -#~ msgid "" -#~ "Unknown network setup.\n" -#~ "\n" -#~ "Please, go back and provide a valid network setup." -#~ msgstr "" -#~ "Configuració de la xarxa desconeguda.\n" -#~ "\n" -#~ "Torneu enrere i configureu la xarxa correctament." - -#~ msgid "Write proxy settings" -#~ msgstr "Escriu els paràmetres del servidor intermediari" - -#~ msgid "Writing proxy settings..." -#~ msgstr "S'estan escrivint els paràmetres del servidor intermediari..." - -#~ msgid "Adjust installation system" -#~ msgstr "Ajusta el sistema d'instal·lació" - -#~ msgid "Adjusting installation system..." -#~ msgstr "S'està ajustant el sistema d'instal·lació..." - -#~ msgid "Test Internet connection" -#~ msgstr "Prova la connexió a Internet" - -#~ msgid "Testing Internet connection..." -#~ msgstr "S'està provant la connexió a Internet..." - -#~| msgid "Writing Network Setup" -#~ msgid "Writing Network Setup..." -#~ msgstr "S'està escrivint la configuració de la xarxa..." - -#~ msgid "Please, wait while network configuration is being written and tested..." -#~ msgstr "Espereu mentre s'escriu i es prova la configuració de la xarxa..." - -#~| msgid "" -#~| "Writing the network settings failed.\n" -#~| "You will be returned to the previous dialog to either\n" -#~| "change the settings, or cancel the network setup." -#~ msgid "" -#~ "Writing the network settings failed.\n" -#~ "You will be returned to the previous dialog to either\n" -#~ "change the settings or cancel the network setup.\n" -#~ msgstr "" -#~ "S'ha produït un error en escriure la configuració de la xarxa.\n" -#~ "Tornareu al diàleg anterior per canviar-ne la configuració\n" -#~ "o bé cancel·lar la configuració de la xarxa.\n" - -#~ msgid "Enabling SSH service on installed system..." -#~ msgstr "S'està habilitant el servei SSH al sistema instal·lat..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ca-3.1.0/po/status.txt new/yast2-trans-ca-3.1.0/po/status.txt --- old/yast2-trans-ca-3.1.0/po/status.txt 2014-12-16 14:16:12.000000000 +0100 +++ new/yast2-trans-ca-3.1.0/po/status.txt 2015-04-20 18:12:04.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17352 +Translated : 17349 Fuzzy : 0 Untranslated : 122 -------------------- - All strings : 17474 + All strings : 17471 99 % are translated ++++++ yast2-trans-cs-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cs-3.1.0/po/auth-client.cs.po new/yast2-trans-cs-3.1.0/po/auth-client.cs.po --- old/yast2-trans-cs-3.1.0/po/auth-client.cs.po 2014-12-16 14:16:49.000000000 +0100 +++ new/yast2-trans-cs-3.1.0/po/auth-client.cs.po 2015-04-20 18:09:51.000000000 +0200 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the opensuse-i package. # # Automatically generated, 2014. -# Jan Papez (honyczek) <honyczek(a)centrum.cz>, 2014. +# Jan Papez (honyczek) <honyczek(a)centrum.cz>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-11-19 21:29+0100\n" +"PO-Revision-Date: 2015-02-10 22:29+0100\n" "Last-Translator: Jan Papez (honyczek) <honyczek(a)centrum.cz>\n" "Language-Team: Czech <opensuse-translation(a)opensuse.org>\n" "Language: cs\n" @@ -1011,7 +1011,6 @@ msgstr "Určuje hlavní server pro použití k FAST." #: src/include/sssd-parameters.rb:1068 -#, fuzzy msgid "Specifies if the host and user principal should be canonicalized." msgstr "Určuje, zda by měl být kanonizován hostitelský a uživatelský principál." @@ -1059,27 +1058,27 @@ #. The Active Directory domain section #: src/include/sssd-parameters.rb:1145 msgid "Specifies the name of the IPA domain." -msgstr "" +msgstr "Určuje název domény IPA." #: src/include/sssd-parameters.rb:1149 msgid "The comma-separated list of IP addresses or hostnames of the IPA servers to which SSSD should connect in the order of preference." -msgstr "" +msgstr "Seznam IP adres nebo hostitelských názvů IPA serverů oddělený čárkou, vyjadřující ke kterým by se SSSD mělo připojit dle preferovaného pořadí." #: src/include/sssd-parameters.rb:1153 msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name." -msgstr "" +msgstr "Může být nastaveno na strojích, kde název hostitele (hostname(5)) neodpovídá plně kvalifikovanému názvu." #: src/include/sssd-parameters.rb:1158 msgid "This option tells SSSD to automatically update the DNS server built into FreeIPA v2 with the IP address of this client." -msgstr "" +msgstr "Tato volba SSSD říká, aby automaticky aktualizoval DNS server postavený do FreeIPA v2 pomocí IP adresy tohoto klienta." #: src/include/sssd-parameters.rb:1163 msgid "The TTL to apply to the client DNS record when updating it." -msgstr "" +msgstr "Životnost (TTL), která se má použít pro klientský DNS záznam při jeho aktualizaci." #: src/include/sssd-parameters.rb:1167 msgid "Choose the interface whose IP address should be used for dynamic DNS updates." -msgstr "" +msgstr "Vyberte rozhraní, jehož IP adresa by měla být použita pro dynamické aktualizace DNS." #. end Export #. ################################################################ @@ -1089,19 +1088,19 @@ #. @return summary #: src/modules/AuthClient.rb:336 msgid "System is configured for using nss_ldap.\n" -msgstr "" +msgstr "Systém je nastaven tak, aby používal nss_ldap.\n" #: src/modules/AuthClient.rb:339 msgid "System is configured for using sssd.\n" -msgstr "" +msgstr "Systém je nastaven tak, aby používal sssd.\n" #: src/modules/AuthClient.rb:345 msgid "System is configured for using OES.\n" -msgstr "" +msgstr "Systém je nastaven tak, aby používal OES.\n" #: src/modules/AuthClient.rb:348 msgid "System is configured for using /etc/passwd only.\n" -msgstr "" +msgstr "Systém je nastaven tak, aby používal pouze /etc/passwd.\n" #~ msgid "SPAM Prevention" #~ msgstr "Opatření proti SPAMu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cs-3.1.0/po/installation.cs.po new/yast2-trans-cs-3.1.0/po/installation.cs.po --- old/yast2-trans-cs-3.1.0/po/installation.cs.po 2014-10-29 17:10:14.000000000 +0100 +++ new/yast2-trans-cs-3.1.0/po/installation.cs.po 2015-04-20 18:09:27.000000000 +0200 @@ -20,13 +20,13 @@ # Jaromír Červenka cervajz(a)cervajz.com, 2009. # Vojtěch Zeisek <Vojtech.Zeisek(a)opensuse.org>, 2010. # Jan Papež <honyczek(a)centrum.cz>, 2011. -# Jan Papez <honyczek(a)centrum.cz>, 2012, 2013, 2014. +# Jan Papez <honyczek(a)centrum.cz>, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-06 20:46+0200\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-02-10 22:22+0100\n" "Last-Translator: Jan Papez (honyczek) <honyczek(a)centrum.cz>\n" "Language-Team: Czech <opensuse-translation(a)opensuse.org>\n" "Language: cs\n" @@ -37,16 +37,6 @@ "10<=4 && (n%100<10 || n%100>=20) ? 1: 2);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -65,39 +55,39 @@ "provedl správnou instalaci a nastavení nainstalovaného systému, potřebuje\n" "profil. Pokud volbu klonování zaškrtnete, uloží se profil v <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Zapsat na konci instalace profil AutoYaSTu do /root/autoinst.xmlat?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Klonovat konfiguraci systému" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Klonovat konfiguraci systému" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Profil AutoYaSTu bude zapsán jako /root/autoinst.xml (<a href=\"%1\">nezapisovat jej</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Profil AutoYaSTu nebude uložen (<a href=\"%1\">zapsat jej</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Zapsat profil AutoYaSTu do /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Do instalovaného systému se kopírují soubory..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopírují se záznamy (logy) do nainstalovaného systému..." @@ -1066,7 +1056,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Změnit..." @@ -1438,31 +1428,31 @@ "Instalace se ruší." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Odstraněné" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Povoleno" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Zakázáno" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Používané repozitáře" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1471,27 +1461,27 @@ "který aktualizujete:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktuální stav" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repozitář" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Změnit s&tatus" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1500,7 +1490,7 @@ "na systému, který aktualizujete. Povolte ty, které si přejete zahrnout při procesu aktualizace." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1509,30 +1499,30 @@ "nebo dvojklikem na položku v tabulce." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "URL změníte kliknutím na tlačítko Změnit...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Neznámé" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&URL repozitáře" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Síť není nastavena" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1541,49 +1531,49 @@ "Chcete připojení nastavit?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Přidávání a odebírání repozitářů..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Přidávají nebo odstraňují se repozitáře." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Odstranit nepoužité repozitáře" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Odstraňuji nepoužité repozitáře..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Přidat dostupné repozitáře " #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Přidávají se povolené repozitáře..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Přidat zakázané repozitáře" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Přidávají se zakázané repozitáře..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Vyžádáno správné médium" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1597,7 +1587,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1612,7 +1602,7 @@ "Repozitář bude přidán v zakázaném stavu." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1624,7 +1614,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1636,7 +1626,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1647,7 +1637,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1759,11 +1749,6 @@ msgstr "Ukládání bezpečnostního nastavení..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Ukládání nastavení startovacích skriptů..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Ukládají se konfigurace hardwaru..." @@ -1935,17 +1920,17 @@ "Poznámka: Některé informace bude nutné zadat znovu." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Potvrzení instalace" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Všechny informace potřebné pro základní instalaci jsou nyní kompletní." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1958,7 +1943,7 @@ "podle nastavení v předchozích dialozích." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1969,22 +1954,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Pokud si nejste jisti, můžete se stále vrátit zpět a nastavení zkontrolovat." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Potvrzení aktualizace" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Všechny informace potřebné pro aktualizaci jsou nyní kompletní." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1995,7 +1980,7 @@ "podle nastavení v předchozích dialozích. " #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Sp&ustit aktualizaci" @@ -2079,6 +2064,15 @@ "Instalátor nebyl schopný vyřešit závislosti balíčků automaticky.\n" "Bude otevřen správce softwaru, abyste je mohli vyřešit ručně." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Ukládání nastavení startovacích skriptů..." + #~ msgid "Search for Linux partitions" #~ msgstr "Hledání linuxových oddílů" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cs-3.1.0/po/network.cs.po new/yast2-trans-cs-3.1.0/po/network.cs.po --- old/yast2-trans-cs-3.1.0/po/network.cs.po 2014-10-29 17:10:40.000000000 +0100 +++ new/yast2-trans-cs-3.1.0/po/network.cs.po 2015-04-20 18:09:50.000000000 +0200 @@ -20,13 +20,13 @@ # Vojtěch Zeisek <Vojtech.Zeisek(a)opensuse.org>, 2010. # Vít Pelčák <vit(a)pelcak.org>, 2011. # Jan Papež <honyczek(a)centrum.cz>, 2011, 2012. -# Jan Papez <honyczek(a)centrum.cz>, 2012, 2013, 2014. +# Jan Papez <honyczek(a)centrum.cz>, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: network.cs\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-10-13 20:57+0200\n" +"PO-Revision-Date: 2015-02-17 20:00+0100\n" "Last-Translator: Jan Papez (honyczek) <honyczek(a)centrum.cz>\n" "Language-Team: Czech <opensuse-translation(a)opensuse.org>\n" "Language: cs\n" @@ -2354,7 +2354,7 @@ "IP addresses. This value must be entered as an IP address\n" "(for example, 192.168.0.42), not as a hostname.\n" msgstr "" -"Nameserver je počítač, který převádí názvy počítačů\n" +"Jmenný server je počítač, který převádí názvy počítačů\n" "na příslušné IP adresy. Tato hodnota musí být zadána jako\n" "IP adresa (např. 10.10.0.1), ne jako název počítače.\n" @@ -3590,12 +3590,12 @@ #. textentry label #: src/include/network/services/dns.rb:178 msgid "Name Server &1" -msgstr "Nameserver &1" +msgstr "Jmenný server &1" #. validation error popup #: src/include/network/services/dns.rb:194 msgid "The IP address of the name server is invalid." -msgstr "Jméno primárního nameserveru je chybné." +msgstr "Jméno primárního jmenného serveru je chybné." #. textentry label #: src/include/network/services/dns.rb:202 @@ -3605,12 +3605,12 @@ #. text entry label #: src/include/network/services/dns.rb:229 msgid "Name Server &2" -msgstr "Nameserver &2" +msgstr "Jmenný server &2" #. text entry label #: src/include/network/services/dns.rb:231 msgid "Name Server &3" -msgstr "Nameserver &3" +msgstr "Jmenný server &3" #. Frame label #. dialog caption @@ -3623,7 +3623,7 @@ #. Frame label #: src/include/network/services/dns.rb:252 msgid "Name Servers and Domain Search List" -msgstr "Nameservery a seznam prohledávaných domén" +msgstr "Jmenné servery a seznam prohledávaných domén" #: src/include/network/services/dns.rb:269 msgid "Hostname/DNS" @@ -3665,7 +3665,7 @@ #. via CWMTab #: src/include/network/services/dns.rb:737 msgid "Hostname and Name Server Configuration" -msgstr "Konfigurace jména počítače a nameserveru" +msgstr "Konfigurace jména počítače a jmenného serveru" #. Warning popup text 1/2 #: src/include/network/services/host.rb:57 @@ -4187,7 +4187,7 @@ #. Summary text #: src/modules/DNS.rb:588 msgid "Name Servers: %1" -msgstr "Nameservery: %1" +msgstr "Jmenné servery: %1" #. Summary text #: src/modules/DNS.rb:598 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cs-3.1.0/po/status.txt new/yast2-trans-cs-3.1.0/po/status.txt --- old/yast2-trans-cs-3.1.0/po/status.txt 2014-12-16 14:16:59.000000000 +0100 +++ new/yast2-trans-cs-3.1.0/po/status.txt 2015-04-20 18:10:01.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17463 -Fuzzy : 1 -Untranslated : 10 +Translated : 17471 +Fuzzy : 0 +Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-cy-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cy-3.1.0/po/installation.cy.po new/yast2-trans-cy-3.1.0/po/installation.cy.po --- old/yast2-trans-cy-3.1.0/po/installation.cy.po 2014-10-29 16:45:34.000000000 +0100 +++ new/yast2-trans-cy-3.1.0/po/installation.cy.po 2015-04-20 17:57:03.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2004-03-10 21:24+0000\n" "Last-Translator: KD at KGyfieithu <kyfieithu(a)dotmon.com>\n" "Language-Team: Cymraeg <cy(a)li.org>\n" @@ -19,16 +19,6 @@ "Plural-Forms: nplurals=5; plural=(n == 0 ? 0 : n == 1 ? 1 : n < 6 ? 2 : n == 6 ? 3 : 4);\n" "X-Generator: KBabel 1.2\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dymi" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dymi" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -43,34 +33,34 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "Diweddaru Ffurfweddiad" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "Diweddaru Ffurfweddiad" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 #, fuzzy @@ -78,7 +68,7 @@ msgstr "Copïo ffeiliau i'r cysawd gosodedig" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 #, fuzzy msgid "Copying log files to installed system..." msgstr "Copïo ffeiliau cofnodion i'r cysawd a osodwyd" @@ -1056,7 +1046,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Newid..." @@ -1463,19 +1453,19 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remo&ve" msgid "Removed" msgstr "Gwa&redu" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Alluogir" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 #, fuzzy msgid "Disabled" msgstr "A&nalluogi" @@ -1483,99 +1473,99 @@ #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Tarddiad &arsefydlu" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Dewisiad Cyfredol:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "Cynnyrch" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "&Cychwyn / Aros" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 #, fuzzy msgid "Unknown" msgstr "anhysbys" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Cynnyrch" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "ni ffurfweddir y rhaglen" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Tarddiad &arsefydlu" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1583,45 +1573,45 @@ "Arhoswch tra mae'r cysawd sylfaenol yn cael ei osod.\n" "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Darllen gwybodaeth am y pecynnau. Arhoswch am eiliad..." #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Darllen gwybodaeth am y pecynnau. Arhoswch am eiliad..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Darllen gwybodaeth am y pecynnau. Arhoswch am eiliad..." #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Tarddiad &arsefydlu" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Darllen gwybodaeth am y pecynnau. Arhoswch am eiliad..." #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Tarddiad &arsefydlu" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1631,7 +1621,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1641,7 +1631,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1651,7 +1641,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1661,7 +1651,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1670,7 +1660,7 @@ msgstr "Digwyddodd gwall wrth ddarllen y cofnodion." #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1793,13 +1783,6 @@ msgstr "Ysgrifennu'r gosodiadau..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Cannot write settings!" -msgid "Saving boot scripts settings..." -msgstr "Methu ysgrifennu'r gosodiadau!" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 #, fuzzy msgid "Saving hardware configuration..." @@ -1987,19 +1970,19 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 #, fuzzy msgid "Confirm Installation" msgstr "&Parhau'r Gosod" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy msgid "Information required for the base installation is now complete." msgstr "Gweithredu sgriptiau hunan-arsefydlu yn yr amgylchedd arsefydlu." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2008,7 +1991,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2017,23 +2000,23 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 #, fuzzy msgid "Confirm Update" msgstr "&Parhau Diweddaru" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2041,7 +2024,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 #, fuzzy msgid "Start &Update" msgstr "Erthylu Diweddaru" @@ -2132,6 +2115,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Dymi" + +#~ msgid "&Dummy" +#~ msgstr "&Dymi" + +#, fuzzy +#~| msgid "Cannot write settings!" +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Methu ysgrifennu'r gosodiadau!" + #, fuzzy #~ msgid "Evaluating update possibility..." #~ msgstr "Ymgychwyn ar gyfer diweddaraiad CD..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-cy-3.1.0/po/status.txt new/yast2-trans-cy-3.1.0/po/status.txt --- old/yast2-trans-cy-3.1.0/po/status.txt 2014-12-16 14:13:49.000000000 +0100 +++ new/yast2-trans-cy-3.1.0/po/status.txt 2015-04-20 17:57:05.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 1064 -Fuzzy : 5534 +Translated : 1062 +Fuzzy : 5533 Untranslated : 10876 -------------------- - All strings : 17474 + All strings : 17471 6 % are translated ++++++ yast2-trans-da-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-da-3.1.0/po/installation.da.po new/yast2-trans-da-3.1.0/po/installation.da.po --- old/yast2-trans-da-3.1.0/po/installation.da.po 2014-10-29 16:43:01.000000000 +0100 +++ new/yast2-trans-da-3.1.0/po/installation.da.po 2015-04-20 18:11:35.000000000 +0200 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-08-19 20:39+0200\n" "Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" "Language-Team: Danish <opensuse-translation(a)opensuse.org>\n" @@ -31,16 +31,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -65,15 +55,19 @@ "kræver en profil for at vide hvordan det installerede system skal se ud. Hvis denne mulighed vælges, vil\n" "en profil af det nuværende system blive gemt i <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Skriver systemkonfigurationen..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -81,27 +75,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopierer filer til det installerede system..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopierer logfiler til det installerede system..." @@ -1089,7 +1079,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Æ&ndr..." @@ -1471,18 +1461,18 @@ "Afbryder installationen." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Fjernet" # #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktiveret" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Deaktiveret" @@ -1490,14 +1480,14 @@ #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Tidligere anvendte softwarekilder" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1506,28 +1496,28 @@ "du er ved at opgradere:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Nuværende status" # #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Softwarekilde" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Skif&t status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1536,7 +1526,7 @@ "på det system, du opgraderer. Aktivér dem, du ønsker at inkludere i opgraderingsprocessen." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1545,31 +1535,31 @@ "Skift status-knappen eller dobbeltklik på de respektive punkter i tabellen." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "For at ændre URL, clik på Ændr...-knappen." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Ukendt" # #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "U&RL for softwarekilde" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Netværk er ikke konfigureret" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1579,53 +1569,53 @@ # #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Tilføjer og fjerner softwarekilder..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Softwarekilder tilføjes og fjernes." # label text -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Fjern ikke-anvendte softwarekilder" # label text #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Fjerner ikke-anvendte softwarekilder..." # label text -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Tilføj aktiverede softwarekilder" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Tilføjer aktiverede softwarekilder..." # label text -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Tilføj deaktiverede softwarekilder" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Tilføjer deaktiverede softwarekilder..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Anmodning om korrekt medie" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1639,7 +1629,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1654,7 +1644,7 @@ "Softwarekilden vil blive tilføjet i deaktiveret tilstand." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1666,7 +1656,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1678,7 +1668,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1689,7 +1679,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1805,11 +1795,6 @@ msgstr "Gemmer sikkerhedsindstillinger..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Gemmer indstillinger for boot-scripts..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Gemmer hardwarekonfiguration..." @@ -1979,17 +1964,17 @@ "Bemærk: Du vil måske skulle indtaste noget information igen." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Bekræft Installation" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Al nødvendig information for basisinstallationen er nu indsamlet." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2002,7 +1987,7 @@ "installationsindstillingerne i de forrige dialoger." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2014,22 +1999,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Hvis du er usikker, så gå tilbage og tjek indstillingerne." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Bekræft opdatering" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Nødvendig information for at udføre en opdatering er nu indsamlet." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2040,7 +2025,7 @@ "i henhold til indstillingerne i de forrige dialoger." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Start opdatering" @@ -2135,6 +2120,15 @@ "Installationen kunne ikke løse pakkeafhængigheder automatisk.\n" "Softwarehåndteringen vil blive åbnet så du kan løse dem manuelt." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Gemmer indstillinger for boot-scripts..." + #~ msgid "License needs to be accepted" #~ msgstr "Licensen skal accepteres" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-da-3.1.0/po/status.txt new/yast2-trans-da-3.1.0/po/status.txt --- old/yast2-trans-da-3.1.0/po/status.txt 2014-12-16 14:56:26.000000000 +0100 +++ new/yast2-trans-da-3.1.0/po/status.txt 2015-04-20 18:11:37.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 15308 +Translated : 15305 Fuzzy : 172 Untranslated : 1994 -------------------- - All strings : 17474 + All strings : 17471 88 % are translated ++++++ yast2-trans-de-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-de-3.1.0/po/cluster.de.po new/yast2-trans-de-3.1.0/po/cluster.de.po --- old/yast2-trans-de-3.1.0/po/cluster.de.po 2014-10-29 17:14:00.000000000 +0100 +++ new/yast2-trans-de-3.1.0/po/cluster.de.po 2015-04-20 17:56:43.000000000 +0200 @@ -7,15 +7,15 @@ # Karl Eichwalder <ke(a)suse.de>, 1999-2003. # Martin Lohner <ml(a)suse.de>, 2000. # Michael Skiba <trans(a)michael-skiba.de>, 2013, 2014. -# Sarah Kriesch <ada.lovelace(a)gmx.de>, 2013, 2014. +# Sarah Kriesch <ada.lovelace(a)gmx.de>, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-17 18:45+0200\n" -"Last-Translator: Michael Skiba <trans(a)michael-skiba.de>\n" -"Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" +"PO-Revision-Date: 2015-01-02 21:34+0100\n" +"Last-Translator: Sarah Kriesch <ada.lovelace(a)gmx.de>\n" +"Language-Team: German <kde-i18n-de(a)kde.org>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,60 +102,48 @@ msgstr "Redundante IP-Adresse" #: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499 -#, fuzzy -#| msgid "Node IP" msgid "Node ID" -msgstr "Knoten-IP" +msgstr "Knoten-ID" #. Set need to require 'set' #: src/include/cluster/dialogs.rb:163 msgid "Node ID has to be fulfilled with a positive integer" -msgstr "" +msgstr "Die Knoten-ID muss mit einem positiven Integer ausgefüllt sein" #: src/include/cluster/dialogs.rb:170 -#, fuzzy -#| msgid "The hardware address must be unique." msgid "Node ID must be unique" -msgstr "Die Hardware-Adresse muss eindeutig sein." +msgstr "Die Knoten-ID muss einmalig sein" #. BNC#871970, change member address struct #: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245 -#, fuzzy -#| msgid "Bind Network Address:" msgid "The Bind Network Address has to be fulfilled" -msgstr "Netzwerkadresse zuweisen:" +msgstr "Die Bind-Netzwerkadresse muss ausgefüllt sein" #: src/include/cluster/dialogs.rb:197 msgid "The cluster name has to be fulfilled" -msgstr "" +msgstr "Der Cluster-Name muss ausgefüllt sein" #: src/include/cluster/dialogs.rb:214 -#, fuzzy -#| msgid "The hardware address must be defined." msgid "The Member Address has to be fulfilled" -msgstr "Die Hardware-Adresse muss angegeben werden." +msgstr "Die Mitgliedsadresse muss ausgefüllt sein" #. BNC#880242, expected_votes must have value when "udp" #: src/include/cluster/dialogs.rb:220 -#, fuzzy -#| msgid "Play the test sound when the card is configured" msgid "The Expected Votes has to be fulfilled when udp is configured" -msgstr "Nach der Konfiguration der Karte Testsound spielen" +msgstr "Die Erwarteten Stimmen müssen ausgefüllt sein, wenn UDP konfiguriert ist" #: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 #: src/include/cluster/dialogs.rb:1463 msgid "The Multicast Address has to be fulfilled" -msgstr "" +msgstr "Die Multicast-Adresse muss ausgefüllt sein" #: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 -#, fuzzy -#| msgid "The value for pos must be a positive integer." msgid "The Multicast port must be a positive integer" -msgstr "Der Wert für pos muss eine positive Ganzzahl sein." +msgstr "Der Multicast-Port muss ein positiver Integer sein" #: src/include/cluster/dialogs.rb:270 msgid "Only passive or active can be chosen if multiple interface used. Set to passive." -msgstr "" +msgstr "Nur passiv oder aktiv kann ausgewählt sein, wenn mehrere Schnittstellen verwendet werden. Setzen Sie auf passiv." #. BNC#871970, change member address struct to memberaddr #: src/include/cluster/dialogs.rb:439 @@ -208,10 +196,8 @@ msgstr "IP" #: src/include/cluster/dialogs.rb:499 -#, fuzzy -#| msgid "Redundant IP Address" msgid "Redundant IP" -msgstr "Redundante IP-Adresse" +msgstr "Redundante IP" #. BNC#879596, check the corosync.conf format #: src/include/cluster/dialogs.rb:539 @@ -219,15 +205,17 @@ " NOTICE: Detected old corosync configuration.\n" " Please reconfigure the member list and confirm all other settings." msgstr "" +"NOTIZ: Alte corosync-Konfiguration festgestellt.\n" +"Bitte konfigurieren Sie die Mitgliedschaftsliste um und bestätigen Sie alle anderen Einstellungen." #. Notice, current could be "nil" if the list is empty. #: src/include/cluster/dialogs.rb:690 msgid "Number of threads must be integer" -msgstr "" +msgstr "Nummer der Threads muss ein Integer sein" #: src/include/cluster/dialogs.rb:696 msgid "Number of threads must larger then 0" -msgstr "" +msgstr "Nummer der Threads muss größer als 0 sein" #: src/include/cluster/dialogs.rb:734 msgid "Enable Security Auth" @@ -247,11 +235,11 @@ #: src/include/cluster/dialogs.rb:773 msgid "Failed to create /etc/corosync/authkey" -msgstr "" +msgstr "Erstellung von /etc/corosync/authkey fehlgeschlagen" #: src/include/cluster/dialogs.rb:775 msgid "Create /etc/corosync/authkey succeeded" -msgstr "" +msgstr "/etc/corosync/authkey darauf folgend erstellen" #: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 msgid "Running" @@ -268,16 +256,12 @@ msgstr "Systemstart" #: src/include/cluster/dialogs.rb:898 -#, fuzzy -#| msgid "On -- Start pacemaker at booting" msgid "On -- Start pacemaker during boot" -msgstr "AN -- pacemaker beim Systemstart starten" +msgstr "An -- pacemaker beim Systemstart starten" #: src/include/cluster/dialogs.rb:905 -#, fuzzy -#| msgid "Off -- Start pacemaker manually only" msgid "Off -- Start pacemaker manually" -msgstr "Aus -- pacemaker nur manuell starten" +msgstr "Aus -- pacemaker manuell starten" #: src/include/cluster/dialogs.rb:914 msgid "Switch On and Off" @@ -410,23 +394,11 @@ msgstr "/etc/conntrackd/conntrackd.conf erstellen" #: src/include/cluster/dialogs.rb:1471 -#, fuzzy -#| msgid "The value for pos must be a positive integer." msgid "The Group Number must be a positive integer" -msgstr "Der Wert für pos muss eine positive Ganzzahl sein." +msgstr "Die Gruppen-Nummer muss ein positiver Integer sein" #. All helps are here #: src/include/cluster/helps.rb:35 -#, fuzzy -#| msgid "" -#| "<big>Bind Network Address</big> This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0. This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified. \n" -#| "<big>Multicast Address</big> This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address. This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.\n" -#| "<big>Port</big> This specifies the UDP port number. It is possible to use the same multicast address on a network with the openais services configured for different UDP ports. \n" -#| "<big>Member Address</big> This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu \n" -#| "<big>Node ID</big> This configuration option is optional when using IPv4 and required when using IPv6. This is a 32 bit value specifying the node identifier delivered to the cluster membership service. If this is not specified with IPv4, the node id will be determined from the 32 bit IP address the system to which the system is bound with ring identifier of 0. The node identifier value of zero is reserved and should not be used. \n" -#| "<big>rrp_mode</big> This specifies the mode of redundant ring, which may be none, active, or passive. Active replication offers slightly lower latency from transmit to delivery in faulty network environments but with less performance. Passive replication may nearly double the speed of the totem protocol if the protocol doesn't become cpu bound. The final option is none, in which case only one network interface will be used to operate the totem protocol. If only one interface directive is specified, none is automatically chosen. If multiple interface directives are specified, only active or passive may be chosen. \n" -#| "<big>Expected votes</big> Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section. \n" -#| "<big>Auto Generate Node ID</big> Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically. \n" msgid "" "<big>Bind Network Address</big> This specifies the address which the openais executive should bind. This address should always end in zero. If the totem traffic should be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0. This may also be an IPV6 address, in which case IPV6 networking will be used. In this case, the full address must be specified and there is no automatic selection of the network interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified. \n" "<big>Multicast Address</big> This is the multicast address used by openais executive. The default should work for most networks, but the network administrator should be queried about a multicast address to use. Avoid 224.x.x.x because this is a \"config\" multicast address. This may also be an IPV6 multicast address, in which case IPV6 networking will be used. If IPv6 networking is used, the nodeid field must be specified.\n" @@ -437,8 +409,8 @@ "<big>Expected votes</big> Expect vote number for voting quorum. Will be automatically calculated when the nodelist {} section is present in corosync.conf or can be specified in the quorum {} section. \n" "<big>Auto Generate Node ID</big> Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically. \n" msgstr "" -"<big>Netzwerk-Adresse zuweisen</big> Das legt die Adresse fest, der den openais-Leiter binden sollte. Diese Adresse sollte immer mit einer Null enden. Wenn der Totem-Netzwerkverkehr über 192.168.5.92 geroutet werden sollte, setzen Sie die bindnetaddr auf 192.168.5.0. Das kann auch eine IPv6-Adresse sein, in welchem Fall ein IPv6-Netzwerkbetrieb verwendet wird. In diesem Fall muss die vollständige Adresse angegeben werden und es gibt keine automatische Auswahl der Netzwerk-Schnittstelle innerhalb eines speziellen Subnetzes wie bei IPv4. Wenn ein IPv6-Netzwerkbetrieb eingesetzt wird, muss das Feld der Knoten-ID festgelegt sein. \n" -"<big>Multicast-Adresse</big> Das ist die Multicast-Adressse, die vom openais-Leiter genutzt wird. Der Standard sollte für die meisten Netzwerke funktionieren, aber der Netzwerk-Administrator sollte hinterfragt werden, ob eine Multicast-Adresse verwendet werden soll. Meiden Sie 224.x.x.x, weil das eine \"config\"-Multicast-Adresse ist. Das kann auch eine IPv6-Multicast-Adresse sein, in welchem Fall ein IPv6-Netzwerkbetrieb verwendet wird. Wenn ein IPv6-Netzwerkbetrieb eingesetzt wird, muss das Feld der Knoten-ID festgelegt sein.\n" +"<big>Bind-Netzwerkadresse</big> Das legt die Adresse fest, der den openais-Leiter binden sollte. Diese Adresse sollte immer mit einer Null enden. Wenn der Totem-Netzwerkverkehr über 192.168.5.92 geroutet werden sollte, setzen Sie die bindnetaddr auf 192.168.5.0. Das kann auch eine IPv6-Adresse sein, in welchem Fall ein IPv6-Netzwerkbetrieb verwendet wird. In diesem Fall muss die vollständige Adresse angegeben werden und es gibt keine automatische Auswahl der Netzwerk-Schnittstelle innerhalb eines speziellen Subnetzes wie bei IPv4. Wenn ein IPv6-Netzwerkbetrieb eingesetzt wird, muss das Feld der Knoten-ID festgelegt sein. \n" +"<big>Multicast-Adresse</big> Das ist die Multicast-Adresse, die vom openais-Leiter genutzt wird. Der Standard sollte für die meisten Netzwerke funktionieren, aber der Netzwerk-Administrator sollte hinterfragt werden, ob eine Multicast-Adresse verwendet werden soll. Meiden Sie 224.x.x.x, weil das eine \"config\"-Multicast-Adresse ist. Das kann auch eine IPv6-Multicast-Adresse sein, in welchem Fall ein IPv6-Netzwerkbetrieb verwendet wird. Wenn ein IPv6-Netzwerkbetrieb eingesetzt wird, muss das Feld der Knoten-ID festgelegt sein.\n" "<big>Port</big> Das legt die Nummer des UDP-Ports fest. Es ist möglich die gleiche Multicast-Adresse in einem Netzwerk zu verwenden, mit der die Dienste von openais für unterschiedliche UDP-Ports konfiguriert sind. \n" "<big>Mitgliedschaft-Adresse</big> Diese Liste bestimmt alle Knoten im Cluster mit IP-Adressen. Das könnte konfigurierbar sein, wenn udpu verwendet wird. \n" "<big>Knoten-ID</big> Diese Konfigurations-Option ist optional, wenn IPv4 verwendet wird und wird bei IPv6 benötigt. Das ist ein 32Bit-Wert, der die Knoten-Identifikation für den Dienst der Cluster-Mitgliedschaft, festlegt. Wenn das nicht mit IPv4 spezifiziert wird, wird die Knoten-ID von der 32Bit großen IP-Adresse des Systems bestimmt, an die das System mit der Ring-Kennung von 0 gebunden ist. Der Wert der Knoten-Kennung von Null ist reserviert und sollte nicht verwendet werden. \n" @@ -447,19 +419,14 @@ "<big>Automatisch generierte Knoten-ID</big> Die Knoten-ID wird benötigt, wenn IPv6 verwendet wird. Eine aktivierte Auto Knoten-ID wird die Knoten-ID automatisch generieren. \n" #: src/include/cluster/helps.rb:45 -#, fuzzy -#| msgid "" -#| "\n" -#| "<big>Threads</big> This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. \n" -#| "<big>Enable Security Auth</big> This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100mbit networks with 1500 MTU frame transmissions: A throughput of 9mb/sec is possible with 100% cpu utilization when this option is enabled on 3ghz cpus. A throughput of 10mb/sec is possible wth 20% cpu utilization when this option is disabled on 3ghz cpus. For gig-e networks with large frame transmissions: A throughput of 20mb/sec is possible when this option is enabled on 3ghz cpus. A throughput of 60mb/sec is possible when this option is disabled on 3ghz cpus. The default is on. \n" msgid "" "\n" "<big>Threads</big> This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. \n" "<big>Enable Security Auth</big> This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. \n" msgstr "" "\n" -"<big>Threads</big> Diese Angabe steuert, wie viele Threads benutzt werden, um Multicast-Nachrichten zu verschlüsseln und senden. Wenn sichere Authentifizierung ausgeschaltet ist, wird nie mit mehreren Threads gesendet. Wenn sichere Authentifizierung angeschaltet ist, erlaubt diese Angabe, die Systeme so zu konfigurieren, dass mehrere Threads zum Verschlüsseln und Senden von Multicast-Nachrichten benutzt werden. Der Wert 0 bewirkt, dass nicht mit mehreren Threads gesendet wird. Diese Betriebsart verspricht die beste Leistung auf auf Systemen mit nur einem CPU-Kern. Der Vorgabewert ist 0. \n" -"<big>Sichere Authentifizierung aktivieren</big> Das bewirkt, dass HMAC/SHA1-Authentifizierung zur Authentifizierung aller Nachrichten benutzt wird. Zusätzlich werden alle Daten mit dem sober128-Algorithmus verschlüsselt, um sie vor Abhören zu schützen. Die Aktivierung dieser Option fügt einen 36-Byte-Header zu jeder von Totem gesendeten Nachricht hinzu, was den Gesamtdurchsatz verringert. Verschlüsselung und Authentifizierung verbrauchen 75% der CPU-Leistung in aisexec; gemessen mit aktiviertem gprof. Für 100MBit-Netzwerke mit einer MTU von 1500: Ein Durchsatz von 9 MB/s ist möglich bei 100% CPU-Auslastung, wenn diese Option auf 3-GHz-CPUs aktiviert ist. Ein Durchsatz von 10 MB/s ist möglich bei einer CPU-Auslastung von 20%, wenn diese Option auf 3-GHz-CPUs deaktiviert ist. Für Gigabit-Netzwerke mit großen Netzwerkpaketen: Ein Durchsatz von 20 MB/s ist möglich, wenn diese Option auf 3-GHz-CPUs aktiviert ist. Ein Durchsatz von 60 MB/s ist möglich, wenn diese Option auf 3-GHz-CPUs deaktiviert ist. Der Vorgabewert ist \"an\". \n" +"<big>Threads</big> This directive controls how many threads are used to encrypt and send multicast messages. If secauth is off, the protocol will never use threaded sending. If secauth is on, this directive allows systems to be configured to use multiple threads to encrypt and send multicast messages. A thread directive of 0 indicates that no threaded send should be used. This mode offers best performance for non-SMP systems. The default is 0. \n" +"<big>Enable Security Auth</big> This specifies that HMAC/SHA1 authentication should be used to authenticate all messages. It further specifies that all data should be encrypted with the sober128 encryption algorithm to protect data from eavesdropping. Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput. Encryption and authentication consume 75% of CPU cycles in aisexec as measured with gprof when enabled. For 100Mbit networks with 1500 MTU frame transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this option is enabled on 3GHz cpus. A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is disabled on 3GHz cpus. For gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this option is enabled on 3GHz cpus. A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus. The default is on. \n" #: src/include/cluster/helps.rb:50 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-de-3.1.0/po/installation.de.po new/yast2-trans-de-3.1.0/po/installation.de.po --- old/yast2-trans-de-3.1.0/po/installation.de.po 2014-10-29 17:13:37.000000000 +0100 +++ new/yast2-trans-de-3.1.0/po/installation.de.po 2015-04-20 17:56:21.000000000 +0200 @@ -15,14 +15,14 @@ # Jannick Kuhr <opensource(a)kuhr.org>, 2008. # Hermann-Josef Beckers <hj.beckers(a)onlinehome.de>, 2009. # Nanuk Krinner <nkrinner(a)suse.de>, 2011. -# Hendrik Woltersdorf <hendrikw(a)arcor.de>, 2013, 2014. +# Hendrik Woltersdorf <hendrikw(a)arcor.de>, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-13 14:24+0200\n" -"Last-Translator: Michael Skiba <trans(a)michael-skiba.de>\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-02-14 20:20+0100\n" +"Last-Translator: Hendrik Woltersdorf <hendrikw(a)arcor.de>\n" "Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -31,16 +31,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -59,39 +49,39 @@ "ist ein Profil erforderlich, das festlegt, wie das installierte System aussehen soll. Wenn diese Option\n" "ausgewählt ist, wird ein Profil des aktuellen Systems in <tt>/root/autoinst.xml</tt> gespeichert." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Soll das AutoYaST-Profil am Ende der Installation in /root/autoinst.xmlat geschrieben werden?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Klonen der Systemkonfiguration" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Klonen der Systemkonfiguration" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Das AutoYaST-Profile wird in /root/autoinst.xml geschrieben (<a href=\"%1\">Nicht schreiben</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Das AutoYaST-Profile wird nicht gespeichert (<a href=\"%1\">Schreiben</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Das AutoYaST-Profile wird in /root/autoinst.xml geschrieben" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Dateien werden in das installierte System kopiert ..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Protokolldateien werden in das installierte System kopiert ..." @@ -1061,7 +1051,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Ä&ndern ..." @@ -1434,31 +1424,31 @@ "Installation wird abgebrochen." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Entfernt" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktiviert" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Deaktiviert" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Zuvor verwendete Repositories" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1467,27 +1457,27 @@ "aktualisieren möchten gefunden:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktueller Status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repository" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Status &wechseln" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1496,7 +1486,7 @@ "Aktivieren Sie diejenigen, die Sie in den Aktualisierungsprozess einschließen möchten." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1505,30 +1495,30 @@ "Schaltfläche Status wechseln oder doppelklicken Sie auf den jeweiligen Tabelleneintrag." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Zum Ändern einer URL klicken Sie auf die Schaltfläche Ändern ...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Unbekannt" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Repository-URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Netzwerk ist nicht eingerichtet" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1537,49 +1527,49 @@ "Möchten Sie diese einrichten?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Repositories werden hinzugefügt bzw. entfernt ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Repositorys werden hinzugefügt bzw. entfernt." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Nicht verwendete Repositories entfernen" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Nicht verwendete Repositories werden entfernt ..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Aktivierte Repositories hinzufügen" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Aktivierte Repositories werden hinzugefügt ..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Deaktivierte Repositories hinzufügen" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Deaktivierte Repositories werden hinzugefügt ..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Korrektes Medium erforderlich" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1593,7 +1583,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1608,7 +1598,7 @@ "Repository wird in deaktiviertem Zustand hinzugefügt." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1620,7 +1610,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1632,7 +1622,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1643,7 +1633,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1757,11 +1747,6 @@ msgstr "Sicherheitseinstellungen werden geschrieben ..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "bootscript-Einstellungen werden gespeichert ..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Hardware-Konfiguration wird gespeichert ..." @@ -1935,17 +1920,17 @@ "Hinweis: Eventuell müssen Sie einige Informationen erneut eingeben." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Installation bestätigen" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Alle für die Basisinstallation erforderlichen Informationen sind nun vollständig." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1958,7 +1943,7 @@ "(dabei werden alle bestehenden Daten in diesen Partitionen gelöscht)." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1969,22 +1954,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Falls Sie sich unsicher sind, gehen Sie zurück und überprüfen Sie die Einstellungen." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Aktualisierung bestätigen" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Alle für eine Aktualisierung erforderlichen Informationen sind nun vollständig." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1995,7 +1980,7 @@ "entsprechend den Einstellungen aus den vorherigen Dialogen." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Akt&ualisierung starten" @@ -2079,6 +2064,18 @@ "Installation konnte eine Paketabhängigkeit nicht automatisch auflösen.\n" "Die Paketverwaltung wird geöffnet um sie manuell aufzulösen." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Write AutoYaST profile to /root/autoinst.xml" +#~ msgstr "Das AutoYaST-Profile wird in /root/autoinst.xml geschrieben" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "bootscript-Einstellungen werden gespeichert ..." + #~ msgid "Search for Linux partitions" #~ msgstr "Linux-Partitionen suchen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-de-3.1.0/po/status.txt new/yast2-trans-de-3.1.0/po/status.txt --- old/yast2-trans-de-3.1.0/po/status.txt 2014-12-16 14:30:36.000000000 +0100 +++ new/yast2-trans-de-3.1.0/po/status.txt 2015-04-20 17:56:59.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17442 -Fuzzy : 23 -Untranslated : 9 +Translated : 17460 +Fuzzy : 11 +Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-el-3.1.0.tar.bz2 ++++++ ++++ 2874 lines of diff (skipped) ++++++ yast2-trans-en_GB-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-en_GB-3.1.0/po/installation.en_GB.po new/yast2-trans-en_GB-3.1.0/po/installation.en_GB.po --- old/yast2-trans-en_GB-3.1.0/po/installation.en_GB.po 2014-10-29 17:01:30.000000000 +0100 +++ new/yast2-trans-en_GB-3.1.0/po/installation.en_GB.po 2015-04-20 17:53:24.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation.en_GB\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2008-05-16 13:44+0200\n" "Last-Translator: Benjamin Weber\n" "Language-Team: British English\n" @@ -19,16 +19,6 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KAider 0.1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -48,15 +38,19 @@ "needs a profile to know what the installed system should look like. If this option is\n" "selected, a profile of the current system is stored in /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Writing the system configuration" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -64,27 +58,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copying files to installed system..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copying log files to installed system..." @@ -1101,7 +1091,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Change..." @@ -1510,33 +1500,33 @@ "Aborting the installation." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Remove" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Enabled" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Disabled" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Previously Used Repositories" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 #, fuzzy msgid "" "These repositories were found on the system\n" @@ -1546,27 +1536,27 @@ "you are just upgrading:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Current Status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repository" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Toggle Status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 #, fuzzy msgid "" "Here you see all software repositories found\n" @@ -1577,7 +1567,7 @@ "those you want to include in the upgrade process." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1590,30 +1580,30 @@ "Toggle Status button or double-click on the respective table item." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "To change the URL, click on the Change... button." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Unknown" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Repository URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Network is not Configured" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 #, fuzzy msgid "" "Remote repositories require an Internet connection.\n" @@ -1624,57 +1614,57 @@ "Would you like to configure it?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Adding and removing repositories..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Please wait while repositories are being added and removed." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Read previously used repositories" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Reading previously used repositories..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Available Repositories" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Adding Repositories..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Available Repositories" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Adding Repositories..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1684,7 +1674,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1694,7 +1684,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1706,7 +1696,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1716,7 +1706,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1727,7 +1717,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1851,13 +1841,6 @@ msgstr "Reading security settings..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Saving sound card settings..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Saving hardware configuration..." @@ -2053,19 +2036,19 @@ "Note: You may have to enter some information again." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirm Installation" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "All information required for the base installation is now complete." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2079,7 +2062,7 @@ "according to the installation settings in the previous dialogs." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2092,24 +2075,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Go back and check the settings if you are unsure." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirm Update" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "All information required to perform an update is now complete." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2121,7 +2104,7 @@ "according to the settings in the previous dialogs." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Start &Update" @@ -2216,6 +2199,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Saving sound card settings..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "needs to be reinstalled" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-en_GB-3.1.0/po/status.txt new/yast2-trans-en_GB-3.1.0/po/status.txt --- old/yast2-trans-en_GB-3.1.0/po/status.txt 2014-12-16 14:19:38.000000000 +0100 +++ new/yast2-trans-en_GB-3.1.0/po/status.txt 2015-04-20 17:53:49.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 11798 -Fuzzy : 4231 +Translated : 11796 +Fuzzy : 4230 Untranslated : 1445 -------------------- - All strings : 17474 + All strings : 17471 68 % are translated ++++++ yast2-trans-en_US-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-en_US-3.1.0/po/installation.en_US.po new/yast2-trans-en_US-3.1.0/po/installation.en_US.po --- old/yast2-trans-en_US-3.1.0/po/installation.en_US.po 2014-10-29 16:52:08.000000000 +0100 +++ new/yast2-trans-en_US-3.1.0/po/installation.en_US.po 2015-04-20 18:09:08.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2008-05-16 13:44+0200\n" "Last-Translator: proofreader <i18n(a)suse.de>\n" "Language-Team: English <i18n(a)suse.de>\n" @@ -16,16 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -40,41 +30,41 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "Reading NTP configuration..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "Configure Online Update" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -1025,7 +1015,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1374,58 +1364,58 @@ "Aborting the installation." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 #, fuzzy msgid "" "Here you see all software repositories found\n" @@ -1436,93 +1426,93 @@ "those you want to include in the upgrade process." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "To change the URL, click the Change... button." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Network is not configured" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "Please, wait while the network configuration is being written and tested..." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Online Repositories" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Online Repositories" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Online Repositories" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Online Repositories" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Online Repositories" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Online Repositories" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1532,7 +1522,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1542,7 +1532,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1552,7 +1542,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1561,7 +1551,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1570,7 +1560,7 @@ msgstr "Online Repositories" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1687,13 +1677,6 @@ msgstr "Saving system settings..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving System Settings..." -msgid "Saving boot scripts settings..." -msgstr "Saving system settings..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 #, fuzzy msgid "Saving hardware configuration..." @@ -1883,18 +1866,18 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy msgid "Information required for the base installation is now complete." msgstr "Initializing installation repository..." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1903,7 +1886,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1912,22 +1895,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1935,7 +1918,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" @@ -2023,6 +2006,11 @@ msgstr "" #, fuzzy +#~| msgid "Saving System Settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Saving system settings..." + +#, fuzzy #~ msgid "Wired" #~ msgstr "Expired" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-en_US-3.1.0/po/status.txt new/yast2-trans-en_US-3.1.0/po/status.txt --- old/yast2-trans-en_US-3.1.0/po/status.txt 2014-12-16 14:24:33.000000000 +0100 +++ new/yast2-trans-en_US-3.1.0/po/status.txt 2015-04-20 18:09:11.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 1669 -Fuzzy : 2939 -Untranslated : 12866 +Fuzzy : 2938 +Untranslated : 12864 -------------------- - All strings : 17474 + All strings : 17471 10 % are translated ++++++ yast2-trans-eo-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-eo-3.1.0/po/installation.eo.po new/yast2-trans-eo-3.1.0/po/installation.eo.po --- old/yast2-trans-eo-3.1.0/po/installation.eo.po 2014-11-03 17:10:19.000000000 +0100 +++ new/yast2-trans-eo-3.1.0/po/installation.eo.po 2015-04-20 17:51:49.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2014-11-03 08:47-0400\n" "Last-Translator: Manuel Ortega <manuel(a)enkidu.coop>\n" "Language-Team: Esperanto <i18n(a)suse.de>\n" @@ -16,16 +16,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Lokokupa" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Lokokupa" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -44,39 +34,41 @@ "bezonas profilon por scii kia devas esti la instalota sistemo. Se ĉi tiu elekteblo estas\n" "elektita, profilo de la aktuala sistemo estas konversita en <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +#, fuzzy +#| msgid "Write AutoYaST profile to /root/autoinst.xml" +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Konservi la AutoYaST-profilon en /root/autoinst.xml" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Agordo de la klonsistemo" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Agordoj de la klonsistemo" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "La AutoYaST-profilo konserviĝos en /root/autoinst.xml (<a href=\"%1\">ne konversi ĝin</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "La AutoYaST-profilo ne konserviĝos (<a href=\"%1\">konversi ĝin</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Konservi la AutoYaST-profilon en /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiado de la dosieroj al la instalita sistemo..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiado de la protokoldosieroj al la instalita sistemo..." @@ -1041,7 +1033,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Ŝ&anĝi..." @@ -1410,31 +1402,31 @@ "Ĉesigado de la instalo." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Forigite" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Ŝaltita" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Malŝaltita" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Antaŭe Uzitaj Deponejoj" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1443,27 +1435,27 @@ "kiun vi promocias:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktuala Stato" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Deponejo" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Baskuligi Staton" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1472,7 +1464,7 @@ "en la sistemo kiun vi promocias. Ŝaltu tiujn kiujn vi volas inkluzivigi en la promocian procezon." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1481,30 +1473,30 @@ "la butono Ŝanĝi staton aŭ duoble alklaku la kocernan elementon de la tabelo." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Por ŝanĝi la URL, klaku sur la butono Ŝanĝi...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nekonata" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL de la &Deponejo" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Reto ne estas agordita" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1513,49 +1505,49 @@ "Ĉu agordi ĝin?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Aldonado kaj forigado de deponejoj..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Prilaborado de la deponejoj." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Forigi neuzatajn deponejojn" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Forigado de neuzataj deponejoj." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Aldoni ŝaltitajn deponejojn" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Aldonado de ŝaltitaj deponejoj..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Aldoni malŝaltitajn deponejojn" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Aldonado de malŝaltitaj deponejoj..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Necesas ĝusta memorilo" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1569,7 +1561,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1584,7 +1576,7 @@ "La deponejo estos aldonita je malŝaltita stato." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1596,7 +1588,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1608,7 +1600,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1619,7 +1611,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1732,11 +1724,6 @@ msgstr "Konservado de la sekurecaj agordoj..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Konservado de la agordoj de la praŝargaj skriptoj..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Konservado de la agordoj de la aparataro..." @@ -1908,17 +1895,17 @@ "Notoj: Eble vi devos replenigi kelkajn informojn denove." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Konfirmi Instaladon" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Devigitaj informoj por la baza instalo nun plenas." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1931,7 +1918,7 @@ "instalagordoj en la antaŭaj dialogoj." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1943,22 +1930,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Iru reen kaj kontrolu la agordojn se vi ne estas certa." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Konfirmi Ĝisdatigon" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "La postulata informo por efektivigi ĝisdatigon estas nun kompleta." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1969,7 +1956,7 @@ "laŭ la agordoj de la pasintaj dialogoj." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Startigi Ĝis&datigon" @@ -2053,6 +2040,15 @@ "La instalilo ne sukcesis aŭtomate solvi la pakaĵdependaĵojn.\n" "Programarmastrumilo malfermiĝos por ke vi permane solvu ilin." +#~ msgid "Dummy" +#~ msgstr "Lokokupa" + +#~ msgid "&Dummy" +#~ msgstr "&Lokokupa" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Konservado de la agordoj de la praŝargaj skriptoj..." + #~ msgid "Network Device: %1" #~ msgstr "Retaparato: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-eo-3.1.0/po/status.txt new/yast2-trans-eo-3.1.0/po/status.txt --- old/yast2-trans-eo-3.1.0/po/status.txt 2014-12-16 14:28:48.000000000 +0100 +++ new/yast2-trans-eo-3.1.0/po/status.txt 2015-04-20 17:51:50.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 879 -Fuzzy : 55 +Translated : 875 +Fuzzy : 56 Untranslated : 16540 -------------------- - All strings : 17474 + All strings : 17471 5 % are translated ++++++ yast2-trans-es-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-3.1.0/po/base.es.po new/yast2-trans-es-3.1.0/po/base.es.po --- old/yast2-trans-es-3.1.0/po/base.es.po 2014-10-29 16:58:24.000000000 +0100 +++ new/yast2-trans-es-3.1.0/po/base.es.po 2015-04-20 18:04:53.000000000 +0200 @@ -12,20 +12,21 @@ # César Sánchez Alonso <csalinux(a)gmail.com>, 2007. # Luis Martinez <lmartinez(a)sct.ictnet.es>, 2008, 2009. # Ricardo Varas Santana <rivarass(a)gmail.com>, 2009. +# Javier Llorente <javier(a)opensuse.org>, 2015. msgid "" msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:22+0100\n" -"PO-Revision-Date: 2014-10-18 12:31-0300\n" -"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" +"PO-Revision-Date: 2015-03-05 01:12+0100\n" +"Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Lokalize 1.5\n" #. Translators: a warning message in a continue-cancel question #. Opscode Chef is a different way to configure the system. @@ -4085,7 +4086,7 @@ #. open a new wizard dialog if needed #: library/packages/src/modules/PackagesUI.rb:661 msgid "After Installing Packages" -msgstr "Luego de instalar paquetes" +msgstr "Después de instalar paquetes" #: library/packages/src/modules/PackagesUI.rb:662 msgid "Show This Report" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-3.1.0/po/installation.es.po new/yast2-trans-es-3.1.0/po/installation.es.po --- old/yast2-trans-es-3.1.0/po/installation.es.po 2014-12-16 14:22:18.000000000 +0100 +++ new/yast2-trans-es-3.1.0/po/installation.es.po 2015-04-20 18:04:50.000000000 +0200 @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: installation.es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2014-11-25 16:08-0300\n" "Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" @@ -29,16 +29,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.6.9\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Simulado" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "Simula&do" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -58,39 +48,39 @@ "el sistema instalado. Si esta opción está seleccionada, se almacenará un perfil del sistema actual en\n" " <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Configuración del Sistema de Duplicación" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Configuración del Sistema de Duplicación" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "El perfil de AutoYaST se guardará en /root/autoinst.xml (<a href=\"%1\">no guardar</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "No se guardará un perfil de AutoYaST (<a href=\"%1\">guardar</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Escribir perfil de AutoYaST en /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiando los archivos al sistema instalado..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiando los archivos de registro al sistema instalado..." @@ -1096,7 +1086,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Cambiar..." @@ -1474,31 +1464,31 @@ # include/partitioning/lvm_ui_lib.ycp:363 include/partitioning/raid_ui.ycp:349 # include/partitioning/lvm_ui_lib.ycp:389 include/partitioning/raid_ui.ycp:349 #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Eliminado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Activado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Desactivado" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repositorios usados anteriormente" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1507,27 +1497,27 @@ "que está actualizando:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Estado actual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repositorio" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Dirección URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Cambiar estado" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1537,7 +1527,7 @@ "desee incluir en el proceso de actualización." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1546,30 +1536,30 @@ "Cambiar estadoo pulse dos veces sobre el elemento respectivo en la tabla." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Para cambiar la dirección URL, pulse sobre el botón Cambiar.... ." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Desconocido" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Dirección URL del &repositorio" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "La red no está configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1578,51 +1568,51 @@ "¿Desea configurarla?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Añadiendo y eliminando repositorios..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Realizando cambios en los repositorios." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Quitar repositorios sin usar" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Quitando repositorios sin usar..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Añadir repositorios habilitados" # include/users/ui.ycp:515 menuentries/menuentry_add_user.ycp:51 #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Añadiendo repositorios habilitados..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Añadir repositorios deshabilitados" # include/users/ui.ycp:515 menuentries/menuentry_add_user.ycp:51 #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Añadiendo repositorios deshabilitados..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Se necesita el medio correcto" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1636,7 +1626,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1651,7 +1641,7 @@ "El repositorio se añadirá deshabilitado." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1663,7 +1653,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1675,7 +1665,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1686,7 +1676,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1800,11 +1790,6 @@ msgstr "Guardando configuració de seguridad..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Guardando configuración de los scripts de inicio..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Guardando la configuración del hardware..." @@ -1976,17 +1961,17 @@ "Nota: es posible que tenga introducir algunos datos de nuevo." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmar la instalación" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "La información necesaria para la instalación básica está completa." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1999,7 +1984,7 @@ "en los diálogos anteriores." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2010,22 +1995,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Si no está seguro, todavía puede retroceder y revisar las opciones seleccionadas." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmar actualización" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Se ha completado toda la información necesaria para realizar una actualización." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2036,7 +2021,7 @@ "conforme a las opciones seleccionadas en los diálogos anteriores." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Iniciar &actualización" @@ -2127,6 +2112,18 @@ "La instalación no ha logrado resolver las dependencias de paquetes automáticamente.\n" "Se abrirá el gestor de paquetes para que pueda resolverlas manualmente." +#~ msgid "Dummy" +#~ msgstr "Simulado" + +#~ msgid "&Dummy" +#~ msgstr "Simula&do" + +#~ msgid "Write AutoYaST profile to /root/autoinst.xml" +#~ msgstr "Escribir perfil de AutoYaST en /root/autoinst.xml" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Guardando configuración de los scripts de inicio..." + #~ msgid "Search for Linux partitions" #~ msgstr "Buscar particiones Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-3.1.0/po/network.es.po new/yast2-trans-es-3.1.0/po/network.es.po --- old/yast2-trans-es-3.1.0/po/network.es.po 2014-10-29 16:58:54.000000000 +0100 +++ new/yast2-trans-es-3.1.0/po/network.es.po 2015-04-20 18:05:19.000000000 +0200 @@ -23,20 +23,21 @@ # Javier Llorente <javier(a)opensuse.org>, 2010. # lluis, 2011. # lluis <lmartinez(a)ingelin.es>, 2011, 2012. +# jcsl <trcs(a)gmx.com>, 2015. msgid "" msgstr "" "Project-Id-Version: network\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-10-14 19:19-0300\n" -"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" -"Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" +"PO-Revision-Date: 2015-03-30 15:01+0200\n" +"Last-Translator: jcsl <trcs(a)gmx.com>\n" +"Language-Team: Spanish <kde-i18n-doc(a)kde.org>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Lokalize 1.5\n" #. Commandline help title #: src/clients/dns.rb:63 @@ -193,11 +194,11 @@ #: src/clients/firewall_stage1_proposal.rb:287 msgid "SSH service will be enabled (<a href=\"%s\">disable</a>)" -msgstr "El servicio SSH será habilitado (<a href=\"%1\">deshabilitar</a>)" +msgstr "El servicio SSH será habilitado (<a href=\"%s\">deshabilitar</a>)" #: src/clients/firewall_stage1_proposal.rb:291 msgid "SSH service will be disabled (<a href=\"%s\">enable</a>)" -msgstr "El servicio SSH será deshabilitado (<a href=\"%1\">habilitar</a>)" +msgstr "El servicio SSH será deshabilitado (<a href=\"%s\">habilitar</a>)" #. TRANSLATORS: check-box label #: src/clients/firewall_stage1_proposal.rb:307 @@ -212,22 +213,22 @@ #. Show VNC port only if installing over VNC #: src/clients/firewall_stage1_proposal.rb:339 msgid "VNC ports will be open (<a href=\"%s\">close</a>)" -msgstr "Los puertos VNC estarán abiertos (<a href=\"%1\">cerrar</a>)" +msgstr "Los puertos VNC estarán abiertos (<a href=\"%s\">cerrar</a>)" #: src/clients/firewall_stage1_proposal.rb:341 msgid "VNC ports will be blocked (<a href=\"%s\">open</a>)" -msgstr "Los puertos VNC estarán cerrados (<a href=\"%1\">abrir</a>)" +msgstr "Los puertos VNC estarán cerrados (<a href=\"%s\">abrir</a>)" #. Returns the SSH-port part of the firewall proposal description #. Returns nil if this part should be skipped #. @return [String] proposal html text #: src/clients/firewall_stage1_proposal.rb:352 msgid "SSH port will be open (<a href=\"%s\">block</a>)" -msgstr "El puerto SSH estará abierto (<a href=\"%1\">cerrar</a>)" +msgstr "El puerto SSH estará abierto (<a href=\"%s\">cerrar</a>)" #: src/clients/firewall_stage1_proposal.rb:354 msgid "SSH port will be blocked (<a href=\"%s\">open</a>)" -msgstr "El puerto SSH estará cerrado (<a href=\"%1\">abrir</a>)" +msgstr "El puerto SSH estará cerrado (<a href=\"%s\">abrir</a>)" #. Commandline help title #. configuration of hosts @@ -4785,7 +4786,7 @@ #: src/modules/LanItems.rb:1378 msgid "enslaved in %s" -msgstr "esclavizado en %1" +msgstr "esclavizado en %s" #: src/modules/LanItems.rb:1379 msgid "Bonding master" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-3.1.0/po/packager.es.po new/yast2-trans-es-3.1.0/po/packager.es.po --- old/yast2-trans-es-3.1.0/po/packager.es.po 2014-10-29 16:58:18.000000000 +0100 +++ new/yast2-trans-es-3.1.0/po/packager.es.po 2015-04-20 18:04:47.000000000 +0200 @@ -12,18 +12,18 @@ # Miguel Angel Alvarez <maacruz(a)gmail.com>, 2007. # Sergio Gabriel Teves <gabriel(a)opensuse.org>, 2008. # Ricardo Varas Santana <rivarass(a)gmail.com>, 2009. -# Javier Llorente <javier(a)opensuse.org>, 2009. +# Javier Llorente <javier(a)opensuse.org>, 2009, 2015. # Lluis <lmartinez(a)sct.ictnet.es>, 2010. # lluis, 2011. # lluis <lmartinez(a)sct.ictnet.es>, 2011, 2012. -# Carlos E. Robinson <carlos.e.r(a)opensuse.org>, 2012, 2013. +# Carlos E. Robinson <carlos.e.r(a)opensuse.org>, 2012, 2013, 2015. msgid "" msgstr "" "Project-Id-Version: packager.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2013-09-16 13:10+0200\n" -"Last-Translator: Carlos E. Robinson <carlos.e.r(a)opensuse.org>\n" +"PO-Revision-Date: 2015-03-05 01:05+0100\n" +"Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -1849,7 +1849,7 @@ #. help text for software proposal #: src/modules/Packages.rb:325 msgid "The pattern list states which functionality will be available after installing the system." -msgstr "La lista de patrones muestra que funcionalidad estará disponible luego de instalar el sistema." +msgstr "La lista de patrones muestra que funcionalidad estará disponible después de instalar el sistema." #. (see bnc#178357 why these numbers) #. translators: help text for software proposal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-3.1.0/po/status.txt new/yast2-trans-es-3.1.0/po/status.txt --- old/yast2-trans-es-3.1.0/po/status.txt 2014-12-16 14:23:02.000000000 +0100 +++ new/yast2-trans-es-3.1.0/po/status.txt 2015-04-20 18:05:31.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17249 +Translated : 17245 Fuzzy : 90 -Untranslated : 135 +Untranslated : 136 -------------------- - All strings : 17474 + All strings : 17471 99 % are translated ++++++ yast2-trans-et-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-et-3.1.0/po/installation.et.po new/yast2-trans-et-3.1.0/po/installation.et.po --- old/yast2-trans-et-3.1.0/po/installation.et.po 2014-10-29 16:49:31.000000000 +0100 +++ new/yast2-trans-et-3.1.0/po/installation.et.po 2015-04-20 17:48:03.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: installation.et\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-12-13 01:57+0200\n" "Last-Translator: Jaan Vajakas <jaanvajakas(a)hot.ee>\n" "Language-Team: Estonian <>\n" @@ -20,16 +20,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Näidis" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "Näi&dis" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -54,15 +44,19 @@ "vajab profiili, mis ütleb, kuidas paigaldatud süsteem välja peaks nägema. Kui see suvand\n" "on valitud, salvestatakse käesoleva süsteemi profiil asukohta <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Süsteemi häälestuse kirjutamine..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -70,27 +64,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Failide kopeerimine paigaldatud süsteemi..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Logifailide kopeerimine paigaldatud süsteemi..." @@ -1078,7 +1068,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Muuda..." @@ -1463,31 +1453,31 @@ "Paigaldamine katkestatakse." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Eemaldatud" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Lubatud" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Keelatud" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Eelnevalt kasutatud hoidlad" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1496,27 +1486,27 @@ "järgmised hoidlad:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Praegune olek" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Hoidla" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Lüli&ta olek ümber" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1525,7 +1515,7 @@ "süsteemilt leiti. Luba need hoidlad, mille tahad uuendamisel kaasata." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1534,30 +1524,30 @@ "Lülita olek ümber või tee topeltklõps vastaval tabeli kirjel." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "URL-i muutmiseks vajuta nuppu Muuda..." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Tundmatu" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Hoidla U&RL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Võrk pole häälestatud" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1566,49 +1556,49 @@ "Kas seadistada see?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Hoidlate lisamine ja eemaldamine..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Hoidlaid lisatakse ja eemaldatakse." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Kasutamata hoidlate eemaldamine" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Eemaldatakse kasutamata hoidlaid..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Lubatud hoidlate lisamine" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Lisatakse lubatud hoidlaid..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Keelatud hoidlate lisamine" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Lisatakse keelatud hoidlaid..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Sisesta õige andmekandja" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1622,7 +1612,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1632,7 +1622,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1644,7 +1634,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1656,7 +1646,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1667,7 +1657,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1787,13 +1777,6 @@ msgstr "Turvasätete lugemine..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Helikaardi sätete salvestamine..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Riistvara häälestuse salvestamine..." @@ -1932,17 +1915,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Paigaldamise kinnitamine" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Põhipaigalduseks vajalik teave on nüüd olemas." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -1956,7 +1939,7 @@ "vastavalt eelmistes dialoogides määratud paigaldamise sätetele." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -1969,22 +1952,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Mine tagasi ja kontrolli sätteid, kui kahtled." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Uuendamise kinnitamine" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Uuendamiseks vajalik teave on nüüd olemas." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -1996,7 +1979,7 @@ "vastavalt eelmistes dialoogides määratud sätetele." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Käivita &uuendamine" @@ -2091,6 +2074,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Näidis" + +#~ msgid "&Dummy" +#~ msgstr "Näi&dis" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Helikaardi sätete salvestamine..." + #~ msgid "License needs to be accepted" #~ msgstr "Litsentsiga peab nõustutama" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-et-3.1.0/po/status.txt new/yast2-trans-et-3.1.0/po/status.txt --- old/yast2-trans-et-3.1.0/po/status.txt 2014-12-16 14:17:48.000000000 +0100 +++ new/yast2-trans-et-3.1.0/po/status.txt 2015-04-20 17:48:14.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 9192 -Fuzzy : 3388 +Translated : 9190 +Fuzzy : 3387 Untranslated : 4894 -------------------- - All strings : 17474 + All strings : 17471 53 % are translated ++++++ yast2-trans-eu-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-eu-3.1.0/po/installation.eu.po new/yast2-trans-eu-3.1.0/po/installation.eu.po --- old/yast2-trans-eu-3.1.0/po/installation.eu.po 2014-10-29 16:55:50.000000000 +0100 +++ new/yast2-trans-eu-3.1.0/po/installation.eu.po 2015-04-20 17:47:56.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-01-11 22:36+0100\n" "Last-Translator: etxondoko <ander.elor(a)gmail.com>\n" "Language-Team: Basque <librezale(a)librezale.org>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Probakoa" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Probakoa" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -41,39 +31,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -955,7 +945,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1277,144 +1267,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1424,7 +1414,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1434,7 +1424,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1443,7 +1433,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1452,7 +1442,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1460,7 +1450,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1564,11 +1554,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1703,17 +1688,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1722,7 +1707,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1731,22 +1716,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1754,7 +1739,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" @@ -1835,3 +1820,9 @@ "Installation was unable to solve package dependencies automatically.\n" "Software manager will be opened for you to solve them manually." msgstr "" + +#~ msgid "Dummy" +#~ msgstr "Probakoa" + +#~ msgid "&Dummy" +#~ msgstr "&Probakoa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-eu-3.1.0/po/status.txt new/yast2-trans-eu-3.1.0/po/status.txt --- old/yast2-trans-eu-3.1.0/po/status.txt 2014-12-16 14:29:43.000000000 +0100 +++ new/yast2-trans-eu-3.1.0/po/status.txt 2015-04-20 17:47:57.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 118 +Translated : 116 Fuzzy : 5 -Untranslated : 17351 +Untranslated : 17350 -------------------- - All strings : 17474 + All strings : 17471 1 % are translated ++++++ yast2-trans-fa-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fa-3.1.0/po/installation.fa.po new/yast2-trans-fa-3.1.0/po/installation.fa.po --- old/yast2-trans-fa-3.1.0/po/installation.fa.po 2014-10-29 16:59:15.000000000 +0100 +++ new/yast2-trans-fa-3.1.0/po/installation.fa.po 2015-04-20 18:09:14.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: yast2 memory\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-02-15 23:53+0330\n" "Last-Translator: \n" "Language-Team: Persian <i18n(a)suse.de>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.0\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "مصنوع" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&مصنوع" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -52,15 +42,19 @@ "به اطلاعات عمومی برای داشتن دانش این که سیستمی که نصب می شود چگونه باشد ،احتیاج دارد. اگر این گزینه \n" "انتخاب شده باشد، اطلاعات عمومی سیستم در مسیر <tt>/root/autoinst.xml</tt> ذخیره خواهد شد." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "نوشتن قالب بندی سیستم" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -68,27 +62,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "در حال نسخه سازی فایل ها در سیستم نصب شده.." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "در حال ذخیره سازی فایل وضعیت در سیستم نصب شده.." @@ -1110,7 +1100,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&تغییر" @@ -1453,31 +1443,31 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "فعال" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "غیر فعال" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "مخزن از قبل استفاده شده" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1486,113 +1476,113 @@ "می کنید پیدا شده است:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "حالت جاری" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "خزانه" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "آدرس" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "تغییر &حالت" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "ناشناس" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "شبکه قالب بندی شده است" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "اضافه و کم کردن خزانه ها" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "خزانه های که استفاده نمیشود را حذف کن" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "در حال حذف خزانه های غیر ملزوم.." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "اضافه کردن خزانه های فعال" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "درحال اضافه کردن خزانه های فعال" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "اضافه کردن خزانه های غیر فعال" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "در حال اضافه کردن خزانه های غیر فعال" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1602,7 +1592,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1612,7 +1602,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "Add enabled repositories" msgid "" @@ -1623,7 +1613,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1632,7 +1622,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "Add enabled repositories" msgid "" @@ -1642,7 +1632,7 @@ msgstr "اضافه کردن خزانه های فعال" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "Add disabled repositories" msgid "" @@ -1762,13 +1752,6 @@ msgstr "در حال نوشتن تنظیمات proxy...." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving automatical installation settings..." -msgid "Saving boot scripts settings..." -msgstr "در حال ذخیره سازی تنظیمات نصب به صورت خودکار..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "در حال ذخیره سازی قالب بندی سخت افزار..." @@ -1915,19 +1898,19 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr " تمام اطلاعاتی که برای روند نصب پایه مورد نیاز است کامل شده است." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1936,7 +1919,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1948,24 +1931,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "در صورتی که اطمینان ندارید به عقب برگردید و تنظیمات خود را دوباره برسی کنید." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "تصدیق به روز رسانی" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "تمام اطلاعاتی که برای اجرای به روز رسانی مورد نیاز است کامل شده." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1976,7 +1959,7 @@ "این عمل بر اساس تنظیمات قبلی شما اتفاق خواهد افتاد." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "آغاز به &روزرسانی" @@ -2074,6 +2057,17 @@ "روند نصب قادر نیست که وابستگی بین بسته ها را به صورت خود کار حل کند.\n" "برنامه مدیریت بسته ها برای شما باز می شود تا ان را به صورت دستی انجام دهید." +#~ msgid "Dummy" +#~ msgstr "مصنوع" + +#~ msgid "&Dummy" +#~ msgstr "&مصنوع" + +#, fuzzy +#~| msgid "Saving automatical installation settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "در حال ذخیره سازی تنظیمات نصب به صورت خودکار..." + #~ msgid "Search for Linux partitions" #~ msgstr "جستجو برای فایلبندی لینوکس" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fa-3.1.0/po/status.txt new/yast2-trans-fa-3.1.0/po/status.txt --- old/yast2-trans-fa-3.1.0/po/status.txt 2014-12-16 14:11:11.000000000 +0100 +++ new/yast2-trans-fa-3.1.0/po/status.txt 2015-04-20 18:09:17.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 1102 -Fuzzy : 1082 +Translated : 1100 +Fuzzy : 1081 Untranslated : 15290 -------------------- - All strings : 17474 + All strings : 17471 6 % are translated ++++++ yast2-trans-fi-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/audit-laf.fi.po new/yast2-trans-fi-3.1.0/po/audit-laf.fi.po --- old/yast2-trans-fi-3.1.0/po/audit-laf.fi.po 2014-10-29 17:07:07.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/audit-laf.fi.po 2015-04-20 17:50:22.000000000 +0200 @@ -10,13 +10,13 @@ # Asko Isonokari <askoin(a)opensuse.fi>, 2009, 2012. # Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. # Katariina Kemppainen <katariina(a)opensuse.fi>, 2010. -# Harri Miettinen <harmie(a)opensuse.fi>, 2013. +# Harri Miettinen <harmie(a)opensuse.fi>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: audit-laf.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2013-08-15 18:38+0300\n" +"PO-Revision-Date: 2014-12-17 22:59+0200\n" "Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" @@ -892,23 +892,21 @@ #. question shown in a popup about start of audit daemon #: src/modules/AuditLaf.rb:463 +#, fuzzy msgid "" "Do you want to start it and enable start at boot\n" "or only start the daemon for now?" msgstr "" +"Haluatko käynnistää audit-demonin nyt ja käynnistyksen yhteydessä\n" +"vai pelkästään nyt?" #: src/modules/AuditLaf.rb:466 +#, fuzzy msgid "The daemon 'auditd' doesn't run.\n" -msgstr "" +msgstr "auditd-demoni ei ole käynnissä.\n" #. message about loaded kernel module #: src/modules/AuditLaf.rb:470 -#, fuzzy -#| msgid "" -#| " The 'apparmor' kernel module is loaded.\n" -#| "The kernel uses a running audit daemon to log audit\n" -#| "events to /var/log/audit/audit.log (default). \n" -#| "Do you want to start the daemon now?" msgid "" "The 'apparmor' kernel module is loaded.\n" "The kernel uses a running audit daemon to log audit\n" @@ -917,19 +915,18 @@ "Ytimen moduuli 'apparmor' on ladattu.\n" "Ydin käyttää audit-demonia kirjaamaan audit-\n" "tapahtumat /var/log/audit/audit.log-tiedostoon (oletus). \n" -"Haluatko käynnistää demonin nyt?" #. Headline of a popup #: src/modules/AuditLaf.rb:477 #, fuzzy #| msgid "Start daemon." msgid "Start of Audit Daemon" -msgstr "Käynnistä demoni." +msgstr "Käynnistä Audit-demoni." #. label of three buttons belonging to the popup #: src/modules/AuditLaf.rb:479 msgid "Start and &Enable" -msgstr "" +msgstr "Käynnistä ja ota käyttöön" #: src/modules/AuditLaf.rb:479 msgid "&Start" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/autoinst.fi.po new/yast2-trans-fi-3.1.0/po/autoinst.fi.po --- old/yast2-trans-fi-3.1.0/po/autoinst.fi.po 2014-10-29 17:07:28.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/autoinst.fi.po 2015-04-20 17:50:41.000000000 +0200 @@ -15,14 +15,14 @@ # Asko Isonokari <askoin(a)netsonic.fi>, 2009. # Harri Miettinen <harri.miettinen(a)opensuse.fi>, 2010. # Katariina Kemppainen <katariina(a)opensuse.fi>, 2010. -# Harri Miettinen <harmie(a)opensuse.fi>, 2011, 2013. +# Harri Miettinen <harmie(a)opensuse.fi>, 2011, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-12 20:51+0300\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" +"PO-Revision-Date: 2014-12-17 21:06+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -148,10 +148,8 @@ #. TRANSLATORS: Warning that an already existing autoyast configuration file will be overwritten. #: src/clients/clone_system.rb:94 -#, fuzzy -#| msgid "%1 exists! Really overwrite?" msgid "File %s exists! Really overwrite?" -msgstr "%1 on jo olemassa! Korvataanko se varmasti?" +msgstr "Tiedosto %s on jo olemassa! Korvataanko se varmasti?" #: src/clients/clone_system.rb:98 msgid "Cloning the system..." @@ -551,10 +549,8 @@ msgstr "Määritetään käynnistyslatain..." #: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:63 -#, fuzzy -#| msgid "Repairing file system..." msgid "Registering the system..." -msgstr "Korjataan tiedostojärjestelmää..." +msgstr "Rekisteröidään järjestelmää..." #: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:64 msgid "Configuring Software selections..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/bootloader.fi.po new/yast2-trans-fi-3.1.0/po/bootloader.fi.po --- old/yast2-trans-fi-3.1.0/po/bootloader.fi.po 2014-10-29 17:07:18.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/bootloader.fi.po 2015-04-20 17:50:31.000000000 +0200 @@ -21,8 +21,8 @@ "Project-Id-Version: bootloader.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-27 21:57+0200\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" +"PO-Revision-Date: 2014-12-17 21:13+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -43,10 +43,8 @@ #. command line help text for delete action #: src/clients/bootloader.rb:58 -#, fuzzy -#| msgid "Set a global option" msgid "Delete a global option" -msgstr "Aseta yleinen valinta" +msgstr "Poista yleinen valinta" #. command line help text for set action #: src/clients/bootloader.rb:65 @@ -80,10 +78,8 @@ #. command line, %1 is the value of bootloader option #: src/clients/bootloader.rb:182 -#, fuzzy -#| msgid "Value: %1" msgid "Value: %s" -msgstr "Arvo: %1" +msgstr "Arvo: %s" #. command line error report #: src/clients/bootloader.rb:185 @@ -263,16 +259,12 @@ "ottaaksesi käyttöön GRUB:in kirjoituksen MBR:lle molemmissa levyissä." #: src/include/bootloader/grub/helps.rb:65 -#, fuzzy -#| msgid "" -#| "Use Serial Console lets you define the parameters to use\n" -#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details." msgid "" "Use Serial Console lets you define the parameters to use\n" "for a serial console. Please see the grub documentation (<code>info grub2</code>) for details." msgstr "" -"Sarjayhteyden parametrit -vaihtoehdon avulla voit määrittää sarjakonsolille\n" -"käytettävät parametrit. Lisätietoja on grub-ohjeissa (<code>info grub</code>)." +"Käytä Sarjakonsolia -vaihtoehdon avulla voit määrittää sarjakonsolille\n" +"käytettävät parametrit. Lisätietoja on grub-ohjeissa (<code>info grub2</code>)." #: src/include/bootloader/grub/helps.rb:68 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/cluster.fi.po new/yast2-trans-fi-3.1.0/po/cluster.fi.po --- old/yast2-trans-fi-3.1.0/po/cluster.fi.po 2014-10-29 17:07:20.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/cluster.fi.po 2015-04-20 17:50:33.000000000 +0200 @@ -11,8 +11,8 @@ "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-26 20:34+0200\n" -"Last-Translator: Tommi Nieminen <translator(a)legisign.org>\n" +"PO-Revision-Date: 2014-12-17 21:38+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: American English <kde-i18n-doc(a)kde.org>\n" "Language: en_US\n" "MIME-Version: 1.0\n" @@ -97,63 +97,53 @@ #: src/include/cluster/dialogs.rb:113 msgid "Redundant IP Address" -msgstr "Tarpeeton IP-osoite" +msgstr "Varayhteyden IP-osoite" #: src/include/cluster/dialogs.rb:115 src/include/cluster/dialogs.rb:499 -#, fuzzy -#| msgid "Node IP" msgid "Node ID" -msgstr "Solmun IP " +msgstr "Solmun ID" #. Set need to require 'set' #: src/include/cluster/dialogs.rb:163 msgid "Node ID has to be fulfilled with a positive integer" -msgstr "" +msgstr "Solmun ID pitää olla asetettu positiiviseksi kokonaisluvuksi" #: src/include/cluster/dialogs.rb:170 -#, fuzzy -#| msgid "The hardware address must be unique." msgid "Node ID must be unique" -msgstr "Laitteisto-osoitteen pitää olla yksilöivä." +msgstr "Solmun ID pitää olla yksilöllinen" #. BNC#871970, change member address struct #: src/include/cluster/dialogs.rb:191 src/include/cluster/dialogs.rb:245 -#, fuzzy -#| msgid "Bind Network Address:" msgid "The Bind Network Address has to be fulfilled" -msgstr "Sidottu verkko-osoite:" +msgstr "Sidottu verkko-osoite pitää olla asetettu" #: src/include/cluster/dialogs.rb:197 msgid "The cluster name has to be fulfilled" -msgstr "" +msgstr "Klusterin nimi pitää olla määritetty" #: src/include/cluster/dialogs.rb:214 #, fuzzy #| msgid "The hardware address must be defined." msgid "The Member Address has to be fulfilled" -msgstr "Laitteisto-osoite pitää olla määritelty." +msgstr "Jäsenosoite pitää olla määritetty" #. BNC#880242, expected_votes must have value when "udp" #: src/include/cluster/dialogs.rb:220 -#, fuzzy -#| msgid "Play the test sound when the card is configured" msgid "The Expected Votes has to be fulfilled when udp is configured" -msgstr "Soita testiääni, kun äänikortti on määritetty" +msgstr "Odotettujen äänien määrä pitää olla määritetty kun udp on käytössä" #: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 #: src/include/cluster/dialogs.rb:1463 msgid "The Multicast Address has to be fulfilled" -msgstr "" +msgstr "Ryhmälähetysosoite pitää olla määritetty" #: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 -#, fuzzy -#| msgid "The value for pos must be a positive integer." msgid "The Multicast port must be a positive integer" -msgstr "pos arvon täytyy olla positiivinen kokonaisluku." +msgstr "Ryhmälähetysportti pitää olla positiivinen kokonaisluku" #: src/include/cluster/dialogs.rb:270 msgid "Only passive or active can be chosen if multiple interface used. Set to passive." -msgstr "" +msgstr "Voit valita vain passiivisen tai aktiivisen, kun useampi liitäntä käytössä. Aseta passiiviseksi." #. BNC#871970, change member address struct to memberaddr #: src/include/cluster/dialogs.rb:439 @@ -209,7 +199,7 @@ #, fuzzy #| msgid "Redundant IP Address" msgid "Redundant IP" -msgstr "Tarpeeton IP-osoite" +msgstr "Varayhteyden IP-osoite" #. BNC#879596, check the corosync.conf format #: src/include/cluster/dialogs.rb:539 @@ -217,15 +207,17 @@ " NOTICE: Detected old corosync configuration.\n" " Please reconfigure the member list and confirm all other settings." msgstr "" +"ILMOITUS: Havaittiin vanha corosync määritys.\n" +"Määritä jäsenlista uudelleen ja tarkista muutkin määritykset." #. Notice, current could be "nil" if the list is empty. #: src/include/cluster/dialogs.rb:690 msgid "Number of threads must be integer" -msgstr "" +msgstr "Säikeiden määrä pitää olla kokonaisluku" #: src/include/cluster/dialogs.rb:696 msgid "Number of threads must larger then 0" -msgstr "" +msgstr "Säikeiden määrä pitää olla suurempi kuin 0" #: src/include/cluster/dialogs.rb:734 msgid "Enable Security Auth" @@ -245,11 +237,11 @@ #: src/include/cluster/dialogs.rb:773 msgid "Failed to create /etc/corosync/authkey" -msgstr "" +msgstr "Tiedoston /etc/corosync/authkey luonti epäonnistui" #: src/include/cluster/dialogs.rb:775 msgid "Create /etc/corosync/authkey succeeded" -msgstr "" +msgstr "Tiedoston /etc/corosync/authkey luonti onnistui" #: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 msgid "Running" @@ -265,16 +257,12 @@ msgstr "Käynnistys" #: src/include/cluster/dialogs.rb:898 -#, fuzzy -#| msgid "On -- Start pacemaker at booting" msgid "On -- Start pacemaker during boot" msgstr "Käytössä – Käynnistä pacemaker käynnistettäessä" #: src/include/cluster/dialogs.rb:905 -#, fuzzy -#| msgid "Off -- Start pacemaker manually only" msgid "Off -- Start pacemaker manually" -msgstr "Poissa käytöstä – Käynnistä pacemaker käsin" +msgstr "Poissa käytöstä – Käynnistä pacemaker manuaalisesti" #: src/include/cluster/dialogs.rb:914 msgid "Switch On and Off" @@ -405,10 +393,8 @@ msgstr "Luo etc/conntrackd/conntrackd.conf" #: src/include/cluster/dialogs.rb:1471 -#, fuzzy -#| msgid "The value for pos must be a positive integer." msgid "The Group Number must be a positive integer" -msgstr "pos arvon täytyy olla positiivinen kokonaisluku." +msgstr "Ryhmänumero pitää olla kokonaisluku" #. All helps are here #: src/include/cluster/helps.rb:35 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/control.fi.po new/yast2-trans-fi-3.1.0/po/control.fi.po --- old/yast2-trans-fi-3.1.0/po/control.fi.po 2014-10-29 17:06:59.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/control.fi.po 2015-04-20 17:50:13.000000000 +0200 @@ -11,14 +11,14 @@ # Mikko Piippo <mikko.piippo(a)opensuse.fi>, 2008. # Asko Isonokari <askoin(a)netsonic.fi>, 2009. # Katariina Kemppainen <katariina(a)opensuse.fi>, 2010. -# Harri Miettinen <harmie(a)opensuse.fi>, 2013. +# Harri Miettinen <harmie(a)opensuse.fi>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: control.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-10-12 20:58+0300\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" +"PO-Revision-Date: 2014-12-17 23:01+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -28,15 +28,6 @@ "X-Generator: Lokalize 1.5\n" #: control/control.openSUSE.glade.translations.glade:3 -#, fuzzy -#| msgid "" -#| "\n" -#| "Congratulations!\n" -#| "The installation of openSUSE on your machine is complete.\n" -#| "After clicking Finish, you can log in to the system.\n" -#| "Visit us at %1.\n" -#| "Have a lot of fun! Your openSUSE Development Team\n" -#| "\t " msgid "" "\n" "Congratulations!\n" @@ -52,7 +43,7 @@ "Voit kirjautua järjestelmään Valmis-painikkeen painamisen jälkeen.\n" "Vieraile osoitteessa %1.\n" "Pidä hauskaa! Terveisin openSUSEn kehitysryhmä\n" -"\t " +" " #: control/control.openSUSE.glade.translations.glade:10 msgid "" @@ -141,8 +132,6 @@ #: control/control.openSUSE.glade.translations.glade:36 #: control/control.openSUSE.glade.translations.glade:63 -#, fuzzy -#| msgid "Load Linuxrc Network Configuration" msgid "Load linuxrc Network Configuration" msgstr "Lataa Linuxrc verkkomääritys" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/crowbar.fi.po new/yast2-trans-fi-3.1.0/po/crowbar.fi.po --- old/yast2-trans-fi-3.1.0/po/crowbar.fi.po 2014-10-29 17:07:16.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/crowbar.fi.po 2015-04-20 17:50:30.000000000 +0200 @@ -4,14 +4,14 @@ # Copyright (C) 2003 SuSE Linux AG. # # Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008, 2013. -# Harri Miettinen <harmie(a)opensuse.fi>, 2013. +# Harri Miettinen <harmie(a)opensuse.fi>, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2013-08-20 14:20+0300\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" +"PO-Revision-Date: 2014-12-17 22:27+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ #, fuzzy #| msgid "&Repository Name" msgid "Repository Name" -msgstr "&Asennuslähteen nimi" +msgstr "Asennuslähteen nimi" #: src/include/crowbar/complex.rb:96 msgid "URL" @@ -44,6 +44,7 @@ #. help text #: src/include/crowbar/complex.rb:106 +#, fuzzy msgid "" "Here you can edit the location of your Update Repositories.\n" "\n" @@ -56,6 +57,16 @@ "For detailed description, check the Deployment Guide.\n" "" msgstr "" +"Tässä voit muokata Päivityslähteidesi sijaintia.\n" +"\n" +"Joitain esimerkkejä miltä päivitysosoitteen tulisi näyttää:\n" +"\n" +"<ul>\n" +"<li>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/ SMT-palvelin\n" +"<li>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-… SUSE Manager palvelin\n" +"\n" +"Tarkempaa tietoa löytyy käyttöönotto ohjeesta.\n" +"" #. textentry label #: src/include/crowbar/complex.rb:122 @@ -67,35 +78,38 @@ #. textentry label #: src/include/crowbar/complex.rb:135 msgid "&Ask On Error" -msgstr "" +msgstr "&Kirjautumisvirhe" #. table header #: src/include/crowbar/complex.rb:155 #, fuzzy #| msgid "Administrator DN" msgid "Administrator Name" -msgstr "Ylläpitäjän DN" +msgstr "Ylläpitäjän nimi" #. help text #: src/include/crowbar/complex.rb:165 #, fuzzy #| msgid "Enter the password for Crowbar administrator." msgid "Manage user names and passwords for Crowbar administrators." -msgstr "Anna salasana Crowbar ylläpitäjälle." +msgstr "Hallitse käyttäjätunnuksia ja salasanoja Crowbar ylläpitäjille." #. textentry label #: src/include/crowbar/complex.rb:201 #, fuzzy #| msgid "&Model" msgid "&Mode" -msgstr "&Malli" +msgstr "&Tila" #. help text for the Network mode tab (do not translate bastion) #: src/include/crowbar/complex.rb:203 +#, fuzzy msgid "" "Here, define a Network Mode with relevant Bonding Policy.\n" "You can also specify interface names for the bastion network conduits as space-separated list." msgstr "" +"Tässä voit muokata verkkotilan oleellisella liitoskäytännöllä.\n" +"Voit myös määrittää liitosverkkojen liitäntöjen nimet välilyönnillä erotettuun listaan." #. textentry label #: src/include/crowbar/complex.rb:213 @@ -106,16 +120,21 @@ #. textentry label #: src/include/crowbar/complex.rb:222 +#, fuzzy msgid "P&hysical interfaces mapping for bastion network" -msgstr "" +msgstr "Liitosverkkojen kartoitus fyysisiin liitäntöihin" #. help text for conduit if list #: src/include/crowbar/complex.rb:231 +#, fuzzy msgid "" "Each physical interface definition needs to fit the pattern\n" "<tt>[Quantifier][Speed][Order]</tt>.\n" "Valid examples are <tt>+1g2</tt>, <tt>10g1</tt> or <tt>?1g2</tt>." msgstr "" +"Jokaisen fyysisen liitännän määritys tulee täyttää kuvio\n" +"<tt>[Quantifier][Speed][Order]</tt>.\n" +"Esimerkkejä <tt>+1g2</tt>, <tt>10g1</tt> or <tt>?1g2</tt>." #. table header #: src/include/crowbar/complex.rb:265 @@ -139,26 +158,22 @@ #, fuzzy #| msgid "Use VLAN" msgid "Use &VLAN" -msgstr "Käytä VLAN:ia" +msgstr "Käytä &VLAN:ia" #. textentry label #: src/include/crowbar/complex.rb:296 -#, fuzzy -#| msgid "VLAN ID" msgid "VLAN &ID" -msgstr "VLAN ID" +msgstr "VLAN &ID" #. textentry label #: src/include/crowbar/complex.rb:306 msgid "Rou&ter" -msgstr "" +msgstr "Rei&titin" #. textentry label #: src/include/crowbar/complex.rb:328 -#, fuzzy -#| msgid "Restoring user preferences..." msgid "Router pre&ference" -msgstr "Palautetaan käyttäjän valintoja..." +msgstr "Reitittimen asetukset" #. textentry label #: src/include/crowbar/complex.rb:338 @@ -171,22 +186,16 @@ msgstr "&Aliverkon peite" #: src/include/crowbar/complex.rb:383 -#, fuzzy -#| msgid "Broadcast" msgid "Broa&dcast" -msgstr "Broadcast" +msgstr "Yleislähetys" #. checkbox label #: src/include/crowbar/complex.rb:393 -#, fuzzy -#| msgid "Add Bridge" msgid "&Add Bridge" msgstr "Lisää silta" #. push button label& #: src/include/crowbar/complex.rb:402 -#, fuzzy -#| msgid "&Edit Ranges..." msgid "Edit Ran&ges..." msgstr "Muo&kkaa alueita..." @@ -195,7 +204,7 @@ #, fuzzy #| msgid "Bond Network" msgid "Add &Bastion Network" -msgstr "Liitosverkko" +msgstr "Lisää Liitosverkko" #. textentry label #: src/include/crowbar/complex.rb:425 @@ -228,15 +237,11 @@ #. error popup #: src/include/crowbar/complex.rb:636 -#, fuzzy -#| msgid "" -#| "Configuration name %1 already exists.\n" -#| "Choose a different one." msgid "" "User '%1' already exists.\n" "Choose a different name." msgstr "" -"Määritys nimellä %1 on jo olemassa.\n" +"Käyttäjä %1 on jo olemassa.\n" "Valitse toinen nimi." #. error popup @@ -244,7 +249,7 @@ #, fuzzy #| msgid "The entered URL is not valid." msgid "The interface format '%1' is not valid" -msgstr "Annettu verkko-osoite ei kelpaa." +msgstr "Liittymän '%1' muotoilu on virheellinen" #. table entry (VLAN status) #: src/include/crowbar/complex.rb:861 @@ -289,7 +294,7 @@ #, fuzzy #| msgid "The address '%1' is not part of network '%2'." msgid "The IP address '%1' is not part of network '%2'." -msgstr "Osoite '%1' ei ole osa '%2' verkkoa." +msgstr "IP-osoite '%1' ei ole osa '%2' aliverkkoa." #. popup message #: src/include/crowbar/complex.rb:1068 @@ -333,8 +338,9 @@ #. label (hint for user) #: src/include/crowbar/complex.rb:1385 +#, fuzzy msgid "If no user is present, user 'crowbar' with default password will be used." -msgstr "" +msgstr "Mikäli yhtään käyttäjää ei ole saatavilla, Käytetään käyttäjää 'crowbar' oletussalasanalla." #. tab header #: src/include/crowbar/complex.rb:1403 @@ -366,7 +372,7 @@ #. label (hint for user) #: src/include/crowbar/complex.rb:1501 msgid "Empty URL means that default value will be used." -msgstr "" +msgstr "Tyhjä URL tarkoittaa, että käytetään oletusasetuksia." #. popup message %1 is FQDN #: src/include/crowbar/complex.rb:1653 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/geo-cluster.fi.po new/yast2-trans-fi-3.1.0/po/geo-cluster.fi.po --- old/yast2-trans-fi-3.1.0/po/geo-cluster.fi.po 2014-12-16 14:26:09.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/geo-cluster.fi.po 2015-04-20 17:50:12.000000000 +0200 @@ -2,42 +2,44 @@ # Copyright (C) 2005 SUSE Linux Products GmbH. # Finnish message file for YaST2 (@memory@). # Copyright (C) 2003 SuSE Linux AG. -# Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008. # +# Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008. +# Harri Miettinen <harmie(a)opensuse.fi>, 2015. msgid "" msgstr "" "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2003-09-22 13:26+0200\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" -"Language-Team: Suomi <opensuse-fi(a)opensuse.fi>\n" -"Language: \n" +"PO-Revision-Date: 2015-03-20 20:02+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" +"Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" #. Command line help text for the Xgeo-cluster module #: src/clients/geo-cluster.rb:54 #, fuzzy #| msgid "Configuration of printer" msgid "Configuration of geo-cluster" -msgstr "Tulostinmääritykset" +msgstr "Geo-Klusterin määritys" #. Rich text title for GeoCluster in proposals #: src/clients/geo-cluster_proposal.rb:83 #, fuzzy #| msgid "Clustering" msgid "GeoCluster" -msgstr "Ryvästys" +msgstr "GeoKlusteri" #. Menu title for GeoCluster in proposals #: src/clients/geo-cluster_proposal.rb:87 #, fuzzy #| msgid "Clustering" msgid "&GeoCluster" -msgstr "Ryvästys" +msgstr "&GeoKlusteri" #. GeoCluster summary dialog caption #. GeoCluster configure2 dialog caption @@ -75,14 +77,14 @@ #, fuzzy #| msgid "Printer Configuration" msgid "Geo Cluster Configuration" -msgstr "Tulostinmääritykset" +msgstr "Geo-Klusterin määritys" #. GeoCluster overview dialog caption #: src/include/geo-cluster/complex.rb:143 #, fuzzy #| msgid "Printer Overview" msgid "Geo Cluster Overview" -msgstr "Tulostimen yhteenveto" +msgstr "Geo-Klusterin yhteenveto" #. encoding: utf-8 #. ------------------------------------------------------------------------------ @@ -113,21 +115,22 @@ #, fuzzy #| msgid "Read configuration file" msgid "configuration file" -msgstr "Lue määritystiedosto" +msgstr "määritystiedosto" #: src/include/geo-cluster/dialogs.rb:58 #, fuzzy #| msgid "Transport" msgid "transport" -msgstr "Siirto" +msgstr "kuljetus" #: src/include/geo-cluster/dialogs.rb:65 msgid "port" msgstr "portti" #: src/include/geo-cluster/dialogs.rb:71 +#, fuzzy msgid "arbitrator" -msgstr "" +msgstr "välittäjä" #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85 #: src/include/geo-cluster/dialogs.rb:679 @@ -148,14 +151,14 @@ #, fuzzy #| msgid "Website:" msgid "site" -msgstr "WWW-sivut:" +msgstr "sijaintipaikka" #: src/include/geo-cluster/dialogs.rb:94 #: src/include/geo-cluster/dialogs.rb:186 #, fuzzy #| msgid "Packet" msgid "ticket" -msgstr "Paketti" +msgstr "lippu" #. return `cacel or a string #: src/include/geo-cluster/dialogs.rb:106 @@ -174,85 +177,87 @@ #, fuzzy #| msgid "Enter a valid e-mail address" msgid "Please enter a valid ip address" -msgstr "Anna voimassa oleva sähköpostiosoite" +msgstr "Anna kelvollinen ip-osoite" #: src/include/geo-cluster/dialogs.rb:184 msgid "Enter ticket and timeout" -msgstr "" +msgstr "Anna lippu ja aikakatkaisu" #: src/include/geo-cluster/dialogs.rb:190 #, fuzzy #| msgid "Timeouts" msgid "timeout" -msgstr "Aikakatkaisut" +msgstr "Aikakatkaisu" #: src/include/geo-cluster/dialogs.rb:192 #, fuzzy #| msgid "No entries." msgid "retries" -msgstr "Ei tapahtumia." +msgstr "uudelleenyrityksiä" #: src/include/geo-cluster/dialogs.rb:194 #, fuzzy #| msgid "Height" msgid "weights" -msgstr "Korkeus" +msgstr "painot" #: src/include/geo-cluster/dialogs.rb:196 #, fuzzy #| msgid "Expired" msgid "expire" -msgstr "Mennyt vanhaksi" +msgstr "vanhenee" #: src/include/geo-cluster/dialogs.rb:198 #, fuzzy #| msgid "Required patterns" msgid "acquire-after" -msgstr "Vaaditut ohjelmistoryhmät" +msgstr "hanki-jälkeen" #: src/include/geo-cluster/dialogs.rb:200 +#, fuzzy msgid "before-acquire-handler" -msgstr "" +msgstr "ennen-hankintaa-käsittelijä" #: src/include/geo-cluster/dialogs.rb:237 #, fuzzy #| msgid "Action is invalid." msgid "timeout is invalid" -msgstr "Toiminto on virheellinen." +msgstr "aikakatkaisu on virheellinen" #: src/include/geo-cluster/dialogs.rb:239 #, fuzzy #| msgid "Key is invalid." msgid "expire is invalid" -msgstr "Avain ei kelpaa." +msgstr "vanheneminen on virheellinen" #: src/include/geo-cluster/dialogs.rb:241 #, fuzzy #| msgid "The name is invalid." msgid "acquireafter is invalid" -msgstr "Nimi on epäkelpo." +msgstr "hanki-jälkeen on virheellinen" #: src/include/geo-cluster/dialogs.rb:243 #, fuzzy #| msgid "Device size is invalid." msgid "retries is invalid" -msgstr "Laitteen koko ei kelpaa." +msgstr "uudelleenyritys on virheellinen" #: src/include/geo-cluster/dialogs.rb:245 +#, fuzzy msgid "retries values lower than 3 is illegal" -msgstr "" +msgstr "uudelleenyrityksen arvo ei saa olla alle 3" #: src/include/geo-cluster/dialogs.rb:247 #, fuzzy #| msgid "Key is invalid." msgid "weights is invalid" -msgstr "Avain ei kelpaa." +msgstr "painot on virheellinen" #: src/include/geo-cluster/dialogs.rb:249 #, fuzzy #| msgid "Port field cannot be empty" msgid "ticket can not be empty" -msgstr "Portti-kenttää ei saa jättää tyhjäksi" +msgstr "lippu ei saa olla tyhjä" #. fill confs with global_files #: src/include/geo-cluster/dialogs.rb:358 @@ -266,31 +271,31 @@ #, fuzzy #| msgid "E-mail address of the server administrator" msgid "Enter an IP address of your arbitrator" -msgstr "Palvelimen ylläpitäjän sähköpostiosoite" +msgstr "Anna välittäjän ip-osoite" #: src/include/geo-cluster/dialogs.rb:505 #, fuzzy #| msgid "E-mail address of the server administrator" msgid "Edit IP address of your arbitrator" -msgstr "Palvelimen ylläpitäjän sähköpostiosoite" +msgstr "Muokkaa välittäjän ip-osoitetta" #: src/include/geo-cluster/dialogs.rb:521 #, fuzzy #| msgid "Enter the address of the KDC server." msgid "Enter an IP address of your site" -msgstr "Anna KDC-palvelimen osoite." +msgstr "anna sijaintipaikan ip-osoite" #: src/include/geo-cluster/dialogs.rb:532 #, fuzzy #| msgid "IP address of master NIS server" msgid "Edit IP address of your site" -msgstr "NIS-isäntäpalvelimen IP-osoite" +msgstr "Muokkaa sijaintipaikan ip-osoitetta" #: src/include/geo-cluster/dialogs.rb:554 #, fuzzy #| msgid "The target already exists" msgid "Ticket name already exist!" -msgstr "Kohde on jo olemassa" +msgstr "lipun nimi on jo käytössä!" #. abort? #: src/include/geo-cluster/dialogs.rb:600 @@ -303,40 +308,40 @@ #, fuzzy #| msgid "Configuration name cannot be empty." msgid "Configuration name can not be duplicated." -msgstr "Määritysnimi ei voi olla tyhjä." +msgstr "Määrityksen nimeä ei voi monistaa." #: src/include/geo-cluster/dialogs.rb:610 #, fuzzy #| msgid "Key is invalid." msgid "port is invalid!" -msgstr "Avain ei kelpaa." +msgstr "portti on virheellinen!" #: src/include/geo-cluster/dialogs.rb:616 msgid "transport have to be filled!" -msgstr "" +msgstr "kuljetus pitää olla määritetty!" #: src/include/geo-cluster/dialogs.rb:621 msgid "arbitrator have to be filled!" -msgstr "" +msgstr "välittäjä pitää olla määritetty!" #: src/include/geo-cluster/dialogs.rb:626 #, fuzzy #| msgid "Software to be installed:" msgid "site have to be filled!" -msgstr "Asennettavat ohjelmistot:" +msgstr "sijaintipaikka pitää olla määritetty!" #: src/include/geo-cluster/dialogs.rb:631 #, fuzzy #| msgid "Software to be installed:" msgid "ticket have to be filled!" -msgstr "Asennettavat ohjelmistot:" +msgstr "lippu pitää olla määritetty!" #. GeoCluster choose configure dialog caption #: src/include/geo-cluster/dialogs.rb:670 #, fuzzy #| msgid "Host Configuration Summary:" msgid "GeoCluster Configuration Select" -msgstr "Koneen määritysten yhteenveto:" +msgstr "Geo-Klusterin määrityksen valinta" #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"", #. Label::BackButton(), Label::NextButton()); @@ -344,7 +349,7 @@ #, fuzzy #| msgid "Read configuration file" msgid "Choose configuration file:" -msgstr "Lue määritystiedosto" +msgstr "Valitse määritystiedosto:" #. Initialization dialog contents #: src/include/geo-cluster/wizards.rb:142 @@ -356,14 +361,14 @@ #, fuzzy #| msgid "Cannot write general settings." msgid "Cannot write global conf settings." -msgstr "Yleisten asetusten kirjoitus ei onnistunut." +msgstr "Globaalin määrityksen kirjoitus ei onnistu." #. List like site #: src/modules/GeoCluster.rb:242 #, fuzzy #| msgid "Cannot write general settings." msgid "Cannot write global settings." -msgstr "Yleisten asetusten kirjoitus ei onnistunut." +msgstr "Ei voida kirjoittaa globaaleja asetuksia." #. Empty (all Int) ticket will be ignore by ag_booth #. Create a ticket item @@ -371,20 +376,20 @@ #, fuzzy #| msgid "Cannot write general settings." msgid "Cannot write global ticket settings." -msgstr "Yleisten asetusten kirjoitus ei onnistunut." +msgstr "Ei voida kirjoittaa globaaleja lippu määrityksiä." #. GeoCluster read dialog caption #: src/modules/GeoCluster.rb:273 #, fuzzy #| msgid "Initializing Printer Configuration" msgid "Initializing Geo Cluster Configuration" -msgstr "Valmistellaan tulostinmääritystä" +msgstr "Alustetaan Geo-Klusterin määritystä" #: src/modules/GeoCluster.rb:286 src/modules/GeoCluster.rb:289 #, fuzzy #| msgid "Read Firewall Settings." msgid "Read SuSEFirewall Settings" -msgstr "Lue palomuurin asetukset." +msgstr "Lue palomuurin asetukset" #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. TODO FIXME Names of real stages @@ -412,7 +417,7 @@ #, fuzzy #| msgid "Saving Repository Configuration" msgid "Saving Geo Cluster Configuration" -msgstr "Tallennetaan asennuslähteiden määritykset" +msgstr "Tallennetaan Geo-Klusterin määritystä" #. Progress stage 1/2 #: src/modules/GeoCluster.rb:348 src/modules/GeoCluster2.pm:223 @@ -436,7 +441,7 @@ #, fuzzy #| msgid "Writing the firewall settings..." msgid "Writing the SuSEFirewall settings" -msgstr "Kirjoitetaan palomuurin asetukset..." +msgstr "Kirjoitetaan palomuurin asetukset" #. #-#-#-#-# geo-cluster.rxgettext.pot (PACKAGE VERSION) #-#-#-#-# #. Error message @@ -455,7 +460,7 @@ #, fuzzy #| msgid "Initializing Security Configuration" msgid "Initializing geo-cluster Configuration" -msgstr "Valmistellaan turvamääritykset" +msgstr "Valmistellaan Geo-Klusterin määritystä" #. Progress stage 1/3 #: src/modules/GeoCluster2.pm:141 @@ -494,7 +499,7 @@ #, fuzzy #| msgid "Saving Repository Configuration" msgid "Saving geo-cluster Configuration" -msgstr "Tallennetaan asennuslähteiden määritykset" +msgstr "Tallennetaan Geo-Klusterin määritystä" #. Progress stage 2/2 #: src/modules/GeoCluster2.pm:225 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/installation.fi.po new/yast2-trans-fi-3.1.0/po/installation.fi.po --- old/yast2-trans-fi-3.1.0/po/installation.fi.po 2014-10-29 17:07:00.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/installation.fi.po 2015-04-20 17:50:15.000000000 +0200 @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: installation.fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2014-10-24 19:58+0300\n" "Last-Translator: Tommi Nieminen <translator(a)legisign.org>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" @@ -38,16 +38,6 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Malli" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Malli" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -66,39 +56,41 @@ "tarvitsee profiilin tietääkseen, miltä asennetun järjestelmän tulisi näyttää. Kun valintaruutu\n" "on valittu, nykyisen järjestelmän profiili tallennetaan tiedostoon <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +#, fuzzy +#| msgid "Write AutoYaST profile to /root/autoinst.xml" +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Kirjoita AutoYaST-profiili tiedostoon /root/autoinst.xml" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Monista järjestelmän määritys" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "M&onista järjestelmän määritys" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "AutoYaST-profiili kirjoitetaan tiedostoon /root/autoinst.xml (<a href=\"%1\">Älä kirjoita</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "AutoYaST-profiilia ei tallenneta (<a href=\"%1\">Tallenna</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Kirjoita AutoYaST-profiili tiedostoon /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopioidaan tiedostot asennettuun järjestelmään..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopioidaan lokitiedostot asennettuun järjestelmään..." @@ -1063,7 +1055,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Muuta..." @@ -1432,31 +1424,31 @@ "Asennus keskeytetään." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Poistettu" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Käytössä" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Ei käytössä" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Aiemmin käytetyt asennuslähteet" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1465,27 +1457,27 @@ "jota olet päivittämässä:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Nykyinen tila" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Asennuslähde" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Verkko-osoite" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Vaihda tilaa" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1494,7 +1486,7 @@ "päivitettävästä järjestelmästä. Ota käyttöön ne asennuslähteet, joita haluat käyttää päivitystoiminnossa." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1503,30 +1495,30 @@ "napsauta Vaihda tilaa tai kaksoisnapsauta vastaavaa taulukon kohtaa." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Vaihtaaksesi verkko-osoitetta napsauta Muuta...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Tuntematon" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Asennuslähteen &osoite" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Verkkoa ei ole asetettu" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1535,49 +1527,49 @@ "Asetetaanko se?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Lisätään ja poistetaan asennuslähteitä..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Asennuslähteitä lisätään ja poistetaan." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Poista käyttämättömät asennuslähteet" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Poistetaan käyttämättömiä asennuslähteitä..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Lisää käyttöön otetut asennuslähteet" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Lisätään käyttöön otettuja asennuslähteitä..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Lisää käytöstä poistetut asennuslähteet" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Lisätään käytöstä poistettuja asennuslähteitä..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Pyydettiin oikeaa tietovälinettä" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1591,7 +1583,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1606,7 +1598,7 @@ "Asennuslähde lisätään, mutta sitä ei oteta käyttöön." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1618,7 +1610,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1630,7 +1622,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1641,7 +1633,7 @@ "Osoite: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1754,11 +1746,6 @@ msgstr "Tallennetaan tietoturva-asetuksia..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Tallennetaan käynnistyskomentojonojen asetuksia..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Tallennetaan laitteistomäärityksiä..." @@ -1930,17 +1917,17 @@ "Huomaa: joitakin tietoja on ehkä annettava uudestaan." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Vahvista asennus" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Kaikki perusasennukseen tarvittavat tiedot on nyt kerätty." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1953,7 +1940,7 @@ "aiemmissa valintaikkunoissa tehtyjen valintojen mukaan." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1964,22 +1951,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Mene takaisin ja tarkista valinnat, jos olet epävarma." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Vahvista päivitys" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Kaikki päivitykseen tarvittavat tiedot on nyt kerätty." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1990,7 +1977,7 @@ "aiemmissa valintaikkunoissa tehtyjen valintojen mukaan." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Aloita päi&vitys" @@ -2074,6 +2061,15 @@ "Asennusohjelma ei onnistunut ratkaisemaan pakettien riippuvuuksia automaattisesti.\n" "Pakettihallintaohjelma käynnistetään nyt, jotta voit ratkaista ongelmat käsin." +#~ msgid "Dummy" +#~ msgstr "Malli" + +#~ msgid "&Dummy" +#~ msgstr "&Malli" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Tallennetaan käynnistyskomentojonojen asetuksia..." + #~ msgid "License needs to be accepted" #~ msgstr "Käyttöoikeussopimus täytyy hyväksyä" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/iplb.fi.po new/yast2-trans-fi-3.1.0/po/iplb.fi.po --- old/yast2-trans-fi-3.1.0/po/iplb.fi.po 2014-12-16 14:26:45.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/iplb.fi.po 2015-04-20 17:50:45.000000000 +0200 @@ -2,21 +2,23 @@ # Copyright (C) 2005 SUSE Linux Products GmbH. # Finnish message file for YaST2 (@memory@). # Copyright (C) 2003 SuSE Linux AG. -# Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008. # +# Jyri Palokangas <jyri.palokangas(a)opensuse.org>, 2005, 2006, 2007, 2008. +# Harri Miettinen <harmie(a)opensuse.fi>, 2014. msgid "" msgstr "" "Project-Id-Version: autoinst.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-04 15:52+0200\n" -"PO-Revision-Date: 2003-09-22 13:26+0200\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" -"Language-Team: Suomi <opensuse-fi(a)opensuse.fi>\n" -"Language: \n" +"PO-Revision-Date: 2014-12-17 22:33+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" +"Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" #. Command line help text for the Xiplb module #: src/clients/iplb.rb:54 @@ -28,12 +30,12 @@ #. Rich text title for Iplb in proposals #: src/clients/iplb_proposal.rb:81 msgid "Iplb" -msgstr "" +msgstr "Iplb" #. Menu title for Iplb in proposals #: src/clients/iplb_proposal.rb:83 msgid "&Iplb" -msgstr "" +msgstr "&Iplb" #. encoding: utf-8 #. ------------------------------------------------------------------------------ @@ -196,8 +198,9 @@ msgstr "Hiljainen" #: src/include/iplb/global_conf.rb:102 +#, fuzzy msgid "Fork" -msgstr "" +msgstr "Haara" #: src/include/iplb/global_conf.rb:103 #, fuzzy @@ -671,10 +674,13 @@ #. split the real server ip value; #: src/include/iplb/vserver_conf.rb:411 +#, fuzzy msgid "" "If using IPv6,the format should like this\n" "[fe80::5054:ff:fe00:2]" msgstr "" +"Mikäli käytät IPv6, tulee sen olla alla olevassa muodossa\n" +"[fe80::5054:ff:fe00:2]" #: src/include/iplb/vserver_conf.rb:413 #, fuzzy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/network.fi.po new/yast2-trans-fi-3.1.0/po/network.fi.po --- old/yast2-trans-fi-3.1.0/po/network.fi.po 2014-10-29 17:07:25.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/network.fi.po 2015-04-20 17:50:38.000000000 +0200 @@ -26,8 +26,8 @@ "Project-Id-Version: network.fi\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-10-12 19:04+0300\n" -"Last-Translator: Jyri Palokangas <jyri.palokangas(a)opensuse.org>\n" +"PO-Revision-Date: 2014-12-17 22:40+0200\n" +"Last-Translator: Harri Miettinen <harmie(a)opensuse.fi>\n" "Language-Team: Finnish <kde-i18n-doc(a)kde.org>\n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -4619,11 +4619,15 @@ #. Do this only if package xinetd is installed (#256385) #: src/modules/Remote.rb:378 +#, fuzzy msgid "" "Your display manager must be restarted.\n" "To take the changes in remote administration into account, \n" "please restart it manually or log out and log in again." msgstr "" +"Näytönhallinta pitää käynnistää uudelleen.\n" +"Ottaaksesi etähallinnan muutokset käyttöön,\n" +"sinun pitää käynnistää näytönhallinta uudelleen tai kirjautua ulos ja sisään." #. description in proposal #: src/modules/Remote.rb:409 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fi-3.1.0/po/status.txt new/yast2-trans-fi-3.1.0/po/status.txt --- old/yast2-trans-fi-3.1.0/po/status.txt 2014-12-16 14:26:48.000000000 +0100 +++ new/yast2-trans-fi-3.1.0/po/status.txt 2015-04-20 17:50:48.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17199 -Fuzzy : 174 -Untranslated : 101 +Translated : 17235 +Fuzzy : 166 +Untranslated : 70 -------------------- - All strings : 17474 -98 % are translated + All strings : 17471 +99 % are translated ++++++ yast2-trans-fr-3.1.0.tar.bz2 ++++++ ++++ 2251 lines of diff (skipped) ++++++ yast2-trans-gl-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-3.1.0/po/installation.gl.po new/yast2-trans-gl-3.1.0/po/installation.gl.po --- old/yast2-trans-gl-3.1.0/po/installation.gl.po 2014-10-29 16:42:31.000000000 +0100 +++ new/yast2-trans-gl-3.1.0/po/installation.gl.po 2015-04-20 18:08:44.000000000 +0200 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: installation.gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2012-05-05 13:48+0200\n" "Last-Translator: Manuel A. Vazquez <xixirei(a)yahoo.es>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" @@ -27,16 +27,6 @@ "X-Generator: Lokalize 1.4\n" "X-Language: gl_ES\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Proba" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Proba" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -61,15 +51,19 @@ "usuario. AutoYaST precisa un perfil para saber como debe ser o sistema instalado.\n" "Se se selecciona esta opción, almacénase un perfil do sistema actual en <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Escribindo a configuración do sistema..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -77,27 +71,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiando os ficheiros ao sistema instalado..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiando os ficheiros de log ao sistema instalado..." @@ -1049,7 +1039,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Cambiar..." @@ -1401,31 +1391,31 @@ "Abortando a instalación." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Eliminado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Activado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Desactivado" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repositorios usados con anterioridade" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1434,27 +1424,27 @@ "que está actualizando:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Estado actual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repositorio" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Estado" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1463,7 +1453,7 @@ "atoparon para o sistema que está actualizando. Active os que queira incluír no proceso de actualización." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1472,30 +1462,30 @@ " Cambiar estado ou faga dobre clic no elemento respectivo da táboa." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Para cambiar o URL, prema no botón Cambiar..." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Descoñecida" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL do &repositorio" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "A rede non está configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1504,49 +1494,49 @@ "Desexa configurala?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Engadindo e eliminando repositorios..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Estanse a engadir e eliminar os repositorios." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Eliminar os repositorios sen usar" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Eliminando os repositorios sen usar..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Engadir repositorios activados" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Engadindo repositorios activados..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Engadindo repositorios desactivados" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Engadindo repositorios desactivados..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Medio correcto solicitado" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1556,7 +1546,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1566,7 +1556,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1578,7 +1568,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1590,7 +1580,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1598,7 +1588,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1709,11 +1699,6 @@ msgstr "Gardando os axustes de seguridade..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Gardando os axustes do script de arrinque..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Gardando a configuración de hardware..." @@ -1866,17 +1851,17 @@ "Nota: Pode que teña que volver introducir algunha información." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmar a instalación" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Xa está completa a información necesaria para a instalación básica." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1889,7 +1874,7 @@ "as opcións de instalación dos cadros de diálogo anteriores." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1901,22 +1886,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Volva atrás e comprobe as opcións se non está seguro." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmar a actualización" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Xa está completa a información necesaria para levar a cabo unha actualización." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1927,7 +1912,7 @@ "de acordo coas opcións dos cadros de diálogo anteriores." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Iniciar &actualización" @@ -2023,6 +2008,15 @@ "A instalación non logrou resolver as dependencias de paquete automaticamente.\n" "Abrirase o xestor de software para resolvelas de xeito manual." +#~ msgid "Dummy" +#~ msgstr "Proba" + +#~ msgid "&Dummy" +#~ msgstr "&Proba" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Gardando os axustes do script de arrinque..." + #~ msgid "Search for Linux partitions" #~ msgstr "Buscar particións Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-3.1.0/po/status.txt new/yast2-trans-gl-3.1.0/po/status.txt --- old/yast2-trans-gl-3.1.0/po/status.txt 2014-12-16 14:17:26.000000000 +0100 +++ new/yast2-trans-gl-3.1.0/po/status.txt 2015-04-20 18:09:04.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 13384 +Translated : 13381 Fuzzy : 1263 Untranslated : 2827 -------------------- - All strings : 17474 + All strings : 17471 77 % are translated ++++++ yast2-trans-gu-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gu-3.1.0/po/installation.gu.po new/yast2-trans-gu-3.1.0/po/installation.gu.po --- old/yast2-trans-gu-3.1.0/po/installation.gu.po 2014-10-29 16:41:56.000000000 +0100 +++ new/yast2-trans-gu-3.1.0/po/installation.gu.po 2015-04-20 17:54:50.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -12,16 +12,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "બનાવટ" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&બનાવટ" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -40,15 +30,19 @@ "વપરાશકર્તાને અસર કર્યા વિના SUSE Linux નું સ્થાપન પૂરું કરવા AutoYaST એ માર્ગ છે. સ્થપાયેલસિસ્ટમ કેવી લાગવી જોઇએ તે જાણવા AutoYaST ને પ્રોફાઇલની જરૂર છે.\n" "જો વિકલ્પ પસંદ કરેલું હોય તો, હાલના સિસ્ટમની પ્રોફાઇલ /root/autoyast.xml માં સંગ્રહ થાય છે.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "સિસ્ટમ કન્ફિગ્યુરેશન લખાઇ રહ્યું છે" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -56,27 +50,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "સ્થપાએલ સિસ્ટમમાં ફાઇલોની નકલ થઇ રહી છે..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "સ્થપાએલ સિસ્ટમમાં લોગ ફાઇલોની નકલ થઇ રહી છે..." @@ -1090,7 +1080,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&બદલો..." @@ -1503,161 +1493,161 @@ msgstr "કેટાલોગ પ્રારંભ કરવામાં નિષ્ફળ." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr " દૂર કરો " #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "સક્ષમ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "અસક્ષમ" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "એડિશનલ રીસોર્સીસ સિલેક્ટ કરોઃ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "હાલની સ્થિતિ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "પ્રોફાઇલ રીપોઝીટરીઃ (&P)" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&ટોગલ સ્ટેટસ" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "અજાણી" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "પ્રોડક્ટ નોંધણી" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "પ્રોગ્રામ કોન્ફીગરડ નથી" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "એડિશનલ રીસોર્સીસ સિલેક્ટ કરોઃ" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "જ્યારે ઇમેજ રીટ્રાઇવ્ડ થાય ત્યારે કૃપા કરી રાહ જુઓ.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "પહેલેથી સેવ કરેલા કોન્ફીગરેશનને વાંચો" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "પહેલેથી સેવ કરેલા કોન્ફીગરેશનને વાંચી રહયું છે..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "પહેલેથી સેવ કરેલા કોન્ફીગરેશનને વાંચો" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "એડિશનલ રીસોર્સીસ સિલેક્ટ કરોઃ" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "પહેલેથી સેવ કરેલા કોન્ફીગરેશનને વાંચો" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "એડિશનલ રીસોર્સીસ સિલેક્ટ કરોઃ" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1667,7 +1657,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1677,7 +1667,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1689,7 +1679,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1699,7 +1689,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1710,7 +1700,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1835,13 +1825,6 @@ msgstr " સુરક્ષા ના સેટિન્ગ્સ વંચાય છે... " #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "સાઉન્ડ કાર્ડ સેટીંગ્સ સેવ કરી રહયું છે..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "હાર્ડ વેર કન્ફિગ્યુરેશન સચવાઇ રહ્યું છે..." @@ -2031,19 +2014,19 @@ " નોંધ : તમારે કેટલીક માહિતી ફરીથી દાખલ કરવાની રહેશે." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "સ્થાપનને સમર્થન કરો" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "આધારભૂત સ્થાપન માટે જરૂરી બધી માહિતી હવે પૂરી થઇ છે." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2058,7 +2041,7 @@ " જશે) થશે." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2071,24 +2054,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "જો તમે ચોક્કસ ન હોવ તો, પાછા જાઓ અને સેટિંગ્સ ચકાસો." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "અદ્યતન મંજૂર કરો" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "અદ્યતન બરાબર પુરું કરવા માટે જરૂરી બધી માહિતી હવે પૂરી થઇ છે." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2100,7 +2083,7 @@ "તમારા હાર્ડડિસ્ક પરની વિગતો ઉપર ફરીથી લખાઇ જશે." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&અદ્યતન શરૂ કરો" @@ -2191,6 +2174,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "બનાવટ" + +#~ msgid "&Dummy" +#~ msgstr "&બનાવટ" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "સાઉન્ડ કાર્ડ સેટીંગ્સ સેવ કરી રહયું છે..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "ફરીથી સ્થાપિત કરવાની જરૂર" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gu-3.1.0/po/status.txt new/yast2-trans-gu-3.1.0/po/status.txt --- old/yast2-trans-gu-3.1.0/po/status.txt 2014-12-16 15:09:40.000000000 +0100 +++ new/yast2-trans-gu-3.1.0/po/status.txt 2015-04-20 17:55:10.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7352 -Fuzzy : 5484 +Translated : 7350 +Fuzzy : 5483 Untranslated : 4638 -------------------- - All strings : 17474 + All strings : 17471 42 % are translated ++++++ yast2-trans-he-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-he-3.1.0/po/installation.he.po new/yast2-trans-he-3.1.0/po/installation.he.po --- old/yast2-trans-he-3.1.0/po/installation.he.po 2014-10-29 17:11:50.000000000 +0100 +++ new/yast2-trans-he-3.1.0/po/installation.he.po 2015-04-20 18:08:29.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: installation.he\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-05-29 21:56+0200\n" "Last-Translator: Ys\n" "Language-Team: Hebrew <opensuse-translation(a)opensuse.org>\n" @@ -18,16 +18,6 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Poedit 1.5.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "דמה" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&דמה" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -42,34 +32,34 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "עדכן התאמות" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "עדכן התאמות" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 #, fuzzy @@ -77,7 +67,7 @@ msgstr "העתק קבצים למערכת שהותקנה" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 #, fuzzy msgid "Copying log files to installed system..." msgstr "מעתיק קובץ יומן למערכת המותקנת" @@ -1108,7 +1098,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&שנה..." @@ -1489,34 +1479,34 @@ # Button in RAID-WF # button text #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "&Remove" msgid "Removed" msgstr "הס&ר" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "מאופשר" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "בטל שימוש" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "התקנת מקור" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 #, fuzzy #| msgid "" #| "These repositories were found on the system\n" @@ -1527,79 +1517,79 @@ msgstr "מאגרים אילו אותרו על המערכת /n שהינך משדרג:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "בחירה נוכחית" # Frame label #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "מאגר" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "כתובת אינטרנט" # heading text #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "סטטוס" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "לא ידוע" # Frame label #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "מקורות להתאמה" # Network dialog caption #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "הגדרת רשת" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "התקנת מקור" @@ -1607,7 +1597,7 @@ # Help text for last dialog of base installation #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1615,45 +1605,45 @@ "נא להמתין בזמן הגדרת המערכת.\n" "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "התקנת מקור" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "התקנת מקור" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "התקנת מקור" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "התקנת מקור" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "התקנת מקור" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "התקנת מקור" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1663,7 +1653,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1673,7 +1663,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1683,7 +1673,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1693,7 +1683,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1702,7 +1692,7 @@ msgstr "התקנת מקור" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1832,14 +1822,6 @@ msgid "Saving security settings..." msgstr "כותב את ההגדרות..." -# Frame title -#. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Cannot write settings." -msgid "Saving boot scripts settings..." -msgstr "לא יכול לכתוב הגדרות." - #. progress step title #: src/clients/save_hw_status_finish.rb:67 #, fuzzy @@ -1993,19 +1975,19 @@ # Headline above bar graph that displays future partitions # Headline above bar graph that displays future windows and linux partitions #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "אשר התקנה" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "כל המידע שנדרך להתקנה בסיסית הסתיים." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2014,7 +1996,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2023,25 +2005,25 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "לך חזרה ובדוק את ההגדרות אם אינך בטוח." # RadioButton label #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "אשר עדכון" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "כל המידע שהיה צריך על מנת לבצע עדכון הסתיים." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2050,7 +2032,7 @@ # ComboBox label #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "התחל ו&עדכן" @@ -2141,6 +2123,18 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "דמה" + +#~ msgid "&Dummy" +#~ msgstr "&דמה" + +# Frame title +#, fuzzy +#~| msgid "Cannot write settings." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "לא יכול לכתוב הגדרות." + # Frame title #, fuzzy #~ msgid "Network Device: %1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-he-3.1.0/po/status.txt new/yast2-trans-he-3.1.0/po/status.txt --- old/yast2-trans-he-3.1.0/po/status.txt 2014-12-16 14:19:44.000000000 +0100 +++ new/yast2-trans-he-3.1.0/po/status.txt 2015-04-20 18:08:33.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 1831 -Fuzzy : 5398 +Translated : 1829 +Fuzzy : 5397 Untranslated : 10245 -------------------- - All strings : 17474 + All strings : 17471 10 % are translated ++++++ yast2-trans-hi-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hi-3.1.0/po/installation.hi.po new/yast2-trans-hi-3.1.0/po/installation.hi.po --- old/yast2-trans-hi-3.1.0/po/installation.hi.po 2014-10-29 16:57:29.000000000 +0100 +++ new/yast2-trans-hi-3.1.0/po/installation.hi.po 2015-04-20 18:02:01.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -13,16 +13,6 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "डम्मी" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "डम्मी (&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -42,15 +32,19 @@ "को एक प्रोफाइल की आवश्यकता होती है। अगर यह विकल्प\n" "चुना गया है, तो वर्तमान सिस्टम का एक प्रोफाइल /रूट/autoyast.xml में स्टोर हो जाता है।\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "सिस्टम समनुरूपण लिख रहा हैं" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -58,27 +52,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "फाइलों को संसथापित सिस्टम में कापी कर रहा है ..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "लोग फाइलों को संसथापित सिस्टम में कापी कर रहा है..." @@ -1094,7 +1084,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "बदलें... (&C)" @@ -1504,160 +1494,160 @@ msgstr "कैटलॉग का प्रारंभिकीकरण असफल" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "हटाऐ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "समर्थ हैं" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "असमर्थ हैं" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "अतिरिक्त संसाधन चुनें:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "हालिया स्थिति:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "भंडार" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "स्थिति बदलें (&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "अनंजान" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "भंडार" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "कार्यकर्म समनुरुप नहीं है" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "अतिरिक्त संसाधन चुनें:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "कृपया प्रतिबिंब की पुर्नप्राप्ति तक प्रतीक्षा करें.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "पुराना संचय किया गया समनुरुपण पढें" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "पुराना संचय किया गया समनुरुपण पढ रहा है..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "पुराना संचय किया गया समनुरुपण पढें" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "अतिरिक्त संसाधन चुनें:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "पुराना संचय किया गया समनुरुपण पढें" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "अतिरिक्त संसाधन चुनें:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1667,7 +1657,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1677,7 +1667,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1689,7 +1679,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1699,7 +1689,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1710,7 +1700,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1834,13 +1824,6 @@ msgstr "सुरक्षा व्यवस्था पढ़ रहा है..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "आवाज कार्ड का व्यवस्थाऐं संचय कर रहा है..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "हार्डवैर समनुरूपण सेव कर रहा हैं... " @@ -2027,19 +2010,19 @@ "नोट : आपको फिर से कुछ जानकारी प्रविष्ट करनी पड़ सकती है।" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "संसथापन निश्चित करें" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "बेस संसथापन के लिए सभी आवश्यक सूचनाऎं मिल गई हैं " #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2053,7 +2036,7 @@ "(इन पार्टीशन में मौजूद किसी भी डेटा का मिट जाना) हो जाएंगे।" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2066,24 +2049,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "यदी तुम निश्चित नहीं हो तो वापस जाकर व्यवस्थाओं की जाँच करें" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "नवीनीकरण निश्चित करें" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "नवीनीकरण के लिए सभी आवश्यक सूचनाऎं मिल गई हैं " #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2095,7 +2078,7 @@ "आपकी हार्ड डिस्क के डेटा पर फिर से लिख दिया जाएगा।" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "नवीनीकरण शुरू करें (&U)" @@ -2188,6 +2171,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "डम्मी" + +#~ msgid "&Dummy" +#~ msgstr "डम्मी (&D)" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "आवाज कार्ड का व्यवस्थाऐं संचय कर रहा है..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "दोबारा अधिष्ठापन की जरुरत है" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hi-3.1.0/po/status.txt new/yast2-trans-hi-3.1.0/po/status.txt --- old/yast2-trans-hi-3.1.0/po/status.txt 2014-12-16 15:06:40.000000000 +0100 +++ new/yast2-trans-hi-3.1.0/po/status.txt 2015-04-20 18:02:24.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 9158 -Fuzzy : 5086 +Translated : 9156 +Fuzzy : 5085 Untranslated : 3230 -------------------- - All strings : 17474 + All strings : 17471 52 % are translated ++++++ yast2-trans-hr-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hr-3.1.0/po/installation.hr.po new/yast2-trans-hr-3.1.0/po/installation.hr.po --- old/yast2-trans-hr-3.1.0/po/installation.hr.po 2014-10-29 16:43:13.000000000 +0100 +++ new/yast2-trans-hr-3.1.0/po/installation.hr.po 2015-04-20 17:58:48.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: installation.hr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-07-22 10:52+0200\n" "Last-Translator: Krešimir Jozić <kjozic(a)gmail.com>\n" "Language-Team: Croatian <kde-i18n-doc(a)kde.org>\n" @@ -21,16 +21,6 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.0\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Neznalica" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Neznalica" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -45,15 +35,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Zapisujem postavke sustava" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -61,27 +55,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiram datoteke na instalirani sustav..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiram datoteke dnevnika na instalirani sustav..." @@ -1025,7 +1015,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Promijeni..." @@ -1403,31 +1393,31 @@ "Prekidam instalaciju." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Uklonjeno" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Omogućeno" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Onemogućeno" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Prethodno korišteni repozitoriji" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1436,64 +1426,64 @@ "kojega nadograđujete:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Trenutni status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repozitorij" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Promijeni status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Da biste promijenili URL, kliknite na gumb Promijeni...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nepoznato" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&URL repozitorija" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Mreža nije podešena" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1502,51 +1492,51 @@ "Da li je želite podesiti?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Dodajem i uklanjam repozitorije..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Molimo pričekajte dok se repozitoriji dodaju ili uklanjaju." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Ukloni repozitorije koji se ne koriste" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Uklanjam repozitorije koji se ne koriste..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Dodaj omogućene repozitorije" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Dodajem omogućene repozitorije..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Dodaj onemogućene repozitorije" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Dodajem onemogućene repozitorije..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1556,7 +1546,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1566,7 +1556,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1583,7 +1573,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1595,7 +1585,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1611,7 +1601,7 @@ "URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1737,13 +1727,6 @@ msgstr "Čitam sigurnosne postavke..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Spremam postavke zvučne kartice..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Spremam postavke sklopovlja..." @@ -1900,18 +1883,18 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Potvrdi instalaciju" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy msgid "Information required for the base installation is now complete." msgstr "Zapisujem profil o autoinstalaciji..." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1920,7 +1903,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1929,22 +1912,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Odite natrag i provjerite postavke ako niste sigurni." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Potvrdi dogradnju" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1952,7 +1935,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Pokreni &nadogradnju" @@ -2045,6 +2028,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Neznalica" + +#~ msgid "&Dummy" +#~ msgstr "&Neznalica" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Spremam postavke zvučne kartice..." + #~ msgid "License needs to be accepted" #~ msgstr "Licenca mora biti prihvaćena" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hr-3.1.0/po/status.txt new/yast2-trans-hr-3.1.0/po/status.txt --- old/yast2-trans-hr-3.1.0/po/status.txt 2014-12-16 14:27:07.000000000 +0100 +++ new/yast2-trans-hr-3.1.0/po/status.txt 2015-04-20 17:58:59.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7474 -Fuzzy : 3850 +Translated : 7472 +Fuzzy : 3849 Untranslated : 6150 -------------------- - All strings : 17474 + All strings : 17471 43 % are translated ++++++ yast2-trans-hu-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hu-3.1.0/po/installation.hu.po new/yast2-trans-hu-3.1.0/po/installation.hu.po --- old/yast2-trans-hu-3.1.0/po/installation.hu.po 2014-10-29 16:36:49.000000000 +0100 +++ new/yast2-trans-hu-3.1.0/po/installation.hu.po 2015-04-20 18:03:44.000000000 +0200 @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-01-14 18:33+0100\n" "Last-Translator: Kalman Kemenczy <kkemenczy(a)opensuse.org>\n" "Language-Team: Hungarian <kde-l10n-hu(a)kde.org>\n" @@ -30,16 +30,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.2\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Üres" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "Ü&res" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -64,15 +54,19 @@ "Ahhoz, hogy az AutoYaST tudja, milyennek kell lennie a telepítendő rendszernek, egy profilra van szüksége. Az opció\n" "bejelölésével az aktuális rendszer beállításait eltárolhatja a <tt>/root/autoinst.xml</tt> fájlban." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Rendszerbeállítások mentése..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -80,27 +74,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Fájlok másolása a telepített rendszerre…" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Naplófájlok másolása a telepített rendszerre…" @@ -1122,7 +1112,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Változtatás…" @@ -1491,17 +1481,17 @@ "A telepítés megszakad." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Eltávolítva" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Engedélyezve" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Letiltva" @@ -1509,14 +1499,14 @@ #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Korábban használt telepítési források" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1525,27 +1515,27 @@ "frissítendő rendszeren:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Jelenlegi állapot" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Telepítési forrás" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Állapot át&kapcsolása" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1554,7 +1544,7 @@ "forrás. Engedélyezze a frissítési folyamatba felvenni kívánt forrásokat." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1563,30 +1553,30 @@ "Állapot átkapcsolása gombra vagy kattintson duplán a megfelelő elemre a táblázatban." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Az URL módosításához nyomja meg a Változtatás gombot." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Ismeretlen" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Telepítési forrás URL-címe" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "A hálózat nincs beállítva" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1595,49 +1585,49 @@ "Szeretné most beállítani?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Telepítési források hozzáadása és eltávolítása…" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Kérem, várjon a telepítési források hozzáadásáig és eltávolításáig." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Nem használt telepítési források eltávolítása" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Nem használt telepítési források eltávolítása…" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Engedélyezett telepítési források hozzáadása" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Engedélyezett telepítési források hozzáadása…" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Letiltott telepítési források hozzáadása" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Letiltott telepítési források hozzáadása…" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "A megfelelő adathordozóra van szükség" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1651,7 +1641,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1661,7 +1651,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1673,7 +1663,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1685,7 +1675,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1696,7 +1686,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1828,11 +1818,6 @@ msgid "Saving security settings..." msgstr "Biztonsági beállítások mentése…" -#. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Rendszerindító parancsfájlok mentése…" - # modules/sound/sound.ycp:540 modules/sound/sound.ycp:578 # modules/sound/sound.ycp:588 #. progress step title @@ -2005,17 +1990,17 @@ "Megjegyzés: valószínűleg a telepítéshez szükséges információkat újra meg kell adni." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Telepítés jóváhagyása" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "A telepítéshez minden szükséges információ rendelkezésre áll." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2027,7 +2012,7 @@ "az előző párbeszédablakok telepítési beállításainak megfelelően." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2036,22 +2021,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Ha nem teljesen biztos a dolgában, az előző ablakokhoz visszatérve módosíthatja a beállításokat." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Frissítés megerősítése" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "A frissítés végrehajtásához szükséges minden információ rendelkezésre áll." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2062,7 +2047,7 @@ # modules/inst_custom_part.ycp:493 #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Frissítés indítása" @@ -2158,6 +2143,15 @@ "A telepítés nem képes automatikusan feloldani a csomagfüggőségeket,\n" "ezért elindul a szoftverkezelő, ahol ez elvégezhető kézzel." +#~ msgid "Dummy" +#~ msgstr "Üres" + +#~ msgid "&Dummy" +#~ msgstr "Ü&res" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Rendszerindító parancsfájlok mentése…" + # modules/inst_language.ycp:68 #~ msgid "Search for Linux partitions" #~ msgstr "Linux-partíciók keresése" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-hu-3.1.0/po/status.txt new/yast2-trans-hu-3.1.0/po/status.txt --- old/yast2-trans-hu-3.1.0/po/status.txt 2014-12-16 14:25:55.000000000 +0100 +++ new/yast2-trans-hu-3.1.0/po/status.txt 2015-04-20 18:04:25.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 16013 +Translated : 16010 Fuzzy : 433 Untranslated : 1028 -------------------- - All strings : 17474 + All strings : 17471 92 % are translated ++++++ yast2-trans-id-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-id-3.1.0/po/installation.id.po new/yast2-trans-id-3.1.0/po/installation.id.po --- old/yast2-trans-id-3.1.0/po/installation.id.po 2014-10-29 17:12:03.000000000 +0100 +++ new/yast2-trans-id-3.1.0/po/installation.id.po 2015-04-20 18:04:29.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-09-27 21:47+0700\n" "Last-Translator: Tedi Heriyanto <tedi.heriyanto(a)gmail.com>\n" "Language-Team: Indonesian <i18n(a)suse.de>\n" @@ -19,16 +19,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.2\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Palsu" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Palsu" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -48,15 +38,19 @@ "membutuhkan sebuah profil untuk mengetahui seperti apa sistem yang diinginkan. Jika opsi ini\n" "dipilih, profil sistem saat ini akan disimpan di /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Online Update Configuration" msgid "Clone System Configuration" msgstr "Konfigurasi Update Online" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "Online Update Configuration" msgid "&Clone System Configuration" @@ -64,27 +58,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Menyalinkan file ke sistem yang diinstalasi..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Menyalinkan file log ke sistem yang diinstalasi..." @@ -1077,7 +1067,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Ubah..." @@ -1501,117 +1491,117 @@ "Membatalkan instalasi." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "&Remove" msgid "Removed" msgstr "&Hapus" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktifkan" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Nonaktifkan" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Ringkasan Instalasi" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Status Saat Ini: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "Registrasi Produk" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "Status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Tidak dikenal" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Registrasi Produk" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "Konfigurasi Jaringan" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Ringkasan Instalasi" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1619,45 +1609,45 @@ "Silakan tunggu sementara sistem sedang dikonfigurasi.\n" "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Membaca seting sebelumnya" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Membaca paket yang tersedia pada sumber instalasi..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Membaca seting sebelumnya" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Ringkasan Instalasi" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Membaca seting sebelumnya" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Ringkasan Instalasi" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1667,7 +1657,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1677,7 +1667,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1687,7 +1677,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1697,7 +1687,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1706,7 +1696,7 @@ msgstr "Sebuah kesalahan terjadi ketika mempersiapkan instalasi sistem." #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1828,13 +1818,6 @@ msgstr "Menulis seting..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Reading the previous settings..." -msgid "Saving boot scripts settings..." -msgstr "Membaca seting sebelumnya..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Menyimpan konfigurasi hardware..." @@ -2020,19 +2003,19 @@ "Apakah anda ingin membuatnya?" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Konfirmasi Instalasi" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Semua informasi yang dibutuhkan untuk instalasi awal telah lengkap." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2046,7 +2029,7 @@ "menurut seting instalasi pada dialog sebelumnya." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2059,24 +2042,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Kembali dan periksa kembali seting bila anda tidak yakin.." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Konfirmasi Update" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Semua informasi yang dibutuhkan untuk melakukan update telah lengkap." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2088,7 +2071,7 @@ "berdasarkan seting pada dialog sebelumnya." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Mulai &Update" @@ -2178,6 +2161,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Palsu" + +#~ msgid "&Dummy" +#~ msgstr "&Palsu" + +#, fuzzy +#~| msgid "Reading the previous settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Membaca seting sebelumnya..." + #, fuzzy #~ msgid "Evaluate update possibility" #~ msgstr "Adakan Update Otomatis" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-id-3.1.0/po/status.txt new/yast2-trans-id-3.1.0/po/status.txt --- old/yast2-trans-id-3.1.0/po/status.txt 2014-12-16 14:23:08.000000000 +0100 +++ new/yast2-trans-id-3.1.0/po/status.txt 2015-04-20 18:04:32.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 2043 -Fuzzy : 4746 +Translated : 2041 +Fuzzy : 4745 Untranslated : 10685 -------------------- - All strings : 17474 + All strings : 17471 12 % are translated ++++++ yast2-trans-it-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-it-3.1.0/po/installation.it.po new/yast2-trans-it-3.1.0/po/installation.it.po --- old/yast2-trans-it-3.1.0/po/installation.it.po 2014-10-29 17:03:14.000000000 +0100 +++ new/yast2-trans-it-3.1.0/po/installation.it.po 2015-04-20 17:55:31.000000000 +0200 @@ -12,13 +12,13 @@ # Giuseppe Salinaro <giuseppeit18(a)yahoo.it>, 2008. # Andrea Florio <andrea(a)opensuse.org>, 2009. # Giacomo Barazzetti <giacomosrv(a)gmail.com>, 2013. -# Andrea Turrini <andrea.turrini(a)gmail.com>, 2013, 2014. +# Andrea Turrini <andrea.turrini(a)gmail.com>, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.it\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-02 08:10+0800\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-11 15:43+0800\n" "Last-Translator: Andrea Turrini <andrea.turrini(a)gmail.com>\n" "Language-Team: Italian <opensuse-translation(a)opensuse.org>\n" "Language: it\n" @@ -28,16 +28,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -56,41 +46,41 @@ "ha bisogno di un profilo per conoscere come il sistema installato debba risultare. Se questa opzione è\n" "selezionata, verrà archiviato un profilo del sistema corrente in <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Scrivere il profilo AutoYaST in /root/autoinst.xml alla fine dell'installazione?" + # #-#-#-#-# installation.it.po (installation) #-#-#-#-# TLABEL modules/inst_ask_config.ycp:142 #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Clona impostazioni di sistema" # #-#-#-#-# installation.it.po (installation) #-#-#-#-# TLABEL modules/inst_ask_config.ycp:142 #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Clona impostazioni di sistema" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Il profilo AutoYaST verrà salvato in /root/autoinst.xml (<a href=\"%1\">non salvarlo</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Il profilo AutoYaST non verrà salvato (<a href=\"%1\">salvalo</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Scrittura del profilo AutoYaST in /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copia dei file nel sistema installato in corso..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copia dei file di log nel sistema installato in corso..." @@ -1091,7 +1081,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Modifica..." @@ -1464,31 +1454,31 @@ "Interruzione dell'installazione." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Rimosso" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Abilitato" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Disabilitato" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repository usati in precedenza" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1497,27 +1487,27 @@ "che si sta aggiornando:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Stato attuale" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repository" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Cambia &stato" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1526,7 +1516,7 @@ "sul sistema in corso di aggiornamento. È necessario abilitare quelli che si desidera siano inclusi nel processo di aggiornamento." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1535,30 +1525,30 @@ "Cambia stato o fare doppio clic sulla voce corrispondente nella tabella." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Per cambiare l'URL, fare clic sul pulsante Modifica...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Sconosciuto" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&URL del repository" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "La rete non è configurata" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1567,49 +1557,49 @@ "Configurarla?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Aggiunta e rimozione dei repository in corso..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "I repository stanno per essere aggiunti e rimossi." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Rimozione dei repository non utilizzati" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Rimozione dei repository non utilizzati in corso..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Aggiunta dei repository abilitati" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Aggiunta dei repository abilitati in corso..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Aggiunta dei repository disabilitati" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Aggiunta dei repository disabilitati in corso..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Supporto corretto richiesto" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1623,7 +1613,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1638,7 +1628,7 @@ "Il repository verrà aggiunto ma sarà disabilitato." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1650,7 +1640,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1662,7 +1652,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1673,7 +1663,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1796,11 +1786,6 @@ msgid "Saving security settings..." msgstr "Salvataggio delle impostazioni di sicurezza in corso..." -#. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Salvataggio delle impostazioni degli script di avvio in corso..." - # #-#-#-#-# installation.it.po (installation) #-#-#-#-# # TLABEL modules/sound/sound.ycp:1038 #. progress step title @@ -1975,17 +1960,17 @@ "Nota: potrebbe essere necessario immettere di nuovo alcune informazioni." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Conferma dell'installazione" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Le informazioni richieste per l'installazione di base sono ora complete." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1998,7 +1983,7 @@ "definite nelle precedenti finestre di dialogo." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2010,24 +1995,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Se non si è sicuri delle impostazioni, tornare indietro e verificarne la correttezza." # #-#-#-#-# installation.it.po (installation) #-#-#-#-# # TLABEL modules/inst_sw_select.ycp:207 #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Conferma aggiornamento" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Le informazioni richieste per eseguire un aggiornamento sono ora complete." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2040,7 +2025,7 @@ # #-#-#-#-# installation.it.po (installation) #-#-#-#-# # TLABEL modules/inst_custom_part.ycp:2170 #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Avvia a&ggiornamento" @@ -2124,6 +2109,15 @@ "L'installazione non è stata in grado di risolvere automaticamente le dipendenze dei pacchetti.\n" "Il gestore dei programmi sarà avviato per permettere di risolverle manualmente." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Salvataggio delle impostazioni degli script di avvio in corso..." + #~ msgid "Search for Linux partitions" #~ msgstr "Ricerca delle partizioni Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-it-3.1.0/po/status.txt new/yast2-trans-it-3.1.0/po/status.txt --- old/yast2-trans-it-3.1.0/po/status.txt 2014-12-16 14:21:04.000000000 +0100 +++ new/yast2-trans-it-3.1.0/po/status.txt 2015-04-20 17:56:10.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17474 +Translated : 17471 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-ja-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-3.1.0/po/installation.ja.po new/yast2-trans-ja-3.1.0/po/installation.ja.po --- old/yast2-trans-ja-3.1.0/po/installation.ja.po 2014-10-29 16:38:02.000000000 +0100 +++ new/yast2-trans-ja-3.1.0/po/installation.ja.po 2015-04-20 18:00:32.000000000 +0200 @@ -7,13 +7,13 @@ # "田邉和子" <ktanabe-aromavet(a)nifty.com>, 2000, 2001, 2002, 2003. # "Takekazu OKAMOTO" <tokamoto(a)novell.com>, 2004. # "Novell Language" <language(a)novell.com>, 2004, 2005. -# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-02 07:59+0900\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-07 20:57+0900\n" "Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n" "Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n" "Language: ja\n" @@ -22,16 +22,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "ダミー" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "ダミー (&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -50,39 +40,39 @@ "AutoYaST では、インストールするシステムの設定方法を指定するためのプロファイルが必要となります。\n" "このオプションを選択すると、現在のシステムのプロファイルが <tt>/root/autoyast.xml</tt> に保存されます。" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "インストールの完了時、 AutoYaST プロファイルを /root/autoinst.xml に書き込みますか？" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "システム設定の複製" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "システム設定の複製 (&C)" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "AutoYaST のプロファイルを /root/autoinst.xml に書き込みます (<a href=\"%1\">作成しない</a>)" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "AutoYaST のプロファイルを保存しません (<a href=\"%1\">作成する</a>)" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "AutoYaST プロファイルの /root/autoinst.xml への書き込み" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "インストールしたシステムへファイルをコピーしています..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "インストールしたシステムへログファイルをコピーしています..." @@ -1046,7 +1036,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "変更 (&C)..." @@ -1416,31 +1406,31 @@ "インストールを中止します。" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "削除済み" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "有効" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "無効" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "以前利用していたリポジトリ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1449,27 +1439,27 @@ "設定されています:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "現在の状態" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "リポジトリ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "有効化／無効化 (&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1479,7 +1469,7 @@ "含める場合は有効に設定してください。" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1488,30 +1478,30 @@ "ボタンを押すか、表内の項目をダブルクリックして切り替えてください。" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "URL を変更するには 変更... ボタンを押してください。" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "不明" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "リポジトリ URL (&R)" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "ネットワークは設定されていません" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1520,49 +1510,49 @@ "ネットワークを設定しますか？" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "リポジトリの追加と削除:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "リポジトリを追加／削除しています。" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "使用していないリポジトリの削除" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "使用していないリポジトリを削除しています..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "有効化したリポジトリの追加" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "有効化したリポジトリを追加しています..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "無効化したリポジトリの追加" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "無効化したリポジトリを追加しています..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "正しいメディアが必要です" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1576,7 +1566,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1591,7 +1581,7 @@ "リポジトリは無効な状態で追加されます。" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1603,7 +1593,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1615,7 +1605,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1626,7 +1616,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1741,11 +1731,6 @@ msgstr "セキュリティの設定を保存しています..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "起動スクリプトの設定を保存しています..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "ハードウエアの設定を保存しています..." @@ -1915,17 +1900,17 @@ "注意: 設定のうちいくつかをもう一度行なう必要があります。" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "インストールの確認" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "基本インストールに必要なすべての情報が集まりました。" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1937,7 +1922,7 @@ "(パーティション内の 全てのデータが消去) されます。" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1949,22 +1934,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "何か不安な箇所があれば戻って確認してください。" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "更新を確認" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "更新に必要なすべての情報が集まりました。" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1975,7 +1960,7 @@ "設定したとおりに上書きされます。" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "更新開始 (&U)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-3.1.0/po/status.txt new/yast2-trans-ja-3.1.0/po/status.txt --- old/yast2-trans-ja-3.1.0/po/status.txt 2014-12-16 14:14:50.000000000 +0100 +++ new/yast2-trans-ja-3.1.0/po/status.txt 2015-04-20 18:01:11.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17474 +Translated : 17471 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-jv-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-jv-3.1.0/po/installation.jv.po new/yast2-trans-jv-3.1.0/po/installation.jv.po --- old/yast2-trans-jv-3.1.0/po/installation.jv.po 2014-10-29 16:40:55.000000000 +0100 +++ new/yast2-trans-jv-3.1.0/po/installation.jv.po 2015-04-20 18:00:20.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2002-10-08 13:38+0200\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Indonesian <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-jv-3.1.0/po/status.txt new/yast2-trans-jv-3.1.0/po/status.txt --- old/yast2-trans-jv-3.1.0/po/status.txt 2014-12-16 14:15:44.000000000 +0100 +++ new/yast2-trans-jv-3.1.0/po/status.txt 2015-04-20 18:00:21.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 Fuzzy : 0 -Untranslated : 17474 +Untranslated : 17471 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-ka-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ka-3.1.0/po/installation.ka.po new/yast2-trans-ka-3.1.0/po/installation.ka.po --- old/yast2-trans-ka-3.1.0/po/installation.ka.po 2014-10-29 16:37:42.000000000 +0100 +++ new/yast2-trans-ka-3.1.0/po/installation.ka.po 2015-04-20 17:48:18.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2009-03-06 15:18+0400\n" "Last-Translator: George Machitidze <giomac(a)gmail.com>\n" "Language-Team: Georgian <>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 0.2\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -41,15 +31,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "მიმდინარეობს სისტემის პარამეტრების ჩაწერა" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -57,27 +51,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "ფაილების ჩადგმურ სისტემაზე კოპირება..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "ჟურნალის ფაილების ჩადგმულ სისტემაზე კოპირება..." @@ -998,7 +988,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "შე&ცვლა..." @@ -1332,33 +1322,33 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "ამოღება" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "ჩართულია" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "გათიშულია" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "წინათ გამოყენებული რეპოზიტორიები" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1367,64 +1357,64 @@ "თქვენ გსურთ განაახლოთ:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "მიმდინარე მდგომარეობა" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "რეპოზიტორია" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "მდგომარეობის გადარ&თვა" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "უცნობი" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&რეპოზიტორიის URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "ქსელი არ არის გამართული" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1433,51 +1423,51 @@ "გავმართო ის?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "რეპოზიტორიების დამატება ან ამოღება..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "გთხოვთ დაიცადოთ რეპოზიტორიებში ცვლიელებების დასრულებამდე." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "გამოუყენებელი რეპოზიტორიების ამოღება" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "გამოუყენებელი რეპოზიტორიების ამოღება..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "ჩართული რეპოზიტორიების დამატება" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "ჩართული რეპოზიტორიების დამატება" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "გათიშული რეპოზიტორიების დამატება" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "გათიშული რეპოზიტორიების დამატება..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1487,7 +1477,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1497,7 +1487,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "Add enabled repositories" msgid "" @@ -1508,7 +1498,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1517,7 +1507,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "Add enabled repositories" msgid "" @@ -1527,7 +1517,7 @@ msgstr "ჩართული რეპოზიტორიების დამატება" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "Add disabled repositories" msgid "" @@ -1639,13 +1629,6 @@ msgstr "ძირითადი პარამეტრების წაკითხვა..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Can not write settings." -msgid "Saving boot scripts settings..." -msgstr "პარამეტრების შენახვა ვერ მოხერხდა." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "აპარატურული ნაწილის პარამეტრების შენახვა..." @@ -1792,17 +1775,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "დაადასტურეთ ჩადგმა" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1811,7 +1794,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1820,22 +1803,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "დაადასტურეთ განახლება" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1843,7 +1826,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "განახლების დაწ&ყება" @@ -1937,6 +1920,11 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#, fuzzy +#~| msgid "Can not write settings." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "პარამეტრების შენახვა ვერ მოხერხდა." + #~ msgid "Search for Linux partitions" #~ msgstr "Linux-ის დანაყოფების მოძებნა" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ka-3.1.0/po/status.txt new/yast2-trans-ka-3.1.0/po/status.txt --- old/yast2-trans-ka-3.1.0/po/status.txt 2014-12-16 14:25:01.000000000 +0100 +++ new/yast2-trans-ka-3.1.0/po/status.txt 2015-04-20 17:48:22.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 3493 -Fuzzy : 1414 -Untranslated : 12567 +Fuzzy : 1413 +Untranslated : 12565 -------------------- - All strings : 17474 + All strings : 17471 20 % are translated ++++++ yast2-trans-km-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-km-3.1.0/po/installation.km.po new/yast2-trans-km-3.1.0/po/installation.km.po --- old/yast2-trans-km-3.1.0/po/installation.km.po 2014-10-29 17:07:54.000000000 +0100 +++ new/yast2-trans-km-3.1.0/po/installation.km.po 2015-04-20 18:13:19.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: installation.km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2012-05-25 09:11+0700\n" "Last-Translator: sutha <sutha(a)khmeros.info>\n" "Language-Team: Khmer <support@khmeros>\n" @@ -20,16 +20,6 @@ "X-Generator: WordForge 0.8 RC1\n" "X-Language: km-CM\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -54,15 +44,19 @@ "ត្រូវការទម្រង់ដើម្បីដឹងអ្វីដែលប្រព័ន្ធបានដំឡើងមានរូបរាងយ៉ាងម៉េច ។ ប្រសិនបើជម្រើសនេះ\n" "ត្រូវបានជ្រើស ទម្រង់របស់ប្រព័ន្ធបច្ចុប្បន្នត្រូវបានទុកនៅក្នុង <tt>/root/autoinst.xml</tt> ។" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "កំពុងសរសេរការកំណត់រចនាសម្ព័ន្ធប្រព័ន្ធ..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -70,27 +64,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "កំពុងចម្លងឯកសារទៅប្រព័ន្ធដែលបានដំឡើង..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "កំពុងចម្លងឯកសារកំណត់ហេតុទៅប្រព័ន្ធដែលបានដំឡើង..." @@ -1078,7 +1068,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "ផ្លាស់ប្តូរ..." @@ -1463,31 +1453,31 @@ "បោះបង់ការដំឡើង ។" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "បានយកចេញ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "បានបើក" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "មិនអនុញ្ញាត" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "ឃ្លាំងដែលបានប្រើពីមុន" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1496,27 +1486,27 @@ "អ្នកកំពុងធ្វើឲ្យប្រសើរឡើង ៖" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "ស្ថានភាពបច្ចុប្បន្ន" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "ឃ្លាំង" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "បិទ/បើក ស្ថានភាព" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1525,7 +1515,7 @@ "នៅក្នុងប្រព័ន្ធ អ្នកកំពុងធ្វើឲ្យប្រសើរឡើង ។ បើកវាមួយ ដែលអ្នកចង់រួមបញ្ចូលនៅក្នុងដំណើរការធ្វើឲ្យប្រសើរឡើង ។" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1534,30 +1524,30 @@ "ប៊ូតុងបិទ/បើកស្ថានភាព ឬចុចទ្វេរដងលើធាតុតាងរាងដោយឡែកៗ ។" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "ដើម្បីផ្លាស់ប្ដូរ URL ចុចលើប៊ូតុង ផ្លាស់ប្ដូរ... ។" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "មិនស្គាល់" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "ឃ្លាំង URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "បណ្ដាញមិនត្រូវបានកំណត់រចនាសម្ព័ន្ធឡើយ" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1566,49 +1556,49 @@ "កំណត់រចនាសម្ព័ន្ធវាឬ ?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "កំពុងបន្ថែម និងយកឃ្លាំងចេញ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "ឃ្លាំងកំពុងត្រូវបានបន្ថែម និងយកចេញ ។" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "យកឃ្លាំងដែលមិនប្រើចេញ" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "កំពុងយកឃ្លាំងដែលមិនប្រើចេញ..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "បន្ថែមឃ្លាំងដែលបានបើក" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "កំពុងបន្ថែមឃ្លាំងដែលបានបើក..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "បន្ថែមឃ្លាំងដែលបានបិទ" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "កំពុងបន្ថែមឃ្លាំងដែលបានបិទ..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "កែមេឌៀដែលបានស្នើ" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1622,7 +1612,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1632,7 +1622,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1644,7 +1634,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1656,7 +1646,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1667,7 +1657,7 @@ "URL ៖ %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1780,11 +1770,6 @@ msgstr "កំពុងរក្សាទុកការកំណត់សុវត្ថិភាព..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "កំពុងរក្សាទុកការកំណត់ស្គ្រីប..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "កំពុងរក្សាទុកការកំណត់រចនាសម្ព័ន្ធផ្នែករឹង..." @@ -1954,17 +1939,17 @@ "ចំណាំ ៖ អ្នកត្រូវតែបញ្ចូលព័ត៌មានមួយចំនួនម្ដងទៀត ។" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "អះអាងដំឡើង" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "មានព័ត៌មានគ្រប់គ្រាន់ហើយ សម្រាប់ការដំឡើងគោល ។" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1977,7 +1962,7 @@ "ការកំណត់ការកំឡើងនៅក្នុងប្រអប់មុន ។" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1989,22 +1974,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "ត្រឡប់ថយក្រោយ ហើយពិនិត្យការកំណត់បើអ្នកមិនច្បាស់ ។" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "អះអាងការធ្វើបច្ចុប្បន្នភាព" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "មានព័ត៌មានគ្រប់គ្រាន់ហើយ ដើម្បីប្រតិបត្តិការធ្វើបច្ចុប្បន្នភាព ។" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2015,7 +2000,7 @@ "ដោយយោងតាមការកំណត់នៅក្នុងប្រអប់មុន ។" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "ចាប់ផ្ដើមធ្វើបច្ចុប្បន្នភាព" @@ -2109,6 +2094,15 @@ "ការដំឡើងមិនអាចដោះស្រាយភាពអាស្រ័យរបស់កញ្ចប់ដោយស្វ័យប្រវត្តិបានទេ ។\n" "កម្មវិធីគ្រប់គ្រងផ្នែកទន់ នឹងត្រូវបានបើកដើម្បីដោះស្រាយដោយស្វ័យប្រវត្តិ ។" +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "កំពុងរក្សាទុកការកំណត់ស្គ្រីប..." + #~ msgid "License needs to be accepted" #~ msgstr "អាជ្ញាប័ណ្ណត្រូវតែបានទទួល" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-km-3.1.0/po/status.txt new/yast2-trans-km-3.1.0/po/status.txt --- old/yast2-trans-km-3.1.0/po/status.txt 2014-12-16 14:31:37.000000000 +0100 +++ new/yast2-trans-km-3.1.0/po/status.txt 2015-04-20 18:14:00.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 15764 +Translated : 15761 Fuzzy : 807 Untranslated : 903 -------------------- - All strings : 17474 + All strings : 17471 90 % are translated ++++++ yast2-trans-kn-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-kn-3.1.0/po/installation.kn.po new/yast2-trans-kn-3.1.0/po/installation.kn.po --- old/yast2-trans-kn-3.1.0/po/installation.kn.po 2014-10-29 16:44:13.000000000 +0100 +++ new/yast2-trans-kn-3.1.0/po/installation.kn.po 2015-04-20 18:03:07.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-02-19 19:59+0200\n" "Last-Translator: xxx <yyy(a)example.org>\n" "Language-Team: Kannada <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,15 +29,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Saving mouse configuration..." msgid "Clone System Configuration" msgstr "ಮೌಸ್‌ನ ಸಂರಚನೆಯನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "Saving mouse configuration..." msgid "&Clone System Configuration" @@ -55,27 +49,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -955,7 +945,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1279,144 +1269,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1426,7 +1416,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1436,7 +1426,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1445,7 +1435,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1454,7 +1444,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1462,7 +1452,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1566,11 +1556,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1707,17 +1692,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1726,7 +1711,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1735,22 +1720,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1758,7 +1743,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-kn-3.1.0/po/status.txt new/yast2-trans-kn-3.1.0/po/status.txt --- old/yast2-trans-kn-3.1.0/po/status.txt 2014-12-16 14:28:04.000000000 +0100 +++ new/yast2-trans-kn-3.1.0/po/status.txt 2015-04-20 18:03:08.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 78 Fuzzy : 179 -Untranslated : 17217 +Untranslated : 17214 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-ko-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ko-3.1.0/po/installation.ko.po new/yast2-trans-ko-3.1.0/po/installation.ko.po --- old/yast2-trans-ko-3.1.0/po/installation.ko.po 2014-10-29 17:11:05.000000000 +0100 +++ new/yast2-trans-ko-3.1.0/po/installation.ko.po 2015-04-20 17:49:21.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: installation.ko\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-04-19 14:41+0900\n" "Last-Translator: Yunseok Choi <xein(a)naver.com>\n" "Language-Team: Korean <xein(a)naver.com>\n" @@ -16,16 +16,6 @@ "X-Poedit-Country: KOREA, REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "더미" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "더미(&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -50,15 +40,19 @@ "AutoYaST는 설치된 시스템의 상태를 파악 하기 위해 프로필을 필요로 합니다.\n" "이 옵션을 선택하면 현재 시스템의 프로파일이 <tt>/root/autoyast.xml</tt>에 저장됩니다." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "시스템 설정 저장 중" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -66,27 +60,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "설치될 시스템으로 파일 복사 중..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "설치될 시스템으로 로그 파일 복사 중..." @@ -1171,7 +1161,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "변경(&C)..." @@ -1598,33 +1588,33 @@ "설치가 중단됩니다." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "제거됨" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "활성화" # translators: service status radio button label # translators: server module status #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "비활성화" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "이전에 사용된 저장소" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1634,28 +1624,28 @@ # Current status #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "현재 상태" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "저장소" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" # translators: toggle button label #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "상태 변경(&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1664,7 +1654,7 @@ "업그레이드 처리에 필요한 저장소를 활성화 시키세요." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1673,31 +1663,31 @@ "상태 변경 버튼을 클릭하거나 테이블 안의 아이템을 각각 더블 클릭하세요." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "변경... 버튼으로 URL을 변경 합니다." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "알 수 없음" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "저장소 URL(&R)" # src/isdn/complex.ycp:164 #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "네트워크가 설정되지 않음" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1706,53 +1696,53 @@ "설정 하시겠습니까?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "저장소 추가 및 제거 중..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "저장소가 추가 및 제거되는 동안 잠시 기다려 주십시오." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "사용하지 않는 저장소 제거" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "사용하지 않는 저장소 제거 중..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "사용 할 저장소 추가" # command line help text for add action #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "사용 할 저장소 추가 중..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "비활성화 저장소 추가" # command line help text for add action #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "비활성화 저장소 추가 중..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "미디어 요청이 올바름" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 #, fuzzy #| msgid "" #| "Make sure that media with label %1\n" @@ -1772,7 +1762,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1785,7 +1775,7 @@ # error report # Error report #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1797,7 +1787,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1812,7 +1802,7 @@ # Error report #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1831,7 +1821,7 @@ # error report # Error report #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1965,13 +1955,6 @@ msgid "Saving security settings..." msgstr "보안 설정 저장 중..." -# progress bar item -# progres bar label -#. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "부트 스크립트 설정 저장 중..." - # progress window content #. progress step title #: src/clients/save_hw_status_finish.rb:67 @@ -2179,19 +2162,19 @@ "참고: 몇 가지 정보를 다시 입력해야 합니다." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "설치 확인" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "기본 설치를 위해 필요한 모든 정보가 이제 완료되었습니다." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2204,7 +2187,7 @@ "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2217,25 +2200,25 @@ # Help text for password expert dialog 5/5 #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "불확실한 내용이 있으면 이전으로 돌아가 설정을 확인하십시오." # Button that will continue with the installation #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "업데이트 확인" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "업데이트를 수행하기 위해 필요한 모든 정보가 이제 완료되었습니다." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2246,7 +2229,7 @@ "모든 데이터를 덮어쓰게 됩니다." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "업데이트 시작(&U)" @@ -2346,6 +2329,17 @@ "설치도중에는 꾸러미의 의존성을 자동으로 해결해주지 않습니다.\n" "나중에 꾸러미 관리자를 열어서 수동으로 해결할 수 있을것입니다." +#~ msgid "Dummy" +#~ msgstr "더미" + +#~ msgid "&Dummy" +#~ msgstr "더미(&D)" + +# progress bar item +# progres bar label +#~ msgid "Saving boot scripts settings..." +#~ msgstr "부트 스크립트 설정 저장 중..." + # text is shown in a line of a package list #~ msgid "License needs to be accepted" #~ msgstr "사용권 동의가 필요" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ko-3.1.0/po/status.txt new/yast2-trans-ko-3.1.0/po/status.txt --- old/yast2-trans-ko-3.1.0/po/status.txt 2014-12-16 14:27:51.000000000 +0100 +++ new/yast2-trans-ko-3.1.0/po/status.txt 2015-04-20 17:49:55.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 13832 +Translated : 13829 Fuzzy : 2348 Untranslated : 1294 -------------------- - All strings : 17474 + All strings : 17471 79 % are translated ++++++ yast2-trans-ku-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ku-3.1.0/po/installation.ku.po new/yast2-trans-ku-3.1.0/po/installation.ku.po --- old/yast2-trans-ku-3.1.0/po/installation.ku.po 2014-10-29 16:46:20.000000000 +0100 +++ new/yast2-trans-ku-3.1.0/po/installation.ku.po 2015-04-20 18:08:22.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation.ku.po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2009-02-26 09:01+0200\n" "Last-Translator: Omer Ensari <oensari(a)gmail.com>\n" "Language-Team: Kurdish Team\n" @@ -17,16 +17,6 @@ "X-Poedit-Language: Kurdish\n" "X-Poedit-SourceCharset: utf8\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Nederbasdar" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Nederbasdar" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -41,15 +31,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the sysconfig settings..." msgid "Clone System Configuration" msgstr "Mîhengên sysconfig dinivîse..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "Writing the sysconfig settings..." msgid "&Clone System Configuration" @@ -57,27 +51,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Pelan ji ber digire pergala hatiye sazkirin..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Pelên têketinê ji ber digire pergala hatiye saz kirin..." @@ -1038,7 +1028,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Biguherîne..." @@ -1368,144 +1358,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Çalak Bû" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Neçalak Bû" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Rewşên Derbasdar" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Arşîv" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nayê Zanîn" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1515,7 +1505,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1525,7 +1515,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1534,7 +1524,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1543,7 +1533,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "Error occurred while creating the repository." msgid "" @@ -1553,7 +1543,7 @@ msgstr "Demê afirandina arşîvê de çewtiyek çêbû." #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1669,13 +1659,6 @@ msgstr "Veava yên mişkê tên tomarkirin..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving automatical installation settings..." -msgid "Saving boot scripts settings..." -msgstr "Vebijêrkên sazkirina bixweber tên tomarkirin..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1822,17 +1805,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1841,7 +1824,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1850,22 +1833,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1873,7 +1856,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Rojanekirinê Bide Destpêkirin" @@ -1963,6 +1946,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Nederbasdar" + +#~ msgid "&Dummy" +#~ msgstr "&Nederbasdar" + +#, fuzzy +#~| msgid "Saving automatical installation settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Vebijêrkên sazkirina bixweber tên tomarkirin..." + #~ msgid "License needs to be accepted" #~ msgstr "Lîsans divê were pejirandin" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ku-3.1.0/po/status.txt new/yast2-trans-ku-3.1.0/po/status.txt --- old/yast2-trans-ku-3.1.0/po/status.txt 2014-12-16 15:11:42.000000000 +0100 +++ new/yast2-trans-ku-3.1.0/po/status.txt 2015-04-20 18:08:25.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 3147 -Fuzzy : 1210 +Translated : 3145 +Fuzzy : 1209 Untranslated : 13117 -------------------- - All strings : 17474 + All strings : 17471 18 % are translated ++++++ yast2-trans-lo-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lo-3.1.0/po/installation.lo.po new/yast2-trans-lo-3.1.0/po/installation.lo.po --- old/yast2-trans-lo-3.1.0/po/installation.lo.po 2014-10-29 16:55:40.000000000 +0100 +++ new/yast2-trans-lo-3.1.0/po/installation.lo.po 2015-04-20 18:01:14.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Lao <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lo-3.1.0/po/status.txt new/yast2-trans-lo-3.1.0/po/status.txt --- old/yast2-trans-lo-3.1.0/po/status.txt 2014-12-16 14:08:20.000000000 +0100 +++ new/yast2-trans-lo-3.1.0/po/status.txt 2015-04-20 18:01:16.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 1 Fuzzy : 34 -Untranslated : 17439 +Untranslated : 17436 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-lt-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/base.lt.po new/yast2-trans-lt-3.1.0/po/base.lt.po --- old/yast2-trans-lt-3.1.0/po/base.lt.po 2014-10-29 16:52:35.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/base.lt.po 2015-04-20 17:48:50.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: base.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:22+0100\n" -"PO-Revision-Date: 2014-08-17 07:08+0300\n" +"PO-Revision-Date: 2014-12-28 18:34+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -30,6 +30,9 @@ "may be overridden by Chef later.\n" "Continue configuration with YaST?" msgstr "" +"Chef klientas paleistas. Atliktus pakeitimus\n" +"vėliau gali perrašyti Chef.\n" +"Tęsti konfigūravimą su YaST?" #. translators: help for 'help' option on command line #: library/commandline/src/modules/CommandLine.rb:55 @@ -458,6 +461,15 @@ "\n" "%2" msgstr "" +"Konfigūracija neleis jums paleisti šio produkto šioje sistemoje.\n" +"Pabandę paleisti sistemą galite patekti į\n" +"į nemalonią situaciją.\n" +" \n" +"Sistema neišpildo tokių reikalavimų:\n" +" \n" +"%1\n" +"\n" +"%2" #. make sure that every workflow is merged only once #. bugzilla #332436 @@ -978,7 +990,7 @@ #. NCurses Control Center help 2/10 #: library/desktop/src/clients/menu.rb:334 msgid "Tree navigation is also done by arrow keys. To open or close a branch use [SPACE]. For modules showing a tree (might look like a list) of configuration items on the left side use [ENTER] to get corresponding dialog on the right." -msgstr "" +msgstr "Judėti galite ir klaviatūros krypčių klavišais. Norėdami atverti ar užverti šaką, spauskite [TARPĄ]. Kairėje esančius medį turinčius konfigūracijos modulius (gali atrodyti kaip sąrašas) išskleisite dešinėje pusėje nuspaudę [ĮVESTIES] klavišą." #. NCurses Control Center help 3/10 #: library/desktop/src/clients/menu.rb:341 @@ -1495,16 +1507,12 @@ #. TRANSLATORS: Popup message #: library/general/src/modules/Message.rb:265 -#, fuzzy -#| msgid "Updating configuration..." msgid "Updating system configuration..." -msgstr "Atnaujinama konfigūracija..." +msgstr "Atnaujinama sistemos konfigūracija..." #: library/general/src/modules/Message.rb:269 -#, fuzzy -#| msgid "This may take a while" msgid "This may take a while." -msgstr "Tai gali truputį užtrukti" +msgstr "Tai gali truputį užtrukti." #. Get information about the OS release #. Throws exception Yast::OSReleaseFileMissingError if release file @@ -1513,10 +1521,8 @@ #. @param [String] directory containing the installed system (/ in installed system) #. @return [String] the release information #: library/general/src/modules/OSRelease.rb:63 -#, fuzzy -#| msgid "Specified profile not found." msgid "Release file %{file} not found" -msgstr "Pasirinktas profilis nerastas." +msgstr "Pasirinktas failas %{file} nerastas." #. Confirm user request to abort installation #: library/general/src/modules/Popup.rb:833 @@ -2602,27 +2608,26 @@ #. Otherwise show error popup depending on Stage and return false #. @return true if network running #: library/network/src/modules/NetworkService.rb:349 -#, fuzzy -#| msgid "Restart installation and configure network in Linuxrc" msgid "" "No running network detected.\n" "Restart installation and configure network in Linuxrc\n" "or continue without network." -msgstr "Iš naujo paleiskite diegyklę ir tinklą konfigūruokite su Linuxrc" +msgstr "" +"Nerasta paleistų tinklo paslaugų.\n" +"Iš naujo paleiskite diegyklę ir tinklą konfigūruokite su Linuxrc\n" +"arba tęskite nesinaudodami tinklu." #: library/network/src/modules/NetworkService.rb:355 -#, fuzzy -#| msgid "" -#| "Configure network with YaST or Network Manager plug-in\n" -#| "and start this module again" msgid "" "No running network detected.\n" "Configure network with YaST or Network Manager plug-in\n" "and start this module again\n" "or continue without network." msgstr "" +"Nerasta paleistų tinklo paslaugų.\n" "Tinklą sukonfigūruokite su YaST arba Network Manager\n" -"ir modulį paleiskite iš naujo" +"ir modulį paleiskite iš naujo\n" +"arba tęskite nesinaudodami tinklu." #. TRANSLATORS: popup informing message, allowed characters for port-names #: library/network/src/modules/PortAliases.rb:136 @@ -3739,6 +3744,11 @@ "\n" "value in the YaST sysconfig editor." msgstr "" +"Jei norite vėl išvysti šį dialogą, redaguokite\n" +"\n" +"System > Yast2 > GUI > PKGMGR_ACTION_AT_EXIT\n" +"\n" +"reikšmę YaST sistemos konfigūracijos redaktoriuje." #. popup question, %1 stands for the package name #. %2 is a repository name @@ -4214,8 +4224,6 @@ #. Dialog heading - software packages are being upgraded #: library/packages/src/modules/SlideShow.rb:719 -#, fuzzy -#| msgid "Perform Update" msgid "Performing Upgrade" msgstr "Atnaujinti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/control.lt.po new/yast2-trans-lt-3.1.0/po/control.lt.po --- old/yast2-trans-lt-3.1.0/po/control.lt.po 2014-10-29 16:52:33.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/control.lt.po 2015-04-20 17:48:48.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-10-20 23:20+0300\n" +"PO-Revision-Date: 2014-12-28 18:35+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -22,15 +22,6 @@ "X-Generator: Lokalize 1.5\n" #: control/control.openSUSE.glade.translations.glade:3 -#, fuzzy -#| msgid "" -#| "\n" -#| "Congratulations!\n" -#| "The installation of openSUSE on your machine is complete.\n" -#| "After clicking Finish, you can log in to the system.\n" -#| "Visit us at %1.\n" -#| "Have a lot of fun! Your openSUSE Development Team\n" -#| "\t " msgid "" "\n" "Congratulations!\n" @@ -46,7 +37,7 @@ "Nuspaudę Užbaigti, jūs galėsite prisijungti prie sistemos.\n" "Aplankykite mus %1.\n" "Linkime daug džiugių akimirkų! Jūsų SUSE tobulinimo komanda\n" -"\t " +" " #: control/control.openSUSE.glade.translations.glade:10 msgid "" @@ -135,10 +126,8 @@ #: control/control.openSUSE.glade.translations.glade:36 #: control/control.openSUSE.glade.translations.glade:63 -#, fuzzy -#| msgid "Load Linuxrc Network Configuration" msgid "Load linuxrc Network Configuration" -msgstr "Įkelti Linuxrc tinklo konfigūraciją" +msgstr "Įkelti linuxrc tinklo konfigūraciją" #: control/control.openSUSE.glade.translations.glade:37 #: control/control.openSUSE.glade.translations.glade:64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/country.lt.po new/yast2-trans-lt-3.1.0/po/country.lt.po --- old/yast2-trans-lt-3.1.0/po/country.lt.po 2014-10-07 17:28:09.000000000 +0200 +++ new/yast2-trans-lt-3.1.0/po/country.lt.po 2015-04-20 17:48:53.000000000 +0200 @@ -4,13 +4,13 @@ # Jonas Gocentas <linuxjonas(a)unitedlinux.lt>, 2000, 2001, 2002, 2003. # Linas Spraunius <linas(a)operis.org>, 2003, 2004. # Andrius Štikonas <stikonas(a)gmail.com>, 2006. -# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2013. +# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: country.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-04 15:52+0200\n" -"PO-Revision-Date: 2013-02-04 13:23+0200\n" +"PO-Revision-Date: 2014-12-28 19:06+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -87,10 +87,8 @@ #. help text for keyboard expert screen cont. #: keyboard/src/include/keyboard/dialogs.rb:60 -#, fuzzy -#| msgid "Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool, such as SaX.\n" msgid "Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool.\n" -msgstr "Čia parinktos nuostatos taikomos tik konsolės klaviatūrai. Grafinei naudotojo sąsajai skirtą klaviatūrą konfigūruokite kitu įrankiu, pvz., SaX.\n" +msgstr "Čia parinktos nuostatos taikomos tik konsolės klaviatūrai. Grafinei naudotojo sąsajai skirtą klaviatūrą konfigūruokite kitu įrankiu.\n" #. heading text #: keyboard/src/include/keyboard/dialogs.rb:78 @@ -847,10 +845,8 @@ #. button text #: timezone/src/include/timezone/dialogs.rb:541 -#, fuzzy -#| msgid "E&xpert Settings..." msgid "Other &Settings..." -msgstr "Nuostatos &ekspertams..." +msgstr "&Kitos nuostatos..." #. frame label #. frame label @@ -891,10 +887,8 @@ msgstr "&Laiko juosta" #: timezone/src/include/timezone/dialogs.rb:673 -#, fuzzy -#| msgid "Date and Time" msgid "Date and Time:" -msgstr "Data ir laikas" +msgstr "Data ir laikas:" #. help for timezone screen #: timezone/src/include/timezone/dialogs.rb:812 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/installation.lt.po new/yast2-trans-lt-3.1.0/po/installation.lt.po --- old/yast2-trans-lt-3.1.0/po/installation.lt.po 2014-10-29 16:52:34.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/installation.lt.po 2015-04-20 17:48:49.000000000 +0200 @@ -6,13 +6,13 @@ # Linas Spraunius <linas(a)operis.org>, 2003, 2004, 2005. # Jonas Gocentas <linuxjonas(a)unitedlinux.lt>, 2003. # Andrius Štikonas <stikonas(a)gmail.com>, 2006, 2007. -# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2012, 2013. +# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2012, 2013, 2014. msgid "" msgstr "" "Project-Id-Version: installation.lt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2013-10-15 14:36+0300\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2014-12-28 18:55+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -22,69 +22,51 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Tuščias" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Tuščias" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." -msgstr "" +msgstr "Kuriamas AutoYaST profilis (pagal poreikį)..." #. TRANSLATORS: help text #: src/clients/clone_proposal.rb:39 -#, fuzzy -#| msgid "" -#| "Use Clone if you want to create an AutoYaST profile.\n" -#| "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" -#| "needs a profile to know what the installed system should look like. If this option is\n" -#| "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgid "" "Use Clone System Settings if you want to create an AutoYaST profile.\n" "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" "needs a profile to know what the installed system should look like. If this option is\n" "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" -"Naudokite Klonavimą norėdami sukurti AutoYaST profilį.\n" +"Sistemos nuostatos leidžia sukurti AutoYaST profilį.\n" "AutoYaST yra SUSE Linux diegimo būdas be naudotojo įsikišimo. AutoYaST\n" "diegimui reikia profilio, kuriame nurodoma, kaip įdiegti sistemą. Pasirinkus šią\n" "parinktį, esamos sistemos profilis bus įrašytas <tt>/root/autoinst.xml</tt>." -#. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:60 #, fuzzy -#| msgid "Writing the system configuration..." +#| msgid "Write AutoYaST profile to /root/autoinst.xml" +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "AutoYaST profilį rašyti į /root/autoinst.xml" + +#. this is a heading +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" -msgstr "Įrašoma sistemos konfigūracija..." +msgstr "Klonuojamos sistemos konfigūracija..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 -#, fuzzy -#| msgid "&Skip Configuration" +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" -msgstr "Pralei&sti konfigūravimą" +msgstr "&Klonuojamos sistemos konfigūracija..." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." -msgstr "" +msgstr "AutoYaST profilis bus įrašytas į /root/autoinst.xml (<a href=\"%1\">neįrašyti</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." -msgstr "" - -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" +msgstr "AutoYaST profilis nebus įrašytas (<a href=\"%1\">įrašyti</a>)." #. progress step title #: src/clients/copy_files_finish.rb:81 @@ -92,7 +74,7 @@ msgstr "Kopijuojamos rinkmenos į įdiegtą sistemą..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Į įdiegtą sistemą kopijuojamos žurnalo rinkmenos..." @@ -321,7 +303,7 @@ #. heading text #: src/clients/inst_complex_welcome.rb:86 msgid "Language, Keyboard and License Agreement" -msgstr "" +msgstr "Kalba, klaviatūra ir licencija" #. combo box label #. combobox @@ -427,14 +409,12 @@ #: src/clients/inst_complex_welcome.rb:230 #: src/clients/inst_download_release_notes.rb:139 #: src/clients/inst_system_analysis.rb:299 -#, fuzzy -#| msgid "Release Notes" msgid "Re&lease Notes..." -msgstr "Pastabos šiai versijai" +msgstr "&Pastabos šiai versijai" #: src/clients/inst_complex_welcome.rb:342 msgid "You must accept the license to install this product" -msgstr "" +msgstr "Prieš diegdami produktą, turite sutikti su jo licencijos sąlygomis" #. TRANSLATORS: check box, see #ZMD #: src/clients/inst_congratulate.rb:107 @@ -600,23 +580,23 @@ #. FIXME: move blacklist to Storage #: src/clients/inst_disk_for_image.rb:84 msgid "Select the disk to deploy the image to." -msgstr "" +msgstr "Pasirinkite diską, kuriame norite išpakuoti atvaizdį." #: src/clients/inst_disk_for_image.rb:85 msgid "All data on the disk will be lost!!!" -msgstr "" +msgstr "Bus ištrinti visi to disko duomenys!!! " #: src/clients/inst_disk_for_image.rb:87 msgid "&Disk to Use" -msgstr "" +msgstr "Naudotinas &diskas" #: src/clients/inst_disk_for_image.rb:93 msgid "Select the disk, which the image will be deployed to. All data on the disk will be lost and the disk will be partitioned as defined in the image." -msgstr "" +msgstr "Pasirinkite diską, kuriame norite išskleisti sistemos atvaizdį. Visi diske esantys duomenys bus ištrinti, o diskas bus suskaidytas pagal atvaizdyje aprašytas taisykles. " #: src/clients/inst_disk_for_image.rb:100 msgid "Hard Disk for Image Deployment" -msgstr "" +msgstr "Standusis diskas atvaizdžio išskleidimui" #. popup label #: src/clients/inst_disks_activate.rb:60 @@ -645,10 +625,8 @@ msgstr "Konfigūruot &iSCSIi diskus" #: src/clients/inst_disks_activate.rb:112 -#, fuzzy -#| msgid "Saving network configuration..." msgid "Change Net&work Configuration" -msgstr "Išsaugoma tinklo konfigūracija..." +msgstr "Keisti &tinklo konfigūraciją..." #. TRANSLATORS: dialog caption #: src/clients/inst_doit.rb:63 @@ -791,10 +769,8 @@ #. dialog caption #: src/clients/inst_installation_options.rb:83 -#, fuzzy -#| msgid "Installation Mode" msgid "Installation Options" -msgstr "Diegimo būdas" +msgstr "Diegimo parinktys" #. TRANSLATORS: progress message #. dialog caption @@ -815,14 +791,8 @@ #. help text for installation method #: src/clients/inst_installation_options.rb:201 -#, fuzzy -#| msgid "" -#| "<big>Installation Mode</big> \n" -#| "Select what to do:" msgid "<big>Installation Options</big>" -msgstr "" -"<big>Diegimo būdas</big> \n" -"Rinkitės, ką daryti:" +msgstr "<big>Diegimo parinktys</big> " #. help text for installation option #: src/clients/inst_installation_options.rb:204 @@ -965,7 +935,7 @@ #. hide the RN button and set the release notes for SlideShow (bnc#871158) #: src/clients/inst_prepareprogress.rb:56 msgid "Cannot find base product. Release notes will not be shown." -msgstr "" +msgstr "Nepavyksta rasti pagrindinio produkto. Pastabos apie šią laidą nerodomos." #. 1 GB is a good approximation #: src/clients/inst_prepareprogress.rb:104 @@ -989,16 +959,14 @@ #. force_reset #: src/clients/inst_proposal.rb:220 -#, fuzzy -#| msgid "Automatic Configuration" msgid "Location of Stored Configuration" -msgstr "Automatinė konfigūracija" +msgstr "Įrašytos konfigūracijos vieta" #. force write, so it always write profile even if user do not want #. to store profile after installation #: src/clients/inst_proposal.rb:227 msgid "Failed to store configuration. Details can be found in log." -msgstr "" +msgstr "Nepavyko įrašyti konfigūracijos. Išsamesnė informacija žurnale." #. message show when user has disabled the configuration #: src/clients/inst_proposal.rb:238 @@ -1072,16 +1040,14 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Pakeisti..." #. menu button #: src/clients/inst_proposal.rb:998 src/clients/inst_proposal.rb:1171 -#, fuzzy -#| msgid "&Skip Configuration" msgid "&Export Configuration" -msgstr "Pralei&sti konfigūravimą" +msgstr "&Eksportuoti konfigūraciją" #. Help message between headline and installation proposal / settings summary. #. May contain newlines, but don't make it very much longer than the original. @@ -1090,10 +1056,8 @@ msgstr "Norėdami pakeisti antraštę, spauskite ant jos arba paspauskite mygtuką „Pakeisti...“." #: src/clients/inst_proposal.rb:1073 -#, fuzzy -#| msgid "Click a headline to make changes or use the \"Change...\" menu below." msgid "Click a headline to make changes." -msgstr "Norėdami pakeisti antraštę, spauskite ant jos arba paspauskite mygtuką „Pakeisti...“." +msgstr "Norėdami pakeisti parametrus, spauskite antraštę." #. menu button item #: src/clients/inst_proposal.rb:1170 @@ -1445,31 +1409,31 @@ "Diegimas nutraukiamas." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Pašalintas" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Įjungta" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Uždrausta" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Anksčiau naudotos saugyklos" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1478,27 +1442,27 @@ "Jūsų atnaujinamoje sistemoje:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Dabartinė būsena" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Saugykla" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Pa&keisti būseną" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1507,7 +1471,7 @@ "kurią ketinate naujovinti. Įgalinkite tas, kurias norite įtraukti į sistemos naujovinimą." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1516,30 +1480,30 @@ "Keisti būseną ar spragtelėkite atitinkamą lentelės įrašą." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Norėdami keisti universalų adresą (URL), spauskite mygtuką Keisti...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nežinoma" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Saugyklos URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Tinklas nesukomfigūruotas" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1548,49 +1512,49 @@ "Konfigūruoti jį?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Pridedamos ir pašalinamos saugyklos..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Pridedamos ir šalinamos programinės įrangos diegimo saugyklos." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Pašalinti nenaudojamas saugyklas" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Šalinamos nenaudojamos saugyklos..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Pridėti naudojamas saugyklas" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Pridedamos naudojamos saugyklos..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Pridėti nenaudojamas saugyklas" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Pridedamos nenaudojamos saugyklos..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Reikia tinkamos laikmenos" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1604,7 +1568,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1619,7 +1583,7 @@ "Saugykla bus pridėta, bet neįjungta." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1631,7 +1595,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1643,7 +1607,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1654,7 +1618,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1767,11 +1731,6 @@ msgstr "Įrašomos saugumo nuostatos..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Įrašomos OS paleidimo scenarijų nuostatos..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Išsaugoma įrenginių informacija..." @@ -1849,6 +1808,8 @@ "No installation control file has been found,\n" "the installer cannot continue." msgstr "" +"Neradome diegimo eigos failo,\n" +"diegyklė nežino, ką daryti toliau." #. Somehow the graphical frontend failed and we're running in #. text mode. Inform the user about this fact. @@ -1941,17 +1902,17 @@ "Pastaba: informaciją galėsite įvesti iš naujo." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Patvirtinti diegimą" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Surinkta informacija, reikalinga diegimui." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1964,7 +1925,7 @@ "ankstesniuose languose atliktas diegimo nuostatas." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1976,22 +1937,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Jei nesate užtikrintas, grįžkite atgal ir patikrinkite nuostatas." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Patvirtinti atnaujinimą" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Surinkta informacija, reikalinga atnaujinimui." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2002,63 +1963,53 @@ "pagal ankstesniuose languose atliktas nustatas." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Pradėti atna&ujinimą" #. this is a heading #: src/lib/installation/cio_ignore.rb:42 msgid "Blacklist Devices" -msgstr "" +msgstr "Įrenginių juodasis sąrašas" #. this is a menu entry #: src/lib/installation/cio_ignore.rb:44 msgid "B&lacklist Devices" -msgstr "" +msgstr "Įrenginių juo&dasis sąrašas" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text #: src/lib/installation/cio_ignore.rb:63 -#, fuzzy -#| msgid "Installation from images is enabled (<a href=\"%1\">disable</a>)." msgid "Blacklist devices enabled (<a href=\"%s\">disable</a>)." -msgstr "Diegimas iš atvaizdžių yra įgalintas (<a href=\"%1\">išjungti</a>)." +msgstr "Įrenginių juodasis sąrašas yra įgalintas (<a href=\"%s\">išjungti</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text #: src/lib/installation/cio_ignore.rb:69 -#, fuzzy -#| msgid "Installation from images is disabled (<a href=\"%1\">enable</a>)." msgid "Blacklist devices disabled (<a href=\"%s\">enable</a>)." -msgstr "Diegimas iš atvaizdžių yra išjungtas (<a href=\"%1\">įgalinti</a>)." +msgstr "Įrenginių juodasis sąrašas yra išjungtas (<a href=\"%s\">įgalinti</a>)." #. TRANSLATORS: help text #: src/lib/installation/cio_ignore.rb:78 msgid "Use Blacklist devices if you want to create blacklist channels to such devices which will reduce kernel memory footprint." -msgstr "" +msgstr "Įrenginių juodąjį sąrašą naudokite tuomet, kai nenorite, kad branduolys bandytų naudoti tuos įrenginius." #. progress step title #: src/lib/installation/cio_ignore.rb:135 -#, fuzzy -#| msgid "Starting service %1..." msgid "Blacklisting Devices..." -msgstr "Paleidžiama paslauga %1..." +msgstr "Įrenginiai įtraukiami į juodąjį sąrašą..." #. progress step title #: src/lib/installation/prep_shrink.rb:35 -#, fuzzy -#| msgid "Searching for Linux partitions..." msgid "Shrinking PREP partition..." -msgstr "Ieškoma Linux skaidinių..." +msgstr "Mažinamas PREP skaidinys..." #. Text to display #. #. @return String #: src/lib/installation/remote_finish_client.rb:68 -#, fuzzy -#| msgid "Remote Administration" msgid "Enabling remote administration..." -msgstr "Nuotolinis administravimas" +msgstr "Įgalinamas nuotolinis administravimas" #. checking whether images are supported #. BNC #409927 @@ -2096,6 +2047,15 @@ "Automatiškai nepavyksta išspręsti paketų priklausomybių.\n" "Jas išspręskite rankiniu būdu atsivėrusioje programinės įrangos tvarkytuvėje." +#~ msgid "Dummy" +#~ msgstr "Tuščias" + +#~ msgid "&Dummy" +#~ msgstr "&Tuščias" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Įrašomos OS paleidimo scenarijų nuostatos..." + #~ msgid "License needs to be accepted" #~ msgstr "Licenciją reikia priimti" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/services-manager.lt.po new/yast2-trans-lt-3.1.0/po/services-manager.lt.po --- old/yast2-trans-lt-3.1.0/po/services-manager.lt.po 2014-10-29 16:52:35.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/services-manager.lt.po 2015-04-20 17:48:50.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2014-08-17 07:18+0300\n" +"PO-Revision-Date: 2014-12-28 19:00+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -69,16 +69,12 @@ msgstr "Nepavyksta įgalinti paslaugos %1" #: src/data/services-manager/autoyast_summary.erb:5 -#, fuzzy -#| msgid "Service Start" msgid "Services Manager" -msgstr "Paleisti paslaugą" +msgstr "Paslaugų tvarkytuvė" #: src/data/services-manager/autoyast_summary.erb:6 -#, fuzzy -#| msgid "Default Value" msgid "Default Target" -msgstr "Numatyta reikšmė" +msgstr "Numatyta paskirtis" #: src/data/services-manager/autoyast_summary.erb:16 msgid "Enabled" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/status.txt new/yast2-trans-lt-3.1.0/po/status.txt --- old/yast2-trans-lt-3.1.0/po/status.txt 2014-12-16 14:24:27.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/status.txt 2015-04-20 17:49:06.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 14608 -Fuzzy : 822 -Untranslated : 2044 +Translated : 14666 +Fuzzy : 785 +Untranslated : 2020 -------------------- - All strings : 17474 + All strings : 17471 84 % are translated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-3.1.0/po/storage.lt.po new/yast2-trans-lt-3.1.0/po/storage.lt.po --- old/yast2-trans-lt-3.1.0/po/storage.lt.po 2014-10-29 16:52:49.000000000 +0100 +++ new/yast2-trans-lt-3.1.0/po/storage.lt.po 2015-04-20 17:49:03.000000000 +0200 @@ -5,13 +5,13 @@ # Jonas Gocentas <linuxjonas(a)unitedlinux.lt>, 2003. # Tomas $atkauskas <satkauskai(a)takas.lt>, 2003. # Andrius Štikonas <stikonas(a)gmail.com>, 2006, 2007. -# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2013. +# Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>, 2009, 2010, 2011, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:21+0100\n" -"PO-Revision-Date: 2013-02-09 10:17+0200\n" +"PO-Revision-Date: 2015-01-16 18:26+0200\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba(a)gmail.com>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -60,29 +60,23 @@ #. Commandline help title #: src/clients/disk_worker.rb:49 -#, fuzzy -#| msgid "Image Configuration" msgid "Storage Configuration" -msgstr "Atvaizdžio konfigūracija" +msgstr "Kaupiklių konfigūravimas" #. Commandline command help #: src/clients/disk_worker.rb:57 -#, fuzzy -#| msgid "Disk partitioner" msgid "List disks and partitions" -msgstr "Skaidymo įrankis" +msgstr "Diskų ir skaidinių sąrašas" #. Command line option help text #: src/clients/disk_worker.rb:70 msgid "List disks" -msgstr "" +msgstr "Diskų sąrašas" #. Command line option help text #: src/clients/disk_worker.rb:74 -#, fuzzy -#| msgid "Edit partition" msgid "List partitions" -msgstr "Keisti skaidinį" +msgstr "Skaidinių sąrašas" #. Title for dialogue #: src/clients/inst_disk_proposal.rb:76 @@ -91,10 +85,8 @@ #. Radiobutton for partition dialog #: src/clients/inst_disk_proposal.rb:78 -#, fuzzy -#| msgid "Expert Partitioner" msgid "&Expert Partitioner..." -msgstr "Skaidymo ekspertas" +msgstr "&Skaidinių tvarkytuvė patyrusiems..." #. Radiobutton for partition dialog #: src/clients/inst_disk_proposal.rb:80 @@ -117,10 +109,8 @@ #. this is the normal case #: src/clients/inst_disk_proposal.rb:135 src/clients/inst_target_part.rb:164 #: src/clients/inst_target_part.rb:178 src/clients/inst_target_part.rb:185 -#, fuzzy -#| msgid "Proposal settings" msgid "Edit Proposal Settings" -msgstr "Siūlomos nuostatos" +msgstr "Keisti siūlomas nuostatas" #. help on suggested partitioning #: src/clients/inst_disk_proposal.rb:165 @@ -176,10 +166,8 @@ #. TRANSLATORS: popup error message #: src/clients/inst_disk_proposal.rb:238 -#, fuzzy -#| msgid "Not enough space available to propose separate /home." msgid "Not enough space available to propose snapshots for root volume." -msgstr "Atskiram /home skaidiniui nepakanka vietos." +msgstr "Šakniniame skaidinyje nepakanka vietos momentiniams būviams kurti." #. TRANSLATORS: popup error message #: src/clients/inst_disk_proposal.rb:244 src/clients/inst_target_part.rb:449 @@ -1858,7 +1846,7 @@ #: src/include/partitioning/custom_part_dialogs.rb:1596 #: src/modules/StorageProposal.rb:6211 msgid "Enable Snapshots" -msgstr "" +msgstr "Įgalinti momentinių kopijų kūrimą" #. heading text #. button text @@ -6737,38 +6725,30 @@ #. TRANSLATORS: checkbox text #: src/modules/StorageProposal.rb:6164 -#, fuzzy -#| msgid "Create &LVM Based Proposal" msgid "Create &LVM-based Proposal" msgstr "Kurti pasiūlymą &LVM pagrindu" #. TRANSLATORS: checkbox text #: src/modules/StorageProposal.rb:6179 msgid "Encr&ypt Volume Group" -msgstr "&Užšifruota tomų grupė " +msgstr "&Užšifruota tomų grupė" #. TRANSLATORS: combobox label #: src/modules/StorageProposal.rb:6197 -#, fuzzy -#| msgid "File system options:" msgid "File System for Root Partition" -msgstr "Rinkmenų sistemos savybės:" +msgstr "Šakninio skaidinio rinkmenų sistema:" #. TRANSLATORS: combobox label #: src/modules/StorageProposal.rb:6244 -#, fuzzy -#| msgid "Propose Separate &Home Partition" msgid "File System for Home Partition" -msgstr "Pasiūlyti atskirą &Namų skaidinį" +msgstr "&Namų skaidinio rinkmenų sistema" #. TRANSLATORS: checkbox text #: src/modules/StorageProposal.rb:6262 msgid "Enlarge &Swap for Suspend" -msgstr "" +msgstr "Padidinti &mainų sritį sustabdant kompiuterį į atmintį" #: src/modules/StorageProposal.rb:6272 -#, fuzzy -#| msgid "Proposal settings" msgid "Proposal Settings" msgstr "Siūlomos nuostatos" ++++++ yast2-trans-mk-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-mk-3.1.0/po/installation.mk.po new/yast2-trans-mk-3.1.0/po/installation.mk.po --- old/yast2-trans-mk-3.1.0/po/installation.mk.po 2014-10-29 16:40:33.000000000 +0100 +++ new/yast2-trans-mk-3.1.0/po/installation.mk.po 2015-04-20 17:48:39.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: installation.mk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-10-12 19:56+0200\n" "Last-Translator: Zoran Dimovski <zoki.dimovski(a)gmail.com>\n" "Language-Team: Macedonian\n" @@ -17,16 +17,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -46,15 +36,19 @@ "корисникот. На „AutoYaST“ му е потребен профил за да знае како треба да изгледа системот.\n" "Ако оваа опција е избрана, профилот од тековниот систем ќе се зачува во /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Запишување на системската конфигурација" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -62,27 +56,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Копирам датотеки во инсталираниот систем..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Копирам дневници во инсталираниот систем..." @@ -1041,7 +1031,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Промени..." @@ -1408,115 +1398,115 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "&Remove" msgid "Removed" msgstr "&Отстрани" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Овозможено" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Оневозможено" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Резиме на инсталацијата" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Тековен статус: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "Статус" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Непознато" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "Конфигурација на мрежата" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Резиме на инсталацијата" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1524,45 +1514,45 @@ "Ве молам почекајте додека системот се конфигурира.\n" "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Читај ги претходните поставувања" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Читање на достапни пакетите од изворите на инсталацијата..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Читај ги претходните поставувања" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Резиме на инсталацијата" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Читај ги претходните поставувања" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Резиме на инсталацијата" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1572,7 +1562,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1582,7 +1572,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1592,7 +1582,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1602,7 +1592,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1611,7 +1601,7 @@ msgstr "Се појави грешка при поврзување со серверот." #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1723,13 +1713,6 @@ msgstr "Зачувување на поставувањата..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Reading the previous settings..." -msgid "Saving boot scripts settings..." -msgstr "Читање не претходните поставувања..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1877,19 +1860,19 @@ "Дали сакате да ја креирате?" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Поврдете ја инсталацијата" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Сите потребни информации за основната инсталација се земени." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -1903,7 +1886,7 @@ "според поставувањата на инсталацијата во претходните дијалози." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -1916,24 +1899,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Ако не сте сигурни, вратете се назад и проверете ги поставувањата." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Потвди надградба" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Сите потребни информации за извршување на надградувањето се земени." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -1945,7 +1928,7 @@ "според поставувањата во претходните дијалози." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" @@ -2036,6 +2019,11 @@ msgstr "" #, fuzzy +#~| msgid "Reading the previous settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Читање не претходните поставувања..." + +#, fuzzy #~ msgid "Evaluate update possibility" #~ msgstr "Овозможи автоматско надградување" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-mk-3.1.0/po/status.txt new/yast2-trans-mk-3.1.0/po/status.txt --- old/yast2-trans-mk-3.1.0/po/status.txt 2014-12-16 14:23:37.000000000 +0100 +++ new/yast2-trans-mk-3.1.0/po/status.txt 2015-04-20 17:48:41.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 1700 -Fuzzy : 3487 -Untranslated : 12287 +Fuzzy : 3486 +Untranslated : 12285 -------------------- - All strings : 17474 + All strings : 17471 10 % are translated ++++++ yast2-trans-mr-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-mr-3.1.0/po/installation.mr.po new/yast2-trans-mr-3.1.0/po/installation.mr.po --- old/yast2-trans-mr-3.1.0/po/installation.mr.po 2014-10-29 17:05:19.000000000 +0100 +++ new/yast2-trans-mr-3.1.0/po/installation.mr.po 2015-04-20 17:47:33.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n" @@ -13,16 +13,6 @@ "Plural-Forms: nplurals=2; plural=(n!=1);\n" "\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "त्याच्यासारखा दिसणारा" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "त्याच्यासारखा दिसणारा" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -42,15 +32,19 @@ " जाणून घेण्यासाठी\n" "प्रोफाईलची गरज असते. /रुट/autoyast.xml.मधे जतन होतो.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "प्रणाली संरचना लिहीत आहे" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -58,27 +52,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "स्थापित यंत्रणेवर फाईल्स प्रतिकृत होत आहेत..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "स्थापित यंत्रणेवर लॉग फाईल्स प्रतिकृत होत आहेत..." @@ -1093,7 +1083,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&बदला..." @@ -1502,161 +1492,161 @@ msgstr "नामावली कार्यान्वयन करण्यात अयशस्वी." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "कमी करा" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Enabled" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "अक्षम केले " #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "अतिरिक्त स्त्रोत निवडा:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "सध्याची स्थिती: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "कार्यक्रम साठा:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "यूआरएल" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "टॉगलची स्थिती" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "अज्ञात" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "उत्पादवस्तू नोंदणी" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "कार्यक्रम संरचित झाली नाही" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "अतिरिक्त स्त्रोत निवडा:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "प्रतिमा पुन्हा मिळेपर्यंत कृपया प्रतिक्षा करा.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "आधी संग्रहीत केलेली संरचना वाचा" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "आधी संग्रहीत केलेली संरचना वाचत आहे..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "आधी संग्रहीत केलेली संरचना वाचा" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "अतिरिक्त स्त्रोत निवडा:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "आधी संग्रहीत केलेली संरचना वाचा" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "अतिरिक्त स्त्रोत निवडा:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1666,7 +1656,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1676,7 +1666,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1688,7 +1678,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1698,7 +1688,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1709,7 +1699,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1833,13 +1823,6 @@ msgstr "सुरक्षा सेटिंग्ज वाचत आहे..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "ध्वनीकार्ड मांडणी संग्रहीत करत आहे..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "हार्डवेअर संरचना संग्रहीत करत आहे..." @@ -2025,19 +2008,19 @@ "टीप – आपणास कदाचित पुन्हा काही माहीती प्रविष्ट करावी लागेल." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "स्थापना नक्की करा" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "मूळ स्थापनेकरता लागणारी सर्व माहिती आता पूर्ण आहे." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2051,7 +2034,7 @@ "असल्यास ते पुसून)." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2064,24 +2047,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "तुम्हाला खात्री वाटत नसेल तर मागे जाऊन व सेटींग्ज तपासा." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "अपडेट नक्की करा" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "अपडेट करण्यासाठी हवी असलेली सर्व माहिती आता पूर्ण आहे." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2093,7 +2076,7 @@ "सेटिग्जच्या अनुसार आपल्या हार्डडिस्क वरील माहितीवरच पुन्हा लिहिले जाईल." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "अपडेट सुरु करा" @@ -2184,6 +2167,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "त्याच्यासारखा दिसणारा" + +#~ msgid "&Dummy" +#~ msgstr "त्याच्यासारखा दिसणारा" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "ध्वनीकार्ड मांडणी संग्रहीत करत आहे..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "पुर्नस्थापित करायला हवा आहे" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-mr-3.1.0/po/status.txt new/yast2-trans-mr-3.1.0/po/status.txt --- old/yast2-trans-mr-3.1.0/po/status.txt 2014-12-16 15:26:07.000000000 +0100 +++ new/yast2-trans-mr-3.1.0/po/status.txt 2015-04-20 17:47:52.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7456 -Fuzzy : 4705 +Translated : 7454 +Fuzzy : 4704 Untranslated : 5313 -------------------- - All strings : 17474 + All strings : 17471 43 % are translated ++++++ yast2-trans-ms-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ms-3.1.0/po/installation.ms.po new/yast2-trans-ms-3.1.0/po/installation.ms.po --- old/yast2-trans-ms-3.1.0/po/installation.ms.po 2014-10-29 16:40:45.000000000 +0100 +++ new/yast2-trans-ms-3.1.0/po/installation.ms.po 2015-04-20 17:48:25.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2007-10-28 13:38+0200\n" "Last-Translator: Malay <i18n(a)suse.de>\n" "Language-Team: Malay <i18n(a)suse.de>\n" @@ -16,16 +16,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -40,39 +30,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -954,7 +944,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1276,144 +1266,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1423,7 +1413,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1433,7 +1423,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1442,7 +1432,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1451,7 +1441,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1459,7 +1449,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1563,11 +1553,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1702,17 +1687,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1721,7 +1706,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1730,22 +1715,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1753,7 +1738,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ms-3.1.0/po/status.txt new/yast2-trans-ms-3.1.0/po/status.txt --- old/yast2-trans-ms-3.1.0/po/status.txt 2014-12-16 14:13:56.000000000 +0100 +++ new/yast2-trans-ms-3.1.0/po/status.txt 2015-04-20 17:48:26.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 259 Fuzzy : 302 -Untranslated : 16913 +Untranslated : 16910 -------------------- - All strings : 17474 + All strings : 17471 1 % are translated ++++++ yast2-trans-my-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-my-3.1.0/po/installation.my.po new/yast2-trans-my-3.1.0/po/installation.my.po --- old/yast2-trans-my-3.1.0/po/installation.my.po 2014-10-29 16:58:03.000000000 +0100 +++ new/yast2-trans-my-3.1.0/po/installation.my.po 2015-04-20 17:58:37.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2002-07-18 14:04+0200\n" "Last-Translator: <i18n(a)suse.de>\n" "Language-Team: Burmese/Myanmar <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-my-3.1.0/po/status.txt new/yast2-trans-my-3.1.0/po/status.txt --- old/yast2-trans-my-3.1.0/po/status.txt 2014-12-16 14:08:23.000000000 +0100 +++ new/yast2-trans-my-3.1.0/po/status.txt 2015-04-20 17:58:38.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 Fuzzy : 0 -Untranslated : 17474 +Untranslated : 17471 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-nb-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nb-3.1.0/po/installation.nb.po new/yast2-trans-nb-3.1.0/po/installation.nb.po --- old/yast2-trans-nb-3.1.0/po/installation.nb.po 2014-10-29 16:50:00.000000000 +0100 +++ new/yast2-trans-nb-3.1.0/po/installation.nb.po 2015-04-20 17:46:19.000000000 +0200 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2011-01-13 22:52+0100\n" "Last-Translator: Olav Pettershagen <olav.pet(a)gmail.com>\n" "Language-Team: Norwegian Bokmål <opensuse-translation(a)opensuse.org>\n" @@ -25,16 +25,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Prøve" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Prøve" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -59,15 +49,19 @@ "trenger en profil for å vite hvordan det installerte systemet skal se ut. Når du krysser av for dette,\n" "blir en profil for gjeldende system lagret i <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Lagrer systemoppsettet..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -75,27 +69,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopierer filer til installert system..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopierer loggfiler til installert system..." @@ -1075,7 +1065,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Endre..." @@ -1449,31 +1439,31 @@ "Avbryter installasjonen." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Fjernet" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktivert" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Deaktivert" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Tidligere brukte pakkebrønner" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1482,27 +1472,27 @@ "du oppgraderer nå:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Gjeldende status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Pakkebrønn" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Nettadresse" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Endre status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1511,7 +1501,7 @@ "på systemet du oppgraderer nå. Aktiver pakkebrønnene du vil bruke under oppgraderingsprosessen." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1520,30 +1510,30 @@ "Endre status-knappen eller ved å dobbeltklikke på et element i tabellen." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Klikk på Endre...-knappen for å endre nettadressen." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Ukjent" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Nettad&resse for pakkebrønn" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Nettverket er ikke satt opp" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1552,49 +1542,49 @@ "Vil du sette opp dette?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Legger til og fjerne pakkebrønner..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Pakkebrønner legges til og fjernes." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Fjern ubrukte pakkebrønner" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Fjerner ubrukte pakkebrønner..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Legg til aktiverte pakkebrønner" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Legger til aktiverte pakkebrønner..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Legg til deaktiverte pakkebrønner" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Legger til deaktiverte pakkebrønner..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Bruk riktig medium" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1608,7 +1598,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1623,7 +1613,7 @@ "Pakkebrønnen vil bli lagt til med deaktivert status." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1635,7 +1625,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1647,7 +1637,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1658,7 +1648,7 @@ "Adresse: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1771,11 +1761,6 @@ msgstr "Lagrer sikkerhetsinnstillinger..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Lagrer innstillinger for oppstartsskript..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Lagrer maskinvarekonfigurasjon..." @@ -1945,17 +1930,17 @@ "Merk: Du må kanskje legge inn noen typer informasjon på nytt." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Bekreft installasjon" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "All nødvendig informasjon for grunninstallasjonen er nå fullført." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1968,7 +1953,7 @@ "installasjonsinnstillingene i tidligere dialoger." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1980,22 +1965,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Hvis du er usikker, kan du gå tilbake og kontrollere innstillingene." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Bekreft oppgradering" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "All nødvendig informasjon for å utføre oppgraderingen er nå fullført." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2006,7 +1991,7 @@ "i henhold til innstillingene i de tidligere dialogene." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Start &oppgradering" @@ -2100,6 +2085,15 @@ "Installasjonsprogrammet kunne ikke løse pakkekonfliktene automatisk.\n" "Pakkebehandleren vil bli åpnet, slik at du kan løse dem manuelt." +#~ msgid "Dummy" +#~ msgstr "Prøve" + +#~ msgid "&Dummy" +#~ msgstr "&Prøve" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Lagrer innstillinger for oppstartsskript..." + #~ msgid "License needs to be accepted" #~ msgstr "Lisensen må godkjennes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nb-3.1.0/po/status.txt new/yast2-trans-nb-3.1.0/po/status.txt --- old/yast2-trans-nb-3.1.0/po/status.txt 2014-12-16 15:23:46.000000000 +0100 +++ new/yast2-trans-nb-3.1.0/po/status.txt 2015-04-20 17:46:54.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 16303 +Translated : 16300 Fuzzy : 429 Untranslated : 742 -------------------- - All strings : 17474 + All strings : 17471 93 % are translated ++++++ yast2-trans-nds-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nds-3.1.0/po/installation.nds.po new/yast2-trans-nds-3.1.0/po/installation.nds.po --- old/yast2-trans-nds-3.1.0/po/installation.nds.po 2014-10-29 16:50:48.000000000 +0100 +++ new/yast2-trans-nds-3.1.0/po/installation.nds.po 2015-04-20 17:52:30.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-07-07 12:22+0100\n" "Last-Translator: Nils-Christoph Fiedler <ncfiedler(a)gnome.org>\n" "Language-Team: Low German <nds-lowgerman(a)lists.sourceforge.net>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,15 +29,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing YaST Configuration..." msgid "Clone System Configuration" msgstr "Schrieve YaST Instellen..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "Writing YaST Configuration..." msgid "&Clone System Configuration" @@ -55,27 +49,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -971,7 +961,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Ännern..." @@ -1303,144 +1293,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Löscht" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktivert" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Deaktivert" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktueller Tostand" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Sammlung" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Tostand ännern" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Unbekannt" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Sammlungs-URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1450,7 +1440,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1460,7 +1450,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1469,7 +1459,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1478,7 +1468,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1486,7 +1476,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1594,11 +1584,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1735,17 +1720,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "De Installatschoon tostimmen" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1754,7 +1739,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1763,22 +1748,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Dem Opfrischen tostimmen" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1786,7 +1771,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Starte &Opfrischen" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nds-3.1.0/po/status.txt new/yast2-trans-nds-3.1.0/po/status.txt --- old/yast2-trans-nds-3.1.0/po/status.txt 2014-12-16 14:19:47.000000000 +0100 +++ new/yast2-trans-nds-3.1.0/po/status.txt 2015-04-20 17:52:31.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 223 Fuzzy : 275 -Untranslated : 16976 +Untranslated : 16973 -------------------- - All strings : 17474 + All strings : 17471 1 % are translated ++++++ yast2-trans-nl-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nl-3.1.0/po/installation.nl.po new/yast2-trans-nl-3.1.0/po/installation.nl.po --- old/yast2-trans-nl-3.1.0/po/installation.nl.po 2014-10-29 16:39:43.000000000 +0100 +++ new/yast2-trans-nl-3.1.0/po/installation.nl.po 2015-04-20 17:54:01.000000000 +0200 @@ -10,13 +10,13 @@ # Rinse de Vries <rinsedevries(a)kde.nl>, 2005, 2006, 2007, 2008. # R.F. Pels <ruurd(a)tiscali.nl>, 2006. # Daniël Huisman <d.d.huisman(a)gmail.com>, 2007. -# Freek de Kruijf <freek(a)opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Freek de Kruijf <freek(a)opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-03 20:13+0200\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-07 10:02+0100\n" "Last-Translator: Freek de Kruijf <freek(a)opensuse.org>\n" "Language-Team: Dutch <opensuse-nl(a)opensuse.org>\n" "Language: nl\n" @@ -26,16 +26,6 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -55,39 +45,39 @@ "systeem eruit komt te zien. Als deze optie is geselecteerd, wordt een profiel van het huidige\n" "systeem opgeslagen in <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "AutoYaST profiel aan het eind van de installatie wegschrijven naar /root/autoinst.xmlat?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Systeemconfiguratie klonen" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "Systeemconfiguratie &klonen" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Het AutoYaST profiel zal weggeschreven worden onder /root/autoinst.xml (<a href=\"%1\">het niet wegschrijven</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Het AutoYaST profiel zal niet weggeschreven worden onder /root/autoinstxml (<a href=\"\">het wel wegschrijven</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "AutoYaST profiel wegschrijven onder /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiëren van bestanden naar geïnstalleerd systeem..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiëren van logbestanden naar het geïnstalleerde systeem..." @@ -1071,7 +1061,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Wijzigen..." @@ -1441,31 +1431,31 @@ "De installatie wordt afgebroken." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Verwijderd" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Ingeschakeld" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Uitgeschakeld" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Eerder gebruikte softwarebronnen" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1474,27 +1464,27 @@ "dat u aan het opwaarderen bent:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Huidige status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Bron" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "S&tatus omschakelen" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1503,7 +1493,7 @@ "op het systeem dat u aan het opwaarderen bent. Activeer diegenen die u wilt gebruiken bij het opwaardeerproces." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1513,30 +1503,30 @@ "bijhorende item in de tabel." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Om een URL-adres te wijzigen, klik op de knop Wijzigen...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Onbekend" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL van installatieb&ron" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Netwerk is niet geconfigureerd" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1546,17 +1536,17 @@ # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:162 #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Bronnen toevoegen en verwijderen..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "De installatiebronnen worden toegevoegd en/of verwijderd." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Verwijder ongebruikte installatiebronnen" @@ -1564,34 +1554,34 @@ # /usr/lib/YaST2/clients/dialup_detection.ycp:269 # /usr/lib/YaST2/clients/dialup_detection.ycp:294 #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Ongebruikte installatiebronnen worden verwijderd..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Voeg ingeschakelde installatiebronnen toe" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Toevoegen van ingeschakelde installatiebronnen..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Voeg uitgeschakelde installatiebronnen toe" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Toevoegen van uitgeschakelde installatiebronnen..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Juiste medium gevraagd" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1605,7 +1595,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1620,7 +1610,7 @@ "Installatiebron zal toegevoegd worden in uitgeschakelde status." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1632,7 +1622,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1644,7 +1634,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1655,7 +1645,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1774,11 +1764,6 @@ msgstr "Beveiligingsinstellingen worden opgeslagen..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Instellingen van opstartscripts worden opgeslagen..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Hardwareconfiguratie wordt opgeslagen..." @@ -1950,17 +1935,17 @@ "Opmerking, sommige informatie dient u opnieuw op te geven." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Installatie bevestigen" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "De benodigde informatie voor de basis-installatie is nu compleet." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1972,7 +1957,7 @@ "worden (waarbij de bestaande gegevens op deze partities verloren zullen gaan)." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1983,24 +1968,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Indien onzeker, ga terug en controleer de instellingen." # workflow: "Software-Auswahl" # -ke- #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Bijwerken bevestigen" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Benodigde informatie om het bijwerken uit te voeren is nu gereed." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2011,7 +1996,7 @@ "worden volgens de instellingen van de voorgaande dialogen." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Bijwerken starten" @@ -2095,6 +2080,15 @@ "De installatie was niet in staat om pakketafhankelijkheden automatisch op te lossen.\n" "De softwarebeheerder zal voor u geopend worden om deze handmatig op te lossen." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Instellingen van opstartscripts worden opgeslagen..." + # /usr/lib/YaST2/clients/inst_language.ycp:99 #~ msgid "Search for Linux partitions" #~ msgstr "Zoeken naar Linux-partities" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nl-3.1.0/po/status.txt new/yast2-trans-nl-3.1.0/po/status.txt --- old/yast2-trans-nl-3.1.0/po/status.txt 2014-12-16 15:06:09.000000000 +0100 +++ new/yast2-trans-nl-3.1.0/po/status.txt 2015-04-20 17:54:38.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17474 +Translated : 17471 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-nn-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nn-3.1.0/po/installation.nn.po new/yast2-trans-nn-3.1.0/po/installation.nn.po --- old/yast2-trans-nn-3.1.0/po/installation.nn.po 2014-10-29 16:44:23.000000000 +0100 +++ new/yast2-trans-nn-3.1.0/po/installation.nn.po 2015-04-20 18:07:54.000000000 +0200 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-09-28 11:07+0200\n" "Last-Translator: Karl Ove Hufthammer <karl(a)huftis.org>\n" "Language-Team: Norwegian Nynorsk <i18n-nn(a)lister.ping.uio.no>\n" @@ -14,16 +14,6 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Prøve" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Prøve" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -48,15 +38,19 @@ "AutoYaST treng en profil for å veta korleis det installerte systemet skal sjå ut.\n" "Når du kryssar av for dette, vert det lagra ein profil for systemet i <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Lagrar systemoppsett" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -64,27 +58,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopierer filer til installert system …" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopierer loggfiler til installert system …" @@ -1065,7 +1055,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Endra …" @@ -1439,31 +1429,31 @@ "Avbryt installeringa." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Fjerna" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "På" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Av" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Tidlegare brukte pakkebrønnar" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1472,27 +1462,27 @@ "systemet du oppgraderer:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Gjeldande status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Pakkebrønn" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Adresse" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Byt status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1502,7 +1492,7 @@ "du vil bruka under oppgraderinga." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1511,30 +1501,30 @@ "ei adresse. Du kan òg dobbeltklikka på tabellrada." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Trykk Endra å endra nettadressa." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Ukjent" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Adresse til pakkebrønn" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Nettverket er ikkje sett opp" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1543,49 +1533,49 @@ "Vil du setja opp dette?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Legg/fjernar pakkebrønnar …" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Pakkebrønnar vert til lagde til / fjerna." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Fjern ubrukte pakkebrønnar" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Fjernar ubrukte pakkebrønnar …" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Legg til aktiverte pakkebrønnar" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Legg til aktiverte pakkebrønnar …" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Legg til deaktiverte pakkebrønnar" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Legg til deaktiverte pakkebrønnar …" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Bruk rett medium" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1599,7 +1589,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1614,7 +1604,7 @@ "Pakkebrønnen vert lagt til, men ikkje aktivert." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1626,7 +1616,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1638,7 +1628,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1649,7 +1639,7 @@ "Adresse: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1764,11 +1754,6 @@ msgstr "Lagrar tryggleiksoppsett …" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Lagrar oppsett for oppstartsskript …" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Lagrar maskinvareoppsett …" @@ -1938,17 +1923,17 @@ "Merk at du kanskje må leggja inn noko informasjon på nytt." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Stadfest installering" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "All nødvendig informasjon for grunninstallasjonen er no klar." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1959,7 +1944,7 @@ "sletta eller formaterte (slik at alle data der vert sletta)i samsvar med vala i dei tidlegare stega i installeringsprosessen." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1970,22 +1955,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Viss du er usikker, kan du gå tilbake og sjå over desse vala på nytt." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Stadfest oppgradering" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "All nødvendig informasjon for oppgraderinga er no klar." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1996,7 +1981,7 @@ "i samsvar med vala i dei tidlegare stega i installeringsprosessen." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Start &oppgradering" @@ -2094,6 +2079,15 @@ "Klarte ikkje løysa pakkekonfliktene automatisk.\n" "Opnar pakkehandsamaren, slik at du kan løysa dei manuelt." +#~ msgid "Dummy" +#~ msgstr "Prøve" + +#~ msgid "&Dummy" +#~ msgstr "&Prøve" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Lagrar oppsett for oppstartsskript …" + #~ msgid "License needs to be accepted" #~ msgstr "Lisensavtala må godkjennast" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-nn-3.1.0/po/status.txt new/yast2-trans-nn-3.1.0/po/status.txt --- old/yast2-trans-nn-3.1.0/po/status.txt 2014-12-16 14:12:44.000000000 +0100 +++ new/yast2-trans-nn-3.1.0/po/status.txt 2015-04-20 18:07:55.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 1917 +Translated : 1914 Fuzzy : 13297 Untranslated : 2260 -------------------- - All strings : 17474 + All strings : 17471 11 % are translated ++++++ yast2-trans-pa-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pa-3.1.0/po/installation.pa.po new/yast2-trans-pa-3.1.0/po/installation.pa.po --- old/yast2-trans-pa-3.1.0/po/installation.pa.po 2014-10-29 16:48:52.000000000 +0100 +++ new/yast2-trans-pa-3.1.0/po/installation.pa.po 2015-04-20 18:02:39.000000000 +0200 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: installation.pa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2011-01-12 23:34+0530\n" "Last-Translator: A S Alam <aalam(a)users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users(a)lists.sf.net>\n" @@ -25,16 +25,6 @@ "X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "ਫ਼ਰਜ਼ੀ" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "ਫ਼ਰਜ਼ੀ(&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -49,15 +39,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "ਸਿਸਟਮ ਸੰਰਚਨਾ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -65,27 +59,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਿਸਟਮ 'ਤੇ ਫਾਇਲਾਂ ਕਾਪੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "ਇੰਸਟਾਲ ਕੀਤੇ ਸਿਟਟਮ 'ਤੇ ਲਾਗ ਫਾਇਲਾਂ ਕਾਪੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..." @@ -1116,7 +1106,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "ਬਦਲੋ(&C)..." @@ -1504,31 +1494,31 @@ "ਇੰਸਟਾਲੇਸ਼ਨ ਅਧੂਰੀ ਛੱਡੀ ਜਾ ਰਹੀ ਹੈ।" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "ਹਟਾਏ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "ਯੋਗ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "ਅਯੋਗ" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "ਪਹਿਲਾਂ ਵਰਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1537,27 +1527,27 @@ "ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਰ ਰਹੇ ਹਨ:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "ਮੌਜੂਦਾ ਹਾਲਤ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "ਰਿਪੋਜ਼ਟਰੀ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "ਹਾਲਤ ਬਦਲੋ(&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1566,7 +1556,7 @@ "ਕਰਨ ਦੌਰਾਨ ਸਿਸਟਮ ਉੱਤੇ ਲੱਭੀਆਂ, ਵੇਖ ਸਕਦੇ ਹੋ। ਜਿੰਨ੍ਹਾਂ ਨੂੰ ਤੁਸੀਂ ਅੱਪਗਰੇਡ ਕਰਨ ਦੌਰਾਨਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਨੂੰ ਯੋਗ ਕਰੋ।" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1579,30 +1569,30 @@ "ਹਾਲਤ ਬਦਲੋ ਬਟਨ ਨੂੰ ਕਲਿੱਕ ਕਰੋ ਜਾਂ ਢੁੱਕਵੀਂ ਟੇਬਲ ਆਈਟਮ ਨੂੰ ਡਬਲ-ਕਲਿੱਕ ਕਰੋ" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "URL ਬਦਲਣ ਲਈ ਬਦਲੋ... ਬਟਨ ਦੱਬੋ।" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "ਅਣਜਾਣ" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "ਰਿਪੋਜ਼ਟਰੀ U&RL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "ਨੈੱਟਵਰਕ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1611,51 +1601,51 @@ "ਇਸ ਦੀ ਸੰਰਚਨਾ ਕਰਨੀ ਹੈ?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ ਕੀਤੀਆਂ ਅਤੇ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ ਹੋਣ ਅਤੇ ਹਟਾਏ ਜਾਣ ਤੱਕ ਉਡੀਕੋ ਜੀ।" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "ਨਾ ਵਰਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ ਹਟਾਓ" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "ਨਾ-ਵਰਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ ਹਟਾਈਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "ਯੋਗ ਕੀਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "ਯੋਗ ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "ਆਯੋਗ ਕੀਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "ਆਯੋਗ ਕੀਤੀਆਂ ਰਿਪੋਜ਼ਟਰੀਆਂ ਸ਼ਾਮਲ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1665,7 +1655,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1675,7 +1665,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1692,7 +1682,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1704,7 +1694,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1720,7 +1710,7 @@ "URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1846,11 +1836,6 @@ msgstr "ਸੁਰੱਖਿਆ ਸੈਟਿੰਗ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "ਬੂਟ ਸਕ੍ਰਿਪਟ ਸੈਟਿੰਗ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "ਜੰਤਰ ਜਾਣਕਾਰੀ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ..." @@ -2045,19 +2030,19 @@ "ਨੋਟ: ਤੁਹਾਨੂੰ ਕੁਝ ਜਾਣਕਾਰੀ ਫੇਰ ਦੇਣੀ ਪੈ ਸਕਦੀ ਹੈ।" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਦੀ ਪੁਸ਼ਟੀ" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "ਮੁੱਢਲੀ ਇੰਸਟਾਲੇਸ਼ਨ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰਨ ਲਈ ਗਈ ਹੈ।" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2070,7 +2055,7 @@ "ਪਿੱਛੇ ਲੰਘੇ ਡਾਈਲਾਗਾਂ ਵਿੱਚ ਕੀਤੀ ਇੰਸਟਾਲੇਸ਼ਨ ਸੈਟਿੰਗ ਅਨੁਸਾਰ ਕੀਤੇ ਜਾਣਗੇ।" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2082,24 +2067,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "ਜੇਕਰ ਤੁਸੀਂ ਹਾਲੇ ਯਕੀਨੀ ਨਹੀਂ ਹੋ ਤਾਂ ਪਿੱਛੇ ਜਾਓ ਅਤੇ ਸੈਟਿੰਗ ਦੀ ਜਾਂਚ ਕਰੋ।" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "ਅੱਪਡੇਟ ਪੁਸ਼ਟੀ" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਲੋੜੀਦੀ ਸਾਰੀ ਜਾਣਕਾਰੀ ਇੱਕਠੀ ਕਰ ਲਈ ਗਈ ਹੈ।" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2110,7 +2095,7 @@ "ਤੁਹਾਡੀ ਹਾਰਡ ਡਿਸਕ ਤੇ ਡਾਟਾ ਲਿਖਿਆ ਜਾਵੇਗਾ।" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "ਅੱਪਡੇਟ ਸ਼ੁਰੂ(&U)" @@ -2210,6 +2195,15 @@ "ਇੰਸਟਾਲੇਸ਼ਨ ਪੈਕੇਜ ਨਿਰਭਰਤਾ ਆਟੋਮੈਟਿਕ ਹੱਲ਼ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।\n" "ਪੈਕੇਜ ਮੈਨਜੇਰ ਨੂੰ ਤੁਹਾਡੇ ਸਾਹਮਣੇ ਖੋਲ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ਤਾਂ ਕਿ ਖੁਦ ਹੱਲ਼ ਕਰ ਸਕੋ।" +#~ msgid "Dummy" +#~ msgstr "ਫ਼ਰਜ਼ੀ" + +#~ msgid "&Dummy" +#~ msgstr "ਫ਼ਰਜ਼ੀ(&D)" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "ਬੂਟ ਸਕ੍ਰਿਪਟ ਸੈਟਿੰਗ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ..." + #~ msgid "Search for Linux partitions" #~ msgstr "ਲੀਨਕਸ ਪਾਰਟੀਸ਼ਨਾਂ ਦੀ ਖੋਜ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pa-3.1.0/po/status.txt new/yast2-trans-pa-3.1.0/po/status.txt --- old/yast2-trans-pa-3.1.0/po/status.txt 2014-12-16 15:16:19.000000000 +0100 +++ new/yast2-trans-pa-3.1.0/po/status.txt 2015-04-20 18:03:04.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 10647 +Translated : 10644 Fuzzy : 3278 Untranslated : 3549 -------------------- - All strings : 17474 + All strings : 17471 61 % are translated ++++++ yast2-trans-pl-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pl-3.1.0/po/installation.pl.po new/yast2-trans-pl-3.1.0/po/installation.pl.po --- old/yast2-trans-pl-3.1.0/po/installation.pl.po 2014-10-29 16:47:11.000000000 +0100 +++ new/yast2-trans-pl-3.1.0/po/installation.pl.po 2015-04-20 17:51:08.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-09-16 17:56+0200\n" "Last-Translator: Marcin Zajączkowski\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Pusty" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Pusty" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -46,41 +36,41 @@ "AutoYaST wymaga tzw. profilu (zapisane wszystkie wybory, pakiety itp), aby wiedzieć, jak ma wyglądać zainstalowany system. Po\n" " zaznaczeniu tej opcji, profil obecnego systemu zostanie zachowany w pliku <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "Zapisywanie konfiguracji systemu..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "&Pomiń konfigurację" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiowanie plików do instalowanego systemu..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiowanie plików dziennika do instalowanego systemu..." @@ -1057,7 +1047,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Zmień..." @@ -1436,31 +1426,31 @@ "Instalacja przerwana." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Usunięto" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Włączone" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Wyłączone" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Używane wcześniej repozytoria" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1469,34 +1459,34 @@ "jest aktualizowane:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktualny stan" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repozytorium" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Adres URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Zmień s&tatus" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "Tutaj można zobaczyć wszystkie repozytoria oprogramowania znalezione w aktualizowanym systemie. Należy włączyć te, które mają zostać dołączone do procesu aktualizacji." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1505,30 +1495,30 @@ "Zmień status lub dwukrotnie kliknąć dany wpis w liście." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Aby zmienić adres URL, proszę kliknąć przycisk Zmień...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nieznane" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Adres U&RL repozytorium" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Sieć nie jest skonfigurowana" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1537,49 +1527,49 @@ "Skonfigurować teraz połączenie?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Dodawanie i usuwanie repozytoriów..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Trwa dodawanie i usuwanie repozytoriów." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Usunięcie nieużywanych repozytoriów" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Usuwanie nieużywanych repozytoriów..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Dodanie włączonych repozytoriów" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Dodawanie włączonych repozytoriów..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Dodanie wyłączonych repozytoriów" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Dodawanie wyłączonych repozytoriów..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Proszę wybrać poprawny nośnik instalacyjny" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1593,7 +1583,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1608,7 +1598,7 @@ "Repozytorium zostanie dodane jako wyłączone." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1620,7 +1610,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1632,7 +1622,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1643,7 +1633,7 @@ "Adres URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1756,11 +1746,6 @@ msgstr "Zapisywanie ustawień zabezpieczeń..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Zapisywanie ustawień skryptów rozruchowych..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Zapisywanie konfiguracji sprzętu..." @@ -1933,17 +1918,17 @@ "niektórych informacji." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Zatwierdzenie instalacji" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Wszystkie informacje wymagane do instalacji podstawowej zostały zebrane." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1956,7 +1941,7 @@ "partycji), zgodnie z ustawieniami instalacji z poprzednich okien." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1968,22 +1953,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "W razie wątpliwości proszę wrócić do poprzednich okien i sprawdzić ustawienia." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Zatwierdzenie aktualizacji" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Wszystkie informacje wymagane do aktualizacji zostały zebrane." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1994,7 +1979,7 @@ "nadpisane, zgodnie z ustawieniami z poprzednich okien." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Uruchom aktualizację" @@ -2083,6 +2068,15 @@ "Instalator nie mógł rozwiązać automatycznie zależności pakietów.\n" "Zostanie uruchomiony menedżer pakietów, aby rozwiązać zależności ręcznie." +#~ msgid "Dummy" +#~ msgstr "Pusty" + +#~ msgid "&Dummy" +#~ msgstr "&Pusty" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Zapisywanie ustawień skryptów rozruchowych..." + #~ msgid "Search for Linux partitions" #~ msgstr "Wyszukanie partycji linuksowych" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pl-3.1.0/po/status.txt new/yast2-trans-pl-3.1.0/po/status.txt --- old/yast2-trans-pl-3.1.0/po/status.txt 2014-12-16 15:25:27.000000000 +0100 +++ new/yast2-trans-pl-3.1.0/po/status.txt 2015-04-20 17:51:45.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 16519 +Translated : 16516 Fuzzy : 316 Untranslated : 639 -------------------- - All strings : 17474 + All strings : 17471 95 % are translated ++++++ yast2-trans-pt-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt-3.1.0/po/installation.pt.po new/yast2-trans-pt-3.1.0/po/installation.pt.po --- old/yast2-trans-pt-3.1.0/po/installation.pt.po 2014-10-29 16:43:39.000000000 +0100 +++ new/yast2-trans-pt-3.1.0/po/installation.pt.po 2015-04-20 17:58:10.000000000 +0200 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: installation.pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2008-05-19 22:08+0100\n" "Last-Translator: Carlos Gonçalves <cgoncalves(a)opensuse.org>\n" "Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n" @@ -24,16 +24,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Fictício" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Fictício" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -59,15 +49,19 @@ "sistema terá, ele necessita de um perfil. Com a caixa de marcação seleccionada,\n" "será armazenado um perfil do sistema actual, em <tt>/root/autoyast.xml.</tt>" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "A escrever a configuração do sistema" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -75,27 +69,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "A Copiar ficheiros para o sistema instalado..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "A copiar os registos de diário para o sistema instalado..." @@ -1136,7 +1126,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Alterar..." @@ -1519,33 +1509,33 @@ # /usr/lib/YaST2/clients/logcontrol.ycp:34 #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Remover" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Activado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Inactivo" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repositórios Anteriormente Utilizados" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1554,27 +1544,27 @@ "que está de momento a actualizar:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Estado Actual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repositório" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Alterar &Estado" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1583,7 +1573,7 @@ "no sistema que de momento está a actualizar. Active aqueles que deseja incluir no processo de actualização." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1596,30 +1586,30 @@ "botão Alterar Estado ou clique duas vezes no respectivo item da tabela." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Para alterar o URL, clique no botão Alterar...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Desconhecido" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL do &Repositório" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "A Rede não está Configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1628,59 +1618,59 @@ "Deseja configurá-la?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "A adicionar e a remover os repositórios..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Por favor aguarde enquanto os repositórios são adicionados e removidos." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Remover Repositórios" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "A ler os repositórios configurados..." # /usr/lib/YaST2/clients/menu.ycp:43 -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Repositórios Disponíveis" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "A adicionar Repositórios..." # /usr/lib/YaST2/clients/menu.ycp:43 -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Repositórios Disponíveis" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "A adicionar Repositórios..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1690,7 +1680,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1700,7 +1690,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1717,7 +1707,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1729,7 +1719,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1745,7 +1735,7 @@ "URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1872,13 +1862,6 @@ msgstr "A ler definições de segurança..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "A Guardar definições da placa de som..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "A gravar a configuração do hardware..." @@ -2066,19 +2049,19 @@ "Nota: Poderá ter de digitar novamente alguma informação." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmar Instalação" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Toda a informação necessária para a instalação base está agora completa." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2092,7 +2075,7 @@ "de acordo com as definições da instalação nas caixas de diálogo anteriores." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2105,24 +2088,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Se não tem a certeza, volte atrás e verifique as definições." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmar Actualização" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Toda a informação necessária para realizar a actualização está agora completa." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2134,7 +2117,7 @@ "de acordo com as definições das caixas de diálogo anteriores." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Iniciar &Actualização" @@ -2228,6 +2211,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Fictício" + +#~ msgid "&Dummy" +#~ msgstr "&Fictício" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "A Guardar definições da placa de som..." + #~ msgid "Search for Linux partitions" #~ msgstr "Procurar Partições Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt-3.1.0/po/status.txt new/yast2-trans-pt-3.1.0/po/status.txt --- old/yast2-trans-pt-3.1.0/po/status.txt 2014-12-16 14:11:07.000000000 +0100 +++ new/yast2-trans-pt-3.1.0/po/status.txt 2015-04-20 17:58:33.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 12064 -Fuzzy : 3138 +Translated : 12062 +Fuzzy : 3137 Untranslated : 2272 -------------------- - All strings : 17474 + All strings : 17471 69 % are translated ++++++ yast2-trans-pt_BR-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt_BR-3.1.0/po/auth-server.pt_BR.po new/yast2-trans-pt_BR-3.1.0/po/auth-server.pt_BR.po --- old/yast2-trans-pt_BR-3.1.0/po/auth-server.pt_BR.po 2014-12-16 14:55:27.000000000 +0100 +++ new/yast2-trans-pt_BR-3.1.0/po/auth-server.pt_BR.po 2015-04-20 18:10:21.000000000 +0200 @@ -3,13 +3,13 @@ # Copyright (C) 2014 SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the opensuse-i package. # -# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2014. +# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-11-06 10:47-0200\n" +"PO-Revision-Date: 2015-02-19 08:59-0200\n" "Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n" "Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n" "Language: pt_BR\n" @@ -22,7 +22,7 @@ #. Command line help text for the Xldap-server module #: src/clients/auth-server.rb:37 msgid "Configuration of Authentication server" -msgstr "" +msgstr "Configuração do servidor de autenticação" #: src/clients/auth-server.rb:49 msgid "Enable/Disable the service" @@ -276,7 +276,7 @@ #. LdapServer summary dialog caption #: src/include/auth-server/complex.rb:231 msgid "Authentication Server Configuration Summary" -msgstr "" +msgstr "Resumo da configuração do servidor de autenticação" #. heading for all dialogs #. FIXME: adapt to your needs @@ -288,7 +288,7 @@ #: src/include/auth-server/wizards.rb:205 #: src/include/auth-server/wizards.rb:298 msgid "Authentication Server Configuration" -msgstr "" +msgstr "Configuração do servidor de autenticação" #. ********************* #. * dialog functions ** @@ -394,6 +394,9 @@ "YaST2 cannot enable Kerberos\n" "without installing the package." msgstr "" +"O pacote '%1' não está disponível.\n" +"O YaST2 não pode habilitar o Kerberos\n" +"sem instalar o pacote." #. caption #: src/include/auth-server/dialogs.rb:595 @@ -668,6 +671,8 @@ "LDAPS enables the \"LDAP over SSL (ldaps)\" interface for SSL protected\n" "connections on port 636. This only works if you have a server certificate configured (see \"Global Settings\"/\"TLS Settings\").\n" msgstr "" +"LDAPS habilita a interface \"LDAP sobre SSL (ldaps)\" para conexões protegidas\n" +"por SSL na porta 636. Isto funciona apenas se você tem um servidor de certificados configurado (veja \"Configurações globais\"/\"Configurações do TLS\").\n" #: src/include/auth-server/helps.rb:36 msgid "" @@ -2214,7 +2219,7 @@ #: src/include/auth-server/widgets.rb:70 msgid "&Start Kerberos Server" -msgstr "" +msgstr "&Iniciar o servidor Kerberos" #: src/include/auth-server/widgets.rb:94 msgid "Protocol Listeners" @@ -2882,7 +2887,7 @@ #: src/modules/AuthServer.pm:355 msgid "Initializing Authentication Server Configuration" -msgstr "" +msgstr "Inicializando a configuração do servidor de autenticação" #: src/modules/AuthServer.pm:390 msgid "" @@ -2961,15 +2966,15 @@ #: src/modules/AuthServer.pm:1569 msgid "Enabling Kerberos Server" -msgstr "" +msgstr "Habilitando o servidor Kerberos" #: src/modules/AuthServer.pm:1570 msgid "Starting Kerberos Server" -msgstr "" +msgstr "Iniciando o servidor Kerberos" #: src/modules/AuthServer.pm:1572 msgid "Activating Kerberos Server" -msgstr "" +msgstr "Ativando o servidor Kerberos" #: src/modules/AuthServer.pm:1602 msgid "Writing Startup Configuration" @@ -2993,11 +2998,11 @@ #: src/modules/AuthServer.pm:1607 msgid "Saving Kerberos Configuration" -msgstr "" +msgstr "Salvando a configuração do Kerberos" #: src/modules/AuthServer.pm:1608 msgid "Writing Auth Server Configuration" -msgstr "" +msgstr "Salvando a configuração do servidor de autenticação" #: src/modules/AuthServer.pm:1616 src/modules/AuthServer.pm:2569 msgid "Switch from slapd.conf to config backend failed." @@ -3041,15 +3046,15 @@ #. in the system, stop it and ignore any configuration changes. #: src/modules/AuthServer.pm:1805 msgid "Stopping Kerberos Server" -msgstr "" +msgstr "Parando o servidor Kerberos" #: src/modules/AuthServer.pm:1806 msgid "Disabling Kerberos Server" -msgstr "" +msgstr "Desabilitando o servidor Kerberos" #: src/modules/AuthServer.pm:1808 msgid "De-activating Kerberos Server" -msgstr "" +msgstr "Desativando o servidor Kerberos" #: src/modules/AuthServer.pm:1825 msgid "Writing Sysconfig files" @@ -3081,7 +3086,7 @@ #: src/modules/AuthServer.pm:1834 msgid "Writing AuthServer Configuration" -msgstr "" +msgstr "Salvando a configuração do servidor de autenticação" #: src/modules/AuthServer.pm:1931 msgid "Creating base objects failed." @@ -3105,7 +3110,7 @@ #: src/modules/AuthServer.pm:2213 msgid "Start Kerberos Server: " -msgstr "" +msgstr "Iniciar o servidor Kerberos: " #: src/modules/AuthServer.pm:2215 msgid "Create the following databases:" @@ -3280,12 +3285,12 @@ #: src/modules/AuthServer.pm:4896 #, perl-format msgid "Certificate File: \"%s\" does not exist." -msgstr "" +msgstr "Arquivo de certificado: \"%s\" não existe." #: src/modules/AuthServer.pm:4901 #, perl-format msgid "Certificate Key File: \"%s\" does not exist." -msgstr "" +msgstr "Chave do arquivo de certificado: \"%s\" não existe." #: src/modules/AuthServer.pm:4982 src/modules/AuthServer.pm:4992 msgid "Writing to krb5.conf failed." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt_BR-3.1.0/po/cluster.pt_BR.po new/yast2-trans-pt_BR-3.1.0/po/cluster.pt_BR.po --- old/yast2-trans-pt_BR-3.1.0/po/cluster.pt_BR.po 2014-11-03 17:13:32.000000000 +0100 +++ new/yast2-trans-pt_BR-3.1.0/po/cluster.pt_BR.po 2015-04-20 18:10:33.000000000 +0200 @@ -5,14 +5,14 @@ # # Karl Eichwalder <ke(a)suse.de>, 1999. # Ralf Lanz <rlanz(a)genix.com.br>, 1999. -# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2013, 2014. +# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2013, 2014, 2015. # Isis Binder <isis.binder(a)gmail.com>, 2013. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-30 10:45-0200\n" +"PO-Revision-Date: 2015-02-19 09:07-0200\n" "Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n" "Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n" "Language: pt_BR\n" @@ -122,11 +122,11 @@ #: src/include/cluster/dialogs.rb:197 msgid "The cluster name has to be fulfilled" -msgstr "" +msgstr "O nome do cluster tem que ser preenchido" #: src/include/cluster/dialogs.rb:214 msgid "The Member Address has to be fulfilled" -msgstr "" +msgstr "O endereço do membro tem que ser preenchido" #. BNC#880242, expected_votes must have value when "udp" #: src/include/cluster/dialogs.rb:220 @@ -138,17 +138,15 @@ #: src/include/cluster/dialogs.rb:226 src/include/cluster/dialogs.rb:254 #: src/include/cluster/dialogs.rb:1463 msgid "The Multicast Address has to be fulfilled" -msgstr "" +msgstr "O endereço de multicast tem que ser preenchido" #: src/include/cluster/dialogs.rb:236 src/include/cluster/dialogs.rb:264 -#, fuzzy -#| msgid "The value for pos must be a positive integer." msgid "The Multicast port must be a positive integer" -msgstr "O valor para pos deve ser um número inteiro positivo." +msgstr "A porta de multicast deve ser um inteiro positivo" #: src/include/cluster/dialogs.rb:270 msgid "Only passive or active can be chosen if multiple interface used. Set to passive." -msgstr "" +msgstr "Apenas passivo ou ativo pode ser escolhido se múltiplas interfaces são usadas. Definido para passivo." #. BNC#871970, change member address struct to memberaddr #: src/include/cluster/dialogs.rb:439 @@ -201,10 +199,8 @@ msgstr "IP" #: src/include/cluster/dialogs.rb:499 -#, fuzzy -#| msgid "Redundant IP Address" msgid "Redundant IP" -msgstr "Endereço IP redundante" +msgstr "IP redundante" #. BNC#879596, check the corosync.conf format #: src/include/cluster/dialogs.rb:539 @@ -240,11 +236,11 @@ #: src/include/cluster/dialogs.rb:773 msgid "Failed to create /etc/corosync/authkey" -msgstr "" +msgstr "Falha ao criar /etc/corosync/authkey" #: src/include/cluster/dialogs.rb:775 msgid "Create /etc/corosync/authkey succeeded" -msgstr "" +msgstr "/etc/corosync/authkey criado com sucesso" #: src/include/cluster/dialogs.rb:850 src/include/cluster/dialogs.rb:920 msgid "Running" @@ -260,14 +256,10 @@ msgstr "Inicializando" #: src/include/cluster/dialogs.rb:898 -#, fuzzy -#| msgid "On -- Start pacemaker at booting" msgid "On -- Start pacemaker during boot" -msgstr "On -- Iniciar pacemaker durante o Boot" +msgstr "On -- Iniciar pacemaker durante a inicialização" #: src/include/cluster/dialogs.rb:905 -#, fuzzy -#| msgid "Off -- Start pacemaker manually only" msgid "Off -- Start pacemaker manually" msgstr "Off -- Iniciar pacemaker manualmente" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt_BR-3.1.0/po/installation.pt_BR.po new/yast2-trans-pt_BR-3.1.0/po/installation.pt_BR.po --- old/yast2-trans-pt_BR-3.1.0/po/installation.pt_BR.po 2014-10-29 17:00:33.000000000 +0100 +++ new/yast2-trans-pt_BR-3.1.0/po/installation.pt_BR.po 2015-04-20 18:10:12.000000000 +0200 @@ -10,13 +10,13 @@ # Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2008. # Isis Binder <isis.binder(a)gmail.com>, 2008, 2010, 2012. # Rafael Reuber <psico.indie(a)gmail.com>, 2008. -# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.pt_BR\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-16 13:12-0300\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-02-19 08:39-0200\n" "Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n" "Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n" "Language: pt_BR\n" @@ -29,16 +29,6 @@ "X-Poedit-Country: BRAZIL\n" "X-Poedit-SourceCharset: utf-8\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Fictício" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Fictício" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -57,39 +47,39 @@ "usuário. O AutoYaST necessita de um perfil para saber como o sistema instalado deverá parecer.\n" "Se esta opção for selecionada, será armazenado um perfil do sistema atual em <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Gravar o perfil do AutoYaST em /root/autoinst.xmlat no final da instalação?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Clonar configuração do sistema" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Clonar configuração do sistema" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "O perfil do AutoYaST será gravado em /root/autoinst.xml (<a href=\"%1\">não gravá-lo</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "O perfil do AutoYaST não será salvo (<a href=\"%1\">gravá-lo</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Gravar o perfil do AutoYaST em /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiando os arquivos para o sistema instalado..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiando os arquivos de log para o sistema instalado..." @@ -1056,7 +1046,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "A&lterar..." @@ -1426,31 +1416,31 @@ "Cancelando a instalação." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Removido" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Habilitado" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Desabilitado" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Repositórios previamente utilizados" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1459,27 +1449,27 @@ "que você está atualizando:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Status atual" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Repositório" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Alternar status" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1489,7 +1479,7 @@ "Habilite aqueles que você deseja incluir no processo de atualização." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1498,30 +1488,30 @@ "Alterar status ou clique duas vezes no respectivo item da tabela." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Para alterar a URL, clique no botão Alterar...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Desconhecido" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL do &repositório" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "A rede não está configurada" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1530,49 +1520,49 @@ "Gostaria de configurá-la?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Adicionando e removendo repositórios..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Repositórios estão sendo adicionados e removidos." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Remover os repositórios não utilizados" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Removendo os repositórios não utilizados..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Adicionar os repositórios habilitados" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Adicionando os repositórios habilitados..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Adicionar os repositórios desabilitados" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Adicionando os repositórios desabilitados..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Mídia Correta Requisitada" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1586,7 +1576,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1601,7 +1591,7 @@ "O repositório será adicionado com o estado desabilitado." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1613,7 +1603,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1625,7 +1615,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1636,7 +1626,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1749,11 +1739,6 @@ msgstr "Salvando configurações de segurança..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Salvando as configurações do script de inicialização..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Salvando a configuração do hardware..." @@ -1925,17 +1910,17 @@ "Nota: poderá ser preciso digitar algumas informações novamente." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmar a instalação" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Todas as informações necessárias para instalação básica estão completas." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1948,7 +1933,7 @@ "de acordo com as configurações de instalação dos diálogos anteriores." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1960,22 +1945,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Volte e verifique as configurações se você não tem certeza." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmar a atualização" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Todas as informações necessárias para fazer a atualização estão completas." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1986,7 +1971,7 @@ "de acordo com as configurações dos diálogos anteriores." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Iniciar a at&ualização" @@ -2070,6 +2055,18 @@ "A instalação não conseguiu resolver as dependências de pacote automaticamente.\n" "O gerenciador de software será aberto para que você as resolva manualmente." +#~ msgid "Dummy" +#~ msgstr "Fictício" + +#~ msgid "&Dummy" +#~ msgstr "&Fictício" + +#~ msgid "Write AutoYaST profile to /root/autoinst.xml" +#~ msgstr "Gravar o perfil do AutoYaST em /root/autoinst.xml" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Salvando as configurações do script de inicialização..." + #~ msgid "Search for Linux partitions" #~ msgstr "Pesquisar por partições Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt_BR-3.1.0/po/iplb.pt_BR.po new/yast2-trans-pt_BR-3.1.0/po/iplb.pt_BR.po --- old/yast2-trans-pt_BR-3.1.0/po/iplb.pt_BR.po 2014-11-03 17:13:46.000000000 +0100 +++ new/yast2-trans-pt_BR-3.1.0/po/iplb.pt_BR.po 2015-04-20 18:10:47.000000000 +0200 @@ -5,13 +5,13 @@ # # Karl Eichwalder <ke(a)suse.de>, 1999. # Ralf Lanz <rlanz(a)genix.com.br>, 1999. -# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2014. +# Luiz Fernando Ranghetti <elchevive(a)opensuse.org>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-04 15:52+0200\n" -"PO-Revision-Date: 2014-10-30 10:48-0200\n" +"PO-Revision-Date: 2015-02-19 09:12-0200\n" "Last-Translator: Luiz Fernando Ranghetti <elchevive(a)opensuse.org>\n" "Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.org>\n" "Language: pt_BR\n" @@ -109,40 +109,30 @@ msgstr "&Configuração global" #: src/include/iplb/global_conf.rb:69 src/include/iplb/vserver_conf.rb:227 -#, fuzzy -#| msgid "Mail Server Configuration" msgid "&Virtual Server Configuration" -msgstr "Configuração do servidor de e-mail" +msgstr "Configuração do servidor &virtual" #: src/include/iplb/global_conf.rb:75 -#, fuzzy -#| msgid "CRL Check Interval" msgid "Check Interval" -msgstr "Inter&valo de verificação:" +msgstr "Intervalo de verificação" #: src/include/iplb/global_conf.rb:76 src/include/iplb/vserver_conf.rb:205 -#, fuzzy -#| msgid "Connection &Timeout" msgid "Check Timeout" -msgstr "&Tempos de Espera de Conexão" +msgstr "Tempos de espera de verificação" #: src/include/iplb/global_conf.rb:78 src/include/iplb/vserver_conf.rb:214 -#, fuzzy -#| msgid "Failure" msgid "Failure Count" -msgstr "Falha" +msgstr "Contagem de falhas" #: src/include/iplb/global_conf.rb:79 src/include/iplb/vserver_conf.rb:208 -#, fuzzy -#| msgid "Connection &Timeout" msgid "Negotiate Timeout" -msgstr "&Tempos de Espera de Conexão" +msgstr "Tempos de espera de negociação" #: src/include/iplb/global_conf.rb:85 src/include/iplb/vserver_conf.rb:167 #, fuzzy #| msgid "Ro&llback" msgid "Fallback" -msgstr "&Desfazer" +msgstr "Alternativo" #: src/include/iplb/global_conf.rb:86 #, fuzzy @@ -155,22 +145,16 @@ msgstr "Executar" #: src/include/iplb/global_conf.rb:91 src/include/iplb/vserver_conf.rb:186 -#, fuzzy -#| msgid "Email Addr: " msgid "Email Alert" -msgstr "Endereço de Email:" +msgstr "Alerta de e-mail:" #: src/include/iplb/global_conf.rb:92 src/include/iplb/vserver_conf.rb:187 -#, fuzzy -#| msgid "Email Addr: " msgid "Email Alert Freq" -msgstr "Endereço de Email:" +msgstr "Frequência de alerta de e-mail" #: src/include/iplb/global_conf.rb:93 src/include/iplb/vserver_conf.rb:190 -#, fuzzy -#| msgid "Test Status" msgid "Email Alert Status" -msgstr "Status do teste" +msgstr "Status do alerta de e-mail" #: src/include/iplb/global_conf.rb:100 #, fuzzy @@ -195,8 +179,6 @@ msgstr "Serviço" #: src/include/iplb/global_conf.rb:106 -#, fuzzy -#| msgid "&Log File" msgid "Log File" msgstr "Arquivo de log" @@ -517,30 +499,22 @@ #. overwrite global value part #: src/include/iplb/vserver_conf.rb:146 -#, fuzzy -#| msgid "&Feedback Type" msgid "Check Type" -msgstr "Tipo de Re&torno" +msgstr "Tipo de verificação" #: src/include/iplb/vserver_conf.rb:150 -#, fuzzy -#| msgid "Check Now" msgid "Check Port" -msgstr "Verificar agora" +msgstr "Porta de verificação" #: src/include/iplb/vserver_conf.rb:151 msgid "Service" msgstr "Serviço" #: src/include/iplb/vserver_conf.rb:152 -#, fuzzy -#| msgid "Command" msgid "Check Command" -msgstr "Comando" +msgstr "Comando de verificação" #: src/include/iplb/vserver_conf.rb:157 -#, fuzzy -#| msgid "Setup Method" msgid "Http Method" msgstr "Método HTTP" @@ -553,8 +527,6 @@ msgstr "Receber" #: src/include/iplb/vserver_conf.rb:165 -#, fuzzy -#| msgid "VirtualHost" msgid "Virtual Host" msgstr "Host virtual" @@ -618,20 +590,14 @@ msgstr "Servidores reais" #: src/include/iplb/vserver_conf.rb:310 -#, fuzzy -#| msgid "Check Repository Type" msgid "Check type" -msgstr "Verificar o tipo de repositório" +msgstr "Tipo de verificação" #: src/include/iplb/vserver_conf.rb:311 -#, fuzzy -#| msgid "Socket type" msgid "Auth type" -msgstr "Autenticação:" +msgstr "Tipo de autenticação" #: src/include/iplb/vserver_conf.rb:312 -#, fuzzy -#| msgid "Other" msgid "Others" msgstr "Outros" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-pt_BR-3.1.0/po/status.txt new/yast2-trans-pt_BR-3.1.0/po/status.txt --- old/yast2-trans-pt_BR-3.1.0/po/status.txt 2014-12-16 14:55:58.000000000 +0100 +++ new/yast2-trans-pt_BR-3.1.0/po/status.txt 2015-04-20 18:10:50.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17263 -Fuzzy : 83 -Untranslated : 128 +Translated : 17306 +Fuzzy : 62 +Untranslated : 103 -------------------- - All strings : 17474 + All strings : 17471 99 % are translated ++++++ yast2-trans-ro-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ro-3.1.0/po/installation.ro.po new/yast2-trans-ro-3.1.0/po/installation.ro.po --- old/yast2-trans-ro-3.1.0/po/installation.ro.po 2014-10-29 17:09:34.000000000 +0100 +++ new/yast2-trans-ro-3.1.0/po/installation.ro.po 2015-04-20 18:07:28.000000000 +0200 @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: OpenSUSE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2012-11-19 15:01+0200\n" "Last-Translator: Lucian Oprea <oprea.luci(a)gmail.com>\n" "Language-Team: Romanian <LL(a)li.org>\n" @@ -35,16 +35,6 @@ "X-Generator: Narro 2.0 on http://tradu.softwareliber.ro\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Dummy" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Dummy" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -69,15 +59,19 @@ "AutoYaST necesită un profil pentru a determina cum va arăta sistemul instalat. Dacă selectați această\n" "opțiune, un profil al sistemului curent va fi salvat în <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Se scrie configurația sistemului..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -85,27 +79,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Copiez fișierele pe sistemul instalat..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Copiez fișierele jurnal (log) pe sistemul instalat..." @@ -1077,7 +1067,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "Modifi&că..." @@ -1453,31 +1443,31 @@ "Anulez instalarea." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Șters" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Activat" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Dezactivat" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Surse de instalare utilizate anterior" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1486,27 +1476,27 @@ "sistemul ce se actualizează momentan:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Starea curentă" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Sursă de instalare" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Ac&tivează/deactivează starea" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1515,7 +1505,7 @@ " găsite pe sistemul pe care îl actualizați. Activați-le pe acelea pe care doriți să le includeți în procedura de actualizare" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1524,30 +1514,30 @@ "butonul Schimbă starea sau dublu-clic pe elementul respectiv din tabel." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Pentru a modifica URL-ul, apăsați butonul Modifică...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Necunoscut" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "U&RL sursă de instalare" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Rețeaua nu este configurată" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1557,49 +1547,49 @@ "Doriți să o configurați?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Adaug și șterg surse de instalare..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Depozitele sunt adăugate și eliminate." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Îndepărtează sursele de instalare neutilizate" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Îndepărtez sursele de instalare neutilizate..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Adaugă sursele de instalare activate" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Adaug sursele de instalare activate..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Adaugă sursele de instalare deactivate" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Adaug sursele de instalare deactivate..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Este necesar un mediu de stocare corespunzător" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1613,7 +1603,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1623,7 +1613,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1635,7 +1625,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1647,7 +1637,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1658,7 +1648,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1771,11 +1761,6 @@ msgstr "Salvez setările de securitate..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Salvez setările programelor de boot..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Salvez configurația hardware..." @@ -1932,19 +1917,19 @@ "Atenție: Va trebui să introduceți din nou anumite informații." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Confirmați instalarea" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Informația necesară pentru instalarea de bază este completă." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1957,7 +1942,7 @@ "de instalare din dialogurile precendente." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1969,24 +1954,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Reveniți și verificați setările dacă aveți nelămuriri." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Confirmați actualizarea" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Informația necesară pentru efectuarea actualizării este completă." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1997,7 +1982,7 @@ "conform setărilor din dialogurile precedente." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Pornește act&ualizarea" @@ -2091,6 +2076,15 @@ "Instalarea nu a putut rezolva automat dependențele pachetelor.\n" "Administratorul de aplicații va fi deschis pentru a le rezolva manual." +#~ msgid "Dummy" +#~ msgstr "Dummy" + +#~ msgid "&Dummy" +#~ msgstr "&Dummy" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Salvez setările programelor de boot..." + #~ msgid "License needs to be accepted" #~ msgstr "Licența trebuie acceptată" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ro-3.1.0/po/status.txt new/yast2-trans-ro-3.1.0/po/status.txt --- old/yast2-trans-ro-3.1.0/po/status.txt 2014-12-16 14:28:44.000000000 +0100 +++ new/yast2-trans-ro-3.1.0/po/status.txt 2015-04-20 18:07:50.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 14554 +Translated : 14551 Fuzzy : 1177 Untranslated : 1743 -------------------- - All strings : 17474 + All strings : 17471 83 % are translated ++++++ yast2-trans-ru-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ru-3.1.0/po/installation.ru.po new/yast2-trans-ru-3.1.0/po/installation.ru.po --- old/yast2-trans-ru-3.1.0/po/installation.ru.po 2014-10-29 17:12:36.000000000 +0100 +++ new/yast2-trans-ru-3.1.0/po/installation.ru.po 2015-04-20 17:42:27.000000000 +0200 @@ -6,13 +6,13 @@ # Aleksey Osipov <aliks-os(a)yandex.ru>, 2005, 2006, 2007, 2008. # Nikolay Derkach <nderkach(a)gmail.com>, 2007. # Alexander Melentev <alex239(a)gmail.com>, 2008, 2009, 2010. -# Alexander Melentev <minton(a)opensuse.org>, 2011, 2012, 2013, 2014. +# Alexander Melentev <minton(a)opensuse.org>, 2011, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-03 18:42+0400\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-21 13:53+0300\n" "Last-Translator: Alexander Melentev <minton(a)opensuse.org>\n" "Language-Team: Russian <opensuse-translation-ru(a)opensuse.org>\n" "Language: ru\n" @@ -22,16 +22,6 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Фиктивный" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Фиктивный" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -50,39 +40,39 @@ "AutoYaST необходим профиль, в котором описано, как должна выглядеть установленная система.\n" "Если выбрано Клонировать, то профиль текущей системы будет записан в <tt>/root/autoyast.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Сохранить профиль AutoYaST в /root/autoinst.xml в конце установки?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Клонировать настройки системы" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Клонировать настройки системы" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Профиль AutoYaST будет сохранён в /root/autoinst.xml (<a href=\"%1\">не сохранять</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Профиль AutoYaST не будет сохранён (<a href=\"%1\">сохранить</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Сохранить профиль AutoYaST в /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Копирование файлов в установленную систему..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Копирование файлов журналов в установленную систему..." @@ -1048,7 +1038,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Изменить..." @@ -1417,31 +1407,31 @@ "Прерывание установки." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Удалён" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Включён" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Выключен" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Ранее использованные репозитории" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1450,27 +1440,27 @@ "перед обновлением:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Текущее состояние" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Репозиторий" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Пере&ключить состояние" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1479,7 +1469,7 @@ "в системе перед обновлением. Включите те, которые вы хотите использовать в процессе обновления." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1488,30 +1478,30 @@ "Переключить состояние или дважды щелкните на соответствующей записи в таблице." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Чтобы изменить URL, нажмите кнопку Изменить...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Неизвестно" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL &репозитория" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Сеть не настроена" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1520,49 +1510,49 @@ "Настроить его сейчас?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Добавление и удаление репозиториев..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Идёт добавление и удаление репозиториев." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Удалить неиспользованные репозитории" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Удаление неиспользованных репозиториев..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Добавить включённые репозитории" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Добавление включённых репозиториев..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Добавить отключённые репозитории" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Добавление отключённых репозиториев..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Запрос правильного носителя" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1576,7 +1566,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1591,7 +1581,7 @@ "Репозиторий будет добавлен в отключённом состоянии." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1603,7 +1593,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1615,7 +1605,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1626,7 +1616,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1739,11 +1729,6 @@ msgstr "Сохранение настроек безопасности..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Сохранение настроек сценариев загрузки..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Сохранение конфигурации оборудования..." @@ -1915,17 +1900,17 @@ "Примечание. Может потребоваться повторный ввод некоторых сведений." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Подтвердить установку" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Собрана вся информация, необходимая для базовой установки." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1938,7 +1923,7 @@ "в соответствии с настройками установки в предыдущих диалогах." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1949,22 +1934,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Вернитесь назад и проверьте настройки, если вы не уверены." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Подтвердить обновление" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Собрана вся информация для выполнения обновления." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1975,7 +1960,7 @@ "в соответствии с настройками в предыдущих диалогах." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Начать &обновление" @@ -2059,6 +2044,15 @@ "Установка не смогла разрешить зависимости пакетов автоматически.\n" "Будет открыт менеджер программного обеспечения, чтобы вы разрешили их вручную." +#~ msgid "Dummy" +#~ msgstr "Фиктивный" + +#~ msgid "&Dummy" +#~ msgstr "&Фиктивный" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Сохранение настроек сценариев загрузки..." + #~ msgid "Search for Linux partitions" #~ msgstr "Найти разделы с Linux" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ru-3.1.0/po/status.txt new/yast2-trans-ru-3.1.0/po/status.txt --- old/yast2-trans-ru-3.1.0/po/status.txt 2014-12-16 14:12:06.000000000 +0100 +++ new/yast2-trans-ru-3.1.0/po/status.txt 2015-04-20 17:59:53.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17467 +Translated : 17464 Fuzzy : 3 Untranslated : 4 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-si-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-si-3.1.0/po/installation.si.po new/yast2-trans-si-3.1.0/po/installation.si.po --- old/yast2-trans-si-3.1.0/po/installation.si.po 2014-10-29 16:45:46.000000000 +0100 +++ new/yast2-trans-si-3.1.0/po/installation.si.po 2015-04-20 17:49:10.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: i18n(a)suse.de\n" "Language-Team: Sinhala <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-si-3.1.0/po/status.txt new/yast2-trans-si-3.1.0/po/status.txt --- old/yast2-trans-si-3.1.0/po/status.txt 2014-12-16 14:21:09.000000000 +0100 +++ new/yast2-trans-si-3.1.0/po/status.txt 2015-04-20 17:49:11.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 36 Fuzzy : 115 -Untranslated : 17323 +Untranslated : 17320 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-sk-3.1.0.tar.bz2 ++++++ ++++ 7646 lines of diff (skipped) ++++++ yast2-trans-sl-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sl-3.1.0/po/installation.sl.po new/yast2-trans-sl-3.1.0/po/installation.sl.po --- old/yast2-trans-sl-3.1.0/po/installation.sl.po 2014-10-29 16:55:16.000000000 +0100 +++ new/yast2-trans-sl-3.1.0/po/installation.sl.po 2015-04-20 18:07:05.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2014-09-24 17:55+0200\n" "Last-Translator: Jure Repinc <jlp(a)holodeck1.com>\n" "Language-Team: Slovenian <lugos-slo(a)lugos.si>\n" @@ -22,16 +22,6 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Lažno" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Lažno" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -50,39 +40,41 @@ "ki vsebuje podatke o želeni namestitvi.\n" "Če boste izbrali to možnost, bo profil trenutnega izbora shranjen v <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +#, fuzzy +#| msgid "Write AutoYaST profile to /root/autoinst.xml" +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Shrani profil AutoYaST v /root/autoinst.xml" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Nastavitve kloniranja sistema" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Nastavitve kloniranja sistema" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Profil AutoYaST bo shranjen v /root/autoinst.xml (<a href=\"%1\">ne shrani ga</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Profil AutoYaST ne bo shranjen (<a href=\"%1\">shrani ga</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Shrani profil AutoYaST v /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopiranje datotek na nameščeni sistem ..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopiranje dnevniških datotek na nameščeni sistem ..." @@ -1054,7 +1046,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Spremeni ..." @@ -1423,58 +1415,58 @@ "Prekinitev namestitve." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Odstranjen" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Omogočen" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Onemogočen" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Predhodno uporabljeni viri" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "Ti viri so bili najdeni na sistemu, ki ga" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Trenutno stanje" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Vir" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Preklopi stanje" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1483,7 +1475,7 @@ "ki ga nadgrajujete. Omogočite tiste, ki jih želite vključiti v nadgradnjo." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1492,30 +1484,30 @@ "gumb Preklopi stanje ali pa dvo-kliknite na ustrezno postavko v preglednici." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Za spremembo URL-ja kliknite na gumb Spremeni." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Neznano" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&URL vira" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Omrežje ni nastavljeno" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1524,49 +1516,49 @@ "Ali jo želite nastaviti?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Dodajanje in odstranjevanje virov ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Dodaja in odstranjuje se vire." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Odstrani neuporabljene vire" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Odstranjevanje neuporabljenih virov ..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Dodaj omogočene vire" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Dodajanje omogočenih virov ..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Dodaj onemogočene vire" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Dodajanje onemogočenih virov ..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Potreben je pravi nosilec" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1580,7 +1572,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1595,7 +1587,7 @@ "Vir bo dodan v onemogočenem stanju." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1607,7 +1599,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1619,7 +1611,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1630,7 +1622,7 @@ "URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1743,11 +1735,6 @@ msgstr "Shranjevanje varnostnih nastavitev ..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Shranjevanje nastavitev zagonskih skriptov ..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Shranjevanje nastavitev strojne opreme ..." @@ -1919,17 +1906,17 @@ "Mogoče boste morali ponovno vnesti nekatere podatke." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Potrditev namestitve" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Podatki, potrebni za osnovno namestitev, so zbrani." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1942,7 +1929,7 @@ "podatki v njih bodo izbrisani)." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1954,22 +1941,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Če niste prepričani, se vrnite in preverite nastavitve." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Potrditev posodobitve" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Podatki, potrebni za posodobitev, so zbrani." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1981,7 +1968,7 @@ "podatke na trdem disku." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Začni &posodabljanje" @@ -2067,6 +2054,15 @@ "Namestitveni program ni mogel samodejno razrešiti odvisnosti paketov.\n" "Odprl se bo upravljalnik programske opreme, kjer boste odvisnosti razrešili ročno." +#~ msgid "Dummy" +#~ msgstr "Lažno" + +#~ msgid "&Dummy" +#~ msgstr "&Lažno" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Shranjevanje nastavitev zagonskih skriptov ..." + #~ msgid "License needs to be accepted" #~ msgstr "Potrebno je sprejeti licenco" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sl-3.1.0/po/status.txt new/yast2-trans-sl-3.1.0/po/status.txt --- old/yast2-trans-sl-3.1.0/po/status.txt 2014-12-16 14:24:54.000000000 +0100 +++ new/yast2-trans-sl-3.1.0/po/status.txt 2015-04-20 18:07:20.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 9114 -Fuzzy : 4849 +Translated : 9110 +Fuzzy : 4850 Untranslated : 3511 -------------------- - All strings : 17474 + All strings : 17471 52 % are translated ++++++ yast2-trans-sr-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sr-3.1.0/po/installation.sr.po new/yast2-trans-sr-3.1.0/po/installation.sr.po --- old/yast2-trans-sr-3.1.0/po/installation.sr.po 2014-10-29 17:06:40.000000000 +0100 +++ new/yast2-trans-sr-3.1.0/po/installation.sr.po 2015-04-20 17:50:52.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2007-10-12 23:55+0200\n" "Last-Translator: Жарко Михајловић <developer(a)beotel.net>\n" "Language-Team: Serbian (Српски језик) <sr(a)li.org>\n" @@ -20,16 +20,6 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -44,15 +34,19 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Preparing the 1st system configuration..." msgid "Clone System Configuration" msgstr "Припремам прво конфигурисање..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -60,27 +54,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Копирам датотеке..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Копирам дневник..." @@ -1044,7 +1034,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1383,33 +1373,33 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Izbaci" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Омогућено" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Онемогућено" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Раније коришћена складишта" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1417,78 +1407,78 @@ # table header: module status #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Тренутни статус" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" # table header: module status #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Ме&њај статус" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Непознато" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Мрежа није подешена" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Додавање или уклањање складишта" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" @@ -1497,45 +1487,45 @@ "" # window title for exit dialog -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Регистрована складишта" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Додавање или уклањање складишта" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Доступна складишта" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Додавање или уклањање складишта" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Доступна складишта" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Додавање или уклањање складишта" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1545,7 +1535,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1555,7 +1545,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1565,7 +1555,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1574,7 +1564,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1583,7 +1573,7 @@ msgstr "Доступна складишта" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1696,13 +1686,6 @@ msgstr "Безбедоносна подешавања" #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Reading the settings..." -msgid "Saving boot scripts settings..." -msgstr "Читам подешавања..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1839,17 +1822,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Потврда инсталације" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1858,7 +1841,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1867,23 +1850,23 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" # Proposal for installation mode #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Потврди ажурирање" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1892,7 +1875,7 @@ # Proposal for installation mode #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "&Ажурирај" @@ -1985,6 +1968,11 @@ msgstr "" #, fuzzy +#~| msgid "Reading the settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Читам подешавања..." + +#, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "треба поново инсталирати" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sr-3.1.0/po/status.txt new/yast2-trans-sr-3.1.0/po/status.txt --- old/yast2-trans-sr-3.1.0/po/status.txt 2014-12-16 14:28:58.000000000 +0100 +++ new/yast2-trans-sr-3.1.0/po/status.txt 2015-04-20 17:50:57.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 1338 -Fuzzy : 3782 -Untranslated : 12354 +Fuzzy : 3781 +Untranslated : 12352 -------------------- - All strings : 17474 + All strings : 17471 8 % are translated ++++++ yast2-trans-sv-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sv-3.1.0/po/installation.sv.po new/yast2-trans-sv-3.1.0/po/installation.sv.po --- old/yast2-trans-sv-3.1.0/po/installation.sv.po 2014-10-29 16:51:02.000000000 +0100 +++ new/yast2-trans-sv-3.1.0/po/installation.sv.po 2015-04-20 18:01:24.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2007-08-16 19:15+0200\n" "Last-Translator: Mattias Newzella <newzella(a)linux.se>\n" "Language-Team: <sv(a)li.org>\n" @@ -22,16 +22,6 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Testmodul" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Test" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -51,15 +41,19 @@ "För att Autoyast ska veta hur systemet ska se ut behöver det en profil. Om det här alternativet\n" "väljs kommer en profil av det aktella systemet att lagras i /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Skriver systeminställningar" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -67,27 +61,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kopierar filer till installerat system..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kopierar loggfiler till installerat system..." @@ -1101,7 +1091,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Ändra..." @@ -1510,33 +1500,33 @@ "Avbryter installation." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Ta bort" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Aktiverad" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Inaktiverad" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Tidigare använda arkiv" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 #, fuzzy msgid "" "These repositories were found on the system\n" @@ -1546,34 +1536,34 @@ "som uppdateras:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Aktuell status" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Arkiv" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Webbadress" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "Växla s&tatus" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 #, fuzzy #| msgid "" #| "To enable or disable an URL, click on the\n" @@ -1586,30 +1576,30 @@ "Växla status eller dubbelklicka på respektive tabellobjekt." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "För att ändra URL, klicka på knappen Ändra...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Okänd" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "A&rkiv-URL" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Nätverket är inte inställt" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 #, fuzzy msgid "" "Remote repositories require an Internet connection.\n" @@ -1620,57 +1610,57 @@ "Vill du ställa in den?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Lägger till och tar bort arkiv..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "Vänta medan arkiv läggs till och tas bort." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Läs inställda arkiv" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Läser inställa arkiv..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Ytterligare arkiv" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Lägger till och tar bort arkiv..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Tillgängliga arkiv" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Lägger till och tar bort arkiv..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1680,7 +1670,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1690,7 +1680,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1702,7 +1692,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1714,7 +1704,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1725,7 +1715,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1849,13 +1839,6 @@ msgstr "Läser säkerhetsinställningar..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Sparar ljudkortsinställningar..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Sparar hårdvaruinställningar..." @@ -2040,19 +2023,19 @@ " Obs! Du kanske måste ange viss information på nytt." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Bekräfta installation" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "All information som krävs för grundläggande installation är nu insamlad." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2066,7 +2049,7 @@ "enligt inställningar i föregående dialogrutor." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2079,24 +2062,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Gå tillbaka och kontrollera inställningarna om du är osäker." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Bekräfta uppdatering" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "All information som krävs för uppdatering är nu insamlad." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2108,7 +2091,7 @@ "enligt inställningar i föregående dialogrutor." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Starta &uppdatering" @@ -2202,6 +2185,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Testmodul" + +#~ msgid "&Dummy" +#~ msgstr "&Test" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Sparar ljudkortsinställningar..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "måste ominstalleras" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sv-3.1.0/po/status.txt new/yast2-trans-sv-3.1.0/po/status.txt --- old/yast2-trans-sv-3.1.0/po/status.txt 2014-12-16 14:13:43.000000000 +0100 +++ new/yast2-trans-sv-3.1.0/po/status.txt 2015-04-20 18:01:48.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 9762 -Fuzzy : 4528 +Translated : 9760 +Fuzzy : 4527 Untranslated : 3184 -------------------- - All strings : 17474 + All strings : 17471 56 % are translated ++++++ yast2-trans-sw-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sw-3.1.0/po/installation.sw.po new/yast2-trans-sw-3.1.0/po/installation.sw.po --- old/yast2-trans-sw-3.1.0/po/installation.sw.po 2014-10-29 17:02:25.000000000 +0100 +++ new/yast2-trans-sw-3.1.0/po/installation.sw.po 2015-04-20 17:55:17.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: yast2.sw.po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2005-09-23 00:15+0200\n" "Last-Translator: Swahili Team <i18n(a)suse.de>\n" "Language-Team: Swahili Team <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-sw-3.1.0/po/status.txt new/yast2-trans-sw-3.1.0/po/status.txt --- old/yast2-trans-sw-3.1.0/po/status.txt 2014-12-16 14:27:58.000000000 +0100 +++ new/yast2-trans-sw-3.1.0/po/status.txt 2015-04-20 17:55:19.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 Fuzzy : 0 -Untranslated : 17474 +Untranslated : 17471 -------------------- - All strings : 17474 + All strings : 17471 0 % are translated ++++++ yast2-trans-ta-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ta-3.1.0/po/installation.ta.po new/yast2-trans-ta-3.1.0/po/installation.ta.po --- old/yast2-trans-ta-3.1.0/po/installation.ta.po 2014-10-29 16:41:19.000000000 +0100 +++ new/yast2-trans-ta-3.1.0/po/installation.ta.po 2015-04-20 17:45:47.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2003-08-14 10:47+0200\n" "Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n" @@ -12,16 +12,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "வெற்று" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr " வெற்று " - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -41,15 +31,19 @@ "வேண்டுமென்பதை அறிவதற்கு AutoYaST-க்கு ஒரு விளக்கம் தேவை.\n" "இந்த விருப்பத்தேர்வு தேர்ந்தெடுக்கப்படுமானால், தற்போதுள்ள முறையின் ஒரு விளக்கம் /root/autoyast.xmlல் சேமிக்கப்படும்.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "கணினியின் தகவமைவை எழுதுகிறது." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -57,27 +51,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "நிறுவப்பட்ட முனையத்திற்கு கோப்புகளை நகல் எடுக்கப்படுகிறது..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "பதிவுக் கோப்புகளை நிறுவப்பட்ட முனையத்திற்கு நகல் எடுக்கப்படுகிறது " @@ -1090,7 +1080,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "மாற்று ..." @@ -1494,159 +1484,159 @@ msgstr "அட்டவணையை ஆரம்பிப்பதில் தோல்வி" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "நீக்கவும்" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "செயலியக்கப்பட்டது" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr " செயலிழக்கப்பட்டது " #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "கூடுதல் மூலாதாரங்களை தேர்வு செய்க: " #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr " தற்போதைய நிலை:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "விவரக்குறிப்பு தொகுபதிவகம்:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&டாகில் நிலை " #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "தெரியாதவை" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "பொருள் பதிவுசெய்தல்" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "ப்ரோக்ராம் உள்ளமைக்கப்படவில்லை" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "கூடுதல் மூலாதாரங்களை தேர்வு செய்க: " #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "உருவம் பெறும் வரை தயவு செய்து காத்திருக்கவும்.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "ஏற்கனவே சேமிக்கப்பட்ட வடிவத்தைப் படிக்கவும்" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "ஏற்கனவே சேமிக்கப்பட்ட வடிவம் படிக்கப்படுகிறது" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "ஏற்கனவே சேமிக்கப்பட்ட வடிவத்தைப் படிக்கவும்" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "கூடுதல் மூலாதாரங்களை தேர்வு செய்க: " -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "ஏற்கனவே சேமிக்கப்பட்ட வடிவத்தைப் படிக்கவும்" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "கூடுதல் மூலாதாரங்களை தேர்வு செய்க: " #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1656,7 +1646,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1666,7 +1656,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1678,7 +1668,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1688,7 +1678,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1699,7 +1689,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1823,13 +1813,6 @@ msgstr "பாதுகாப்பு அமைப்புகள் படிக்கப்படுகின்றன.." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "ஒலி அட்டை அமைவுகள் சேமிக்கப்படுகின்றன...." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "வ்ன்பொருள் தகவமைவுகளை சேமிக்கிறது.." @@ -2015,19 +1998,19 @@ "குறிப்பு: நீங்கள் மீண்டும் சிறிது விவரங்களை சேர்க்க வேண்டியிருக்கும்." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr " நிறுவுதலை உறுதிபடுத்து" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "அடிப்படை நிறுவுதலுக்கு தேவையான அனைத்து தகவலும் முழுமைபடுத்தப்பட்டுவிட்டன." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2041,7 +2024,7 @@ "தகவல்களும் அழிக்கப்படும்)" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2054,24 +2037,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "புரியவில்லையென்றால் பின்னே சென்று அமைப்புகளை சரிபார்க்கவும்" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "புதுபித்தலை உறுதிபடுத்து" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "புதுபித்தலுக்கு தேவையான அனைத்து தகவல்களும் முழுமையடைந்துவிட்டது." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2083,7 +2066,7 @@ "உள்ள அனைத்து தகவல்களையும் மேலெழுதப்படும்." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "புதுப்பித்தலை தொடங்கு" @@ -2173,6 +2156,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "வெற்று" + +#~ msgid "&Dummy" +#~ msgstr " வெற்று " + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "ஒலி அட்டை அமைவுகள் சேமிக்கப்படுகின்றன...." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "மீண்டும் நிறுவப்பட வேண்டும்" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ta-3.1.0/po/status.txt new/yast2-trans-ta-3.1.0/po/status.txt --- old/yast2-trans-ta-3.1.0/po/status.txt 2014-12-16 14:19:00.000000000 +0100 +++ new/yast2-trans-ta-3.1.0/po/status.txt 2015-04-20 17:46:08.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7466 -Fuzzy : 4681 +Translated : 7464 +Fuzzy : 4680 Untranslated : 5327 -------------------- - All strings : 17474 + All strings : 17471 43 % are translated ++++++ yast2-trans-tg-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-3.1.0/po/installation.tg.po new/yast2-trans-tg-3.1.0/po/installation.tg.po --- old/yast2-trans-tg-3.1.0/po/installation.tg.po 2014-10-29 16:59:26.000000000 +0100 +++ new/yast2-trans-tg-3.1.0/po/installation.tg.po 2015-04-20 18:02:28.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Tajik openSUSE Localization\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: \n" "Last-Translator: Victor Ibragimov <victor.ibragimov(a)gmail.com>\n" "Language-Team: Tajik KDE & Software Localization - Victor Ibragimov <victor.ibragimov(a)gmail.com>\n" @@ -13,16 +13,6 @@ "Plural-Forms: nplurals=2; plural=1;\n" "X-Generator: Poedit 1.5.7\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Сохтагӣ" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Сохтагӣ" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -47,15 +37,19 @@ "бояд дорои профил бошад, то ки тавонад намуди системаи муайяншударо насб кунад. Агар шумо ин имконро\n" "интихоб кунед, профили системаи ҷорӣ ба файли <tt>/root/autoinst.xml</tt> захира мешавад." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Танзимоти системавӣ сабт шуда истодааст" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -63,27 +57,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Нусхабардории файлҳо ба системаи насбшуда..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Нусхабардории файлҳои сабти рӯйдодҳо ба системаи насбшуда..." @@ -1064,7 +1054,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Тағйир додан..." @@ -1438,31 +1428,31 @@ "Насб манъ карда шудааст." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Тозашуда" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Фаъолшуда" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Ғайрифаъол" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Анборҳои нармафзори истифодашудаи қаблӣ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1471,27 +1461,27 @@ "чунин анборҳои нармафзор пайдо шудаанд:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Вазъияти ҷорӣ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Анбори нармафзор" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Суроғаи URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Намоиши вазъият" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1500,7 +1490,7 @@ "намоиш дода мешаванд. Анборҳои нармафзоре, ки шумо мехоҳед барои раванди такмилдиҳӣ илова кунед, интихоб намоед." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1509,30 +1499,30 @@ "Намоиши вазъият-ро зер кунед ё ба объекти ҷадвали мувофиқ дубора зер кунед." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Барои тағйир додани суроғаи URL, тугмаи Тағйир додан...-ро зер кунед." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Номаълум" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "&Суроғаи URL-и анбори нармафзор" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Шабака танзим нашудааст" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1541,49 +1531,49 @@ "Интернетро танзим мекунед?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Анборҳои нармафзор илова ва тоза шуда истодаанд..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Анборҳои нармафзор илова ва тоза шуда истодаанд." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Тоза кардани анборҳои нармафзори истифоданашуда" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Анборҳои нармафзори истифоданашуда тоза шуда истодаанд..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Илова кардани анборҳои нармафзори фаъолшуда" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Анборҳои нармафзори фаъолшуда илова шуда истодаанд..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Илова кардани анборҳои нармафзори ғайрифаъол" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Анборҳои нармафзори ғайрифаъол илова шуда истодаанд..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Медиаи мувофиқ дархост шудааст" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1597,7 +1587,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1612,7 +1602,7 @@ "Анбори нармафзор дар ҳолати ғайрифаъол илова мешавад." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1624,7 +1614,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1636,7 +1626,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1647,7 +1637,7 @@ "Суроғаи URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1760,11 +1750,6 @@ msgstr "Танзимоти амният захира шуда истодааст..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Танзимоти скриптҳои коргузорӣ захира шуда истодааст..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Танзими сахтафзор захира шуда истодааст..." @@ -1934,17 +1919,17 @@ "Тавзеҳ: Шумо бояд баъзе маълумотро аз нав ворид кунед." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Тасдиқи насб" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Ҳамаи иттилооти зарурӣ барои насби асосӣ ҷамъ шудааст." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1957,7 +1942,7 @@ "мувофиқи танзимоти насбе, ки дар диалоги қаблӣ таъин карда шуд, иҷро мешавад." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1969,22 +1954,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Агар мутмаин набошед, ба ақиб гузашта танзимотро санҷед." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Тасдиқи навсозӣ" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Ҳамаи маълумоти зарурӣ барои навсозии система ҷамъ шудааст." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1996,7 +1981,7 @@ "тағйир дода мешавад." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Оғоз кардани &навсозӣ" @@ -2094,6 +2079,15 @@ "Ҳангоми коргузорӣ вобастагиҳои қуттиҳо ба худкор ҳал нашудаанд.\n" "Барои танзимоти дастӣ, мудири қуттиҳо кушода мешавад." +#~ msgid "Dummy" +#~ msgstr "Сохтагӣ" + +#~ msgid "&Dummy" +#~ msgstr "&Сохтагӣ" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Танзимоти скриптҳои коргузорӣ захира шуда истодааст..." + #~ msgid "License needs to be accepted" #~ msgstr "Шумо бояд иҷозатномаро қабул кунед" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-3.1.0/po/status.txt new/yast2-trans-tg-3.1.0/po/status.txt --- old/yast2-trans-tg-3.1.0/po/status.txt 2014-12-16 14:59:55.000000000 +0100 +++ new/yast2-trans-tg-3.1.0/po/status.txt 2015-04-20 18:02:30.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 2050 +Translated : 2047 Fuzzy : 2984 Untranslated : 12440 -------------------- - All strings : 17474 + All strings : 17471 12 % are translated ++++++ yast2-trans-th-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-th-3.1.0/po/installation.th.po new/yast2-trans-th-3.1.0/po/installation.th.po --- old/yast2-trans-th-3.1.0/po/installation.th.po 2014-10-29 16:39:01.000000000 +0100 +++ new/yast2-trans-th-3.1.0/po/installation.th.po 2015-04-20 18:05:57.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2010-07-01 13:53+0700\n" "Last-Translator: Thanomsub Noppaburana <donga.nb(a)gmail.com>\n" "Language-Team: Thai <thai-l10n(a)googlegroups.com>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "ตัวจำลอง" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "ตัว&จำลอง" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -52,15 +42,19 @@ " ระบบที่จะติดตั้งควรจะเป็นอย่างไรบ้าง หากเลือกใช้ตัวเลือกนี้\n" " จะมีการเขียนค่าโพรไฟล์ของระบบปัจจุบันไปเก็บยังแฟ้ม <tt>/root/autoinst.xml</tt>" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "เขียนการปรับแต่งค่าระบบ" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -68,27 +62,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "ทำการคัดลอกแฟ้มไปยังระบบที่ติดตั้ง..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "ทำการคัดลอกปูมบันทึกไปยังระบบที่ติดตั้ง..." @@ -1140,7 +1130,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "เ&ปลี่ยนค่า..." @@ -1556,31 +1546,31 @@ "กำลังยกเลิกการติดตั้ง" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "ถูกเอาออก" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "ถูกเปิดใช้งาน" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "ถูกปิดการใช้งาน" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "คลังแพกเกจที่เคยใช้ก่อนหน้านี้" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1589,27 +1579,27 @@ "คุณกำลังจะการปรับรุ่น:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "สถานะปัจจุบัน" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "คลังแพกเกจ" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "ที่อยู่ URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&สลับสถานะ" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1619,7 +1609,7 @@ "จะใช้ร่วมในกระบวนการปรับรุ่นให้ทันสมัย" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1628,30 +1618,30 @@ "สลับสถานะ หรือดับเบิลคลิกบนรายการที่ต้องการในตาราง" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "เพื่อเปลี่ยนค่าที่อยู่ URL ให้คลิกที่ปุ่ม เปลี่ยนค่า..." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "ไม่ทราบ" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "ที่อยู่ &URL ของคลังแพกเกจ" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "ยังไม่ได้ทำการปรับแต่งเครือข่าย" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1660,51 +1650,51 @@ "คุณต้องการจะปรับแต่งค่าของมันก่อนหรือไม่ ?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "ทำการเพิ่มและลบคลังแพกเกจ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy #| msgid "Please wait while repositories are being added and removed." msgid "Repositories are being added and removed." msgstr "โปรดรอระหว่างที่กำลังทำการเพิ่มและลบคลังแพกเกจ" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "ลบคลังแพกเกจที่ไม่ได้ใช้แล้ว" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "ทำการลบคลังแพกเกจที่ไม่ได้ใช้แล้ว..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "เพิ่มคลังแพกเกจที่ถูกเปิดใช้งาน" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "ทำการเพิ่มคลังแพกเกจที่ถูกเปิดใช้งาน..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "เพิ่มคลังแพกเกจที่ถูกปิดการใช้งาน" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "ทำการเพิ่มคลังแพกเกจที่ถูกปิดการใช้งาน..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "ต้องการใช้แผ่นสื่อที่ถูกต้อง" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 #, fuzzy #| msgid "" #| "Make sure that media with label %1\n" @@ -1724,7 +1714,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1734,7 +1724,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1746,7 +1736,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1758,7 +1748,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy #| msgid "" #| "An error occurred when enabling repository\n" @@ -1774,7 +1764,7 @@ "ที่อยู่ URL: %2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1895,11 +1885,6 @@ msgstr "ทำการจัดเก็บค่าปรับแต่งความปลอดภัย..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "ทำการจัดเก็บค่าปรับแต่งสคริปต์การบูตระบบ..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "ทำการจัดเก็บค่าปรับแต่งของฮาร์ดแวร์..." @@ -2092,19 +2077,19 @@ "โปรดทราบ: คุณอาจจะต้องกรอกข้อมูลบางอย่างใหม่อีกครั้งด้วย" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "ยืนยันการติดตั้ง" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "รับข้อมูลทั้งหมดที่จำเป็นต้องใช้สำหรับการติดตั้งพื้นฐานเสร็จเรียบร้อยแล้ว" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2117,7 +2102,7 @@ " ซึ่งจะเป็นไปตามการตั้งค่าในกล่องโต้ตอบก่อนหน้านี้" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2128,24 +2113,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "หากคุณไม่แน่ใจ ให้ย้อนกลับไปตรวจสอบการตั้งค่าใหม่อีกครั้ง" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "ยืนยันการปรับรุ่น" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "รับข้อมูลทั้งหมดที่จำเป็นต้องใช้สำหรับการปรับรุ่นเสร็จเรียบร้อยแล้ว" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2156,7 +2141,7 @@ "ซึ่งจะเป็นไปตามการตั้งค่าที่ได้ตั้งไว้ในกล่องโต้ตอบก่อนหน้านี้" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "เริ่มการ&ปรับรุ่น" @@ -2254,6 +2239,15 @@ "การติดตั้งไม่สามารถแก้ปัญหาความเกี่ยวพันกันของแพกเกจได้โดยอัตโนมัติ\n" "ดังนั้นจะทำการเปิดเครื่องมือจัดการแพกเกจขึ้นมาเพื่อให้คุณได้แก้ปัญหาด้วยตัวเอง" +#~ msgid "Dummy" +#~ msgstr "ตัวจำลอง" + +#~ msgid "&Dummy" +#~ msgstr "ตัว&จำลอง" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "ทำการจัดเก็บค่าปรับแต่งสคริปต์การบูตระบบ..." + #~ msgid "License needs to be accepted" #~ msgstr "ต้องยอมรับเงื่อนไขสัญญาอนุญาตสิทธิ์เสียก่อน" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-th-3.1.0/po/status.txt new/yast2-trans-th-3.1.0/po/status.txt --- old/yast2-trans-th-3.1.0/po/status.txt 2014-12-16 15:08:12.000000000 +0100 +++ new/yast2-trans-th-3.1.0/po/status.txt 2015-04-20 18:06:19.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 10239 +Translated : 10236 Fuzzy : 2661 Untranslated : 4574 -------------------- - All strings : 17474 + All strings : 17471 59 % are translated ++++++ yast2-trans-tk-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tk-3.1.0/po/installation.tk.po new/yast2-trans-tk-3.1.0/po/installation.tk.po --- old/yast2-trans-tk-3.1.0/po/installation.tk.po 2014-10-29 17:04:53.000000000 +0100 +++ new/yast2-trans-tk-3.1.0/po/installation.tk.po 2015-04-20 17:45:38.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2007-10-221 10:13+0200\n" "Last-Translator: Turkmen <i18n(a)suse.de>\n" "Language-Team: turkmen <i18n(a)suse.de>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -39,39 +29,39 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "" @@ -951,7 +941,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "" @@ -1273,144 +1263,144 @@ msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1420,7 +1410,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1430,7 +1420,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1439,7 +1429,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1448,7 +1438,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1456,7 +1446,7 @@ msgstr "" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1560,11 +1550,6 @@ msgstr "" #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "" - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "" @@ -1699,17 +1684,17 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1718,7 +1703,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1727,22 +1712,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1750,7 +1735,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tk-3.1.0/po/status.txt new/yast2-trans-tk-3.1.0/po/status.txt --- old/yast2-trans-tk-3.1.0/po/status.txt 2014-12-16 14:17:32.000000000 +0100 +++ new/yast2-trans-tk-3.1.0/po/status.txt 2015-04-20 17:45:39.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 162 Fuzzy : 304 -Untranslated : 17008 +Untranslated : 17005 -------------------- - All strings : 17474 + All strings : 17471 1 % are translated ++++++ yast2-trans-tr-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tr-3.1.0/po/installation.tr.po new/yast2-trans-tr-3.1.0/po/installation.tr.po --- old/yast2-trans-tr-3.1.0/po/installation.tr.po 2014-10-29 16:56:54.000000000 +0100 +++ new/yast2-trans-tr-3.1.0/po/installation.tr.po 2015-04-20 18:00:00.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: installation.tr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2004-09-06 16:07+0200\n" "Last-Translator: Omer Kehri <xanathar(a)gmx.com.tr>\n" "Language-Team: Turkish <yast-int(a)suse.de>\n" @@ -23,16 +23,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.3.1\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Geçersiz" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Geçersiz" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -47,34 +37,34 @@ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>." msgstr "" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "Yapılandırmayı güncelle" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "Yapılandırmayı güncelle" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 #, fuzzy @@ -82,7 +72,7 @@ msgstr "Dosyaları kurulu sisteme kopyala" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 #, fuzzy msgid "Copying log files to installed system..." msgstr "Kayıt dosyaları kurulu sisteme kopyalanıyor" @@ -1132,7 +1122,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Değiştir..." @@ -1530,19 +1520,19 @@ # clients/hwinfo.ycp:55 #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Kaldır" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Etkin" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Kapalı" @@ -1550,83 +1540,83 @@ #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Ek hizmetler:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Şu anki durum: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "&Alice deposu:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "Adres" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Durum aç/kapa" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Bilinmeyen" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "&Alice deposu:" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "Yapılandırılacak ağ kartları" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1634,59 +1624,59 @@ # clients/lan_inetd_custom.ycp:156 #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Ek hizmetler:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "Paketler kuruluyor, lütfen bekleyin." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Önceden yazılmış yapılandırmayı oku" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Önceden yazılmış yapılandırma okunuyor..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Önceden yazılmış yapılandırmayı oku" # clients/lan_inetd_custom.ycp:156 #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Ek hizmetler:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Önceden yazılmış yapılandırmayı oku" # clients/lan_inetd_custom.ycp:156 #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Ek hizmetler:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1696,7 +1686,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1706,7 +1696,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1716,7 +1706,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1726,7 +1716,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1735,7 +1725,7 @@ msgstr "Profil alınırken bir hata oluştu:\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1867,14 +1857,6 @@ msgid "Saving security settings..." msgstr "Güvenlik ayarları okunuyor..." -# clients/sound_manual.ycp:68 -#. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Ses kartı ayarları kaydediliyor..." - # clients/sound.ycp:155 include/sound/ui.ycp:60 include/sound/ui.ycp:429 #. progress step title #: src/clients/save_hw_status_finish.rb:67 @@ -2068,19 +2050,19 @@ "Bu yol şimdi oluşturulsun mu?" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 #, fuzzy msgid "Confirm Installation" msgstr "Kurulumu onayla?" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy msgid "Information required for the base installation is now complete." msgstr "Kurulum ortamındaki otomatik kurulum komut dosyaları başlatılıyor." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -2089,7 +2071,7 @@ msgstr "" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -2098,7 +2080,7 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 #, fuzzy msgid "Go back and check the settings if you are unsure." msgstr "" @@ -2108,18 +2090,18 @@ # clients/online_update.ycp:134 #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 #, fuzzy msgid "Confirm Update" msgstr "Güncellemeye &devam et" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2127,7 +2109,7 @@ msgstr "" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 #, fuzzy msgid "Start &Update" msgstr "Başlatma &modu" @@ -2220,6 +2202,18 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Geçersiz" + +#~ msgid "&Dummy" +#~ msgstr "&Geçersiz" + +# clients/sound_manual.ycp:68 +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Ses kartı ayarları kaydediliyor..." + # clients/inst_rootpart.ycp:454 #, fuzzy #~ msgid "Search for Linux partitions" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tr-3.1.0/po/status.txt new/yast2-trans-tr-3.1.0/po/status.txt --- old/yast2-trans-tr-3.1.0/po/status.txt 2014-12-16 14:24:01.000000000 +0100 +++ new/yast2-trans-tr-3.1.0/po/status.txt 2015-04-20 18:00:17.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 6786 -Fuzzy : 6216 +Translated : 6784 +Fuzzy : 6215 Untranslated : 4472 -------------------- - All strings : 17474 + All strings : 17471 39 % are translated ++++++ yast2-trans-uk-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-uk-3.1.0/po/installation.uk.po new/yast2-trans-uk-3.1.0/po/installation.uk.po --- old/yast2-trans-uk-3.1.0/po/installation.uk.po 2014-10-29 17:05:55.000000000 +0100 +++ new/yast2-trans-uk-3.1.0/po/installation.uk.po 2015-04-20 18:12:37.000000000 +0200 @@ -7,13 +7,13 @@ # Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>, 2005, 2006, 2007. # Yuri Chornoivan <yurchor(a)ukr.net>, 2008. # Ivan Petrouchtchak <fr.ivan(a)ukrainian-orthodox.org>, 2008, 2009. -# Andriy Bandura <andriykopanytsia(a)gmail.com>, 2014. +# Andriy Bandura <andriykopanytsia(a)gmail.com>, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation.uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-10-10 14:47+0300\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-10 09:46+0200\n" "Last-Translator: Andriy Bandura <andriykopanytsia(a)gmail.com>\n" "Language-Team: Ukrainian <www-uk-translations(a)gnu.org>\n" "Language: uk\n" @@ -23,16 +23,6 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Макет" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Макет" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -51,39 +41,39 @@ "знав, якою повинна бути встановлена система, йому потрібний профіль. Якщо увімкнено\n" "цей параметр, то профіль поточної системи буде збережено в файлі <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "Записати профіль AutoYaST у /root/autoinst.xml на кінці інсталяції?" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "Клонувати конфігурацію системи" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "&Клонувати конфігурацію системи" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "Профіль AutoYaST буде збережений у /root/autoinst.xml (<a href=\"%1\">не зберігати</a>)." #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "Профіль AutoYaST не буде збережено (<a href=\"%1\">зберегти</a>)." -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "Зберегти профіль AutoYaST в /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Копіювання файлів у систему, яка встановлюється..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Копіювання файлів журналу у систему, яка встановлюється..." @@ -1049,7 +1039,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Змінити..." @@ -1419,31 +1409,31 @@ "Встановлення перервано." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Вилучено" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Увімкнено" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Вимкнено" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Вже вживані сховища" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1452,27 +1442,27 @@ "яку ви оновлюєте:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Поточний стан" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Сховище" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Перемкнути стан" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1482,7 +1472,7 @@ "плануєте використовувати в процесі оновлення." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1491,30 +1481,30 @@ "кнопку Перемкнути стан або двічі клацніть на відповідний елемент." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Щоб змінити адресу URL, натисніть на кнопку Змінити..." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Невідомо" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "URL схови&ща" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Мережу не налаштовано" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1523,49 +1513,49 @@ "Налаштувати це з'єднання?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Додавання і вилучення сховищ..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Додаються і вилучаються сховища." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Вилучити сховища, які не використовуються" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Вилучення сховищ, які не використовуються..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Додати увімкнені сховища" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Додавання увімкнених сховищ..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Додати вимкнені сховища" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Додавання вимкнених сховищ..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "Запит правильного носія" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1579,7 +1569,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1594,7 +1584,7 @@ "Сховище буде додано у вимкненому стані." #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1606,7 +1596,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1618,7 +1608,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1629,7 +1619,7 @@ "Адреса URL: %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1742,11 +1732,6 @@ msgstr "Збереження параметрів безпеки..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Збереження параметрів сценаріїв завантаження..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Збереження конфігурації обладнання..." @@ -1921,17 +1906,17 @@ "ввести деяку інформацію." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Підтвердити встановлення" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Вже є вся необхідна інформація для встановлення основи." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1944,7 +1929,7 @@ "встановлення в попередніх вікнах." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1956,22 +1941,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Якщо не впевнені, то поверніться назад і перевірте параметри." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Підтвердити оновлення" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Вже є вся необхідна інформація для виконання оновлення." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1982,7 +1967,7 @@ "перезаписано відповідно до параметрів у попередніх вікнах." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Почати &оновлення" @@ -2066,6 +2051,15 @@ "Програма встановлення не змогла автоматично вирішити залежності\n" "пакунків. Буде відкрито менеджер пакунків, щоб ви вирішили їх вручну." +#~ msgid "Dummy" +#~ msgstr "Макет" + +#~ msgid "&Dummy" +#~ msgstr "&Макет" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Збереження параметрів сценаріїв завантаження..." + #~ msgid "License needs to be accepted" #~ msgstr "Слід прийняти ліцензію" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-uk-3.1.0/po/status.txt new/yast2-trans-uk-3.1.0/po/status.txt --- old/yast2-trans-uk-3.1.0/po/status.txt 2014-12-16 14:21:59.000000000 +0100 +++ new/yast2-trans-uk-3.1.0/po/status.txt 2015-04-20 18:13:08.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17474 +Translated : 17471 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-vi-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-vi-3.1.0/po/installation.vi.po new/yast2-trans-vi-3.1.0/po/installation.vi.po --- old/yast2-trans-vi-3.1.0/po/installation.vi.po 2014-10-29 17:08:47.000000000 +0100 +++ new/yast2-trans-vi-3.1.0/po/installation.vi.po 2015-04-20 17:48:31.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-07-18 03:56+0400\n" "Last-Translator: Phan Vĩnh Thịnh <teppi82(a)gmail.com>\n" "Language-Team: Vietnamese <vi-VN(a)googlegroups.com>\n" @@ -17,16 +17,6 @@ "Plural-Forms: nplurals=1; nplural=0\n" "X-Generator: KBabel 1.10\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Hình nộm" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Hình nộm" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -46,15 +36,19 @@ "cần một xác lập để biết hệ thống muốn cài đặt sẽ như thế nào. Nếu dùng tùy chọn này\n" "thì một xác lập cho hệ thống hiện thời sẽ được đặt tại /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Online Update Configuration" msgid "Clone System Configuration" msgstr "Cấu hình cập nhật trực tuyến" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "Online Update Configuration" msgid "&Clone System Configuration" @@ -62,27 +56,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Đang sao chép tập tin vào hệ thống đã cài đặt..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Đang sao chép tập tin bản ghi vào hệ thống đã cài đặt..." @@ -1083,7 +1073,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Thay đổi..." @@ -1501,160 +1491,160 @@ msgstr "Lỗi bắt đầu thư mục." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Gỡ bỏ" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Dùng" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Không dùng" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Tập tin phụ" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Trạng thái hiện thời: " #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "Đăng ký sản phẩm" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 #, fuzzy msgid "&Toggle Status" msgstr "Trạng thái" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Không biết" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Đăng ký sản phẩm" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "Cấu hình mạng" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Tập tin phụ" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "Xin hãy đợi trong khi cấu hình hệ thống." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Đọc thiết lập trước đây" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Đọc những gói có trong nguồn cài đặt.." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Đọc thiết lập trước đây" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Tập tin phụ" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Đọc thiết lập trước đây" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Tập tin phụ" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1664,7 +1654,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1674,7 +1664,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1686,7 +1676,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1698,7 +1688,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1709,7 +1699,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1834,13 +1824,6 @@ msgstr "Đang ghi thiết lập..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Reading the previous settings..." -msgid "Saving boot scripts settings..." -msgstr "Đang đọc thiết lập trước đây..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Đang lưu cấu hình phần cứng..." @@ -2019,19 +2002,19 @@ msgstr "" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Xác nhận cài đặt" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Đã có mọi thông tin cần thiết cho cài đặt cơ bản." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2045,7 +2028,7 @@ "theo thiết lập cài đặt trong hộp thoại trước." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2058,24 +2041,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Quay lại và kiểm tra lại thiết lập nếu không chắc chắn." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Xác nhập cập nhật" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Đã có mọi thông tin cần thiết cho cập nhật." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2087,7 +2070,7 @@ "theo thiết lập cài đặt trong hộp thoại trước." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Bắt đầu &cập nhật" @@ -2177,6 +2160,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Hình nộm" + +#~ msgid "&Dummy" +#~ msgstr "&Hình nộm" + +#, fuzzy +#~| msgid "Reading the previous settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Đang đọc thiết lập trước đây..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "cần phải cài đặt lại" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-vi-3.1.0/po/status.txt new/yast2-trans-vi-3.1.0/po/status.txt --- old/yast2-trans-vi-3.1.0/po/status.txt 2014-12-16 14:28:12.000000000 +0100 +++ new/yast2-trans-vi-3.1.0/po/status.txt 2015-04-20 17:48:35.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 2385 -Fuzzy : 5788 +Translated : 2383 +Fuzzy : 5787 Untranslated : 9301 -------------------- - All strings : 17474 + All strings : 17471 14 % are translated ++++++ yast2-trans-wa-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-wa-3.1.0/po/installation.wa.po new/yast2-trans-wa-3.1.0/po/installation.wa.po --- old/yast2-trans-wa-3.1.0/po/installation.wa.po 2014-10-29 16:45:58.000000000 +0100 +++ new/yast2-trans-wa-3.1.0/po/installation.wa.po 2015-04-20 18:05:37.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: installation.wa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2012-08-16 18:50+0200\n" "Last-Translator: Jean Cayron <jean.cayron(a)base.be>\n" "Language-Team: Walloon <linux-wa(a)walon.org>\n" @@ -23,16 +23,6 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Pitit no" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Pitit no" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -57,15 +47,19 @@ "a dandjî d' on profil po cnoxhe comint duvreut rashonner l' sistinme astalé. Si cisse tchuze\n" "est tchoezeye, on profil do sistinme do moumint va esse wårdé e <tt>/root/autoinst.xml</tt>." +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration..." msgid "Clone System Configuration" msgstr "Dji scrî l' apontiaedje do sistinme…" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -73,27 +67,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Dji copeye les fitchîs aviè l' sistinme d' astalé..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Dji copeye les fitchîs djournås diviè l' sistinme d' astalé..." @@ -1081,7 +1071,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Candjî..." @@ -1465,31 +1455,31 @@ "Dj' abandene l' astalaedje." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "Oisté" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "En alaedje" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Essocté" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "Depots dedja -z eployîs" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1498,27 +1488,27 @@ "ki vs estoz a mete a djoû:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "Situwåcion pol moumint" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "Depot" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&(Dis)mete estat" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1527,7 +1517,7 @@ "sol sistinme ki vs estoz a mete a djoû. Metoz en alaedje les cis k' vos vloz mete e processus di metaedje a djoû." #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1536,30 +1526,30 @@ "boton <n>(Dis)mete estat oudonbén dobe-clitchîz sol bon cayet do tåvlea." #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "Po candjî l' adresse, clitchîz sol boton Candjî...." #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Nén cnoxhou" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "Ad&resse do depot" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "Li rantoele n' est nén apontieye" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1568,49 +1558,49 @@ "L' apontyî?" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "Dji radjoute et oistêye des depots..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "Des depots sont radjoutés et oistés." -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "Oister les depots nén eployîs" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "Dji oistêye les depots nén eployîs.." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "Radjouter des depots en alaedje" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "Dji radjoute des depots en alaedje..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "Radjouter des depots essoctés" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "Dji radjoute des depots essoctés..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "I fåt l' bon media" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1624,7 +1614,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1634,7 +1624,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1646,7 +1636,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1658,7 +1648,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1669,7 +1659,7 @@ "URL : %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1782,11 +1772,6 @@ msgstr "Dji schape les tchuzes di såvrité..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "Dji schape les tchuzes des scripes d' enondaedje do sistinme..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Dji schape l' apontiaedje di l' éndjolreye" @@ -1956,17 +1941,17 @@ "Note: Vous pôrîz dvou intrer co on côp sacwantès informåcions." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Astaler podbon" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "Dj' a asteure totes les informåcions k' i fåt po l' astalaedje di båze." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1979,7 +1964,7 @@ "sorlon les tchuzes d' astalaedje des dvizes di dvant." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1991,22 +1976,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Rivnoz en erî et verifyîz les tchuzes si vs n' estoz nén seur di c' ki vs fijhoz." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Aveuri l' metaedje a djoû" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "Dj' a asteure les informåcions k' on-z a dandjî po mete a djoû." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -2017,7 +2002,7 @@ "sorlon les tchuzes tchoezeyes dins les dvizes di dvant." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Ataker l' &metaedje a djoû" @@ -2111,6 +2096,15 @@ "L' astalaedje n' a sepou rezoude otomaticmint les aloyances des pacaedjes.\n" "Li manaedjeu des programes va esse drovou por vos les rezoude al mwin." +#~ msgid "Dummy" +#~ msgstr "Pitit no" + +#~ msgid "&Dummy" +#~ msgstr "&Pitit no" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Dji schape les tchuzes des scripes d' enondaedje do sistinme..." + #~ msgid "License needs to be accepted" #~ msgstr "Li licince doet esse acceptêye" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-wa-3.1.0/po/status.txt new/yast2-trans-wa-3.1.0/po/status.txt --- old/yast2-trans-wa-3.1.0/po/status.txt 2014-12-16 14:23:25.000000000 +0100 +++ new/yast2-trans-wa-3.1.0/po/status.txt 2015-04-20 18:05:49.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 6977 +Translated : 6974 Fuzzy : 6807 Untranslated : 3690 -------------------- - All strings : 17474 + All strings : 17471 40 % are translated ++++++ yast2-trans-xh-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-xh-3.1.0/po/installation.xh.po new/yast2-trans-xh-3.1.0/po/installation.xh.po --- old/yast2-trans-xh-3.1.0/po/installation.xh.po 2014-10-29 16:51:41.000000000 +0100 +++ new/yast2-trans-xh-3.1.0/po/installation.xh.po 2015-04-20 18:03:15.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-11-03 14:26\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -15,16 +15,6 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "iDami" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&iDami" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -44,15 +34,19 @@ " AutoYaST. Ukuba oku kunokukhethwa\n" " kukhethiwe, kulondolozwe inkangeleko yecala lesixokelelwano sangoku /kwingcambu yamandla/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Ukubhala ubumbeko lwesixokelelwano" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -60,27 +54,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Kukhutshelwa iifayili kwisixokelelwano esihlohliweyo" #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Kukhutshelwa iifayili zokungena kwisixokelelwano esihlohliweyo..." @@ -1098,7 +1088,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Guqula..." @@ -1510,161 +1500,161 @@ "Iyeka ukuhlohla." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Shenxisa" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Kunikwa isakhono" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Kususwa isakhono" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Khetha Imithombo Efakelweyo:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Isimo Sangoku:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "&Indawo Yokuhlala Yenkangeleko Yecala:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "I-URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Isimo Sokutshintsha ngendlela efanayo" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Akwaziwa" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Imithombo efanele Ukubhaliswa" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "inkqubo ayibumbekanga" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Khetha Imithombo Efakelweyo:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "Nceda linda xa kusabuyiselwa kwakhona umfuziselo.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Funda ubumbeko olugcinwe ngaphambili" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Ifunda ubumbeko olugcinwe ngaphambili..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Funda ubumbeko olugcinwe ngaphambili" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Khetha Imithombo Efakelweyo:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Funda ubumbeko olugcinwe ngaphambili" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Khetha Imithombo Efakelweyo:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1674,7 +1664,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1684,7 +1674,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1696,7 +1686,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1706,7 +1696,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1717,7 +1707,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1842,13 +1832,6 @@ msgstr "Kufundwa imimiselo yokhuseleko..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Igcina izakhelo zekhadi lesandi..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Kugcinwa ubumbeko lomsebenzi wothungelwano..." @@ -2035,19 +2018,19 @@ " Qaphela: Kusenokufuneka ukuba ungenise olunye ulwazi kwakhona." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Qinisekisa Ukuhlohla" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Lonke ulwazi olufunekayo ukwenzela ukuhlohla isiseko ngoku lugqibekile." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2061,7 +2044,7 @@ " ngokwemimiselo yokuhlohla kwiingxoxo ezidlulileyo. " #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2074,24 +2057,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Buya umva uqwalasele imimiselo xa ungaqinisekanga." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Qinisekisa Uhlaziyo" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Lonke ulwazi olufunekayo ukuze kwenziwe uhlaziyo ngoku lugqibekile." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2103,7 +2086,7 @@ " ngokwemimiselo kwiingxoxo ezidlulileyo." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Qalisa &Uhlaziyo" @@ -2195,6 +2178,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "iDami" + +#~ msgid "&Dummy" +#~ msgstr "&iDami" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Igcina izakhelo zekhadi lesandi..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "Kufuneka kuphindwe kwahlohlwa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-xh-3.1.0/po/status.txt new/yast2-trans-xh-3.1.0/po/status.txt --- old/yast2-trans-xh-3.1.0/po/status.txt 2014-12-16 15:12:13.000000000 +0100 +++ new/yast2-trans-xh-3.1.0/po/status.txt 2015-04-20 18:03:32.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7349 -Fuzzy : 5584 +Translated : 7347 +Fuzzy : 5583 Untranslated : 4541 -------------------- - All strings : 17474 + All strings : 17471 42 % are translated ++++++ yast2-trans-zh_CN-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zh_CN-3.1.0/po/installation.zh_CN.po new/yast2-trans-zh_CN-3.1.0/po/installation.zh_CN.po --- old/yast2-trans-zh_CN-3.1.0/po/installation.zh_CN.po 2014-10-29 16:59:44.000000000 +0100 +++ new/yast2-trans-zh_CN-3.1.0/po/installation.zh_CN.po 2015-04-20 17:52:40.000000000 +0200 @@ -7,13 +7,13 @@ # Novell Language <language(a)novell.com>, 2004, 2005. # Thruth Wang <lihaow(a)opera.com>, 2007. # Eric Shan <ericalways(a)gmail.com>, 2008, 2012, 2013. -# 玛格丽特 · 苏 <i(a)marguerite.su>, 2013, 2014. +# 玛格丽特 · 苏 <i(a)marguerite.su>, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" -"PO-Revision-Date: 2014-09-04 14:04+0800\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" +"PO-Revision-Date: 2015-01-16 22:14+0800\n" "Last-Translator: 玛格丽特 · 苏 <marguerite(a)opensuse.org>\n" "Language-Team: Chinese Simplified <opensuse-zh(a)opensuse.org>\n" "Language: zh_CN\n" @@ -23,16 +23,6 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "演示" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "演示(&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -51,39 +41,39 @@ "AutoYaST 需要一个方案来获知安装后的系统应该长什么样子。\n" "若选择了此选项，将把当前系统的方案存储到 <tt>/root/autoinst.xml</tt>。" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "安装结束后写入 AutoYaST 方案到 /root/autoinst.xml 吗？" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 msgid "Clone System Configuration" msgstr "复制系统配置" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 msgid "&Clone System Configuration" msgstr "复制系统配置(&C)" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "AutoYaST 方案将被写入在 /root/autoinst.xml 下(<a href=\"%1\">不写入</a>)。" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "将不会保存 AutoYaST 方案(<a href=\"%1\">写入</a>)。" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "写入 AutoYaST 方案到 /root/autoinst.xml" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "正在将文件复制到安装好的系统..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "正在将日志文件复制到安装好的系统..." @@ -1025,7 +1015,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "修改(&C)..." @@ -1388,58 +1378,58 @@ "即将中止安装。" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "已移除" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "已启用" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "已禁用" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "之前用过的软件源" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "在您正在升级的系统中发现以下软件源：" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "当前状态" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "软件源" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "切换状态(&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1448,7 +1438,7 @@ "请启用您想要在升级过程中使用的软件源。" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1457,30 +1447,30 @@ "切换状态按钮或双击相应的表格项。" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "要修改 URL，请点击修改...按钮。" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "未知" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "软件源 URL(&R)" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "网络尚未配置" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1489,49 +1479,49 @@ "配置互联网连接吗？" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "正在添加和移除软件源..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "正在添加和移除软件源。" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "移除无用的软件源" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "正在移除无用的软件源..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "添加已启用的软件源" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "正在添加已启用的软件源..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "添加已禁用的软件源" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "正在添加已禁用的软件源..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "需要正确的介质" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1544,7 +1534,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1558,7 +1548,7 @@ "该软件源将以已禁用模式添加。" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1570,7 +1560,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1582,7 +1572,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1593,7 +1583,7 @@ "URL：%2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1704,11 +1694,6 @@ msgstr "正在保存安全设置..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "正在保存引导脚本设置..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "正在保存硬件配置..." @@ -1874,17 +1859,17 @@ "注意：您可能需要再次输入一些信息。" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "确认安装" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "现在已完成了基本安装所需的信息。" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1895,7 +1880,7 @@ "您硬盘上的已有分区。(这些分区将被擦除任何已有数据)" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1904,22 +1889,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "若您不确定请返回并检查设置。" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "确认更新" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "现在已完成了执行更新所需的信息。" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1929,7 +1914,7 @@ "现在您若继续，则会根据之前对话框中的设置覆盖您硬盘上的数据。" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "开始更新(&U)" @@ -2013,6 +1998,15 @@ "安装未能自动解决软件包依赖关系。\n" "将打开软件包管理器来让您手动解决那些依赖关系。" +#~ msgid "Dummy" +#~ msgstr "演示" + +#~ msgid "&Dummy" +#~ msgstr "演示(&D)" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "正在保存引导脚本设置..." + #~ msgid "Search for Linux partitions" #~ msgstr "搜索 Linux 分区" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zh_CN-3.1.0/po/status.txt new/yast2-trans-zh_CN-3.1.0/po/status.txt --- old/yast2-trans-zh_CN-3.1.0/po/status.txt 2014-12-16 15:03:37.000000000 +0100 +++ new/yast2-trans-zh_CN-3.1.0/po/status.txt 2015-04-20 17:53:09.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 17474 +Translated : 17471 Fuzzy : 0 Untranslated : 0 -------------------- - All strings : 17474 + All strings : 17471 100 % are translated ++++++ yast2-trans-zh_TW-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zh_TW-3.1.0/po/installation.zh_TW.po new/yast2-trans-zh_TW-3.1.0/po/installation.zh_TW.po --- old/yast2-trans-zh_TW-3.1.0/po/installation.zh_TW.po 2014-10-29 16:56:07.000000000 +0100 +++ new/yast2-trans-zh_TW-3.1.0/po/installation.zh_TW.po 2015-04-20 18:06:28.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2013-01-16 09:21+0800\n" "Last-Translator: Ray Chen <swyear(a)opensuse.org>\n" "Language-Team: Chinese Traditional <kde-i18n-doc(a)kde.org>\n" @@ -20,16 +20,6 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.4\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "虛構" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "虛構(&D)" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -49,41 +39,41 @@ "需要一個設定檔，才能知道已安裝系統是什麼樣子。若選取此選項，\n" "一個針對目前系統的設定檔會被儲存在 <tt>/root/autoyast.xml</tt>。" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy msgid "Clone System Configuration" msgstr "正在寫入系統組態..." #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy msgid "&Clone System Configuration" msgstr "跳過組態(&S)" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "正在複製檔案到已安裝的系統..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "正在複製記錄檔到已安裝的系統..." @@ -1057,7 +1047,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "變更(&C)..." @@ -1430,31 +1420,31 @@ "中止安裝。" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 msgid "Removed" msgstr "移除" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "啟用" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "已停用" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 msgid "Previously Used Repositories" msgstr "之前使用的套件庫" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" @@ -1463,27 +1453,27 @@ "發現這些套件庫：" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 msgid "Current Status" msgstr "目前狀態" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 msgid "Repository" msgstr "套件庫" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "切換狀態(&T)" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." @@ -1492,7 +1482,7 @@ "所有軟體套件庫，您可以啟用那些您想包含在升級程序中的套件庫。" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." @@ -1501,30 +1491,30 @@ "切換狀態按鈕或是連擊相對應的表格選項。" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "若要改變 URL，請按 「變更...」按鈕。" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "不明" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 msgid "&Repository URL" msgstr "套件庫 URL(&R)" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 msgid "Network is not Configured" msgstr "網路尚未設定" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" @@ -1533,49 +1523,49 @@ "要設定嗎？" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 msgid "Adding and removing repositories..." msgstr "加入和移除套件庫..." #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 msgid "Repositories are being added and removed." msgstr "套件庫已被加入和移除。" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 msgid "Remove unused repositories" msgstr "移除不用的套件庫" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 msgid "Removing unused repositories..." msgstr "正在移除不用的套件庫..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 msgid "Add enabled repositories" msgstr "加入啟用的套件庫" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 msgid "Adding enabled repositories..." msgstr "正在啟用套件庫..." -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 msgid "Add disabled repositories" msgstr "加入停用的套件庫" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 msgid "Adding disabled repositories..." msgstr "正在加入停用的套件庫..." #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "修正媒體需求" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1589,7 +1579,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1599,7 +1589,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 msgid "" "Cannot add enabled repository\n" "Name: %1\n" @@ -1611,7 +1601,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 msgid "" "An error occurred while refreshing repository\n" "Name: %1\n" @@ -1623,7 +1613,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 msgid "" "An error occurred while enabling repository\n" "Name: %1\n" @@ -1634,7 +1624,7 @@ "位址： %2\n" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 msgid "" "Cannot add disabled repository\n" "Name: %1\n" @@ -1747,11 +1737,6 @@ msgstr "正在儲存安全性設定..." #. progress step title -#: src/clients/save_config_finish.rb:208 -msgid "Saving boot scripts settings..." -msgstr "正在開機 script 設定..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "正在儲存硬體組態..." @@ -1921,17 +1906,17 @@ "注意：您可能需要再次輸入某些資訊。" #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "確認安裝" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 msgid "Information required for the base installation is now complete." msgstr "基本安裝所需的資訊現在都已完成。" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 msgid "" "If you continue now, existing\n" "partitions on your hard disk will be deleted or formatted\n" @@ -1944,7 +1929,7 @@ "(抹除所有現存資料)" #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 msgid "" "If you continue now, partitions on your\n" "hard disk will be modified according to the installation settings in the\n" @@ -1956,22 +1941,22 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "若您不確定，請回到上一頁檢查您的設定。" #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "確認更新" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 msgid "Information required to perform an update is now complete." msgstr "執行更新所需要的資訊現在都已完成。" #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 msgid "" "\n" "If you continue now, data on your hard disk will be overwritten\n" @@ -1982,7 +1967,7 @@ "如果您繼續，硬碟中的資料將被覆蓋。" #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "開始更新(&U)" @@ -2072,6 +2057,15 @@ "安裝程序無法自動解決套件相依性問題。\n" "軟體管理員將開啟讓您能手動解決這些問題。" +#~ msgid "Dummy" +#~ msgstr "虛構" + +#~ msgid "&Dummy" +#~ msgstr "虛構(&D)" + +#~ msgid "Saving boot scripts settings..." +#~ msgstr "正在開機 script 設定..." + #~ msgid "Search for Linux partitions" #~ msgstr "搜尋 Linux 分割區" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zh_TW-3.1.0/po/status.txt new/yast2-trans-zh_TW-3.1.0/po/status.txt --- old/yast2-trans-zh_TW-3.1.0/po/status.txt 2014-12-16 14:18:29.000000000 +0100 +++ new/yast2-trans-zh_TW-3.1.0/po/status.txt 2015-04-20 18:06:58.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 13880 +Translated : 13877 Fuzzy : 1546 Untranslated : 2048 -------------------- - All strings : 17474 + All strings : 17471 79 % are translated ++++++ yast2-trans-zu-3.1.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zu-3.1.0/po/installation.zu.po new/yast2-trans-zu-3.1.0/po/installation.zu.po --- old/yast2-trans-zu-3.1.0/po/installation.zu.po 2014-10-29 17:02:39.000000000 +0100 +++ new/yast2-trans-zu-3.1.0/po/installation.zu.po 2015-04-20 18:08:02.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: installation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-29 16:20+0100\n" +"POT-Creation-Date: 2015-01-07 09:39+0100\n" "PO-Revision-Date: 2006-11-03 14:26\n" "Last-Translator: Novell Language <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\n" @@ -14,16 +14,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#. this is a heading -#: doc/proposal/dummy_proposal.rb:61 -msgid "Dummy" -msgstr "Isithipha" - -#. this is a menu entry -#: doc/proposal/dummy_proposal.rb:63 -msgid "&Dummy" -msgstr "&Isithipha" - #. progress step title #: src/clients/clone_finish.rb:47 msgid "Generating AutoYaST profile if needed..." @@ -43,15 +33,19 @@ " idinga iphrofayili ukuze yazi ukuthi kufanele ibukeke kanjani isistimu efakiwe. Uma lokhu\n" " kukhethiwe, iphrofayili yohlelo lwamanje igcinwa engxenyeni ethi /root/autoyast.xml.\n" +#: src/clients/clone_proposal.rb:60 +msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?" +msgstr "" + #. this is a heading -#: src/clients/clone_proposal.rb:68 +#: src/clients/clone_proposal.rb:71 #, fuzzy #| msgid "Writing the system configuration" msgid "Clone System Configuration" msgstr "Ukubhala ukuhlelwa kwesistimu (system configuration)" #. this is a menu entry -#: src/clients/clone_proposal.rb:70 +#: src/clients/clone_proposal.rb:73 #, fuzzy #| msgid "&Skip Configuration" msgid "&Clone System Configuration" @@ -59,27 +53,23 @@ #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:98 +#: src/clients/clone_proposal.rb:101 msgid "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)." msgstr "" #. TRANSLATORS: Installation overview #. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text -#: src/clients/clone_proposal.rb:107 +#: src/clients/clone_proposal.rb:110 msgid "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)." msgstr "" -#: src/clients/clone_proposal.rb:119 -msgid "Write AutoYaST profile to /root/autoinst.xml" -msgstr "" - #. progress step title #: src/clients/copy_files_finish.rb:81 msgid "Copying files to installed system..." msgstr "Ikopishela amafayela kwisistimu efakiwe..." #. progress step title -#: src/clients/copy_logs_finish.rb:65 +#: src/clients/copy_logs_finish.rb:67 msgid "Copying log files to installed system..." msgstr "Ikopishela amafayela elogi kwisistimu efakiwe..." @@ -1096,7 +1086,7 @@ #. menu button #. TRANSLATORS: Push button #: src/clients/inst_proposal.rb:992 src/clients/inst_proposal.rb:1176 -#: src/clients/inst_upgrade_urls.rb:236 +#: src/clients/inst_upgrade_urls.rb:247 msgid "&Change..." msgstr "&Shintsha..." @@ -1508,161 +1498,161 @@ "Iyayeka ukufaka uhlelo." #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:104 +#: src/clients/inst_upgrade_urls.rb:109 #, fuzzy #| msgid "Remove" msgid "Removed" msgstr "Susa" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:108 +#: src/clients/inst_upgrade_urls.rb:113 msgid "Enabled" msgstr "Ivuliwe ukuze isebenze" #. TRANSLATORS: Table item status (repository) -#: src/clients/inst_upgrade_urls.rb:112 +#: src/clients/inst_upgrade_urls.rb:117 msgid "Disabled" msgstr "Icishiwe" #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption #. TRANSLATORS: dialog caption -#: src/clients/inst_upgrade_urls.rb:209 src/clients/inst_upgrade_urls.rb:677 -#: src/clients/inst_upgrade_urls.rb:736 +#: src/clients/inst_upgrade_urls.rb:220 src/clients/inst_upgrade_urls.rb:616 +#: src/clients/inst_upgrade_urls.rb:675 #, fuzzy msgid "Previously Used Repositories" msgstr "Khetha Eminye Imithombo:" #. TRANSLATORS: dialog text, possibly multiline, #. Please, do not use more than 50 characters per line. -#: src/clients/inst_upgrade_urls.rb:215 +#: src/clients/inst_upgrade_urls.rb:226 msgid "" "These repositories were found on the system\n" "you are upgrading:" msgstr "" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:225 +#: src/clients/inst_upgrade_urls.rb:236 #, fuzzy msgid "Current Status" msgstr "Isimo Samanje:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:227 +#: src/clients/inst_upgrade_urls.rb:238 #, fuzzy msgid "Repository" msgstr "&Inqolobane Yephrofayili:" #. TRANSLATORS: Table header item -#: src/clients/inst_upgrade_urls.rb:229 +#: src/clients/inst_upgrade_urls.rb:240 msgid "URL" msgstr "I-URL" #. TRANSLATORS: Push button -#: src/clients/inst_upgrade_urls.rb:239 +#: src/clients/inst_upgrade_urls.rb:250 msgid "&Toggle Status" msgstr "&Shintsha Isimo" #. TRANSLATORS: help text 1/3 -#: src/clients/inst_upgrade_urls.rb:245 +#: src/clients/inst_upgrade_urls.rb:256 msgid "" "Here you see all software repositories found\n" "on the system you are upgrading. Enable the ones you want to include in the upgrade process." msgstr "" #. TRANSLATORS: help text 2/3 -#: src/clients/inst_upgrade_urls.rb:249 +#: src/clients/inst_upgrade_urls.rb:260 msgid "" "To enable, remove or disable an URL, click on the\n" "Toggle Status button or double-click on the respective table item." msgstr "" #. TRANSLATORS: help text 3/3 -#: src/clients/inst_upgrade_urls.rb:253 +#: src/clients/inst_upgrade_urls.rb:264 msgid "To change the URL, click on the Change... button." msgstr "" #. one_url already has "id" and some items might be deleted #. looking to id_to_name is done via the original key #. TRANSLATORS: Fallback name for a repository -#: src/clients/inst_upgrade_urls.rb:275 src/clients/inst_upgrade_urls.rb:282 -#: src/clients/inst_upgrade_urls.rb:288 +#: src/clients/inst_upgrade_urls.rb:286 src/clients/inst_upgrade_urls.rb:293 +#: src/clients/inst_upgrade_urls.rb:299 msgid "Unknown" msgstr "Akwaziwa" #. TRANSLATORS: textentry -#: src/clients/inst_upgrade_urls.rb:383 +#: src/clients/inst_upgrade_urls.rb:373 #, fuzzy msgid "&Repository URL" msgstr "Imithombo Yokubhalisa" #. TRANSLATORS: popup header -#: src/clients/inst_upgrade_urls.rb:647 +#: src/clients/inst_upgrade_urls.rb:586 #, fuzzy msgid "Network is not Configured" msgstr "uhlelo aluhlelwanga" #. TRANSLATORS: popup question -#: src/clients/inst_upgrade_urls.rb:649 +#: src/clients/inst_upgrade_urls.rb:588 msgid "" "Remote repositories require an Internet connection.\n" "Configure it?" msgstr "" #. TRANSLATORS: Progress text -#: src/clients/inst_upgrade_urls.rb:680 src/clients/inst_upgrade_urls.rb:737 +#: src/clients/inst_upgrade_urls.rb:619 src/clients/inst_upgrade_urls.rb:676 #, fuzzy msgid "Adding and removing repositories..." msgstr "Khetha Eminye Imithombo:" #. TRANSLATORS: help text #. TRANSLATORS: help text -#: src/clients/inst_upgrade_urls.rb:683 src/clients/inst_upgrade_urls.rb:742 +#: src/clients/inst_upgrade_urls.rb:622 src/clients/inst_upgrade_urls.rb:681 #, fuzzy msgid "Repositories are being added and removed." msgstr "" "\n" "Sicela ulinde lapho isithombe sisatholwa.\n" -#: src/clients/inst_upgrade_urls.rb:702 +#: src/clients/inst_upgrade_urls.rb:641 #, fuzzy msgid "Remove unused repositories" msgstr "Ifunda ukuhlelwa okugcinwe esikhathini esidlule" #. force reloading the libzypp repomanager to notice the removed files -#: src/clients/inst_upgrade_urls.rb:706 src/clients/inst_upgrade_urls.rb:859 +#: src/clients/inst_upgrade_urls.rb:645 src/clients/inst_upgrade_urls.rb:798 #, fuzzy msgid "Removing unused repositories..." msgstr "Ifunda ukuhlelwa okugcinwe esikhathini esidlule..." -#: src/clients/inst_upgrade_urls.rb:713 +#: src/clients/inst_upgrade_urls.rb:652 #, fuzzy msgid "Add enabled repositories" msgstr "Ifunda ukuhlelwa okugcinwe esikhathini esidlule" #. Adds selected repositories as <tt>enabled</tt> -#: src/clients/inst_upgrade_urls.rb:716 src/clients/inst_upgrade_urls.rb:925 +#: src/clients/inst_upgrade_urls.rb:655 src/clients/inst_upgrade_urls.rb:864 #, fuzzy msgid "Adding enabled repositories..." msgstr "Khetha Eminye Imithombo:" -#: src/clients/inst_upgrade_urls.rb:725 +#: src/clients/inst_upgrade_urls.rb:664 #, fuzzy msgid "Add disabled repositories" msgstr "Ifunda ukuhlelwa okugcinwe esikhathini esidlule" #. Adds selected repositories as <tt>disabled</tt> -#: src/clients/inst_upgrade_urls.rb:729 src/clients/inst_upgrade_urls.rb:1082 +#: src/clients/inst_upgrade_urls.rb:668 src/clients/inst_upgrade_urls.rb:1021 #, fuzzy msgid "Adding disabled repositories..." msgstr "Khetha Eminye Imithombo:" #. true - OK, continue -#: src/clients/inst_upgrade_urls.rb:899 +#: src/clients/inst_upgrade_urls.rb:838 msgid "Correct Media Requested" msgstr "" -#: src/clients/inst_upgrade_urls.rb:901 +#: src/clients/inst_upgrade_urls.rb:840 msgid "" "Make sure that media with label %1\n" "is in the CD/DVD drive.\n" @@ -1672,7 +1662,7 @@ #. Adding repositories in a disabled state, then enable them #. for the system upgrade -#: src/clients/inst_upgrade_urls.rb:964 +#: src/clients/inst_upgrade_urls.rb:903 msgid "" "Cannot add repository %1\n" "URL: %2\n" @@ -1682,7 +1672,7 @@ msgstr "" #. bnc #543468, do not check aliases of repositories stored in Installation::destdir -#: src/clients/inst_upgrade_urls.rb:1001 +#: src/clients/inst_upgrade_urls.rb:940 #, fuzzy msgid "" "Cannot add enabled repository\n" @@ -1694,7 +1684,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1021 +#: src/clients/inst_upgrade_urls.rb:960 #, fuzzy msgid "" "An error occurred while refreshing repository\n" @@ -1704,7 +1694,7 @@ #. TRANSLATORS: error report #. %1 is replaced with repo-name, %2 with repo-URL -#: src/clients/inst_upgrade_urls.rb:1041 +#: src/clients/inst_upgrade_urls.rb:980 #, fuzzy msgid "" "An error occurred while enabling repository\n" @@ -1715,7 +1705,7 @@ "%2" #. do not probe! adding as disabled! -#: src/clients/inst_upgrade_urls.rb:1122 +#: src/clients/inst_upgrade_urls.rb:1061 #, fuzzy msgid "" "Cannot add disabled repository\n" @@ -1840,13 +1830,6 @@ msgstr "Ifunda amasethingi okuphepha..." #. progress step title -#: src/clients/save_config_finish.rb:208 -#, fuzzy -#| msgid "Saving sound card settings..." -msgid "Saving boot scripts settings..." -msgstr "Gcina amasethingi ekhadi lomsindo..." - -#. progress step title #: src/clients/save_hw_status_finish.rb:67 msgid "Saving hardware configuration..." msgstr "Igcina ukuhlelwa kwe-hardware..." @@ -2033,19 +2016,19 @@ " Phawula: Kungase kudingeke ufake okunye ukwaziswa futhi." #. Heading for confirmation popup before the installation really starts -#: src/include/installation/misc.rb:199 +#: src/include/installation/misc.rb:181 msgid "Confirm Installation" msgstr "Qinisekisa Ukuwufaka Ohlelweni" #. Text for confirmation popup before the installation really starts 1/3 -#: src/include/installation/misc.rb:202 +#: src/include/installation/misc.rb:184 #, fuzzy #| msgid "All information required for the base installation is now complete." msgid "Information required for the base installation is now complete." msgstr "Konke ukwaziswa okudingekayo kokufaka ohlelweni okuyisisekelo manje kuphothuliwe." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:214 +#: src/include/installation/misc.rb:196 #, fuzzy msgid "" "If you continue now, existing\n" @@ -2059,7 +2042,7 @@ " ngokuvumelana namasethingi okufaka kumadayalogi (izibuko) adlule." #. Text for confirmation popup before the installation really starts 2/3 -#: src/include/installation/misc.rb:225 +#: src/include/installation/misc.rb:207 #, fuzzy msgid "" "If you continue now, partitions on your\n" @@ -2072,24 +2055,24 @@ #. Text for confirmation popup before the installation really starts 3/3 #. Text for confirmation popup before the update really starts 3/3 -#: src/include/installation/misc.rb:236 src/include/installation/misc.rb:254 +#: src/include/installation/misc.rb:218 src/include/installation/misc.rb:236 msgid "Go back and check the settings if you are unsure." msgstr "Buyela emuva uhlole amasethingi uma ungaqiniseki." #. Heading for confirmation popup before the update really starts -#: src/include/installation/misc.rb:242 +#: src/include/installation/misc.rb:224 msgid "Confirm Update" msgstr "Qinisekisa Ukuvuselelwa Kwamafayela" #. Text for confirmation popup before the update really starts 1/3 -#: src/include/installation/misc.rb:246 +#: src/include/installation/misc.rb:228 #, fuzzy #| msgid "All information required to perform an update is now complete." msgid "Information required to perform an update is now complete." msgstr "Konke ukwaziswa okudingekayo ukuze kuvuselelwe amafayela manje sekuphothuliwe." #. Text for confirmation popup before the update really starts 2/3 -#: src/include/installation/misc.rb:248 +#: src/include/installation/misc.rb:230 #, fuzzy msgid "" "\n" @@ -2101,7 +2084,7 @@ " ngokwamasethingi akumadayalogi adlule." #. Label for the button that confirms startint the installation -#: src/include/installation/misc.rb:258 +#: src/include/installation/misc.rb:240 msgid "Start &Update" msgstr "Qalisa &Vuselela" @@ -2192,6 +2175,17 @@ "Software manager will be opened for you to solve them manually." msgstr "" +#~ msgid "Dummy" +#~ msgstr "Isithipha" + +#~ msgid "&Dummy" +#~ msgstr "&Isithipha" + +#, fuzzy +#~| msgid "Saving sound card settings..." +#~ msgid "Saving boot scripts settings..." +#~ msgstr "Gcina amasethingi ekhadi lomsindo..." + #, fuzzy #~ msgid "License needs to be accepted" #~ msgstr "idinga ukuphinde ifakwe futhi" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-zu-3.1.0/po/status.txt new/yast2-trans-zu-3.1.0/po/status.txt --- old/yast2-trans-zu-3.1.0/po/status.txt 2014-12-16 14:13:07.000000000 +0100 +++ new/yast2-trans-zu-3.1.0/po/status.txt 2015-04-20 18:08:19.000000000 +0200 @@ -1,6 +1,6 @@ -Translated : 7350 -Fuzzy : 5570 +Translated : 7348 +Fuzzy : 5569 Untranslated : 4554 -------------------- - All strings : 17474 + All strings : 17471 42 % are translated

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2015-04-27 22:07:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod" Changes: -------- New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2015-04-27 22:07:48.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Apr 21 12:43:39 UTC 2015 - mmarek(a)suse.cz + +- Run the kmod testsuite in a separate build, to avoid a buildloop + with the kernel. + --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2015-04-06 00:25:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-04-27 22:07:48.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 21 14:38:55 UTC 2015 - mmarek(a)suse.cz + +- Update to kmod 20 +* More robust ELF parsing +* To fix a race, modprobe only looks at modules.builtin to + determine a builtin module, so e.g. 'modprobe vt' will no longer + work. +* Other fixes +* Testsuite moved to a separate package, since it is now building + the test modules from sources, which requires the kernel package. +* dropped kmod-blacklist-fixtest.patch (merged upstream) + + +------------------------------------------------------------------- Old: ---- kmod-19.tar.sign kmod-19.tar.xz kmod-blacklist-fixtest.patch New: ---- kmod-20.tar.sign kmod-20.tar.xz kmod-testsuite.changes kmod-testsuite.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-testsuite.spec ++++++ # # spec file for package kmod-testsuite # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kmod-testsuite %define lname libkmod2 Version: 20 Release: 0 Summary: Testsuite of the kmod package License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tool… #Announce: https://lkml.org/lkml/2015/3/1/152 #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch7: 0001-use-correct-sort-method-in-test-array.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: git-core BuildRequires: kernel-default-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz %if 0%{?sles_version} == 11 BuildRequires: xz-devel >= 4.99 BuildRequires: zlib-devel %else BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) %endif Requires: suse-module-tools %description This spec file does not produce any binary RPMs. It just builds kmod and runs its testsuite. It has been split off the kmod package to avoid a buildloop with the kernel. %prep %setup -q -n kmod-%version %patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 %build autoreconf -fi export LDFLAGS="-Wl,-z,relro,-z,now" # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ %if 0%{?sles_version} == 11 zlib_CFLAGS=" " zlib_LIBS="-lz" \ %endif --with-xz \ --with-zlib \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" make %{?_smp_mflags} V=1 %install # empty %check make check V=1 %changelog ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.Q2PSNP/_old 2015-04-27 22:07:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2PSNP/_new 2015-04-27 22:07:49.000000000 +0200 @@ -18,24 +18,23 @@ Name: kmod %define lname libkmod2 +Version: 20 +Release: 0 Summary: Utilities to load modules into the kernel License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version: 19 -Release: 0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tool… -#Announce: https://lkml.org/lkml/2014/11/16/97 +#Announce: https://lkml.org/lkml/2015/3/1/152 #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz -Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign +Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz +Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch -Patch6: kmod-blacklist-fixtest.patch Patch7: 0001-use-correct-sort-method-in-test-array.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -101,8 +100,8 @@ in %lname. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1 +%setup -q -n kmod-%version +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 %build autoreconf -fi @@ -115,7 +114,7 @@ %endif --with-xz \ --with-zlib \ - --includedir="%_includedir/%name" \ + --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" make %{?_smp_mflags} V=1 @@ -125,7 +124,7 @@ make install DESTDIR="$b"; rm -f "$b/%_libdir"/*.la -mkdir -p "$b/%_libexecdir/%name" "$b/%_sbindir" "$b/sbin"; +mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin"; for i in depmod insmod lsmod modinfo modprobe rmmod; do # # kmod-compat and kmod-compat(usrmerge) @@ -137,7 +136,7 @@ # Make symlinks also available in normal fashion, # so one can actually run it. # - ln -s "%_bindir/kmod" "$b/%_libexecdir/%name/$i"; + ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i"; done; mkdir -p "$b/%_bindir" "$b/bin"; for i in lsmod; do @@ -153,12 +152,9 @@ ln -s "%_bindir/kmod" "$b/bin/"; %if "%_libdir" != "/%_lib" ln -s "%_libdir/libkmod.so.2" "$b/%_lib/"; -ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/"; +ln -s "%_libdir/libkmod.so.2.2.10" "$b/%_lib/"; %endif -%check -make check V=1 - %post %{?regenerate_initrd_post} @@ -172,7 +168,7 @@ %files %defattr(-,root,root) %_bindir/kmod -%_libexecdir/%name +%_libexecdir/kmod /bin/kmod %_datadir/bash-completion/ %_mandir/man8/kmod.8* ++++++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++++++ --- /var/tmp/diff_new_pack.Q2PSNP/_old 2015-04-27 22:07:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2PSNP/_new 2015-04-27 22:07:49.000000000 +0200 @@ -6,17 +6,17 @@ References: fate#316971 Patch-mainline: never --- - Makefile.am | 4 +++- - libkmod/libkmod-unsupported.c | 9 +++++++++ - libkmod/libkmod-unsupported.h | 8 ++++++++ - tools/modprobe.c | 7 ++++++- - 4 files changed, 26 insertions(+), 2 deletions(-) + Makefile.am | 4 +++- + libkmod/libkmod-unsupported.c | 9 +++++++++ + libkmod/libkmod-unsupported.h | 8 ++++++++ + tools/modprobe.c | 8 +++++++- + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h ---- kmod-19.orig/Makefile.am -+++ kmod-19/Makefile.am -@@ -86,7 +86,9 @@ libkmod_libkmod_la_LIBADD = \ +--- kmod-20.orig/Makefile.am ++++ kmod-20/Makefile.am +@@ -87,7 +87,9 @@ libkmod_libkmod_la_LIBADD = \ ${liblzma_LIBS} ${zlib_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la @@ -28,7 +28,7 @@ -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) --- /dev/null -+++ kmod-19/libkmod/libkmod-unsupported.c ++++ kmod-20/libkmod/libkmod-unsupported.c @@ -0,0 +1,9 @@ +#include "libkmod-internal.h" +#include "libkmod-unsupported.h" @@ -40,7 +40,7 @@ + config->block_unsupported = 0; +} --- /dev/null -+++ kmod-19/libkmod/libkmod-unsupported.h ++++ kmod-20/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ +#pragma once + @@ -50,18 +50,18 @@ + * library + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); ---- kmod-19.orig/tools/modprobe.c -+++ kmod-19/tools/modprobe.c +--- kmod-20.orig/tools/modprobe.c ++++ kmod-20/tools/modprobe.c @@ -38,6 +38,8 @@ #include "kmod.h" -+#include "libkmod-unsupported.h" ++#include "libkmod/libkmod-unsupported.h" + static int log_priority = LOG_CRIT; static int use_syslog = 0; #define LOG(...) log_printf(log_priority, __VA_ARGS__) -@@ -756,6 +758,7 @@ static int do_modprobe(int argc, char ** +@@ -730,6 +732,7 @@ static int do_modprobe(int argc, char ** int do_remove = 0; int do_show_config = 0; int do_show_modversions = 0; @@ -69,7 +69,7 @@ int err; argv = prepend_options_from_env(&argc, orig_argv); -@@ -839,7 +842,7 @@ static int do_modprobe(int argc, char ** +@@ -813,7 +816,7 @@ static int do_modprobe(int argc, char ** kversion = optarg; break; case 128: @@ -78,7 +78,7 @@ break; case 's': env_modprobe_options_append("-s"); -@@ -911,6 +914,9 @@ static int do_modprobe(int argc, char ** +@@ -885,6 +888,9 @@ static int do_modprobe(int argc, char ** log_setup_kmod_log(ctx, verbose); ++++++ kmod-19.tar.xz -> kmod-20.tar.xz ++++++ ++++ 36426 lines of diff (skipped)

1 0

commit java-1_7_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:Factory checked in at 2015-04-27 22:07:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes 2015-04-15 17:42:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes 2015-04-27 22:07:31.000000000 +0200 @@ -1,0 +2,229 @@ +Thu Apr 16 06:20:53 UTC 2015 - fstrba(a)suse.com + +- Add patch: + * linux_vs_sys_ptrace.patch + - Fix type mismatch between linux/ptrace.h and sys/ptrace.h + on some distributions + +------------------------------------------------------------------- +Wed Apr 15 07:31:03 UTC 2015 - fstrba(a)suse.com + +- Update to 2.5.5 - OpenJdk 7u79 + * Security fixes + - S8059064: Better G1 log caching + - S8060461: Fix for JDK-8042609 uncovers additional issue + - S8064601, CVE-2015-0480: Improve jar file handling + - S8065286: Fewer subtable substitutions + - S8065291: Improved font lookups + - S8066479: Better certificate chain validation + - S8067050: Better font consistency checking + - S8067684: Better font substitutions + - S8067699, CVE-2015-0469: Better glyph storage + - S8068320, CVE-2015-0477: Limit applet requests + - S8068720, CVE-2015-0488: Better certificate options checking + - S8069198: Upgrade image library + - S8071726, CVE-2015-0478: Better RSA optimizations + - S8071818: Better vectorization on SPARC + - S8071931, CVE-2015-0460: Return of the phantom menace + * Backports + - S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback + should not be invoked when string value is null + - S6956398, PR2250: make ephemeral DH key match the length of + the certificate key + - S7090424: TestGlyphVectorLayout failed automately with + java.lang.StackOverflowError + - S7142035: assert in j.l.instrument agents during shutdown + when daemon thread is running + - S7160837: DigestOutputStream does not turn off digest + calculation when "close()" is called + - S7195480: javax.smartcardio does not detect cards on Mac OS X + - S8001472: api/java_awt/Window/indexTGF_* tests fail because + expected colors aren't equal + - S8011646: SEGV in compiled code with loop predication + - S8012637: Adjust CipherInputStream class to work in AEAD/GCM + mode + - S8016545: java.beans.XMLEncoder.writeObject output is wrong + - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field + change + - S8019623: Lack of synchronization in AppContext.getAppContext() + - S8021804: Certpath validation fails if validity period of root + cert does not include validity period of intermediate cert + - S8022070: Compilation error in stubGenerator_sparc.cpp with + some compilers + - S8024061: Exception thrown when drag and drop between two + components is executed quickly + - S8028616: Htmleditorkit parser doesn't handle leading slash (/) + - S8028617: Dvorak keyboard mapping not honored when ctrl key + pressed + - S8029837: NPE seen in XMLDocumentFragmentScannerImpl.setProperty + since 7u40b33 + - S8031290: Adjust call to getisax() for additional words + returned + - S8032872: [macosx] Cannot select from JComboBox in a JWindow + - S8032874: ArrayIndexOutOfBoundsException in JTable while + clearing data in JTable + - S8032878: Editable combos in table do not behave as expected + - S8033113: wsimport fails on WSDL:header parameter name + customization + - S8033696: "assert(thread != NULL) failed: just checking" due + to Thread::current() and JNI pthread interaction + - S8036022: D3D: rendering with XOR composite causes + InternalError. + - S8036709: Java 7 jarsigner displays warning about cert policy + tree + - S8036819: JAB: mneumonics not read for textboxes + - S8036983: JAB:Multiselection Ctrl+CursorUp/Down and + ActivateDescenderPropertyChanged event + - S8037477: Reproducible hang of JAWS and webstart application + with JAB 2.0.4 + - S8038925: Java with G1 crashes in dump_instance_fields using + jmap or jcmd without fullgc + - S8039050: Crash in C2 compiler at Node::rematerialize + - S8039298: assert(base == NULL || t_adr->isa_rawptr() || ! phase->type(base)->higher_equal(TypePtr::NULL_PTR)) + - S8039319: (smartcardio) Card.transmitControlCommand() does + not work on Mac OS X + - S8040228: TransformerConfigurationException occurs with + security manager, FSP and XSLT Ext + - S8040790: [TEST_BUG] tools/javac/innerClassFile/Driver.sh + fails to cleanup files after it + - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should + abandon ldap request + - S8041740: Test sun/security/tools/keytool/ListKeychainStore.sh + fails on Mac + - S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java + failing on all platforms + - S8042059: Various fixes to linux/sparc + - S8042857: 14 stuck threads waiting for notification on + LDAPRequest + - S8043123: Hard crash with access violation exception when + blitting to very large image + - S8043200: Decrease the preference mode of RC4 in the enabled + cipher suite list + - S8043205: Incorrect system traps.h include path + - S8043206: Fix signed vs. unsigned comparison warning in + copy_sparc.hpp + - S8043207: Add const to Address argument for Assembler::swap + - S8043210: Add _BIG_ENDIAN define on linux/sparc + - S8043507: javax.smartcardio.CardTerminals.list() fails on + MacOSX + - S8044602: Increment minor version of HSx for 7u72 and + initialize the build number + - S8044659: Java SecureRandom on SPARC T4 much slower than on + x86/Linux + - S8046769: Set T family feature bit on Niagara systems + - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() + dosn't work on MacOSX + - S8049081: Increment hsx 24.72 build to b02 for 7u72-b03 + - S8049542: C2: assert(size_in_words <= (julong)max_jint) + failed: no overflow + - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04 + - S8050158: Introduce system property to maintain RC4 + preference order + - S8050165: linux-sparcv9: NMT detail causes + assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) + failed: younger_sp must be valid + - S8050167: linux-sparcv9: hs_err file does not show any stack + information + - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 + - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] + failure + - S8060072: Increment minor version of HSx for 7u79 and + initialize the build number + - S8064454: [TEST_BUG] Test tools/javac/innerClassFile/Driver.sh + fails for Mac and Linux + - S8064532: 7u76 build failed with # 8041979 + - S8065072: sun/net/www/http/HttpClient/StreamingRetry.java + failed intermittently + - S8065373: [macosx] jdk8, jdk7u60 Regression in Graphics2D + drawing of derived Fonts + - S8065709: Deadlock in awt/logging apparently introduced by + 8019623 + - S8065991: LogManager unecessarily calls JavaAWTAccess from + within a critical section + - S8068405: GenerateCurrencyData throws RuntimeException for + old data + - S8071591: java/util/logging/LogManagerAppContextDeadlock.java + test started to fail due to JDK-8065991 + - S8072039: jdk7u79 l10n resource file translation update + - S8072042: (tz) Support tzdata2015a + - S8073226: Increment hsx 24.79 build to b02 for 7u79-b10 + - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels + - S8074662: Update 3rd party readme and license for LibPNG + v 1.6.16 + - S8075211: [TEST_BUG] Test + sun/net/www/http/HttpClient/StreamingRetry.java fails with + compilation error + * Bug fixes + - PR2196, RH1164762: jhat man page has broken URL + - PR2200: Support giflib 5.1.0 + - PR2210: DGifCloseFile call should check the return value, not + the error code, for failure + - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc. + - PR2250: JSSE server is still limited to 768-bit DHE + * ARM32 port + - PR2228: Add ARM32 JIT + - PR2297: Use the IcedTea 2.6.0 HotSpot for ARM32 by default + - Several bug fixes to get Eclipse working + * AArch64 port + - Add java.lang.ref.Reference.get intrinsic to template + interpreter + - Fix implementation of InterpreterMacroAssembler::increment_mdp_data_at(). + - Remove insanely large stack allocation in entry frame. + - S6976528: PS: assert(!limit_exceeded || softrefs_clear) + failed: Should have been cleared + - S8020675: invalid jar file in the bootclasspath could lead to + jvm fatal error + - S8020829: NMT tests fail on platforms if NMT detail is not + supported + - S8026303: CMS: JVM intermittently crashes with "FreeList of + size 258 violates Conservation Principle" assert + - S8029775: Solaris code cleanup + - S8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java + failing on all platforms + - S8042235: redefining method used by multiple MethodHandles + crashes VM + - S8044406: JVM crash with JDK8 (build 1.8.0-b132) with G1 GC + - S8046233: VerifyError on backward branch + - S8046289: compiler/6340864/TestLongVect.java timeout with + - S8048170: Test closed/java/text/Normalizer/ConformanceTest.java + failed + - S8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop()) + failed: sanity check + - S8054478: C2: Incorrectly compiled char[] array access crashes + JVM + - S8054530: C2: assert(res == old_res) failed: Inconsistency + between old and new + - S8054883: Segmentation error while running program + - S8056309: Set minor version for hotspot in 7u76 to 76 and ++++ 32 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes ++++ and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes java-1_7_0-openjdk.changes: same change Old: ---- arm32-jit.patch icedtea-2.5.4.tar.xz icedtea-2.5.4.tar.xz.sig java-1_7_0-openjdk-giflib5.patch New: ---- icedtea-2.5.5.tar.xz icedtea-2.5.5.tar.xz.sig linux_vs_sys_ptrace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_7_0-openjdk-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.R0u0LN/_old 2015-04-27 22:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.R0u0LN/_new 2015-04-27 22:07:38.000000000 +0200 @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 %global test_arches %ix86 x86_64 ppc64 ppc64le -%global icedtea_version 2.5.4 +%global icedtea_version 2.5.5 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 17147 %global javaver 1.7.0 -%global buildver 75 +%global buildver 79 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -110,7 +110,7 @@ %global tapsetroot %{_datadir}/systemtap %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif -%ifarch %aarch64 +%ifarch %aarch64 %arm %if ! %{with zero} %global with_default_hotspot_tarball 0 %endif @@ -163,15 +163,13 @@ # # OpenJDK specific patches # -# Fix build with giflib5 -Patch105: java-1_7_0-openjdk-giflib5.patch Patch106: java-1.7.0-openjdk-freetype-check-fix.patch # Fix use of unintialized memory in adlc parser Patch107: java-1.7.0-openjdk-adlc-parser.patch # Increase default thread stack size Patch108: java-1.7.0-openjdk-thread-stack-size.patch -# Add ARM32 JIT -Patch109: arm32-jit.patch +# Fix type mismatch between linux/ptrace.h and sys/ptrace.h +Patch109: linux_vs_sys_ptrace.patch # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable Patch200: abrt_friendly_hs_log_jdk7.patch # @@ -572,8 +570,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} -# Remove the thumb2.cpp file completely (the -E option) -patch -p0 -E -i %{PATCH109} +patch -p0 -i %{PATCH109} patch -p0 -i %{PATCH200} %if ! %{with zero} @@ -581,7 +578,6 @@ %endif %endif -patch -p0 -i %{PATCH105} patch -p0 -i %{PATCH107} patch -p0 -R -i %{PATCH404} ++++++ java-1_7_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.R0u0LN/_old 2015-04-27 22:07:38.000000000 +0200 +++ /var/tmp/diff_new_pack.R0u0LN/_new 2015-04-27 22:07:38.000000000 +0200 @@ -19,7 +19,7 @@ %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %global jit_arches %ix86 x86_64 ppc64 ppc64le %arm %aarch64 %global test_arches %ix86 x86_64 ppc64 ppc64le -%global icedtea_version 2.5.4 +%global icedtea_version 2.5.5 %global icedtea_sound_version 1.0.1 %global mauvedate 2008-10-22 %global buildoutputdir openjdk.build/ @@ -31,7 +31,7 @@ # Standard JPackage naming and versioning defines. %global priority 17147 %global javaver 1.7.0 -%global buildver 75 +%global buildver 79 # Standard JPackage directories and symbolic links. %global sdklnk java-%{javaver}-openjdk %global archname %{sdklnk} @@ -110,7 +110,7 @@ %global tapsetroot %{_datadir}/systemtap %global tapsetdir %{tapsetroot}/tapset/%{_build_cpu} %endif -%ifarch %aarch64 +%ifarch %aarch64 %arm %if ! %{with zero} %global with_default_hotspot_tarball 0 %endif @@ -163,15 +163,13 @@ # # OpenJDK specific patches # -# Fix build with giflib5 -Patch105: java-1_7_0-openjdk-giflib5.patch Patch106: java-1.7.0-openjdk-freetype-check-fix.patch # Fix use of unintialized memory in adlc parser Patch107: java-1.7.0-openjdk-adlc-parser.patch # Increase default thread stack size Patch108: java-1.7.0-openjdk-thread-stack-size.patch -# Add ARM32 JIT -Patch109: arm32-jit.patch +# Fix type mismatch between linux/ptrace.h and sys/ptrace.h +Patch109: linux_vs_sys_ptrace.patch # allow to create hs_pid.log in tmp (in 700 permissions) if working directory is unwritable Patch200: abrt_friendly_hs_log_jdk7.patch # @@ -572,8 +570,7 @@ patch -p0 -i %{PATCH106} patch -p0 -i %{PATCH108} -# Remove the thumb2.cpp file completely (the -E option) -patch -p0 -E -i %{PATCH109} +patch -p0 -i %{PATCH109} patch -p0 -i %{PATCH200} %if ! %{with zero} @@ -581,7 +578,6 @@ %endif %endif -patch -p0 -i %{PATCH105} patch -p0 -i %{PATCH107} patch -p0 -R -i %{PATCH404} ++++++ aarch64.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/aarch64.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/aarch64.tar.bz2 differ: char 11, line 1 ++++++ corba.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-3c9f523bf96e/.hgtags new/corba-52db6f325d61/.hgtags --- old/corba-3c9f523bf96e/.hgtags 2015-01-06 20:04:18.000000000 +0100 +++ new/corba-52db6f325d61/.hgtags 2015-03-10 23:40:57.000000000 +0100 @@ -505,6 +505,11 @@ 50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40 d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31 2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33 +244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01 +507cb7e62dfed67b467a1767d9c56d276551d6f3 jdk7u67-b31 +aef9e24b79543a3b58bb4575266b9b87ca84e4e1 jdk7u67-b32 +7c1d15d36a6c40b4a4f75bc03729136a104d2434 jdk7u67-b33 +f026080f4fcc9eca5589d8747c66bfa123c5a87d jdk7u67-b34 5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00 9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01 596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09 @@ -533,3 +538,38 @@ 3b13d5123ab280705c27c9e025fd6ecca8a09f58 icedtea-2.5.4pre01 946d8c68cc64055e0a7bcbceecb499e193328c2c icedtea-2.5.4pre02 b894abb26bbf730bf048809e61647886a05235c2 icedtea-2.5.4pre03 +3c9f523bf96e91b4d1782fc4b82d3a44a5fa5b1e icedtea-2.5.4 +701e1d5cea2e8065d2282eb3ebe31b6829a72a95 jdk7u71-b14 +287c772d7245396a7a6c7fc409ca8d21ba1ae2c5 jdk7u72-b01 +92552d17915bdf467fe758293eded9e6290f4ce2 jdk7u72-b02 +ae522462810fd74a92b4408b12b036bed5ea3efe jdk7u72-b03 +42a799212f4a287be3d2fd272b9faa3c65326b05 jdk7u72-b04 +a2d4167edbf96cdfda04e829d2baa361ade14bf5 jdk7u72-b05 +01922ce7611b852c7fdc4c0f88c9500c55eccd50 jdk7u72-b06 +b5a2d85c7fce5461d8e1be7e89a891a3ce40f805 jdk7u72-b07 +2b6d8a79df83bc5732ef7c65c51cfe9feac52559 jdk7u72-b08 +c62534f0e97dc7100da18b0b9c034d846f7067dc jdk7u72-b09 +62668c37376f462cfe7bfdfa001f902f52d450ef jdk7u72-b10 +39828d500dfef8045eb5b531182a09ea6ecdfb71 jdk7u72-b11 +990f51c3edeb4f25d0be95d51b23e5a4e8e02f06 jdk7u72-b12 +9e0c893977bba3ed7820f173d386e197f3c06e7b jdk7u72-b13 +bd80d0c18ccd97669dd8392dbde5cd91f647ee1d jdk7u72-b14 +66da7f46eff05df2aa3bb9b5c1f7ee47a75828a5 jdk7u72-b30 +4fefe5c11ddb650e681e2dd5e8ac8dfeb15e6afd jdk7u72-b31 +88772da384953fed254492c3ea9da498381081f2 jdk7u75-b00 +0466441d71122c9af252ec17f597f228dbf64578 jdk7u75-b01 +9aa7fe309fa584ff782ab9d557632321747ba11e jdk7u75-b02 +c734b5009fc92667af13c36b1f23e153a3e2dfca jdk7u75-b03 +f55967c261230a4fcc8d71ecfe58f2f47ea50393 jdk7u75-b04 +86369ed6e77c65496f2c167c00ed48d1e488845c jdk7u75-b05 +6831d2ff20362464a754f53bf8eb3ec1aacd6271 jdk7u75-b06 +33cf9bbc4ff36cb9e65e9fc22eabd606b98b6b8c jdk7u75-b07 +160cce8c24c4af6481426c931e400dfec29fe0d1 jdk7u75-b08 +ac5f25a05f13d81e4e18f5447e60dddee77d8d17 jdk7u75-b09 +c762a8187b1fe223b92aca3aaf7ee2dfe03e2ae6 jdk7u75-b10 +e05b02f8d5c988e55e985d767420e0b7e35d996e jdk7u75-b11 +45136140d2bcf28009271a047eea9a89c95378d7 jdk7u75-b12 +fb49daa5d7f89cbe60ff4b598c6b3e976ad04e4d jdk7u75-b13 +f3d39b94209598ba90e221d60ff3325dbe37fe2e jdk7u75-b30 +e8e7ada7819ce051ba4adfba0f43638e3ffc1261 icedtea-2.5.5pre01 +e6764ce23dabaed1b6c6b1742aedb1c11ebb0e98 icedtea-2.5.5pre02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/corba-3c9f523bf96e/THIRD_PARTY_README new/corba-52db6f325d61/THIRD_PARTY_README --- old/corba-3c9f523bf96e/THIRD_PARTY_README 2015-01-06 20:04:18.000000000 +0100 +++ new/corba-52db6f325d61/THIRD_PARTY_README 2015-03-10 23:40:57.000000000 +0100 @@ -1001,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which is +%% This notice is provided with respect to libpng 1.6.16, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1017,7 +1017,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1115,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE --- @@ -1912,35 +1912,6 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Sparkle v.1.5, -which is included with JRE 7 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3198,12 +3169,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.3.0 [included with JDK 7 only] + Apache Derby 10.8.1.2 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.11.0 + Apache Xerces2 Java 2.10.0 Apache XML Resolver 1.1 ++++++ hotspot.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/hotspot.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/hotspot.tar.bz2 differ: char 11, line 1 ++++++ icedtea-2.5.4.tar.xz -> icedtea-2.5.5.tar.xz ++++++ ++++ 4017 lines of diff (skipped) ++++++ jaxp.tar.bz2 ++++++ ++++ 12448 lines of diff (skipped) ++++++ jaxws.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-9a6c90336922/.hgtags new/jaxws-3706d41e1476/.hgtags --- old/jaxws-9a6c90336922/.hgtags 2014-10-29 19:13:34.000000000 +0100 +++ new/jaxws-3706d41e1476/.hgtags 2015-03-10 23:41:12.000000000 +0100 @@ -505,6 +505,11 @@ db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31 6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33 +1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01 +34e3554140b7f9efe2ad20fa04dfd5faf5821248 jdk7u67-b31 +6090119e680a65addafb82f2b6227315813b7e68 jdk7u67-b32 +aa1879afbb8dc4dd157eab31c86de2845a3cad6a jdk7u67-b33 +a3290ceed5750bfc62a5ec5c00ee1aea125e9db3 jdk7u67-b34 d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00 1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01 04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09 @@ -533,3 +538,38 @@ ac4697fab02d744e30ad60898813aadba1ad9ba0 icedtea-2.5.4pre01 686552a98cae5fef622eb2a0e5fbe84bec3c11ca icedtea-2.5.4pre02 c604500818dadbf3258d5881132c8e325a575d04 icedtea-2.5.4pre03 +9a6c9033692216a43475e64c476bc4fda2a8e3d2 icedtea-2.5.4 +a580f2c49eacc68a11cf0e724aec4a974fb77745 jdk7u71-b14 +18676fc7713f5341f298a1ae2aee9e217fcdb5a5 jdk7u72-b01 +e4bbb79df2b13cea8c24ee2e6346e1aa30645400 jdk7u72-b02 +646f7c237e9ecde8df0fc6524b3605a89e6dc135 jdk7u72-b03 +30d42f2fde558b4aeae26cc7bda89b2badf88aab jdk7u72-b04 +761c40c9076aefac72bbff913e8bc088e565386f jdk7u72-b05 +a3961ce4d5c1fd1f9cde546e62760a008b5b9d60 jdk7u72-b06 +1153553de579fbbf8c328ea47f07accf8e2d9ac2 jdk7u72-b07 +7b00d0359f49c82b38bb2f2faafae53eacc1a995 jdk7u72-b08 +f16ea19cfd03274e9e1fd5367c3f4c23accf4e75 jdk7u72-b09 +615c0d49e8927c9b03f5694df4ddb7a5e45eaf6d jdk7u72-b10 +b34f135642cddf3c15f1fecaad320cb12cbd9472 jdk7u72-b11 +cfa494e8b9bcd29ba59f1bfa3c365418b4102f71 jdk7u72-b12 +d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13 +e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14 +587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30 +4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31 +664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00 +ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01 +1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02 +033349ac9e45fd897571ff4f6e38ed48d46cd539 jdk7u75-b03 +f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u75-b04 +bfe594779717071439b94ddc771117eedb442a25 jdk7u75-b05 +b700cddd5754a82fca4f5465116fbba516a96667 jdk7u75-b06 +781d7a0230eef7cbef89bb32bc0d722730c198e3 jdk7u75-b07 +b85627d6afbb758fc244147dfdbbd287ee524eed jdk7u75-b08 +e7aef72db8cf95b27af7c2508a02bf87b52b325b jdk7u75-b09 +d7c340b9d530da158dce7da897f66e31e83b1366 jdk7u75-b10 +4b36c07b29c32064abdfa6df09c381861875ddd4 jdk7u75-b11 +5458349b0e4860662dc5a4f96363c0e714d09c65 jdk7u75-b12 +38d474b401c6a69dfc7cea5ba79a894980fa8107 jdk7u75-b13 +4d068ffb0b544d004792b3047c5aa9ab72b53529 jdk7u75-b30 +be14a67897fcac1107923aabe5218f4a88fc7c1d icedtea-2.5.5pre01 +a4d2c21355d569b65f6424d30e3f8553f9f56d2d icedtea-2.5.5pre02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-9a6c90336922/THIRD_PARTY_README new/jaxws-3706d41e1476/THIRD_PARTY_README --- old/jaxws-9a6c90336922/THIRD_PARTY_README 2014-10-29 19:13:34.000000000 +0100 +++ new/jaxws-3706d41e1476/THIRD_PARTY_README 2015-03-10 23:41:12.000000000 +0100 @@ -1001,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which is +%% This notice is provided with respect to libpng 1.6.16, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1017,7 +1017,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1115,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE --- @@ -1912,35 +1912,6 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Sparkle v.1.5, -which is included with JRE 7 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3198,12 +3169,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.3.0 [included with JDK 7 only] + Apache Derby 10.8.1.2 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.11.0 + Apache Xerces2 Java 2.10.0 Apache XML Resolver 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java new/jaxws-3706d41e1476/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java --- old/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java 2014-10-29 19:13:34.000000000 +0100 +++ new/jaxws-3706d41e1476/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java 2015-03-10 23:41:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,6 @@ package com.sun.tools.internal.ws.processor.model; -import com.sun.tools.internal.ws.wsdl.framework.Entity; import com.sun.tools.internal.ws.wscompile.ErrorReceiver; import com.sun.tools.internal.ws.wscompile.AbortException; import com.sun.tools.internal.ws.resources.ModelMessages; @@ -177,7 +176,8 @@ throw new AbortException(); } _parameters.add(p); - _parametersByName.put(p.getName(), p); + String name = p.getCustomName() != null ? p.getCustomName() : p.getName(); + _parametersByName.put(name, p); } public Parameter getParameterByName(String name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java new/jaxws-3706d41e1476/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java --- old/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java 2014-10-29 19:13:34.000000000 +0100 +++ new/jaxws-3706d41e1476/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java 2015-03-10 23:41:12.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1757,9 +1757,9 @@ } if (part.isIN()) - setCustomizedParameterName(info.portTypeOperation, inMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, inMsg, part, param, false); else if (outMsg != null) - setCustomizedParameterName(info.portTypeOperation, outMsg, part, param, false); + setCustomizedParameterName(info.bindingOperation, outMsg, part, param, false); params.add(param); } ++++++ jdk.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/java-1_7_0-openjdk/jdk.tar.bz2 /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/jdk.tar.bz2 differ: char 11, line 1 ++++++ langtools.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-960cdffa8b3f/.hgtags new/langtools-3ffd17553e8c/.hgtags --- old/langtools-960cdffa8b3f/.hgtags 2014-11-24 19:03:13.000000000 +0100 +++ new/langtools-3ffd17553e8c/.hgtags 2015-03-10 23:41:40.000000000 +0100 @@ -505,6 +505,11 @@ eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40 5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31 59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33 +8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01 +e3b604d29f9177ac0c1344cdb7af8f5ccdc1db42 jdk7u67-b31 +e6bf55d457016764b4dd785b61ae79a125ba869b jdk7u67-b32 +624c54795faaf1a92bc1eb8c369dc18c1704c812 jdk7u67-b33 +18077957a8b802d9ce8724856e8b5f3fcde38b9e jdk7u67-b34 684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00 a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01 6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09 @@ -533,3 +538,38 @@ 6bbb3de3efa5e79df741020a9f55fc5386c0c727 icedtea-2.5.4pre01 622e6cf4c032ece5d1b553dbf4f36f404cfc8122 icedtea-2.5.4pre02 412a4f8c67e8ab5c84e168e5d392a8944c89898c icedtea-2.5.4pre03 +960cdffa8b3faca9c0d2dafe9359321c485f502e icedtea-2.5.4 +6fe93bd5d4ac9d65a3f97cc16286ed2278150d7c jdk7u71-b14 +5b207c2ea9d20c5de58a7a7e618cc9b86ac7fe76 jdk7u72-b01 +1f1c94334f194aa980b7787fd5f2286405991e23 jdk7u72-b02 +6e5faa9ed5f317369eacfedbf57fc0745c1e940b jdk7u72-b03 +960f87b4d55681f19880385f9d11e227ea36f2df jdk7u72-b04 +adf88de8b627ede9e8819d94b00ad9ec7eed3077 jdk7u72-b05 +7efda07275d14dbd0fd96d304b7d682579cb6410 jdk7u72-b06 +bfaa78bab4784c6bb494393dad0c330616cb7256 jdk7u72-b07 +073486551f0c07f44c93e8dcdb31785a3f4526eb jdk7u72-b08 +0e25c3ae773a27dba34ec05ea28dbcd44ea6f933 jdk7u72-b09 +b63b6992ddd27688e276100be436bcf52e0525bc jdk7u72-b10 +65c68241236ab792fe72119a0b4c29effd048904 jdk7u72-b11 +cc58d9704b4017efe9ebe4391d73d82c0caf6d1c jdk7u72-b12 +cade57461d3b90a59ec62c06d77068b1b73f05b2 jdk7u72-b13 +6106b56a874e19e603660a09d506fe8afcde9e14 jdk7u72-b14 +7a09f7596c8bb17d3b25b4506dd76425f6efb15e jdk7u72-b30 +de0088aaf97fa861be8c17e97b57139287068c86 jdk7u72-b31 +0138c5f55af0c700882deeac4411fbd9118b4d6e jdk7u75-b00 +7ecfdbf693cfc14d648ebdf2cc87716068569e8d jdk7u75-b01 +688a304d3215af8104336ecce50b7f4edfb88d36 jdk7u75-b02 +105ad2d2417515b2b595c151e2a5d8ae0fe729eb jdk7u75-b03 +bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u75-b04 +1895dc97d832950fe13a16428b797c952c9e4f4a jdk7u75-b05 +5fcea7a0e4f1e3fa52bd6010e685098731966933 jdk7u75-b06 +2e1c7e887c37dd702b2d09a00dacbafd79604e8c jdk7u75-b07 +fe8e75540f0990c6ad9d060c2343ef896cb5bc19 jdk7u75-b08 +512d77cd143798615266314c72c00ee32500661c jdk7u75-b09 +d77d44ecfb980610de2c90446fab13910ed2c8d7 jdk7u75-b10 +b5554ad39fa33c17033931a4ef5564a9b9d88f05 jdk7u75-b11 +6f369f5322618b48225eebcde52ab9dfa552e286 jdk7u75-b12 +7eb2663b7feb537ca765747e7bd0128245812c64 jdk7u75-b13 +059a87205fda11b19d25ace75698a854aa8edbf3 jdk7u75-b30 +62af99c4ba800ff1cbb882cdcdbc1fe9fad527c3 icedtea-2.5.5pre01 +b4aed9cdd65b49a022b9d82f20a733ee3cd61fba icedtea-2.5.5pre02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-960cdffa8b3f/THIRD_PARTY_README new/langtools-3ffd17553e8c/THIRD_PARTY_README --- old/langtools-960cdffa8b3f/THIRD_PARTY_README 2014-11-24 19:03:13.000000000 +0100 +++ new/langtools-3ffd17553e8c/THIRD_PARTY_README 2015-03-10 23:41:40.000000000 +0100 @@ -1001,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which is +%% This notice is provided with respect to libpng 1.6.16, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1017,7 +1017,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1115,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE --- @@ -1912,35 +1912,6 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Sparkle v.1.5, -which is included with JRE 7 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3198,12 +3169,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.3.0 [included with JDK 7 only] + Apache Derby 10.8.1.2 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.11.0 + Apache Xerces2 Java 2.10.0 Apache XML Resolver 1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/langtools-960cdffa8b3f/test/tools/javac/innerClassFile/Driver.sh new/langtools-3ffd17553e8c/test/tools/javac/innerClassFile/Driver.sh --- old/langtools-960cdffa8b3f/test/tools/javac/innerClassFile/Driver.sh 2014-11-24 19:03:13.000000000 +0100 +++ new/langtools-3ffd17553e8c/test/tools/javac/innerClassFile/Driver.sh 2015-03-10 23:41:40.000000000 +0100 @@ -71,3 +71,5 @@ "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/x/B.java src/x/C.java src/y/Main.java rm y/R3.class "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . -classpath . -sourcepath src src/y/Main.java +chmod -R u+w src +rm -fr src ++++++ linux_vs_sys_ptrace.patch ++++++ --- openjdk/hotspot/agent/src/os/linux/libproc.h 2015-04-16 08:14:26.796524999 +0200 +++ openjdk/hotspot/agent/src/os/linux/libproc.h 2015-04-16 08:14:58.586070883 +0200 @@ -34,7 +34,7 @@ #include "libproc_md.h" #endif -#include <linux/ptrace.h> +#include <sys/ptrace.h> /************************************************************************************ ++++++ openjdk.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-5-6cf2880aab5e/.hgtags new/icedtea7-forest-2-5-f8c87dd516ff/.hgtags --- old/icedtea7-forest-2-5-6cf2880aab5e/.hgtags 2015-01-06 20:04:22.000000000 +0100 +++ new/icedtea7-forest-2-5-f8c87dd516ff/.hgtags 2015-03-10 23:41:40.000000000 +0100 @@ -503,6 +503,11 @@ 64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40 9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31 fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33 +d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01 +d3b934344cb17238ea27cd1e0b824f856addc815 jdk7u67-b31 +79c6f8d257776b93485f4c1014dfcf61cc75a667 jdk7u67-b32 +5aef2a187827f1e7f48a619af4bee118ca99efea jdk7u67-b33 +b86df0257fad12e8802fe43d53e932b7b0253112 jdk7u67-b34 48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00 4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01 964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09 @@ -531,3 +536,38 @@ 39495d637282db1073b99f20f5924203f8c47e16 icedtea-2.5.4pre01 f94395c841f46f8ffbf41b14e07cb90c15a55579 icedtea-2.5.4pre02 1bcd6e8a9bc04fbc31b37de6856ad50d08cb96b9 icedtea-2.5.4pre03 +6cf2880aab5eefd45f18fab1786fdd0a0256fc6b icedtea-2.5.4 +ade1a91dba7391ef319a2fc646138387e6416436 jdk7u71-b14 +423ddccf39073af15eb78623f89f1080612b5b3d jdk7u72-b01 +5f985e54beec37de3ad2261d82665d378143a8dc jdk7u72-b02 +e6e679e8dc418d9174668f445af10e2a6d71ce39 jdk7u72-b03 +32b4ccb2a7ada38639a4869a5628bda061d8563e jdk7u72-b04 +15e7f04f32510469be2ab44b4547cb8acb19d04a jdk7u72-b05 +9c732ba56ec06696e218f7b70ddc432295638d79 jdk7u72-b06 +a7679adac6cc7ff6a2893e4df447c39937f59eda jdk7u72-b07 +44a9b66255b9b8a200c0e53338145bac86381576 jdk7u72-b08 +66c1df24154b1c8c67fd9bed0b6d366452a46fb0 jdk7u72-b09 +a8993ba5a86938e6bd9ab7c41401610b0e36afce jdk7u72-b10 +8d695cc7268f902f235506ac8d3849a4dd118bee jdk7u72-b11 +965b19722fce7a8303b89fc9288f7b6a9cf70922 jdk7u72-b12 +9c6095c8748ba80aa1ffd14f978b24e50abcfdc1 jdk7u72-b13 +fa606411d8fd650334b6f90d626399e13e77740f jdk7u72-b14 +f42462b4dfd81539eacf90955d2d26e1dc1686c0 jdk7u72-b30 +891bb800d7b2abff392669276f9e55ff30ba9962 jdk7u72-b31 +569e053e97b4fecaf1371f7cf2645394edb8a11a jdk7u75-b00 +618b221a71a962f1d62a5b02db1b4256bad9441a jdk7u75-b01 +eb36016211cb5d412c779836bd8efbf133cbf6f5 jdk7u75-b02 +134f5183bd712b940056508bcd0988cce7a60ec7 jdk7u75-b03 +dcc07fe8d380a63c22086abeb62a5a9780b3639c jdk7u75-b04 +5acf5e095d7b3a9364b278911047a4fad15a1ae7 jdk7u75-b05 +709239275717263b600f6c8816b023de3442eb0f jdk7u75-b06 +79414f9ef336b48c3766a7e994ac3efce3877b61 jdk7u75-b07 +0fa6cf059c5c262a410220bfb9ec7d83d44a8030 jdk7u75-b08 +109dfa012fb50a65c9dcb5eb36c530a2001d139b jdk7u75-b09 +a90c928524da634a18ea5a9ca2d6aba839c9bf8a jdk7u75-b10 +ae1470a6681851d99608269ac902383ce44c9f10 jdk7u75-b11 +cca6b8a583cef75117297d9522adc33f7ab516c2 jdk7u75-b12 +669bd350d550600a3f0c4556da9bc4bb6006dc5c jdk7u75-b13 +7d45f621855a37b70a239edc6f8ac3b75ca7862b jdk7u75-b30 +cf5639f1ca27fb61485911b6c3ae3a3272ae1e79 icedtea-2.5.5pre01 +76ca358c79a2295195160baf31d2f2f6e2d1fbba icedtea-2.5.5pre02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/icedtea7-forest-2-5-6cf2880aab5e/THIRD_PARTY_README new/icedtea7-forest-2-5-f8c87dd516ff/THIRD_PARTY_README --- old/icedtea7-forest-2-5-6cf2880aab5e/THIRD_PARTY_README 2015-01-06 20:04:22.000000000 +0100 +++ new/icedtea7-forest-2-5-f8c87dd516ff/THIRD_PARTY_README 2015-03-10 23:41:40.000000000 +0100 @@ -1001,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which is +%% This notice is provided with respect to libpng 1.6.16, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1017,7 +1017,7 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1115,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE --- @@ -1912,35 +1912,6 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Sparkle v.1.5, -which is included with JRE 7 on Mac OS X. - ---- begin of LICENSE --- - -Copyright (c) 2012 Sparkle.org and Andy Matuschak - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---- end of LICENSE --- - -------------------------------------------------------------------------------- - %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3198,12 +3169,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.3.0 [included with JDK 7 only] + Apache Derby 10.8.1.2 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.11.0 + Apache Xerces2 Java 2.10.0 Apache XML Resolver 1.1

1 0

commit htdig for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package htdig for openSUSE:Factory checked in at 2015-04-27 22:07:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/htdig (Old) and /work/SRC/openSUSE:Factory/.htdig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "htdig" Changes: -------- --- /work/SRC/openSUSE:Factory/htdig/htdig.changes 2011-10-16 12:50:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.htdig.new/htdig.changes 2015-04-27 22:07:24.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 21 12:44:10 UTC 2015 - mpluskal(a)suse.com + +- Cleanup spec file with spec-cleaner +- Update dependencies +- Update category for devel package +- rename htdig-README.SuSE to htdig-README.SUSE + +------------------------------------------------------------------- Old: ---- htdig-README.SuSE New: ---- htdig-README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ htdig.spec ++++++ --- /var/tmp/diff_new_pack.7G38s6/_old 2015-04-27 22:07:25.000000000 +0200 +++ /var/tmp/diff_new_pack.7G38s6/_new 2015-04-27 22:07:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package htdig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - +%define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs2 -q PREFIX) Name: htdig -BuildRequires: apache2-devel gcc-c++ libapr-util1-devel libopenssl-devel pcre-devel postfix zlib-devel -BuildRequires: libtool -%define apache_serverroot %(/usr/sbin/apxs2 -q datadir 2>/dev/null || /usr/sbin/apxs2 -q PREFIX) -Url: http://www.htdig.org -License: GPL-2.0+ -Group: Productivity/Networking/Web/Utilities -AutoReqProv: on Version: 3.2.0b6 -Release: 217 +Release: 0 Summary: WWW Index and Search System +License: GPL-2.0+ +Group: Productivity/Networking/Web/Utilities +Url: http://www.htdig.org Source: http://switch.dl.sourceforge.net/sourceforge/htdig/htdig-%{version}.tar.bz2 -Source1: %{name}-README.SuSE +Source1: %{name}-README.SUSE Patch1: %{name}-google-style.patch Patch2: %{name}-rundig.patch Patch3: %{name}-ExternalParser-typo.patch @@ -43,6 +38,17 @@ Patch14: %{name}-quoting.patch # PATCH-FIX-UPSTREAM gmtime-lastday.patch use INT32_MAX to define last day (bnc##231196), related to (bnc#343913) Patch15: %{name}-gmtime-lastday.patch +BuildRequires: apache2-devel +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libapr-util1-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool +BuildRequires: pcre-devel +BuildRequires: postfix +BuildRequires: rrdtool +BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -57,18 +63,9 @@ span several Web servers at a site. The type of these Web servers does not matter as long as they understand the HTTP 1.0 protocol. - - -Authors: --------- - Andrew Scherpbier <andrew(a)contigo.com> - Gabriele Bartolini <bartolini(a)infomedia.it> - Lachlan Andrew <lha(a)users.sourceforge.net> - %package devel -License: GPL-2.0+ Summary: Development files for htdig -Group: Productivity/Networking/Web/Utilities +Group: Development/Languages/C and C++ Requires: %{name} = %{version} %description devel @@ -82,16 +79,7 @@ This package is needed if you want to develop other applications on htdig. - - -Authors: --------- - Andrew Scherpbier <andrew(a)contigo.com> - Gabriele Bartolini <bartolini(a)infomedia.it> - Lachlan Andrew <lha(a)users.sourceforge.net> - %package doc -License: GPL-2.0+ Summary: WWW Index and Search System Documentation Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} @@ -105,19 +93,11 @@ subsection of a Web site. This package provides additional documentation for htdig in -/usr/share/doc/packages/htdig/ - - - -Authors: --------- - Andrew Scherpbier <andrew(a)contigo.com> - Gabriele Bartolini <bartolini(a)infomedia.it> - Lachlan Andrew <lha(a)users.sourceforge.net> +%{_docdir}/htdig/ %prep %setup -q -cp %{S:1} README.SuSE +cp %{SOURCE1} README.SUSE %patch1 %patch2 %patch3 @@ -133,14 +113,14 @@ %build %{?suse_update_config:%{suse_update_config -f db/dist}} pushd contrib 1>/dev/null -find . -type f | xargs -n 1 sed -i "s@/usr/local/bin/perl@/usr/bin/perl@" +find . -type f | xargs -n 1 sed -i "s@%{_prefix}/local/bin/perl@%{_bindir}/perl@" popd 1>/dev/null -%__rm -f acconfig.h db/dist/acconfig.h aclocal.m4 configure db/dist/configure +rm -f acconfig.h db/dist/acconfig.h aclocal.m4 configure db/dist/configure autoreconf --force --install %configure \ --with-config-dir=%{_sysconfdir}/htdig \ --with-common-dir=%{apache_serverroot}/htdig/common \ - --with-database-dir=/var/lib/htdig/db \ + --with-database-dir=%{_localstatedir}/lib/htdig/db \ --with-cgi-bin-dir=%{apache_serverroot}/cgi-bin \ --with-image-dir=%{apache_serverroot}/htdig/images \ --with-image-url-prefix=images \ @@ -149,64 +129,61 @@ --with-zlib \ --enable-bigfile \ --disable-static -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} %install find . -name \*.orig -o -name .cvsignore | xargs rm -f -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} # remove static libs as nobody uses them -find %buildroot/%_libdir/ -name *.*a | xargs rm -f -pushd %buildroot/%{_sysconfdir}/htdig 1>/dev/null +find %{buildroot}/%{_libdir}/ -name *.*a | xargs rm -f +pushd %{buildroot}/%{_sysconfdir}/htdig 1>/dev/null # try to use only one mime.types file (from aaa_base) for the distri -%__rm mime.types -%__ln_s ../mime.types mime.types +rm mime.types +ln -s ../mime.types mime.types # adapt the htdig.conf file sed -e "s@start_url:.*http://www.htdig.org/@start_url: http://localhost/@g" htdig.conf > htdig.conf.new mv htdig.conf.new htdig.conf popd 1>/dev/null # install the documentation files in the right directory -%__mkdir_p %buildroot/%_defaultdocdir/%{name}/ +mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}/ pushd %{_builddir}/%{name}-%{version} 1>/dev/null -cp -a contrib %buildroot/%_defaultdocdir/%{name}/ -cp -a htdoc %buildroot/%_defaultdocdir/%{name}/ -cp COPYING ChangeLog README* STATUS %buildroot/%_defaultdocdir/%{name}/ - -%clean -rm -rf %buildroot +cp -a contrib %{buildroot}/%{_defaultdocdir}/%{name}/ +cp -a htdoc %{buildroot}/%{_defaultdocdir}/%{name}/ +cp COPYING ChangeLog README* STATUS %{buildroot}/%{_defaultdocdir}/%{name}/ %files devel %defattr(-,root,root) -%dir %_includedir/htdig -%dir %_includedir/htdig_db -%_includedir/htdig/* -%_includedir/htdig_db/* +%dir %{_includedir}/htdig +%dir %{_includedir}/htdig_db +%{_includedir}/htdig/* +%{_includedir}/htdig_db/* %files doc %defattr(-,root,root) -%doc %_defaultdocdir/%{name}/contrib -%doc %_defaultdocdir/%{name}/htdoc +%doc %{_defaultdocdir}/%{name}/contrib +%doc %{_defaultdocdir}/%{name}/htdoc #disable execute permission -%attr(644, root, root) %_defaultdocdir/%{name}/htdoc/cf_generate.pl +%attr(644, root, root) %{_defaultdocdir}/%{name}/htdoc/cf_generate.pl #delete Makefile waste from doc -%exclude %_defaultdocdir/%{name}/htdoc/Makefile* +%exclude %{_defaultdocdir}/%{name}/htdoc/Makefile* %files %defattr(-,root,root) -%dir %_defaultdocdir/%{name} -%doc %_defaultdocdir/%{name}/* -%exclude %_defaultdocdir/%{name}/contrib -%exclude %_defaultdocdir/%{name}/htdoc +%dir %{_defaultdocdir}/%{name} +%doc %{_defaultdocdir}/%{name}/* +%exclude %{_defaultdocdir}/%{name}/contrib +%exclude %{_defaultdocdir}/%{name}/htdoc %config(noreplace) %{_sysconfdir}/htdig %dir %{apache_serverroot}/htdig %{apache_serverroot}/htdig/search.html %{apache_serverroot}/htdig/common %{apache_serverroot}/htdig/images -%dir /var/lib/htdig -/var/lib/htdig/db +%dir %{_localstatedir}/lib/htdig +%{_localstatedir}/lib/htdig/db %{apache_serverroot}/cgi-bin/htsearch %{apache_serverroot}/cgi-bin/qtest %{_mandir}/*/* -%_libdir/h* -%_bindir/* +%{_libdir}/h* +%{_bindir}/* %changelog ++++++ htdig-README.SUSE ++++++ Changes for htdig: ================== The htdig 'main' dir is now /srv/www/htdig, there is a subdir conf where the configuration file is to be found. /etc/htdig/htdig.conf is the htdig configuration file. Tools like htdig, htdump, etc. are installed in /usr/bin. The probably large databases go to /var/lib/htdig/db. The online documentation is in /usr/share/doc/packages/htdig if you install the htdig-doc package.

1 0

commit mariadb for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package mariadb for openSUSE:Factory checked in at 2015-04-27 22:07:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mariadb (Old) and /work/SRC/openSUSE:Factory/.mariadb.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mariadb" Changes: -------- --- /work/SRC/openSUSE:Factory/mariadb/mariadb.changes 2014-11-18 22:55:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.changes 2015-04-27 22:07:20.000000000 +0200 @@ -1,0 +2,55 @@ +Tue Apr 14 13:42:54 UTC 2015 - michal.hrusecky(a)opensuse.org + +- fix parent directory has insecure permissions error + +------------------------------------------------------------------- +Tue Apr 14 08:20:47 UTC 2015 - michal.hrusecky(a)opensuse.org + +- disable optional features for mariadb + * still possible to use them from mariadb_100 package + +------------------------------------------------------------------- +Mon Mar 23 23:24:11 UTC 2015 - dvaleev(a)suse.com + +- Adjust _constraints. 11GB is not enough for ppc64 builds, + increase to 13GB + +------------------------------------------------------------------- +Tue Mar 3 05:48:08 UTC 2015 - michal.hrusecky(a)opensuse.org + +- Updated to the version 10.0.17 + * Release notes: + http://kb.askmonty.org/v/mariadb-10017-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-10017-changelog +- merged patches to packaging git and regenerated + * few fixes mainly to upgrades + +------------------------------------------------------------------- +Mon Mar 2 17:25:47 UTC 2015 - mgorse(a)suse.com + +- README.SuSE is now README.SUSE; fix name in some places. + +------------------------------------------------------------------- +Fri Jan 23 19:17:09 UTC 2015 - xrigou(a)otenet.gr + +- Fix undefined initial status in systemd script (boo #914370) + +------------------------------------------------------------------- +Mon Jan 12 20:29:24 UTC 2015 - xrigou(a)otenet.gr + +- Fix include dir in alternative cnf files (bnc #859345) + +------------------------------------------------------------------- +Sat Dec 6 11:44:25 UTC 2014 - michal.hrusecky(a)opensuse.org + +- run spec cleaner on spec +- update to 10.0.15 + * Release notes: + http://kb.askmonty.org/v/mariadb-10015-release-notes + * Changelog: + http://kb.askmonty.org/v/mariadb-10015-changelog +- conditionally enable more storage engines +- updated packaging to the latest templates + +------------------------------------------------------------------- Old: ---- mariadb-10.0.14.tar.bz2 New: ---- mariadb-10.0.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mariadb.spec ++++++ ++++ 751 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/mariadb/mariadb.spec ++++ and /work/SRC/openSUSE:Factory/.mariadb.new/mariadb.spec ++++++ README.debug ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -1,7 +1,7 @@ Debugging mysqld crashes ======================== Author: Michal Marek <mmarek(a)suse.cz> -Last modified: 2006-07-31 +Last modified: 2014-11-21 Contents -------- @@ -67,22 +67,16 @@ gdb /usr/sbin/mysqld /var/lib/mysql/core (gdb) bt -Replace mysqld with the mysqld version you used (mysqld, mysqld-max or -mysqld-debug) and core with the actual name of the coredump. +Replace mysqld with the mysqld version you used (mysqld, mysqld-max) +and core with the actual name of the coredump. 3) Trace files -------------- -You'll need the mysqld-debug binary from the mysql-debug package to get -a trace file. Install the mysqld-debug package and the start mysqld -using following command: +Start mysqld using following command: $ MYSQLD_DEBUG=yes rcmysql start - Note: The init script doesn't automatically pick up the mysqld-debug - binary (as it does with mysqld-max), because it is expected to be used - just temporarily to help solving a particular problem. - -The init script will then start mysqld-debug and add the --core-file, +The init script will then start mysqld and add the --core-file, --log and --debug options for you. The query log will be stored in /var/lib/mysql/myqld-query.log @@ -92,9 +86,7 @@ /var/lib/mysql/mysqld.trace If you don't like the options set by the init script, just put your own -into /etc/my.cnf and the init script will honor it. For information -about the --debug option, see "The DBUG Package": -http://dev.mysql.com/doc/refman/5.0/en/the-dbug-package.html . +into /etc/my.cnf and the init script will honor them. The trace file will contain various debug information and function calls/returns and will become _extremly_ huge after a while, so don't ++++++ README.install ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -15,6 +15,6 @@ '/usr/bin/mysql_secure_installation' which will also give you the option of removing the test -databases and anonymous user created by default. This is +databases and anonymous user created by default. This is strongly recommended for production servers. ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -1,7 +1,7 @@ <constraints> <hardware> <disk> - <size unit="G">9</size> + <size unit="G">13</size> </disk> </hardware> </constraints> ++++++ build.inc ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -1,130 +1,49 @@ -%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0 -%define socketpath /var/lib/mysql -%else -%define socketpath /var/run/mysql -%endif -%if 0%{?suse_version} > 1140 -export EXTRA_FLAGS=" -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter " -%endif +EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter" +# Mariadb devs seems to fall in love with -Werror option +EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error" %ifarch ppc64 -export EXTRA_FLAGS=" -mminimal-toc " -%endif -export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS " -export CXXFLAGS="$CFLAGS" - -%if 0%{use_cmake} < 1 -autoreconf -f -i -# Make the compile a function, since we do multiple builds -BuildMySQL() { - # The --enable-assembler simply does nothing on systems that do not - # support assembler speedups. - suffix="$1"; shift - mkdir _build$suffix - pushd _build$suffix - ../configure \ - --enable-assembler \ - --with-readline \ - --infodir=%{_infodir} \ - --libdir=%{_libdir} \ - --libexecdir=/usr/sbin \ - --localstatedir=/var/lib/mysql \ - --mandir=%{_mandir} \ - --prefix=%{_prefix} \ - --sysconfdir=/etc \ - --with-mysqld-user=mysql \ - --with-mysqld-group=mysql \ - --without-debug \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --with-charset=utf8 \ - --with-collation=utf8_unicode_ci \ - --with-extra-charsets=all \ - --with-unix-socket-path=%{socketpath}/mysql.sock \ - --enable-thread-safe-client \ - --with-comment="SUSE MySQL RPM" \ - --with-libwrap \ - --with-server-suffix=$suffix \ -%ifarch s390 s390x - --with-atomic-ops=rwlocks \ -%else - --with-atomic-ops=smp \ -%endif - --with-ssl=/usr \ - --with-plugins=%{builtin_plugins} \ - --without-plugin-handlersocket \ - HOSTNAME="/bin/hostname -f" \ - "$@" - # Add this for MyISAM RAID support: - # --with-raid - # benchdir does not fit in above model. Fix when we make a separate package - make %{?jobs:-j%jobs} - nm --numeric-sort sql/mysqld > sql/mysqld.sym - # needed for make check, which is not VPATH aware - # copy the files unconditionally so that manual 'make check' after - # the build works, too - cp -a ../mysql-test/* mysql-test/ - for i in ../sql/share/{english,charsets}; do - [ -d $i ] && cp -a $i sql/share/ - done - cp -a ../scripts/*.sql scripts/ -%if %{?_with_testsuite:1}0 - pushd mysql-test; perl ./mysql-test-run.pl --force; popd -%endif - popd -} -# Build the client, extra tools, libraries -%if 0%{?preferred} > 0 -BuildMySQL "" --with-embedded-server -%else -BuildMySQL "" --without-embedded-server -%endif -# build mysqld-debug -BuildMySQL "-debug" --with-debug --without-embedded-server - -%if 0%{?preferred} > 0 -mkdir -p _buildlibmysqld/tmp -cd _buildlibmysqld/tmp -ar -x ../../_build/libmysqld/libmysqld.a -gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \ -*.o \ --lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc -cd .. -rm -rf tmp -cd .. -%endif - -%else # cmake build - -BuildMySQL() { - mkdir _build$1 - pushd _build$1 - shift - cmake -DWITH_SSL=system \ - -DWITH_ZLIB=system \ - -DWITH_LIBEVENT=system \ - -DWITH_JEMALLOC=no \ - -DWITH_READLINE=0 \ - -DWITH_LIBEDIT=0 \ - -DINSTALL_LAYOUT=RPM \ - -DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \ - -DINSTALL_MYSQLSHAREDIR=share/%{name} \ - -DWITH_COMMENT="openSUSE MySQL rpm" \ - -DWITH_EXTRA_CHARSET=all \ - -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ - -DWITH_EMBEDDED_SERVER=true \ - -DCOMPILATION_COMMENT="openSUSE package" \ - -DDENABLE_DOWNLOADS=false \ - -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \ - -DINSTALL_LIBDIR_RPM="%{_lib}" \ - -Wno-dev "$@" .. - make %{?jobs:-j%jobs} - nm --numeric-sort sql/mysqld > sql/mysqld.sym - popd -} - -BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share -# TokuDB can't be compiled without optimisations turned on -BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_TOKUDB=1 +EXTRA_FLAGS="${EXTRA_FLAGS} -mminimal-toc" %endif +export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS" +export CXXFLAGS="$CFLAGS -felide-constructors" +%cmake -DWITH_SSL=system \ + -DWITH_ZLIB=system \ + -DWITH_LIBEVENT=system \ + -DWITH_JEMALLOC=auto \ + -DWITH_READLINE=0 \ + -DWITH_LIBEDIT=0 \ + -DINSTALL_LAYOUT=RPM \ + -DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \ + -DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \ + -DINSTALL_MYSQLSHAREDIR=share/%{name} \ + -DWITH_COMMENT="openSUSE MySQL rpm" \ + -DWITH_EXTRA_CHARSET=all \ + -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \ + -DWITH_INNOBASE_STORAGE_ENGINE=1 \ + -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \ +%if 0%{with_oqgraph} > 0 + -DWITH_OQGRAPH_STORAGE_ENGINE=1 \ +%endif +%if 0%{with_cassandra} > 0 + -DWITH_CASSANDRA_STORAGE_ENGINE=1 \ +%endif + -DWITH_XTRADB_STORAGE_ENGINE=1 \ + -DWITH_CSV_STORAGE_ENGINE=1 \ + -DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \ + -DWITH_EMBEDDED_SERVER=true \ + -DCOMPILATION_COMMENT="openSUSE package" \ + -DDENABLE_DOWNLOADS=false \ + -DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \ + -DINSTALL_LIBDIR_RPM="%{_lib}" \ + -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \ + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \ + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_SQLBENCHDIR=share \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \ + -Wno-dev "$@" .. +make %{?_smp_mflags} +nm --numeric-sort sql/mysqld > sql/mysqld.sym ++++++ configuration-tweaks.tar.bz2 ++++++ ++++++ install.inc ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -1,11 +1,5 @@ -# install the debug server first, so that we don't overwrite the standard -mkdir -p %buildroot%_libdir/mysql -make -C _build-debug/sql install DESTDIR=%buildroot -mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug -install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym -# install the client, extra tools, libraries and the standard server -make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/ -install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym +%cmake_install benchdir_root=/usr/share/ +install -m 644 build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym # remove handler socket client rm -f %buildroot%_libdir/libhsclient* rm -f %buildroot%_bindir/hsclient* @@ -17,6 +11,7 @@ [ \! -f "%buildroot%_libdir/"libmysqld.static ] || mv "%buildroot%_libdir/"libmysqld.static "%buildroot%_libdir/"libmysqld.a rm -f %buildroot%_libdir/mysql/{,plugin}/*.{a,la} rm -f %buildroot%_libdir/mysql/libndbclient.* +rm -f %buildroot%_libdir/mysql/plugin/debug_key_management.so rm -f %{buildroot}/usr/share/mysql-test/{mysql-test-run,mtr} rm -f %{buildroot}/usr/share/mysql/{binary-configure,errmsg-utf8.txt,magic,mysql-log-rotate,mysql*.server} rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini @@ -35,20 +30,26 @@ if test -e usr/bin/"$i"; then echo /usr/bin/"$i" fi + if test -d usr/share/*/"$i"; then + echo "/`echo usr/share/*/"$i"`" + fi + if test -n "`ls -1 %buildroot$i 2> /dev/null`"; then + echo "$i" + fi if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then echo "%%doc %_mandir/*/$i.[1-9]*" fi done popd >/dev/null } -filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files +filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files -filelist mysql_config >libmysqlclient-devel.files +filelist mysql_config /usr/share/pkgconfig/mariadb.pc >libmysqlclient-devel.files filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient >mysql-tools.files +filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient %{_bindir}/wsrep* /usr/share/mysql/wsrep_notify >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files @@ -71,35 +72,22 @@ errmsg_list > errormessages.files ### files not installed by make install # Create directory structure -DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SuSE plugin/daemon_example/daemon_example.ini) +DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/README.SUSE plugin/daemon_example/daemon_example.ini) DOCDIR=%buildroot%_defaultdocdir/%name install -d -m 755 ${DOCDIR} install -d -m 755 %buildroot/etc/logrotate.d -install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql -%if 0%{?preferred} > 0%{?use_cmake} -install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 -ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so -%endif +install -m 644 build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql install -m 660 %{S:14} %buildroot/etc/my.cnf [ \! -f scripts/mysqlaccess.conf ] || install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf for i in "${DOCS[@]}"; do install -m 644 "${i}" "${DOCDIR}" || true done -%if 0%{?use_systemd} > 0 install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql ln -sf service '%buildroot'/usr/sbin/rcmysql install -D -m 644 %_sourcedir/mysql.service '%buildroot'/usr/lib/systemd/system/mysql.service sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/usr/lib/mysql/rcmysql rm -rf '%buildroot'/etc/init.d -%else -install -d -m 755 '%buildroot'/etc/init.d -install -m 755 '%_sourcedir'/rc.mysql.sysvinit '%buildroot'/etc/init.d/mysql -sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/etc/init.d/mysql -ln -sf ../../etc/init.d/mysql '%buildroot'/usr/sbin/rcmysql -sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql -%endif # SuSEfirewall service description install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \ %buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql @@ -109,26 +97,14 @@ mkdir '%buildroot'/usr/share/mysql-test/var # Final fixes find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete -%if 0%{?suse_version} > 1030 %fdupes -s '%buildroot'/usr/share/mysql-test -%endif -%if 0%{?fedora_version} > 8 fdupes -q -n -r '%buildroot'/usr/share/mysql-test -%endif dos2unixConversion() { %{__sed} -i 's/\r//g' "$1" } for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do dos2unixConversion "$i" done -%if ! 0%{cluster} > 0 -cat mysql-ndb-storage.files mysql-ndb-management.files \ - mysql-ndb-tools.files mysql-ndb-extra.files | \ - sed 's|^%%doc\ ||' | while read tmp; do - cd '%buildroot' - rm -f .$tmp -done -%endif %if ! 0%{preferred} > 0 cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do cd '%buildroot' @@ -143,10 +119,6 @@ ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize -%if 0%{?cluster} > 1 -ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0 -ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6 -%endif if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf fi ++++++ mysql-patches.tar.bz2 ++++++ ++++ 2283 lines of diff (skipped) ++++++ rc.mysql.systemd ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -32,6 +32,10 @@ # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status +_rc_status_ret=0 +_rc_status=$_rc_status_ret +_rc_status_all=$_rc_status + rc_check () { _rc_status_ret=$? @@ -301,9 +305,9 @@ unset MYSQLD # use mysqld-debug only if explicitly requested (TODO: sysconfig variable?) - if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug + if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld then - MYSQLD=/usr/sbin/mysqld-debug + MYSQLD=/usr/sbin/mysqld elif test -x /usr/sbin/mysqld-max then MYSQLD=/usr/sbin/mysqld-max @@ -422,27 +426,12 @@ # Run mysql_upgrade on every package install/upgrade. Not always # necessary, but doesn't do any harm. On big upgrade, require # user confirmation. - if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then - if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \ - [ -f "$datadir/mysql_upgrade_info" ] && \ - [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then - echo - echo "You are upgrading from different stable version of MySQL!" - echo "Make sure you to make backup of your data (mostly $datadir)!" - echo - echo "If you want to continue upgrading your database, run following commands:" - echo - echo " touch /var/lib/mysql/.force_upgrade" - echo " rcmysql restart" - echo - rc_failed; rc_status -v; rc_exit - - fi + if [ -f "$datadir/.run-mysql_upgrade" ]; then echo > "$log_upgrade" echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade" echo >> "$log_upgrade" echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade" - echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade" + echo " /usr/share/doc/packages/mysql/README.SUSE" | tee -a "$log_upgrade" sed -i -e 's|^$[[:blank:]]*$skip-locking|\1skip-external-locking|' \ -e 's|^$[[:blank:]]*skip-federated$|#\1|' /etc/my.cnf [ -d /etc/mysql ] || \ @@ -502,8 +491,7 @@ } echo "Running protected MySQL... " | tee -a "$log_upgrade" - $SAFE_MYSQLD \ - --mysqld=${MYSQLD#/usr/sbin/} \ + $MYSQLD \ $debug_flags \ --skip-networking \ --skip-grant-tables \ @@ -564,6 +552,8 @@ rm -f /var/lib/mysql/.run-mysql_upgrade rm -f /var/lib/mysql/.force_upgrade rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past + MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+$[^[:blank:]]\+$[[:blank:]].*|\1|p'`" + [ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade" chmod 640 "$log_upgrade" fi ++++++ rc.mysql.sysvinit ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -251,9 +251,9 @@ unset MYSQLD # use mysqld-debug only if explicitly requested (TODO: sysconfig variable?) - if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug + if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld then - MYSQLD=/usr/sbin/mysqld-debug + MYSQLD=/usr/sbin/mysqld elif test -x /usr/sbin/mysqld-max then MYSQLD=/usr/sbin/mysqld-max @@ -372,27 +372,12 @@ # Run mysql_upgrade on every package install/upgrade. Not always # necessary, but doesn't do any harm. On big upgrade, require # user confirmation. - if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then - if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \ - [ -f "$datadir/mysql_upgrade_info" ] && \ - [ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then - echo - echo "You are upgrading from different stable version of MySQL!" - echo "Make sure you to make backup of your data (mostly $datadir)!" - echo - echo "If you want to continue upgrading your database, run following commands:" - echo - echo " touch /var/lib/mysql/.force_upgrade" - echo " rcmysql restart" - echo - rc_failed; rc_status -v; rc_exit - - fi + if [ -f "$datadir/.run-mysql_upgrade" ]; then echo > "$log_upgrade" echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade" echo >> "$log_upgrade" echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade" - echo " /usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade" + echo " /usr/share/doc/packages/mysql/README.SUSE" | tee -a "$log_upgrade" sed -i -e 's|^$[[:blank:]]*$skip-locking|\1skip-external-locking|' \ -e 's|^$[[:blank:]]*skip-federated$|#\1|' /etc/my.cnf [ -d /etc/mysql ] || \ @@ -452,8 +437,7 @@ } echo "Running protected MySQL... " | tee -a "$log_upgrade" - $SAFE_MYSQLD \ - --mysqld=${MYSQLD#/usr/sbin/} \ + $MYSQLD \ $debug_flags \ --skip-networking \ --skip-grant-tables \ @@ -514,6 +498,8 @@ rm -f /var/lib/mysql/.run-mysql_upgrade rm -f /var/lib/mysql/.force_upgrade rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past + MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+$[^[:blank:]]\+$[[:blank:]].*|\1|p'`" + [ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade" chmod 640 "$log_upgrade" fi ++++++ series ++++++ --- /var/tmp/diff_new_pack.y5VfTY/_old 2015-04-27 22:07:23.000000000 +0200 +++ /var/tmp/diff_new_pack.y5VfTY/_new 2015-04-27 22:07:23.000000000 +0200 @@ -4,14 +4,14 @@ mariadb-5.1.50-strncat-overflow.patch mariadb-5.5.28-install_db-quiet.patch mysql-community-server-5.1.51-mysql_config.patch -mariadb-5.5.25-mysqld_multi-features.patch +mariadb-10.0.15-mysqld_multi-features.patch mariadb-5.5.32-upgrade-exit-status.patch mariadb-5.2.3-cnf.patch mysql-community-server-5.5.6-safe-process-in-bin.patch -mariadb-10.0.11-group.patch +mariadb-10.0.17-group.patch mariadb-10.0.5-deharcode-libdir.patch -mariadb-10.0.14-upgrade-datadir.patch +mariadb-10.0.15-upgrade-datadir.patch mysql-community-server-5.6.12-srv_buf_size.patch -mariadb-10.0.9-perl-in-bench.patch -mariadb-10.0.11-header_files_const_warnings.patch -mariadb-10.0.13-default-source.patch +mariadb-10.0.16-header_files_const_warnings.patch +mariadb-10.0.15-fortify-and-O.patch +mariadb-10.0.15-logrotate-su.patch

1 0

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2015-04-27 22:07:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-packager" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2015-04-10 09:45:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes 2015-04-27 22:07:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 10 14:10:39 UTC 2015 - lslezak(a)suse.cz + +- register addons from media (FATE#318505) +- 3.1.67 + +------------------------------------------------------------------- Old: ---- yast2-packager-3.1.66.tar.bz2 New: ---- yast2-packager-3.1.67.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.OK7G4z/_old 2015-04-27 22:07:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OK7G4z/_new 2015-04-27 22:07:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.66 +Version: 3.1.67 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,20 +75,12 @@ # ensure that 'checkmedia' is on the medium Recommends: checkmedia -Provides: yast2-config-package-manager -Obsoletes: yast2-config-package-manager -Provides: y2c_spkg -Provides: y2pkginf -Provides: y2t_inst-packages -Provides: y2t_spkg -Obsoletes: y2c_spkg -Obsoletes: y2pkginf -Obsoletes: y2t_inst-packages -Obsoletes: y2t_spkg -Provides: yast2-trans-inst-packages -Provides: yast2-trans-package-manager -Obsoletes: yast2-trans-inst-packages -Obsoletes: yast2-trans-package-manager +# for registering media add-ons on SLE +# (openSUSE does not contain the registration module) +%if 0%{?sles_version} +Recommends: yast2-registration +%endif + # force *-webpin subpackage removal at upgrade Obsoletes: yast2-packager-webpin < %version ++++++ yast2-packager-3.1.66.tar.bz2 -> yast2-packager-3.1.67.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.66/CONTRIBUTING.md new/yast2-packager-3.1.67/CONTRIBUTING.md --- old/yast2-packager-3.1.66/CONTRIBUTING.md 2015-04-08 15:14:55.000000000 +0200 +++ new/yast2-packager-3.1.67/CONTRIBUTING.md 2015-04-21 15:28:10.000000000 +0200 @@ -71,7 +71,7 @@ [widely used conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-message…. -If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure you mention it in the commit message for cross-reference. Use format like bnc#775814 or gh#yast/yast-foo#42. See also [GitHub autolinking](https://help.github.com/articles/github-flavored-markdown#refe… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.66/package/yast2-packager.changes new/yast2-packager-3.1.67/package/yast2-packager.changes --- old/yast2-packager-3.1.66/package/yast2-packager.changes 2015-04-08 15:14:55.000000000 +0200 +++ new/yast2-packager-3.1.67/package/yast2-packager.changes 2015-04-21 15:28:10.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 10 14:10:39 UTC 2015 - lslezak(a)suse.cz + +- register addons from media (FATE#318505) +- 3.1.67 + +------------------------------------------------------------------- Mon Mar 16 09:45:04 UTC 2015 - cwh(a)suse.com - Added reponame to license's title (bnc#899892) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.66/package/yast2-packager.spec new/yast2-packager-3.1.67/package/yast2-packager.spec --- old/yast2-packager-3.1.66/package/yast2-packager.spec 2015-04-08 15:14:55.000000000 +0200 +++ new/yast2-packager-3.1.67/package/yast2-packager.spec 2015-04-21 15:28:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 3.1.66 +Version: 3.1.67 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,12 +74,12 @@ # ensure that 'checkmedia' is on the medium Recommends: checkmedia -Provides: yast2-config-package-manager -Obsoletes: yast2-config-package-manager -Provides: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg -Obsoletes: y2t_spkg y2t_inst-packages y2pkginf y2c_spkg -Provides: yast2-trans-package-manager yast2-trans-inst-packages -Obsoletes: yast2-trans-package-manager yast2-trans-inst-packages +# for registering media add-ons on SLE +# (openSUSE does not contain the registration module) +%if 0%{?sles_version} +Recommends: yast2-registration +%endif + # force *-webpin subpackage removal at upgrade Obsoletes: yast2-packager-webpin < %version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.66/src/modules/AddOnProduct.rb new/yast2-packager-3.1.67/src/modules/AddOnProduct.rb --- old/yast2-packager-3.1.66/src/modules/AddOnProduct.rb 2015-04-08 15:14:55.000000000 +0200 +++ new/yast2-packager-3.1.67/src/modules/AddOnProduct.rb 2015-04-21 15:28:10.000000000 +0200 @@ -44,6 +44,7 @@ Yast.import "URL" Yast.import "Stage" Yast.import "Icon" + Yast.import "Package" Yast.import "PackageCallbacks" Yast.import "PackagesProposal" Yast.import "SourceManager" @@ -885,9 +886,19 @@ # or check the content file if WorkflowManager.WorkflowRequiresRegistration(src_id) || Builtins.contains(@addons_requesting_registration, src_id) Builtins.y2milestone("Repository ID %1 requests registration", src_id) - # TODO FIXME: user needs to manually select the addon to register, - # pass the addon so it could be pre-selected - WFM.CallFunction("inst_scc", []) + + if !WFM.ClientExists("inst_scc") + package_installed = Package.Install("yast2-registration") + + if !package_installed + Report.Error(_("Package '%s' is not installed.\nThe add-on product cannot be registered.") % + "yast2-registration") + return nil + end + end + + # pass the addon so it could be registered + WFM.CallFunction("inst_scc", ["register_media_addon", src_id]) else Builtins.y2milestone( "Repository ID %1 doesn't need registration", @@ -1466,7 +1477,7 @@ one_prod ) Pkg.ResolvableInstall(one_prod, :product) - end + end # install all products from the destination else @@ -1657,7 +1668,7 @@ add_products = [] # new xml format if type == "xml" - add_products = ParseXMLBasedAddOnProductsFile(filename, base_url) + add_products = ParseXMLBasedAddOnProductsFile(filename, base_url) # old fallback elsif type == "plain" add_products = ParsePlainAddOnProductsFile(filename, base_url) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-3.1.66/test/addon_product_test.rb new/yast2-packager-3.1.67/test/addon_product_test.rb --- old/yast2-packager-3.1.66/test/addon_product_test.rb 2015-04-08 15:14:55.000000000 +0200 +++ new/yast2-packager-3.1.67/test/addon_product_test.rb 2015-04-21 15:28:10.000000000 +0200 @@ -32,4 +32,59 @@ end end + describe "#RegisterAddOnProduct" do + let(:repo_id) { 42 } + + context "the add-on requires registration" do + before do + allow(Yast::WorkflowManager).to receive(:WorkflowRequiresRegistration) + .with(repo_id).and_return(true) + end + + context "the registration client is installed" do + before do + expect(Yast::WFM).to receive(:ClientExists).with("inst_scc").and_return(true) + end + + it "starts the registration client" do + expect(Yast::WFM).to receive(:CallFunction).with("inst_scc", ["register_media_addon", repo_id]) + + Yast::AddOnProduct.RegisterAddOnProduct(repo_id) + end + end + + context "the registration client is not installed" do + before do + expect(Yast::WFM).to receive(:ClientExists).with("inst_scc").and_return(false) + end + + it "asks to install yast2-registration and starts registration if installed" do + expect(Yast::Package).to receive(:Install).with("yast2-registration").and_return(true) + expect(Yast::WFM).to receive(:CallFunction).with("inst_scc", ["register_media_addon", repo_id]) + + Yast::AddOnProduct.RegisterAddOnProduct(repo_id) + end + + it "asks to install yast2-registration and skips registration if not installed" do + expect(Yast::Package).to receive(:Install).with("yast2-registration").and_return(false) + expect(Yast::WFM).to_not receive(:CallFunction).with("inst_scc", ["register_media_addon", repo_id]) + + Yast::AddOnProduct.RegisterAddOnProduct(repo_id) + end + end + end + + context "the add-on does not require registration" do + before do + allow(Yast::WorkflowManager).to receive(:WorkflowRequiresRegistration) + .with(repo_id).and_return(false) + end + + it "add-on registration is skipped" do + expect(Yast::WFM).to_not receive(:CallFunction).with("inst_scc", ["register_media_addon", repo_id]) + + Yast::AddOnProduct.RegisterAddOnProduct(repo_id) + end + end + end end

1 0

commit postfix for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package postfix for openSUSE:Factory checked in at 2015-04-27 22:07:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postfix (Old) and /work/SRC/openSUSE:Factory/.postfix.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postfix" Changes: -------- --- /work/SRC/openSUSE:Factory/postfix/postfix.changes 2015-03-03 11:09:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.postfix.new/postfix.changes 2015-04-27 22:07:11.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Apr 21 09:55:44 UTC 2015 - mrueckert(a)suse.de + +- added postfix-2.11.5_linux4.patch: + Allow building on kernel 4. Patch taken from: + https://groups.google.com/forum/#!topic/mailing.postfix.users/fufS22sMGWY + +------------------------------------------------------------------- +Sun Apr 19 23:03:25 UTC 2015 - mrueckert(a)suse.de + +- update to postfix 2.11.5 + - Bugfix (introduced: Postfix 2.6): + sender_dependent_relayhost_maps ignored the relayhost setting + in the case of a DUNNO lookup result. It would use the + recipient domain instead. Viktor Dukhovni. Wietse took the + pieces of code that enforce the precedence of a + sender-dependent relayhost, the global relayhost, and the + recipient domain, and put that code together in once place so + that it is easier to maintain. File: + trivial-rewrite/resolve.c. + - Bitrot: prepare for future changes in OpenSSL API. Viktor + Dukhovni. File: tls_dane.c. + - Incompatibility: specifying "make makefiles" with "CC=command" + will no longer override the default WARN setting. + +------------------------------------------------------------------- Old: ---- postfix-2.11.4.tar.gz New: ---- postfix-2.11.5.tar.gz postfix-2.11.5_linux4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postfix.spec ++++++ --- /var/tmp/diff_new_pack.ZAws6U/_old 2015-04-27 22:07:12.000000000 +0200 +++ /var/tmp/diff_new_pack.ZAws6U/_new 2015-04-27 22:07:12.000000000 +0200 @@ -52,7 +52,7 @@ %define _unitdir /lib/systemd %endif Name: postfix -Version: 2.11.4 +Version: 2.11.5 Release: 0 Summary: A fast, secure, and flexible mailer License: IPL-1.0 @@ -78,6 +78,7 @@ Patch101: postfix-db6.diff #PATCH-FIX-SLE PATCH-FIX-OPENSUSE to be able to build the agent tls_proxy Patch102: add_missed_library.patch +Patch103: postfix-2.11.5_linux4.patch BuildRequires: cyrus-sasl-devel BuildRequires: db-devel BuildRequires: libopenssl-devel @@ -171,6 +172,7 @@ %patch100 -p1 %patch101 %patch102 +%patch103 -p1 # --------------------------------------------------------------------------- %build ++++++ postfix-2.11.4.tar.gz -> postfix-2.11.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/HISTORY new/postfix-2.11.5/HISTORY --- old/postfix-2.11.4/HISTORY 2015-02-09 00:12:22.000000000 +0100 +++ new/postfix-2.11.5/HISTORY 2015-04-13 00:40:44.000000000 +0200 @@ -17919,7 +17919,7 @@ 20120824 - Feature: support for "sendmail -R hdrs|full". Jan Kundr�t. + Feature: support for "sendmail -R hdrs|full". Jan Kundr?t. File: sendmail/sendmail.c. 20120902 @@ -19641,3 +19641,26 @@ Cleanup: missing " in \%s\" in postconf(1) fatal error messages. Iain Hibbert. File: postconf/postconf_master.c. + +20150324 + + Bugfix (introduced: Postfix 2.6): sender_dependent_relayhost_maps + ignored the relayhost setting in the case of a DUNNO lookup + result. It would use the recipient domain instead. Viktor + Dukhovni. Wietse took the pieces of code that enforce the + precedence of a sender-dependent relayhost, the global + relayhost, and the recipient domain, and put that code + together in once place so that it is easier to maintain. + File: trivial-rewrite/resolve.c. + +20150330 + + Bitrot: prepare for future changes in OpenSSL API. Viktor + Dukhovni. File: tls_dane.c. + +20150408 + + Portability: FreeBSD10 support. Files: makedefs, util/sys_defs.h. + + Incompatibility: specifying "make makefiles" with "CC=command" + will no longer override the default WARN setting. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/makedefs new/postfix-2.11.5/makedefs --- old/postfix-2.11.4/makedefs 2014-10-20 00:10:54.000000000 +0200 +++ new/postfix-2.11.5/makedefs 2015-04-09 03:34:37.000000000 +0200 @@ -158,6 +158,9 @@ ;; FreeBSD.9*) SYSTYPE=FREEBSD9 ;; + FreeBSD.10*) SYSTYPE=FREEBSD10 + : ${CC=cc} + ;; DragonFly.*) SYSTYPE=DRAGONFLY ;; OpenBSD.2*) SYSTYPE=OPENBSD2 @@ -470,7 +473,6 @@ Darwin.*) SYSTYPE=MACOSX # Use the native compiler by default : ${CC=cc} - CCARGS="$CCARGS \$(WARN)" # Darwin > 1.3 uses awk and flat_namespace case $RELEASE in 1.[0-3]) AWK=gawk;; @@ -624,7 +626,7 @@ # een burned once by a compiler that lies about what warnings it # produces, not taking that chance again. -: ${CC='gcc $(WARN)'} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \ +: ${CC=gcc} ${OPT='-O'} ${DEBUG='-g'} ${AWK=awk} \ ${WARN='-Wall -Wno-comment -Wformat -Wimplicit -Wmissing-prototypes \ -Wparentheses -Wstrict-prototypes -Wswitch -Wuninitialized \ -Wunused -Wno-missing-braces'} @@ -647,7 +649,7 @@ ARFL = $ARFL RANLIB = $RANLIB SYSLIBS = $AUXLIBS $SYSLIBS -CC = $CC $CCARGS +CC = $CC $CCARGS \$(WARN) OPT = $OPT DEBUG = $DEBUG AWK = $AWK diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/src/global/mail_version.h new/postfix-2.11.5/src/global/mail_version.h --- old/postfix-2.11.4/src/global/mail_version.h 2015-02-09 00:17:36.000000000 +0100 +++ new/postfix-2.11.5/src/global/mail_version.h 2015-04-12 23:34:37.000000000 +0200 @@ -20,8 +20,8 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20150208" -#define MAIL_VERSION_NUMBER "2.11.4" +#define MAIL_RELEASE_DATE "20150412" +#define MAIL_VERSION_NUMBER "2.11.5" #ifdef SNAPSHOT #define MAIL_VERSION_DATE "-" MAIL_RELEASE_DATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/src/tls/tls_dane.c new/postfix-2.11.5/src/tls/tls_dane.c --- old/postfix-2.11.4/src/tls/tls_dane.c 2014-01-09 16:00:36.000000000 +0100 +++ new/postfix-2.11.5/src/tls/tls_dane.c 2015-04-01 14:49:46.000000000 +0200 @@ -383,7 +383,7 @@ && ((md = EVP_get_digestbyname(dane_mdalg)) == 0 || (mdlen = EVP_MD_size(md)) <= 0 || mdlen > EVP_MAX_MD_SIZE)) { - msg_warn("Unimplemented digest algoritm in %s: %s%s%s", + msg_warn("Unimplemented digest algorithm in %s: %s%s%s", VAR_TLS_DANE_DIGESTS, mdalg, value ? "=" : "", value ? value : ""); return (0); @@ -1452,7 +1452,7 @@ static int add_akid(X509 *cert, AUTHORITY_KEYID *akid) { - ASN1_STRING *id; + ASN1_OCTET_STRING *id; unsigned char c = 0; int nid = NID_authority_key_identifier; int ret = 0; @@ -1464,13 +1464,13 @@ * exempt from any potential (off by default for now in OpenSSL) * self-signature checks! */ - id = (ASN1_STRING *) ((akid && akid->keyid) ? akid->keyid : 0); - if (id && M_ASN1_STRING_length(id) == 1 && *M_ASN1_STRING_data(id) == c) + id = ((akid && akid->keyid) ? akid->keyid : 0); + if (id && ASN1_STRING_length(id) == 1 && *ASN1_STRING_data(id) == c) c = 1; if ((akid = AUTHORITY_KEYID_new()) != 0 && (akid->keyid = ASN1_OCTET_STRING_new()) != 0 - && M_ASN1_OCTET_STRING_set(akid->keyid, (void *) &c, 1) + && ASN1_OCTET_STRING_set(akid->keyid, (void *) &c, 1) && X509_add1_ext_i2d(cert, nid, akid, 0, X509V3_ADD_DEFAULT) > 0) ret = 1; if (akid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/src/trivial-rewrite/resolve.c new/postfix-2.11.5/src/trivial-rewrite/resolve.c --- old/postfix-2.11.4/src/trivial-rewrite/resolve.c 2013-05-07 20:41:03.000000000 +0200 +++ new/postfix-2.11.5/src/trivial-rewrite/resolve.c 2015-04-09 03:48:51.000000000 +0200 @@ -549,15 +549,20 @@ if (*relay == 0) { msg_warn("%s: ignoring null lookup result for %s", rp->snd_relay_maps_name, sender_key); - relay = "DUNNO"; - } - vstring_strcpy(nexthop, strcasecmp(relay, "DUNNO") == 0 ? - rcpt_domain : relay); + relay = 0; + } else if (strcasecmp(relay, "DUNNO") == 0) + relay = 0; } else if (rp->snd_relay_info && rp->snd_relay_info->error != 0) { msg_warn("%s lookup failure", rp->snd_relay_maps_name); *flags |= RESOLVE_FLAG_FAIL; FREE_MEMORY_AND_RETURN; + } else { + relay = 0; + } + /* Enforce all the relayhost precedences in one place. */ + if (relay != 0) { + vstring_strcpy(nexthop, relay); } else if (*RES_PARAM_VALUE(rp->relayhost)) vstring_strcpy(nexthop, RES_PARAM_VALUE(rp->relayhost)); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/postfix-2.11.4/src/util/sys_defs.h new/postfix-2.11.5/src/util/sys_defs.h --- old/postfix-2.11.4/src/util/sys_defs.h 2013-09-29 22:51:55.000000000 +0200 +++ new/postfix-2.11.5/src/util/sys_defs.h 2015-04-09 02:16:04.000000000 +0200 @@ -25,7 +25,7 @@ */ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ - || defined(FREEBSD8) || defined(FREEBSD9) \ + || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(OPENBSD5) \ ++++++ postfix-2.11.5_linux4.patch ++++++ Index: postfix-2.11.5/makedefs =================================================================== --- postfix-2.11.5.orig/makedefs +++ postfix-2.11.5/makedefs @@ -365,7 +365,12 @@ EOF fi;; esac ;; - Linux.3*) SYSTYPE=LINUX3 + Linux.[34]*) + case "$RELEASE" in + 3.*) SYSTYPE=LINUX3;; + 4.*) SYSTYPE=LINUX4;; + *) error "Unknown Linux version: `uname -r`.";; + esac case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; Index: postfix-2.11.5/src/util/sys_defs.h =================================================================== --- postfix-2.11.5.orig/src/util/sys_defs.h +++ postfix-2.11.5/src/util/sys_defs.h @@ -755,7 +755,7 @@ extern int initgroups(const char *, int) /* * LINUX. */ -#if defined(LINUX2) || defined(LINUX3) +#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) #define SUPPORTED #include <sys/types.h> #define UINT32_TYPE unsigned int

1 0

commit iputils for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package iputils for openSUSE:Factory checked in at 2015-04-27 22:07:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iputils (Old) and /work/SRC/openSUSE:Factory/.iputils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iputils" Changes: -------- --- /work/SRC/openSUSE:Factory/iputils/iputils.changes 2014-01-29 07:15:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iputils.new/iputils.changes 2015-04-27 22:07:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 20 17:07:42 CEST 2015 - tiwai(a)suse.de + +- Fix a bogus kernel version check (boo#927831): + iputils-remove-bogus-check-required-for-2.4.9-kernels.patch + +------------------------------------------------------------------- New: ---- iputils-remove-bogus-check-required-for-2.4.9-kernels.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iputils.spec ++++++ --- /var/tmp/diff_new_pack.NLOb1p/_old 2015-04-27 22:07:05.000000000 +0200 +++ /var/tmp/diff_new_pack.NLOb1p/_new 2015-04-27 22:07:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iputils # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,8 @@ Patch3: iputils-ifenslave.diff Patch8: iputils-s20101006-sec-ping-unblock.diff Patch9: iputils-s20101006-ping-interrupt.diff +# PATCH-FIX-UPSTREAM iputils-remove-bogus-check-required-for-2.4.9-kernels.patch tiwai(a)suse.de - boo#927831 +Patch10: iputils-remove-bogus-check-required-for-2.4.9-kernels.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: permissions @@ -50,6 +52,7 @@ %patch3 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build make %{?_smp_mflags} KERNEL_INCLUDE=$PWD \ ++++++ iputils-remove-bogus-check-required-for-2.4.9-kernels.patch ++++++ >From 5bb0f0a8b0ed6f111a329c0d6911dfa516ab1d42 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans <noahm(a)debian.org> Date: Fri, 18 Apr 2014 15:47:29 +0200 Subject: [PATCH] remove bogus check required for < 2.4.9 kernels Debian bug: #709052 --- ping.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/ping.c b/ping.c index b9d649531621..f9f4a28f5dc1 100644 --- a/ping.c +++ b/ping.c @@ -654,17 +654,6 @@ int receive_error_msg() acknowledge(ntohs(icmph.un.echo.sequence)); - if (!working_recverr) { - struct icmp_filter filt; - working_recverr = 1; - /* OK, it works. Add stronger filter. */ - filt.data = ~((1<<ICMP_SOURCE_QUENCH)| - (1<<ICMP_REDIRECT)| - (1<<ICMP_ECHOREPLY)); - if (setsockopt(icmp_sock, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt)) == -1) - perror("\rWARNING: setsockopt(ICMP_FILTER)"); - } - net_errors++; nerrors++; if (options & F_QUIET) @@ -820,19 +809,7 @@ parse_reply(struct msghdr *msg, int cc, void *addr, struct timeval *tv) icp->type != ICMP_SOURCE_QUENCH); if (error_pkt) { acknowledge(ntohs(icp1->un.echo.sequence)); - if (working_recverr) { - return 0; - } else { - static int once; - /* Sigh, IP_RECVERR for raw socket - * was broken until 2.4.9. So, we ignore - * the first error and warn on the second. - */ - if (once++ == 1) - fprintf(stderr, "\rWARNING: kernel is not very fresh, upgrade is recommended.\n"); - if (once == 1) - return 0; - } + return 0; } nerrors+=error_pkt; if (options&F_QUIET) -- 2.3.5

1 0

commit obs-service-source_validator for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package obs-service-source_validator for openSUSE:Factory checked in at 2015-04-27 22:06:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old) and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-source_validator" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes 2015-02-27 11:08:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes 2015-04-27 22:07:00.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 20 12:17:45 UTC 2015 - lnussel(a)suse.de + +- Update to version 0.5+git20150420.23830c1: + + Verify if the packages referenced by baselibs.conf are actually being built. + + Check for disallowed services before missing files (#16) + + add support for %autosetup and %autopatch +- use proper versioning in _service file and generate changes entry + +------------------------------------------------------------------- Old: ---- obs-service-source_validator-0.5.tar.bz2 New: ---- _servicedata obs-service-source_validator-0.5+git20150420.23830c1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.kLQMOf/_old 2015-04-27 22:07:01.000000000 +0200 +++ /var/tmp/diff_new_pack.kLQMOf/_new 2015-04-27 22:07:01.000000000 +0200 @@ -20,7 +20,7 @@ Summary: An OBS source service: running all the osc source-validator checks License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.5 +Version: 0.5+git20150420.23830c1 Release: 0 # use osc service dr to update Source: %{name}-%{version}.tar.bz2 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.kLQMOf/_old 2015-04-27 22:07:01.000000000 +0200 +++ /var/tmp/diff_new_pack.kLQMOf/_new 2015-04-27 22:07:01.000000000 +0200 @@ -1,11 +1,12 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">git@github.com:openSUSE/obs-service-source_validator.git</param> + <param name="url">git://github.com/openSUSE/obs-service-source_validator.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="version">git-master</param> - <param name="versionformat">0.5</param> + <param name="versionformat">0.5+git%cd.%h</param> <param name="revision">master</param> + <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/obs-service-source_validator.git</param> <param name="changesrevision">23830c1e19fac4b2c0972b79cd61b5f0cac796c9</param></service></servicedata>

1 0

commit hex for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package hex for openSUSE:Factory checked in at 2015-04-27 22:06:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hex (Old) and /work/SRC/openSUSE:Factory/.hex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hex" Changes: -------- --- /work/SRC/openSUSE:Factory/hex/hex.changes 2015-02-27 11:03:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hex.new/hex.changes 2015-04-27 22:06:54.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 20 14:18:18 UTC 2015 - mpluskal(a)suse.com + +- Cleanup spec-file with spec-cleaner +- Use url for source + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hex.spec ++++++ --- /var/tmp/diff_new_pack.9EmFyN/_old 2015-04-27 22:06:55.000000000 +0200 +++ /var/tmp/diff_new_pack.9EmFyN/_new 2015-04-27 22:06:55.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package hex # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,28 +23,26 @@ License: BSD-3-Clause Group: Development/Tools/Other Url: http://ibiblio.org/pub/Linux/utils/file/hex/!INDEX.html -Source: %{name}-%{version}.tar.gz -Patch: %{name}-%{version}.diff +Source: http://ibiblio.org/pub/Linux/utils/file/hex/%{name}-%{version}.tar.gz +Patch0: %{name}-%{version}.diff +Provides: util-linux:%{_bindir}/hex BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: util-linux:/usr/bin/hex %description A hex dumper that does CP/M and EBCDIC formatting and has internationalization support. - - %prep -%setup -%patch +%setup -q +%patch0 %build -make clean -make CFLAGS="$RPM_OPT_FLAGS -Wall" CC="%{__cc}" %{?_smp_mflags} +make %{?_smp_mflags} clean +make CFLAGS="%{optflags} -Wall" CC="gcc" %{?_smp_mflags} %install -mkdir -p "$RPM_BUILD_ROOT"{%{_mandir}/man1,%{_bindir}} -make install DESTDIR="$RPM_BUILD_ROOT" MANDIR=%{_mandir} +mkdir -p %{buildroot}{%{_mandir}/man1,%{_bindir}} +make install DESTDIR=%{buildroot} MANDIR=%{_mandir} %files %defattr(-,root,root)

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2015-04-27 22:06:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2015-04-03 14:33:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2015-04-27 22:06:49.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 17 08:14:31 UTC 2015 - normand(a)linux.vnet.ibm.com + +- Add xorg-x11-server-byte-order.patch to correctly set + X_BYTE_ORDER when compiling tigervnc on ppc64 architecture. + Related to bnc#926201 + +------------------------------------------------------------------- New: ---- xorg-x11-server-byte-order.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.fWMi1i/_old 2015-04-27 22:06:51.000000000 +0200 +++ /var/tmp/diff_new_pack.fWMi1i/_new 2015-04-27 22:06:51.000000000 +0200 @@ -166,6 +166,7 @@ Patch114: u_ad-hoc-fix-for-mmap-s-truncated-offset-parameter-on-.patch Patch115: N_Force-swcursor-for-KMS-drivers-without-hw-cursor-sup.patch Patch116: U_os-XDMCP-options-like-query-etc-should-imply-listen.patch +Patch117: xorg-x11-server-byte-order.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -257,6 +258,7 @@ %patch114 -p1 %patch115 -p1 %patch116 -p1 +%patch117 -p1 %patch1000 -p1 ++++++ xorg-x11-server-byte-order.patch ++++++ >From 1f679da30a33f3ddad14bc6b2be0795160ae12b8 Mon Sep 17 00:00:00 2001 From: Adam Jackson <ajax(a)redhat.com> Date: Thu, 9 Apr 2015 10:19:13 -0400 Subject: [PATCH] include: Fix endianness setup Need to make sure X_{BIG,LITTLE}_ENDIAN actually get defined Signed-off-by: Adam Jackson <ajax(a)redhat.com> --- include/dix-config.h.in | 1 + include/xorg-server.h.in | 1 + 2 files changed, 2 insertions(+) Index: a/include/dix-config.h.in =================================================================== --- a.orig/include/dix-config.h.in +++ a/include/dix-config.h.in @@ -499,6 +499,7 @@ /* byte order */ #undef X_BYTE_ORDER +#include <X11/Xarch.h> /* Listen on TCP socket */ #undef LISTEN_TCP Index: a/include/xorg-server.h.in =================================================================== --- a.orig/include/xorg-server.h.in +++ a/include/xorg-server.h.in @@ -233,5 +233,6 @@ /* byte order */ #undef X_BYTE_ORDER +#include <X11/Xarch.h> #endif /* _XORG_SERVER_H_ */

1 0

commit tigervnc for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-04-27 22:06:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tigervnc (Old) and /work/SRC/openSUSE:Factory/.tigervnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tigervnc" Changes: -------- --- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-04-18 10:38:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-04-27 22:06:43.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 20 12:10:10 UTC 2015 - msrb(a)suse.com + +- u_syslog.patch, vnc.xinetd + * Add logging to syslog. + +------------------------------------------------------------------- New: ---- u_syslog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tigervnc.spec ++++++ --- /var/tmp/diff_new_pack.ChP1B3/_old 2015-04-27 22:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ChP1B3/_new 2015-04-27 22:06:44.000000000 +0200 @@ -113,6 +113,7 @@ Patch11: u_terminate_instead_of_ignoring_restart.patch # Require and build against gnutls 3.x Patch12: tigervnc-gnutls-3.4-required.patch +Patch13: u_syslog.patch %description TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing), @@ -146,6 +147,7 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 pushd unix/xserver patch -p1 < ../xserver116.patch ++++++ u_syslog.patch ++++++ Author: Michal Srb <msrb(a)suse.com> Subject: Syslog logging Patch-Mainline: To be upstreamed Index: tigervnc-1.4.1/common/rfb/CMakeLists.txt =================================================================== --- tigervnc-1.4.1.orig/common/rfb/CMakeLists.txt +++ tigervnc-1.4.1/common/rfb/CMakeLists.txt @@ -29,6 +29,7 @@ set(RFB_SOURCES Logger.cxx Logger_file.cxx Logger_stdio.cxx + Logger_syslog.cxx Password.cxx PixelBuffer.cxx PixelFormat.cxx Index: tigervnc-1.4.1/common/rfb/LogWriter.h =================================================================== --- tigervnc-1.4.1.orig/common/rfb/LogWriter.h +++ tigervnc-1.4.1/common/rfb/LogWriter.h @@ -68,10 +68,15 @@ namespace rfb { } } - DEF_LOGFUNCTION(error, 0) - DEF_LOGFUNCTION(status, 10) - DEF_LOGFUNCTION(info, 30) - DEF_LOGFUNCTION(debug, 100) + static const int LEVEL_ERROR = 0; + static const int LEVEL_STATUS = 10; + static const int LEVEL_INFO = 30; + static const int LEVEL_DEBUG = 100; + + DEF_LOGFUNCTION(error, LEVEL_ERROR) + DEF_LOGFUNCTION(status, LEVEL_STATUS) + DEF_LOGFUNCTION(info, LEVEL_INFO) + DEF_LOGFUNCTION(debug, LEVEL_DEBUG) // -=- DIAGNOSTIC & HELPER ROUTINES Index: tigervnc-1.4.1/common/rfb/Logger_syslog.cxx =================================================================== --- /dev/null +++ tigervnc-1.4.1/common/rfb/Logger_syslog.cxx @@ -0,0 +1,65 @@ +/* Copyright (C) 2015 TigerVNC + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +// -=- Logger_syslog.cxx - Logger instance for a syslog + +#include <stdlib.h> +#include <string.h> +#include <syslog.h> + +#include <rfb/util.h> +#include <rfb/Logger_syslog.h> +#include <rfb/LogWriter.h> +#include <rfb/Threading.h> + +using namespace rfb; + + +Logger_Syslog::Logger_Syslog(const char* loggerName) + : Logger(loggerName) +{ + openlog("Xvnc", LOG_CONS | LOG_PID, LOG_USER); +} + +Logger_Syslog::~Logger_Syslog() +{ + closelog(); +} + +void Logger_Syslog::write(int level, const char *logname, const char *message) +{ + // Convert our priority level into syslog level + int priority; + if (level >= LogWriter::LEVEL_DEBUG) { + priority = LOG_DEBUG; + } else if (level >= LogWriter::LEVEL_INFO) { + priority = LOG_INFO; + } else if (level >= LogWriter::LEVEL_STATUS) { + priority = LOG_NOTICE; + } else { + priority = LOG_ERR; + } + + syslog(priority, "%s: %s", logname, message); +} + +static Logger_Syslog logger("syslog"); + +void rfb::initSyslogLogger() { + logger.registerLogger(); +} Index: tigervnc-1.4.1/common/rfb/Logger_syslog.h =================================================================== --- /dev/null +++ tigervnc-1.4.1/common/rfb/Logger_syslog.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2015 TigerVNC + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +// -=- Logger_syslog - log to syslog + +#ifndef __RFB_LOGGER_SYSLOG_H__ +#define __RFB_LOGGER_SYSLOG_H__ + +#include <time.h> +#include <rfb/Logger.h> + +namespace rfb { + + class Logger_Syslog : public Logger { + public: + Logger_Syslog(const char* loggerName); + virtual ~Logger_Syslog(); + + virtual void write(int level, const char *logname, const char *message); + }; + + void initSyslogLogger(); +}; + +#endif Index: tigervnc-1.4.1/unix/xserver/hw/vnc/Xvnc.man =================================================================== --- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/Xvnc.man +++ tigervnc-1.4.1/unix/xserver/hw/vnc/Xvnc.man @@ -274,11 +274,11 @@ stop non-SSH connections from any other . .TP .B \-Log \fIlogname\fP:\fIdest\fP:\fIlevel\fP -Configures the debug log settings. \fIdest\fP can currently be \fBstderr\fP or -\fBstdout\fP, and \fIlevel\fP is between 0 and 100, 100 meaning most verbose -output. \fIlogname\fP is usually \fB*\fP meaning all, but you can target a -specific source file if you know the name of its "LogWriter". Default is -\fB*:stderr:30\fP. +Configures the debug log settings. \fIdest\fP can currently be \fBstderr\fP, +\fBstdout\fP or \fBsyslog\fP, and \fIlevel\fP is between 0 and 100, 100 meaning +most verbose output. \fIlogname\fP is usually \fB*\fP meaning all, but you can +target a specific source file if you know the name of its "LogWriter". Default +is \fB*:stderr:30\fP. . .TP .B \-RemapKeys \fImapping Index: tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc =================================================================== --- tigervnc-1.4.1.orig/unix/xserver/hw/vnc/xvnc.cc +++ tigervnc-1.4.1/unix/xserver/hw/vnc/xvnc.cc @@ -34,6 +34,7 @@ from the X Consortium. #include <rfb/Configuration.h> #include <rfb/Logger_stdio.h> +#include <rfb/Logger_syslog.h> #include <rfb/LogWriter.h> #include <network/TcpSocket.h> #include "vncExtInit.h" @@ -376,6 +377,7 @@ ddxProcessArgument(int argc, char *argv[ vfbInitializePixmapDepths(); firstTime = FALSE; rfb::initStdIOLoggers(); + rfb::initSyslogLogger(); rfb::LogWriter::setLogParams("*:stderr:30"); rfb::Configuration::enableServerParams(); } ++++++ vnc.xinetd ++++++ --- /var/tmp/diff_new_pack.ChP1B3/_old 2015-04-27 22:06:44.000000000 +0200 +++ /var/tmp/diff_new_pack.ChP1B3/_new 2015-04-27 22:06:44.000000000 +0200 @@ -10,7 +10,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes none + server_args = -noreset -inetd -once -query localhost -geometry 1024x768 -securitytypes none -log *:syslog:30 disable = yes } # default: off @@ -25,7 +25,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = -noreset -inetd -once -query localhost -geometry 1280x1024 -securitytypes none + server_args = -noreset -inetd -once -query localhost -geometry 1280x1024 -securitytypes none -log *:syslog:30 disable = yes } # default: off @@ -40,7 +40,7 @@ wait = no user = nobody server = /usr/bin/Xvnc - server_args = -noreset -inetd -once -query localhost -geometry 1600x1200 -securitytypes none + server_args = -noreset -inetd -once -query localhost -geometry 1600x1200 -securitytypes none -log *:syslog:30 disable = yes } # default: off

1 0

commit fontforge for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package fontforge for openSUSE:Factory checked in at 2015-04-27 22:06:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fontforge (Old) and /work/SRC/openSUSE:Factory/.fontforge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontforge" Changes: -------- --- /work/SRC/openSUSE:Factory/fontforge/fontforge.changes 2015-02-06 10:55:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fontforge.new/fontforge.changes 2015-04-27 22:06:39.000000000 +0200 @@ -1,0 +2,26 @@ +Mon Apr 20 07:10:42 UTC 2015 - pgajdos(a)suse.com + +- repack source [bnc#926061] + +------------------------------------------------------------------- +Tue Mar 31 09:55:24 UTC 2015 - pgajdos(a)suse.com + +- updated to 20150330: + * fixes a few crashes, enhances round-tripping of information in + certain file formats, and fixes some bad logic + * adds support for fine point adjustment + * etc. see https://github.com/fontforge/fontforge/releases + for details +- remove %requires_ge libpng16-16 as it seems fontforge is not so + picky anymore +- doc is generated +- remove pfaedit compat +- removed patches (upstreamed or not needed): + - fontforge-fixgiflib.patch + - fontforge-arraysubscript.patch + - fontforge-fdleak.patch + - fontforge-libpng.diff + - fontforge-docdir.patch + - fontforge-python-module-name.diff + +------------------------------------------------------------------- Old: ---- fontforge-arraysubscript.patch fontforge-docdir.patch fontforge-fdleak.patch fontforge-fixgiflib.patch fontforge-libpng.diff fontforge-python-module-name.diff fontforge_full-20120731-b.tar.bz2 fontforge_htdocs-20120731-b.tar.bz2 New: ---- fontforge-20150330-repacked.tar.gz get-source.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontforge.spec ++++++ --- /var/tmp/diff_new_pack.P6l3tW/_old 2015-04-27 22:06:42.000000000 +0200 +++ /var/tmp/diff_new_pack.P6l3tW/_new 2015-04-27 22:06:42.000000000 +0200 @@ -16,37 +16,33 @@ # -%define src_version %{version}-b Name: fontforge -Version: 20120731 +Version: 20150330 Release: 0 Summary: A Font Editor -License: BSD-3-Clause +License: GPL-3.0+ Group: Productivity/Graphics/Vector Editors Url: http://fontforge.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}_full-%{src_version}.tar.bz2 -Source1: http://downloads.sourceforge.net/%{name}/%{name}_htdocs-%{src_version}.tar.… -# PATCH-FIX-OPENSUSE -- set path to documentation -Patch0: fontforge-docdir.patch -Patch1: fontforge-fdleak.patch -# workaround, this should be resolved upstream (use pkg-config) bnc#867041 -Patch2: fontforge-libpng.diff -# PATCH-FIX-OPENSUSE fontforge-python-module-name.diff -- change python module name according to naming policy -Patch3: fontforge-python-module-name.diff -Patch4: fontforge-fixgiflib.patch -# PATCH-FIX-UPSTREAM http://sourceforge.net/p/fontforge/git/ci/9ae25e0 -Patch5: fontforge-arraysubscript.patch +# Source: https://github.com/fontforge/fontforge/releases/download/%{version}/fontfor… +# see bug 926061, fontforge-*-repacked.tar.gz does not contain fontforge-*/win/gold/libX11-*.noarch.rpm +Source0: fontforge-%{version}-repacked.tar.gz +Source1: get-source.sh # suse specific -Patch6: propagate-creation-and-modification-times-to-ttf.patch +Patch0: propagate-creation-and-modification-times-to-ttf.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: cairo-devel BuildRequires: fdupes BuildRequires: fontconfig-devel BuildRequires: freetype2-devel BuildRequires: gettext-tools BuildRequires: giflib-devel +BuildRequires: git +BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel +BuildRequires: libtool BuildRequires: libuninameslist-devel BuildRequires: libxml2-devel BuildRequires: pango-devel @@ -57,11 +53,6 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xft) BuildRequires: pkgconfig(xi) -# following to avoid warning -# 'Application built with libpng-1.5.14 but running with 1.6.1' -%requires_eq libpng16-16 -Obsoletes: PfaEdit < 20110222 -Provides: PfaEdit = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libspiro-devel @@ -102,60 +93,24 @@ to develop applications that use FontForge libraries. %prep -%setup -q -T -n fontforge-%{src_version} -b 0 -%patch0 -p 1 -b .docdir -%patch1 -%patch2 -%patch3 -%if 0%{?suse_version} > 1230 -%patch4 -p1 -%endif -%patch5 -p1 -%patch6 -p1 -mkdir docs -tar -jxvf %{SOURCE1} -C docs -chmod 644 docs/quadraticspline.gif -chmod 644 docs/FontForgeSplash.png -chmod 644 docs/*.html -# tar zxvf docs/cidmaps.tgz -find . -name CVS -type d | xargs rm -rf -# fix wrong-file-end-of-line-encoding -sed -i 's/\r$//' docs/{Big5.txt,corpchar.txt} +%setup -q +%patch0 -p1 +sed -i 's/\r$//' doc/html/{Big5.txt,corpchar.txt} %build -# workaround, this should be resolved upstream (use pkg-config) bnc#867041 -pkg-config --exists 'libpng >= 1.7.0' && echo 'Libpng was updated to 1.7, fontforge-libpng.patch will probably need to be adapted.' && exit 1 -export CFLAGS="%{optflags} -fno-strict-aliasing" +./bootstrap %configure \ --disable-static \ --enable-pyextension \ - --with-regular-link - + --with-regular-link \ + --docdir=%{_docdir}/%{name}/html make %{?_smp_mflags} -pushd pyhook -python setup.py build -popd %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -# symlink for old FontForge name - PfaEdit -pushd %{buildroot}%{_bindir} - ln -s fontforge pfaedit -popd -# install CMaps to be able to edit CID-keyed fonts: -# install -m 644 Adobe* %{buildroot}%{_datadir}/fontforge -# desktop file and icon -install -Dm 644 Packaging/%{name}.desktop %{buildroot}%{_datadir}/applications/%{name}.desktop -install -Dm 644 Packaging/icons/48x48/apps/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png %suse_update_desktop_file -i %{name} VectorGraphics %find_lang FontForge find %{buildroot} -type f -name "*.la" -delete -print -pushd pyhook -python setup.py install \ - --root=%{buildroot} \ - --prefix=%{_prefix} \ - --record-rpm=%{name}-python.files -popd %fdupes -s %{buildroot}%{_datadir}/%{name} %post -p /sbin/ldconfig @@ -164,21 +119,26 @@ %files -f FontForge.lang %defattr(-,root,root) -%doc LICENSE +%doc LICENSE COPYING.gplv3 +%exclude %{_docdir}/%{name}/html +%{_mandir}/man1/*.1* %{_bindir}/* %{_libdir}/lib*.so.* %{_datadir}/fontforge/ -%{_mandir}/man1/*.1* -%{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png %{py_sitedir}/* +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/mime/packages/%{name}.xml %files doc %defattr(-,root,root) -%doc AUTHORS VERSION LICENSE README-unix docs/ +%doc AUTHORS LICENSE README.md +%doc %{_docdir}/%{name}/html %files devel %defattr(-, root, root) +%doc CONTRIBUTING.md %{_includedir}/fontforge/ %{_libdir}/pkgconfig/*.pc %{_libdir}/lib*.so ++++++ get-source.sh ++++++ #!/bin/sh # # repack source -- delete libX11-*.noarch.rpm from there; see bug #926061 # VERSION=$1 if [ -z $VERSION ]; then echo "usage: $0 date_version" echo "example: $0 20150330" exit 1 fi wget "https://github.com/fontforge/fontforge/releases/download/$VERSION/fontforge…" tar xf fontforge-$VERSION.tar.gz rm fontforge-*/win/gold/libX11-*.noarch.rpm tar czf fontforge-$VERSION-repacked.tar.gz fontforge-$VERSION rm -rf fontforge-$VERSION rm fontforge-$VERSION.tar.gz

1 0

commit kraft for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package kraft for openSUSE:Factory checked in at 2015-04-27 13:05:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kraft (Old) and /work/SRC/openSUSE:Factory/.kraft.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kraft" Changes: -------- --- /work/SRC/openSUSE:Factory/kraft/kraft.changes 2015-03-18 13:04:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kraft.new/kraft.changes 2015-04-27 13:05:43.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Apr 5 19:42:22 UTC 2015 - freitag(a)opensuse.org + +* Update to upstream version 0.58: + - Fix handling of slashes in the doc id template + - Fix a bug in calculation of the VAT sum + - Removed kraftcat library as it was unused. Easier building now. + +* Removed patch kraft_no_lib.diff from package as the changes went + upstream and are contained in the official tarball now. + +------------------------------------------------------------------- Old: ---- kraft-0.57.tar.xz kraft_no_lib.diff New: ---- kraft-0.58.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kraft.spec ++++++ --- /var/tmp/diff_new_pack.Ny4QH2/_old 2015-04-27 13:05:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Ny4QH2/_new 2015-04-27 13:05:44.000000000 +0200 @@ -1,30 +1,38 @@ # # spec file for package kraft # +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2007-2011 Klaas Freitag <freitag(a)kde.org> -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: kraft Url: http://volle-kraft-voraus.de -Version: 0.57 -Release: 1 -License: GPL-2.0+ and LGPL-2.1+ +Version: 0.58 +Release: 0 Summary: KDE software to manage office documents in the office +License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Office/Other Source0: kraft-%{version}.tar.xz -Patch0: kraft_no_lib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} +Requires: kdepim4-runtime +Requires: libqt4-sql-sqlite Requires: python-pypdf Requires: sqlite3 -Requires: libqt4-sql-sqlite -Requires: kdepim4-runtime %kde4_runtime_requires %kde4_pimlibs_requires %kde4_akonadi_requires @@ -36,11 +44,11 @@ %endif %if 0%{?fedora_version} -Requires: pyPdf -Requires: sqlite Requires: kdepim-runtime +Requires: pyPdf Requires: qt >= 4.7 Requires: qt-x11 >= 4.7 +Requires: sqlite BuildRequires: ctemplate-devel BuildRequires: kdelibs-devel @@ -59,7 +67,6 @@ %prep %setup -q -%patch0 -p1 %build mkdir build ++++++ kraft-0.57.tar.xz -> kraft-0.58.tar.xz ++++++ ++++ 8432 lines of diff (skipped)

1 0

commit mksusecd for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package mksusecd for openSUSE:Factory checked in at 2015-04-27 13:05:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mksusecd (Old) and /work/SRC/openSUSE:Factory/.mksusecd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mksusecd" Changes: -------- --- /work/SRC/openSUSE:Factory/mksusecd/mksusecd.changes 2015-04-25 11:25:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mksusecd.new/mksusecd.changes 2015-04-27 13:05:41.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Apr 25 09:35:55 UTC 2015 - schwab(a)linux-m68k.org + +- Run through spec-cleaner +- Fix file list + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mksusecd.spec ++++++ --- /var/tmp/diff_new_pack.JDAabn/_old 2015-04-27 13:05:42.000000000 +0200 +++ /var/tmp/diff_new_pack.JDAabn/_new 2015-04-27 13:05:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mksusecd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 Steffen Winterfeldt # # All modifications and additions to the file contributed by third parties @@ -18,8 +18,15 @@ Name: mksusecd -BuildRequires: xz +Version: 1.19 +Release: 0 +Summary: Create SUSE Linux installation ISOs +License: GPL-3.0+ +Group: Hardware/Other +Url: https://github.com/wfeldt/mksusecd +Source: %{name}-%{version}.tar.xz BuildRequires: libuuid-devel +BuildRequires: xz Requires: checkmedia Requires: dosfstools Requires: genisoimage @@ -27,37 +34,23 @@ Requires: mtools Requires: syslinux Requires: xz -Summary: Create SUSE Linux installation ISOs -License: GPL-3.0+ -Group: Hardware/Other -Version: 1.19 -Release: 0 -Source: %{name}-%{version}.tar.xz -Url: https://github.com/wfeldt/mksusecd BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This is a tool to create SUSE Linux installation ISOs. -Authors: --------- - Steffen Winterfeldt - %prep -%setup +%setup -q %build %install - make install DESTDIR=%{buildroot} - -%clean -rm -rf %{buildroot} +make DESTDIR=%{buildroot} LIBDIR=%{_libexecdir} BINDIR=%{_bindir} install %{?_smp_mflags} %files %defattr(-,root,root) -/usr/bin/* -/usr/lib/* +%{_bindir}/* +%{_libexecdir}/%{name} %doc README* COPYING* %changelog

1 0

commit colorhug-client for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package colorhug-client for openSUSE:Factory checked in at 2015-04-27 13:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colorhug-client (Old) and /work/SRC/openSUSE:Factory/.colorhug-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colorhug-client" Changes: -------- --- /work/SRC/openSUSE:Factory/colorhug-client/colorhug-client.changes 2014-12-21 12:04:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.colorhug-client.new/colorhug-client.changes 2015-04-27 13:05:40.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Apr 20 06:38:34 UTC 2015 - kkaempf(a)suse.com + +- Update to version 0.2.7 + * Fix a typo to allow exporting results again + * Never auto-dim less than 5% + +- Update to version 0.2.6 + * This release make the CCMX loader adhere to the GNOME 3 + guidelines. + +------------------------------------------------------------------- Old: ---- colorhug-client-0.2.5.tar.xz New: ---- colorhug-client-0.2.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colorhug-client.spec ++++++ --- /var/tmp/diff_new_pack.S7qPF1/_old 2015-04-27 13:05:41.000000000 +0200 +++ /var/tmp/diff_new_pack.S7qPF1/_new 2015-04-27 13:05:41.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package colorhug-client # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: colorhug-client -Version: 0.2.5 +Version: 0.2.7 Release: 0 Summary: Tools for the Hughski Colorimeter License: GPL-2.0+ @@ -65,6 +65,8 @@ %suse_update_desktop_file -u -r -G 'Display Analysis' com.hughski.ColorHug.DisplayAnalysis Graphics Color %suse_update_desktop_file -u -r -G 'Firmware Updater' com.hughski.ColorHug.FlashLoader Graphics Color %suse_update_desktop_file -u -r -G 'Documentation' colorhug-docs Graphics Color +%suse_update_desktop_file -u -r -G 'Backlight' com.hughski.ColorHug.Backlight Graphics Color + %find_lang %{name} %post @@ -88,6 +90,7 @@ %{_bindir}/colorhug* %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/*/apps/colorhug.png +%{_datadir}/icons/hicolor/*/apps/colorhug-backlight.png %{_datadir}/icons/hicolor/*/apps/colorhug-flash.png %{_datadir}/icons/hicolor/*/apps/colorhug-ccmx.png %{_datadir}/icons/hicolor/*/apps/colorhug-refresh.png ++++++ colorhug-client-0.2.5.tar.xz -> colorhug-client-0.2.7.tar.xz ++++++ ++++ 26526 lines of diff (skipped)

1 0

commit python-async for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-async for openSUSE:Factory checked in at 2015-04-27 13:05:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-async (Old) and /work/SRC/openSUSE:Factory/.python-async.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-async" Changes: -------- --- /work/SRC/openSUSE:Factory/python-async/python-async.changes 2012-03-20 11:31:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-async.new/python-async.changes 2015-04-27 13:05:39.000000000 +0200 @@ -1,0 +2,15 @@ +Sat Apr 25 16:40:20 UTC 2015 - benoit.monin(a)gmx.fr + +- update to 0.6.2: + * Added python 3.X compatibility. As it doesn't work + deterministically in this version, it shouldn't be used + in production ! +- remove zlib-devel from BuildRequires, unneeded +- add python-nose and python-setuptools to BuildRequires +- switch the package to noarch, since it is pure python now +- remove useless CFLAGS from build +- run the tests during the build +- add LICENSE to documentation +- remove README, deleted from archive + +------------------------------------------------------------------- Old: ---- async-0.6.1.tar.gz New: ---- async-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-async.spec ++++++ --- /var/tmp/diff_new_pack.68tlnz/_old 2015-04-27 13:05:39.000000000 +0200 +++ /var/tmp/diff_new_pack.68tlnz/_new 2015-04-27 13:05:39.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-async # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-async -Version: 0.6.1 +Version: 0.6.2 Release: 0 Url: https://github.com/gitpython-developers/async Summary: Async Framework @@ -26,10 +26,12 @@ Source: http://pypi.python.org/packages/source/a/async/async-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel -#BuildRequires: python-nose -BuildRequires: zlib-devel +BuildRequires: python-nose +BuildRequires: python-setuptools %if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%else +BuildArch: noarch %endif %description @@ -41,17 +43,17 @@ %setup -q -n async-%{version} %build -CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build +python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -#%%check -#nosetests +%check +python setup.py -q test %files %defattr(-,root,root,-) -%doc AUTHORS README -%{python_sitearch}/* +%doc AUTHORS LICENSE +%{python_sitelib}/* %changelog ++++++ async-0.6.1.tar.gz -> async-0.6.2.tar.gz ++++++ ++++ 7285 lines of diff (skipped)

1 0

commit python-blosc for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-blosc for openSUSE:Factory checked in at 2015-04-27 13:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-blosc (Old) and /work/SRC/openSUSE:Factory/.python-blosc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-blosc" Changes: -------- --- /work/SRC/openSUSE:Factory/python-blosc/python-blosc.changes 2014-08-08 10:13:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-blosc.new/python-blosc.changes 2015-04-27 13:05:37.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 26 14:22:04 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 1.2.5: + * Updated to c-blosc v1.5.4. + * Added wrapper for the expert function ``set_blocksize``. + (#72 @esc) + * Fix setup.py to allow compilation on posix architectures + without SSE2. (#70 @andreas-schwab) + * Don't release the GIL on compression/decompression (#77 @esc) + * Various miscellaneous fixes. +- drop setup.patch: fixed upstream + +------------------------------------------------------------------- Old: ---- blosc-1.2.4.tar.gz setup.patch New: ---- blosc-1.2.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-blosc.spec ++++++ --- /var/tmp/diff_new_pack.I8pufJ/_old 2015-04-27 13:05:38.000000000 +0200 +++ /var/tmp/diff_new_pack.I8pufJ/_new 2015-04-27 13:05:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-blosc # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,13 @@ %define modname blosc Name: python-blosc -Version: 1.2.4 +Version: 1.2.5 Release: 0 Summary: Blosc data compressor for Python License: MIT Group: Development/Languages/Python Url: http://www.blosc.org/ Source: http://pypi.python.org/packages/source/b/blosc/blosc-%{version}.tar.gz -Patch: setup.patch BuildRequires: blosc-devel BuildRequires: gcc-c++ BuildRequires: python-devel @@ -41,7 +40,6 @@ %prep %setup -q -n blosc-%{version} -%patch -p1 %build CFLAGS="%{optflags}" python setup.py build_ext --inplace --blosc=%{_prefix} ++++++ blosc-1.2.4.tar.gz -> blosc-1.2.5.tar.gz ++++++ ++++ 8953 lines of diff (skipped)

1 0

commit python-biplist for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-biplist for openSUSE:Factory checked in at 2015-04-27 13:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-biplist (Old) and /work/SRC/openSUSE:Factory/.python-biplist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-biplist" Changes: -------- --- /work/SRC/openSUSE:Factory/python-biplist/python-biplist.changes 2013-10-25 11:12:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-biplist.new/python-biplist.changes 2015-04-27 13:05:35.000000000 +0200 @@ -1,0 +2,16 @@ +Sun Apr 26 13:02:09 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 0.9: + * Fixes #5 ValueError: timestamp out of range for platform time_t + * Merged pull request #3 removing the `six` module while keeping + Python3 compatibility +- additional changes from version v0.8: + * Fixes #3 testFileRead fails using python 3.x along with several + other Python 3 compatibility issues. +- update project URL +- add fdupes as BuildRequires and call it after install +- set a minimum version to python 2.7 +- remove python-six from BuildRequires: now unneeded +- quiet the test run to avoid spamming the build log + +------------------------------------------------------------------- Old: ---- biplist-0.5.tar.gz New: ---- biplist-0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-biplist.spec ++++++ --- /var/tmp/diff_new_pack.JUj3Nj/_old 2015-04-27 13:05:37.000000000 +0200 +++ /var/tmp/diff_new_pack.JUj3Nj/_new 2015-04-27 13:05:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-biplist # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,19 @@ Name: python-biplist -Version: 0.5 +Version: 0.9 Release: 0 -Url: https://github.com/wooster/biplist +Url: https://bitbucket.org/wooster/biplist Summary: A library for reading/writing binary plists License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/b/biplist/biplist-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: python-coverage -BuildRequires: python-devel +BuildRequires: python-devel >= 2.7 BuildRequires: python-nose BuildRequires: python-setuptools -BuildRequires: python-six %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else @@ -51,9 +51,10 @@ %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%fdupes %buildroot/%_prefix %check -python setup.py test +python setup.py -q test %files %defattr(-,root,root,-) ++++++ biplist-0.5.tar.gz -> biplist-0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/PKG-INFO new/biplist-0.9/PKG-INFO --- old/biplist-0.5/PKG-INFO 2012-06-19 02:51:33.000000000 +0200 +++ new/biplist-0.9/PKG-INFO 2014-10-26 20:09:20.000000000 +0100 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: biplist -Version: 0.5 +Version: 0.9 Summary: biplist is a library for reading/writing binary plists. -Home-page: https://github.com/wooster/biplist +Home-page: https://bitbucket.org/wooster/biplist Author: Andrew Wooster Author-email: andrew(a)planetaryscale.com License: BSD -Download-URL: https://github.com/wooster/biplist/downloads/biplist-0.5.tar.gz +Download-URL: https://bitbucket.org/wooster/biplist/downloads/biplist-0.9.tar.gz Description: `biplist` is a binary plist parser/generator for Python. Binary Property List (plist) files provide a faster and smaller serialization @@ -22,4 +22,3 @@ Classifier: Programming Language :: Python Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup -Requires: six diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/biplist/__init__.py new/biplist-0.9/biplist/__init__.py --- old/biplist-0.5/biplist/__init__.py 2012-06-19 02:37:05.000000000 +0200 +++ new/biplist-0.9/biplist/__init__.py 2014-10-26 20:03:11.000000000 +0100 @@ -46,22 +46,38 @@ import sys from collections import namedtuple -import calendar import datetime +import io import math import plistlib from struct import pack, unpack +from struct import error as struct_error import sys import time -import six +try: + unicode + unicodeEmpty = r'' +except NameError: + unicode = str + unicodeEmpty = '' +try: + long +except NameError: + long = int +try: + {}.iteritems + iteritems = lambda x: x.iteritems() +except AttributeError: + iteritems = lambda x: x.items() __all__ = [ 'Uid', 'Data', 'readPlist', 'writePlist', 'readPlistFromString', 'writePlistToString', 'InvalidPlistException', 'NotBinaryPlistException' ] -apple_reference_date_offset = 978307200 +# Apple uses Jan 1, 2001 as a base for all plist date/times. +apple_reference_date = datetime.datetime.utcfromtimestamp(978307200) class Uid(int): """Wrapper around integers for representing UID values. This @@ -69,7 +85,7 @@ def __repr__(self): return "Uid(%d)" % self -class Data(six.binary_type): +class Data(bytes): """Wrapper around str types for representing Data values.""" pass @@ -85,7 +101,7 @@ """Raises NotBinaryPlistException, InvalidPlistException""" didOpen = False result = None - if isinstance(pathOrFile, (six.binary_type, six.text_type)): + if isinstance(pathOrFile, (bytes, unicode)): pathOrFile = open(pathOrFile, 'rb') didOpen = True try: @@ -94,19 +110,33 @@ except NotBinaryPlistException as e: try: pathOrFile.seek(0) - result = plistlib.readPlist(pathOrFile) + result = None + if hasattr(plistlib, 'loads'): + contents = None + if isinstance(pathOrFile, (bytes, unicode)): + with open(pathOrFile, 'rb') as f: + contents = f.read() + else: + contents = pathOrFile.read() + result = plistlib.loads(contents) + else: + result = plistlib.readPlist(pathOrFile) result = wrapDataObject(result, for_binary=True) except Exception as e: raise InvalidPlistException(e) - if didOpen: - pathOrFile.close() + finally: + if didOpen: + pathOrFile.close() return result def wrapDataObject(o, for_binary=False): if isinstance(o, Data) and not for_binary: - o = plistlib.Data(o) - elif isinstance(o, plistlib.Data) and for_binary: - o = Data(o.data) + v = sys.version_info + if not (v[0] >= 3 and v[1] >= 4): + o = plistlib.Data(o) + elif isinstance(o, (bytes, plistlib.Data)) and for_binary: + if hasattr(o, 'data'): + o = Data(o.data) elif isinstance(o, tuple): o = wrapDataObject(list(o), for_binary) o = tuple(o) @@ -121,10 +151,17 @@ def writePlist(rootObject, pathOrFile, binary=True): if not binary: rootObject = wrapDataObject(rootObject, binary) - return plistlib.writePlist(rootObject, pathOrFile) + if hasattr(plistlib, "dump"): + if isinstance(pathOrFile, (bytes, unicode)): + with open(pathOrFile, 'wb') as f: + return plistlib.dump(rootObject, f) + else: + return plistlib.dump(rootObject, pathOrFile) + else: + return plistlib.writePlist(rootObject, pathOrFile) else: didOpen = False - if isinstance(pathOrFile, (six.binary_type, six.text_type)): + if isinstance(pathOrFile, (bytes, unicode)): pathOrFile = open(pathOrFile, 'wb') didOpen = True writer = PlistWriter(pathOrFile) @@ -134,25 +171,27 @@ return result def readPlistFromString(data): - return readPlist(six.BytesIO(data)) + return readPlist(io.BytesIO(data)) def writePlistToString(rootObject, binary=True): if not binary: rootObject = wrapDataObject(rootObject, binary) - if six.PY3: + if hasattr(plistlib, "dumps"): + return plistlib.dumps(rootObject) + elif hasattr(plistlib, "writePlistToBytes"): return plistlib.writePlistToBytes(rootObject) else: return plistlib.writePlistToString(rootObject) else: - io = six.BytesIO() - writer = PlistWriter(io) + ioObject = io.BytesIO() + writer = PlistWriter(ioObject) writer.writeRoot(rootObject) - return io.getvalue() + return ioObject.getvalue() def is_stream_binary_plist(stream): stream.seek(0) header = stream.read(7) - if header == six.b('bplist0'): + if header == b'bplist0': return True else: return False @@ -281,12 +320,12 @@ raise InvalidPlistException("Invalid object found: {format: %s, extra: %s}" % (bin(format), bin(extra))) return result - def readInteger(self, bytes): + def readInteger(self, byteSize): result = 0 original_offset = self.currentOffset - data = self.contents[self.currentOffset:self.currentOffset+bytes] - result = self.getSizedInteger(data, bytes) - self.currentOffset = original_offset + bytes + data = self.contents[self.currentOffset:self.currentOffset + byteSize] + result = self.getSizedInteger(data, byteSize, as_number=True) + self.currentOffset = original_offset + byteSize return result def readReal(self, length): @@ -350,9 +389,9 @@ return data.decode('utf_16_be') def readDate(self): - global apple_reference_date_offset result = unpack(">d", self.contents[self.currentOffset:self.currentOffset+8])[0] - result = datetime.datetime.utcfromtimestamp(result + apple_reference_date_offset) + # Use timedelta to workaround time_t size limitation on 32-bit python. + result = datetime.timedelta(seconds=result) + apple_reference_date self.currentOffset += 8 return result @@ -364,19 +403,32 @@ def readUid(self, length): return Uid(self.readInteger(length+1)) - def getSizedInteger(self, data, bytes): + def getSizedInteger(self, data, byteSize, as_number=False): + """Numbers of 8 bytes are signed integers when they refer to numbers, but unsigned otherwise.""" result = 0 # 1, 2, and 4 byte integers are unsigned - if bytes == 1: + if byteSize == 1: result = unpack('>B', data)[0] - elif bytes == 2: + elif byteSize == 2: result = unpack('>H', data)[0] - elif bytes == 4: + elif byteSize == 4: result = unpack('>L', data)[0] - elif bytes == 8: - result = unpack('>q', data)[0] + elif byteSize == 8: + if as_number: + result = unpack('>q', data)[0] + else: + result = unpack('>Q', data)[0] + elif byteSize <= 16: + # Handle odd-sized or integers larger than 8 bytes + # Don't naively go over 16 bytes, in order to prevent infinite loops. + result = 0 + if hasattr(int, 'from_bytes'): + result = int.from_bytes(data, 'big') + else: + for byte in data: + result = (result << 8) | unpack('>B', byte)[0] else: - raise InvalidPlistException("Encountered integer longer than 8 bytes.") + raise InvalidPlistException("Encountered integer longer than 16 bytes.") return result class HashableWrapper(object): @@ -391,8 +443,21 @@ def __repr__(self): return "<BoolWrapper: %s>" % self.value +class FloatWrapper(object): + _instances = {} + def __new__(klass, value): + # Ensure FloatWrapper(x) for a given float x is always the same object + wrapper = klass._instances.get(value) + if wrapper is None: + wrapper = object.__new__(klass) + wrapper.value = value + klass._instances[value] = wrapper + return wrapper + def __repr__(self): + return "<FloatWrapper: %s>" % self.value + class PlistWriter(object): - header = six.b('bplist00bybiplist1.0') + header = b'bplist00bybiplist1.0' file = None byteCounts = None trailer = None @@ -467,6 +532,8 @@ return self.wrappedTrue else: return self.wrappedFalse + elif isinstance(root, float): + return FloatWrapper(root) elif isinstance(root, set): n = set() for value in root: @@ -474,7 +541,7 @@ return HashableWrapper(n) elif isinstance(root, dict): n = {} - for key, value in six.iteritems(root): + for key, value in iteritems(root): n[self.wrapRoot(key)] = self.wrapRoot(value) return HashableWrapper(n) elif isinstance(root, list): @@ -497,7 +564,7 @@ raise InvalidPlistException('Dictionary keys cannot be null in plists.') elif isinstance(key, Data): raise InvalidPlistException('Data cannot be dictionary keys in plists.') - elif not isinstance(key, (six.binary_type, six.text_type)): + elif not isinstance(key, (bytes, unicode)): raise InvalidPlistException('Keys must be strings.') def proc_size(size): @@ -519,10 +586,10 @@ elif isinstance(obj, Uid): size = self.intSize(obj) self.incrementByteCount('uidBytes', incr=1+size) - elif isinstance(obj, six.integer_types): + elif isinstance(obj, (int, long)): size = self.intSize(obj) self.incrementByteCount('intBytes', incr=1+size) - elif isinstance(obj, (float)): + elif isinstance(obj, FloatWrapper): size = self.realSize(obj) self.incrementByteCount('realBytes', incr=1+size) elif isinstance(obj, datetime.datetime): @@ -530,7 +597,7 @@ elif isinstance(obj, Data): size = proc_size(len(obj)) self.incrementByteCount('dataBytes', incr=1+size) - elif isinstance(obj, (six.text_type, six.binary_type)): + elif isinstance(obj, (unicode, bytes)): size = proc_size(len(obj)) self.incrementByteCount('stringBytes', incr=1+size) elif isinstance(obj, HashableWrapper): @@ -549,7 +616,7 @@ elif isinstance(obj, dict): size = proc_size(len(obj)) self.incrementByteCount('dictBytes', incr=1+size) - for key, value in six.iteritems(obj): + for key, value in iteritems(obj): check_key(key) self.computeOffsets(key, asReference=True) self.computeOffsets(value, asReference=True) @@ -566,10 +633,10 @@ position = self.positionOfObjectReference(obj) if position is None: self.writtenReferences[obj] = len(self.writtenReferences) - output += self.binaryInt(len(self.writtenReferences) - 1, bytes=self.trailer.objectRefSize) + output += self.binaryInt(len(self.writtenReferences) - 1, byteSize=self.trailer.objectRefSize) return (True, output) else: - output += self.binaryInt(position, bytes=self.trailer.objectRefSize) + output += self.binaryInt(position, byteSize=self.trailer.objectRefSize) return (False, output) def writeObject(self, obj, output, setReferencePosition=False): @@ -578,7 +645,7 @@ object was written. """ def proc_variable_length(format, length): - result = six.b('') + result = b'' if length > 0b1110: result += pack('!B', (format << 4) | 0b1111) result = self.writeObject(length, result) @@ -586,9 +653,9 @@ result += pack('!B', (format << 4) | length) return result - if isinstance(obj, six.text_type) and obj == six.u(''): + if isinstance(obj, (str, unicode)) and obj == unicodeEmpty: # The Apple Plist decoder can't decode a zero length Unicode string. - obj = six.b('') + obj = b'' if setReferencePosition: self.referencePositions[obj] = len(output) @@ -604,31 +671,29 @@ size = self.intSize(obj) output += pack('!B', (0b1000 << 4) | size - 1) output += self.binaryInt(obj) - elif isinstance(obj, six.integer_types): - bytes = self.intSize(obj) - root = math.log(bytes, 2) + elif isinstance(obj, (int, long)): + byteSize = self.intSize(obj) + root = math.log(byteSize, 2) output += pack('!B', (0b0001 << 4) | int(root)) - output += self.binaryInt(obj) - elif isinstance(obj, float): + output += self.binaryInt(obj, as_number=True) + elif isinstance(obj, FloatWrapper): # just use doubles output += pack('!B', (0b0010 << 4) | 3) output += self.binaryReal(obj) elif isinstance(obj, datetime.datetime): - timestamp = calendar.timegm(obj.utctimetuple()) - timestamp -= apple_reference_date_offset + timestamp = (obj - apple_reference_date).total_seconds() output += pack('!B', 0b00110011) output += pack('!d', float(timestamp)) elif isinstance(obj, Data): output += proc_variable_length(0b0100, len(obj)) output += obj - elif isinstance(obj, six.text_type): - bytes = obj.encode('utf_16_be') - output += proc_variable_length(0b0110, len(bytes)//2) - output += bytes - elif isinstance(obj, six.binary_type): - bytes = obj - output += proc_variable_length(0b0101, len(bytes)) - output += bytes + elif isinstance(obj, unicode): + byteData = obj.encode('utf_16_be') + output += proc_variable_length(0b0110, len(byteData)//2) + output += byteData + elif isinstance(obj, bytes): + output += proc_variable_length(0b0101, len(obj)) + output += obj elif isinstance(obj, HashableWrapper): obj = obj.value if isinstance(obj, (set, list, tuple)): @@ -649,7 +714,7 @@ keys = [] values = [] objectsToWrite = [] - for key, value in six.iteritems(obj): + for key, value in iteritems(obj): keys.append(key) values.append(value) for key in keys: @@ -675,8 +740,8 @@ # goes into writtenReferences. This isn't an issue in Py2 # because u'' and b'' have the same hash; but it is in # Py3, where they don't. - if six.PY3 and obj == six.u(''): - obj = six.b('') + if bytes != str and obj == unicodeEmpty: + obj = b'' position = self.referencePositions.get(obj) if position is None: raise InvalidPlistException("Error while writing offsets table. Object not found. %s" % obj) @@ -686,23 +751,31 @@ def binaryReal(self, obj): # just use doubles - result = pack('>d', obj) + result = pack('>d', obj.value) return result - def binaryInt(self, obj, bytes=None): - result = six.b('') - if bytes is None: - bytes = self.intSize(obj) - if bytes == 1: + def binaryInt(self, obj, byteSize=None, as_number=False): + result = b'' + if byteSize is None: + byteSize = self.intSize(obj) + if byteSize == 1: result += pack('>B', obj) - elif bytes == 2: + elif byteSize == 2: result += pack('>H', obj) - elif bytes == 4: + elif byteSize == 4: result += pack('>L', obj) - elif bytes == 8: - result += pack('>q', obj) + elif byteSize == 8: + if as_number: + result += pack('>q', obj) + else: + result += pack('>Q', obj) + elif byteSize <= 16: + try: + result = pack('>Q', 0) + pack('>Q', obj) + except struct_error as e: + raise InvalidPlistException("Unable to pack integer %d: %s" % (obj, e)) else: - raise InvalidPlistException("Core Foundation can't handle integers with size greater than 8 bytes.") + raise InvalidPlistException("Core Foundation can't handle integers with size greater than 16 bytes.") return result def intSize(self, obj): @@ -719,8 +792,10 @@ return 4 # SIGNED # 0x7FFFFFFFFFFFFFFF is the max. - elif obj <= 0x7FFFFFFFFFFFFFFF: # 8 bytes + elif obj <= 0x7FFFFFFFFFFFFFFF: # 8 bytes signed return 8 + elif obj <= 0xffffffffffffffff: # 8 bytes unsigned + return 16 else: raise InvalidPlistException("Core Foundation can't handle integers with size greater than 8 bytes.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/biplist.egg-info/PKG-INFO new/biplist-0.9/biplist.egg-info/PKG-INFO --- old/biplist-0.5/biplist.egg-info/PKG-INFO 2012-06-19 02:51:33.000000000 +0200 +++ new/biplist-0.9/biplist.egg-info/PKG-INFO 2014-10-26 20:09:20.000000000 +0100 @@ -1,12 +1,12 @@ Metadata-Version: 1.1 Name: biplist -Version: 0.5 +Version: 0.9 Summary: biplist is a library for reading/writing binary plists. -Home-page: https://github.com/wooster/biplist +Home-page: https://bitbucket.org/wooster/biplist Author: Andrew Wooster Author-email: andrew(a)planetaryscale.com License: BSD -Download-URL: https://github.com/wooster/biplist/downloads/biplist-0.5.tar.gz +Download-URL: https://bitbucket.org/wooster/biplist/downloads/biplist-0.9.tar.gz Description: `biplist` is a binary plist parser/generator for Python. Binary Property List (plist) files provide a faster and smaller serialization @@ -22,4 +22,3 @@ Classifier: Programming Language :: Python Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup -Requires: six diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/biplist.egg-info/SOURCES.txt new/biplist-0.9/biplist.egg-info/SOURCES.txt --- old/biplist-0.5/biplist.egg-info/SOURCES.txt 2012-06-19 02:51:33.000000000 +0200 +++ new/biplist-0.9/biplist.egg-info/SOURCES.txt 2014-10-26 20:09:20.000000000 +0100 @@ -8,17 +8,18 @@ biplist.egg-info/SOURCES.txt biplist.egg-info/dependency_links.txt biplist.egg-info/not-zip-safe -biplist.egg-info/requires.txt biplist.egg-info/top_level.txt tests/test_invalid.py tests/test_utils.py tests/test_valid.py tests/test_write.py +tests/data/BFPersistentEventInfo.plist tests/data/array_only_binary.plist tests/data/bogus_file.plist tests/data/bool_only_binary.plist tests/data/dict_only_binary.plist tests/data/empty_file.plist +tests/data/large_int_limits.plist tests/data/nskeyedarchiver_example.plist tests/data/simple_binary.plist tests/data/small_real.plist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/biplist.egg-info/requires.txt new/biplist-0.9/biplist.egg-info/requires.txt --- old/biplist-0.5/biplist.egg-info/requires.txt 2012-06-19 02:51:33.000000000 +0200 +++ new/biplist-0.9/biplist.egg-info/requires.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -six \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/setup.py new/biplist-0.9/setup.py --- old/biplist-0.5/setup.py 2012-06-19 02:50:08.000000000 +0200 +++ new/biplist-0.9/setup.py 2014-10-26 20:04:50.000000000 +0100 @@ -19,14 +19,14 @@ author = 'Andrew Wooster' email = 'andrew(a)planetaryscale.com' -version = '0.5' +version = '0.9' desc = 'biplist is a library for reading/writing binary plists.' setup( name = 'biplist', version = version, - url = 'https://github.com/wooster/biplist', - download_url = 'https://github.com/wooster/biplist/downloads/biplist-0.5.tar.gz', + url = 'https://bitbucket.org/wooster/biplist', + download_url = 'https://bitbucket.org/wooster/biplist/downloads/biplist-0.9.tar.gz', license = 'BSD', description = desc, long_description = @@ -50,9 +50,9 @@ 'Programming Language :: Python', "Topic :: Software Development :: Libraries :: Python Modules", "Topic :: Text Processing :: Markup", - ], - setup_requires = ['nose', 'coverage'], + ], test_suite = 'nose.collector', - install_requires = ['six'], - requires = ['six'], + install_requires = [], + requires = [], + tests_require = ['nose', 'coverage'], ) Files old/biplist-0.5/tests/data/BFPersistentEventInfo.plist and new/biplist-0.9/tests/data/BFPersistentEventInfo.plist differ Files old/biplist-0.5/tests/data/large_int_limits.plist and new/biplist-0.9/tests/data/large_int_limits.plist differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/tests/test_invalid.py new/biplist-0.9/tests/test_invalid.py --- old/biplist-0.5/tests/test_invalid.py 2012-06-19 02:37:05.000000000 +0200 +++ new/biplist-0.9/tests/test_invalid.py 2014-10-26 20:03:11.000000000 +0100 @@ -17,14 +17,14 @@ def testTooShort(self): try: - readPlistFromString(six.b("bplist0")) + readPlistFromString(b"bplist0") self.fail("Should not successfully read plist which is too short.") except InvalidPlistException as e: pass def testInvalid(self): try: - readPlistFromString(six.b("bplist0-------------------------------------")) + readPlistFromString(b"bplist0-------------------------------------") self.fail("Should not successfully read invalid plist.") except InvalidPlistException as e: pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/tests/test_utils.py new/biplist-0.9/tests/test_utils.py --- old/biplist-0.5/tests/test_utils.py 2012-06-19 02:37:05.000000000 +0200 +++ new/biplist-0.9/tests/test_utils.py 2014-10-26 20:03:11.000000000 +0100 @@ -1,7 +1,6 @@ import os import subprocess import sys -import six def data_path(path): return os.path.join(os.path.dirname(globals()["__file__"]), 'data', path) @@ -13,7 +12,8 @@ p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE) stdin, stdout = (p.stdin, p.stdout) output = stdout.read() - output = output.strip(six.b("\n")) + output = output.strip(b'\n') status = stdin.close() + stdout.close() p.wait() return p.returncode, output diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/tests/test_valid.py new/biplist-0.9/tests/test_valid.py --- old/biplist-0.5/tests/test_valid.py 2012-06-19 02:37:05.000000000 +0200 +++ new/biplist-0.9/tests/test_valid.py 2014-10-26 20:03:33.000000000 +0100 @@ -1,9 +1,17 @@ +# -*- coding: utf-8 -*- + from biplist import * import datetime import os from test_utils import * import unittest -import six + +try: + unicode + toUnicode = lambda x: x.decode('unicode-escape') +except NameError: + unicode = str + toUnicode = lambda x: x class TestValidPlistFile(unittest.TestCase): def setUp(self): @@ -11,14 +19,19 @@ def validateSimpleBinaryRoot(self, root): self.assertTrue(type(root) == dict, "Root should be dictionary.") - self.assertTrue(type(root[six.b('dateItem')]) == datetime.datetime, "date should be datetime") - self.assertEquals(root[six.b('dateItem')], datetime.datetime(2010, 8, 19, 22, 27, 30, 385449), "dates not equal" ) - self.assertEquals(root[six.b('numberItem')], -10000000000000000, "number not of expected value") - self.assertEquals(root[six.b('unicodeItem')], six.u('abc\u212cdef\u2133')) - self.assertEquals(root[six.b('stringItem')], six.b('Hi there')) - self.assertEquals(root[six.b('realItem')], 0.47) - self.assertEquals(root[six.b('boolItem')], True) - self.assertEquals(root[six.b('arrayItem')], [six.b('item0')]) + self.assertTrue(type(root[b'dateItem']) == datetime.datetime, "date should be datetime") + us = root[b'dateItem'].microsecond + if us == 385448: + # Python 3 doesn't round microseconds to the nearest value. + self.assertEqual(root[b'dateItem'], datetime.datetime(2010, 8, 19, 22, 27, 30, 385448), "dates not equal" ) + else: + self.assertEqual(root[b'dateItem'], datetime.datetime(2010, 8, 19, 22, 27, 30, 385449), "dates not equal" ) + self.assertEqual(root[b'numberItem'], -10000000000000000, "number not of expected value") + self.assertEqual(root[b'unicodeItem'], toUnicode('abc\u212cdef\u2133')) + self.assertEqual(root[b'stringItem'], b'Hi there') + self.assertEqual(root[b'realItem'], 0.47) + self.assertEqual(root[b'boolItem'], True) + self.assertEqual(root[b'arrayItem'], [b'item0']) def testFileRead(self): try: @@ -31,7 +44,7 @@ def testUnicodeRoot(self): result = readPlist(data_path('unicode_root.plist')) - self.assertEquals(result, six.u("Mirror's Edge\u2122 for iPad")) + self.assertEqual(result, toUnicode("Mirror's Edge\u2122 for iPad")) def testEmptyUnicodeRoot(self): # Porting note: this test was tricky; it was only passing in @@ -42,12 +55,22 @@ # 0b0101 (ASCII string), so the value being asserted against # appears to be what is wrong. result = readPlist(data_path('unicode_empty.plist')) - self.assertEquals(result, six.b("")) + self.assertEqual(result, b'') def testSmallReal(self): result = readPlist(data_path('small_real.plist')) - self.assertEquals(result, {six.b('4 byte real'):0.5}) + self.assertEqual(result, {b'4 byte real':0.5}) + def testLargeIntegers(self): + result = readPlist(data_path('large_int_limits.plist')) + self.assertEqual(result[b'Max 8 Byte Unsigned Integer'], 18446744073709551615) + self.assertEqual(result[b'Min 8 Byte Signed Integer'], -9223372036854775808) + self.assertEqual(result[b'Max 8 Byte Signed Integer'], 9223372036854775807) + + def testLargeDates(self): + result = readPlist(data_path("BFPersistentEventInfo.plist")) + self.assertEqual(result['lastShownRatePromptDate'], datetime.datetime(1, 12, 30, 0, 0, 0)) + def testKeyedArchiverPlist(self): """ Archive is created with class like this: @@ -63,15 +86,15 @@ ... """ result = readPlist(data_path('nskeyedarchiver_example.plist')) - self.assertEquals(result, {six.b('$version'): 100000, - six.b('$objects'): - [six.b('$null'), - {six.b('$class'): Uid(3), six.b('somekey'): Uid(2)}, - six.b('object value as string'), - {six.b('$classes'): [six.b('Archived'), six.b('NSObject')], six.b('$classname'): six.b('Archived')} + self.assertEqual(result, {b'$version': 100000, + b'$objects': + [b'$null', + {b'$class': Uid(3), b'somekey': Uid(2)}, + b'object value as string', + {b'$classes': [b'Archived', b'NSObject'], b'$classname': b'Archived'} ], - six.b('$top'): {six.b('root'): Uid(1)}, six.b('$archiver'): six.b('NSKeyedArchiver')}) - self.assertEquals("Uid(1)", repr(Uid(1))) + b'$top': {b'root': Uid(1)}, b'$archiver': b'NSKeyedArchiver'}) + self.assertEqual("Uid(1)", repr(Uid(1))) if __name__ == '__main__': unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/biplist-0.5/tests/test_write.py new/biplist-0.9/tests/test_write.py --- old/biplist-0.5/tests/test_write.py 2012-06-19 02:37:05.000000000 +0200 +++ new/biplist-0.9/tests/test_write.py 2014-10-26 20:03:11.000000000 +0100 @@ -1,13 +1,18 @@ from biplist import * from biplist import PlistWriter import datetime +import io import os #from cStringIO import StringIO import subprocess import tempfile from test_utils import * import unittest -import six + +try: + unicode +except NameError: + unicode = str class TestWritePlist(unittest.TestCase): def setUp(self): @@ -19,7 +24,7 @@ plist = writePlistToString(root, binary=(not xml)) self.assertTrue(len(plist) > 0) readResult = readPlistFromString(plist) - self.assertEquals(readResult, (expected if expected is not None else root)) + self.assertEqual(readResult, (expected if expected is not None else root)) self.lintPlist(plist) def lintPlist(self, plistString): @@ -37,13 +42,13 @@ def testXMLPlistWithData(self): for binmode in (True, False): - binplist = writePlistToString({'data': Data(six.b('\x01\xac\xf0\xff'))}, binary=binmode) + binplist = writePlistToString({'data': Data(b'\x01\xac\xf0\xff')}, binary=binmode) plist = readPlistFromString(binplist) - self.assertTrue(isinstance(plist['data'], Data), \ + self.assertTrue(isinstance(plist['data'], (Data, bytes)), \ "unable to encode then decode Data into %s plist" % ("binary" if binmode else "XML")) def testConvertToXMLPlistWithData(self): - binplist = writePlistToString({'data': Data(six.b('\x01\xac\xf0\xff'))}) + binplist = writePlistToString({'data': Data(b'\x01\xac\xf0\xff')}) plist = readPlistFromString(binplist) xmlplist = writePlistToString(plist, binary=False) self.assertTrue(len(xmlplist) > 0, "unable to convert plist with Data from binary to XML") @@ -62,22 +67,28 @@ def testDictRoot(self): self.roundTrip({'a':1, 'B':'d'}) - def boolsAndIntegersHelper(self, cases): + def mixedNumericTypesHelper(self, cases): result = readPlistFromString(writePlistToString(cases)) for i in range(0, len(cases)): self.assertTrue(cases[i] == result[i]) - self.assertEquals(type(cases[i]), type(result[i]), "Type mismatch on %d: %s != %s" % (i, repr(cases[i]), repr(result[i]))) + self.assertEqual(type(cases[i]), type(result[i]), "Type mismatch on %d: %s != %s" % (i, repr(cases[i]), repr(result[i]))) def reprChecker(self, case): result = readPlistFromString(writePlistToString(case)) - self.assertEquals(repr(case), repr(result)) + self.assertEqual(repr(case), repr(result)) def testBoolsAndIntegersMixed(self): - self.boolsAndIntegersHelper([0, 1, True, False, None]) - self.boolsAndIntegersHelper([False, True, 0, 1, None]) - self.reprChecker({'1':[True, False, 1, 0], '0':[1, 2, 0, {'2':[1, 0, False]}]}) + self.mixedNumericTypesHelper([0, 1, True, False, None]) + self.mixedNumericTypesHelper([False, True, 0, 1, None]) + self.reprChecker({unicode('1'):[True, False, 1, 0], unicode('0'):[1, 2, 0, {unicode('2'):[1, 0, False]}]}) self.reprChecker([1, 1, 1, 1, 1, True, True, True, True]) + def testFloatsAndIntegersMixed(self): + self.mixedNumericTypesHelper([0, 1, 1.0, 0.0, None]) + self.mixedNumericTypesHelper([0.0, 1.0, 0, 1, None]) + self.reprChecker({unicode('1'):[1.0, 0.0, 1, 0], unicode('0'):[1, 2, 0, {unicode('2'):[1, 0, 0.0]}]}) + self.reprChecker([1, 1, 1, 1, 1, 1.0, 1.0, 1.0, 1.0]) + def testSetRoot(self): self.roundTrip(set((1, 2, 3))) @@ -93,8 +104,8 @@ result = writePlistToString({'aTuple':(1, 2.0, 'a'), 'dupTuple':('a', 'a', 'a', 'b', 'b')}) self.assertTrue(len(result) > 0) readResult = readPlistFromString(result) - self.assertEquals(readResult['aTuple'], [1, 2.0, 'a']) - self.assertEquals(readResult['dupTuple'], ['a', 'a', 'a', 'b', 'b']) + self.assertEqual(readResult['aTuple'], [1, 2.0, 'a']) + self.assertEqual(readResult['dupTuple'], ['a', 'a', 'a', 'b', 'b']) def testComplicated(self): root = {'preference':[1, 2, {'hi there':['a', 1, 2, {'yarrrr':123}]}]} @@ -102,9 +113,9 @@ self.roundTrip(root) def testString(self): - self.roundTrip(six.b('0')) - self.roundTrip(six.b('')) - self.roundTrip({six.b('a'):six.b('')}) + self.roundTrip(b'0') + self.roundTrip(b'') + self.roundTrip({b'a':b''}) def testLargeDict(self): d = {} @@ -124,7 +135,8 @@ path = '/var/tmp/test.plist' writePlist([1, 2, 3], path, binary=is_binary) self.assertTrue(os.path.exists(path)) - self.lintPlist(open(path, 'rb').read()) + with open(path, 'rb') as f: + self.lintPlist(f.read()) def testNone(self): self.roundTrip(None) @@ -138,7 +150,7 @@ except InvalidPlistException as e: pass try: - self.roundTrip({Data(six.b("hello world")):1}) + self.roundTrip({Data(b"hello world"):1}) self.fail("Data is not a valid key in Cocoa.") except InvalidPlistException as e: pass @@ -153,41 +165,45 @@ for edge in edges: cases = [edge, edge-1, edge+1, edge-2, edge+2, edge*2, edge/2] self.roundTrip(cases) - edges = [-pow(2, 7), pow(2, 7) - 1, -pow(2, 15), pow(2, 15) - 1, -pow(2, 31), pow(2, 31) - 1] + edges = [-pow(2, 7), pow(2, 7) - 1, + -pow(2, 15), pow(2, 15) - 1, + -pow(2, 31), pow(2, 31) - 1, + -pow(2, 63), pow(2, 64) - 1] self.roundTrip(edges) - io = six.BytesIO() - writer = PlistWriter(io) + ioBytes = io.BytesIO() + writer = PlistWriter(ioBytes) bytes = [(1, [pow(2, 7) - 1]), (2, [pow(2, 15) - 1]), (4, [pow(2, 31) - 1]), - (8, [-pow(2, 7), -pow(2, 15), -pow(2, 31), -pow(2, 63), pow(2, 63) - 1]) + (8, [-pow(2, 7), -pow(2, 15), -pow(2, 31), -pow(2, 63), pow(2, 63) - 1]), + (16, [pow(2, 64) - 1]) ] for bytelen, tests in bytes: for test in tests: got = writer.intSize(test) - self.assertEquals(bytelen, got, "Byte size is wrong. Expected %d, got %d" % (bytelen, got)) + self.assertEqual(bytelen, got, "Byte size is wrong. Expected %d, got %d" % (bytelen, got)) bytes_lists = [list(x) for x in bytes] self.roundTrip(bytes_lists) try: - self.roundTrip([0x8000000000000000, pow(2, 63)]) - self.fail("2^63 should be too large for Core Foundation to handle.") + self.roundTrip([0x10000000000000000, pow(2, 64)]) + self.fail("2^64 should be too large for Core Foundation to handle.") except InvalidPlistException as e: pass def testWriteData(self): - self.roundTrip(Data(six.b("woohoo"))) + self.roundTrip(Data(b"woohoo")) def testUnicode(self): - unicodeRoot = six.u("Mirror's Edge\u2122 for iPad") + unicodeRoot = unicode("Mirror's Edge\u2122 for iPad") writePlist(unicodeRoot, "/tmp/odd.plist") self.roundTrip(unicodeRoot) - unicodeStrings = [six.u("Mirror's Edge\u2122 for iPad"), six.u('Weightbot \u2014 Track your Weight in Style')] + unicodeStrings = [unicode("Mirror's Edge\u2122 for iPad"), unicode('Weightbot \u2014 Track your Weight in Style')] self.roundTrip(unicodeStrings) - self.roundTrip({six.u(""):six.u("")}, expected={six.b(''):six.b('')}) - self.roundTrip(six.u(""), expected=six.b('')) + self.roundTrip({unicode(""):unicode("")}, expected={b'':b''}) + self.roundTrip(unicode(""), expected=b'') def testUidWrite(self): self.roundTrip({'$version': 100000,

1 0

commit python-billiard for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-billiard for openSUSE:Factory checked in at 2015-04-27 13:05:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-billiard (Old) and /work/SRC/openSUSE:Factory/.python-billiard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-billiard" Changes: -------- --- /work/SRC/openSUSE:Factory/python-billiard/python-billiard.changes 2014-08-16 15:38:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-billiard.new/python-billiard.changes 2015-04-27 13:05:32.000000000 +0200 @@ -1,0 +2,21 @@ +Sat Apr 25 19:37:13 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 3.3.0.20: + * Pool: Timeouts will attempt to send SIGKILL, but this signal + does not exist on Windows. Replaced with SIGTERM. +- additional changes from version 3.3.0.19: + * Pool: Exceptions in user timeout callbacks are now logged + instead of crashing the pool. Contributed by Pierre Fersing. + * Pool: Exit codes in errors were improperly being represented + as signals. + * Pool: ``.map``. and ``.imap`` now working again. + * Now builds on FreeBSD 10. Contributed by Michael Fladischer. +- update project URL +- add fdupes as BuildRequires and call it after install +- remove BuildRequires python-nose-cover3, not needed by the tests + anymore +- set a minimum version for python-nose +- remove unwanted shebang of funtests/setup.py +- add -fno-strict-aliasing to CFLAGS to avoid potential breakage + +------------------------------------------------------------------- Old: ---- billiard-3.3.0.18.tar.gz New: ---- billiard-3.3.0.20.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-billiard.spec ++++++ --- /var/tmp/diff_new_pack.RxgJRn/_old 2015-04-27 13:05:34.000000000 +0200 +++ /var/tmp/diff_new_pack.RxgJRn/_new 2015-04-27 13:05:34.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-billiard # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,22 @@ Name: python-billiard -Version: 3.3.0.18 +Version: 3.3.0.20 Release: 0 -Url: http://github.com/ask/billiard +Url: https://github.com/celery/billiard Summary: Python multiprocessing fork License: BSD-3-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/b/billiard/billiard-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-setuptools # Documentation requirements: BuildRequires: python-sphinx # Test requirements: BuildRequires: python-mock -BuildRequires: python-nose -BuildRequires: python-nose-cover3 +BuildRequires: python-nose >= 1.3.4 BuildRequires: python-unittest2 >= 0.4.0 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -46,9 +46,11 @@ %prep %setup -q -n billiard-%{version} +# remove unwanted shebang +sed -i '/^#!/ d' funtests/setup.py %build -CFLAGS="%{optflags}" python setup.py build +CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build cd Doc && sphinx-build -b html . html %install @@ -56,6 +58,7 @@ # Remove hidden files from generated documentation directory rm -r Doc/html/.doctrees rm -r Doc/html/.buildinfo +%fdupes %buildroot/%_prefix %check python setup.py test ++++++ billiard-3.3.0.18.tar.gz -> billiard-3.3.0.20.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/CHANGES.txt new/billiard-3.3.0.20/CHANGES.txt --- old/billiard-3.3.0.18/CHANGES.txt 2014-06-20 15:33:22.000000000 +0200 +++ new/billiard-3.3.0.20/CHANGES.txt 2015-04-17 14:57:02.000000000 +0200 @@ -1,3 +1,25 @@ +3.3.0.20 - 2015-04-17 +--------------------- + +- Pool: Timeouts will attempt to send SIGKILL, but this signal + does not exist on Windows. Replaced with SIGTERM. + +3.3.0.19 - 2014-10-13 +--------------------- + +- Pool: Exceptions in user timeout callbacks are now logged instead + of crashing the pool. + + Contributed by Pierre Fersing. + +- Pool: Exit codes in errors were improperly being represented as signals. + +- Pool: ``.map``. and ``.imap`` now working again. + +- Now builds on FreeBSD 10. + + Contributed by Michael Fladischer. + 3.3.0.18 - 2014-06-20 --------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/PKG-INFO new/billiard-3.3.0.20/PKG-INFO --- old/billiard-3.3.0.18/PKG-INFO 2014-06-20 15:37:44.000000000 +0200 +++ new/billiard-3.3.0.20/PKG-INFO 2015-04-17 15:03:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: billiard -Version: 3.3.0.18 +Version: 3.3.0.20 Summary: Python multiprocessing fork with improvements and bugfixes Home-page: http://github.com/celery/billiard Author: Ask Solem', @@ -9,7 +9,7 @@ Description: ======== billiard ======== - :version: 3.3.0.18 + :version: 3.3.0.19 About ----- @@ -50,6 +50,28 @@ Changes =========== + 3.3.0.20 - 2015-04-17 + --------------------- + + - Pool: Timeouts will attempt to send SIGKILL, but this signal + does not exist on Windows. Replaced with SIGTERM. + + 3.3.0.19 - 2014-10-13 + --------------------- + + - Pool: Exceptions in user timeout callbacks are now logged instead + of crashing the pool. + + Contributed by Pierre Fersing. + + - Pool: Exit codes in errors were improperly being represented as signals. + + - Pool: ``.map``. and ``.imap`` now working again. + + - Now builds on FreeBSD 10. + + Contributed by Michael Fladischer. + 3.3.0.18 - 2014-06-20 --------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/README.rst new/billiard-3.3.0.20/README.rst --- old/billiard-3.3.0.18/README.rst 2014-06-20 15:33:47.000000000 +0200 +++ new/billiard-3.3.0.20/README.rst 2015-04-17 14:52:50.000000000 +0200 @@ -1,7 +1,7 @@ ======== billiard ======== -:version: 3.3.0.18 +:version: 3.3.0.19 About ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/billiard/__init__.py new/billiard-3.3.0.20/billiard/__init__.py --- old/billiard-3.3.0.18/billiard/__init__.py 2014-06-20 15:33:30.000000000 +0200 +++ new/billiard-3.3.0.20/billiard/__init__.py 2015-04-17 14:57:19.000000000 +0200 @@ -19,7 +19,7 @@ from __future__ import absolute_import -VERSION = (3, 3, 0, 18) +VERSION = (3, 3, 0, 20) __version__ = '.'.join(map(str, VERSION[0:4])) + "".join(VERSION[4:]) __author__ = 'R Oudkerk / Python Software Foundation' __author_email__ = 'python-dev(a)python.org' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/billiard/pool.py new/billiard-3.3.0.20/billiard/pool.py --- old/billiard-3.3.0.18/billiard/pool.py 2014-06-20 15:13:41.000000000 +0200 +++ new/billiard-3.3.0.20/billiard/pool.py 2015-04-17 14:52:50.000000000 +0200 @@ -51,8 +51,10 @@ # handled by # any process, so this is needed to terminate the task # *and its children* (if any). from ._win import kill_processtree as _kill # noqa + SIGKILL = signal.SIGTERM else: from os import kill as _kill # noqa + SIGKILL = signal.SIGKILL try: @@ -123,7 +125,7 @@ def human_status(status): - if status or 0 < 0: + if (status or 0) < 0: try: return 'signal {0} ({1})'.format(-status, SIGMAP[-status]) except KeyError: @@ -622,8 +624,7 @@ return # Run timeout callback - if job._timeout_callback is not None: - job._timeout_callback(soft=True, timeout=job._soft_timeout) + job.handle_timeout(soft=True) try: _kill(job._worker_pid, SIG_SOFT_TIMEOUT) @@ -647,8 +648,8 @@ process, _index = self._process_by_pid(job._worker_pid) # Run timeout callback - if job._timeout_callback is not None: - job._timeout_callback(soft=False, timeout=job._timeout) + job.handle_timeout(soft=False) + if process: self._trywaitkill(process) @@ -663,7 +664,7 @@ return debug('timeout: TERM timed-out, now sending KILL to %s', worker._name) try: - _kill(worker.pid, signal.SIGKILL) + _kill(worker.pid, SIGKILL) except OSError: pass @@ -1629,7 +1630,6 @@ self._error_callback = error_callback self._timeout_callback = timeout_callback self._timeout = timeout - self._terminated = None self._soft_timeout = soft_timeout self._lost_worker_timeout = lost_worker_timeout self._on_timeout_set = on_timeout_set @@ -1641,6 +1641,7 @@ self._cancelled = False self._worker_pid = None self._time_accepted = None + self._terminated = None cache[self._job] = self def __repr__(self): @@ -1689,16 +1690,23 @@ else: raise self._value.exception - def safe_apply_callback(self, fun, *args): + def safe_apply_callback(self, fun, *args, **kwargs): if fun: try: - fun(*args) + fun(*args, **kwargs) except self._callbacks_propagate: raise except Exception as exc: error('Pool callback raised exception: %r', exc, exc_info=1) + def handle_timeout(self, soft=False): + if self._timeout_callback is not None: + self.safe_apply_callback( + self._timeout_callback, soft=soft, + timeout=self._soft_timeout if soft else self._timeout, + ) + def _set(self, i, obj): with self._mutex: if self._on_timeout_cancel: @@ -1798,9 +1806,9 @@ self._cache.pop(self._job, None) self._event.set() - def _ack(self, i, time_accepted, pid): + def _ack(self, i, time_accepted, pid, *args): start = i * self._chunksize - stop = (i + 1) * self._chunksize + stop = min((i + 1) * self._chunksize, self._length) for j in range(start, stop): self._accepted[j] = True self._worker_pid[j] = pid @@ -1887,7 +1895,7 @@ self._cond.notify() del self._cache[self._job] - def _ack(self, i, time_accepted, pid): + def _ack(self, i, time_accepted, pid, *args): self._worker_pids.append(pid) def ready(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/billiard/tests/test_common.py new/billiard-3.3.0.20/billiard/tests/test_common.py --- old/billiard-3.3.0.18/billiard/tests/test_common.py 2014-04-16 15:10:55.000000000 +0200 +++ new/billiard-3.3.0.20/billiard/tests/test_common.py 2015-04-17 15:01:26.000000000 +0200 @@ -4,7 +4,6 @@ import signal from contextlib import contextmanager -from mock import call, patch, Mock from time import time from billiard.common import ( @@ -15,6 +14,11 @@ from .utils import Case +try: + from unittest.mock import Mock, call, patch +except ImportError: + from mock import Mock, call, patch # noqa + def signo(name): return getattr(signal, name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/billiard.egg-info/PKG-INFO new/billiard-3.3.0.20/billiard.egg-info/PKG-INFO --- old/billiard-3.3.0.18/billiard.egg-info/PKG-INFO 2014-06-20 15:37:36.000000000 +0200 +++ new/billiard-3.3.0.20/billiard.egg-info/PKG-INFO 2015-04-17 15:03:07.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: billiard -Version: 3.3.0.18 +Version: 3.3.0.20 Summary: Python multiprocessing fork with improvements and bugfixes Home-page: http://github.com/celery/billiard Author: Ask Solem', @@ -9,7 +9,7 @@ Description: ======== billiard ======== - :version: 3.3.0.18 + :version: 3.3.0.19 About ----- @@ -50,6 +50,28 @@ Changes =========== + 3.3.0.20 - 2015-04-17 + --------------------- + + - Pool: Timeouts will attempt to send SIGKILL, but this signal + does not exist on Windows. Replaced with SIGTERM. + + 3.3.0.19 - 2014-10-13 + --------------------- + + - Pool: Exceptions in user timeout callbacks are now logged instead + of crashing the pool. + + Contributed by Pierre Fersing. + + - Pool: Exit codes in errors were improperly being represented as signals. + + - Pool: ``.map``. and ``.imap`` now working again. + + - Now builds on FreeBSD 10. + + Contributed by Michael Fladischer. + 3.3.0.18 - 2014-06-20 --------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/funtests/setup.py new/billiard-3.3.0.20/funtests/setup.py --- old/billiard-3.3.0.18/funtests/setup.py 2014-01-22 21:04:31.000000000 +0100 +++ new/billiard-3.3.0.20/funtests/setup.py 2015-04-17 14:59:25.000000000 +0200 @@ -44,7 +44,6 @@ test_suite='nose.collector', build_requires=[ 'nose', - 'nose-cover3', 'unittest2', 'coverage>=3.0', ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/requirements/test.txt new/billiard-3.3.0.20/requirements/test.txt --- old/billiard-3.3.0.18/requirements/test.txt 2014-01-22 21:04:31.000000000 +0100 +++ new/billiard-3.3.0.20/requirements/test.txt 2014-12-09 22:50:09.000000000 +0100 @@ -1,4 +1,3 @@ unittest2>=0.4.0 -nose -nose-cover3 +nose>=1.3.4 mock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/requirements/test3.txt new/billiard-3.3.0.20/requirements/test3.txt --- old/billiard-3.3.0.18/requirements/test3.txt 2014-01-22 21:04:31.000000000 +0100 +++ new/billiard-3.3.0.20/requirements/test3.txt 2015-04-17 14:52:50.000000000 +0200 @@ -1,3 +1 @@ -nose -nose-cover3 -mock +nose>=1.3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/setup.cfg new/billiard-3.3.0.20/setup.cfg --- old/billiard-3.3.0.18/setup.cfg 2014-06-20 15:37:44.000000000 +0200 +++ new/billiard-3.3.0.20/setup.cfg 2015-04-17 15:03:13.000000000 +0200 @@ -1,9 +1,5 @@ [nosetests] where = billiard/tests -cover3-branch = 1 -cover3-html = 1 -cover3-package = billiard -cover3-exclude = billiard.tests [egg_info] tag_build = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/billiard-3.3.0.18/setup.py new/billiard-3.3.0.20/setup.py --- old/billiard-3.3.0.18/setup.py 2014-06-20 15:13:37.000000000 +0200 +++ new/billiard-3.3.0.20/setup.py 2015-04-17 14:52:50.000000000 +0200 @@ -118,7 +118,7 @@ HAVE_FD_TRANSFER=1, ) libraries = [] -elif re.match('^(gnukfreebsd(8|9|10|11)|freebsd(7|8|9|0))', sys.platform): +elif re.match('^(gnukfreebsd(8|9|10|11)|freebsd(7|8|9|10))', sys.platform): macros = dict( # FreeBSD 7+ and GNU/kFreeBSD 8+ HAVE_SEM_OPEN=bool( sysconfig.get_config_var('HAVE_SEM_OPEN') and not

1 0

commit python-bcdoc for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-bcdoc for openSUSE:Factory checked in at 2015-04-27 13:05:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-bcdoc (Old) and /work/SRC/openSUSE:Factory/.python-bcdoc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-bcdoc" Changes: -------- --- /work/SRC/openSUSE:Factory/python-bcdoc/python-bcdoc.changes 2014-02-28 19:17:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-bcdoc.new/python-bcdoc.changes 2015-04-27 13:05:31.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Apr 25 17:41:15 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 0.14.0: no upstream changelog +- point source URL to pypi +- remove python from BuildRequires +- increase required versions for docutils and six + +------------------------------------------------------------------- Old: ---- bcdoc-0.12.0.tar.gz New: ---- bcdoc-0.14.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bcdoc.spec ++++++ --- /var/tmp/diff_new_pack.9xiY3g/_old 2015-04-27 13:05:31.000000000 +0200 +++ /var/tmp/diff_new_pack.9xiY3g/_new 2015-04-27 13:05:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-bcdoc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,29 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define baseName bcdoc Name: python-bcdoc -Version: 0.12.0 +Version: 0.14.0 Release: 0 -License: Apache-2.0 Summary: Doc tools for botocore projects -URL: https://github.com/boto/bcdoc +License: Apache-2.0 Group: Development/Languages/Python -Source0: %{baseName}-%{version}.tar.gz -Requires: python-docutils >= 0.1 -Requires: python-six >= 1.1.0 -BuildRequires: python +Url: https://github.com/boto/bcdoc +Source0: https://pypi.python.org/packages/source/b/%{baseName}/%{baseName}-%{version… +Requires: python-docutils >= 0.10 +Requires: python-six >= 1.8.0 BuildRequires: python-devel BuildRequires: python-setuptools -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif - %description Tools to help document botocore-based projects @@ -59,5 +58,4 @@ %{python_sitelib}/bcdoc/* %{python_sitelib}/*egg-info/* - %changelog ++++++ bcdoc-0.12.0.tar.gz -> bcdoc-0.14.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/.gitignore new/bcdoc-0.14.0/.gitignore --- old/bcdoc-0.12.0/.gitignore 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,35 +0,0 @@ -*.py[cod] - -# C extensions -*.so - -# Packages -*.egg -*.egg-info -dist -build -eggs -parts -var -sdist -develop-eggs -.installed.cfg -lib -lib64 - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -.tox -nosetests.xml - -# Translations -*.mo - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject -*~ \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/.travis.yml new/bcdoc-0.14.0/.travis.yml --- old/bcdoc-0.12.0/.travis.yml 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -language: python -python: - - "2.6" - - "2.7" - - "3.3" -install: - - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi - - pip install --use-mirrors -r requirements.txt - - python setup.py develop -script: nosetests tests/unit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/PKG-INFO new/bcdoc-0.14.0/PKG-INFO --- old/bcdoc-0.12.0/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/PKG-INFO 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1,44 @@ +Metadata-Version: 1.1 +Name: bcdoc +Version: 0.14.0 +Summary: ReST document generation tools for botocore. +Home-page: https://github.com/botocore/bcdoc +Author: Mitch Garnaat +Author-email: mitch(a)garnaat.com +License: Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"). You +may not use this file except in compliance with the License. A copy of +the License is located at + + http://aws.amazon.com/apache2.0/ + +or in the "license" file accompanying this file. This file is +distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +ANY KIND, either express or implied. See the License for the specific +language governing permissions and limitations under the License. + +Description: bcdoc + ===== + + |Build Status| + + + Tools to help document botocore-based projects + + .. |Build Status| image:: https://travis-ci.org/boto/bcdoc.png?branch=develop + :target: https://travis-ci.org/boto/bcdoc + +Platform: UNKNOWN +Classifier: Development Status :: 3 - Alpha +Classifier: Intended Audience :: Developers +Classifier: Intended Audience :: System Administrators +Classifier: Natural Language :: English +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.0 +Classifier: Programming Language :: Python :: 3.1 +Classifier: Programming Language :: Python :: 3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc/__init__.py new/bcdoc-0.14.0/bcdoc/__init__.py --- old/bcdoc-0.12.0/bcdoc/__init__.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc/__init__.py 2015-04-22 23:15:37.000000000 +0200 @@ -10,4 +10,4 @@ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF # ANY KIND, either express or implied. See the License for the specific # language governing permissions and limitations under the License. -__version__ = '0.12.0' +__version__ = '0.14.0' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc/docevents.py new/bcdoc-0.14.0/bcdoc/docevents.py --- old/bcdoc-0.12.0/bcdoc/docevents.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc/docevents.py 2015-02-23 19:24:34.000000000 +0100 @@ -13,21 +13,24 @@ DOC_EVENTS = { - 'doc-breadcrumbs': '.%s.%s', - 'doc-title': '.%s.%s', - 'doc-description': '.%s.%s', - 'doc-synopsis-start': '.%s.%s', - 'doc-synopsis-option': '.%s.%s.%s', - 'doc-synopsis-end': '.%s.%s', - 'doc-options-start': '.%s.%s', - 'doc-option': '.%s.%s.%s', - 'doc-option-example': '.%s.%s.%s', - 'doc-options-end': '.%s.%s', - 'doc-examples': '.%s.%s', - 'doc-output': '.%s.%s', - 'doc-subitems-start': '.%s.%s', - 'doc-subitem': '.%s.%s.%s', - 'doc-subitems-end': '.%s.%s', + 'doc-breadcrumbs': '.%s', + 'doc-title': '.%s', + 'doc-description': '.%s', + 'doc-synopsis-start': '.%s', + 'doc-synopsis-option': '.%s.%s', + 'doc-synopsis-end': '.%s', + 'doc-options-start': '.%s', + 'doc-option': '.%s.%s', + 'doc-option-example': '.%s.%s', + 'doc-options-end': '.%s', + 'doc-examples': '.%s', + 'doc-output': '.%s', + 'doc-subitems-start': '.%s', + 'doc-subitem': '.%s.%s', + 'doc-subitems-end': '.%s', + 'doc-relateditems-start': '.%s', + 'doc-relateditem': '.%s.%s', + 'doc-relateditems-end': '.%s' } @@ -43,47 +46,63 @@ DOC_EVENTS[event_name]) # Now generate the documentation events fire_event(session, 'doc-breadcrumbs', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-title', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-description', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-synopsis-start', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) if help_command.arg_table: for arg_name in help_command.arg_table: + # An argument can set an '_UNDOCUMENTED' attribute + # to True to indicate a parameter that exists + # but shouldn't be documented. This can be used + # for backwards compatibility of deprecated arguments. + if getattr(help_command.arg_table[arg_name], + '_UNDOCUMENTED', False): + continue fire_event(session, 'doc-synopsis-option', - help_command.event_class, - help_command.name, arg_name, + help_command.event_class, arg_name, arg_name=arg_name, help_command=help_command) fire_event(session, 'doc-synopsis-end', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-options-start', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) if help_command.arg_table: for arg_name in help_command.arg_table: + if getattr(help_command.arg_table[arg_name], + '_UNDOCUMENTED', False): + continue fire_event(session, 'doc-option', help_command.event_class, - help_command.name, arg_name, - arg_name=arg_name, help_command=help_command) + arg_name, arg_name=arg_name, help_command=help_command) fire_event(session, 'doc-option-example', help_command.event_class, - help_command.name, arg_name, - arg_name=arg_name, help_command=help_command) + arg_name, arg_name=arg_name, help_command=help_command) fire_event(session, 'doc-options-end', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-subitems-start', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) if help_command.command_table: for command_name in sorted(help_command.command_table.keys()): if hasattr(help_command.command_table[command_name], '_UNDOCUMENTED'): continue fire_event(session, 'doc-subitem', help_command.event_class, - help_command.name, command_name, - command_name=command_name, help_command=help_command) + command_name, command_name=command_name, + help_command=help_command) fire_event(session, 'doc-subitems-end', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-examples', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) fire_event(session, 'doc-output', help_command.event_class, - help_command.name, help_command=help_command) + help_command=help_command) + fire_event(session, 'doc-relateditems-start', help_command.event_class, + help_command=help_command) + if help_command.related_items: + for related_item in sorted(help_command.related_items): + fire_event(session, 'doc-relateditem', help_command.event_class, + related_item, help_command=help_command, + related_item=related_item) + fire_event(session, 'doc-relateditems-end', help_command.event_class, + help_command=help_command) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc/style.py new/bcdoc-0.14.0/bcdoc/style.py --- old/bcdoc-0.12.0/bcdoc/style.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc/style.py 2015-04-22 23:14:18.000000000 +0200 @@ -186,25 +186,47 @@ self.a_href = attr_value self.doc.write('`') else: + # There are some model documentation that + # looks like this: <a>DescribeInstances</a>. + # In this case we just write out an empty + # string. self.doc.write(' ') self.doc.do_translation = True def link_target_definition(self, refname, link): self.doc.writeln('.. _%s: %s' % (refname, link)) + def sphinx_reference_label(self, label, text=None): + if text is None: + text = label + if self.doc.target == 'html': + self.doc.write(':ref:`%s <%s>`' % (text, label)) + else: + self.doc.write(text) + def end_a(self): self.doc.do_translation = False if self.a_href: last_write = self.doc.pop_write() last_write = last_write.rstrip(' ') - if last_write: + if last_write and last_write != '`': + if ':' in last_write: + last_write = last_write.replace(':', r'\:') self.doc.push_write(last_write) self.doc.hrefs[last_write] = self.a_href + self.doc.write('`_') + elif last_write == '`': + # Look at start_a(). It will do a self.doc.write('`') + # which is the start of the link title. If that is the + # case then there was no link text. We should just + # use an inline link. The syntax of this is + # `<http://url>`_ + self.doc.push_write('`<%s>`_' % self.a_href) else: self.doc.push_write(self.a_href) self.doc.hrefs[self.a_href] = self.a_href + self.doc.write('`_') self.a_href = None - self.doc.write('`_') self.doc.write(' ') def start_i(self, attrs=None): @@ -292,3 +314,12 @@ else: self.doc.writeln(' %s' % item) + def hidden_toctree(self): + if self.doc.target == 'html': + self.doc.write('\n.. toctree::\n') + self.doc.write(' :maxdepth: 1\n') + self.doc.write(' :hidden:\n\n') + + def hidden_tocitem(self, item): + if self.doc.target == 'html': + self.tocitem(item) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc.egg-info/PKG-INFO new/bcdoc-0.14.0/bcdoc.egg-info/PKG-INFO --- old/bcdoc-0.12.0/bcdoc.egg-info/PKG-INFO 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc.egg-info/PKG-INFO 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1,44 @@ +Metadata-Version: 1.1 +Name: bcdoc +Version: 0.14.0 +Summary: ReST document generation tools for botocore. +Home-page: https://github.com/botocore/bcdoc +Author: Mitch Garnaat +Author-email: mitch(a)garnaat.com +License: Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. + +Licensed under the Apache License, Version 2.0 (the "License"). You +may not use this file except in compliance with the License. A copy of +the License is located at + + http://aws.amazon.com/apache2.0/ + +or in the "license" file accompanying this file. This file is +distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF +ANY KIND, either express or implied. See the License for the specific +language governing permissions and limitations under the License. + +Description: bcdoc + ===== + + |Build Status| + + + Tools to help document botocore-based projects + + .. |Build Status| image:: https://travis-ci.org/boto/bcdoc.png?branch=develop + :target: https://travis-ci.org/boto/bcdoc + +Platform: UNKNOWN +Classifier: Development Status :: 3 - Alpha +Classifier: Intended Audience :: Developers +Classifier: Intended Audience :: System Administrators +Classifier: Natural Language :: English +Classifier: License :: OSI Approved :: Apache Software License +Classifier: Programming Language :: Python +Classifier: Programming Language :: Python :: 2.6 +Classifier: Programming Language :: Python :: 2.7 +Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: 3.0 +Classifier: Programming Language :: Python :: 3.1 +Classifier: Programming Language :: Python :: 3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc.egg-info/SOURCES.txt new/bcdoc-0.14.0/bcdoc.egg-info/SOURCES.txt --- old/bcdoc-0.12.0/bcdoc.egg-info/SOURCES.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc.egg-info/SOURCES.txt 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1,17 @@ +LICENSE.txt +MANIFEST.in +README.rst +requirements.txt +setup.cfg +setup.py +bcdoc/__init__.py +bcdoc/docevents.py +bcdoc/docstringparser.py +bcdoc/restdoc.py +bcdoc/style.py +bcdoc/textwriter.py +bcdoc.egg-info/PKG-INFO +bcdoc.egg-info/SOURCES.txt +bcdoc.egg-info/dependency_links.txt +bcdoc.egg-info/requires.txt +bcdoc.egg-info/top_level.txt \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc.egg-info/dependency_links.txt new/bcdoc-0.14.0/bcdoc.egg-info/dependency_links.txt --- old/bcdoc-0.12.0/bcdoc.egg-info/dependency_links.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc.egg-info/dependency_links.txt 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1 @@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc.egg-info/requires.txt new/bcdoc-0.14.0/bcdoc.egg-info/requires.txt --- old/bcdoc-0.12.0/bcdoc.egg-info/requires.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc.egg-info/requires.txt 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1,2 @@ +six>=1.8.0,<2.0.0 +docutils>=0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/bcdoc.egg-info/top_level.txt new/bcdoc-0.14.0/bcdoc.egg-info/top_level.txt --- old/bcdoc-0.12.0/bcdoc.egg-info/top_level.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/bcdoc-0.14.0/bcdoc.egg-info/top_level.txt 2015-04-22 23:17:32.000000000 +0200 @@ -0,0 +1 @@ +bcdoc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/requirements.txt new/bcdoc-0.14.0/requirements.txt --- old/bcdoc-0.12.0/requirements.txt 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/requirements.txt 2015-02-23 19:24:34.000000000 +0100 @@ -1,2 +1,2 @@ -six==1.1.0 +six>=1.8.0,<2.0.0 docutils>=0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/setup.cfg new/bcdoc-0.14.0/setup.cfg --- old/bcdoc-0.12.0/setup.cfg 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/setup.cfg 2015-04-22 23:17:32.000000000 +0200 @@ -1,2 +1,8 @@ [wheel] universal = 1 + +[egg_info] +tag_build = +tag_date = 0 +tag_svn_revision = 0 + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/setup.py new/bcdoc-0.14.0/setup.py --- old/bcdoc-0.12.0/setup.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/setup.py 2015-04-22 23:15:37.000000000 +0200 @@ -14,13 +14,13 @@ 'bcdoc', ] -requires = ['six>=1.1.0', +requires = ['six>=1.8.0,<2.0.0', 'docutils>=0.10'] setup( name='bcdoc', - version='0.12.0', + version='0.14.0', description='ReST document generation tools for botocore.', long_description=open('README.rst').read(), author='Mitch Garnaat', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/tests/__init__.py new/bcdoc-0.14.0/tests/__init__.py --- old/bcdoc-0.12.0/tests/__init__.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). You -# may not use this file except in compliance with the License. A copy of -# the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "license" file accompanying this file. This file is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF -# ANY KIND, either express or implied. See the License for the specific -# language governing permissions and limitations under the License. -import sys - - -# The unittest module got a significant overhaul -# in 2.7, so if we're in 2.6 we can use the backported -# version unittest2. -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/tests/unit/__init__.py new/bcdoc-0.14.0/tests/unit/__init__.py --- old/bcdoc-0.12.0/tests/unit/__init__.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/tests/unit/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). You -# may not use this file except in compliance with the License. A copy of -# the License is located at -# -# http://aws.amazon.com/apache2.0/ -# -# or in the "license" file accompanying this file. This file is -# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF -# ANY KIND, either express or implied. See the License for the specific -# language governing permissions and limitations under the License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/tests/unit/test_document.py new/bcdoc-0.14.0/tests/unit/test_document.py --- old/bcdoc-0.12.0/tests/unit/test_document.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/tests/unit/test_document.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -# Copyright (c) 2012-2013 Mitch Garnaat http://garnaat.org/ -# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, dis- -# tribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the fol- -# lowing conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- -# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -import unittest - -import six - -from bcdoc.restdoc import ReSTDocument - - -class TestReSTDocument(unittest.TestCase): - - def test_write(self): - doc = ReSTDocument() - doc.write('foo') - self.assertEqual(doc.getvalue(), six.b('foo')) - - def test_writeln(self): - doc = ReSTDocument() - doc.writeln('foo') - self.assertEqual(doc.getvalue(), six.b('foo\n')) - - def test_include_doc_string(self): - doc = ReSTDocument() - doc.include_doc_string('this is a <code>test</code>') - self.assertEqual(doc.getvalue(), six.b('\n\nthis is a ``test`` \n\n')) - - def test_remove_doc_string(self): - doc = ReSTDocument() - doc.writeln('foo') - doc.include_doc_string('this is a <code>test</code>') - doc.remove_last_doc_string() - self.assertEqual(doc.getvalue(), six.b('foo\n')) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/tests/unit/test_style.py new/bcdoc-0.14.0/tests/unit/test_style.py --- old/bcdoc-0.12.0/tests/unit/test_style.py 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/tests/unit/test_style.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,117 +0,0 @@ -# Copyright (c) 2012-2013 Mitch Garnaat http://garnaat.org/ -# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, dis- -# tribute, sublicense, and/or sell copies of the Software, and to permit -# persons to whom the Software is furnished to do so, subject to the fol- -# lowing conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- -# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -import unittest - -import six - -from bcdoc.style import ReSTStyle -from bcdoc.restdoc import ReSTDocument - - -class TestStyle(unittest.TestCase): - - def test_spaces(self): - style = ReSTStyle(None, 4) - self.assertEqual(style.spaces(), '') - style.indent() - self.assertEqual(style.spaces(), ' ') - style.indent() - self.assertEqual(style.spaces(), ' ') - style.dedent() - self.assertEqual(style.spaces(), ' ') - style.dedent() - self.assertEqual(style.spaces(), '') - style.dedent() - self.assertEqual(style.spaces(), '') - - def test_bold(self): - style = ReSTStyle(ReSTDocument()) - style.bold('foobar') - self.assertEqual(style.doc.getvalue(), six.b('**foobar** ')) - - def test_italics(self): - style = ReSTStyle(ReSTDocument()) - style.italics('foobar') - self.assertEqual(style.doc.getvalue(), six.b('*foobar* ')) - - def test_code(self): - style = ReSTStyle(ReSTDocument()) - style.code('foobar') - self.assertEqual(style.doc.getvalue(), six.b('``foobar`` ')) - - def test_h1(self): - style = ReSTStyle(ReSTDocument()) - style.h1('foobar fiebaz') - self.assertEqual(style.doc.getvalue(), - six.b('\n\n*************\nfoobar fiebaz\n*************\n\n')) - - def test_h2(self): - style = ReSTStyle(ReSTDocument()) - style.h2('foobar fiebaz') - self.assertEqual(style.doc.getvalue(), - six.b('\n\n=============\nfoobar fiebaz\n=============\n\n')) - - def test_h3(self): - style = ReSTStyle(ReSTDocument()) - style.h3('foobar fiebaz') - self.assertEqual(style.doc.getvalue(), - six.b('\n\n-------------\nfoobar fiebaz\n-------------\n\n')) - - def test_ref(self): - style = ReSTStyle(ReSTDocument()) - style.ref('foobar', 'http://foo.bar.com') - self.assertEqual(style.doc.getvalue(), - six.b(':doc:`foobar <http://foo.bar.com>`')) - - def test_examples(self): - style = ReSTStyle(ReSTDocument()) - self.assertTrue(style.doc.keep_data) - style.start_examples() - self.assertFalse(style.doc.keep_data) - style.end_examples() - self.assertTrue(style.doc.keep_data) - - def test_codeblock(self): - style = ReSTStyle(ReSTDocument()) - style.codeblock('foobar') - self.assertEqual(style.doc.getvalue(), - six.b('::\n\n foobar\n\n\n')) - - def test_toctree_html(self): - style = ReSTStyle(ReSTDocument()) - style.doc.target = 'html' - style.toctree() - style.tocitem('foo') - style.tocitem('bar') - self.assertEqual(style.doc.getvalue(), - six.b('\n.. toctree::\n :maxdepth: 1\n :titlesonly:\n\n foo\n bar\n')) - - def test_toctree_man(self): - style = ReSTStyle(ReSTDocument()) - style.doc.target = 'man' - style.toctree() - style.tocitem('foo') - style.tocitem('bar') - self.assertEqual(style.doc.getvalue(), - six.b('\n\n\n* foo\n\n\n* bar\n\n')) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bcdoc-0.12.0/tox.ini new/bcdoc-0.14.0/tox.ini --- old/bcdoc-0.12.0/tox.ini 2013-11-26 23:06:06.000000000 +0100 +++ new/bcdoc-0.14.0/tox.ini 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -[tox] -envlist = py26,py27,py33 - -[testenv] -commands = nosetests tests/unit -deps = - nose - -[testenv:py26] -commands = nosetests tests/unit -deps = - nose - unittest2

1 0

commit python-jmespath for openSUSE:Factory
by root＠hilbert.suse.de 27 Apr '15

27 Apr '15

Hello community, here is the log from the commit of package python-jmespath for openSUSE:Factory checked in at 2015-04-27 13:05:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-jmespath (Old) and /work/SRC/openSUSE:Factory/.python-jmespath.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-jmespath" Changes: -------- --- /work/SRC/openSUSE:Factory/python-jmespath/python-jmespath.changes 2015-03-27 09:41:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-jmespath.new/python-jmespath.changes 2015-04-27 13:05:29.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Apr 26 16:57:39 UTC 2015 - benoit.monin(a)gmx.fr + +- update to version 0.7.0: + * Add support for JEP-12, raw string literals + * Support .whl files +- additional changes from version 0.6.2: + * Implement JEP-10, slice projections + * Fix bug with filter projection parsing + * Add to_array function + * Add merge function + * Fix error messages for function argument type errors +- point source URL to pypi + +------------------------------------------------------------------- Old: ---- jmespath-0.6.1.tar.gz New: ---- jmespath-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-jmespath.spec ++++++ --- /var/tmp/diff_new_pack.FCyBNX/_old 2015-04-27 13:05:29.000000000 +0200 +++ /var/tmp/diff_new_pack.FCyBNX/_new 2015-04-27 13:05:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-jmespath # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,13 @@ %define baseName jmespath Name: python-jmespath -Version: 0.6.1 +Version: 0.7.0 Release: 0 Summary: Extract elements from JSON document License: MIT Group: Development/Languages/Python Url: https://github.com/boto/jmespath -Source0: %{baseName}-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/j/%{baseName}/%{baseName}-%{version… Requires: python Requires: python-ply >= 3.4 BuildRequires: python ++++++ jmespath-0.6.1.tar.gz -> jmespath-0.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/PKG-INFO new/jmespath-0.7.0/PKG-INFO --- old/jmespath-0.6.1/PKG-INFO 2015-02-03 22:19:50.000000000 +0100 +++ new/jmespath-0.7.0/PKG-INFO 2015-04-21 08:34:36.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: jmespath -Version: 0.6.1 +Version: 0.7.0 Summary: JSON Matching Expressions Home-page: https://github.com/boto/jmespath Author: James Saryerwinnie @@ -9,11 +9,16 @@ Description: JMESPath ======== + + .. image:: https://badges.gitter.im/Join Chat.svg + :target: https://gitter.im/jmespath/chat + + .. image:: https://secure.travis-ci.org/jmespath/jmespath.py.png?branch=develop :target: http://travis-ci.org/jmespath/jmespath.py - JMESPath (pronounced ``\ˈjāmz path\``) allows you to declaratively specify how to + JMESPath (pronounced "james path") allows you to declaratively specify how to extract elements from a JSON document. For example, given this document:: @@ -46,9 +51,41 @@ The expression: ``foo.*.name`` will return ["one", "two"]. + API + === + + The ``jmespath.py`` library has two functions + that operate on python data structures. You can use ``search`` + and give it the jmespath expression and the data:: + + >>> import jmespath + >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) + 'baz' + + Similar to the ``re`` module, you can use the ``compile`` function + to compile the JMESPath expression and use this parsed expression + to perform repeated searches:: + + >>> import jmespath + >>> expression = jmespath.compile('foo.bar') + >>> expression.search({'foo': {'bar': 'baz'}}) + 'baz' + >>> expression.search({'foo': {'bar': 'other'}}) + 'other' + + This is useful if you're going to use the same jmespath expression to + search multiple documents. This avoids having to reparse the + JMESPath expression each time you search a new document. + + Specification ============= + If you'd like to learn more about the JMESPath language, you can check out + the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. Also check + out the `JMESPath examples page <http://jmespath.org/examples.html>`__ for + examples of more complex jmespath queries. + The grammar is specified using ABNF, as described in `RFC4234 <http://www.ietf.org/rfc/rfc4234.txt>`_. You can find the most up to date @@ -57,9 +94,6 @@ You can read the full `JMESPath specification here <http://jmespath.org/specification.html>`__. - If you'd like to learn more about the JMESPath language, you can check out - the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. - Testing ======= @@ -70,29 +104,12 @@ to verify they are producing the correct output. Each json file is grouped by feature. - Python Library - ============== - The included python implementation has two convenience functions - that operate on python data structures. You can use ``search`` - and give it the jmespath expression and the data:: - - >>> import jmespath - >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) - 'baz' - - Similar to the ``re`` module, you can store the compiled expressions - and reuse them to perform repeated searches:: - - >>> import jmespath - >>> path = jmespath.compile('foo.bar') - >>> path.search({'foo': {'bar': 'baz'}}) - 'baz' - >>> path.search({'foo': {'bar': 'other'}}) - 'other' + Discuss + ======= - You can also use the ``jmespath.parser.Parser`` class directly - if you want more control. + Join us on our `Gitter channel <https://gitter.im/jmespath/chat>`__ + if you want to chat or if you have any questions. Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/README.rst new/jmespath-0.7.0/README.rst --- old/jmespath-0.6.1/README.rst 2015-02-03 22:19:02.000000000 +0100 +++ new/jmespath-0.7.0/README.rst 2015-03-20 03:58:23.000000000 +0100 @@ -1,11 +1,16 @@ JMESPath ======== + +.. image:: https://badges.gitter.im/Join Chat.svg + :target: https://gitter.im/jmespath/chat + + .. image:: https://secure.travis-ci.org/jmespath/jmespath.py.png?branch=develop :target: http://travis-ci.org/jmespath/jmespath.py -JMESPath (pronounced ``\ˈjāmz path\``) allows you to declaratively specify how to +JMESPath (pronounced "james path") allows you to declaratively specify how to extract elements from a JSON document. For example, given this document:: @@ -38,9 +43,41 @@ The expression: ``foo.*.name`` will return ["one", "two"]. +API +=== + +The ``jmespath.py`` library has two functions +that operate on python data structures. You can use ``search`` +and give it the jmespath expression and the data:: + + >>> import jmespath + >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) + 'baz' + +Similar to the ``re`` module, you can use the ``compile`` function +to compile the JMESPath expression and use this parsed expression +to perform repeated searches:: + + >>> import jmespath + >>> expression = jmespath.compile('foo.bar') + >>> expression.search({'foo': {'bar': 'baz'}}) + 'baz' + >>> expression.search({'foo': {'bar': 'other'}}) + 'other' + +This is useful if you're going to use the same jmespath expression to +search multiple documents. This avoids having to reparse the +JMESPath expression each time you search a new document. + + Specification ============= +If you'd like to learn more about the JMESPath language, you can check out +the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. Also check +out the `JMESPath examples page <http://jmespath.org/examples.html>`__ for +examples of more complex jmespath queries. + The grammar is specified using ABNF, as described in `RFC4234 <http://www.ietf.org/rfc/rfc4234.txt>`_. You can find the most up to date @@ -49,9 +86,6 @@ You can read the full `JMESPath specification here <http://jmespath.org/specification.html>`__. -If you'd like to learn more about the JMESPath language, you can check out -the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. - Testing ======= @@ -62,26 +96,9 @@ to verify they are producing the correct output. Each json file is grouped by feature. -Python Library -============== -The included python implementation has two convenience functions -that operate on python data structures. You can use ``search`` -and give it the jmespath expression and the data:: - - >>> import jmespath - >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) - 'baz' - -Similar to the ``re`` module, you can store the compiled expressions -and reuse them to perform repeated searches:: - - >>> import jmespath - >>> path = jmespath.compile('foo.bar') - >>> path.search({'foo': {'bar': 'baz'}}) - 'baz' - >>> path.search({'foo': {'bar': 'other'}}) - 'other' +Discuss +======= -You can also use the ``jmespath.parser.Parser`` class directly -if you want more control. +Join us on our `Gitter channel <https://gitter.im/jmespath/chat>`__ +if you want to chat or if you have any questions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/bin/jp new/jmespath-0.7.0/bin/jp --- old/jmespath-0.6.1/bin/jp 2014-04-23 21:00:09.000000000 +0200 +++ new/jmespath-0.7.0/bin/jp 2015-04-18 20:54:14.000000000 +0200 @@ -51,9 +51,6 @@ except exceptions.UnknownFunctionError as e: sys.stderr.write("unknown-function: %s\n" % e) return 1 - except exceptions.LexerError as e: - sys.stderr.write("syntax-error: %s\n" % e) - return 1 except exceptions.ParseError as e: sys.stderr.write("syntax-error: %s\n" % e) return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath/__init__.py new/jmespath-0.7.0/jmespath/__init__.py --- old/jmespath-0.6.1/jmespath/__init__.py 2015-02-03 22:19:10.000000000 +0100 +++ new/jmespath-0.7.0/jmespath/__init__.py 2015-04-21 08:29:17.000000000 +0200 @@ -1,6 +1,6 @@ from jmespath import parser -__version__ = '0.6.1' +__version__ = '0.7.0' def compile(expression): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath/exceptions.py new/jmespath-0.7.0/jmespath/exceptions.py --- old/jmespath-0.6.1/jmespath/exceptions.py 2015-01-29 20:42:34.000000000 +0100 +++ new/jmespath-0.7.0/jmespath/exceptions.py 2015-04-18 20:54:14.000000000 +0200 @@ -22,8 +22,8 @@ # self.lex_position +1 to account for the starting double quote char. underline = ' ' * (self.lex_position + 1) + '^' return ( - '%s: Parse error at column %s near ' - 'token "%s" (%s) for expression:\n"%s"\n%s' % ( + '%s: Parse error at column %s, ' + 'token "%s" (%s), for expression:\n"%s"\n%s' % ( self.msg, self.lex_position, self.token_value, self.token_type, self.expression, underline)) @@ -71,19 +71,29 @@ self.expression = None def __str__(self): - return ("Expected %s arguments for function %s(), " - "received %s" % (self.expected_arity, - self.function_name, - self.actual_arity)) + return ("Expected %s %s for function %s(), " + "received %s" % ( + self.expected_arity, + self._pluralize('argument', self.expected_arity), + self.function_name, + self.actual_arity)) + + def _pluralize(self, word, count): + if count == 1: + return word + else: + return word + 's' @with_str_method class VariadictArityError(ArityError): def __str__(self): - return ("Expected at least %s arguments for function %s, " - "received %s" % (self.expected_arity, - self.function_name, - self.actual_arity)) + return ("Expected at least %s %s for function %s(), " + "received %s" % ( + self.expected_arity, + self._pluralize('argument', self.expected_arity), + self.function_name, + self.actual_arity)) @with_str_method diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath/functions.py new/jmespath-0.7.0/jmespath/functions.py --- old/jmespath-0.6.1/jmespath/functions.py 2015-01-31 22:18:30.000000000 +0100 +++ new/jmespath-0.7.0/jmespath/functions.py 2015-04-18 20:54:14.000000000 +0200 @@ -186,6 +186,13 @@ return argument @builtin_function({'types': []}) + def _func_to_array(self, arg): + if isinstance(arg, list): + return arg + else: + return [arg] + + @builtin_function({'types': []}) def _func_to_string(self, arg): if isinstance(arg, STRING_TYPE): return arg @@ -252,6 +259,13 @@ else: return None + @builtin_function({"types": ["object"], "variadic": True}) + def _func_merge(self, *arguments): + merged = {} + for arg in arguments: + merged.update(arg) + return merged + @builtin_function({"types": ['array-number', 'array-string']}) def _func_min(self, arg): if arg: @@ -303,7 +317,7 @@ # that validates that type, which requires that remaining array # elements resolve to the same type as the first element. required_type = self._convert_to_jmespath_type( - self.interpreter.visit(expref.expression, array[0])) + type(self.interpreter.visit(expref.expression, array[0])).__name__) if required_type not in ['number', 'string']: raise exceptions.JMESPathTypeError( 'sort_by', array[0], required_type, ['string', 'number']) @@ -331,7 +345,9 @@ def keyfunc(x): result = interpreter.visit(expr_node, x) - jmespath_type = self._convert_to_jmespath_type(result) + actual_typename = type(result).__name__ + jmespath_type = self._convert_to_jmespath_type(actual_typename) + # allowed_types is in term of jmespath types, not python types. if jmespath_type not in allowed_types: raise exceptions.JMESPathTypeError( function_name, result, jmespath_type, allowed_types) @@ -339,4 +355,4 @@ return keyfunc def _convert_to_jmespath_type(self, pyobject): - return TYPES_MAP.get(type(pyobject).__name__, 'unknown') + return TYPES_MAP.get(pyobject, 'unknown') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath/lexer.py new/jmespath-0.7.0/jmespath/lexer.py --- old/jmespath-0.6.1/jmespath/lexer.py 2015-01-29 20:42:34.000000000 +0100 +++ new/jmespath-0.7.0/jmespath/lexer.py 2015-04-21 08:28:55.000000000 +0200 @@ -1,4 +1,5 @@ import re +import warnings from json import loads from jmespath.exceptions import LexerError, EmptyExpressionError @@ -9,6 +10,7 @@ r'(?P<number>-?\d+)|' r'(?P<unquoted_identifier>([a-zA-Z_][a-zA-Z_0-9]*))|' r'(?P<quoted_identifier>("(?:\\\\|\\"|[^"])*"))|' + r'(?P<string_literal>(\'(?:\\\\|\\\'|[^\'])*\'))|' r'(?P<literal>(`(?:\\\\|\\`|[^`])*`))|' r'(?P<filter>\[\?)|' r'(?P<or>\|\|)|' @@ -93,6 +95,9 @@ lexer_value=value, message=error_message) + def _token_string_literal(self, value, start, end): + return value[1:-1] + def _token_literal(self, value, start, end): actual_value = value[1:-1] actual_value = actual_value.replace('\\`', '`').lstrip() @@ -113,7 +118,10 @@ # don't have to be quoted. This is only true if the # string doesn't start with chars that could start a valid # JSON value. - return loads(potential_value) + value = loads(potential_value) + warnings.warn("deprecated string literal syntax", + PendingDeprecationWarning) + return value except ValueError: raise LexerError(lexer_position=start, lexer_value=value, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath/parser.py new/jmespath-0.7.0/jmespath/parser.py --- old/jmespath-0.6.1/jmespath/parser.py 2015-02-03 22:19:02.000000000 +0100 +++ new/jmespath-0.7.0/jmespath/parser.py 2015-04-21 08:28:55.000000000 +0200 @@ -46,6 +46,7 @@ 'number': 0, 'current': 0, 'expref': 0, + 'colon': 0, 'pipe': 1, 'eq': 2, 'gt': 2, @@ -56,9 +57,9 @@ 'or': 5, 'flatten': 6, 'star': 20, + 'filter': 20, 'dot': 40, 'lbrace': 50, - 'filter': 50, 'lbracket': 55, 'lparen': 60, } @@ -126,6 +127,9 @@ current_token = self._current_token() return left + def _token_nud_string_literal(self, token): + return ast.literal(token['value']) + def _token_nud_literal(self, token): return ast.literal(token['value']) @@ -165,7 +169,12 @@ def _token_nud_lbracket(self, token): if self._current_token() in ['number', 'colon']: - return self._parse_index_expression() + right = self._parse_index_expression() + # We could optimize this and remove the identity() node. + # We don't really need an index_expression node, we can + # just use emit an index node here if we're not dealing + # with a slice. + return self._project_if_slice(ast.identity(), right) elif self._current_token() == 'star' and \ self._lookahead(1) == 'rbracket': self._advance() @@ -300,10 +309,13 @@ if token['type'] in ['number', 'colon']: right = self._parse_index_expression() if left['type'] == 'index_expression': + # Optimization: if the left node is an index expr, + # we can avoid creating another node and instead just add + # the right node as a child of the left. left['children'].append(right) return left else: - return ast.index_expression([left, right]) + return self._project_if_slice(left, right) else: # We have a projection self._match('star') @@ -311,6 +323,15 @@ right = self._parse_projection_rhs(self.BINDING_POWER['star']) return ast.projection(left, right) + def _project_if_slice(self, left, right): + index_expr = ast.index_expression([left, right]) + if right['type'] == 'slice': + return ast.projection( + index_expr, + self._parse_projection_rhs(self.BINDING_POWER['star'])) + else: + return index_expr + def _parse_comparator(self, left, comparator): right = self._expression(self.BINDING_POWER[comparator]) return ast.comparator(comparator, left, right) @@ -409,6 +430,9 @@ "Token %s not allowed to be: %s" % (actual_type, token_types)) def _error_nud_token(self, token): + if token['type'] == 'eof': + raise exceptions.IncompleteExpressionError( + token['start'], token['value'], token['type']) raise exceptions.ParseError(token['start'], token['value'], token['type'], 'Invalid token.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath.egg-info/PKG-INFO new/jmespath-0.7.0/jmespath.egg-info/PKG-INFO --- old/jmespath-0.6.1/jmespath.egg-info/PKG-INFO 2015-02-03 22:19:49.000000000 +0100 +++ new/jmespath-0.7.0/jmespath.egg-info/PKG-INFO 2015-04-21 08:34:35.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: jmespath -Version: 0.6.1 +Version: 0.7.0 Summary: JSON Matching Expressions Home-page: https://github.com/boto/jmespath Author: James Saryerwinnie @@ -9,11 +9,16 @@ Description: JMESPath ======== + + .. image:: https://badges.gitter.im/Join Chat.svg + :target: https://gitter.im/jmespath/chat + + .. image:: https://secure.travis-ci.org/jmespath/jmespath.py.png?branch=develop :target: http://travis-ci.org/jmespath/jmespath.py - JMESPath (pronounced ``\ˈjāmz path\``) allows you to declaratively specify how to + JMESPath (pronounced "james path") allows you to declaratively specify how to extract elements from a JSON document. For example, given this document:: @@ -46,9 +51,41 @@ The expression: ``foo.*.name`` will return ["one", "two"]. + API + === + + The ``jmespath.py`` library has two functions + that operate on python data structures. You can use ``search`` + and give it the jmespath expression and the data:: + + >>> import jmespath + >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) + 'baz' + + Similar to the ``re`` module, you can use the ``compile`` function + to compile the JMESPath expression and use this parsed expression + to perform repeated searches:: + + >>> import jmespath + >>> expression = jmespath.compile('foo.bar') + >>> expression.search({'foo': {'bar': 'baz'}}) + 'baz' + >>> expression.search({'foo': {'bar': 'other'}}) + 'other' + + This is useful if you're going to use the same jmespath expression to + search multiple documents. This avoids having to reparse the + JMESPath expression each time you search a new document. + + Specification ============= + If you'd like to learn more about the JMESPath language, you can check out + the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. Also check + out the `JMESPath examples page <http://jmespath.org/examples.html>`__ for + examples of more complex jmespath queries. + The grammar is specified using ABNF, as described in `RFC4234 <http://www.ietf.org/rfc/rfc4234.txt>`_. You can find the most up to date @@ -57,9 +94,6 @@ You can read the full `JMESPath specification here <http://jmespath.org/specification.html>`__. - If you'd like to learn more about the JMESPath language, you can check out - the `JMESPath tutorial <http://jmespath.org/tutorial.html>`__. - Testing ======= @@ -70,29 +104,12 @@ to verify they are producing the correct output. Each json file is grouped by feature. - Python Library - ============== - The included python implementation has two convenience functions - that operate on python data structures. You can use ``search`` - and give it the jmespath expression and the data:: - - >>> import jmespath - >>> path = jmespath.search('foo.bar', {'foo': {'bar': 'baz'}}) - 'baz' - - Similar to the ``re`` module, you can store the compiled expressions - and reuse them to perform repeated searches:: - - >>> import jmespath - >>> path = jmespath.compile('foo.bar') - >>> path.search({'foo': {'bar': 'baz'}}) - 'baz' - >>> path.search({'foo': {'bar': 'other'}}) - 'other' + Discuss + ======= - You can also use the ``jmespath.parser.Parser`` class directly - if you want more control. + Join us on our `Gitter channel <https://gitter.im/jmespath/chat>`__ + if you want to chat or if you have any questions. Platform: UNKNOWN Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath.egg-info/SOURCES.txt new/jmespath-0.7.0/jmespath.egg-info/SOURCES.txt --- old/jmespath-0.6.1/jmespath.egg-info/SOURCES.txt 2015-02-03 22:19:50.000000000 +0100 +++ new/jmespath-0.7.0/jmespath.egg-info/SOURCES.txt 2015-04-21 08:34:36.000000000 +0200 @@ -1,6 +1,7 @@ LICENSE.txt MANIFEST.in README.rst +setup.cfg setup.py bin/jp jmespath/__init__.py @@ -14,7 +15,5 @@ jmespath.egg-info/PKG-INFO jmespath.egg-info/SOURCES.txt jmespath.egg-info/dependency_links.txt -jmespath.egg-info/top_level.txt -tests/__init__.py -tests/test_compliance.py -tests/test_parser.py \ No newline at end of file +jmespath.egg-info/pbr.json +jmespath.egg-info/top_level.txt \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/jmespath.egg-info/pbr.json new/jmespath-0.7.0/jmespath.egg-info/pbr.json --- old/jmespath-0.6.1/jmespath.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 +++ new/jmespath-0.7.0/jmespath.egg-info/pbr.json 2015-04-21 08:34:36.000000000 +0200 @@ -0,0 +1 @@ +{"is_release": true, "git_version": "0466cc1"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/setup.cfg new/jmespath-0.7.0/setup.cfg --- old/jmespath-0.6.1/setup.cfg 2015-02-03 22:19:50.000000000 +0100 +++ new/jmespath-0.7.0/setup.cfg 2015-04-21 08:34:36.000000000 +0200 @@ -1,3 +1,6 @@ +[bdist_wheel] +universal = 1 + [egg_info] tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/setup.py new/jmespath-0.7.0/setup.py --- old/jmespath-0.6.1/setup.py 2015-02-03 22:19:10.000000000 +0100 +++ new/jmespath-0.7.0/setup.py 2015-04-21 08:29:17.000000000 +0200 @@ -25,7 +25,7 @@ setup( name='jmespath', - version='0.6.1', + version='0.7.0', description='JSON Matching Expressions', long_description=io.open('README.rst', encoding='utf-8').read(), author='James Saryerwinnie', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/tests/__init__.py new/jmespath-0.7.0/tests/__init__.py --- old/jmespath-0.6.1/tests/__init__.py 2014-04-23 21:00:09.000000000 +0200 +++ new/jmespath-0.7.0/tests/__init__.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -import sys -from jmespath import ast - - -# The unittest module got a significant overhaul -# in 2.7, so if we're in 2.6 we can use the backported -# version unittest2. -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest - import simplejson as json - from ordereddict import OrderedDict -else: - import unittest - import json - from collections import OrderedDict - - -# Helper method used to create an s-expression -# of the AST to make unit test assertions easier. -# You get a nice string diff on assert failures. -def as_s_expression(node): - parts = [] - _as_s_expression(node, parts) - return ''.join(parts) - - -def _as_s_expression(node, parts): - parts.append("(%s" % (node.__class__.__name__.lower())) - if isinstance(node, ast.Field): - parts.append(" %s" % node.name) - elif isinstance(node, ast.FunctionExpression): - parts.append(" %s" % node.name) - elif isinstance(node, ast.KeyValPair): - parts.append(" %s" % node.key_name) - for child in node.children: - parts.append(" ") - _as_s_expression(child, parts) - parts.append(")") - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/tests/test_compliance.py new/jmespath-0.7.0/tests/test_compliance.py --- old/jmespath-0.6.1/tests/test_compliance.py 2015-01-31 22:18:30.000000000 +0100 +++ new/jmespath-0.7.0/tests/test_compliance.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -import os -from pprint import pformat -from tests import OrderedDict -from tests import json - -from nose.tools import assert_equal - -import jmespath -from jmespath.visitor import TreeInterpreter - - -TEST_DIR = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - 'compliance') -NOT_SPECIFIED = object() -TreeInterpreter.MAP_TYPE = OrderedDict - - -def test_compliance(): - for full_path in _walk_files(): - if full_path.endswith('.json'): - for given, expression, result, error in _load_cases(full_path): - if error is NOT_SPECIFIED and result is not NOT_SPECIFIED: - yield (_test_expression, given, expression, - result, os.path.basename(full_path)) - elif result is NOT_SPECIFIED and error is not NOT_SPECIFIED: - yield (_test_error_expression, given, expression, - error, os.path.basename(full_path)) - else: - parts = (given, expression, result, error) - raise RuntimeError("Invalid test description: %s" % parts) - - -def _walk_files(): - # Check for a shortcut when running the tests interactively. - # If a JMESPATH_TEST is defined, that file is used as the - # only test to run. Useful when doing feature development. - single_file = os.environ.get('JMESPATH_TEST') - if single_file is not None: - yield os.path.abspath(single_file) - else: - for root, dirnames, filenames in os.walk(TEST_DIR): - for filename in filenames: - yield os.path.join(root, filename) - - -def _load_cases(full_path): - all_test_data = json.load(open(full_path), object_pairs_hook=OrderedDict) - for test_data in all_test_data: - given = test_data['given'] - for case in test_data['cases']: - yield (given, case['expression'], - case.get('result', NOT_SPECIFIED), - case.get('error', NOT_SPECIFIED)) - - -def _test_expression(given, expression, expected, filename): - import jmespath.parser - try: - parsed = jmespath.compile(expression) - except ValueError as e: - raise AssertionError( - 'jmespath expression failed to compile: "%s", error: %s"' % - (expression, e)) - actual = parsed.search(given) - expected_repr = json.dumps(expected, indent=4) - actual_repr = json.dumps(actual, indent=4) - error_msg = ("\n\n (%s) The expression '%s' was suppose to give:\n%s\n" - "Instead it matched:\n%s\nparsed as:\n%s\ngiven:\n%s" % ( - filename, expression, expected_repr, - actual_repr, parsed, - json.dumps(given, indent=4))) - error_msg = error_msg.replace(r'\n', '\n') - assert_equal(actual, expected, error_msg) - - -def _test_error_expression(given, expression, error, filename): - import jmespath.parser - if error not in ('syntax', 'invalid-type', - 'unknown-function', 'invalid-arity', 'invalid-value'): - raise RuntimeError("Unknown error type '%s'" % error) - try: - parsed = jmespath.compile(expression) - parsed.search(given) - except ValueError as e: - # Test passes, it raised a parse error as expected. - pass - else: - error_msg = ("\n\n (%s) The expression '%s' was suppose to be a " - "syntax error, but it successfully parsed as:\n\n%s" % ( - filename, expression, parsed)) - error_msg = error_msg.replace(r'\n', '\n') - raise AssertionError(error_msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jmespath-0.6.1/tests/test_parser.py new/jmespath-0.7.0/tests/test_parser.py --- old/jmespath-0.6.1/tests/test_parser.py 2015-01-31 22:18:30.000000000 +0100 +++ new/jmespath-0.7.0/tests/test_parser.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,345 +0,0 @@ -#!/usr/bin/env python - -import re -from tests import unittest - -from jmespath import parser -from jmespath import ast -from jmespath import exceptions - - -class TestParser(unittest.TestCase): - def setUp(self): - self.parser = parser.Parser() - - def assert_parsed_ast(self, expression, expected_ast): - parsed = self.parser.parse(expression) - self.assertEqual(parsed.parsed, expected_ast) - - def test_parse_empty_string_raises_exception(self): - with self.assertRaises(exceptions.EmptyExpressionError): - self.parser.parse('') - - def test_field(self): - self.assert_parsed_ast('foo', ast.field('foo')) - - def test_dot_syntax(self): - self.assert_parsed_ast('foo.bar', - ast.subexpression([ast.field('foo'), - ast.field('bar')])) - - def test_multiple_dots(self): - parsed = self.parser.parse('foo.bar.baz') - self.assertEqual( - parsed.search({'foo': {'bar': {'baz': 'correct'}}}), 'correct') - - def test_index(self): - parsed = self.parser.parse('foo[1]') - self.assertEqual( - parsed.search({'foo': ['zero', 'one', 'two']}), - 'one') - - def test_quoted_subexpression(self): - self.assert_parsed_ast('"foo"."bar"', - ast.subexpression([ - ast.field('foo'), - ast.field('bar')])) - - def test_wildcard(self): - parsed = self.parser.parse('foo[*]') - self.assertEqual( - parsed.search({'foo': ['zero', 'one', 'two']}), - ['zero', 'one', 'two']) - - def test_wildcard_with_children(self): - parsed = self.parser.parse('foo[*].bar') - self.assertEqual( - parsed.search({'foo': [{'bar': 'one'}, {'bar': 'two'}]}), - ['one', 'two']) - - def test_or_expression(self): - parsed = self.parser.parse('foo || bar') - self.assertEqual(parsed.search({'foo': 'foo'}), 'foo') - self.assertEqual(parsed.search({'bar': 'bar'}), 'bar') - self.assertEqual(parsed.search({'foo': 'foo', 'bar': 'bar'}), 'foo') - self.assertEqual(parsed.search({'bad': 'bad'}), None) - - def test_complex_or_expression(self): - parsed = self.parser.parse('foo.foo || foo.bar') - self.assertEqual(parsed.search({'foo': {'foo': 'foo'}}), 'foo') - self.assertEqual(parsed.search({'foo': {'bar': 'bar'}}), 'bar') - self.assertEqual(parsed.search({'foo': {'baz': 'baz'}}), None) - - def test_or_repr(self): - self.assert_parsed_ast('foo || bar', ast.or_expression(ast.field('foo'), - ast.field('bar'))) - - def test_unicode_literals_escaped(self): - self.assert_parsed_ast(r'`"\u2713"`', ast.literal(u'\u2713')) - - def test_multiselect(self): - parsed = self.parser.parse('foo.{bar: bar,baz: baz}') - self.assertEqual( - parsed.search({'foo': {'bar': 'bar', 'baz': 'baz', 'qux': 'qux'}}), - {'bar': 'bar', 'baz': 'baz'}) - - def test_multiselect_subexpressions(self): - parsed = self.parser.parse('foo.{"bar.baz": bar.baz, qux: qux}') - self.assertEqual( - parsed.search({'foo': {'bar': {'baz': 'CORRECT'}, 'qux': 'qux'}}), - {'bar.baz': 'CORRECT', 'qux': 'qux'}) - - def test_multiselect_with_all_quoted_keys(self): - parsed = self.parser.parse('foo.{"bar": bar.baz, "qux": qux}') - result = parsed.search({'foo': {'bar': {'baz': 'CORRECT'}, 'qux': 'qux'}}) - self.assertEqual(result, {"bar": "CORRECT", "qux": "qux"}) - - -class TestErrorMessages(unittest.TestCase): - - def setUp(self): - self.parser = parser.Parser() - - def assert_error_message(self, expression, error_message, - exception=exceptions.ParseError): - try: - self.parser.parse(expression) - except exception as e: - self.assertEqual(error_message, str(e)) - return - except Exception as e: - self.fail( - "Unexpected error raised (%s: %s) for bad expression: %s" % - (e.__class__.__name__, e, expression)) - else: - self.fail( - "ParseError not raised for bad expression: %s" % expression) - - def test_bad_parse(self): - with self.assertRaises(exceptions.ParseError): - self.parser.parse('foo]baz') - - def test_bad_parse_error_message(self): - error_message = ( - 'Unexpected token: ]: Parse error at column 3 ' - 'near token "]" (RBRACKET) for expression:\n' - '"foo]baz"\n' - ' ^') - self.assert_error_message('foo]baz', error_message) - - def test_bad_parse_error_message_with_multiselect(self): - error_message = ( - 'Invalid jmespath expression: Incomplete expression:\n' - '"foo.{bar: baz,bar: bar"\n' - ' ^') - self.assert_error_message('foo.{bar: baz,bar: bar', error_message) - - def test_bad_lexer_values(self): - error_message = ( - 'Bad jmespath expression: ' - 'Starting quote is missing the ending quote:\n' - 'foo."bar\n' - ' ^') - self.assert_error_message('foo."bar', error_message, - exception=exceptions.LexerError) - - def test_bad_lexer_literal_value_with_json_object(self): - error_message = ('Bad jmespath expression: ' - 'Bad token `{{}`:\n`{{}`\n^') - self.assert_error_message('`{{}`', error_message, - exception=exceptions.LexerError) - - def test_bad_unicode_string(self): - # This error message is straight from the JSON parser - # and pypy has a slightly different error message, - # so we're not using assert_error_message. - error_message = re.compile( - r'Bad jmespath expression: ' - r'Invalid \\uXXXX escape.*\\uAZ12', re.DOTALL) - with self.assertRaisesRegexp(exceptions.LexerError, error_message): - self.parser.parse(r'"\uAZ12"') - - -class TestParserWildcards(unittest.TestCase): - def setUp(self): - self.parser = parser.Parser() - self.data = { - 'foo': [ - {'bar': [{'baz': 'one'}, {'baz': 'two'}]}, - {'bar': [{'baz': 'three'}, {'baz': 'four'}, {'baz': 'five'}]}, - ] - } - - def test_multiple_index_wildcards(self): - parsed = self.parser.parse('foo[*].bar[*].baz') - self.assertEqual(parsed.search(self.data), - [['one', 'two'], ['three', 'four', 'five']]) - - def test_wildcard_mix_with_indices(self): - parsed = self.parser.parse('foo[*].bar[0].baz') - self.assertEqual(parsed.search(self.data), - ['one', 'three']) - - def test_wildcard_mix_last(self): - parsed = self.parser.parse('foo[0].bar[*].baz') - self.assertEqual(parsed.search(self.data), - ['one', 'two']) - - def test_indices_out_of_bounds(self): - parsed = self.parser.parse('foo[*].bar[2].baz') - self.assertEqual(parsed.search(self.data), - ['five']) - - def test_root_indices(self): - parsed = self.parser.parse('[0]') - self.assertEqual(parsed.search(['one', 'two']), 'one') - - def test_root_wildcard(self): - parsed = self.parser.parse('*.foo') - data = {'top1': {'foo': 'bar'}, 'top2': {'foo': 'baz'}, - 'top3': {'notfoo': 'notfoo'}} - # Sorted is being used because the order of the keys are not - # required to be in any specific order. - self.assertEqual(sorted(parsed.search(data)), sorted(['bar', 'baz'])) - self.assertEqual(sorted(self.parser.parse('*.notfoo').search(data)), - sorted(['notfoo'])) - - def test_only_wildcard(self): - parsed = self.parser.parse('*') - data = {'foo': 'a', 'bar': 'b', 'baz': 'c'} - self.assertEqual(sorted(parsed.search(data)), sorted(['a', 'b', 'c'])) - - def test_escape_sequences(self): - self.assertEqual(self.parser.parse(r'"foo\tbar"').search( - {'foo\tbar': 'baz'}), 'baz') - self.assertEqual(self.parser.parse(r'"foo\nbar"').search( - {'foo\nbar': 'baz'}), 'baz') - self.assertEqual(self.parser.parse(r'"foo\bbar"').search( - {'foo\bbar': 'baz'}), 'baz') - self.assertEqual(self.parser.parse(r'"foo\fbar"').search( - {'foo\fbar': 'baz'}), 'baz') - self.assertEqual(self.parser.parse(r'"foo\rbar"').search( - {'foo\rbar': 'baz'}), 'baz') - - def test_consecutive_escape_sequences(self): - parsed = self.parser.parse(r'"foo\\nbar"') - self.assertEqual(parsed.search({'foo\\nbar': 'baz'}), 'baz') - - parsed = self.parser.parse(r'"foo\n\t\rbar"') - self.assertEqual(parsed.search({'foo\n\t\rbar': 'baz'}), 'baz') - - def test_escape_sequence_at_end_of_string_not_allowed(self): - with self.assertRaises(ValueError): - self.parser.parse('foobar\\') - - def test_wildcard_with_multiselect(self): - parsed = self.parser.parse('foo.*.{a: a, b: b}') - data = { - 'foo': { - 'one': { - 'a': {'c': 'CORRECT', 'd': 'other'}, - 'b': {'c': 'ALSOCORRECT', 'd': 'other'}, - }, - 'two': { - 'a': {'c': 'CORRECT', 'd': 'other'}, - 'c': {'c': 'WRONG', 'd': 'other'}, - }, - } - } - match = parsed.search(data) - self.assertEqual(len(match), 2) - self.assertIn('a', match[0]) - self.assertIn('b', match[0]) - self.assertIn('a', match[1]) - self.assertIn('b', match[1]) - - -class TestMergedLists(unittest.TestCase): - def setUp(self): - self.parser = parser.Parser() - self.data = { - "foo": [ - [["one", "two"], ["three", "four"]], - [["five", "six"], ["seven", "eight"]], - [["nine"], ["ten"]] - ] - } - - def test_merge_with_indices(self): - parsed = self.parser.parse('foo[][0]') - match = parsed.search(self.data) - self.assertEqual(match, ["one", "three", "five", "seven", - "nine", "ten"]) - - def test_trailing_merged_operator(self): - parsed = self.parser.parse('foo[]') - match = parsed.search(self.data) - self.assertEqual( - match, - [["one", "two"], ["three", "four"], - ["five", "six"], ["seven", "eight"], - ["nine"], ["ten"]]) - - -class TestParserCaching(unittest.TestCase): - def test_compile_lots_of_expressions(self): - # We have to be careful here because this is an implementation detail - # that should be abstracted from the user, but we need to make sure we - # exercise the code and that it doesn't blow up. - p = parser.Parser() - compiled = [] - compiled2 = [] - for i in range(parser.Parser._MAX_SIZE + 1): - compiled.append(p.parse('foo%s' % i)) - # Rerun the test and half of these entries should be from the - # cache but they should still be equal to compiled. - for i in range(parser.Parser._MAX_SIZE + 1): - compiled2.append(p.parse('foo%s' % i)) - self.assertEqual(len(compiled), len(compiled2)) - self.assertEqual( - [expr.parsed for expr in compiled], - [expr.parsed for expr in compiled2]) - - def test_cache_purge(self): - p = parser.Parser() - first = p.parse('foo') - cached = p.parse('foo') - p.purge() - second = p.parse('foo') - self.assertEqual(first.parsed, - second.parsed) - self.assertEqual(first.parsed, - cached.parsed) - - -class TestParserAddsExpressionAttribute(unittest.TestCase): - def test_expression_available_from_parser(self): - p = parser.Parser() - parsed = p.parse('foo.bar') - self.assertEqual(parsed.expression, 'foo.bar') - - -class TestRenderGraphvizFile(unittest.TestCase): - def test_dot_file_rendered(self): - p = parser.Parser() - result = p.parse('foo') - dot_contents = result._render_dot_file() - self.assertEqual(dot_contents, - 'digraph AST {\nfield1 [label="field(foo)"]\n}') - - def test_dot_file_subexpr(self): - p = parser.Parser() - result = p.parse('foo.bar') - dot_contents = result._render_dot_file() - self.assertEqual( - dot_contents, - 'digraph AST {\n' - 'subexpression1 [label="subexpression()"]\n' - ' subexpression1 -> field2\n' - 'field2 [label="field(foo)"]\n' - ' subexpression1 -> field3\n' - 'field3 [label="field(bar)"]\n}') - - -if __name__ == '__main__': - unittest.main()

1 0

← Newer
1
2
3
4
5
6
7
...
40
Older →

Jump to page: