[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Fwd: Re: branches/KDE/3.4/kdenetwork/kopete/protocols/jabber
From:       Till Gerken <till () tantalo ! net>
Date:       2005-05-29 16:57:18
Message-ID: 200505291857.19069.till () tantalo ! net
[Download RAW message or body]

Hello,

I have backported a bugfix to the 3.4 branch and was unaware of the fact that 
strings in branch are frozen. Matt Rogers notified me of this, you can find 
my commit below. It has two added strings.

Please let me know if this is ok or if I should revert the patch. Since I am 
not subscribed to this list, CC me on any reply.

Thanks!

Till

----------  Forwarded Message  ----------

Subject: Re: branches/KDE/3.4/kdenetwork/kopete/protocols/jabber
Date: Sunday 29 May 2005 17:34
From: Matt Rogers <mattr@kde.org>
To: kde-commits@kde.org, Till Gerken <till@tantalo.net>

On Sunday 29 May 2005 08:00 am, Till Gerken wrote:
> SVN commit 419439 by gerken:
>
> Backport fix for #92391. (display group chat error messages)
>
>
>  M  +9 -3      jabberaccount.cpp
>
>
> --- branches/KDE/3.4/kdenetwork/kopete/protocols/jabber/jabberaccount.cpp
> #419438:419439 @@ -1768,10 +1768,16 @@
>
>  }
>
> -void JabberAccount::slotGroupChatError (const XMPP::Jid & /*jid*/, int
> /*error*/, const QString & /*reason*/) +void
> JabberAccount::slotGroupChatError (const XMPP::Jid &jid, int error, const
> QString &reason) {
> - /* FIXME: Present this to the user, damnit! */
> -//  kdDebug (JABBER_DEBUG_GLOBAL) << "[JabberAccount] Group chat error -
> room " << jid.userHost () << " had error " << error << " (" << reason <<
> ")!" << endl; + kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Group chat
> error - room " << jid.full () << " had error " << error << " (" << reason
> << ")" << endl; +
> + QString detailedReason = reason.isEmpty () ? i18n ( "No reason given by
> the server" ) : reason; +
> + KMessageBox::queuedMessageBox ( Kopete::UI::Global::mainWidget (),
> +         KMessageBox::Error,
> +         i18n ("There was an error processing your request for group chat
> %1. (Reason: %2, Code %3)").arg ( jid.full (), detailedReason,
> QString::number ( error ) ), +         i18n ("Jabber Group Chat") );
>  }
>
>  void JabberAccount::slotResourceAvailable (const XMPP::Jid & jid, const
> XMPP::Resource & resource)

That looks like it might be a new string. The KDE 3.4 branch is still
string-frozen. We might need to revert that part unless you can get approval
for the new string from kde-i18n-doc.

Thanks,
Matt

-------------------------------------------------------
[prev in list] [next in list] [prev in thread] [next in thread]