Hello community, here is the log from the commit of package aisleriot for openSUSE:Factory checked in at 2015-05-18 21:25:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aisleriot (Old) and /work/SRC/openSUSE:Factory/.aisleriot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aisleriot" Changes: -------- --- /work/SRC/openSUSE:Factory/aisleriot/aisleriot.changes 2015-04-23 08:02:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aisleriot.new/aisleriot.changes 2015-05-18 21:25:57.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 11 12:39:09 UTC 2015 - [email protected] + +- Update to version 3.16.2: + + icon: provide a symbolic variant of the app icon (bgo#747007). + + Updated translations. +- Remove HighContrast %icon_theme_cache_post(un) calls, as Symbolic + icons have replaced them. + +------------------------------------------------------------------- Old: ---- aisleriot-3.16.1.tar.xz New: ---- aisleriot-3.16.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aisleriot.spec ++++++ --- /var/tmp/diff_new_pack.roQpKC/_old 2015-05-18 21:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.roQpKC/_new 2015-05-18 21:25:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: aisleriot -Version: 3.16.1 +Version: 3.16.2 Release: 0 Summary: Solitaire Card Games for GNOME License: GPL-3.0+ @@ -85,7 +85,6 @@ %glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post -%icon_theme_cache_post HighContrast %posttrans -f aisleriot.schemas_posttrans @@ -95,7 +94,6 @@ %glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun -%icon_theme_cache_postun HighContrast %files -f aisleriot.schemas_list %defattr(-, root, root) @@ -121,9 +119,8 @@ %endif %{_libexecdir}/aisleriot/ar-cards-renderer %{_datadir}/glib-2.0/schemas/org.gnome.Patience.WindowState.gschema.xml -%{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.* +%{_datadir}/icons/hicolor/*/apps/gnome-aisleriot* %{_datadir}/icons/hicolor/*/apps/gnome-freecell.* -%{_datadir}/icons/HighContrast/ %{_mandir}/man?/sol.* # Kind of ugly to own the valgrind directory, but the other solutions (a dep on # valgrind, a subpackage, etc.) are not worth it ++++++ aisleriot-3.16.1.tar.xz -> aisleriot-3.16.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/ChangeLog new/aisleriot-3.16.2/ChangeLog --- old/aisleriot-3.16.1/ChangeLog 2015-04-13 19:56:19.000000000 +0200 +++ new/aisleriot-3.16.2/ChangeLog 2015-05-10 19:53:37.000000000 +0200 @@ -1,3 +1,39 @@ +commit 9f72fe69b393edc6ae482af562811625aa6dd2ed +Author: Jakub Steiner <[email protected]> +Date: Mon Mar 30 12:50:01 2015 +0200 + + icon: provide a symbolic variant of the app icon + + - used for the High Contrast accessible theme since 3.16 + + The symbolic size has been introduced to hicolor to cope with + the nominal size of 16x16 rather than the backward compatible + 128x128. + + https://bugzilla.gnome.org/show_bug.cgi?id=747007 + + data/icons/Makefile.am | 4 ++-- + ...sleriot.svg => hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg} | 0 + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 78abeac5329c0a719a22884962d8bfe2fd3586db +Author: Yuri Myasoedov <[email protected]> +Date: Sun Apr 26 09:31:51 2015 +0300 + + Updated Russian translation + + po/ru.po | 213 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 109 insertions(+), 104 deletions(-) + +commit dba9705a8975db167aa1ea4191d521be46f50595 +Author: Christian Persch <[email protected]> +Date: Mon Apr 13 19:58:08 2015 +0200 + + Post release version bump + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit ad7d33fa45d0ef7619afbd3bb4ac0972e9503170 Author: Sveinn í Felli <[email protected]> Date: Fri Mar 27 09:03:05 2015 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/configure new/aisleriot-3.16.2/configure --- old/aisleriot-3.16.1/configure 2015-04-13 19:50:29.000000000 +0200 +++ new/aisleriot-3.16.2/configure 2015-05-10 19:48:59.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Patience 3.16.1. +# Generated by GNU Autoconf 2.69 for GNOME Patience 3.16.2. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=aisleriot>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Patience' PACKAGE_TARNAME='aisleriot' -PACKAGE_VERSION='3.16.1' -PACKAGE_STRING='GNOME Patience 3.16.1' +PACKAGE_VERSION='3.16.2' +PACKAGE_STRING='GNOME Patience 3.16.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=aisleriot' PACKAGE_URL='' @@ -1468,7 +1468,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Patience 3.16.1 to adapt to many kinds of systems. +\`configure' configures GNOME Patience 3.16.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1538,7 +1538,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Patience 3.16.1:";; + short | recursive ) echo "Configuration of GNOME Patience 3.16.2:";; esac cat <<\_ACEOF @@ -1707,7 +1707,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Patience configure 3.16.1 +GNOME Patience configure 3.16.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2197,7 +2197,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Patience $as_me 3.16.1, which was +It was created by GNOME Patience $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3071,7 +3071,7 @@ # Define the identity of the package. PACKAGE='aisleriot' - VERSION='3.16.1' + VERSION='3.16.2' cat >>confdefs.h <<_ACEOF @@ -19431,7 +19431,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Patience $as_me 3.16.1, which was +This file was extended by GNOME Patience $as_me 3.16.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19497,7 +19497,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Patience config.status 3.16.1 +GNOME Patience config.status 3.16.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/configure.ac new/aisleriot-3.16.2/configure.ac --- old/aisleriot-3.16.1/configure.ac 2015-03-23 19:18:11.000000000 +0100 +++ new/aisleriot-3.16.2/configure.ac 2015-04-13 19:58:06.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.53]) -AC_INIT([GNOME Patience], [3.16.1], +AC_INIT([GNOME Patience], [3.16.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=aisleriot], [aisleriot]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/data/icons/HighContrast_apps_scalable_gnome-aisleriot.svg new/aisleriot-3.16.2/data/icons/HighContrast_apps_scalable_gnome-aisleriot.svg --- old/aisleriot-3.16.1/data/icons/HighContrast_apps_scalable_gnome-aisleriot.svg 2014-08-12 12:42:55.000000000 +0200 +++ new/aisleriot-3.16.2/data/icons/HighContrast_apps_scalable_gnome-aisleriot.svg 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' standalone='no'?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='aisleriot-symbolic.svg' height='16.0049' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.2 r9819' version='1.1' width='16.000645' xmlns='http://www.w3.org/2000/svg'> - <metadata id='metadata90'> - <rdf:RDF> - <cc:Work rdf:about=''> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> - <dc:title>Gnome Symbolic Icon Theme</dc:title> - </cc:Work> - </rdf:RDF> - </metadata> - <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='49.76717' inkscape:cy='4.5759751' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='false' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1381' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='1600' inkscape:window-y='27' inkscape:zoom='16'> - <inkscape:grid empspacing='2' enabled='true' id='grid4866' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/> - </sodipodi:namedview> - <title id='title9167'>Gnome Symbolic Icon Theme</title> - <defs id='defs7386'/> - <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-83.00009,-214.99988)'> - <g id='g19133' transform='matrix(1.0000141,0,0,0.9993613,-140.00326,40.121879)'> - <path inkscape:connector-curvature='0' d='m -6,-36 1,0 0,1 -1,0 z' id='rect19046' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-35 1,0 0,1 -1,0 z' id='rect19048-0' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -5,-35 1,0 0,1 -1,0 z' id='rect19050' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -6,-34 1,0 0,1 -1,0 z' id='rect19052' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-33 1,0 0,1 -1,0 z' id='rect19054' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -5,-33 1,0 0,0.152344 L -4.3554688,-32 -5,-32 z' id='rect19056' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -4,-36 1,0 0,0.730469 L -3.1054688,-35 -4,-35 z' id='rect19058' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -6,-32 1,0 0,1 -1,0 z' id='rect19060' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-31 1,0 0,1 -1,0 z' id='rect19062' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -6,-30 0.8164062,0 L -5.59375,-29 -6,-29 z' id='rect19064' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-29 1,0 0,0.960937 L -6.0117188,-28 -7,-28 z' id='rect19066' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -5,-31 0.234375,0 0,0 L -5,-30.441406 z' id='rect19068' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -4,-34 0.4726562,0 -0.4140625,1 L -4,-33 z' id='rect19070' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -3,-37 0.7211056,0 -0.4203244,1 L -3,-36 z' id='rect19072' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -3,-39 0.5429687,0 c 0.21875,0.192708 0.4296875,0.572917 0.4492188,1 L -3,-38 z' id='rect19074' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -4,-39.738281 1,0.417969 0,0.320312 -1,0 z' id='rect19076' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-41 1,0.421875 0,0.578125 -1,0 z' id='rect19078' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-27 c 0.1875,0 0.3867188,0 0.5742188,0 -0.1460316,0.371994 -0.4512679,0.649553 -0.5820313,0.722656 z' id='rect19082' sodipodi:nodetypes='cccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -6,-40 1,0 0,1 -1,0 z' id='rect19119' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-39 1,0 0,1 -1,0 z' id='rect19121' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -5,-39 1,0 0,1 -1,0 z' id='rect19123' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -6,-38 1,0 0,1 -1,0 z' id='rect19125' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -4,-38 1,0 0,1 -1,0 z' id='rect19127' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -5,-37 1,0 0,1 -1,0 z' id='rect19129' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - <path inkscape:connector-curvature='0' d='m -7,-37 1,0 0,1 -1,0 z' id='rect19131' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> - </g> - - <path inkscape:connector-curvature='0' d='m 84.2501,215.01011 c -0.70756,0.15767 -1.25001,0.86404 -1.25001,1.68642 l 0,12.5857 c 0,0.93986 0.73509,1.71766 1.59377,1.71766 l 7.81261,0 c 0.85868,0 1.59377,-0.7778 1.59377,-1.71766 l 0,-12.5857 c 0,-0.93986 -0.73509,-1.68642 -1.59377,-1.68642 l -7.81261,0 c -0.10736,0 -0.24267,-0.0225 -0.34376,0 z m 1.06252,0.99936 0.37501,0 1.31251,2.99808 -0.59375,0 -0.40626,-0.99936 -1.00001,0 -0.37501,0.99936 -0.62501,0 1.31252,-2.99808 z m 0.1875,0.6246 -0.40625,0.99936 0.81251,0 -0.40626,-0.99936 z m 1.25002,3.37284 c 0.96654,0 1.75002,0.74236 1.75002,1.68643 0,-0.94407 0.78349,-1.68643 1.75003,-1.68643 0.96652,0 1.75002,0.74236 1.75002,1.68643 0,0.44866 -0.17924,0.88178 -0.46875,1.18674 -0.0152,0.0158 -0.0156,0.016 -0.0312,0.0312 l -3.00005,3.09177 -2.84379,-2.99808 c -0.1211,-0.0977 -0.19074,-0.21786 -0.28125,-0.34353 -0.20026,-0.27797 -0.375,-0.60242 -0.375,-0.96813 0,-0.94408 0.7835,-1.68643 1.75002,-1.68643 z m 3.25005,6.99553 0.625,0 0.37501,0.99936 1.00001,0 0.40626,-0.99936 0.59376,0 -1.31252,2.99809 -0.37501,0 -1.31251,-2.99809 z m 1.09376,1.37412 0.40626,0.99937 0.40625,-0.99937 -0.81251,0 z' id='path18996' style='fill:#bebebe;fill-opacity:1;stroke:none'/> - <path inkscape:connector-curvature='0' d='m 96.00027,217.00883 0.37501,0 -0.37501,-0.15615 -2.59379,-1.09305 0.12501,14.2409 -1.01564,0.95251 c 0.9395,0.15886 1.7235,-0.14618 2.0469,-0.92128 l 4.31256,-10.39961 c 0.3234,-0.7751 -0.0449,-1.62126 -0.78126,-1.90503 l -1.71877,-0.71829 m -0.37501,0 0,-0.15615' id='path19008' sodipodi:nodetypes='cccccccccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none;display:inline'/> - <path inkscape:connector-curvature='0' d='m 94.00024,230.00053 c 0,0 0.004,-0.12102 0,-1.00717 0,0.6664 -0.0502,0.76696 -0.15625,1.00717 z' id='path19306' sodipodi:nodetypes='cccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none'/> - <path inkscape:connector-curvature='0' d='m 93.28125,215.40625 0,0.53125 0.03125,13.6875 -1.0625,0.71875 -0.90625,0.59375 1.0625,0.0625 c 0,0 0.238813,0.0108 0.53125,0 0.292437,-0.0108 0.646942,-0.0477 0.9375,-0.15625 0.47406,-0.17704 0.899256,-0.50086 1.09375,-1 L 98.875,219.8125 c 0.348575,-0.89466 -0.05472,-1.88261 -0.875,-2.25 -0.0072,-0.003 0.0073,-0.0281 0,-0.0312 l -0.03125,0 -1.53125,-0.6875 -0.34375,-0.15625 -2.34375,-1.0625 -0.46875,-0.21875 z m 0.6875,1.0625 1.84375,0.84375 0.34375,0.15625 1.53125,0.6875 0.03125,0 c 0.477715,0.19713 0.72851,0.81975 0.5,1.40625 l -3.875,10.03125 C 94.297479,229.7125 94.114712,229.77373 94,229.875 l 0,-0.0312 -0.03125,-13.375 z' id='path19308' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.69098449;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/> - </g> -</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/data/icons/Makefile.am new/aisleriot-3.16.2/data/icons/Makefile.am --- old/aisleriot-3.16.1/data/icons/Makefile.am 2014-08-12 12:42:55.000000000 +0200 +++ new/aisleriot-3.16.2/data/icons/Makefile.am 2015-05-10 19:48:03.000000000 +0200 @@ -1,6 +1,6 @@ NULL = -public_icons_themes = hicolor HighContrast +public_icons_themes = hicolor dist_noinst_DATA = \ hicolor_apps_16x16_gnome-aisleriot.png \ @@ -15,7 +15,7 @@ hicolor_apps_32x32_gnome-freecell.png \ hicolor_apps_48x48_gnome-freecell.png \ hicolor_apps_256x256_gnome-freecell.png \ - HighContrast_apps_scalable_gnome-aisleriot.svg \ + hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg \ $(NULL) private_icons = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/data/icons/Makefile.in new/aisleriot-3.16.2/data/icons/Makefile.in --- old/aisleriot-3.16.1/data/icons/Makefile.in 2015-04-13 19:50:26.000000000 +0200 +++ new/aisleriot-3.16.2/data/icons/Makefile.in 2015-05-10 19:48:57.000000000 +0200 @@ -296,7 +296,7 @@ top_srcdir = @top_srcdir@ valgrinddir = @valgrinddir@ NULL = -public_icons_themes = hicolor HighContrast +public_icons_themes = hicolor dist_noinst_DATA = \ hicolor_apps_16x16_gnome-aisleriot.png \ hicolor_apps_22x22_gnome-aisleriot.png \ @@ -310,7 +310,7 @@ hicolor_apps_32x32_gnome-freecell.png \ hicolor_apps_48x48_gnome-freecell.png \ hicolor_apps_256x256_gnome-freecell.png \ - HighContrast_apps_scalable_gnome-aisleriot.svg \ + hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg \ $(NULL) private_icons = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/data/icons/hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg new/aisleriot-3.16.2/data/icons/hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg --- old/aisleriot-3.16.1/data/icons/hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/aisleriot-3.16.2/data/icons/hicolor_apps_symbolic_gnome-aisleriot-symbolic.svg 2015-05-10 19:48:03.000000000 +0200 @@ -0,0 +1,53 @@ +<?xml version='1.0' encoding='UTF-8' standalone='no'?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='aisleriot-symbolic.svg' height='16.0049' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' inkscape:version='0.48.2 r9819' version='1.1' width='16.000645' xmlns='http://www.w3.org/2000/svg'> + <metadata id='metadata90'> + <rdf:RDF> + <cc:Work rdf:about=''> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/> + <dc:title>Gnome Symbolic Icon Theme</dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='49.76717' inkscape:cy='4.5759751' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='false' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' inkscape:window-height='1381' inkscape:window-maximized='1' inkscape:window-width='2560' inkscape:window-x='1600' inkscape:window-y='27' inkscape:zoom='16'> + <inkscape:grid empspacing='2' enabled='true' id='grid4866' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/> + </sodipodi:namedview> + <title id='title9167'>Gnome Symbolic Icon Theme</title> + <defs id='defs7386'/> + <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' transform='translate(-83.00009,-214.99988)'> + <g id='g19133' transform='matrix(1.0000141,0,0,0.9993613,-140.00326,40.121879)'> + <path inkscape:connector-curvature='0' d='m -6,-36 1,0 0,1 -1,0 z' id='rect19046' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-35 1,0 0,1 -1,0 z' id='rect19048-0' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -5,-35 1,0 0,1 -1,0 z' id='rect19050' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -6,-34 1,0 0,1 -1,0 z' id='rect19052' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-33 1,0 0,1 -1,0 z' id='rect19054' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -5,-33 1,0 0,0.152344 L -4.3554688,-32 -5,-32 z' id='rect19056' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -4,-36 1,0 0,0.730469 L -3.1054688,-35 -4,-35 z' id='rect19058' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -6,-32 1,0 0,1 -1,0 z' id='rect19060' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-31 1,0 0,1 -1,0 z' id='rect19062' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -6,-30 0.8164062,0 L -5.59375,-29 -6,-29 z' id='rect19064' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-29 1,0 0,0.960937 L -6.0117188,-28 -7,-28 z' id='rect19066' sodipodi:nodetypes='cccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -5,-31 0.234375,0 0,0 L -5,-30.441406 z' id='rect19068' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -4,-34 0.4726562,0 -0.4140625,1 L -4,-33 z' id='rect19070' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -3,-37 0.7211056,0 -0.4203244,1 L -3,-36 z' id='rect19072' sodipodi:nodetypes='ccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -3,-39 0.5429687,0 c 0.21875,0.192708 0.4296875,0.572917 0.4492188,1 L -3,-38 z' id='rect19074' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -4,-39.738281 1,0.417969 0,0.320312 -1,0 z' id='rect19076' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-41 1,0.421875 0,0.578125 -1,0 z' id='rect19078' sodipodi:nodetypes='ccccc' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-27 c 0.1875,0 0.3867188,0 0.5742188,0 -0.1460316,0.371994 -0.4512679,0.649553 -0.5820313,0.722656 z' id='rect19082' sodipodi:nodetypes='cccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -6,-40 1,0 0,1 -1,0 z' id='rect19119' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-39 1,0 0,1 -1,0 z' id='rect19121' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -5,-39 1,0 0,1 -1,0 z' id='rect19123' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -6,-38 1,0 0,1 -1,0 z' id='rect19125' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -4,-38 1,0 0,1 -1,0 z' id='rect19127' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -5,-37 1,0 0,1 -1,0 z' id='rect19129' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + <path inkscape:connector-curvature='0' d='m -7,-37 1,0 0,1 -1,0 z' id='rect19131' style='fill:#bebebe;fill-opacity:1;stroke:none' transform='translate(241.0002,217)'/> + </g> + + <path inkscape:connector-curvature='0' d='m 84.2501,215.01011 c -0.70756,0.15767 -1.25001,0.86404 -1.25001,1.68642 l 0,12.5857 c 0,0.93986 0.73509,1.71766 1.59377,1.71766 l 7.81261,0 c 0.85868,0 1.59377,-0.7778 1.59377,-1.71766 l 0,-12.5857 c 0,-0.93986 -0.73509,-1.68642 -1.59377,-1.68642 l -7.81261,0 c -0.10736,0 -0.24267,-0.0225 -0.34376,0 z m 1.06252,0.99936 0.37501,0 1.31251,2.99808 -0.59375,0 -0.40626,-0.99936 -1.00001,0 -0.37501,0.99936 -0.62501,0 1.31252,-2.99808 z m 0.1875,0.6246 -0.40625,0.99936 0.81251,0 -0.40626,-0.99936 z m 1.25002,3.37284 c 0.96654,0 1.75002,0.74236 1.75002,1.68643 0,-0.94407 0.78349,-1.68643 1.75003,-1.68643 0.96652,0 1.75002,0.74236 1.75002,1.68643 0,0.44866 -0.17924,0.88178 -0.46875,1.18674 -0.0152,0.0158 -0.0156,0.016 -0.0312,0.0312 l -3.00005,3.09177 -2.84379,-2.99808 c -0.1211,-0.0977 -0.19074,-0.21786 -0.28125,-0.34353 -0.20026,-0.27797 -0.375,-0.60242 -0.375,-0.96813 0,-0.94408 0.7835,-1.68643 1.75002,-1.68643 z m 3.25005,6.99553 0.625,0 0.37501,0.99936 1.00001,0 0.40626,-0.99936 0.59376,0 -1.31252,2.99809 -0.37501,0 -1.31251,-2.99809 z m 1.09376,1.37412 0.40626,0.99937 0.40625,-0.99937 -0.81251,0 z' id='path18996' style='fill:#bebebe;fill-opacity:1;stroke:none'/> + <path inkscape:connector-curvature='0' d='m 96.00027,217.00883 0.37501,0 -0.37501,-0.15615 -2.59379,-1.09305 0.12501,14.2409 -1.01564,0.95251 c 0.9395,0.15886 1.7235,-0.14618 2.0469,-0.92128 l 4.31256,-10.39961 c 0.3234,-0.7751 -0.0449,-1.62126 -0.78126,-1.90503 l -1.71877,-0.71829 m -0.37501,0 0,-0.15615' id='path19008' sodipodi:nodetypes='cccccccccccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none;display:inline'/> + <path inkscape:connector-curvature='0' d='m 94.00024,230.00053 c 0,0 0.004,-0.12102 0,-1.00717 0,0.6664 -0.0502,0.76696 -0.15625,1.00717 z' id='path19306' sodipodi:nodetypes='cccc' style='fill:#bdbdbd;fill-opacity:0.36470588;stroke:none'/> + <path inkscape:connector-curvature='0' d='m 93.28125,215.40625 0,0.53125 0.03125,13.6875 -1.0625,0.71875 -0.90625,0.59375 1.0625,0.0625 c 0,0 0.238813,0.0108 0.53125,0 0.292437,-0.0108 0.646942,-0.0477 0.9375,-0.15625 0.47406,-0.17704 0.899256,-0.50086 1.09375,-1 L 98.875,219.8125 c 0.348575,-0.89466 -0.05472,-1.88261 -0.875,-2.25 -0.0072,-0.003 0.0073,-0.0281 0,-0.0312 l -0.03125,0 -1.53125,-0.6875 -0.34375,-0.15625 -2.34375,-1.0625 -0.46875,-0.21875 z m 0.6875,1.0625 1.84375,0.84375 0.34375,0.15625 1.53125,0.6875 0.03125,0 c 0.477715,0.19713 0.72851,0.81975 0.5,1.40625 l -3.875,10.03125 C 94.297479,229.7125 94.114712,229.77373 94,229.875 l 0,-0.0312 -0.03125,-13.375 z' id='path19308' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.69098449;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans'/> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aisleriot-3.16.1/po/ru.po new/aisleriot-3.16.2/po/ru.po --- old/aisleriot-3.16.1/po/ru.po 2015-03-16 18:57:15.000000000 +0100 +++ new/aisleriot-3.16.2/po/ru.po 2015-05-10 19:48:03.000000000 +0200 @@ -12,27 +12,26 @@ # Dmitry Dzhus <[email protected]>, 2008. # Andrew Grigorev <[email protected]>, 2009. # Yuri Kozlov <[email protected]>, 2010, 2012. -# Yuri Myasoedov <[email protected]>, 2012-2014. +# Yuri Myasoedov <[email protected]>, 2012-2014, 2015. # msgid "" msgstr "" "Project-Id-Version: gnome-games trunk\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"; "product=aisleriot&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-09-09 02:31+0000\n" -"PO-Revision-Date: 2014-09-09 12:45+0300\n" -"Last-Translator: Yuri Myasoedov <[email protected]>\n" +"POT-Creation-Date: 2015-04-26 02:29+0000\n" +"PO-Revision-Date: 2015-04-26 09:03+0300\n" +"Last-Translator: Yuri Myasoedov <[email protected]>\n" "Language-Team: русский <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.5.4\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/sol.appdata.xml.in.h:1 -#| msgid "AisleRiot Solitaire" msgid "Aisleriot Solitaire" msgstr "Пасьянс Айслериот" @@ -72,19 +71,19 @@ #: ../src/aisleriot.schemas.in.h:4 msgid "Whether or not to show the status bar" -msgstr "Показывать ли строку состояния" +msgstr "Показывать ли панель состояния" #: ../src/aisleriot.schemas.in.h:5 msgid "Select the style of control" -msgstr "Выбор стиля управления" +msgstr "Выбор метод управления" #: ../src/aisleriot.schemas.in.h:6 msgid "" "Select whether to drag the cards or to click on the source then the " "destination." msgstr "" -"Нужно ли перетаскивать карты мышью или указывать место, откуда карта берётся " -"и куда кладётся." +"Выберите способ переноса карт: перетаскивание карт с помощью мыши или " +"указание мест, откуда берутся и куда кладутся карты." #: ../src/aisleriot.schemas.in.h:7 msgid "Sound" @@ -140,7 +139,7 @@ msgid "Change Game" msgstr "Изменить игру" -#: ../src/ar-application.c:221 ../src/stats-dialog.c:199 +#: ../src/ar-application.c:221 ../src/stats-dialog.c:206 msgid "Statistics" msgstr "Статистика" @@ -154,14 +153,14 @@ #: ../src/ar-application.c:227 msgid "About" -msgstr "О программе" +msgstr "О приложении" #: ../src/ar-application.c:228 msgid "Quit" msgstr "Закончить" #. Now construct the window contents -#: ../src/ar-game-chooser.c:312 ../src/window.c:2109 +#: ../src/ar-game-chooser.c:312 ../src/window.c:1989 msgid "Select Game" msgstr "Выбор игры" @@ -258,86 +257,101 @@ ">." #. Translators: this is the name of a type of card slot -#: ../src/game.c:1437 +#: ../src/game.c:1422 +msgctxt "slot type" +msgid "chooser" +msgstr "" + +#. Translators: this is the name of a type of card slot +#: ../src/game.c:1426 msgctxt "slot type" msgid "foundation" msgstr "основание" #. Translators: this is the name of a type of card slot -#: ../src/game.c:1441 +#: ../src/game.c:1430 msgctxt "slot type" msgid "reserve" msgstr "резерв" #. Translators: this is the name of a type of card slot -#: ../src/game.c:1445 +#: ../src/game.c:1434 msgctxt "slot type" msgid "stock" msgstr "колода" #. Translators: this is the name of a type of card slot -#: ../src/game.c:1449 +#: ../src/game.c:1438 msgctxt "slot type" msgid "tableau" msgstr "игровое поле" #. Translators: this is the name of a type of card slot -#: ../src/game.c:1453 +#: ../src/game.c:1442 msgctxt "slot type" msgid "waste" msgstr "сброс" +#. Translators: %s is the name of the card; "chooser" is the name of a type of card slot +#: ../src/game.c:1474 +#, fuzzy, c-format +#| msgctxt "slot hint" +#| msgid "%s on reserve" +msgctxt "slot hint" +msgid "%s on chooser" +msgstr "%s в резерве" + #. Translators: %s is the name of the card; "foundation" is the name of a type of card slot -#: ../src/game.c:1485 +#: ../src/game.c:1478 #, c-format msgctxt "slot hint" msgid "%s on foundation" msgstr "%s в основании" #. Translators: %s is the name of the card; "reserve" is the name of a type of card slot -#: ../src/game.c:1489 +#: ../src/game.c:1482 #, c-format msgctxt "slot hint" msgid "%s on reserve" msgstr "%s в резерве" #. Translators: %s is the name of the card; "stock" is the name of a type of card slot -#: ../src/game.c:1493 +#: ../src/game.c:1486 #, c-format msgctxt "slot hint" msgid "%s on stock" msgstr "%s в колоде" #. Translators: %s is the name of the card; "tableau" is the name of a type of card slot -#: ../src/game.c:1497 +#: ../src/game.c:1490 #, c-format msgctxt "slot hint" msgid "%s on tableau" msgstr "%s на игровом поле" #. Translators: %s is the name of the card; "waste" is the name of a type of card slot -#: ../src/game.c:1501 +#: ../src/game.c:1494 #, c-format msgctxt "slot hint" msgid "%s on waste" msgstr "%s в сбросе" -#: ../src/game.c:2168 +#: ../src/game.c:2161 msgid "This game does not have hint support yet." -msgstr "В этой игре подсказка не реализована." +msgstr "В этой игре подсказки ещё не реализованы." #. Both %s are card names #. The first %s is a card name, the 2nd %s a sentence fragment. #. * Yes, we know this is bad for i18n. #. -#: ../src/game.c:2203 ../src/game.c:2229 +#: ../src/game.c:2196 ../src/game.c:2222 #, c-format msgid "Move %s onto %s." msgstr "Положить %s на %s." -#: ../src/game.c:2249 +#: ../src/game.c:2242 msgid "This game is unable to provide a hint." -msgstr "В этой игре нельзя реализовать подсказку." +msgstr "В этой игре нельзя получить подсказку." #. This is a generated file; DO NOT EDIT #. Translators: this string is the name of a game of patience. @@ -1494,31 +1508,31 @@ msgstr "Высота окна" #. String reserve -#: ../src/sol.c:51 +#: ../src/sol.c:45 msgid "Solitaire" msgstr "Пасьянс" -#: ../src/sol.c:52 +#: ../src/sol.c:46 msgid "GNOME Solitaire" msgstr "Пасьянс GNOME" -#: ../src/sol.c:53 +#: ../src/sol.c:47 msgid "About Solitaire" msgstr "О пасьянсе" -#: ../src/sol.c:68 +#: ../src/sol.c:62 msgid "Select the game type to play" msgstr "Выберите игру" -#: ../src/sol.c:68 +#: ../src/sol.c:62 msgid "NAME" msgstr "ИМЯ" -#: ../src/sol.c:117 +#: ../src/sol.c:105 msgid "FreeCell Solitaire" msgstr "Пасьянс Свободная ячейка" -#: ../src/sol.c:117 ../src/window.c:416 +#: ../src/sol.c:105 ../src/window.c:397 msgid "AisleRiot" msgstr "Айслериот" @@ -1564,7 +1578,7 @@ #. Translators: Translate this to "%Id" if you want to use localised digits, #. * and to "%d" otherwise. Do not translate it to anything else! #. -#: ../src/stats-dialog.c:213 ../src/stats-dialog.c:219 +#: ../src/stats-dialog.c:220 ../src/stats-dialog.c:226 #, c-format msgid "%d" msgstr "%d" @@ -1576,49 +1590,49 @@ #. * instead, or leave it as "%%". If you chose a character other than #. * "%" (U+0025 PERCENT SIGN) you do NOT need to escape it with another "%"! #. -#: ../src/stats-dialog.c:230 +#: ../src/stats-dialog.c:237 #, c-format msgid "%d%%" msgstr "%d%%" #. For translators: N/A means "Not Applicable", use whatever #. * abbreviation you have for a value that has no meaning. -#: ../src/stats-dialog.c:236 ../src/stats-dialog.c:245 -#: ../src/stats-dialog.c:253 +#: ../src/stats-dialog.c:243 ../src/stats-dialog.c:252 +#: ../src/stats-dialog.c:260 msgid "N/A" msgstr "Н/Д" #. Translators: this represents minutes:seconds. -#: ../src/stats-dialog.c:240 ../src/stats-dialog.c:248 +#: ../src/stats-dialog.c:247 ../src/stats-dialog.c:255 #, c-format msgid "%d:%02d" msgstr "%d:%02d" -#: ../src/window.c:211 +#: ../src/window.c:198 msgid "Congratulations, you have won!" msgstr "Поздравляем, вы выиграли!" -#: ../src/window.c:215 +#: ../src/window.c:202 msgid "There are no more moves" msgstr "Больше нет вариантов ходов" -#: ../src/window.c:366 +#: ../src/window.c:347 msgid "Main game:" msgstr "Основная игра:" -#: ../src/window.c:374 +#: ../src/window.c:355 msgid "Card games:" msgstr "Карточные игры:" -#: ../src/window.c:389 +#: ../src/window.c:370 msgid "Card themes:" msgstr "Стиль карт:" -#: ../src/window.c:418 +#: ../src/window.c:399 msgid "About Aisleriot" msgstr "О программе" -#: ../src/window.c:420 +#: ../src/window.c:401 msgid "" "Aisleriot provides a rule-based solitaire card engine that allows many " "different games to be played." @@ -1626,7 +1640,7 @@ "Айслериот предоставляет карточный движок для пасьянсов, который позволяет " "играть в различные игры." -#: ../src/window.c:429 +#: ../src/window.c:410 msgid "translator-credits" msgstr "" "Валек Филиппов aka frob\n" @@ -1635,185 +1649,176 @@ "Михаил Яхонтов\n" "Леонид Кантер" -#: ../src/window.c:432 +#: ../src/window.c:413 msgid "Aisleriot web site" msgstr "Веб-сайт Айслериот" -#: ../src/window.c:1225 +#: ../src/window.c:1190 #, c-format msgid "Play “%s”" msgstr "Играть в «%s»" -#: ../src/window.c:1387 +#: ../src/window.c:1351 #, c-format msgid "Display cards with “%s” card theme" msgstr "Использовать тему карт «%s»" -#: ../src/window.c:1681 +#: ../src/window.c:1645 msgid "A scheme exception occurred" msgstr "Возникло исключение scheme" -#: ../src/window.c:1684 +#: ../src/window.c:1648 msgid "Please report this bug to the developers." msgstr "Пожалуйста, сообщите об этом разработчикам." -#: ../src/window.c:1690 +#: ../src/window.c:1654 msgid "_Don't report" msgstr "_Не сообщать" -#: ../src/window.c:1691 +#: ../src/window.c:1655 msgid "_Report" msgstr "_Сообщить" #. Menu actions -#: ../src/window.c:1898 +#: ../src/window.c:1812 msgid "_Game" msgstr "_Игра" -#: ../src/window.c:1899 +#: ../src/window.c:1813 msgid "_View" msgstr "_Вид" -#: ../src/window.c:1900 +#: ../src/window.c:1814 msgid "_Control" msgstr "_Управление" -#: ../src/window.c:1902 +#: ../src/window.c:1816 msgid "_Help" msgstr "_Справка" -#: ../src/window.c:1907 +#: ../src/window.c:1821 msgid "Start a new game" msgstr "Начать новую игру" -#: ../src/window.c:1910 +#: ../src/window.c:1824 msgid "Restart the game" msgstr "Начать игру заново" -#: ../src/window.c:1912 +#: ../src/window.c:1826 msgid "_Select Game…" msgstr "_Выбрать игру…" -#: ../src/window.c:1914 +#: ../src/window.c:1828 msgid "Play a different game" msgstr "Начать другой пасьянс" -#: ../src/window.c:1916 +#: ../src/window.c:1830 msgid "_Recently Played" msgstr "Недавние п_асьянсы" -#: ../src/window.c:1917 +#: ../src/window.c:1831 msgid "S_tatistics" msgstr "_Статистика" -#: ../src/window.c:1918 +#: ../src/window.c:1832 msgid "Show gameplay statistics" msgstr "Показать статистику игры" -#: ../src/window.c:1921 +#: ../src/window.c:1835 msgid "Close this window" msgstr "Закрыть это окно" -#: ../src/window.c:1924 +#: ../src/window.c:1838 msgid "Undo the last move" msgstr "Отменить последний ход" -#: ../src/window.c:1927 +#: ../src/window.c:1841 msgid "Redo the undone move" msgstr "Вернуть отменённый ход" -#: ../src/window.c:1930 +#: ../src/window.c:1844 msgid "Deal next card or cards" msgstr "Раздать ещё карту" -#: ../src/window.c:1933 +#: ../src/window.c:1847 msgid "Get a hint for your next move" msgstr "Подсказать следующий ход" -#: ../src/window.c:1936 +#: ../src/window.c:1850 msgid "View help for Aisleriot" msgstr "Показать справку по Aisleriot" -#: ../src/window.c:1940 +#: ../src/window.c:1854 msgid "View help for this game" msgstr "Показать справку по игре" -#: ../src/window.c:1943 +#: ../src/window.c:1857 msgid "About this game" msgstr "Об игре" -#: ../src/window.c:1945 +#: ../src/window.c:1859 msgid "Install card themes…" msgstr "Установить карточную тему…" -#: ../src/window.c:1946 +#: ../src/window.c:1860 msgid "Install new card themes from the distribution packages repositories" msgstr "Установить новые карточные темы из репозитория пакетов дистрибутива" -#: ../src/window.c:1952 +#: ../src/window.c:1866 msgid "_Card Style" msgstr "Стиль _карт" -#: ../src/window.c:1978 +#: ../src/window.c:1892 msgid "_Toolbar" msgstr "Панель _инструментов" -#: ../src/window.c:1979 +#: ../src/window.c:1893 msgid "Show or hide the toolbar" msgstr "Показать или скрыть панель инструментов" -#: ../src/window.c:1983 +#: ../src/window.c:1897 msgid "_Statusbar" -msgstr "Строка _состояния" +msgstr "Панель _состояния" -#: ../src/window.c:1984 +#: ../src/window.c:1898 msgid "Show or hide statusbar" -msgstr "Показать или скрыть строку состояния" +msgstr "Показывать или скрывать панель состояния" -#: ../src/window.c:1988 +#: ../src/window.c:1902 msgid "_Click to Move" -msgstr "_Перенос карт" +msgstr "_Переносить карты нажатием" -#: ../src/window.c:1989 +#: ../src/window.c:1903 msgid "Pick up and drop cards by clicking" -msgstr "Брать и опускать карты по щелчку" +msgstr "Брать или класть карты с помощью нажатия" #. not active by default -#: ../src/window.c:1992 +#: ../src/window.c:1906 msgid "_Sound" msgstr "_Звук" -#: ../src/window.c:1993 +#: ../src/window.c:1907 msgid "Whether or not to play event sounds" msgstr "Воспроизводить ли звуки событий" -#. not active by default -#: ../src/window.c:1996 -msgid "_Animations" -msgstr "_Анимации" - -#: ../src/window.c:1997 -msgid "Whether or not to animate card moves" -msgstr "Использовать ли анимацию карточных перемещений" - -#: ../src/window.c:2133 +#: ../src/window.c:2008 msgid "Score:" msgstr "Счёт:" -#: ../src/window.c:2145 +#: ../src/window.c:2020 msgid "Time:" msgstr "Время:" -#: ../src/window.c:2443 +#: ../src/window.c:2307 #, c-format msgid "Cannot start the game “%s”" msgstr "Не удалось начать игру «%s»" -#: ../src/window.c:2450 +#: ../src/window.c:2314 msgid "Aisleriot cannot find the last game you played." msgstr "Не удалось найти последнюю сыгранную игру." -#: ../src/window.c:2451 +#: ../src/window.c:2315 msgid "" "This usually occurs when you run an older version of Aisleriot which does " "not have the game you last played. The default game, Klondike, is being "
