--nextPart16578585.vIShVAPRbn
Content-Type: multipart/mixed;
  boundary="Boundary-01=_H+aLEEhhfjQqyar"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

--Boundary-01=_H+aLEEhhfjQqyar
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

I'm a little fuzzy on how things ought to be developed right now. When shou=
ld=20
things in kdebase be ported to kdelibs trunk? For instance, the attached=20
patch brings libkonq up to date wrt. Chuslove's i18n changes from tuesday.=
=20
Should I wait with that until the libs snapshot is updated?

Similarly, there's Hamish's KAction changes, which break libkonq as well, i=
n=20

popup.insertItem(SmallIconSet("goto"), i18n( "&Move Here" ) + "\t" +
 KKey::modFlagLabel( KKey::SHIFT ), 2 );

OK, so KKey::SHIFT is now Qt::SHIFT, but what about modFlagLabel()? It wasn=
't=20
in the 3.5 API, so it's vanished again without being documented.

=2D-=20
These are your friends - Adem
    GPG: FEA2 A3FE Adriaan de Groot

--Boundary-01=_H+aLEEhhfjQqyar
Content-Type: text/x-diff;
  charset="us-ascii";
  name="libkonq.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="libkonq.diff"

Index: libkonq/konq_operations.cc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- libkonq/konq_operations.cc	(revision 525135)
+++ libkonq/konq_operations.cc	(working copy)
@@ -273,7 +273,7 @@
       {
       case DEL:
           result =3D KMessageBox::warningContinueCancelList( 0,
=2D             	i18n( "Do you really want to delete this item?", "Do you r=
eally want to delete these %n items?", prettyList.count()),
+             	i18np( "Do you really want to delete this item?", "Do you re=
ally want to delete these %n items?", prettyList.count()),
              	prettyList,
 		i18n( "Delete Files" ),
 		KStdGuiItem::del(),
@@ -282,7 +282,7 @@
=20
       case SHRED:
           result =3D KMessageBox::warningContinueCancelList( 0,
=2D                i18n( "Do you really want to shred this item?", "Do you =
really want to shred these %n items?", prettyList.count()),
+                i18np( "Do you really want to shred this item?", "Do you r=
eally want to shred these %n items?", prettyList.count()),
                 prettyList,
                 i18n( "Shred Files" ),
 		KGuiItem( i18n( "Shred" ), "editshred" ),
@@ -292,10 +292,10 @@
       case MOVE:
       default:
           result =3D KMessageBox::warningContinueCancelList( 0,
=2D                i18n( "Do you really want to move this item to the trash=
?", "Do you really want to move these %n items to the trash?", prettyList.c=
ount()),
+                i18np( "Do you really want to move this item to the trash?=
", "Do you really want to move these %n items to the trash?", prettyList.co=
unt()),
                 prettyList,
 		i18n( "Move to Trash" ),
=2D		KGuiItem( i18n( "Verb", "&Trash" ), "edittrash"),
+		KGuiItem( i18nc( "Verb", "&Trash" ), "edittrash"),
 		keyName, KMessageBox::Dangerous);
       }
       if (!keyName.isEmpty())

--Boundary-01=_H+aLEEhhfjQqyar--

--nextPart16578585.vIShVAPRbn
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)

iD8DBQBELa+HdqzuAf6io/4RAlf+AKCIBcoiP01rn9Rl4fJ+Lcguv9X7jACfVpJP
ewox1/rQi/sdxbWc1B+UaaI=
=xCa4
-----END PGP SIGNATURE-----

--nextPart16578585.vIShVAPRbn--