Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package knavalbattle for openSUSE:Factory checked in at 2021-04-25 21:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knavalbattle (Old) and /work/SRC/openSUSE:Factory/.knavalbattle.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "knavalbattle" Sun Apr 25 21:26:48 2021 rev:108 rq:887695 version:21.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/knavalbattle/knavalbattle.changes 2021-03-10 08:54:29.114717431 +0100 +++ /work/SRC/openSUSE:Factory/.knavalbattle.new.12324/knavalbattle.changes 2021-04-25 21:27:51.696462146 +0200 @@ -1,0 +2,29 @@ +Fri Apr 16 16:12:18 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.04 +- No code change since 21.03.90 + +------------------------------------------------------------------- +Fri Apr 9 17:40:44 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.03.90 + * New feature release +- No code change since 21.03.80 + +------------------------------------------------------------------- +Sun Mar 21 13:28:32 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.03.80 + * New feature release +- Changes since 20.12.3: + * Autogenerate categories files + * Increase Qt/kf5 dependencies to 5.12/5.68 + * Remove unimplemented method or not used signal + * Doc: Dump releaseinfo number + * Fix a misspelled + * Documentation updates + +------------------------------------------------------------------- Old: ---- knavalbattle-20.12.3.tar.xz knavalbattle-20.12.3.tar.xz.sig New: ---- knavalbattle-21.04.0.tar.xz knavalbattle-21.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knavalbattle.spec ++++++ --- /var/tmp/diff_new_pack.aWbhTb/_old 2021-04-25 21:27:52.212462766 +0200 +++ /var/tmp/diff_new_pack.aWbhTb/_new 2021-04-25 21:27:52.212462766 +0200 @@ -1,7 +1,7 @@ # # spec file for package knavalbattle # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,13 +21,17 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: knavalbattle -Version: 20.12.3 +Version: 21.04.0 Release: 0 Summary: Battleship game License: GPL-2.0-or-later Group: Amusements/Games/Board/Other -URL: https://www.kde.org +URL: https://apps.kde.org/knavalbattle Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif BuildRequires: extra-cmake-modules BuildRequires: update-desktop-files BuildRequires: cmake(KF5Config) @@ -55,10 +59,6 @@ BuildRequires: cmake(Qt5Widgets) Provides: knavalbattle5 = %{version} Obsoletes: knavalbattle5 < %{version} -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif Recommends: %{name}-lang %description @@ -69,7 +69,7 @@ %lang_package %prep -%setup -q -n knavalbattle-%{version} +%autosetup -p1 -n knavalbattle-%{version} %build %cmake_kf5 -d build @@ -85,9 +85,10 @@ %files %license COPYING COPYING.DOC -%dir %{_kf5_appsdir}/kconf_update %doc %lang(en) %{_kf5_htmldir}/en/knavalbattle/ + %{_kf5_applicationsdir}/org.kde.knavalbattle.desktop +%dir %{_kf5_appsdir}/kconf_update %{_kf5_appsdir}/kconf_update/knavalbattle.upd %{_kf5_appsdir}/knavalbattle/ %{_kf5_appstreamdir}/org.kde.knavalbattle.appdata.xml ++++++ knavalbattle-20.12.3.tar.xz -> knavalbattle-21.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/CMakeLists.txt new/knavalbattle-21.04.0/CMakeLists.txt --- old/knavalbattle-20.12.3/CMakeLists.txt 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/CMakeLists.txt 2021-04-16 10:41:47.000000000 +0200 @@ -1,15 +1,15 @@ cmake_minimum_required (VERSION 3.5 FATAL_ERROR) -set (RELEASE_SERVICE_VERSION_MAJOR "20") -set (RELEASE_SERVICE_VERSION_MINOR "12") -set (RELEASE_SERVICE_VERSION_MICRO "3") +set (RELEASE_SERVICE_VERSION_MAJOR "21") +set (RELEASE_SERVICE_VERSION_MINOR "04") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") project(knavalbattle VERSION "2.1.${RELEASE_SERVICE_COMPACT_VERSION}") -set (QT_MIN_VERSION "5.10.0") -set (KF5_MIN_VERSION "5.46.0") +set (QT_MIN_VERSION "5.12.0") +set (KF5_MIN_VERSION "5.68.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ) @@ -44,7 +44,8 @@ add_subdirectory(data) add_subdirectory(doc) add_subdirectory(kconf_update) -install(FILES knavalbattle.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +ecm_qt_install_logging_categories(EXPORT KNAVALBATTLE FILE knavalbattle.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) if (KF5DocTools_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/README.md new/knavalbattle-21.04.0/README.md --- old/knavalbattle-20.12.3/README.md 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/README.md 2021-04-14 17:19:15.000000000 +0200 @@ -1,4 +1,4 @@ -# KNavalBattel +# KNavalBattle Naval Battle is a ship sinking game. Ships are placed on a board which represents the sea. Players try to hit each others ships in turns without knowing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/doc/index.docbook new/knavalbattle-21.04.0/doc/index.docbook --- old/knavalbattle-20.12.3/doc/index.docbook 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/doc/index.docbook 2021-04-14 17:19:15.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application>Naval Battle</application>"> + <!ENTITY i18n-knavalbattle "<application>Naval Battle</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> @@ -51,12 +51,12 @@ <holder>Kevin Krammer</holder> </copyright> -<date>2016-05-10</date> -<releaseinfo>2.1 (Applications 16.04)</releaseinfo> +<date>2020-12-10</date> +<releaseinfo>Applications 20.12</releaseinfo> <abstract> <para> -&knavalbattle; is a network-enabled implementation of the famous ship sinking game by &kde;.</para> +&i18n-knavalbattle; is a network-enabled implementation of the famous ship sinking game by &kde;.</para> </abstract> <keywordset> @@ -82,13 +82,13 @@ <imagedata fileref="gameboard.png" format="PNG"/> </imageobject> <textobject> -<phrase>&knavalbattle; Game Board</phrase> +<phrase>&i18n-knavalbattle; Game Board</phrase> </textobject> </mediaobject> </screenshot> <para> -&knavalbattle; is a ship sinking game by &kde;. Ships are placed on a board which represents the sea. Players try to hit each others +&i18n-knavalbattle; is a ship sinking game by &kde;. Ships are placed on a board which represents the sea. Players try to hit each others ships in turns without knowing where they are placed. The first player to destroy all ships wins the game. </para> </chapter> @@ -97,14 +97,14 @@ <title>How to Play</title> <note><title>Objective:</title><para>Sink all of the opponent???s ships before the opponent sink all the ships of your own.</para></note><!--Describe the objective of the game.--> <para> -If you want to play &knavalbattle;, you will need two players, either play -against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guibutton>Single Player</guibutton> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu></menuchoice> menu.</para> +If you want to play &i18n-knavalbattle;, you will need two players, either play +against the computer or in a network against another player. To play against your computer, first select the difficulty level on the right of the status bar, and then select <guilabel>Single Player</guilabel> on the welcome screen, or directly on the <menuchoice><guimenu>Game</guimenu> <guimenuitem>Single Player</guimenuitem></menuchoice> menu item.</para> <para> To start a network game, one player has to host the game by selecting <guilabel>Host Network Game</guilabel> on the welcome screen, or choosing <menuchoice><guimenu>Game</guimenu> <guimenuitem>Host Game...</guimenuitem></menuchoice>. A dialog box opens which asks for a <guilabel>Nickname:</guilabel> and <guilabel>Port:</guilabel>. Normally, -&knavalbattle; will suggest your full name, but you can enter any string +&i18n-knavalbattle; will suggest your full name, but you can enter any string you want. The predefined port should be ok. However, if you encounter problems, you can choose any other free port above 1024. </para> @@ -116,9 +116,9 @@ </note> <para> -The other player has to choose <guilabel>Connect to Network Game</guilabel>, or click <menuchoice><guimenu>Game</guimenu> -<guimenuitem>Connect to Game...</guimenuitem></menuchoice>. Again, a <guilabel>Nickname:</guilabel> is -suggested, but you can choose any name you like. In the field <guilabel>Hostname:</guilabel> you +The other player has to choose <guilabel>Connect to Network Game</guilabel>, or click on the <menuchoice><guimenu>Game</guimenu> +<guimenuitem>Connect to Game...</guimenuitem></menuchoice> menu item. Again, a <guilabel>Nickname:</guilabel> is +suggested, but you can choose any nickname you like. In the field <guilabel>Hostname:</guilabel> you have to enter the host name of the server (the machine of the player that initiated the game). </para> @@ -159,13 +159,13 @@ </para> <para> -You can restart the game by choosing <menuchoice><guimenu>Game</guimenu> -<guimenuitem>Restart Game</guimenuitem></menuchoice>, or by pressing +You can restart the game by choosing the <menuchoice><guimenu>Game</guimenu> +<guimenuitem>Restart Game</guimenuitem></menuchoice> menu item, or by pressing <keycap>F5</keycap>. </para> <para> -The first player to destroy all their opponents ships wins the game. +The first player to destroy all their opponent's ships wins the game. </para> </chapter> @@ -306,7 +306,7 @@ </term> <listitem> <para> -<action>Exit</action> &knavalbattle; +<action>Exit</action> &i18n-knavalbattle;. </para> </listitem> </varlistentry> @@ -350,7 +350,7 @@ <listitem> <para> <action>Toggle whether the ships can be put on a desk without one empty space between them.</action> -The default is on. This setting should be defined on a host when <link linkend="howtoplay">playing &knavalbattle; via network</link>. +The default is on. This setting should be defined on a host when <link linkend="howtoplay">playing &i18n-knavalbattle; via network</link>. </para> </listitem> </varlistentry> @@ -402,7 +402,7 @@ </variablelist> <para> -Additionally &knavalbattle; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> +Additionally &i18n-knavalbattle; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> menu items, for more information read the sections about the <ulink url="help:/fundamentals/menus.html#menus-settings" >Settings Menu</ulink> and <ulink >url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. @@ -424,7 +424,7 @@ </question> <answer> <para> -No, there is no hint system in &knavalbattle;. +No, there is no hint system in &i18n-knavalbattle;. </para> </answer> </qandaentry> @@ -437,7 +437,7 @@ </question> <answer> <para> -Move the ship where you want to place it, then press the &RMB; +Move the ship where you want to place it, then press the &RMB;. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/knavalbattle.categories new/knavalbattle-21.04.0/knavalbattle.categories --- old/knavalbattle-20.12.3/knavalbattle.categories 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/knavalbattle.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.kdegames.knavalbattle knavalbattle (kdegames) IDENTIFIER [KNAVALBATTLE_LOG] Binary files old/knavalbattle-20.12.3/po/ca/docs/knavalbattle/gameboard.png and new/knavalbattle-21.04.0/po/ca/docs/knavalbattle/gameboard.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/ca/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/ca/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/ca/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/ca/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>Batalla naval</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Catalan "INCLUDE" > <!-- change language only here --> @@ -64,13 +63,13 @@ </copyright> <date ->10 de maig de 2016</date> +>10 de desembre de 2020</date> <releaseinfo ->2.1 (Aplicacions 16.04)</releaseinfo> +>Aplicacions 20.12</releaseinfo> <abstract> <para ->El &knavalbattle; ??s una implementaci?? habilitada per a xarxa del fam??s joc de tocar i enfonsar vaixells per al &kde;.</para> +>El &i18n-knavalbattle; ??s una implementaci?? habilitada per a xarxa del fam??s joc de tocar i enfonsar vaixells per al &kde;.</para> </abstract> <keywordset> @@ -117,13 +116,13 @@ </imageobject> <textobject> <phrase ->Tauler del joc &knavalbattle;</phrase> +>Tauler del joc &i18n-knavalbattle;</phrase> </textobject> </mediaobject> </screenshot> <para ->El &knavalbattle; ??s un joc de tocar i enfonsar vaixells per al &kde;. Els vaixells es col??loquen en un tauler que representa el mar. Els jugadors intenten tocar per torns els vaixells de l'oponent sense saber on estan col??locats. El primer jugador a destruir tots els vaixells de l'oponent guanyar?? el joc. </para> +>El &i18n-knavalbattle; ??s un joc de tocar i enfonsar vaixells per al &kde;. Els vaixells es col??loquen en un tauler que representa el mar. Els jugadors intenten tocar per torns els vaixells de l'oponent sense saber on estan col??locats. El primer jugador a destruir tots els vaixells de l'oponent guanyar?? el joc. </para> </chapter> <chapter id="howtoplay"> @@ -137,7 +136,7 @@ ></note ><!--Describe the objective of the game.--> <para ->Si voleu jugar al &knavalbattle;, necessitareu dos jugadors, ja sigui contra l'ordinador o en xarxa contra un altre jugador. Per a jugar contra l'ordinador, primer seleccioneu el nivell de dificultat a la dreta de la barra d'estat i despr??s seleccioneu <guilabel +>Si voleu jugar al &i18n-knavalbattle;, necessitareu dos jugadors, ja sigui contra l'ordinador o en xarxa contra un altre jugador. Per a jugar contra l'ordinador, primer seleccioneu el nivell de dificultat a la dreta de la barra d'estat i despr??s seleccioneu <guilabel >Jugador individual</guilabel > a la pantalla de benvinguda o directament a l'element de men?? <menuchoice ><guimenu @@ -160,7 +159,7 @@ >Sobrenom:</guilabel > i <guilabel >Port:</guilabel ->. Normalment, el &knavalbattle; suggerir?? el vostre nom complet, per?? podreu introduir la cadena que vulgueu. El port predeterminat hauria d'estar b??. No obstant aix??, si teniu problemes, podreu triar qualsevol altre port lliure per sobre de 1024. </para> +>. Normalment, el &i18n-knavalbattle; suggerir?? el vostre nom complet, per?? podreu introduir la cadena que vulgueu. El port predeterminat hauria d'estar b??. No obstant aix??, si teniu problemes, podreu triar qualsevol altre port lliure per sobre de 1024. </para> <note> <para @@ -416,7 +415,7 @@ <para ><action >Surt</action -> del &knavalbattle;. </para> +> del &i18n-knavalbattle;. </para> </listitem> </varlistentry> @@ -468,7 +467,7 @@ ><action >Alterna si els vaixells es podran col??locar en un escriptori sense un espai >buit entre ells.</action > El valor predeterminat ??s que est?? activat. Aquesta configuraci?? s'haur?? > de definir en una m??quina quan <link linkend="howtoplay" ->es juga al &knavalbattle; a trav??s de la xarxa</link +>es juga al &i18n-knavalbattle; a trav??s de la xarxa</link >. </para> </listitem> </varlistentry> @@ -531,7 +530,7 @@ </variablelist> <para ->De manera addicional, el &knavalbattle; t?? la configuraci?? comuna al &kde; i els elements dels men??s <guimenu +>De manera addicional, el &i18n-knavalbattle; t?? la configuraci?? comuna al &kde; i els elements dels men??s <guimenu >Arranjament</guimenu > i <guimenu >Ajuda</guimenu @@ -557,7 +556,7 @@ </question> <answer> <para ->No, no hi ha un sistema de pistes en el &knavalbattle;. </para> +>No, no hi ha un sistema de pistes en el &i18n-knavalbattle;. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/ca@valencia/knavalbattle.po new/knavalbattle-21.04.0/po/ca@valencia/knavalbattle.po --- old/knavalbattle-20.12.3/po/ca@valencia/knavalbattle.po 2021-03-02 01:44:40.000000000 +0100 +++ new/knavalbattle-21.04.0/po/ca@valencia/knavalbattle.po 2021-04-16 10:41:47.000000000 +0200 @@ -561,3 +561,6 @@ #, kde-format msgid "Remote player" msgstr "Jugador remot" + +#~ msgid "Game difficulty." +#~ msgstr "Dificultat del joc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/de/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/de/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/de/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/de/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application + <!ENTITY i18n-knavalbattle "<application >Naval Battle</application ->" -> +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % German "INCLUDE" > <!-- change language only here --> @@ -78,13 +77,13 @@ </copyright> <date ->2016-05-10</date> +>2020-12-10</date> <releaseinfo ->2.1 (Anwendungen 16.04)</releaseinfo> +>Anwendungen 20.12</releaseinfo> <abstract> <para ->&knavalbattle; ist eine netzwerkf??hige Umsetzung des bekannten Spiels <quote +>&i18n-knavalbattle; ist eine netzwerkf??hige Umsetzung des bekannten Spiels <quote >Schiffe versenken</quote > von &kde;.</para> </abstract> @@ -133,13 +132,13 @@ </imageobject> <textobject> <phrase ->&knavalbattle;-Spielfeld</phrase> +>&i18n-knavalbattle;-Spielfeld</phrase> </textobject> </mediaobject> </screenshot> <para ->&knavalbattle; ist ein <quote +>&i18n-knavalbattle; ist ein <quote >Schiffe versenken</quote >-Spiel von &kde;. Alle Schiffe werden auf dem Spielfeld - dem Meer - >angeordnet. Die Spieler versuchen die gegnerischen Schiffe, deren Lage auf >dem Spielfeld Sie nicht kennen, abwechselnd mit Sch??ssen zu treffen. Sieger >ist, wer als erster alle Schiffe des Gegners versenkt hat. </para> </chapter> @@ -155,11 +154,13 @@ ></note ><!--Describe the objective of the game.--> <para ->&knavalbattle; wird zu zweit gespielt, entweder gegen den Rechner oder im Netzwerk gegen einen anderen Spieler. Spielen Sie gegen den Rechner, w??hlen Sie zuerst eine Ebene rechts in der Statusleiste, dann <guibutton ->Einzelspieler</guibutton +>&i18n-knavalbattle; wird zu zweit gespielt, entweder gegen den Rechner oder im Netzwerk gegen einen anderen Spieler. Spielen Sie gegen den Rechner, w??hlen Sie zuerst eine Ebene rechts in der Statusleiste, dann <guilabel +>Einzelspieler</guilabel > im Startdialog oder im Men?? <menuchoice ><guimenu >Spiel</guimenu +><guimenuitem +>Einzelspieler</guimenuitem ></menuchoice >.</para> @@ -176,7 +177,7 @@ >Spitzname:</guilabel > und <guilabel >Port:</guilabel -> einzugeben. Normalerweise wird &knavalbattle; Ihren vollen Anmeldenamen vorschlagen, Sie k??nnen aber jeden beliebigen Namen eintragen. Mit dem vorgegeben Port sollte das Netzwerkspiel funktionieren. Treten jedoch Probleme auf, k??nnen Sie jeden anderen freien Port gr????er als 1024 w??hlen. </para> +> einzugeben. Normalerweise wird &i18n-knavalbattle; Ihren vollen Anmeldenamen vorschlagen, Sie k??nnen aber jeden beliebigen Namen eintragen. Mit dem vorgegeben Port sollte das Netzwerkspiel funktionieren. Treten jedoch Probleme auf, k??nnen Sie jeden anderen freien Port gr????er als 1024 w??hlen. </para> <note> <para @@ -432,7 +433,7 @@ <para ><action >Beendet</action -> &knavalbattle; </para> +> &i18n-knavalbattle; </para> </listitem> </varlistentry> @@ -484,7 +485,7 @@ ><action >Legt fest, ob Schiffe auf dem Spielfeld ohne leere Felder dazwischen >angeordnet werden k??nnen.</action > Als Voreinstellung ist dies abgeschaltet. Diese Einstellung sollte auf einem > Server eingestellt werden, wenn <link linkend="howtoplay" ->&knavalbattle; ??ber ein Netzwerk gespielt wird</link +>&i18n-knavalbattle; ??ber ein Netzwerk gespielt wird</link >. </para> </listitem> </varlistentry> @@ -549,7 +550,7 @@ </variablelist> <para ->Zus??tzlich hat &knavalbattle; die bekannten &kde;-Eintr??ge im Men?? <guimenu +>Zus??tzlich hat &i18n-knavalbattle; die bekannten &kde;-Eintr??ge im Men?? <guimenu >Einstellungen</guimenu > und <guimenu >Hilfe</guimenu @@ -575,7 +576,7 @@ </question> <answer> <para ->Nein, in &knavalbattle; gibt es keine Tipps. </para> +>Nein, in &i18n-knavalbattle; gibt es keine Tipps. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/de/knavalbattle.po new/knavalbattle-21.04.0/po/de/knavalbattle.po --- old/knavalbattle-20.12.3/po/de/knavalbattle.po 2021-03-02 01:44:40.000000000 +0100 +++ new/knavalbattle-21.04.0/po/de/knavalbattle.po 2021-04-16 10:41:47.000000000 +0200 @@ -1,7 +1,7 @@ # Stefan Winter <[email protected]>, 2003, 2004, 2005, 2007. # Stephan Johach <[email protected]>, 2005. # Thomas Reitelbach <[email protected]>, 2005. -# Burkhard L??ck <[email protected]>, 2008, 2012, 2013, 2014, 2017. +# Burkhard L??ck <[email protected]>, 2008, 2012, 2013, 2014, 2017, 2021. # Johannes Obermayr <[email protected]>, 2009, 2010. # Panagiotis Papadopoulos <[email protected]>, 2009. msgid "" @@ -9,14 +9,14 @@ "Project-Id-Version: kbattleship\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2020-05-12 03:22+0200\n" -"PO-Revision-Date: 2017-04-18 15:50+0100\n" +"PO-Revision-Date: 2021-03-30 07:27+0200\n" "Last-Translator: Burkhard L??ck <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "\n" @@ -33,7 +33,7 @@ #: controller.cpp:53 #, kde-format msgid "Computer" -msgstr "Computer" +msgstr "Rechner" #. i18n: ectx: label, entry (Hostname), group (network) #: knavalbattle.kcfg:9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/es/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/es/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/es/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/es/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>Batalla naval</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Spanish "INCLUDE" > <!-- change language only here --> @@ -12,7 +11,7 @@ <book id="knavalbattle" lang="&language;"> <bookinfo> <title ->Manual de &knavalbattle;</title> +>El manual de &knavalbattle;</title> <authorgroup> <author @@ -120,13 +119,13 @@ </copyright> <date ->2016-05-10</date> +>2020-12-10</date> <releaseinfo ->2.1 (Aplicaciones 16.04)</releaseinfo> +>Aplicaciones 20.12</releaseinfo> <abstract> <para ->&knavalbattle; es una implementaci??n con soporte para red del famoso juego de hundir los barcos, creado por &kde;.</para> +>&i18n-knavalbattle; es una implementaci??n con soporte para red del famoso juego de hundir los barcos, creado por &kde;.</para> </abstract> <keywordset> @@ -173,13 +172,13 @@ </imageobject> <textobject> <phrase ->El tablero de juego de &knavalbattle;</phrase> +>El tablero de juego de &i18n-knavalbattle;</phrase> </textobject> </mediaobject> </screenshot> <para ->&knavalbattle; es el juego de hundir barcos creado por &kde;. Los barcos se colocan sobre un tablero que representa el mar. Los jugadores intentar??n alcanzar los barcos de los otros jugadores por turnos sin saber d??nde est??n situados. Ganar?? la partida el primer jugador que destruya todos los barcos del oponente. </para> +>&i18n-knavalbattle; es el juego de hundir barcos creado por &kde;. Los barcos se colocan sobre un tablero que representa el mar. Los jugadores intentar??n alcanzar los barcos de los otros jugadores por turnos sin saber d??nde est??n situados. Ganar?? la partida el primer jugador que destruya todos los barcos del oponente. </para> </chapter> <chapter id="howtoplay"> @@ -193,11 +192,13 @@ ></note ><!--Describe the objective of the game.--> <para ->Si desea jugar a &knavalbattle;, necesitar?? dos jugadores, bien jugando contra la m??quina o contra otro jugador en red. Para jugar contra su m??quina, primero debe seleccionar el nivel de dificultad en la parte derecha de la barra de estado y despu??s seleccione <guibutton ->Un solo jugador</guibutton -> en la pantalla de bienvenida o directamente en el men?? <menuchoice +>Si desea jugar a &i18n-knavalbattle;, necesitar?? dos jugadores, bien jugando contra la m??quina o contra otro jugador en red. Para jugar contra su m??quina, primero debe seleccionar el nivel de dificultad en la parte derecha de la barra de estado y despu??s seleccione <guilabel +>Un solo jugador</guilabel +> en la pantalla de bienvenida o directamente en la opci??n del men?? <menuchoice > <guimenu >Partida</guimenu +> <guimenuitem +>Un solo jugador</guimenuitem ></menuchoice >.</para> @@ -214,7 +215,7 @@ >Apodo:</guilabel > y un <guilabel >Puerto</guilabel ->. Normalmente, &knavalbattle; sugerir?? su nombre completo, pero puede modificarlo si lo desea. El puerto predefinido deber??a funcionar. Sin embargo, si encuentra problemas, puede elegir cualquier otro puerto libre que se encuentre por encima de 1024. </para> +>. Normalmente, &i18n-knavalbattle; sugerir?? su nombre completo, pero puede modificarlo si lo desea. El puerto predefinido deber??a funcionar. Sin embargo, si encuentra problemas, puede elegir cualquier otro puerto libre que se encuentre por encima de 1024. </para> <note> <para @@ -224,7 +225,7 @@ <para >El otro jugador debe elegir <guilabel >Conectarse a un juego de red</guilabel -> o pulsar <menuchoice +> o usar la opci??n del men?? <menuchoice ><guimenu >Partida</guimenu > <guimenuitem @@ -252,7 +253,7 @@ >Ahora puede comenzar a disparar a ciegas con el &LMB; en el ??rea enemiga. La >barra de estado indica a qui??n le toca disparar. </para> <para ->Puede reiniciar la partida eligiendo <menuchoice +>Puede reiniciar la partida eligiendo la opci??n del men?? <menuchoice ><guimenu >Juego</guimenu > <guimenuitem @@ -468,7 +469,7 @@ <para ><action >Sale</action -> de &knavalbattle;. </para> +> de &i18n-knavalbattle;. </para> </listitem> </varlistentry> @@ -520,7 +521,7 @@ ><action >Conmuta la posibilidad de que los barcos se puedan colocar en un tablero sin >espacios en blanco entre ellos.</action > De manera predeterminada, s?? se permite. Esta preferencia de debe definir > en un servidor cuando se <link linkend="howtoplay" ->juega a &knavalbattle; a trav??s de la red</link +>juega a &i18n-knavalbattle; a trav??s de la red</link >. </para> </listitem> </varlistentry> @@ -583,7 +584,7 @@ </variablelist> <para ->Adem??s, &knavalbattle; tiene las opciones de men?? <guimenu +>Adem??s, &i18n-knavalbattle; tiene las opciones de men?? <guimenu >Preferencias</guimenu > y <guimenu >Ayuda</guimenu @@ -609,7 +610,7 @@ </question> <answer> <para ->No, &knavalbattle; no tiene un sistema de pistas. </para> +>No, &i18n-knavalbattle; no tiene un sistema de pistas. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/it/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/it/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/it/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/it/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>Battaglia navale</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Italian "INCLUDE" > <!-- change language only here --> @@ -78,13 +77,13 @@ </copyright> <date ->2016-05-10</date> +>2020-12-10</date> <releaseinfo ->2.1 (Applications 16.04)</releaseinfo> +>Applications 20.12</releaseinfo> <abstract> <para ->&knavalbattle; ?? un'implementazione di &kde;, giocabile in rete, del famoso gioco della <quote +>&i18n-knavalbattle; ?? un'implementazione di &kde;, giocabile in rete, del famoso gioco della <quote >Battaglia navale</quote >.</para> </abstract> @@ -133,13 +132,13 @@ </imageobject> <textobject> <phrase ->Tavolo di gioco di &knavalbattle;</phrase> +>Tavolo di gioco di &i18n-knavalbattle;</phrase> </textobject> </mediaobject> </screenshot> <para ->&knavalbattle; ?? un gioco di <quote +>&i18n-knavalbattle; ?? un gioco di <quote >Battaglia navale</quote > di &kde;. Le navi vengono disposte su un riquadro che rappresenta il mare. > Poi ogni giocatore a turno tenta di colpire le navi dell'altro, senza sapere > dove sono disposte. Vince il primo giocatore che affonda tutte le navi > nemiche. </para> </chapter> @@ -155,11 +154,13 @@ ></note ><!--Describe the objective of the game.--> <para ->Per giocare a &knavalbattle; servono due giocatori. Puoi anche giocare contro il computer o in rete contro un avversario remoto. Per giocare contro il computer, prima devi selezionare il livello di difficolt?? nella parte destra della barra di stato e <guibutton ->Singolo giocatore</guibutton -> nella schermata di benvenuto o, direttamente. nel menu <menuchoice +>Per giocare a &i18n-knavalbattle; servono due giocatori. Puoi anche giocare contro il computer o in rete contro un avversario remoto. Per giocare contro il computer, prima devi selezionare il livello di difficolt?? nella parte destra della barra di stato e <guilabel +>Singolo giocatore</guilabel +> nella schermata di benvenuto o, direttamente. nell'elemento di menu <menuchoice ><guimenu >Partita</guimenu +><guimenuitem +>Singolo giocatore</guimenuitem ></menuchoice >.</para> @@ -176,7 +177,7 @@ >Nome di battaglia:</guilabel > e una <guilabel >Porta:</guilabel ->. Di norma, &knavalbattle; propone di usare il tuo nome, ma puoi scegliere una stringa qualunque. La porta predefinita dovrebbe andare bene. Per??, se ci sono problemi, puoi scegliere una qualsiasi altra porta libera maggiore di 1024. </para> +>. Di norma, &i18n-knavalbattle; propone di usare il tuo nome, ma puoi scegliere una stringa qualunque. La porta predefinita dovrebbe andare bene. Per??, se ci sono problemi, puoi scegliere una qualsiasi altra porta libera maggiore di 1024. </para> <note> <para @@ -186,7 +187,7 @@ <para >L'altro giocatore deve scegliere <guilabel >Partecipare ad una partita in rete</guilabel ->, o premere <menuchoice +>, o premere sull'elemento di menu <menuchoice ><guimenu >Partita</guimenu > <guimenuitem @@ -216,7 +217,7 @@ >Ora puoi sparare sul mare nemico premendo il &LMB;. La barra di stato indica >a chi tocca far fuoco. </para> <para ->Puoi riavviare il gioco scegliendo <menuchoice +>Puoi riavviare il gioco scegliendo l'elemento di menu <menuchoice ><guimenu >Partita</guimenu > <guimenuitem @@ -432,7 +433,7 @@ <para >Si <action >esce</action -> da &knavalbattle; </para> +> da &i18n-knavalbattle;. </para> </listitem> </varlistentry> @@ -482,9 +483,9 @@ <listitem> <para ><action ->Permette o meno di disporre le navi senza lasciare uno spazio vuoto tra di loro.</action +>Permette o no di disporre le navi senza lasciare uno spazio vuoto tra di loro.</action >. ?? preimpostato come permesso. L'impostazione pu?? essere modificata >sull'host quando <link linkend="howtoplay" ->si gioca &knavalbattle; in rete</link +>si gioca &i18n-knavalbattle; in rete</link >. </para> </listitem> </varlistentry> @@ -547,7 +548,7 @@ </variablelist> <para ->Inoltre, il menu di &knavalbattle; ha le voci <guimenu +>Inoltre, il menu di &i18n-knavalbattle; ha le voci <guimenu >Impostazioni</guimenu > e <guimenu >Aiuto</guimenu @@ -573,7 +574,7 @@ </question> <answer> <para ->No, non sono previsti suggerimenti in &knavalbattle;. </para> +>No, non sono previsti suggerimenti in &i18n-knavalbattle;. </para> </answer> </qandaentry> @@ -584,7 +585,7 @@ </question> <answer> <para ->Sposta la nave dove hai deciso di schierarla e premi il &RMB; </para> +>Sposta la nave dove hai deciso di schierarla e premi il &RMB;. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/nl/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/nl/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/nl/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/nl/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>Zeeslag</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Dutch "INCLUDE" > <!-- change language only here --> @@ -64,13 +63,13 @@ </copyright> <date ->2016-05-10</date> +>2020-12-10</date> <releaseinfo ->2.1 (Applications 16.04)</releaseinfo> +>Applications 20.12</releaseinfo> <abstract> <para ->&knavalbattle; is een netwerk-gerichte variant van het beroemde spel van het laten zinken van een schip door &kde;.</para> +>&i18n-knavalbattle; is een netwerk-gerichte variant van het beroemde spel van het laten zinken van een schip door &kde;.</para> </abstract> <keywordset> @@ -117,13 +116,13 @@ </imageobject> <textobject> <phrase ->Het spelbord van &knavalbattle;</phrase> +>Het spelbord van &i18n-knavalbattle;</phrase> </textobject> </mediaobject> </screenshot> <para ->&knavalbattle; is het spel Zeeslag door &kde;. Schepen worden op een bord geplaatst die de zee voorstelt. Spelers proberen om de beurt elkaars schepen te raken zonder te weten waar ze zijn geplaatst. De eerste speler die alle schepen laat zinken wint het spel. </para> +>&i18n-knavalbattle; is het spel Zeeslag door &kde;. Schepen worden op een bord geplaatst die de zee voorstelt. Spelers proberen om de beurt elkaars schepen te raken zonder te weten waar ze zijn geplaatst. De eerste speler die alle schepen laat zinken wint het spel. </para> </chapter> <chapter id="howtoplay"> @@ -137,11 +136,13 @@ ></note ><!--Describe the objective of the game.--> <para ->Als u &knavalbattle; wilt spelen, dan zijn er twee spelers nodig, ofwel u speelt tegen de computer of in een netwerk tegen een andere speler. Om tegen uw computer te spelen, selecteert u eerst de moeilijkheidsgraad rechts van de statusbalk en daarna selecteert u <guibutton ->E??n speler</guibutton -> in het welkomstscherm of direct in het menu <menuchoice +>Als u &i18n-knavalbattle; wilt spelen, dan zijn er twee spelers nodig, ofwel u speelt tegen de computer of in een netwerk tegen een andere speler. Om tegen uw computer te spelen, selecteert u eerst de moeilijkheidsgraad rechts van de statusbalk en daarna selecteert u <guilabel +>E??n speler</guilabel +> in het welkomstscherm of direct in het menu-item <menuchoice ><guimenu >Spel</guimenu +><guimenuitem +>E??n speler</guimenuitem ></menuchoice >.</para> @@ -158,7 +159,7 @@ >Schermnaam:</guilabel > en een <guilabel >poort</guilabel ->. &knavalbattle; heeft uw gebruikersnaam al ingevuld, maar die kunt u vervangen door een andere in te voeren. De opgegeven poort is in principe goed. Mocht u toch problemen ondervinden, kies dan een andere vrije poort boven 1024. </para> +>. &i18n-knavalbattle; heeft uw gebruikersnaam al ingevuld, maar die kunt u vervangen door een andere in te voeren. De opgegeven poort is in principe goed. Mocht u toch problemen ondervinden, kies dan een andere vrije poort boven 1024. </para> <note> <para @@ -166,13 +167,9 @@ </note> <para ->De andere speler kiest <menuchoice -><guimenu ->Spel</guimenu -><guimenuitem ->Verbinden met netwerkspel</guimenuitem -></menuchoice -> of klikt op <menuchoice +>De andere speler kiest <guilabel +>Verbinden met netwerkspel</guilabel +> of klikt op het menu-item <menuchoice ><guimenu >Spel</guimenu > <guimenuitem @@ -202,7 +199,7 @@ >Nu kunt u de &LMB; gebruiken om schieten op het speelgebied van de vijand. De >statusbalk geeft aan wie aan beurt is. </para> <para ->U kunt het spel opnieuw starten door <menuchoice +>U kunt het spel opnieuw starten door menu-item <menuchoice ><guimenu >Spel</guimenu > <guimenuitem @@ -213,7 +210,7 @@ > te drukken. </para> <para ->De eerste speler die alle schepen van de tegenstander vernietigt heeft gewonnen! </para> +>De eerste speler, die alle schepen van de tegenstander vernietigt, heeft gewonnen! </para> </chapter> @@ -418,7 +415,7 @@ <para ><action >Afsluiten</action -> van &knavalbattle; </para> +> van &i18n-knavalbattle;. </para> </listitem> </varlistentry> @@ -470,7 +467,7 @@ ><action >Schakel om of de schepen op het speelveld zonder of met lege ruimte ertussen >geplaatst mogen worden.</action > De standaard is zonder. Deze instelling moet op een host gedefinieerd worden > bij het <link linkend="howtoplay" ->spelen van &knavalbattle; via het netwerk</link +>spelen van &i18n-knavalbattle; via het netwerk</link >. </para> </listitem> </varlistentry> @@ -533,7 +530,7 @@ </variablelist> <para ->Bovendien heeft &knavalbattle; de gezamenlijke menu-items van &kde; <guimenu +>Bovendien heeft &i18n-knavalbattle; de gezamenlijke menu-items van &kde; <guimenu >Instellingen</guimenu > en <guimenu >Help</guimenu @@ -559,7 +556,7 @@ </question> <answer> <para ->Nee, er is geen systeem met hints in &knavalbattle;. </para> +>Nee, er is geen systeem met tips in &i18n-knavalbattle;. </para> </answer> </qandaentry> @@ -570,7 +567,7 @@ </question> <answer> <para ->Verplaats het schip naar de gewenste plaats en druk op de &RMB; </para> +>Verplaats het schip naar de gewenste plaats en druk op de &RMB;. </para> </answer> </qandaentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/sv/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/sv/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/sv/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/sv/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>S??nka fartyg</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Swedish "INCLUDE" > <!-- change language only here --> @@ -78,9 +77,9 @@ </copyright> <date ->2016-05-10</date> +>2020-12-10</date> <releaseinfo ->2.1 (Program 16.04)</releaseinfo> +>Program 20.12</releaseinfo> <abstract> <para diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/uk/docs/knavalbattle/index.docbook new/knavalbattle-21.04.0/po/uk/docs/knavalbattle/index.docbook --- old/knavalbattle-20.12.3/po/uk/docs/knavalbattle/index.docbook 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/uk/docs/knavalbattle/index.docbook 2021-04-16 10:41:47.000000000 +0200 @@ -1,9 +1,8 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY knavalbattle "<application ->Naval Battle</application ->" -> + <!ENTITY i18n-knavalbattle "<application +>???????????????? ??????</application +>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % Ukrainian "INCLUDE" > <!-- change language only here --> @@ -12,7 +11,7 @@ <book id="knavalbattle" lang="&language;"> <bookinfo> <title ->?????????????????? ?? &knavalbattle;</title> +>?????????????????? ?? ?????? ??&i18n-knavalbattle;??</title> <authorgroup> <author @@ -78,13 +77,13 @@ </copyright> <date ->10 ???????????? 2016 ????????</date> +>10 ???????????? 2020 ????????</date> <releaseinfo ->2.1 (???????????????? 16.04)</releaseinfo> +>???????????????? 20.12</releaseinfo> <abstract> <para ->&knavalbattle; ??? ???? ???????????????? ?????????????????????????? ?????????????? ?????? ?????????????????? ???????? ?? &kde;.</para> +>??&i18n-knavalbattle;?? ??? ???? ???????????????? ?????????????????????????? ?????????????? ?????? ?????????????????? ???????? ?? &kde;.</para> </abstract> <keywordset> @@ -131,13 +130,13 @@ </imageobject> <textobject> <phrase ->???????????? ?????????? &knavalbattle;</phrase> +>???????????? ?????????? ?????? ??&i18n-knavalbattle;??</phrase> </textobject> </mediaobject> </screenshot> <para ->&knavalbattle; ??? ???? ?????? ?? ???????????????? ?????? ?? &kde;. ???? ???????????????? ????????, ?????? ???????????????????? ???????????????? ????????????????, ???????????? ???????????????????????? ??????????????. ?????????? ?????????? ?????????? ?? ?????????????? ???? ?????????? ?????????????????????? ?????????????? ?? ?????????????? ???????????? ????????????. ???? ?????????????? ?????? ???????????? ???? ????????????, ???? ?????????????????????? ?????????????? ??????????????????. ???????????? ?? ??????????????, ?????? ???????????????? ?????????????? ????????????????????????, ???????????? ??????. </para> +>??&i18n-knavalbattle;?? ??? ???? ?????? ?? ???????????????? ?????? ?? &kde;. ???? ???????????????? ????????, ?????? ???????????????????? ???????????????? ????????????????, ???????????? ???????????????????????? ??????????????. ?????????? ?????????? ?????????? ?? ?????????????? ???? ?????????? ?????????????????????? ?????????????? ?? ?????????????? ???????????? ????????????. ???? ?????????????? ?????? ???????????? ???? ????????????, ???? ?????????????????????? ?????????????? ??????????????????. ???????????? ?? ??????????????, ?????? ???????????????? ?????????????? ????????????????????????, ???????????? ??????. </para> </chapter> <chapter id="howtoplay"> @@ -151,7 +150,7 @@ ></note ><!--Describe the objective of the game.--> <para ->?????? ?????? ?? &knavalbattle; ???????????????? ?????? ????????????, ??? ???? ???????????? ?????????????? ?????????? ??????????????????????????? ???????????? ?????? ???? ?????????????????? ???????????? ?????????? ???????????? ????????????. ?????? ?????????????????? ?????? ?? ?????????? ???????????????????????, ???????????????? ?????????????? ???????????? ???????????????????? ???? ?????????????????? ???????????????? ????????????, ?????????????????????????? ?? ???????????? ?????????????? ???????????? ??????????. ?????????? ?????????? ?????????????? ?????????? <guibutton +>?????? ?????? ?? ??&i18n-knavalbattle;?? ???????????????? ?????? ????????????, ??? ???? ???????????? ?????????????? ?????????? ??????????????????????????? ???????????? ?????? ???? ?????????????????? ???????????? ?????????? ???????????? ????????????. ?????? ?????????????????? ?????? ?? ?????????? ???????????????????????, ???????????????? ?????????????? ???????????? ???????????????????? ???? ?????????????????? ???????????????? ????????????, ?????????????????????????? ?? ???????????? ?????????????? ???????????? ??????????. ?????????? ?????????? ?????????????? ?????????? <guibutton >???????? ??????????????</guibutton > ?? ?????????? ?????????????? ?????? ?????????????????????????? ?? ???????? > <menuchoice ><guimenu @@ -172,7 +171,7 @@ >??????????????????:</guilabel > ?? <guilabel >????????:</guilabel ->. ????????????????, &knavalbattle; ???????????????????? ???? ???????????????????? ???????? ?????????? ?????????, ?????? ???? ???????????? ???????????? ????????-???????? ??????????????????, ???????? ?????? ??????????????????????. ????????, ???????? ???????????? ???????????????? ?????????? ???? ????????????. ??????, ???????? ?? ?????? ???????????????????????? ????????????????, ???? ???????????? ???????????? ????????-???????? ?? ?????????????? ???????????? ?? ??????????????, ?????????????? ???? 1024. </para> +>. ????????????????, ??&i18n-knavalbattle;?? ???????????????????? ???? ???????????????????? ???????? ?????????? ?????????, ?????? ???? ???????????? ???????????? ????????-???????? ??????????????????, ???????? ?????? ??????????????????????. ????????, ???????? ???????????? ???????????????? ?????????? ???? ????????????. ??????, ???????? ?? ?????? ???????????????????????? ????????????????, ???? ???????????? ???????????? ????????-???????? ?? ?????????????? ???????????? ?? ??????????????, ?????????????? ???? 1024. </para> <note> <para @@ -428,7 +427,7 @@ <para ><action >???????????????? ????????????</action -> &knavalbattle;. </para> +> ?????? ??&i18n-knavalbattle;??. </para> </listitem> </varlistentry> @@ -480,7 +479,7 @@ ><action >???????????? ?????? ?????????????? ???????????????????? >???????????????????????? ???????????????? ???? ?????????? ??????????, ?????? >???????????????? ?????? ????????.</action > ???????????? ??????????????????. ???????? ???? <link linkend="howtoplay" ->???????????? ?? &knavalbattle; ???? ?????????????????? ????????????</link +>???????????? ?? ??&i18n-knavalbattle;?? ???? ?????????????????? ????????????</link >, ???????????????? ?????????? ?????????????????? ?????? ?????? ???????? >?????????????????? ???? ?????????????????? ????????????????????? ??????. ></para> </listitem> </varlistentry> @@ -543,7 +542,7 @@ </variablelist> <para ->???????? ????????, ?? &knavalbattle; ?????????????????????? ???????????? ?????? &kde; ???????????? ???????? <guimenu +>???????? ????????, ?? ?????? ??&i18n-knavalbattle;?? ?????????????????????? ???????????? ?????? &kde; ???????????? ???????? <guimenu >??????????????????</guimenu > ?? <guimenu >??????????????</guimenu @@ -569,7 +568,7 @@ </question> <answer> <para ->????, ?? &knavalbattle; ?????????? ?????????????? ????????????????. </para> +>????, ?? ?????? ??&i18n-knavalbattle;?? ?????????? ?????????????? ????????????????. </para> </answer> </qandaentry> @@ -603,7 +602,7 @@ >???????????? ?? ????????????????????????</title> <para ->?? &knavalbattle;, 2000???2007</para> +>?? &i18n-knavalbattle;, 2000???2007</para> <itemizedlist> <title diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/po/zh_CN/knavalbattle.po new/knavalbattle-21.04.0/po/zh_CN/knavalbattle.po --- old/knavalbattle-20.12.3/po/zh_CN/knavalbattle.po 2021-03-02 01:44:41.000000000 +0100 +++ new/knavalbattle-21.04.0/po/zh_CN/knavalbattle.po 2021-04-16 10:41:47.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2020-05-12 03:22+0200\n" -"PO-Revision-Date: 2021-02-04 12:01\n" +"PO-Revision-Date: 2021-03-27 17:31\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/src/CMakeLists.txt new/knavalbattle-21.04.0/src/CMakeLists.txt --- old/knavalbattle-20.12.3/src/CMakeLists.txt 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/src/CMakeLists.txt 2021-04-14 17:19:15.000000000 +0200 @@ -40,7 +40,7 @@ ) ecm_setup_version(${PROJECT_VERSION} VARIABLE_PREFIX KNAVALBATTLE VERSION_HEADER knavalbattle_version.h) -ecm_qt_declare_logging_category(knavalbattle_SRCS HEADER knavalbattle_debug.h IDENTIFIER KNAVALBATTLE_LOG CATEGORY_NAME org.kde.kdegames.knavalbattle) +ecm_qt_declare_logging_category(knavalbattle_SRCS HEADER knavalbattle_debug.h IDENTIFIER KNAVALBATTLE_LOG CATEGORY_NAME org.kde.kdegames.knavalbattle DESCRIPTION "knavalbattle (kdegames)" EXPORT KNAVALBATTLE) kconfig_add_kcfg_files(knavalbattle_SRCS settingsbase.kcfgc) file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../data/pictures/*-apps-knavalbattle.png") ecm_add_app_icon(knavalbattle_SRCS ICONS ${ICONS_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/src/button.h new/knavalbattle-21.04.0/src/button.h --- old/knavalbattle-20.12.3/src/button.h 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/src/button.h 2021-04-14 17:19:15.000000000 +0200 @@ -44,7 +44,6 @@ QWidget* m_editor; - QPoint textPos() const; void computeSize(); public: Button(QGraphicsItem* parent, const QIcon& icon, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/knavalbattle-20.12.3/src/org.kde.knavalbattle.appdata.xml new/knavalbattle-21.04.0/src/org.kde.knavalbattle.appdata.xml --- old/knavalbattle-20.12.3/src/org.kde.knavalbattle.appdata.xml 2021-02-25 00:24:35.000000000 +0100 +++ new/knavalbattle-21.04.0/src/org.kde.knavalbattle.appdata.xml 2021-04-14 17:19:15.000000000 +0200 @@ -121,9 +121,9 @@ <content_attribute id="violence-cartoon">mild</content_attribute> </content_rating> <releases> + <release version="2.1.21040" date="2021-04-22"/> <release version="2.1.20123" date="2021-03-04"/> <release version="2.1.20122" date="2021-02-04"/> <release version="2.1.20121" date="2021-01-07"/> - <release version="2.1.20120" date="2020-12-10"/> </releases> </component>
