Version: (using KDE KDE 3.5.1) Installed from: Compiled From Sources usual evening bugreport for annma ;) svn diff follows
Created attachment 14488 [details] patch for khangman docs In addition the khangman toolbar "Special Characters" is not translated Just a guess: khangman.cpp:secondToolbar = toolBar("Special Characters"); i18n call missing?
For the missing translation of the toolbar name, I need to add the toolbar in khangmanui.rc file. <ToolBar name="secondToolBar" noMerge="1"><text>Special Characters</text> </ToolBar> Stupid mistake from me! However, am I allowed to add this string now? and to fix the doc now for kde 3.5.2?
>However, am I allowed to add this string now? I believe yes, according to section 11.5 "Fixes during message freeze" in http://developer.kde.org/documentation/library/kdeqt/kde3arch/kde-i18n-howto.html >and to fix the doc now for kde 3.5.2? No, review the patch, commit to trunk, vote here (http://lists.kde.org/?l=kde-i18n-doc&m=113827195123600&w=2) for a message unfreeze, I would like to backport this patch together with my other doc patches to 3.5, when possible.
SVN commit 504921 by annma: fix part of 121179 untranslated string CCBUG=121179 M +1 -1 khangman.cpp M +4 -0 khangmanui.rc --- branches/KDE/3.5/kdeedu/khangman/khangman/khangman.cpp #504920:504921 @@ -56,7 +56,7 @@ setupActions(); // Toolbar for special characters - secondToolbar = toolBar("Special Characters"); + secondToolbar = toolBar("secondToolBar"); secondToolbar->setBarPos(KToolBar::Bottom); loadSettings(); setAccent(); --- branches/KDE/3.5/kdeedu/khangman/khangman/khangmanui.rc #504920:504921 @@ -34,4 +34,8 @@ <Action name="file_new"/> <Action name="file_quit"/> </ToolBar> + +<ToolBar name="secondToolBar" noMerge="1"><text>Special Characters</text> +</ToolBar> + </kpartgui>
Created attachment 14548 [details] new patch for the docs some more correction, please review and commit to trunk
SVN commit 505774 by annma: fix 121179 to trunk, thanks to Burkhard! CCMAIL=121179 M +39 -35 index.docbook
SVN commit 505787 by annma: forward port 121179 to trunk CCMAIL=121179 Now if a doc unfreeze is allowed for 3.5.2 the doc should be patched here. M +1 -1 khangman.cpp M +4 -0 khangmanui.rc M +8 -9 khangmanview.cpp --- trunk/KDE/kdeedu/khangman/khangman/khangman.cpp #505786:505787 @@ -54,7 +54,7 @@ setupActions(); // Toolbar for special characters - secondToolbar = toolBar("Special Characters"); + secondToolbar = toolBar("secondToolBar"); secondToolbar->setBarPos(KToolBar::Bottom); loadSettings(); --- trunk/KDE/kdeedu/khangman/khangman/khangmanui.rc #505786:505787 @@ -34,4 +34,8 @@ <Action name="file_new"/> <Action name="file_quit"/> </ToolBar> + +<ToolBar name="secondToolBar" noMerge="1"><text>Special Characters</text> + </ToolBar> + </kpartgui> --- trunk/KDE/kdeedu/khangman/khangman/khangmanview.cpp #505786:505787 @@ -25,15 +25,14 @@ #include <kpushbutton.h> #include <kstandarddirs.h> -#include <qimage.h> -#include <qlabel.h> -#include <qpainter.h> -#include <qpoint.h> -#include <qregexp.h> -#include <qtimer.h> -#include <qtooltip.h> -#include <kvbox.h> -#include <qwidget.h> +#include <QImage> +#include <QLabel> +#include <QPainter> +#include <QPoint> +#include <QRegExp> +#include <QTimer> +#include <QToolTip> +#include <QWidget> #include <QMouseEvent> //project headers #include "prefs.h"
SVN commit 509101 by annma: backport bug 121179 CCBUG=121179 M +35 -32 index.docbook
Can be closed now that all is fixed in both trunk and 3.5 branch.
Created attachment 14834 [details] svn diff for khangman docs I missed some fixes from my first attachment 14548 [details]
SVN commit 512912 by annma: improve thanks to Burkhard CCBUG=121179 M +13 -13 index.docbook --- branches/KDE/3.5/kdeedu/doc/khangman/index.docbook #512911:512912 @@ -341,7 +341,7 @@ A toolbar is provided for quick access to some settings. You can click on a button to have a new game (i.e. a new word), or to quit the game. The level and the theme are easily changed via 2 combo boxes on the toolbar. </para> <para> -In <guimenu>Settings</guimenu>, <guimenu>Configure &khangman;</guimenu> you will find two tabs. The first one is for General settings. +In <guimenu>Settings</guimenu>, <guimenu>Configure &khangman;</guimenu> you will find tree pages. The first one is for <guilabel>General</guilabel> settings. </para> <sect2 id="general-settings"> @@ -359,20 +359,20 @@ </mediaobject> </screenshot> -<para><guimenu>Require more guesses for duplicate letters</guimenu>: this is unchecked as default. When unchecked, if you try the letter "a" and the word has several as, they will be all displayed. For example if the word is "potato" and you try "o", both os will be diaplayed. If you check this option however, only the firts "o" will be displayed and you will have to try it one more time to display the second "o" in "potato". This increases the difficulty. +<para><guilabel>Require more guesses for duplicate letters</guilabel>: this is unchecked as default. When unchecked, if you try the letter "a" and the word has several as, they will be all displayed. For example if the word is "potato" and you try "o", both os will be diaplayed. If you check this option however, only the firts "o" will be displayed and you will have to try it one more time to display the second "o" in "potato". This increases the difficulty. </para> -<para><guimenu>Do not display the 'Congratulations! You won!' dialog</guimenu>: the default is unchecked, that means that when you win a game, a message box will be displayed to tell you that you won and ask you if you want to play again. If you check this option, this dialog is not displayed anymore, instead a new game starts directly after 3 seconds. +<para><guilabel>Do not display the 'Congratulations! You won!' dialog</guilabel>: the default is unchecked, that means that when you win a game, a message box will be displayed to tell you that you won and ask you if you want to play again. If you check this option, this dialog is not displayed anymore, instead a new game starts directly after 3 seconds. </para> <para> -In the Sounds section, if you check <guimenu>Enable sounds</guimenu> then a sound will be played on new game and another sound will be played when you win a game. +In the Sounds section, if you check <guilabel>Enable sounds</guilabel> then a sound will be played on new game and another sound will be played when you win a game. </para> </sect2> <sect2 id="languages-settings"> <title>Languages Settings</title> -<para>The Languages Settings tab allows you to set some settings specific to some languages. If the settings are not available for the language you are playing in then those settings will be grayed and disabled so you cannot choose them. +<para>The <guilabel>Languages</guilabel> Settings tab allows you to set some settings specific to some languages. If the settings are not available for the language you are playing in then those settings will be grayed and disabled so you cannot choose them. </para> <screenshot> @@ -388,7 +388,7 @@ </screenshot> <para> -Some languages also have hints to help you guess the word. The hint is shown by a right-click and gives a short definition of the word to guess. If this setting is enabled and if you check the option <guimenu>Show hints</guimenu>, you can &RMB; click anywhere on the game and get a hint shown for four seconds. This hint should help you to guess the word more easily. +Some languages also have hints to help you guess the word. The hint is shown by a right-click and gives a short definition of the word to guess. If this setting is enabled and if you check the option <guilabel>Show hints</guilabel>, you can &RMB; click anywhere on the game and get a hint shown for four seconds. This hint should help you to guess the word more easily. </para> <para><guilabel>Type accented letters</guilabel> is available for Brazilian Portuguese, Catalan, Portuguese and Spanish in &khangman;'s configuration dialog. If you check <guilabel>Type accented letters</guilabel> then you will have to type all accented vowels (like ã). If this remains unchecked, when you type any vowel, all accented vowels will be displayed as well. @@ -398,7 +398,7 @@ <sect2 id="timers-settings"> <title>Timers Settings</title> -<para>The Timers Settings tab allows you to set the time for displaying the hint and the Already Guessed Letter tooltip. +<para>The <guilabel>Timers</guilabel> Settings tab allows you to set the time for displaying the hint and the Already Guessed Letter tooltip. </para> <screenshot> @@ -430,7 +430,7 @@ <title>Command Reference</title> <sect1 id="khangman-mainwindow"> -<title>Menus and shortcut keys</title> +<title>Menus and Shortcut Keys</title> <sect2> <title>The <guimenu>Game</guimenu> Menu</title> @@ -576,19 +576,19 @@ <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Toolbars...</guimenuitem> +<guimenuitem>Configure Shortcuts...</guimenuitem> </menuchoice></term> -<listitem><para><action>Configure</action> the items you want to put in the toolbar +<listitem><para><action>Open</action> standard &kde; setting dialog that allows you to +choose different shortcut keys for different actions. </para></listitem> </varlistentry> <varlistentry> <term><menuchoice> <guimenu>Settings</guimenu> -<guimenuitem>Configure Shortcuts...</guimenuitem> +<guimenuitem>Configure Toolbars...</guimenuitem> </menuchoice></term> -<listitem><para><action>Open</action> standard &kde; setting dialog that allows you to -choose different shortcut keys for different actions. +<listitem><para><action>Configure</action> the items you want to put in the toolbar </para></listitem> </varlistentry>