[WebKit-devel] playground/libs/webkitkde/part

Sat Jan 30 19:07:05 CET 2010

Looks fine to me...

On Saturday 30 January 2010 08:54:38 you wrote:
> SVN commit 1082413 by uwolfer:
> 
> * fix i18n calls (Dawit, please see this commit for correct ussage with
> args) * better includes order
> 
> CCMAIL:adawit at kde.org
> 
>  M  +1 -1      kwebkitpart.cpp
>  M  +4 -4      ui/passwordbar.cpp
>  M  +1 -1      ui/searchbar.cpp
>  M  +1 -1      webview.cpp
> 
> 
> --- trunk/playground/libs/webkitkde/part/kwebkitpart.cpp #1082412:1082413
> @@ -25,8 +25,8 @@
> 
>  #include "kwebkitpart.h"
> 
> +#include "kwebkitpart_p.h"
>  #include "kwebkitpart_ext.h"
> -#include "kwebkitpart_p.h"
>  #include "webview.h"
>  #include "webpage.h"
>  #include "websslinfo.h"
> --- trunk/playground/libs/webkitkde/part/ui/passwordbar.cpp
> #1082412:1082413 @@ -19,8 +19,8 @@
>   * Boston, MA 02110-1301, USA.
>   */
> 
> +#include "passwordbar.h"
>  #include "ui_passwordbar.h"
> -#include "passwordbar.h"
> 
>  #include "settings/webkitsettings.h"
> 
> @@ -85,9 +85,9 @@
>      d->url = url;
>      d->requestKey = key;
>      d->ui.infoLabel->setText(i18n("<html>Do you want %1 to remember the
> login " -                                  "information for
> <b>%2</b>?</html>") -                            
> .arg(QCoreApplication::applicationName()) -                            
> .arg(url.host()));
> +                                  "information for <b>%2</b>?</html>",
> +                                  QCoreApplication::applicationName(),
> +                                  url.host()));
> 
>      if (WebKitSettings::self()->isNonPasswordStorableSite(url.host()))
>        onNotNowButtonClicked();
> --- trunk/playground/libs/webkitkde/part/ui/searchbar.cpp #1082412:1082413
> @@ -23,8 +23,8 @@
>   *
>   */
> 
> +#include "searchbar.h"
>  #include "ui_searchbar.h"
> -#include "searchbar.h"
> 
>  #include <QResizeEvent>
>  #include <QShortcut>
> --- trunk/playground/libs/webkitkde/part/webview.cpp #1082412:1082413
> @@ -252,7 +252,7 @@
>          partActions.append(action);
> 
>          if (!d->actionCollection->action("viewimage")) {
> -            action = new KAction(i18n("View Image
> (%1)").arg(KUrl(d->result.imageUrl()).fileName()), this); +           
> action = new KAction(i18n("View Image (%1)",
> KUrl(d->result.imageUrl()).fileName()), this);
> d->actionCollection->addAction("viewimage", action);
>              connect(action, SIGNAL(triggered(bool)),
> d->part->browserExtension(), SLOT(slotViewImage())); }