diff options
678 files changed, 29425 insertions, 27366 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index d4bcdede52ca..b110398033b3 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -50,6 +50,10 @@ USE_KDELIBS_VER=3 CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +## Every KDE application is inherently IPv6-capable + +CATEGORIES+=ipv6 + ## XXX - This really belongs into bsd.port.mk .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= @@ -97,7 +101,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.4 +KDE_VERSION= 3.5.5 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -125,7 +129,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ + QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" .endif # !defined(QT_NONSTANDARD) .else IGNORE= cannot install: unsupported value of USE_QT_VER diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index d4bcdede52ca..b110398033b3 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -50,6 +50,10 @@ USE_KDELIBS_VER=3 CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" +## Every KDE application is inherently IPv6-capable + +CATEGORIES+=ipv6 + ## XXX - This really belongs into bsd.port.mk .if !defined(_NO_KDE_CONFTARGET_HACK) CONFIGURE_TARGET= @@ -97,7 +101,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.5.4 +KDE_VERSION= 3.5.5 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -125,7 +129,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ + QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}" .endif # !defined(QT_NONSTANDARD) .else IGNORE= cannot install: unsupported value of USE_QT_VER @@ -6,6 +6,18 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20061219: + AFFECTS: users of x11/kdebase3 + AUTHOR: kde@FreeBSD.org + + If you choose to enable the HAL backend for the media kioslave, + you should enable dbus, hal and policy kit during system startup. + To do this, add the following lines to /etc/rc.conf: + + dbus_enable="YES" + polkitd_enable="YES" + hald_enable="YES" + 20061212: AFFECTS: users of net/smokeping AUTHOR: lth@FreeBSD.org diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kaccessible/distinfo +++ b/accessibility/kaccessible/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/accessibility/kdeaccessibility/distinfo b/accessibility/kdeaccessibility/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kdeaccessibility/distinfo +++ b/accessibility/kdeaccessibility/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/accessibility/kdeaccessibility4/distinfo b/accessibility/kdeaccessibility4/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kdeaccessibility4/distinfo +++ b/accessibility/kdeaccessibility4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kmag/distinfo +++ b/accessibility/kmag/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kmousetool/distinfo +++ b/accessibility/kmousetool/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo index f4e9e727f978..5d4e5ff1c639 100644 --- a/accessibility/kmouth/distinfo +++ b/accessibility/kmouth/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.4.tar.bz2) = bc64350a56a585e4d2c88fe3fc8b24f8 -SHA256 (KDE/kdeaccessibility-3.5.4.tar.bz2) = aec74ce2635e76a9ce50ec754eb76482efd3f8e671aa45c805d7d0fa50b8b29e -SIZE (KDE/kdeaccessibility-3.5.4.tar.bz2) = 8603442 +MD5 (KDE/kdeaccessibility-3.5.5.tar.bz2) = a227e65e012b83c8635f6e16c4dc3259 +SHA256 (KDE/kdeaccessibility-3.5.5.tar.bz2) = c7f7ac0b1b2fb19e1ca22209e14bb12108094d5b12574ce2cf9683a497233030 +SIZE (KDE/kdeaccessibility-3.5.5.tar.bz2) = 8610846 diff --git a/arabic/kde3-i18n/distinfo b/arabic/kde3-i18n/distinfo index bbf468feed3b..bbe11ee0e528 100644 --- a/arabic/kde3-i18n/distinfo +++ b/arabic/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = d537027991c11417e4d3ede0ced3c142 -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = 4cd15ac0fc9821223437bfcd1df63319ce36c7885417b52454547aafb048fc07 -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = 1646247 +MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 237879698e967ba9384b6800f8517ce2 +SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = bd63cd5946a5ae1a6b843333f37d555956f2d6d8941626b5c8f8fcbaf3afe98d +SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 1646611 diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo index bbf468feed3b..bbe11ee0e528 100644 --- a/arabic/kde4-l10n/distinfo +++ b/arabic/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = d537027991c11417e4d3ede0ced3c142 -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = 4cd15ac0fc9821223437bfcd1df63319ce36c7885417b52454547aafb048fc07 -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.4.tar.bz2) = 1646247 +MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 237879698e967ba9384b6800f8517ce2 +SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = bd63cd5946a5ae1a6b843333f37d555956f2d6d8941626b5c8f8fcbaf3afe98d +SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.5.tar.bz2) = 1646611 diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/audio/arts/Makefile b/audio/arts/Makefile index 36b04ce22f09..fa4f4355b6fa 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -7,7 +7,7 @@ # PORTNAME= arts -PORTVERSION= 1.5.4 +PORTVERSION= 1.5.5 PORTEPOCH= 1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -47,7 +47,7 @@ OPTIONS= ESD "Enable esound support" off \ .include <bsd.port.pre.mk> .if ${ARCH} == "i386" || ${ARCH} == "amd64" -.if ${OSVERSION} > 502102 +.if (${OSVERSION} < 500000 ) || (${OSVERSION} > 502102 ) LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .endif .endif diff --git a/audio/arts/distinfo b/audio/arts/distinfo index 54b45132bbe5..d424862e9a9b 100644 --- a/audio/arts/distinfo +++ b/audio/arts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/arts-1.5.4.tar.bz2) = 886ba4a13dc0da312d94c09f50c3ffe6 -SHA256 (KDE/arts-1.5.4.tar.bz2) = a5bdd1a9fd0cf6886b6e4dffb4d02f82ff60964fb2af276d86cd37b71a6cf74c -SIZE (KDE/arts-1.5.4.tar.bz2) = 967063 +MD5 (KDE/arts-1.5.5.tar.bz2) = 3b0aa1ee08c6ef2aefd8d2d88d1ec146 +SHA256 (KDE/arts-1.5.5.tar.bz2) = 2e5d5f07078ac79911815c25c6768b7fbf3c54989a4fc5b52a07e4a73b50aec1 +SIZE (KDE/arts-1.5.5.tar.bz2) = 967552 diff --git a/audio/jack/Makefile b/audio/jack/Makefile index 8ff82f2f039d..318cf329ad8f 100644 --- a/audio/jack/Makefile +++ b/audio/jack/Makefile @@ -81,8 +81,8 @@ post-patch: post-build: @${RM} -f ${WRKSRC}/doc/reference/html/dir__2F* -.if ${OSVERSION} < 500000 -BROKEN= Does not compile on 4.x -.endif +#.if ${OSVERSION} < 500000 +#BROKEN= Does not compile on 4.x +#.endif .include <bsd.port.post.mk> diff --git a/audio/juk/distinfo b/audio/juk/distinfo index a3c9dfa3cb96..9b50fd30006c 100644 --- a/audio/juk/distinfo +++ b/audio/juk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 -SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b -SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 +MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba +SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c +SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 diff --git a/audio/mpeglib_artsplug/distinfo b/audio/mpeglib_artsplug/distinfo index a3c9dfa3cb96..9b50fd30006c 100644 --- a/audio/mpeglib_artsplug/distinfo +++ b/audio/mpeglib_artsplug/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 -SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b -SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 +MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba +SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c +SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile index 740dd398762b..51c2f5739ff0 100644 --- a/chinese/calligra-l10n-zh_CN/Makefile +++ b/chinese/calligra-l10n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/calligra-l10n-zh_CN/distinfo b/chinese/calligra-l10n-zh_CN/distinfo index 350c1b4e2110..83fe79adc6f7 100644 --- a/chinese/calligra-l10n-zh_CN/distinfo +++ b/chinese/calligra-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = e2de60faab2bc7049e2b4af6827cbe8e -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = c647fb47de4011651fe75e91d419c062e9071feab18fe20b889411e40b799661 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = 345247 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 diff --git a/chinese/calligra-l10n-zh_CN/pkg-plist b/chinese/calligra-l10n-zh_CN/pkg-plist index a6ae7f0b275a..0b464a615910 100644 --- a/chinese/calligra-l10n-zh_CN/pkg-plist +++ b/chinese/calligra-l10n-zh_CN/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo share/locale/zh_CN/LC_MESSAGES/example.mo share/locale/zh_CN/LC_MESSAGES/karbon.mo share/locale/zh_CN/LC_MESSAGES/kchart.mo +share/locale/zh_CN/LC_MESSAGES/kdgantt.mo share/locale/zh_CN/LC_MESSAGES/kexi.mo share/locale/zh_CN/LC_MESSAGES/kfile_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile index f71d18687493..e83e9975bfd3 100644 --- a/chinese/calligra-l10n-zh_TW/Makefile +++ b/chinese/calligra-l10n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo index 87e6dc793a73..1fc0c8365c79 100644 --- a/chinese/calligra-l10n-zh_TW/distinfo +++ b/chinese/calligra-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = a39dcaf36d9361d2915399ee0dce0cc0 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 1ed7cb81231d527bc035daac306432e6a11e71a4a5ce18d566243bbc686b51ff -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 358934 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 diff --git a/chinese/calligra-l10n-zh_TW/pkg-plist b/chinese/calligra-l10n-zh_TW/pkg-plist index b84480f92d10..2a1040f2cfdc 100644 --- a/chinese/calligra-l10n-zh_TW/pkg-plist +++ b/chinese/calligra-l10n-zh_TW/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo +share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/kde3-i18n-zh_CN/distinfo b/chinese/kde3-i18n-zh_CN/distinfo index 1367852b93dc..d8c95ea76e1e 100644 --- a/chinese/kde3-i18n-zh_CN/distinfo +++ b/chinese/kde3-i18n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = c1f8e26b1129513ef83357c65ab2db94 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = 2df724ec73a7491958481b860bc5f97effdf779ed01afb7179af98cba3928c5c -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = 1956124 +MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = c0df78b39982a1ba117539e86c0dabb8 +SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 9eb31fe27bb140c858bc8a17b149eb9e410e907033757cfcff9689597a872675 +SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 1969823 diff --git a/chinese/kde3-i18n-zh_TW/distinfo b/chinese/kde3-i18n-zh_TW/distinfo index 6b5a13ebb175..50347a0ac13b 100644 --- a/chinese/kde3-i18n-zh_TW/distinfo +++ b/chinese/kde3-i18n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = 8893190922de3905ebd909ad58e45dc9 -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = a93c82ea768dc87865a08d3a54e1f6c6e110ea3ea6804bb3410033cd309cceaf -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = 1816512 +MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 6c1051a985f68563380844dec9080248 +SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 0ead24dca3410ae0dd9f022964dc17398dbeea62ab19bc16a47d34c6bc386d14 +SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 2111961 diff --git a/chinese/kde3-i18n-zh_TW/pkg-plist b/chinese/kde3-i18n-zh_TW/pkg-plist index 629f07546488..298fd8702f3b 100644 --- a/chinese/kde3-i18n-zh_TW/pkg-plist +++ b/chinese/kde3-i18n-zh_TW/pkg-plist @@ -4,6 +4,29 @@ share/doc/HTML/zh_TW/docs/common/kde-localised.css share/doc/HTML/zh_TW/docs/common/lgpl-translated.html share/doc/HTML/zh_TW/docs/common/logotp3.png share/doc/HTML/zh_TW/khelpcenter/contact.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/about.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/common +share/doc/HTML/zh_TW/khelpcenter/faq/configkde.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/contrib.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/desktop.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/filemng.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/getkde.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/index.cache.bz2 +share/doc/HTML/zh_TW/khelpcenter/faq/index.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/install.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/intro.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/kdeapps.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/misc.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/moreinfo.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/nonkdeapps.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/notrelated.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/panel.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/qt.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/questions.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/sound.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/tips.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/webbrowse.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/winmng.docbook share/doc/HTML/zh_TW/khelpcenter/help.docbook share/doc/HTML/zh_TW/khelpcenter/links.docbook share/doc/HTML/zh_TW/khelpcenter/support.docbook @@ -190,6 +213,8 @@ share/locale/zh_TW/LC_MESSAGES/kdesktop.mo share/locale/zh_TW/LC_MESSAGES/kdessh.mo share/locale/zh_TW/LC_MESSAGES/kdesu.mo share/locale/zh_TW/LC_MESSAGES/kdesud.mo +share/locale/zh_TW/LC_MESSAGES/kdevdesigner.mo +share/locale/zh_TW/LC_MESSAGES/kdevelop.mo share/locale/zh_TW/LC_MESSAGES/kdevtipofday.mo share/locale/zh_TW/LC_MESSAGES/kdf.mo share/locale/zh_TW/LC_MESSAGES/kdgantt.mo @@ -255,6 +280,7 @@ share/locale/zh_TW/LC_MESSAGES/kfile_wav.mo share/locale/zh_TW/LC_MESSAGES/kfile_xbm.mo share/locale/zh_TW/LC_MESSAGES/kfile_xpm.mo share/locale/zh_TW/LC_MESSAGES/kfileaudiopreview.mo +share/locale/zh_TW/LC_MESSAGES/kfilereplace.mo share/locale/zh_TW/LC_MESSAGES/kfileshare.mo share/locale/zh_TW/LC_MESSAGES/kfindpart.mo share/locale/zh_TW/LC_MESSAGES/kfloppy.mo @@ -279,6 +305,7 @@ share/locale/zh_TW/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_TW/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_TW/LC_MESSAGES/kicker.mo share/locale/zh_TW/LC_MESSAGES/kiconedit.mo +share/locale/zh_TW/LC_MESSAGES/kimagemapeditor.mo share/locale/zh_TW/LC_MESSAGES/kinetd.mo share/locale/zh_TW/LC_MESSAGES/kio.mo share/locale/zh_TW/LC_MESSAGES/kio_audiocd.mo @@ -323,6 +350,7 @@ share/locale/zh_TW/LC_MESSAGES/kleopatra.mo share/locale/zh_TW/LC_MESSAGES/klettres.mo share/locale/zh_TW/LC_MESSAGES/klickety.mo share/locale/zh_TW/LC_MESSAGES/klines.mo +share/locale/zh_TW/LC_MESSAGES/klinkstatus.mo share/locale/zh_TW/LC_MESSAGES/klipper.mo share/locale/zh_TW/LC_MESSAGES/klock.mo share/locale/zh_TW/LC_MESSAGES/kmag.mo @@ -361,6 +389,7 @@ share/locale/zh_TW/LC_MESSAGES/kodo.mo share/locale/zh_TW/LC_MESSAGES/kolf.mo share/locale/zh_TW/LC_MESSAGES/kolourpaint.mo share/locale/zh_TW/LC_MESSAGES/kolourpicker.mo +share/locale/zh_TW/LC_MESSAGES/kommander.mo share/locale/zh_TW/LC_MESSAGES/kompare.mo share/locale/zh_TW/LC_MESSAGES/konnector_dummy.mo share/locale/zh_TW/LC_MESSAGES/konnector_kabc.mo @@ -391,6 +420,7 @@ share/locale/zh_TW/LC_MESSAGES/kpersonalizer.mo share/locale/zh_TW/LC_MESSAGES/kpf.mo share/locale/zh_TW/LC_MESSAGES/kpilot.mo share/locale/zh_TW/LC_MESSAGES/kpoker.mo +share/locale/zh_TW/LC_MESSAGES/kpovmodeler.mo share/locale/zh_TW/LC_MESSAGES/kppp.mo share/locale/zh_TW/LC_MESSAGES/kppplogview.mo share/locale/zh_TW/LC_MESSAGES/kprinter.mo @@ -489,6 +519,7 @@ share/locale/zh_TW/LC_MESSAGES/kworldclock.mo share/locale/zh_TW/LC_MESSAGES/kwriteconfig.mo share/locale/zh_TW/LC_MESSAGES/kxkb.mo share/locale/zh_TW/LC_MESSAGES/kxsconfig.mo +share/locale/zh_TW/LC_MESSAGES/kxsldbg.mo share/locale/zh_TW/LC_MESSAGES/libKTTSD.mo share/locale/zh_TW/LC_MESSAGES/libdmctl.mo share/locale/zh_TW/LC_MESSAGES/libkaddrbk_geo_xxport.mo @@ -549,6 +580,7 @@ share/locale/zh_TW/LC_MESSAGES/tippecanoe.mo share/locale/zh_TW/LC_MESSAGES/trashapplet.mo share/locale/zh_TW/LC_MESSAGES/tyler.mo share/locale/zh_TW/LC_MESSAGES/uachangerplugin.mo +share/locale/zh_TW/LC_MESSAGES/umbrello.mo share/locale/zh_TW/LC_MESSAGES/useraccount.mo share/locale/zh_TW/LC_MESSAGES/validatorsplugin.mo share/locale/zh_TW/LC_MESSAGES/wakeup.mo @@ -557,6 +589,7 @@ share/locale/zh_TW/LC_MESSAGES/webarchiver.mo share/locale/zh_TW/charset share/locale/zh_TW/entry.desktop share/locale/zh_TW/flag.png +@dirrm share/doc/HTML/zh_TW/khelpcenter/faq @dirrm share/doc/HTML/zh_TW/khelpcenter @dirrm share/doc/HTML/zh_TW/docs/common @dirrm share/doc/HTML/zh_TW/docs diff --git a/chinese/kde4-l10n-zh_CN/distinfo b/chinese/kde4-l10n-zh_CN/distinfo index 1367852b93dc..d8c95ea76e1e 100644 --- a/chinese/kde4-l10n-zh_CN/distinfo +++ b/chinese/kde4-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = c1f8e26b1129513ef83357c65ab2db94 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = 2df724ec73a7491958481b860bc5f97effdf779ed01afb7179af98cba3928c5c -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.4.tar.bz2) = 1956124 +MD5 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = c0df78b39982a1ba117539e86c0dabb8 +SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 9eb31fe27bb140c858bc8a17b149eb9e410e907033757cfcff9689597a872675 +SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.5.tar.bz2) = 1969823 diff --git a/chinese/kde4-l10n-zh_TW/distinfo b/chinese/kde4-l10n-zh_TW/distinfo index 6b5a13ebb175..50347a0ac13b 100644 --- a/chinese/kde4-l10n-zh_TW/distinfo +++ b/chinese/kde4-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = 8893190922de3905ebd909ad58e45dc9 -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = a93c82ea768dc87865a08d3a54e1f6c6e110ea3ea6804bb3410033cd309cceaf -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.4.tar.bz2) = 1816512 +MD5 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 6c1051a985f68563380844dec9080248 +SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 0ead24dca3410ae0dd9f022964dc17398dbeea62ab19bc16a47d34c6bc386d14 +SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.5.tar.bz2) = 2111961 diff --git a/chinese/kde4-l10n-zh_TW/pkg-plist b/chinese/kde4-l10n-zh_TW/pkg-plist index 629f07546488..298fd8702f3b 100644 --- a/chinese/kde4-l10n-zh_TW/pkg-plist +++ b/chinese/kde4-l10n-zh_TW/pkg-plist @@ -4,6 +4,29 @@ share/doc/HTML/zh_TW/docs/common/kde-localised.css share/doc/HTML/zh_TW/docs/common/lgpl-translated.html share/doc/HTML/zh_TW/docs/common/logotp3.png share/doc/HTML/zh_TW/khelpcenter/contact.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/about.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/common +share/doc/HTML/zh_TW/khelpcenter/faq/configkde.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/contrib.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/desktop.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/filemng.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/getkde.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/index.cache.bz2 +share/doc/HTML/zh_TW/khelpcenter/faq/index.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/install.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/intro.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/kdeapps.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/misc.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/moreinfo.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/nonkdeapps.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/notrelated.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/panel.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/qt.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/questions.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/sound.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/tips.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/webbrowse.docbook +share/doc/HTML/zh_TW/khelpcenter/faq/winmng.docbook share/doc/HTML/zh_TW/khelpcenter/help.docbook share/doc/HTML/zh_TW/khelpcenter/links.docbook share/doc/HTML/zh_TW/khelpcenter/support.docbook @@ -190,6 +213,8 @@ share/locale/zh_TW/LC_MESSAGES/kdesktop.mo share/locale/zh_TW/LC_MESSAGES/kdessh.mo share/locale/zh_TW/LC_MESSAGES/kdesu.mo share/locale/zh_TW/LC_MESSAGES/kdesud.mo +share/locale/zh_TW/LC_MESSAGES/kdevdesigner.mo +share/locale/zh_TW/LC_MESSAGES/kdevelop.mo share/locale/zh_TW/LC_MESSAGES/kdevtipofday.mo share/locale/zh_TW/LC_MESSAGES/kdf.mo share/locale/zh_TW/LC_MESSAGES/kdgantt.mo @@ -255,6 +280,7 @@ share/locale/zh_TW/LC_MESSAGES/kfile_wav.mo share/locale/zh_TW/LC_MESSAGES/kfile_xbm.mo share/locale/zh_TW/LC_MESSAGES/kfile_xpm.mo share/locale/zh_TW/LC_MESSAGES/kfileaudiopreview.mo +share/locale/zh_TW/LC_MESSAGES/kfilereplace.mo share/locale/zh_TW/LC_MESSAGES/kfileshare.mo share/locale/zh_TW/LC_MESSAGES/kfindpart.mo share/locale/zh_TW/LC_MESSAGES/kfloppy.mo @@ -279,6 +305,7 @@ share/locale/zh_TW/LC_MESSAGES/khtmlkttsd.mo share/locale/zh_TW/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/zh_TW/LC_MESSAGES/kicker.mo share/locale/zh_TW/LC_MESSAGES/kiconedit.mo +share/locale/zh_TW/LC_MESSAGES/kimagemapeditor.mo share/locale/zh_TW/LC_MESSAGES/kinetd.mo share/locale/zh_TW/LC_MESSAGES/kio.mo share/locale/zh_TW/LC_MESSAGES/kio_audiocd.mo @@ -323,6 +350,7 @@ share/locale/zh_TW/LC_MESSAGES/kleopatra.mo share/locale/zh_TW/LC_MESSAGES/klettres.mo share/locale/zh_TW/LC_MESSAGES/klickety.mo share/locale/zh_TW/LC_MESSAGES/klines.mo +share/locale/zh_TW/LC_MESSAGES/klinkstatus.mo share/locale/zh_TW/LC_MESSAGES/klipper.mo share/locale/zh_TW/LC_MESSAGES/klock.mo share/locale/zh_TW/LC_MESSAGES/kmag.mo @@ -361,6 +389,7 @@ share/locale/zh_TW/LC_MESSAGES/kodo.mo share/locale/zh_TW/LC_MESSAGES/kolf.mo share/locale/zh_TW/LC_MESSAGES/kolourpaint.mo share/locale/zh_TW/LC_MESSAGES/kolourpicker.mo +share/locale/zh_TW/LC_MESSAGES/kommander.mo share/locale/zh_TW/LC_MESSAGES/kompare.mo share/locale/zh_TW/LC_MESSAGES/konnector_dummy.mo share/locale/zh_TW/LC_MESSAGES/konnector_kabc.mo @@ -391,6 +420,7 @@ share/locale/zh_TW/LC_MESSAGES/kpersonalizer.mo share/locale/zh_TW/LC_MESSAGES/kpf.mo share/locale/zh_TW/LC_MESSAGES/kpilot.mo share/locale/zh_TW/LC_MESSAGES/kpoker.mo +share/locale/zh_TW/LC_MESSAGES/kpovmodeler.mo share/locale/zh_TW/LC_MESSAGES/kppp.mo share/locale/zh_TW/LC_MESSAGES/kppplogview.mo share/locale/zh_TW/LC_MESSAGES/kprinter.mo @@ -489,6 +519,7 @@ share/locale/zh_TW/LC_MESSAGES/kworldclock.mo share/locale/zh_TW/LC_MESSAGES/kwriteconfig.mo share/locale/zh_TW/LC_MESSAGES/kxkb.mo share/locale/zh_TW/LC_MESSAGES/kxsconfig.mo +share/locale/zh_TW/LC_MESSAGES/kxsldbg.mo share/locale/zh_TW/LC_MESSAGES/libKTTSD.mo share/locale/zh_TW/LC_MESSAGES/libdmctl.mo share/locale/zh_TW/LC_MESSAGES/libkaddrbk_geo_xxport.mo @@ -549,6 +580,7 @@ share/locale/zh_TW/LC_MESSAGES/tippecanoe.mo share/locale/zh_TW/LC_MESSAGES/trashapplet.mo share/locale/zh_TW/LC_MESSAGES/tyler.mo share/locale/zh_TW/LC_MESSAGES/uachangerplugin.mo +share/locale/zh_TW/LC_MESSAGES/umbrello.mo share/locale/zh_TW/LC_MESSAGES/useraccount.mo share/locale/zh_TW/LC_MESSAGES/validatorsplugin.mo share/locale/zh_TW/LC_MESSAGES/wakeup.mo @@ -557,6 +589,7 @@ share/locale/zh_TW/LC_MESSAGES/webarchiver.mo share/locale/zh_TW/charset share/locale/zh_TW/entry.desktop share/locale/zh_TW/flag.png +@dirrm share/doc/HTML/zh_TW/khelpcenter/faq @dirrm share/doc/HTML/zh_TW/khelpcenter @dirrm share/doc/HTML/zh_TW/docs/common @dirrm share/doc/HTML/zh_TW/docs diff --git a/chinese/koffice-i18n-zh_CN/Makefile b/chinese/koffice-i18n-zh_CN/Makefile index 740dd398762b..51c2f5739ff0 100644 --- a/chinese/koffice-i18n-zh_CN/Makefile +++ b/chinese/koffice-i18n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-i18n-zh_CN/distinfo b/chinese/koffice-i18n-zh_CN/distinfo index 350c1b4e2110..83fe79adc6f7 100644 --- a/chinese/koffice-i18n-zh_CN/distinfo +++ b/chinese/koffice-i18n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = e2de60faab2bc7049e2b4af6827cbe8e -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = c647fb47de4011651fe75e91d419c062e9071feab18fe20b889411e40b799661 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = 345247 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 diff --git a/chinese/koffice-i18n-zh_CN/pkg-plist b/chinese/koffice-i18n-zh_CN/pkg-plist index a6ae7f0b275a..0b464a615910 100644 --- a/chinese/koffice-i18n-zh_CN/pkg-plist +++ b/chinese/koffice-i18n-zh_CN/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo share/locale/zh_CN/LC_MESSAGES/example.mo share/locale/zh_CN/LC_MESSAGES/karbon.mo share/locale/zh_CN/LC_MESSAGES/kchart.mo +share/locale/zh_CN/LC_MESSAGES/kdgantt.mo share/locale/zh_CN/LC_MESSAGES/kexi.mo share/locale/zh_CN/LC_MESSAGES/kfile_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile index f71d18687493..e83e9975bfd3 100644 --- a/chinese/koffice-i18n-zh_TW/Makefile +++ b/chinese/koffice-i18n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-i18n-zh_TW/distinfo b/chinese/koffice-i18n-zh_TW/distinfo index 87e6dc793a73..1fc0c8365c79 100644 --- a/chinese/koffice-i18n-zh_TW/distinfo +++ b/chinese/koffice-i18n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = a39dcaf36d9361d2915399ee0dce0cc0 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 1ed7cb81231d527bc035daac306432e6a11e71a4a5ce18d566243bbc686b51ff -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 358934 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 diff --git a/chinese/koffice-i18n-zh_TW/pkg-plist b/chinese/koffice-i18n-zh_TW/pkg-plist index b84480f92d10..2a1040f2cfdc 100644 --- a/chinese/koffice-i18n-zh_TW/pkg-plist +++ b/chinese/koffice-i18n-zh_TW/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo +share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-kde4-l10n-zh_CN/Makefile b/chinese/koffice-kde4-l10n-zh_CN/Makefile index 740dd398762b..51c2f5739ff0 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/Makefile +++ b/chinese/koffice-kde4-l10n-zh_CN/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-kde4-l10n-zh_CN/distinfo b/chinese/koffice-kde4-l10n-zh_CN/distinfo index 350c1b4e2110..83fe79adc6f7 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/distinfo +++ b/chinese/koffice-kde4-l10n-zh_CN/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = e2de60faab2bc7049e2b4af6827cbe8e -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = c647fb47de4011651fe75e91d419c062e9071feab18fe20b889411e40b799661 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.2.tar.bz2) = 345247 +MD5 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 055cf1eed59bc1e491063d4ffa883d9b +SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = f7645d5785e9f014423c2e5952adbdf6e281fdea1a3c7f46304d52b72c66bf23 +SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.6.1.tar.bz2) = 359950 diff --git a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist index a6ae7f0b275a..0b464a615910 100644 --- a/chinese/koffice-kde4-l10n-zh_CN/pkg-plist +++ b/chinese/koffice-kde4-l10n-zh_CN/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_CN/LC_MESSAGES/desktop_koffice.mo share/locale/zh_CN/LC_MESSAGES/example.mo share/locale/zh_CN/LC_MESSAGES/karbon.mo share/locale/zh_CN/LC_MESSAGES/kchart.mo +share/locale/zh_CN/LC_MESSAGES/kdgantt.mo share/locale/zh_CN/LC_MESSAGES/kexi.mo share/locale/zh_CN/LC_MESSAGES/kfile_abiword.mo share/locale/zh_CN/LC_MESSAGES/kfile_gnumeric.mo diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile index f71d18687493..e83e9975bfd3 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/Makefile +++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/chinese/koffice-kde4-l10n-zh_TW/distinfo b/chinese/koffice-kde4-l10n-zh_TW/distinfo index 87e6dc793a73..1fc0c8365c79 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/distinfo +++ b/chinese/koffice-kde4-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = a39dcaf36d9361d2915399ee0dce0cc0 -SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 1ed7cb81231d527bc035daac306432e6a11e71a4a5ce18d566243bbc686b51ff -SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.5.2.tar.bz2) = 358934 +MD5 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 230b02b893873f1fd55f002509549793 +SHA256 (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 8683281d2e6fc0610deaca00755d075384a8da78333261f3e614792410a05170 +SIZE (KDE/kde-i18n/koffice-l10n-zh_TW-1.6.1.tar.bz2) = 370170 diff --git a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist index b84480f92d10..2a1040f2cfdc 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist +++ b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist @@ -2,6 +2,7 @@ share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo +share/locale/zh_TW/LC_MESSAGES/kdgantt.mo share/locale/zh_TW/LC_MESSAGES/kexi.mo share/locale/zh_TW/LC_MESSAGES/kfile_abiword.mo share/locale/zh_TW/LC_MESSAGES/kfile_gnumeric.mo diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/comms/kremotecontrol/distinfo +++ b/comms/kremotecontrol/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index 0e6042bf052d..0e5ba8031a91 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -5,10 +5,10 @@ # $FreeBSD$ PORTNAME= keximdb -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-1.5.2/src +MASTER_SITE_SUBDIR= stable/koffice-1.6.1/src MAINTAINER= kde@FreeBSD.org COMMENT= MS Access import plugin for Kexi diff --git a/databases/keximdb/distinfo b/databases/keximdb/distinfo index bbebebfabdcf..c3cada7060f3 100644 --- a/databases/keximdb/distinfo +++ b/databases/keximdb/distinfo @@ -1,2 +1,3 @@ -MD5 (keximdb-1.0.2.tar.gz) = 5d63539e8ee69b9f4bb27932d809fde4 -SIZE (keximdb-1.0.2.tar.gz) = 583078 +MD5 (keximdb-1.1.0.tar.gz) = 0e960fe9344d5be1232c12fb984e60a9 +SHA256 (keximdb-1.1.0.tar.gz) = 14e6caacc6cc5c811d498eb480678bd06a03d82a4a27a46fcb5f7f075f4a776c +SIZE (keximdb-1.1.0.tar.gz) = 601367 diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index dafd1e582022..0a4e06a44c7d 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdepim PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= deskutils mail news palm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -16,7 +15,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo index 0c2772ca7f70..77abe98678d3 100644 --- a/deskutils/kdepim3/distinfo +++ b/deskutils/kdepim3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559 -SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa -SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075 +MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b +SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 +SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist index 87c64101eca7..be431fcaa3d6 100644 --- a/deskutils/kdepim3/pkg-plist +++ b/deskutils/kdepim3/pkg-plist @@ -41,6 +41,8 @@ bin/networkstatustestservice bin/sloxwizard include/KNotesAppIface.h include/KNotesIface.h +include/akregator/akregator_export.h +include/akregator/articleinterceptor.h include/akregator/feedstorage.h include/akregator/plugin.h include/akregator/storage.h @@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd share/apps/kconf_update/kpilot.upd share/apps/kconf_update/upgrade-signature.pl share/apps/kconf_update/upgrade-transport.pl +share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png share/apps/kdepimwidgets/pics/addresseelineedit.png share/apps/kdepimwidgets/pics/clicklineedit.png share/apps/kdepimwidgets/pics/kdateedit.png @@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png @@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png share/apps/korganizer/korganizer_part.rc share/apps/korganizer/korganizerui.rc @@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics share/apps/libical/zoneinfo/America/Thule.ics share/apps/libical/zoneinfo/America/Thunder_Bay.ics share/apps/libical/zoneinfo/America/Tijuana.ics +share/apps/libical/zoneinfo/America/Toronto.ics share/apps/libical/zoneinfo/America/Tortola.ics share/apps/libical/zoneinfo/America/Vancouver.ics share/apps/libical/zoneinfo/America/Whitehorse.ics @@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics share/apps/libical/zoneinfo/Asia/Kuching.ics share/apps/libical/zoneinfo/Asia/Kuwait.ics share/apps/libical/zoneinfo/Asia/Macao.ics +share/apps/libical/zoneinfo/Asia/Macau.ics share/apps/libical/zoneinfo/Asia/Magadan.ics share/apps/libical/zoneinfo/Asia/Manila.ics share/apps/libical/zoneinfo/Asia/Muscat.ics @@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at share/apps/libkholidays/holiday_au share/apps/libkholidays/holiday_bavarian share/apps/libkholidays/holiday_be +share/apps/libkholidays/holiday_br share/apps/libkholidays/holiday_ca share/apps/libkholidays/holiday_catalan share/apps/libkholidays/holiday_ch @@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt share/apps/libkholidays/holiday_py share/apps/libkholidays/holiday_quebec share/apps/libkholidays/holiday_ro +share/apps/libkholidays/holiday_ru share/apps/libkholidays/holiday_se share/apps/libkholidays/holiday_si share/apps/libkholidays/holiday_th @@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/kgantt @dirrm share/apps/kdepimwidgets/pics @dirrm share/apps/kdepimwidgets +@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions +@dirrm share/apps/kdepim/icons/crystalsvg/32x32 +@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions +@dirrm share/apps/kdepim/icons/crystalsvg/22x22 +@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions +@dirrm share/apps/kdepim/icons/crystalsvg/16x16 +@dirrm share/apps/kdepim/icons/crystalsvg +@dirrm share/apps/kdepim/icons +@dirrm share/apps/kdepim @dirrm share/apps/karmpart @dirrm share/apps/karm/pics @dirrm share/apps/karm diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index dafd1e582022..0a4e06a44c7d 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdepim PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= deskutils mail news palm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -16,7 +15,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo index 0c2772ca7f70..77abe98678d3 100644 --- a/deskutils/kdepim4/distinfo +++ b/deskutils/kdepim4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559 -SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa -SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075 +MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b +SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 +SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist index 87c64101eca7..be431fcaa3d6 100644 --- a/deskutils/kdepim4/pkg-plist +++ b/deskutils/kdepim4/pkg-plist @@ -41,6 +41,8 @@ bin/networkstatustestservice bin/sloxwizard include/KNotesAppIface.h include/KNotesIface.h +include/akregator/akregator_export.h +include/akregator/articleinterceptor.h include/akregator/feedstorage.h include/akregator/plugin.h include/akregator/storage.h @@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd share/apps/kconf_update/kpilot.upd share/apps/kconf_update/upgrade-signature.pl share/apps/kconf_update/upgrade-transport.pl +share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png share/apps/kdepimwidgets/pics/addresseelineedit.png share/apps/kdepimwidgets/pics/clicklineedit.png share/apps/kdepimwidgets/pics/kdateedit.png @@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png @@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png share/apps/korganizer/korganizer_part.rc share/apps/korganizer/korganizerui.rc @@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics share/apps/libical/zoneinfo/America/Thule.ics share/apps/libical/zoneinfo/America/Thunder_Bay.ics share/apps/libical/zoneinfo/America/Tijuana.ics +share/apps/libical/zoneinfo/America/Toronto.ics share/apps/libical/zoneinfo/America/Tortola.ics share/apps/libical/zoneinfo/America/Vancouver.ics share/apps/libical/zoneinfo/America/Whitehorse.ics @@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics share/apps/libical/zoneinfo/Asia/Kuching.ics share/apps/libical/zoneinfo/Asia/Kuwait.ics share/apps/libical/zoneinfo/Asia/Macao.ics +share/apps/libical/zoneinfo/Asia/Macau.ics share/apps/libical/zoneinfo/Asia/Magadan.ics share/apps/libical/zoneinfo/Asia/Manila.ics share/apps/libical/zoneinfo/Asia/Muscat.ics @@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at share/apps/libkholidays/holiday_au share/apps/libkholidays/holiday_bavarian share/apps/libkholidays/holiday_be +share/apps/libkholidays/holiday_br share/apps/libkholidays/holiday_ca share/apps/libkholidays/holiday_catalan share/apps/libkholidays/holiday_ch @@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt share/apps/libkholidays/holiday_py share/apps/libkholidays/holiday_quebec share/apps/libkholidays/holiday_ro +share/apps/libkholidays/holiday_ru share/apps/libkholidays/holiday_se share/apps/libkholidays/holiday_si share/apps/libkholidays/holiday_th @@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/kgantt @dirrm share/apps/kdepimwidgets/pics @dirrm share/apps/kdepimwidgets +@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions +@dirrm share/apps/kdepim/icons/crystalsvg/32x32 +@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions +@dirrm share/apps/kdepim/icons/crystalsvg/22x22 +@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions +@dirrm share/apps/kdepim/icons/crystalsvg/16x16 +@dirrm share/apps/kdepim/icons/crystalsvg +@dirrm share/apps/kdepim/icons +@dirrm share/apps/kdepim @dirrm share/apps/karmpart @dirrm share/apps/karm/pics @dirrm share/apps/karm diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index dafd1e582022..0a4e06a44c7d 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -7,7 +7,6 @@ PORTNAME= kdepim PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= deskutils mail news palm kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -16,7 +15,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Personal Information Management tools for KDE -LIB_DEPENDS= gpgme.17:${PORTSDIR}/security/gpgme \ +LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ mal:${PORTSDIR}/palm/libmal \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo index 0c2772ca7f70..77abe98678d3 100644 --- a/deskutils/kdepim44/distinfo +++ b/deskutils/kdepim44/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.4.tar.bz2) = 4a01ceaeb6067d03003edb77b104f559 -SHA256 (KDE/kdepim-3.5.4.tar.bz2) = b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa -SIZE (KDE/kdepim-3.5.4.tar.bz2) = 12925075 +MD5 (KDE/kdepim-3.5.5.tar.bz2) = 3f2127f74cb496899bb3f1f6f702353b +SHA256 (KDE/kdepim-3.5.5.tar.bz2) = 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 +SIZE (KDE/kdepim-3.5.5.tar.bz2) = 12908968 diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist index 87c64101eca7..be431fcaa3d6 100644 --- a/deskutils/kdepim44/pkg-plist +++ b/deskutils/kdepim44/pkg-plist @@ -41,6 +41,8 @@ bin/networkstatustestservice bin/sloxwizard include/KNotesAppIface.h include/KNotesIface.h +include/akregator/akregator_export.h +include/akregator/articleinterceptor.h include/akregator/feedstorage.h include/akregator/plugin.h include/akregator/storage.h @@ -992,6 +994,29 @@ share/apps/kconf_update/kpgp.upd share/apps/kconf_update/kpilot.upd share/apps/kconf_update/upgrade-signature.pl share/apps/kconf_update/upgrade-transport.pl +share/apps/kdepim/icons/crystalsvg/16x16/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/bell.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/inverse_recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/journal.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/readonlyevent.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/recur.png +share/apps/kdepim/icons/crystalsvg/16x16/actions/todo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedbox_mask.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkedclipboard.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/checkmark.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/journal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newjournal.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newrecurevent.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/newtodo.png +share/apps/kdepim/icons/crystalsvg/22x22/actions/todo.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/appointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/journal.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/newappointment.png +share/apps/kdepim/icons/crystalsvg/32x32/actions/todo.png share/apps/kdepimwidgets/pics/addresseelineedit.png share/apps/kdepimwidgets/pics/clicklineedit.png share/apps/kdepimwidgets/pics/kdateedit.png @@ -1154,27 +1179,20 @@ share/apps/korgac/icons/crystalsvg/22x22/actions/korgac_disabled.png share/apps/korganizer/icons/crystalsvg/16x16/actions/1day.png share/apps/korganizer/icons/crystalsvg/16x16/actions/5days.png share/apps/korganizer/icons/crystalsvg/16x16/actions/7days.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/bell.png share/apps/korganizer/icons/crystalsvg/16x16/actions/dayview.png share/apps/korganizer/icons/crystalsvg/16x16/actions/downindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/findf.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupevent.png share/apps/korganizer/icons/crystalsvg/16x16/actions/groupeventtentative.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/inverse_recur.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/journal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/list.png share/apps/korganizer/icons/crystalsvg/16x16/actions/mailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/month.png share/apps/korganizer/icons/crystalsvg/16x16/actions/nomailappt.png share/apps/korganizer/icons/crystalsvg/16x16/actions/organizer.png share/apps/korganizer/icons/crystalsvg/16x16/actions/playsound.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/readonlyevent.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/recur.png share/apps/korganizer/icons/crystalsvg/16x16/actions/runprog.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallcal.png share/apps/korganizer/icons/crystalsvg/16x16/actions/smallclock.png -share/apps/korganizer/icons/crystalsvg/16x16/actions/todo.png share/apps/korganizer/icons/crystalsvg/16x16/actions/upindicator.png share/apps/korganizer/icons/crystalsvg/16x16/actions/webexport.png share/apps/korganizer/icons/crystalsvg/16x16/actions/whatsnext.png @@ -1182,34 +1200,21 @@ share/apps/korganizer/icons/crystalsvg/22x22/actions/1day.png share/apps/korganizer/icons/crystalsvg/22x22/actions/5days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/7days.png share/apps/korganizer/icons/crystalsvg/22x22/actions/agenda.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedbox_mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkedclipboard.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/checkmark.png share/apps/korganizer/icons/crystalsvg/22x22/actions/delete.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox.png share/apps/korganizer/icons/crystalsvg/22x22/actions/emptybox/mask.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/journal.png share/apps/korganizer/icons/crystalsvg/22x22/actions/list.png share/apps/korganizer/icons/crystalsvg/22x22/actions/month.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newjournal.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newrecurevent.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/newtodo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/search.png share/apps/korganizer/icons/crystalsvg/22x22/actions/send.png -share/apps/korganizer/icons/crystalsvg/22x22/actions/todo.png share/apps/korganizer/icons/crystalsvg/22x22/actions/webexport.png share/apps/korganizer/icons/crystalsvg/22x22/actions/whatsnext.png share/apps/korganizer/icons/crystalsvg/22x22/actions/xdays.png share/apps/korganizer/icons/crystalsvg/32x32/actions/1day.png share/apps/korganizer/icons/crystalsvg/32x32/actions/5days.png share/apps/korganizer/icons/crystalsvg/32x32/actions/7days.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/appointment.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/journal.png share/apps/korganizer/icons/crystalsvg/32x32/actions/list.png share/apps/korganizer/icons/crystalsvg/32x32/actions/month.png -share/apps/korganizer/icons/crystalsvg/32x32/actions/todo.png share/apps/korganizer/icons/crystalsvg/32x32/actions/xdays.png share/apps/korganizer/korganizer_part.rc share/apps/korganizer/korganizerui.rc @@ -1433,6 +1438,7 @@ share/apps/libical/zoneinfo/America/Tegucigalpa.ics share/apps/libical/zoneinfo/America/Thule.ics share/apps/libical/zoneinfo/America/Thunder_Bay.ics share/apps/libical/zoneinfo/America/Tijuana.ics +share/apps/libical/zoneinfo/America/Toronto.ics share/apps/libical/zoneinfo/America/Tortola.ics share/apps/libical/zoneinfo/America/Vancouver.ics share/apps/libical/zoneinfo/America/Whitehorse.ics @@ -1492,6 +1498,7 @@ share/apps/libical/zoneinfo/Asia/Kuala_Lumpur.ics share/apps/libical/zoneinfo/Asia/Kuching.ics share/apps/libical/zoneinfo/Asia/Kuwait.ics share/apps/libical/zoneinfo/Asia/Macao.ics +share/apps/libical/zoneinfo/Asia/Macau.ics share/apps/libical/zoneinfo/Asia/Magadan.ics share/apps/libical/zoneinfo/Asia/Manila.ics share/apps/libical/zoneinfo/Asia/Muscat.ics @@ -1675,6 +1682,7 @@ share/apps/libkholidays/holiday_at share/apps/libkholidays/holiday_au share/apps/libkholidays/holiday_bavarian share/apps/libkholidays/holiday_be +share/apps/libkholidays/holiday_br share/apps/libkholidays/holiday_ca share/apps/libkholidays/holiday_catalan share/apps/libkholidays/holiday_ch @@ -1705,6 +1713,7 @@ share/apps/libkholidays/holiday_pt share/apps/libkholidays/holiday_py share/apps/libkholidays/holiday_quebec share/apps/libkholidays/holiday_ro +share/apps/libkholidays/holiday_ru share/apps/libkholidays/holiday_se share/apps/libkholidays/holiday_si share/apps/libkholidays/holiday_th @@ -2646,6 +2655,15 @@ share/servicetypes/kpilotconduit.desktop @dirrm share/apps/kgantt @dirrm share/apps/kdepimwidgets/pics @dirrm share/apps/kdepimwidgets +@dirrm share/apps/kdepim/icons/crystalsvg/32x32/actions +@dirrm share/apps/kdepim/icons/crystalsvg/32x32 +@dirrm share/apps/kdepim/icons/crystalsvg/22x22/actions +@dirrm share/apps/kdepim/icons/crystalsvg/22x22 +@dirrm share/apps/kdepim/icons/crystalsvg/16x16/actions +@dirrm share/apps/kdepim/icons/crystalsvg/16x16 +@dirrm share/apps/kdepim/icons/crystalsvg +@dirrm share/apps/kdepim/icons +@dirrm share/apps/kdepim @dirrm share/apps/karmpart @dirrm share/apps/karm/pics @dirrm share/apps/karm diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 357dd2077af1..89b184a3bdc9 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -35,7 +35,9 @@ LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \ --with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ - --with-apu-config=${LOCALBASE}/bin/apu-1-config + --with-apu-config=${LOCALBASE}/bin/apu-1-config \ + --with-svn-include=${LOCALBASE}/include \ + --with-svn-lib=${LOCALBASE}/lib MAN1= cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1 diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index e7b1e72619ee..386f9cf1ea10 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.4.tar.bz2) = 2150e6a4ce5e42886a4afc6c0198c30c -SHA256 (KDE/kdesdk-3.5.4.tar.bz2) = 62f244c0cdb33b8d80c17406de97589cfd4d314d81c5a7d80f3699722d0a5e2d -SIZE (KDE/kdesdk-3.5.4.tar.bz2) = 4973943 +MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0 +SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd +SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560 diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist index 04f3d4a29352..061e86c3a5b0 100644 --- a/devel/kdesdk3/pkg-plist +++ b/devel/kdesdk3/pkg-plist @@ -74,6 +74,7 @@ bin/svnrevertlast bin/svnversions bin/swappo bin/transxx +bin/umbodoc bin/umbrello bin/xml2pot bin/zonetab2pot.py @@ -554,6 +555,8 @@ share/apps/konqueror/servicemenus/subversion_toplevel.desktop share/apps/kstyle/themes/scheck.themerc share/apps/kuiviewer/kuiviewerui.rc share/apps/kuiviewerpart/kuiviewer_part.rc +share/apps/umbrello/common.ent +share/apps/umbrello/docbook2xhtml.xsl share/apps/umbrello/headings/heading.adb share/apps/umbrello/headings/heading.ads share/apps/umbrello/headings/heading.as @@ -677,6 +680,8 @@ share/apps/umbrello/pics/uniassociation.png share/apps/umbrello/pics/usecase.png share/apps/umbrello/tips share/apps/umbrello/umbrelloui.rc +share/apps/umbrello/xmi.css +share/apps/umbrello/xmi2docbook.xsl share/config.kcfg/cervisiapart.kcfg share/config.kcfg/kbabel.kcfg share/config.kcfg/kbprojectsettings.kcfg diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 357dd2077af1..89b184a3bdc9 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -35,7 +35,9 @@ LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ARGS+=--with-db-include-dir=${LOCALBASE}/include/db4 \ --with-db-lib-dir=${LOCALBASE}/lib --with-db-name=db4 \ --with-apr-config=${LOCALBASE}/bin/apr-1-config \ - --with-apu-config=${LOCALBASE}/bin/apu-1-config + --with-apu-config=${LOCALBASE}/bin/apu-1-config \ + --with-svn-include=${LOCALBASE}/include \ + --with-svn-lib=${LOCALBASE}/lib MAN1= cervisia.1 cvsblame.1 cvscheck.1 cvsversion.1 includemocs.1 kde-build.1 kdesvn-build.1 noncvslist.1 diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index e7b1e72619ee..386f9cf1ea10 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.4.tar.bz2) = 2150e6a4ce5e42886a4afc6c0198c30c -SHA256 (KDE/kdesdk-3.5.4.tar.bz2) = 62f244c0cdb33b8d80c17406de97589cfd4d314d81c5a7d80f3699722d0a5e2d -SIZE (KDE/kdesdk-3.5.4.tar.bz2) = 4973943 +MD5 (KDE/kdesdk-3.5.5.tar.bz2) = d226bf07bf8106f37b4e9e31a7d451f0 +SHA256 (KDE/kdesdk-3.5.5.tar.bz2) = fedd1631c2e139d27450dc51ab5aa3e9e46f5d5c0c030992818b9c37058678cd +SIZE (KDE/kdesdk-3.5.5.tar.bz2) = 5043560 diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist index 04f3d4a29352..061e86c3a5b0 100644 --- a/devel/kdesdk4/pkg-plist +++ b/devel/kdesdk4/pkg-plist @@ -74,6 +74,7 @@ bin/svnrevertlast bin/svnversions bin/swappo bin/transxx +bin/umbodoc bin/umbrello bin/xml2pot bin/zonetab2pot.py @@ -554,6 +555,8 @@ share/apps/konqueror/servicemenus/subversion_toplevel.desktop share/apps/kstyle/themes/scheck.themerc share/apps/kuiviewer/kuiviewerui.rc share/apps/kuiviewerpart/kuiviewer_part.rc +share/apps/umbrello/common.ent +share/apps/umbrello/docbook2xhtml.xsl share/apps/umbrello/headings/heading.adb share/apps/umbrello/headings/heading.ads share/apps/umbrello/headings/heading.as @@ -677,6 +680,8 @@ share/apps/umbrello/pics/uniassociation.png share/apps/umbrello/pics/usecase.png share/apps/umbrello/tips share/apps/umbrello/umbrelloui.rc +share/apps/umbrello/xmi.css +share/apps/umbrello/xmi2docbook.xsl share/config.kcfg/cervisiapart.kcfg share/config.kcfg/kbabel.kcfg share/config.kcfg/kbprojectsettings.kcfg diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 290ddd4af77f..ec320a34c202 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kdevelop -PORTVERSION= 3.3.4 +PORTVERSION= 3.3.5 CATEGORIES?= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${KDE_VERSION:S/.0//}/src diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index e039cbede87b..e7eb377af793 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdevelop-3.3.4.tar.bz2) = e5278e37468bda7fdf6d019f84aeed16 -SHA256 (KDE/kdevelop-3.3.4.tar.bz2) = 808f51aa8084f5aed45ecfef1362624d7fa1a9bbe4b4d6160e2d40f1a4b1ab94 -SIZE (KDE/kdevelop-3.3.4.tar.bz2) = 8148258 +MD5 (KDE/kdevelop-3.3.5.tar.bz2) = e1bb5566c79022c20d534efae386cfa2 +SHA256 (KDE/kdevelop-3.3.5.tar.bz2) = b92ca82e9b0547251d11a647e01578e3f641e0ea2069d07172885e1035406d29 +SIZE (KDE/kdevelop-3.3.5.tar.bz2) = 8178575 diff --git a/devel/kdevelop/files/patch-appwizard-libtool b/devel/kdevelop/files/patch-appwizard-libtool index fd90c498b01a..99a3a09bf555 100644 --- a/devel/kdevelop/files/patch-appwizard-libtool +++ b/devel/kdevelop/files/patch-appwizard-libtool @@ -1,5 +1,5 @@ ---- parts/appwizard/common/admin/libtool.m4.in.orig Mon Jun 19 18:09:34 2006 -+++ parts/appwizard/common/admin/libtool.m4.in Mon Jun 19 18:09:36 2006 +--- parts/appwizard/common/admin/libtool.m4.in Sun Oct 1 19:29:11 2006 ++++ parts/appwizard/common/admin/libtool.m4.in Sun Dec 18 22:53:17 2005 @@ -1,28 +1,13 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -## Copyright 1996, 1997, 1998, 1999, 2000, 2001 @@ -19,7 +19,7 @@ -## -## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software --## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a @@ -570,7 +570,7 @@ dynamic_linker=no ;; --freebsd*-gnu*) +-kfreebsd*-gnu*) +kfreebsd*-gnu) version_type=linux need_lib_prefix=no @@ -894,7 +894,7 @@ ])# AC_PROG_LD_RELOAD_FLAG -@@ -2088,40 +2281,36 @@ +@@ -2088,44 +2281,36 @@ lt_cv_deplibs_check_method=pass_all ;; @@ -905,16 +905,18 @@ lt_cv_file_magic_test_file=/shlib/libc.so ;; --cygwin* | mingw* | pw32*) -- # win32_libid is a shell function defined in ltmain.sh -+cygwin*) + cygwin*) +- lt_cv_deplibs_check_method=pass_all + # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -- lt_cv_file_magic_cmd='win32_libid' ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' -+ ;; + ;; +- + -+mingw* | pw32*) + mingw* | pw32*) +- # win32_libid is a shell function defined in ltmain.sh +- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' +- lt_cv_file_magic_cmd='win32_libid' + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump'. + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' @@ -936,7 +938,7 @@ lt_cv_deplibs_check_method=pass_all ;; --freebsd*) +-freebsd* | kfreebsd*-gnu) +freebsd* | kfreebsd*-gnu | dragonfly*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in @@ -948,7 +950,7 @@ lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; -@@ -2137,7 +2326,7 @@ +@@ -2141,7 +2326,7 @@ hpux10.20* | hpux11*) lt_cv_file_magic_cmd=/usr/bin/file @@ -957,7 +959,7 @@ ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -@@ -2153,40 +2342,24 @@ +@@ -2157,40 +2342,24 @@ esac ;; @@ -1009,7 +1011,7 @@ ;; netbsd*) -@@ -2208,32 +2381,22 @@ +@@ -2212,32 +2381,22 @@ ;; openbsd*) @@ -1045,7 +1047,7 @@ case $host_vendor in motorola) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -@@ -2254,10 +2417,13 @@ +@@ -2258,10 +2417,13 @@ siemens) lt_cv_deplibs_check_method=pass_all ;; @@ -1060,7 +1062,7 @@ lt_cv_deplibs_check_method=pass_all ;; esac -@@ -2277,36 +2443,43 @@ +@@ -2281,36 +2443,43 @@ # Let the user override the test. lt_cv_path_NM="$NM" else @@ -1128,7 +1130,7 @@ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi]) NM="$lt_cv_path_NM" -@@ -2338,13 +2511,13 @@ +@@ -2342,13 +2511,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl convenience library and # LTDLINCL to the include flags for the libltdl header and adds @@ -1149,7 +1151,7 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case $enable_ltdl_convenience in -@@ -2363,13 +2536,13 @@ +@@ -2367,13 +2536,13 @@ # ----------------------------------- # sets LIBLTDL to the link flags for the libltdl installable library and # LTDLINCL to the include flags for the libltdl header and adds @@ -1170,7 +1172,7 @@ # In the future, this macro may have to be called after AC_PROG_LIBTOOL. AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -@@ -2407,10 +2580,21 @@ +@@ -2411,10 +2580,21 @@ # --------------- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX]) @@ -1193,7 +1195,7 @@ # AC_LIBTOOL_F77 # -------------- -@@ -2450,7 +2634,7 @@ +@@ -2454,7 +2634,7 @@ # AC_LIBTOOL_RC @@ -1202,7 +1204,7 @@ # enable support for Windows resource files AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC]) -@@ -2483,36 +2667,9 @@ +@@ -2487,36 +2667,9 @@ _LT_AC_SYS_COMPILER @@ -1242,7 +1244,7 @@ ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change -@@ -2526,9 +2683,9 @@ +@@ -2530,9 +2683,9 @@ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) AC_LIBTOOL_SYS_LIB_STRIP @@ -1254,7 +1256,7 @@ AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) -@@ -2537,7 +2694,7 @@ +@@ -2541,7 +2694,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. @@ -1263,7 +1265,7 @@ aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then -@@ -2546,37 +2703,11 @@ +@@ -2550,48 +2703,11 @@ fi ;; @@ -1278,18 +1280,29 @@ - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on -- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac +- fi - ;; - esac - output_verbose_link_cmd='echo' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring' -- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -1303,7 +1316,7 @@ esac AC_MSG_RESULT([$enable_shared]) -@@ -2601,7 +2732,7 @@ +@@ -2616,7 +2732,7 @@ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++) AC_REQUIRE([AC_PROG_CXX]) @@ -1312,7 +1325,7 @@ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(allow_undefined_flag, $1)= -@@ -2613,6 +2744,7 @@ +@@ -2628,6 +2744,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= _LT_AC_TAGVAR(hardcode_minus_L, $1)=no @@ -1320,7 +1333,7 @@ _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= _LT_AC_TAGVAR(module_expsym_cmds, $1)= -@@ -2630,7 +2762,7 @@ +@@ -2645,7 +2762,7 @@ _LT_AC_TAGVAR(compiler_lib_search_path, $1)= # Source file extension for C++ test sources. @@ -1329,7 +1342,7 @@ # Object file extension for compiled C++ test sources. objext=o -@@ -2640,11 +2772,15 @@ +@@ -2655,11 +2772,15 @@ lt_simple_compile_test_code="int some_variable = 0;\n" # Code to be used in simple link tests @@ -1346,7 +1359,7 @@ # Allow CC to be a program name with arguments. lt_save_CC=$CC lt_save_LD=$LD -@@ -2655,18 +2791,18 @@ +@@ -2670,18 +2791,18 @@ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx else @@ -1368,7 +1381,27 @@ # We don't want -fno-exception wen compiling C++ code, so set the # no_builtin_flag separately -@@ -2741,8 +2877,23 @@ +@@ -2699,8 +2820,8 @@ + # Check if GNU C++ uses GNU ld as the underlying linker, since the + # archiving commands below assume that GNU ld is being used. + if test "$with_gnu_ld" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' +@@ -2726,7 +2847,7 @@ + # linker, instead of GNU ld. If possible, this setting should + # overridden to take advantage of the native linker features on + # the platform it is being used on. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + fi + + # Commands to make compiler produce verbose output that lists +@@ -2756,8 +2877,23 @@ exp_sym_flag='-Bexport' no_entry_flag="" else @@ -1394,7 +1427,7 @@ exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi -@@ -2759,7 +2910,7 @@ +@@ -2774,7 +2910,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GXX" = yes; then @@ -1403,7 +1436,7 @@ # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` -@@ -2778,8 +2929,12 @@ +@@ -2793,8 +2929,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi @@ -1416,7 +1449,7 @@ else # not using gcc if test "$host_cpu" = ia64; then -@@ -2788,15 +2943,16 @@ +@@ -2803,15 +2943,16 @@ shared_flag='-G' else if test "$aix_use_runtimelinking" = yes; then @@ -1437,23 +1470,23 @@ if test "$aix_use_runtimelinking" = yes; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. -@@ -2805,13 +2961,12 @@ +@@ -2820,13 +2961,12 @@ _LT_AC_SYS_LIBPATH_AIX _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" else if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX -@@ -2820,16 +2975,26 @@ +@@ -2835,16 +2975,26 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' @@ -1464,7 +1497,7 @@ + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi @@ -1485,20 +1518,26 @@ chorus*) case $cc_basename in *) -@@ -2848,7 +3013,7 @@ +@@ -2858,12 +3008,12 @@ + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -2857,59 +3022,81 @@ +@@ -2872,70 +3022,81 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ -- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_AC_TAGVAR(ld_shlibs, $1)=no @@ -1536,10 +1575,26 @@ - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on -- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac ++ if test "$GXX" = yes ; then ++ lt_int_apple_cc_single_mod=no ++ output_verbose_link_cmd='echo' ++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then ++ lt_int_apple_cc_single_mod=yes + fi - ;; - esac - lt_int_apple_cc_single_mod=no @@ -1548,19 +1603,19 @@ - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_automatic, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -1570,12 +1625,6 @@ - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; -+ if test "$GXX" = yes ; then -+ lt_int_apple_cc_single_mod=no -+ output_verbose_link_cmd='echo' -+ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then -+ lt_int_apple_cc_single_mod=yes -+ fi + if test "X$lt_int_apple_cc_single_mod" = Xyes ; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' + else @@ -1618,7 +1667,7 @@ # Green Hills C++ Compiler # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -2920,14 +3107,14 @@ +@@ -2946,14 +3107,14 @@ ;; esac ;; @@ -1630,12 +1679,12 @@ freebsd-elf*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;; -- freebsd*) +- freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_AC_TAGVAR(ld_shlibs, $1)=yes -@@ -2944,11 +3131,11 @@ +@@ -2970,12 +3131,12 @@ # location of the library. case $cc_basename in @@ -1645,11 +1694,13 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; - aCC) +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + aCC*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when -@@ -2958,7 +3145,7 @@ + # linking a shared library. +@@ -2984,11 +3145,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. @@ -1658,7 +1709,12 @@ ;; *) if test "$GXX" = yes; then -@@ -2972,33 +3159,22 @@ +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + # FIXME: insert proper C++ library support + _LT_AC_TAGVAR(ld_shlibs, $1)=no +@@ -2998,33 +3159,22 @@ ;; hpux10*|hpux11*) if test $with_gnu_ld = no; then @@ -1699,7 +1755,7 @@ ;; *) _LT_AC_TAGVAR(hardcode_direct, $1)=yes -@@ -3009,14 +3185,17 @@ +@@ -3035,17 +3185,20 @@ esac case $cc_basename in @@ -1721,8 +1777,12 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -@@ -3035,9 +3214,12 @@ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + # Commands to make compiler produce verbose output that lists +@@ -3061,12 +3214,15 @@ *) if test "$GXX" = yes; then if test $with_gnu_ld = no; then @@ -1737,8 +1797,12 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -@@ -3051,11 +3233,25 @@ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + ;; + esac + fi +@@ -3077,11 +3233,25 @@ ;; esac ;; @@ -1761,21 +1825,24 @@ - CC) + CC*) # SGI C++ -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' # Archives containing C++ object files must be created using # "CC -ar", where "CC" is the IRIX C++ compiler. This is -@@ -3066,7 +3262,7 @@ +@@ -3092,9 +3262,9 @@ *) if test "$GXX" = yes; then if test "$with_gnu_ld" = no; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' fi -@@ -3079,7 +3275,7 @@ + fi + _LT_AC_TAGVAR(link_all_deplibs, $1)=yes +@@ -3105,14 +3275,14 @@ ;; linux*) case $cc_basename in @@ -1784,7 +1851,16 @@ # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file -@@ -3104,17 +3300,41 @@ + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when + # linking a shared library. +@@ -3130,20 +3300,44 @@ # "CC -Bstatic", where "CC" is the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; @@ -1810,8 +1886,8 @@ + ;; + esac _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' @@ -1828,9 +1904,14 @@ + ;; + cxx*) # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -@@ -3145,7 +3365,7 @@ +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + + runpath_var=LD_RUN_PATH + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' +@@ -3171,7 +3365,7 @@ ;; mvs*) case $cc_basename in @@ -1839,7 +1920,7 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; -@@ -3166,9 +3386,25 @@ +@@ -3192,15 +3386,31 @@ # Workaround some broken pre-1.5 toolchains output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ;; @@ -1866,7 +1947,14 @@ # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file -@@ -3184,14 +3420,14 @@ + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3210,14 +3420,14 @@ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; @@ -1879,21 +1967,21 @@ - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3209,7 +3445,7 @@ +@@ -3235,7 +3445,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3228,7 +3464,7 @@ +@@ -3254,13 +3464,13 @@ ;; osf4* | osf5*) case $cc_basename in @@ -1902,7 +1990,14 @@ # Kuck and Associates, Inc. (KAI) C++ Compiler # KCC will only create a shared library if the output file -@@ -3243,17 +3479,17 @@ + # ends with ".so" (or ".sl" for HP-UX), so rename the library + # to its proper name (with version) after linking. +- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: +@@ -3269,17 +3479,17 @@ # the KAI C++ compiler. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; @@ -1915,25 +2010,25 @@ - cxx) + cxx*) _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ echo "-hidden">> $lib.exp~ -- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ +- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~ + $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~ $rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -3272,7 +3508,7 @@ +@@ -3298,7 +3508,7 @@ *) if test "$GXX" = yes && test "$with_gnu_ld" = no; then _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: -@@ -3293,27 +3529,14 @@ +@@ -3319,27 +3529,14 @@ # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -1963,7 +2058,7 @@ # Lucid # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -3326,36 +3549,33 @@ +@@ -3352,36 +3549,33 @@ ;; solaris*) case $cc_basename in @@ -1972,10 +2067,10 @@ # Sun C++ 4.2, 5.x and Centerline C++ + _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ -- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' +- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' + $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' @@ -2012,23 +2107,50 @@ # Archives containing C++ object files must be created using # "CC -xar", where "CC" is the Sun C++ compiler. This is -@@ -3363,7 +3583,7 @@ +@@ -3389,9 +3583,9 @@ # in the archive. _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ;; - gcx) + gcx*) # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -@@ -3401,12 +3621,63 @@ + # The C++ compiler must be used to create the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' +@@ -3401,9 +3595,9 @@ + if test "$GXX" = yes && test "$with_gnu_ld" = no; then + _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if $CC --version | grep -v '^2\.7' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -3412,9 +3606,9 @@ + else + # g++ 2.7 appears to require `-G' NOT `-shared' on this + # platform. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ +- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp' ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' + + # Commands to make compiler produce verbose output that lists + # what "hidden" libraries, object files and flags are used when +@@ -3427,12 +3621,63 @@ ;; esac ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + runpath_var='LD_RUN_PATH' + @@ -2061,7 +2183,7 @@ + # names for shared libraries. + _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' @@ -2087,7 +2209,7 @@ # NonStop-UX NCC 3.20 # FIXME: insert proper C++ library support _LT_AC_TAGVAR(ld_shlibs, $1)=no -@@ -3443,8 +3714,6 @@ +@@ -3469,8 +3714,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) @@ -2096,7 +2218,7 @@ AC_LIBTOOL_CONFIG($1) -@@ -3462,7 +3731,7 @@ +@@ -3488,7 +3731,7 @@ ])# AC_LIBTOOL_LANG_CXX_CONFIG # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) @@ -2105,7 +2227,7 @@ # Figure out "hidden" library dependencies from verbose # compiler output when linking a shared library. # Parse the compiler output and extract the necessary -@@ -3516,7 +3785,7 @@ +@@ -3542,7 +3785,7 @@ # The `*' in the case matches for architectures that use `case' in # $output_verbose_cmd can trigger glob expansion during the loop # eval without this substitution. @@ -2114,7 +2236,7 @@ for p in `eval $output_verbose_link_cmd`; do case $p in -@@ -3556,7 +3825,7 @@ +@@ -3582,7 +3825,7 @@ fi ;; @@ -2123,7 +2245,7 @@ # This assumes that the test object file only shows up # once in the compiler output. if test "$p" = "conftest.$objext"; then -@@ -3592,13 +3861,37 @@ +@@ -3618,13 +3861,37 @@ $rm -f confest.$objext @@ -2162,7 +2284,7 @@ # Ensure that the configuration vars for the C compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -@@ -3642,12 +3935,16 @@ +@@ -3668,12 +3935,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2180,7 +2302,7 @@ AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) -@@ -3657,7 +3954,7 @@ +@@ -3683,7 +3954,7 @@ # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. @@ -2189,7 +2311,7 @@ aix3*) test "$enable_shared" = yes && enable_static=no if test -n "$RANLIB"; then -@@ -3665,8 +3962,10 @@ +@@ -3691,8 +3962,10 @@ postinstall_cmds='$RANLIB $lib' fi ;; @@ -2202,7 +2324,7 @@ ;; esac AC_MSG_RESULT([$enable_shared]) -@@ -3676,8 +3975,6 @@ +@@ -3702,8 +3975,6 @@ test "$enable_shared" = yes || enable_static=yes AC_MSG_RESULT([$enable_static]) @@ -2211,7 +2333,7 @@ _LT_AC_TAGVAR(GCC, $1)="$G77" _LT_AC_TAGVAR(LD, $1)="$LD" -@@ -3687,8 +3984,6 @@ +@@ -3713,8 +3984,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) @@ -2220,7 +2342,7 @@ AC_LIBTOOL_CONFIG($1) -@@ -3717,20 +4012,27 @@ +@@ -3743,20 +4012,27 @@ lt_simple_compile_test_code="class foo {}\n" # Code to be used in simple link tests @@ -2249,7 +2371,7 @@ ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change ## the running order or otherwise move them around unless you know exactly -@@ -3742,8 +4044,6 @@ +@@ -3768,8 +4044,6 @@ AC_LIBTOOL_PROG_LD_SHLIBS($1) AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) @@ -2258,7 +2380,7 @@ AC_LIBTOOL_CONFIG($1) -@@ -3753,7 +4053,7 @@ +@@ -3779,7 +4053,7 @@ # AC_LIBTOOL_LANG_RC_CONFIG @@ -2267,7 +2389,7 @@ # Ensure that the configuration vars for the Windows resource compiler are # suitably defined. Those variables are subsequently used by # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -@@ -3777,11 +4077,16 @@ +@@ -3803,11 +4077,16 @@ # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2284,7 +2406,7 @@ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes AC_LIBTOOL_CONFIG($1) -@@ -3807,11 +4112,12 @@ +@@ -3833,11 +4112,12 @@ # without removal of \ escapes. if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST @@ -2299,7 +2421,7 @@ libname_spec library_names_spec soname_spec extract_expsyms_cmds \ old_striplib striplib file_magic_cmd finish_cmds finish_eval \ deplibs_check_method reload_flag reload_cmds need_locks \ -@@ -3861,7 +4167,7 @@ +@@ -3887,7 +4167,7 @@ _LT_AC_TAGVAR(archive_cmds, $1) | \ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \ _LT_AC_TAGVAR(module_cmds, $1) | \ @@ -2308,16 +2430,7 @@ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \ extract_expsyms_cmds | reload_cmds | finish_cmds | \ -@@ -3916,7 +4222,7 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -3927,11 +4233,11 @@ +@@ -3953,11 +4233,11 @@ SED=$lt_SED # Sed that helps us avoid accidentally triggering echo(1) options like -n. @@ -2331,7 +2444,7 @@ # The names of the tagged configurations supported by this script. available_tags= -@@ -3962,6 +4268,12 @@ +@@ -3988,6 +4268,12 @@ # The host system. host_alias=$host_alias host=$host @@ -2344,7 +2457,7 @@ # An echo program that does not interpret backslashes. echo=$lt_echo -@@ -3973,6 +4285,9 @@ +@@ -3999,6 +4285,9 @@ # A C compiler. LTCC=$lt_LTCC @@ -2354,7 +2467,7 @@ # A language-specific compiler. CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) -@@ -3992,7 +4307,7 @@ +@@ -4018,7 +4307,7 @@ NM=$lt_NM # A symbol stripping program @@ -2363,7 +2476,7 @@ # Used to examine libraries when file_magic_cmd begins "file" MAGIC_CMD=$MAGIC_CMD -@@ -4023,7 +4338,7 @@ +@@ -4049,7 +4338,7 @@ libext="$libext" # Shared library suffix (normally ".so"). @@ -2372,7 +2485,7 @@ # Executable file suffix (normally ""). exeext="$exeext" -@@ -4038,7 +4353,7 @@ +@@ -4064,7 +4353,7 @@ # Does compiler simultaneously support -c and -o options? compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) @@ -2381,7 +2494,7 @@ need_locks=$lt_need_locks # Do we need the lib prefix for modules? -@@ -4267,7 +4582,10 @@ +@@ -4293,7 +4582,10 @@ # If there is no Makefile yet, we rely on a make rule to execute # `config.status --recheck' to rerun these tests and create the # libtool script then. @@ -2393,7 +2506,7 @@ fi ])# AC_LIBTOOL_CONFIG -@@ -4309,9 +4627,6 @@ +@@ -4335,9 +4627,6 @@ # Regexp to match symbols that can be accessed directly from C. sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' @@ -2403,7 +2516,7 @@ # Transform an extracted symbol line into a proper C declaration lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'" -@@ -4333,14 +4648,30 @@ +@@ -4359,14 +4648,30 @@ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" ;; @@ -2436,7 +2549,7 @@ ;; sysv4) symcode='[[DFNSTU]]' -@@ -4358,14 +4689,17 @@ +@@ -4384,14 +4689,17 @@ # If we're using GNU nm, then use its standard symbol codes. case `$NM -V 2>&1` in *GNU* | *'with BFD'*) @@ -2456,7 +2569,7 @@ # Check to see that the pipe works correctly. pipe_works=no -@@ -4521,6 +4855,10 @@ +@@ -4547,6 +4855,10 @@ # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -2467,7 +2580,7 @@ sysv4*MP*) if test -d /usr/nec; then _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -@@ -4529,7 +4867,7 @@ +@@ -4555,7 +4867,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. @@ -2476,7 +2589,7 @@ hppa*64*|ia64*) ;; *) -@@ -4554,18 +4892,28 @@ +@@ -4580,18 +4892,28 @@ ;; chorus*) case $cc_basename in @@ -2508,11 +2621,11 @@ # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; -@@ -4573,22 +4921,22 @@ +@@ -4599,22 +4921,22 @@ ;; esac ;; -- freebsd*) +- freebsd* | kfreebsd*-gnu) + freebsd* | kfreebsd*-gnu | dragonfly*) # FreeBSD uses GNU C++ ;; @@ -2537,7 +2650,7 @@ hppa*64*|ia64*) # +Z the default ;; -@@ -4601,9 +4949,13 @@ +@@ -4627,9 +4949,13 @@ ;; esac ;; @@ -2552,7 +2665,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' # CC pic flag -KPIC is the default. -@@ -4614,18 +4966,24 @@ +@@ -4640,18 +4966,24 @@ ;; linux*) case $cc_basename in @@ -2581,7 +2694,7 @@ # Compaq C++ # Make sure the PIC flag is empty. It appears that all Alpha # Linux and Compaq Tru64 Unix objects are PIC. -@@ -4642,7 +5000,7 @@ +@@ -4668,7 +5000,7 @@ ;; mvs*) case $cc_basename in @@ -2590,7 +2703,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ;; *) -@@ -4653,14 +5011,14 @@ +@@ -4679,14 +5011,14 @@ ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -2608,7 +2721,7 @@ # Digital/Compaq C++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # Make sure the PIC flag is empty. It appears that all Alpha -@@ -4674,24 +5032,15 @@ +@@ -4700,24 +5032,15 @@ ;; psos*) ;; @@ -2635,7 +2748,7 @@ # Green Hills C++ Compiler _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ;; -@@ -4701,12 +5050,12 @@ +@@ -4727,12 +5050,12 @@ ;; sunos4*) case $cc_basename in @@ -2650,7 +2763,7 @@ # Lucid _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ;; -@@ -4716,7 +5065,7 @@ +@@ -4742,7 +5065,7 @@ ;; tandem*) case $cc_basename in @@ -2659,7 +2772,7 @@ # NonStop-UX NCC 3.20 _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ;; -@@ -4724,7 +5073,14 @@ +@@ -4750,7 +5073,14 @@ ;; esac ;; @@ -2675,7 +2788,7 @@ ;; vxworks*) ;; -@@ -4771,6 +5127,11 @@ +@@ -4797,6 +5127,11 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; @@ -2687,7 +2800,7 @@ msdosdjgpp*) # Just because we use GCC doesn't mean we suddenly get shared libraries # on systems that don't support them. -@@ -4787,7 +5148,7 @@ +@@ -4813,7 +5148,7 @@ hpux*) # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. @@ -2696,7 +2809,7 @@ hppa*64*|ia64*) # +Z the default ;; -@@ -4813,6 +5174,16 @@ +@@ -4839,6 +5174,16 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' fi ;; @@ -2713,7 +2826,7 @@ mingw* | pw32* | os2*) # This hack is so that the source file can tell whether it is being -@@ -4824,7 +5195,7 @@ +@@ -4850,7 +5195,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but # not for PA HP-UX. @@ -2722,7 +2835,7 @@ hppa*64*|ia64*) # +Z the default ;; -@@ -4848,12 +5219,19 @@ +@@ -4874,12 +5219,19 @@ ;; linux*) @@ -2743,7 +2856,7 @@ ccc*) _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' # All Alpha code is PIC. -@@ -4868,15 +5246,15 @@ +@@ -4894,15 +5246,15 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; @@ -2765,7 +2878,7 @@ ;; sunos4*) -@@ -4885,7 +5263,7 @@ +@@ -4911,7 +5263,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; @@ -2774,7 +2887,7 @@ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4898,6 +5276,17 @@ +@@ -4924,6 +5276,17 @@ fi ;; @@ -2792,7 +2905,7 @@ uts4*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -@@ -4925,7 +5314,7 @@ +@@ -4951,7 +5314,7 @@ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) fi @@ -2801,7 +2914,7 @@ # For platforms which do not support PIC, -DPIC is meaningless: *djgpp*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -@@ -4934,6 +5323,16 @@ +@@ -4960,6 +5323,16 @@ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" ;; esac @@ -2818,7 +2931,7 @@ ]) -@@ -4958,7 +5357,7 @@ +@@ -4984,7 +5357,7 @@ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) @@ -2827,7 +2940,7 @@ ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -@@ -4984,7 +5383,7 @@ +@@ -5010,7 +5383,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown _LT_AC_TAGVAR(hardcode_automatic, $1)=no _LT_AC_TAGVAR(module_cmds, $1)= @@ -2836,7 +2949,7 @@ _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' # include_expsyms should be a list of space-separated symbols to be *always* -@@ -5001,7 +5400,8 @@ +@@ -5027,7 +5400,8 @@ # rely on this symbol name, it's probably fine to never include it in # preloaded symbol tables. extract_expsyms_cmds= @@ -2846,7 +2959,7 @@ case $host_os in cygwin* | mingw* | pw32*) # FIXME: the MSVC++ port hasn't been tested in a loooong time -@@ -5011,6 +5411,10 @@ +@@ -5037,6 +5411,10 @@ with_gnu_ld=no fi ;; @@ -2857,7 +2970,7 @@ openbsd*) with_gnu_ld=no ;; -@@ -5021,6 +5425,27 @@ +@@ -5047,6 +5425,27 @@ # If archive_cmds runs LD, not CC, wlarc should be empty wlarc='${wl}' @@ -2885,26 +2998,40 @@ # See if GNU ld supports shared libraries. case $host_os in aix3* | aix4* | aix5*) -@@ -5071,10 +5496,10 @@ - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +@@ -5084,7 +5483,7 @@ + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported + # Joseph Beckenbach <jrb3@best.com> says some releases of gcc + # support --undefined. This deserves some investigation. FIXME +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi +@@ -5094,13 +5493,13 @@ + # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, + # as there is no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' # If the export-symbols file already is a .def file (1st line # is EXPORTS), use it as is; otherwise, prepend... _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -@@ -5083,9 +5508,55 @@ +@@ -5109,9 +5508,55 @@ echo EXPORTS > $output_objdir/$soname.def; cat $export_symbols >> $output_objdir/$soname.def; fi~ -- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' +- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else + else +- ld_shlibs=no + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi + ;; @@ -2950,13 +3077,19 @@ + $echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi - else -- ld_shlibs=no ++ else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; -@@ -5099,7 +5570,7 @@ +@@ -5120,12 +5565,12 @@ + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -2965,7 +3098,16 @@ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<EOF 1>&2 -@@ -5120,6 +5591,33 @@ +@@ -5139,13 +5584,40 @@ + + EOF + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -2999,7 +3141,17 @@ sunos4*) _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' wlarc= -@@ -5137,16 +5635,11 @@ +@@ -5155,24 +5627,19 @@ + + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no + fi ;; esac @@ -3021,7 +3173,7 @@ fi else # PORTME fill in a description of your system's linker (not GNU ld) -@@ -5158,7 +5651,7 @@ +@@ -5184,7 +5651,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes @@ -3030,7 +3182,7 @@ # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported -@@ -5180,9 +5673,21 @@ +@@ -5206,9 +5673,21 @@ else _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' fi @@ -3054,7 +3206,7 @@ exp_sym_flag='-bexport' no_entry_flag='-bnoentry' fi -@@ -5199,7 +5704,7 @@ +@@ -5225,7 +5704,7 @@ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes if test "$GCC" = yes; then @@ -3063,7 +3215,7 @@ # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ collect2name=`${CC} -print-prog-name=collect2` -@@ -5218,8 +5723,12 @@ +@@ -5244,8 +5723,12 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= fi @@ -3076,7 +3228,7 @@ else # not using gcc if test "$host_cpu" = ia64; then -@@ -5227,30 +5736,30 @@ +@@ -5253,30 +5736,30 @@ # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else @@ -3104,8 +3256,8 @@ # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" +- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_AC_SYS_LIBPATH_AIX + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" @@ -3113,12 +3265,12 @@ if test "$host_cpu" = ia64; then _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols" + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an empty executable. _LT_AC_SYS_LIBPATH_AIX -@@ -5259,13 +5768,11 @@ +@@ -5285,13 +5768,11 @@ # -berok will link without error, but may produce a broken library. _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' @@ -3129,13 +3281,13 @@ + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - # This is similar to how AIX traditionally builds it's shared libraries. -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + # This is similar to how AIX traditionally builds its shared libraries. + _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' fi fi ;; -@@ -5278,7 +5785,7 @@ +@@ -5304,7 +5785,7 @@ _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; @@ -3144,14 +3296,20 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; -@@ -5292,54 +5799,65 @@ +@@ -5314,69 +5795,69 @@ + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no ++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext=".dll" + shrext_cmds=".dll" # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. @@ -3166,10 +3324,21 @@ - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case "$host_os" in - rhapsody* | darwin1.[[012]]) -- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress' +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress' - ;; - *) # Darwin 1.3 on -- test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress' +- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- else +- case ${MACOSX_DEPLOYMENT_TARGET} in +- 10.[012]) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +- ;; +- 10.*) +- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup' +- ;; +- esac +- fi - ;; + case $host_os in + rhapsody* | darwin1.[[012]]) @@ -3196,18 +3365,18 @@ - lt_int_apple_cc_single_mod=yes - fi - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring' - else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring' - fi -- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' +- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs' - # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's - if test "X$lt_int_apple_cc_single_mod" = Xyes ; then -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - else -- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi -- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' +- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_automatic, $1)=yes @@ -3243,16 +3412,27 @@ ;; dgux*) -@@ -5372,7 +5890,7 @@ +@@ -5409,8 +5890,8 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -- freebsd*) +- freebsd* | kfreebsd*-gnu) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs' + freebsd* | kfreebsd*-gnu | dragonfly*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_AC_TAGVAR(hardcode_direct, $1)=yes -@@ -5395,47 +5913,62 @@ + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no +@@ -5418,7 +5899,7 @@ + + hpux9*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi +@@ -5432,47 +5913,62 @@ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3261,6 +3441,7 @@ if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' @@ -3282,13 +3463,14 @@ + if test "$GCC" = yes -a "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; + ia64*) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; + ;; *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else @@ -3337,15 +3519,59 @@ _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -@@ -5483,6 +6016,7 @@ +@@ -5486,7 +5982,7 @@ + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' +@@ -5519,7 +6015,8 @@ + _LT_AC_TAGVAR(hardcode_direct, $1)=yes _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' else -@@ -5528,7 +6062,7 @@ +@@ -5529,7 +6026,7 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac +@@ -5540,14 +6037,14 @@ + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes + _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported +- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' + _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + ;; + + osf3*) + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + else + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' +@@ -5559,13 +6056,13 @@ + osf4* | osf5*) # as osf3* with the addition of -msym flag + if test "$GCC" = yes; then + _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + else _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ @@ -3354,7 +3580,7 @@ # Both c and cxx compiler support -rpath directly _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -@@ -5536,21 +6070,15 @@ +@@ -5573,21 +6070,15 @@ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: ;; @@ -3369,16 +3595,18 @@ solaris*) _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text' if test "$GCC" = yes; then +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + wlarc='${wl}' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' +- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp' ++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp' else + wlarc='' _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' -@@ -5559,8 +6087,18 @@ +@@ -5596,8 +6087,18 @@ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; @@ -3399,7 +3627,16 @@ esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; -@@ -5617,36 +6155,45 @@ +@@ -5606,7 +6107,7 @@ + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs' ++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + else + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' + fi +@@ -5654,36 +6155,45 @@ fi ;; @@ -3419,11 +3656,11 @@ - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text' if test "$GCC" = yes; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' +- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi @@ -3466,7 +3703,7 @@ ;; uts4*) -@@ -5664,11 +6211,6 @@ +@@ -5701,11 +6211,6 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no @@ -3478,7 +3715,7 @@ # # Do we need to explicitly link libc? # -@@ -5689,13 +6231,14 @@ +@@ -5726,13 +6231,14 @@ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* printf "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -3494,7 +3731,7 @@ compiler_flags=-v linker_flags=-v verstring= -@@ -5823,7 +6366,7 @@ +@@ -5860,7 +6366,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do @@ -3503,8 +3740,8 @@ cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in ---- parts/appwizard/common/admin/ltmain.sh.orig Mon Jun 19 20:20:16 2006 -+++ parts/appwizard/common/admin/ltmain.sh Mon Jun 19 20:20:29 2006 +--- parts/appwizard/common/admin/ltmain.sh Sun Oct 1 19:29:12 2006 ++++ parts/appwizard/common/admin/ltmain.sh Sun Dec 18 23:14:54 2005 @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. @@ -3514,15 +3751,7 @@ # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # -@@ -17,13 +17,41 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a +@@ -24,6 +24,34 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -4065,16 +4294,16 @@ - -static) - build_old_libs=yes -- continue -- ;; -- -- -prefer-pic) -- pic_mode=yes + -static | -prefer-pic | -prefer-non-pic) + later="$later $arg" continue ;; +- -prefer-pic) +- pic_mode=yes +- continue +- ;; +- - -prefer-non-pic) - pic_mode=no + -no-suppress) @@ -4473,10 +4702,20 @@ ;; esac if test "$prev" = rpath; then -@@ -1149,6 +1412,18 @@ +@@ -1149,16 +1412,15 @@ finalize_command="$finalize_command $qarg" continue ;; +- framework) +- case $host in +- *-*-darwin*) +- case "$deplibs " in +- *" $qarg.ltframework "*) ;; +- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later +- ;; +- esac +- ;; +- esac + shrext) + shrext_cmds="$arg" + prev= @@ -4486,13 +4725,10 @@ + test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" -+ prev= -+ continue -+ ;; - *) - eval "$prev=\"\$arg\"" prev= -@@ -1197,7 +1472,7 @@ + continue + ;; +@@ -1210,7 +1472,7 @@ -export-symbols | -export-symbols-regex) if test -n "$export_symbols" || test -n "$export_symbols_regex"; then $echo "$modename: more than one -exported-symbols argument is not allowed" @@ -4501,7 +4737,7 @@ fi if test "X$arg" = "X-export-symbols"; then prev=expsyms -@@ -1207,6 +1482,18 @@ +@@ -1220,6 +1482,18 @@ continue ;; @@ -4520,7 +4756,7 @@ -inst-prefix-dir) prev=inst_prefix continue -@@ -1233,7 +1520,8 @@ +@@ -1246,7 +1520,8 @@ absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 @@ -4530,7 +4766,7 @@ fi dir="$absdir" ;; -@@ -1247,10 +1535,15 @@ +@@ -1260,10 +1535,15 @@ esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) @@ -4546,7 +4782,7 @@ ;; esac continue -@@ -1259,18 +1552,15 @@ +@@ -1272,26 +1552,35 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in @@ -4555,9 +4791,6 @@ # These systems don't actually have a C or math library (as such) continue ;; -- *-*-freebsd*-gnu*) -- # prevent being parsed by the freebsd regexp below -- ;; - *-*-mingw* | *-*-os2*) + *-*-os2*) # These systems don't actually have a C library (as such) @@ -4568,9 +4801,10 @@ # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; -@@ -1278,13 +1568,19 @@ + *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) @@ -4584,15 +4818,12 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in -- *-*-freebsd*-gnu*) -- # prevent being parsed by the freebsd regexp below -- ;; - *-*-openbsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; -@@ -1294,18 +1590,41 @@ +@@ -1301,18 +1590,41 @@ continue ;; @@ -4641,7 +4872,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` -@@ -1316,9 +1635,7 @@ +@@ -1323,9 +1635,7 @@ esac compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -4652,7 +4883,7 @@ continue ;; -@@ -1358,6 +1675,11 @@ +@@ -1365,6 +1675,11 @@ -o) prev=output ;; @@ -4664,7 +4895,7 @@ -release) prev=release continue -@@ -1380,7 +1702,7 @@ +@@ -1387,7 +1702,7 @@ [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 @@ -4673,7 +4904,19 @@ ;; esac case "$xrpath " in -@@ -1476,7 +1798,6 @@ +@@ -1473,11 +1788,6 @@ + continue + ;; + +- -framework) +- prev=framework +- continue +- ;; +- + # Some other compiler flag. + -* | +*) + # Unknown arguments in both finalize_command and compile_command need +@@ -1488,7 +1798,6 @@ arg="\"$arg\"" ;; esac @@ -4681,7 +4924,7 @@ ;; *.$objext) -@@ -1504,7 +1825,7 @@ +@@ -1516,7 +1825,7 @@ test "$pic_object" = none && \ test "$non_pic_object" = none; then $echo "$modename: cannot find name of object for \`$arg'" 1>&2 @@ -4690,7 +4933,7 @@ fi # Extract subdirectory from the argument. -@@ -1552,12 +1873,17 @@ +@@ -1564,12 +1873,17 @@ if test -z "$pic_object" || test "$pic_object" = none ; then arg="$non_pic_object" fi @@ -4709,7 +4952,7 @@ else # Dry-run case. -@@ -1611,7 +1937,6 @@ +@@ -1623,7 +1937,6 @@ arg="\"$arg\"" ;; esac @@ -4717,7 +4960,7 @@ ;; esac # arg -@@ -1625,48 +1950,7 @@ +@@ -1637,48 +1950,7 @@ if test -n "$prev"; then $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 $echo "$help" 1>&2 @@ -4767,7 +5010,7 @@ fi if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then -@@ -1699,9 +1983,9 @@ +@@ -1711,9 +1983,9 @@ if test ! -d "$output_objdir"; then $show "$mkdir $output_objdir" $run $mkdir $output_objdir @@ -4780,7 +5023,7 @@ fi fi -@@ -1710,7 +1994,7 @@ +@@ -1722,7 +1994,7 @@ "") $echo "$modename: you must specify an output file" 1>&2 $echo "$help" 1>&2 @@ -4789,7 +5032,7 @@ ;; *.$libext) linkmode=oldlib ;; *.lo | *.$objext) linkmode=obj ;; -@@ -1720,7 +2004,7 @@ +@@ -1732,7 +2004,7 @@ case $host in *cygwin* | *mingw* | *pw32*) @@ -4798,7 +5041,7 @@ duplicate_compiler_generated_deps=yes ;; *) -@@ -1764,7 +2048,6 @@ +@@ -1776,7 +2048,6 @@ newlib_search_path= need_relink=no # whether we're linking any uninstalled libtool libraries notinst_deplibs= # not-installed libtool libraries @@ -4806,7 +5049,7 @@ case $linkmode in lib) passes="conv link" -@@ -1773,7 +2056,7 @@ +@@ -1785,7 +2056,7 @@ *.la) ;; *) $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 @@ -4815,7 +5058,7 @@ ;; esac done -@@ -1811,18 +2094,23 @@ +@@ -1823,18 +2094,23 @@ lib= found=no case $deplib in @@ -4844,7 +5087,26 @@ # Search the libtool library lib="$searchdir/lib${name}${search_ext}" if test -f "$lib"; then -@@ -1898,11 +2186,11 @@ +@@ -1895,18 +2171,6 @@ + fi + fi + ;; # -l +- *.ltframework) +- if test "$linkmode,$pass" = "prog,link"; then +- compile_deplibs="$deplib $compile_deplibs" +- finalize_deplibs="$deplib $finalize_deplibs" +- else +- deplibs="$deplib $deplibs" +- if test "$linkmode" = lib ; then +- newdependency_libs="$deplib $newdependency_libs" +- fi +- fi +- continue +- ;; + -L*) + case $linkmode in + lib) +@@ -1922,11 +2186,11 @@ fi if test "$pass" = scan; then deplibs="$deplib $deplibs" @@ -4857,7 +5119,7 @@ ;; *) $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 -@@ -1930,7 +2218,22 @@ +@@ -1954,7 +2218,22 @@ fi case $linkmode in lib) @@ -4881,7 +5143,7 @@ $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" -@@ -1980,15 +2283,15 @@ +@@ -2004,15 +2283,15 @@ esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else @@ -4900,7 +5162,7 @@ fi ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` -@@ -2004,6 +2307,8 @@ +@@ -2028,6 +2307,8 @@ # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no @@ -4909,10 +5171,26 @@ # Read the .la file case $lib in -@@ -2021,33 +2326,32 @@ +@@ -2035,13 +2316,6 @@ + *) . ./$lib ;; + esac + +- case $host in +- *-*-darwin*) +- # Convert "-framework foo" to "foo.ltframework" in dependency_libs +- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` +- ;; +- esac +- + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan" || + { test "$linkmode" != prog && test "$linkmode" != lib; }; then +@@ -2050,35 +2324,34 @@ + fi + if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" +- # Only check for convenience libraries +- deplibs="$lib $deplibs" - tmp_libs= - for deplib in $dependency_libs; do - #echo "Adding $deplib to \$deplibs" @@ -4924,6 +5202,8 @@ - fi - tmp_libs="$tmp_libs $deplib" - done ++ # Only check for convenience libraries ++ deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 @@ -4956,7 +5236,7 @@ # Get the name of the library we link against. linklib= for l in $old_library $library_names; do -@@ -2055,16 +2359,18 @@ +@@ -2086,16 +2359,18 @@ done if test -z "$linklib"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 @@ -4978,7 +5258,7 @@ # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't -@@ -2101,11 +2407,19 @@ +@@ -2132,11 +2407,19 @@ dir="$libdir" absdir="$libdir" fi @@ -5002,7 +5282,7 @@ fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` -@@ -2113,7 +2427,7 @@ +@@ -2144,7 +2427,7 @@ if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 @@ -5011,7 +5291,7 @@ fi # Prefer using a static library (so that no silly _DYNAMIC symbols # are required to link). -@@ -2140,7 +2454,7 @@ +@@ -2171,7 +2454,7 @@ continue fi @@ -5020,7 +5300,7 @@ if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" -@@ -2178,12 +2492,12 @@ +@@ -2209,12 +2492,12 @@ if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path @@ -5035,7 +5315,7 @@ esac fi -@@ -2220,24 +2534,29 @@ +@@ -2251,24 +2534,29 @@ fi link_static=no # Whether the deplib will be linked statically @@ -5071,7 +5351,7 @@ if test "$linkmode" = lib && test "$hardcode_into_libs" = yes; then # Hardcode the library path. -@@ -2295,9 +2614,10 @@ +@@ -2326,9 +2614,10 @@ else $show "extracting exported symbol list from \`$soname'" save_ifs="$IFS"; IFS='~' @@ -5083,7 +5363,7 @@ $show "$cmd" $run eval "$cmd" || exit $? done -@@ -2308,9 +2628,10 @@ +@@ -2339,9 +2628,10 @@ if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" save_ifs="$IFS"; IFS='~' @@ -5095,7 +5375,7 @@ $show "$cmd" $run eval "$cmd" || exit $? done -@@ -2331,11 +2652,15 @@ +@@ -2362,11 +2652,15 @@ if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in @@ -5115,7 +5395,7 @@ $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo -@@ -2343,7 +2668,7 @@ +@@ -2374,7 +2668,7 @@ $echo "** The link will probably fail, sorry" else add="$dir/$old_library" @@ -5124,7 +5404,7 @@ fi esac elif test "$hardcode_minus_L" = no; then -@@ -2366,9 +2691,9 @@ +@@ -2397,9 +2691,9 @@ add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then @@ -5136,7 +5416,7 @@ ;; esac fi -@@ -2385,7 +2710,7 @@ +@@ -2416,7 +2710,7 @@ if test "$lib_linked" != yes; then $echo "$modename: configuration error: unsupported hardcode properties" @@ -5145,7 +5425,7 @@ fi if test -n "$add_shlibpath"; then -@@ -2428,7 +2753,8 @@ +@@ -2459,7 +2753,8 @@ esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5155,7 +5435,7 @@ add="$inst_prefix_dir$libdir/$linklib" else add="$libdir/$linklib" -@@ -2438,9 +2764,9 @@ +@@ -2469,9 +2764,9 @@ add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then @@ -5167,7 +5447,7 @@ ;; esac fi -@@ -2499,17 +2825,16 @@ +@@ -2530,17 +2825,16 @@ fi fi else @@ -5189,7 +5469,7 @@ # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do -@@ -2523,7 +2848,7 @@ +@@ -2554,7 +2848,7 @@ esac done dependency_libs="$temp_deplibs" @@ -5198,7 +5478,7 @@ newlib_search_path="$newlib_search_path $absdir" # Link against this library -@@ -2565,20 +2890,18 @@ +@@ -2596,20 +2890,18 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 @@ -5223,7 +5503,7 @@ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do -@@ -2586,46 +2909,45 @@ +@@ -2617,55 +2909,45 @@ done if test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" @@ -5272,8 +5552,16 @@ ;; *) continue ;; - esac -+ esac +- ;; +- +- *.ltframework) +- case $host in +- *-*-darwin*) +- depdepl="$deplib" +- ;; + esac ;; +- *) continue ;; esac case " $deplibs " in @@ -5291,7 +5579,7 @@ esac done fi # link_all_deplibs != no -@@ -2712,7 +3034,8 @@ +@@ -2752,7 +3034,8 @@ eval $var=\"$tmp_libs\" done # for var fi @@ -5301,7 +5589,7 @@ tmp_libs= for i in $dependency_libs ; do case " $predeps $postdeps $compiler_lib_search_path " in -@@ -2772,19 +3095,19 @@ +@@ -2812,19 +3095,19 @@ case $outputname in lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -5324,7 +5612,7 @@ eval libname=\"$libname_spec\" else libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` -@@ -2795,7 +3118,7 @@ +@@ -2835,7 +3118,7 @@ if test -n "$objs"; then if test "$deplibs_check_method" != pass_all; then $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 @@ -5333,7 +5621,7 @@ else $echo $echo "*** Warning: Linking the shared library $output against the non-libtool" -@@ -2843,13 +3166,13 @@ +@@ -2883,13 +3166,13 @@ if test -n "$8"; then $echo "$modename: too many parameters to \`-version-info'" 1>&2 $echo "$help" 1>&2 @@ -5349,7 +5637,7 @@ case $vinfo_number in yes) number_major="$2" -@@ -2889,36 +3212,36 @@ +@@ -2929,36 +3212,36 @@ # Check that each of the things are valid numbers. case $current in @@ -5396,7 +5684,7 @@ fi # Calculate the version variables. -@@ -2935,7 +3258,7 @@ +@@ -2975,7 +3258,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` @@ -5405,7 +5693,7 @@ ;; freebsd-aout) -@@ -3007,7 +3330,7 @@ +@@ -3047,7 +3330,7 @@ *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 @@ -5414,8 +5702,12 @@ ;; esac -@@ -3061,6 +3384,12 @@ - *.$objext) +@@ -3098,9 +3381,15 @@ + tempremovelist=`$echo "$output_objdir/*"` + for p in $tempremovelist; do + case $p in +- *.$objext | *$exeext) ++ *.$objext) ;; $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then @@ -5427,7 +5719,7 @@ removelist="$removelist $p" ;; *) ;; -@@ -3082,9 +3411,9 @@ +@@ -3122,9 +3411,9 @@ # Eliminate all temporary directories. for path in $notinst_path; do @@ -5440,7 +5732,7 @@ done if test -n "$xrpath"; then -@@ -3097,7 +3426,7 @@ +@@ -3137,7 +3426,7 @@ *) finalize_rpath="$finalize_rpath $libdir" ;; esac done @@ -5449,16 +5741,16 @@ dependency_libs="$temp_xrpath $dependency_libs" fi fi -@@ -3135,15 +3464,14 @@ +@@ -3170,14 +3459,19 @@ + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework +- deplibs="$deplibs System.ltframework" ++ deplibs="$deplibs -framework System" + ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; -- *-*-freebsd*-gnu*) -- # Prevent $arg from being parsed by the freebsd regexp below. -- if test "$build_libtool_need_lc" = "yes"; then -- deplibs="$deplibs -lc" -- fi -- ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. @@ -5472,7 +5764,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. -@@ -3187,11 +3515,11 @@ +@@ -3221,11 +3515,11 @@ int main() { return 0; } EOF $rm conftest @@ -5486,7 +5778,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -@@ -3228,11 +3556,11 @@ +@@ -3262,11 +3556,11 @@ # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do @@ -5500,7 +5792,7 @@ # Did it work? if test "$?" -eq 0 ; then ldd_output=`ldd conftest` -@@ -3280,7 +3608,7 @@ +@@ -3314,7 +3608,7 @@ set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do @@ -5509,7 +5801,7 @@ # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -@@ -3349,7 +3677,7 @@ +@@ -3383,7 +3677,7 @@ set dummy $deplibs_check_method match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do @@ -5518,7 +5810,27 @@ # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then -@@ -3479,6 +3807,35 @@ +@@ -3463,7 +3757,7 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + +@@ -3509,17 +3803,39 @@ + fi + fi + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- case $host in +- *-*-darwin*) +- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- ;; +- esac + # Done checking deplibs! deplibs=$newdeplibs fi @@ -5554,7 +5866,7 @@ # All the library-specific variables (install_libdir is set above). library_names= old_library= -@@ -3491,7 +3848,7 @@ +@@ -3532,7 +3848,7 @@ hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" @@ -5563,7 +5875,7 @@ for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then -@@ -3546,7 +3903,7 @@ +@@ -3587,7 +3903,7 @@ fi # Get the real and link names of the library. @@ -5572,7 +5884,7 @@ eval library_names=\"$library_names_spec\" set dummy $library_names realname="$2" -@@ -3562,6 +3919,7 @@ +@@ -3603,6 +3919,7 @@ fi lib="$output_objdir/$realname" @@ -5580,7 +5892,7 @@ for link do linknames="$linknames $link" -@@ -3576,10 +3934,11 @@ +@@ -3617,10 +3934,11 @@ $show "generating symbol list for \`$libname.la'" export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols @@ -5593,7 +5905,7 @@ if len=`expr "X$cmd" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then $show "$cmd" -@@ -3589,6 +3948,9 @@ +@@ -3630,6 +3948,9 @@ # The command line is too long to execute in one step. $show "using reloadable object file for export list..." skipped_export=: @@ -5603,7 +5915,7 @@ fi done IFS="$save_ifs" -@@ -3609,12 +3971,12 @@ +@@ -3650,12 +3971,12 @@ for test_deplib in $deplibs; do case " $convenience " in *" $test_deplib "*) ;; @@ -5618,7 +5930,7 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then -@@ -3622,67 +3984,13 @@ +@@ -3663,67 +3984,13 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" @@ -5689,7 +6001,7 @@ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" -@@ -3693,31 +4001,27 @@ +@@ -3734,31 +4001,27 @@ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? fi @@ -5731,7 +6043,7 @@ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else -@@ -3736,6 +4040,7 @@ +@@ -3777,6 +4040,7 @@ save_libobjs=$libobjs fi save_output=$output @@ -5739,7 +6051,7 @@ # Clear the reloadable object creation command queue and # initialize k to one. -@@ -3745,13 +4050,13 @@ +@@ -3786,13 +4050,13 @@ delfiles= last_robj= k=1 @@ -5755,7 +6067,7 @@ test "$len" -le "$max_cmd_len"; }; then objlist="$objlist $obj" else -@@ -3765,9 +4070,9 @@ +@@ -3806,9 +4070,9 @@ # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi @@ -5767,7 +6079,7 @@ objlist=$obj len=1 fi -@@ -3787,13 +4092,13 @@ +@@ -3828,13 +4092,13 @@ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi @@ -5783,7 +6095,7 @@ done $echo "creating a temporary reloadable object file: $output" -@@ -3818,28 +4123,54 @@ +@@ -3859,28 +4123,54 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. @@ -5843,7 +6155,7 @@ fi # Create links to the real library. -@@ -3887,7 +4218,7 @@ +@@ -3928,7 +4218,7 @@ *.lo) if test -n "$objs$old_deplibs"; then $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 @@ -5852,7 +6164,7 @@ fi libobj="$output" obj=`$echo "X$output" | $Xsed -e "$lo2o"` -@@ -3916,64 +4247,10 @@ +@@ -3957,64 +4247,10 @@ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" @@ -5919,7 +6231,7 @@ fi fi -@@ -3981,10 +4258,11 @@ +@@ -4022,10 +4258,11 @@ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" @@ -5932,7 +6244,7 @@ $show "$cmd" $run eval "$cmd" || exit $? done -@@ -3997,7 +4275,7 @@ +@@ -4038,7 +4275,7 @@ $run ${rm}r $gentop fi @@ -5941,7 +6253,7 @@ fi if test "$build_libtool_libs" != yes; then -@@ -4010,17 +4288,18 @@ +@@ -4051,17 +4288,18 @@ # accidentally link it into a program. # $show "echo timestamp > $libobj" # $run eval "echo timestamp > $libobj" || exit $? @@ -5962,7 +6274,7 @@ $show "$cmd" $run eval "$cmd" || exit $? done -@@ -4032,7 +4311,7 @@ +@@ -4073,7 +4311,7 @@ $run ${rm}r $gentop fi @@ -5971,7 +6283,28 @@ ;; prog) -@@ -4072,6 +4351,35 @@ +@@ -4098,24 +4336,50 @@ + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` ++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` + ;; + esac + + case $host in +- *-*-darwin*) ++ *darwin*) + # Don't allow lazy linking, it breaks C++ global constructors + if test "$tagname" = CXX ; then + compile_command="$compile_command ${wl}-bind_at_load" + finalize_command="$finalize_command ${wl}-bind_at_load" + fi +- # Time to change all our "foo.ltframework" stuff back to "-framework foo" +- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` +- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6007,7 +6340,7 @@ compile_command="$compile_command $compile_deplibs" finalize_command="$finalize_command $finalize_deplibs" -@@ -4116,10 +4424,15 @@ +@@ -4160,10 +4424,15 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) @@ -6023,7 +6356,7 @@ ;; esac done -@@ -4233,13 +4546,25 @@ +@@ -4277,13 +4546,25 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then @@ -6053,7 +6386,7 @@ fi fi -@@ -4290,7 +4615,26 @@ +@@ -4334,7 +4615,26 @@ #endif /* The mapping between symbol names and symbols. */ @@ -6080,7 +6413,7 @@ const char *name; lt_ptr address; } -@@ -4337,20 +4681,33 @@ +@@ -4381,20 +4681,33 @@ esac # Now compile the dynamic symbol file. @@ -6119,7 +6452,7 @@ ;; esac else -@@ -4363,17 +4720,6 @@ +@@ -4407,17 +4720,6 @@ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` fi @@ -6137,7 +6470,7 @@ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` -@@ -4382,7 +4728,7 @@ +@@ -4426,7 +4728,7 @@ # We have no uninstalled library dependencies, so finalize right now. $show "$link_command" $run eval "$link_command" @@ -6146,7 +6479,7 @@ # Delete the generated files. if test -n "$dlsyms"; then -@@ -4390,7 +4736,7 @@ +@@ -4434,7 +4736,7 @@ $run $rm "$output_objdir/${outputname}S.${objext}" fi @@ -6155,7 +6488,7 @@ fi if test -n "$shlibpath_var"; then -@@ -4449,7 +4795,7 @@ +@@ -4493,7 +4795,7 @@ # Link the executable and exit $show "$link_command" $run eval "$link_command" || exit $? @@ -6164,7 +6497,7 @@ fi if test "$hardcode_action" = relink; then -@@ -4504,10 +4850,10 @@ +@@ -4548,10 +4850,10 @@ fi # Quote $echo for shipping. @@ -6179,14 +6512,16 @@ esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` else -@@ -4530,10 +4876,12 @@ +@@ -4573,11 +4875,13 @@ + *) exeext= ;; esac case $host in - *cygwin* | *mingw* ) -- cwrappersource=`$echo ${objdir}/lt-${output}.c` +- *mingw* ) +- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c` - cwrapper=`$echo ${output}.exe` - $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 ++ *cygwin* | *mingw* ) + output_name=`basename $output` + output_path=`dirname $output` + cwrappersource="$output_path/$objdir/lt-$output_name.c" @@ -6196,7 +6531,7 @@ cat > $cwrappersource <<EOF -@@ -4542,7 +4890,7 @@ +@@ -4586,7 +4890,7 @@ The $output program cannot be directly executed until all the libtool libraries that it depends on are installed. @@ -6205,7 +6540,7 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. -@@ -4558,6 +4906,9 @@ +@@ -4602,6 +4906,9 @@ #include <malloc.h> #include <stdarg.h> #include <assert.h> @@ -6215,7 +6550,7 @@ #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX -@@ -4568,15 +4919,19 @@ +@@ -4612,15 +4919,19 @@ #endif #ifndef DIR_SEPARATOR @@ -6240,7 +6575,7 @@ #endif #ifndef DIR_SEPARATOR_2 -@@ -4586,17 +4941,32 @@ +@@ -4630,17 +4941,32 @@ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) #endif /* DIR_SEPARATOR_2 */ @@ -6275,7 +6610,7 @@ char * strendzap(char *str, const char *pat); void lt_fatal (const char *message, ...); -@@ -4605,30 +4975,52 @@ +@@ -4649,30 +4975,52 @@ { char **newargz; int i; @@ -6337,7 +6672,7 @@ } void * -@@ -4641,59 +5033,159 @@ +@@ -4685,59 +5033,159 @@ return p; } @@ -6374,9 +6709,7 @@ -fnqualify(const char *path) +int +check_executable(const char * path) - { -- size_t size; -- char *p; ++{ + struct stat st; + + DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!"); @@ -6403,7 +6736,9 @@ + newly allocated full path name if found, NULL otherwise */ +char * +find_executable (const char* wrapper) -+{ + { +- size_t size; +- char *p; + int has_slash = 0; + const char* p; + const char* p_next; @@ -6420,9 +6755,7 @@ - /* Is it qualified already? */ + /* Absolute path? */ - #if defined (HAVE_DOS_BASED_FILE_SYSTEM) -- if (isalpha (path[0]) && path[1] == ':') -- return xstrdup (path); ++#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); @@ -6440,7 +6773,9 @@ + return concat_name; + XFREE(concat_name); + } -+#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + #if defined (HAVE_DOS_BASED_FILE_SYSTEM) +- if (isalpha (path[0]) && path[1] == ':') +- return xstrdup (path); + } #endif - if (IS_DIR_SEPARATOR (path[0])) @@ -6519,7 +6854,7 @@ { size_t len, patlen; -@@ -4713,7 +5205,7 @@ +@@ -4757,7 +5205,7 @@ } static void @@ -6528,7 +6863,7 @@ const char * message, va_list ap) { fprintf (stderr, "%s: %s: ", program_name, mode); -@@ -4733,16 +5225,16 @@ +@@ -4777,16 +5225,16 @@ va_end (ap); } EOF @@ -6555,7 +6890,7 @@ $echo > $output "\ #! $SHELL -@@ -4763,7 +5255,7 @@ +@@ -4807,7 +5255,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. @@ -6564,7 +6899,7 @@ relink_command=\"$relink_command\" -@@ -4842,7 +5334,7 @@ +@@ -4886,7 +5334,7 @@ else $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" @@ -6573,7 +6908,7 @@ fi fi -@@ -4892,32 +5384,32 @@ +@@ -4936,34 +5384,32 @@ # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ @@ -6583,8 +6918,10 @@ ;; *) +- # Need to set LD_LIBRARY_PATH, to the value already +- # computed within libtool. $echo >> $output "\ -- exec \$progdir/\$program \${1+\"\$@\"} +- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"} + exec \"\$progdir/\$program\" \${1+\"\$@\"} " ;; @@ -6612,7 +6949,7 @@ ;; esac -@@ -4940,78 +5432,78 @@ +@@ -4986,78 +5432,78 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" @@ -6752,7 +7089,7 @@ else # the command line is too long to link in one step, link in parts $echo "using piecewise archive linking..." -@@ -5020,31 +5512,18 @@ +@@ -5066,31 +5512,18 @@ objlist= concat_cmds= save_oldobjs=$oldobjs @@ -6787,7 +7124,7 @@ test "$len" -le "$max_cmd_len"; then : else -@@ -5052,7 +5531,7 @@ +@@ -5098,7 +5531,7 @@ oldobjs=$objlist if test "$obj" = "$last_oldobj" ; then RANLIB=$save_RANLIB @@ -6796,7 +7133,7 @@ test -z "$concat_cmds" || concat_cmds=$concat_cmds~ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" objlist= -@@ -5063,12 +5542,13 @@ +@@ -5109,12 +5542,13 @@ if test "X$oldobjs" = "X" ; then eval cmds=\"\$concat_cmds\" else @@ -6811,7 +7148,7 @@ IFS="$save_ifs" $show "$cmd" $run eval "$cmd" || exit $? -@@ -5100,11 +5580,13 @@ +@@ -5146,11 +5580,13 @@ fi done # Quote the link command for shipping. @@ -6828,7 +7165,7 @@ # Only create the output if not a dry run. if test -z "$run"; then for installed in no yes; do -@@ -5122,7 +5604,7 @@ +@@ -5168,7 +5604,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 @@ -6837,7 +7174,7 @@ fi newdependency_libs="$newdependency_libs $libdir/$name" ;; -@@ -5136,7 +5618,7 @@ +@@ -5182,7 +5618,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 @@ -6846,7 +7183,7 @@ fi newdlfiles="$newdlfiles $libdir/$name" done -@@ -5147,11 +5629,30 @@ +@@ -5193,11 +5629,30 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 @@ -6878,7 +7215,7 @@ fi $rm $output # place dlname in correct position for cygwin -@@ -5195,7 +5696,7 @@ +@@ -5241,7 +5696,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" @@ -6887,7 +7224,7 @@ $echo >> $output "\ relink_command=\"$relink_command\"" fi -@@ -5208,7 +5709,7 @@ +@@ -5254,7 +5709,7 @@ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? ;; esac @@ -6896,7 +7233,7 @@ ;; # libtool install mode -@@ -5219,11 +5720,11 @@ +@@ -5265,11 +5720,11 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. @@ -6910,7 +7247,7 @@ arg="\"$arg\"" ;; esac -@@ -5232,14 +5733,14 @@ +@@ -5278,14 +5733,14 @@ shift else install_prog= @@ -6927,7 +7264,7 @@ arg="\"$arg\"" ;; esac -@@ -5257,28 +5758,31 @@ +@@ -5303,28 +5758,31 @@ do if test -n "$dest"; then files="$files $dest" @@ -6967,7 +7304,7 @@ continue fi ;; -@@ -5287,7 +5791,7 @@ +@@ -5333,7 +5791,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in @@ -6976,7 +7313,7 @@ arg="\"$arg\"" ;; esac -@@ -5297,13 +5801,13 @@ +@@ -5343,13 +5801,13 @@ if test -z "$install_prog"; then $echo "$modename: you must specify an install program" 1>&2 $echo "$help" 1>&2 @@ -6992,7 +7329,7 @@ fi if test -z "$files"; then -@@ -5313,7 +5817,7 @@ +@@ -5359,7 +5817,7 @@ $echo "$modename: you must specify a destination" 1>&2 fi $echo "$help" 1>&2 @@ -7001,7 +7338,7 @@ fi # Strip any trailing slash from the destination. -@@ -5334,7 +5838,7 @@ +@@ -5380,7 +5838,7 @@ if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 @@ -7010,7 +7347,7 @@ fi fi case $destdir in -@@ -5346,7 +5850,7 @@ +@@ -5392,7 +5850,7 @@ *) $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 $echo "$help" 1>&2 @@ -7019,7 +7356,7 @@ ;; esac done -@@ -5375,7 +5879,7 @@ +@@ -5421,7 +5879,7 @@ else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 @@ -7028,7 +7365,7 @@ fi library_names= -@@ -5417,7 +5921,7 @@ +@@ -5463,7 +5921,7 @@ # but it's something to keep an eye on. if test "$inst_prefix_dir" = "$destdir"; then $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 @@ -7037,7 +7374,7 @@ fi if test -n "$inst_prefix_dir"; then -@@ -5432,7 +5936,7 @@ +@@ -5478,7 +5936,7 @@ if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 @@ -7046,7 +7383,7 @@ fi fi -@@ -5456,23 +5960,36 @@ +@@ -5502,23 +5960,36 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. @@ -7087,7 +7424,7 @@ done IFS="$save_ifs" fi -@@ -5510,7 +6027,7 @@ +@@ -5556,7 +6027,7 @@ *) $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 $echo "$help" 1>&2 @@ -7096,7 +7433,7 @@ ;; esac -@@ -5528,7 +6045,7 @@ +@@ -5574,7 +6045,7 @@ $show "$install_prog $staticobj $staticdest" $run eval "$install_prog \$staticobj \$staticdest" || exit $? fi @@ -7105,7 +7442,7 @@ ;; *) -@@ -5566,23 +6083,21 @@ +@@ -5612,23 +6083,21 @@ notinst_deplibs= relink_command= @@ -7138,7 +7475,7 @@ fi finalize=yes -@@ -5604,30 +6119,21 @@ +@@ -5650,30 +6119,21 @@ done relink_command= @@ -7169,7 +7506,7 @@ - tmpdir="/tmp" - test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" -- if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : +- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then : - else - $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 - continue @@ -7178,7 +7515,7 @@ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. -@@ -5651,7 +6157,7 @@ +@@ -5697,7 +6157,7 @@ fi # remove .exe since cygwin /usr/bin/install will append another @@ -7187,7 +7524,7 @@ case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in -@@ -5683,16 +6189,17 @@ +@@ -5729,16 +6189,17 @@ $show "$install_prog $file $oldlib" $run eval "$install_prog \$file \$oldlib" || exit $? @@ -7207,7 +7544,7 @@ $show "$cmd" $run eval "$cmd" || exit $? done -@@ -5706,9 +6213,9 @@ +@@ -5752,9 +6213,9 @@ if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" @@ -7219,7 +7556,7 @@ fi ;; -@@ -5727,10 +6234,11 @@ +@@ -5773,10 +6234,11 @@ for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -7232,7 +7569,7 @@ $show "$cmd" $run eval "$cmd" || admincmds="$admincmds $cmd" -@@ -5747,9 +6255,9 @@ +@@ -5793,9 +6255,9 @@ fi # Exit here if they wanted silent mode. @@ -7244,7 +7581,7 @@ $echo "Libraries have been installed in:" for libdir in $libdirs; do $echo " $libdir" -@@ -5782,8 +6290,8 @@ +@@ -5828,8 +6290,8 @@ $echo $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." @@ -7255,7 +7592,7 @@ ;; # libtool execute mode -@@ -5795,7 +6303,7 @@ +@@ -5841,7 +6303,7 @@ if test -z "$cmd"; then $echo "$modename: you must specify a COMMAND" 1>&2 $echo "$help" @@ -7264,7 +7601,7 @@ fi # Handle -dlopen flags immediately. -@@ -5803,7 +6311,7 @@ +@@ -5849,7 +6311,7 @@ if test ! -f "$file"; then $echo "$modename: \`$file' is not a file" 1>&2 $echo "$help" 1>&2 @@ -7273,7 +7610,7 @@ fi dir= -@@ -5814,7 +6322,7 @@ +@@ -5860,7 +6322,7 @@ else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 @@ -7282,7 +7619,7 @@ fi # Read the libtool library. -@@ -5841,7 +6349,7 @@ +@@ -5887,7 +6349,7 @@ dir="$dir/$objdir" else $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 @@ -7291,7 +7628,7 @@ fi ;; -@@ -5921,7 +6429,7 @@ +@@ -5967,7 +6429,7 @@ $echo "export $shlibpath_var" fi $echo "$cmd$args" @@ -7300,7 +7637,7 @@ fi ;; -@@ -5949,7 +6457,7 @@ +@@ -5995,7 +6457,7 @@ if test -z "$rm"; then $echo "$modename: you must specify an RM program" 1>&2 $echo "$help" 1>&2 @@ -7309,7 +7646,7 @@ fi rmdirs= -@@ -5999,15 +6507,24 @@ +@@ -6045,15 +6507,24 @@ rmfiles="$rmfiles $objdir/$n" done test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" @@ -7337,7 +7674,7 @@ $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -6019,10 +6536,11 @@ +@@ -6065,10 +6536,11 @@ if test -n "$old_library"; then # Do each command in the old_postuninstall commands. @@ -7350,7 +7687,7 @@ $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then -@@ -6032,7 +6550,8 @@ +@@ -6078,7 +6550,8 @@ IFS="$save_ifs" fi # FIXME: should reinstall the best remaining shared library. @@ -7360,7 +7697,7 @@ fi ;; -@@ -6061,7 +6580,7 @@ +@@ -6107,7 +6580,7 @@ if test "$mode" = clean ; then noexename=$name case $file in @@ -7369,7 +7706,7 @@ file=`$echo $file|${SED} 's,.exe$,,'` noexename=`$echo $name|${SED} 's,.exe$,,'` # $file with .exe has already been added to rmfiles, -@@ -6106,20 +6625,20 @@ +@@ -6152,20 +6625,20 @@ "") $echo "$modename: you must specify a MODE" 1>&2 $echo "$generic_help" 1>&2 @@ -7393,7 +7730,7 @@ fi # We need to display help for each of the modes. -@@ -6155,7 +6674,7 @@ +@@ -6201,7 +6674,7 @@ a more detailed description of MODE. Report bugs to <bug-libtool@gnu.org>." @@ -7402,7 +7739,7 @@ ;; clean) -@@ -6267,6 +6786,8 @@ +@@ -6313,6 +6786,8 @@ -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -objectlist FILE Use a list of object files found in FILE to specify objects @@ -7411,7 +7748,7 @@ -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries -@@ -6308,14 +6829,14 @@ +@@ -6354,14 +6829,14 @@ *) $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 @@ -7428,7 +7765,7 @@ # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting -@@ -6329,12 +6850,11 @@ +@@ -6375,12 +6850,11 @@ # configuration. But we'll never go from static-only to shared-only. # ### BEGIN LIBTOOL TAG CONFIG: disable-shared diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist index 0d74ade725e1..130c7ae8ba44 100644 --- a/devel/kdevelop/pkg-plist +++ b/devel/kdevelop/pkg-plist @@ -158,9 +158,25 @@ lib/kde3/libclearcaseintegrator.so lib/kde3/libcvsserviceintegrator.a lib/kde3/libcvsserviceintegrator.la lib/kde3/libcvsserviceintegrator.so +lib/kde3/libdocchmplugin.a +lib/kde3/libdocchmplugin.la +lib/kde3/libdocchmplugin.so +lib/kde3/libdocchmplugin.so.0 lib/kde3/libdoccustomplugin.a lib/kde3/libdoccustomplugin.la lib/kde3/libdoccustomplugin.so +lib/kde3/libdocdevhelpplugin.a +lib/kde3/libdocdevhelpplugin.la +lib/kde3/libdocdevhelpplugin.so +lib/kde3/libdocdevhelpplugin.so.0 +lib/kde3/libdocdoxygenplugin.a +lib/kde3/libdocdoxygenplugin.la +lib/kde3/libdocdoxygenplugin.so +lib/kde3/libdocdoxygenplugin.so.0 +lib/kde3/libdockdevtocplugin.a +lib/kde3/libdockdevtocplugin.la +lib/kde3/libdockdevtocplugin.so +lib/kde3/libdockdevtocplugin.so.0 lib/kde3/libdocqtplugin.a lib/kde3/libdocqtplugin.la lib/kde3/libdocqtplugin.so @@ -394,22 +410,6 @@ lib/libdesignerintegration.a lib/libdesignerintegration.la lib/libdesignerintegration.so lib/libdesignerintegration.so.0 -lib/libdocchmplugin.a -lib/libdocchmplugin.la -lib/libdocchmplugin.so -lib/libdocchmplugin.so.0 -lib/libdocdevhelpplugin.a -lib/libdocdevhelpplugin.la -lib/libdocdevhelpplugin.so -lib/libdocdevhelpplugin.so.0 -lib/libdocdoxygenplugin.a -lib/libdocdoxygenplugin.la -lib/libdocdoxygenplugin.so -lib/libdocdoxygenplugin.so.0 -lib/libdockdevtocplugin.a -lib/libdockdevtocplugin.la -lib/libdockdevtocplugin.so -lib/libdockdevtocplugin.so.0 lib/libdocumentation_interfaces.a lib/libdocumentation_interfaces.la lib/libdocumentation_interfaces.so @@ -698,6 +698,7 @@ share/apps/kdevappwizard/superwaba.png share/apps/kdevappwizard/superwaba.tar.gz share/apps/kdevappwizard/template-common/Artistic share/apps/kdevappwizard/template-common/COPYING +share/apps/kdevappwizard/template-common/COPYING-DOCS share/apps/kdevappwizard/template-common/COPYING.LIB share/apps/kdevappwizard/template-common/LICENSE.BSD share/apps/kdevappwizard/template-common/LICENSE.QPL diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile index 99d12bd89bdb..5b2c53c82e80 100644 --- a/editors/calligra-l10n-ca/Makefile +++ b/editors/calligra-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-ca/distinfo b/editors/calligra-l10n-ca/distinfo index 5138bc7fcafb..64dc722ff740 100644 --- a/editors/calligra-l10n-ca/distinfo +++ b/editors/calligra-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 8e3ff02096b6574cf337430924d5af98 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 069f10ff118b9fdcb21ce37edd7cc6cf54184c2961868cdac5c1d606923a1658 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 524044 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist index 232a56980982..f9699d3b9475 100644 --- a/editors/calligra-l10n-ca/pkg-plist +++ b/editors/calligra-l10n-ca/pkg-plist @@ -15,16 +15,119 @@ share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kformula/common +share/doc/HTML/ca/kformula/index.cache.bz2 +share/doc/HTML/ca/kformula/index.docbook +share/doc/HTML/ca/kivio/common +share/doc/HTML/ca/kivio/credits.docbook +share/doc/HTML/ca/kivio/index.cache.bz2 +share/doc/HTML/ca/kivio/index.docbook +share/doc/HTML/ca/kivio/introduction.docbook +share/doc/HTML/ca/kivio/usage.docbook +share/doc/HTML/ca/kivio/working.docbook share/doc/HTML/ca/koffice/common share/doc/HTML/ca/koffice/index.cache.bz2 share/doc/HTML/ca/koffice/index.docbook share/doc/HTML/ca/koshell/common share/doc/HTML/ca/koshell/index.cache.bz2 share/doc/HTML/ca/koshell/index.docbook +share/doc/HTML/ca/kplato/commands.docbook +share/doc/HTML/ca/kplato/common +share/doc/HTML/ca/kplato/definitions.docbook +share/doc/HTML/ca/kplato/index.cache.bz2 +share/doc/HTML/ca/kplato/index.docbook +share/doc/HTML/ca/kplato/mainwindow.docbook +share/doc/HTML/ca/kplato/options.docbook +share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/faq.docbook +share/doc/HTML/ca/kpresenter/great-presentations.docbook +share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/menus.docbook +share/doc/HTML/ca/kpresenter/options.docbook +share/doc/HTML/ca/kpresenter/screen.docbook +share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/kspread/a11y.docbook +share/doc/HTML/ca/kspread/advanced.docbook +share/doc/HTML/ca/kspread/basics.docbook +share/doc/HTML/ca/kspread/cellformat0.png +share/doc/HTML/ca/kspread/cellformat1.png +share/doc/HTML/ca/kspread/cellformat2.png +share/doc/HTML/ca/kspread/cellformat3.png +share/doc/HTML/ca/kspread/cellformat4.png +share/doc/HTML/ca/kspread/cellformat5.png +share/doc/HTML/ca/kspread/cellformat6.png +share/doc/HTML/ca/kspread/cellformat7.png +share/doc/HTML/ca/kspread/cellprotection1.png +share/doc/HTML/ca/kspread/cellprotection2.png +share/doc/HTML/ca/kspread/commands.docbook +share/doc/HTML/ca/kspread/common +share/doc/HTML/ca/kspread/config.docbook +share/doc/HTML/ca/kspread/configdialog.docbook +share/doc/HTML/ca/kspread/configure1.png +share/doc/HTML/ca/kspread/configure2.png +share/doc/HTML/ca/kspread/configure3.png +share/doc/HTML/ca/kspread/configure4.png +share/doc/HTML/ca/kspread/configure5.png +share/doc/HTML/ca/kspread/configure6.png +share/doc/HTML/ca/kspread/faq.docbook +share/doc/HTML/ca/kspread/format.docbook +share/doc/HTML/ca/kspread/importexport.docbook +share/doc/HTML/ca/kspread/index.cache.bz2 +share/doc/HTML/ca/kspread/index.docbook +share/doc/HTML/ca/kspread/mousenav.png +share/doc/HTML/ca/kspread/newdocument.png +share/doc/HTML/ca/kspread/sheetproperties.png +share/doc/HTML/ca/kspread/shortcut1.png +share/doc/HTML/ca/kspread/shortcut2.png +share/doc/HTML/ca/kspread/shortcut3.png +share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kword/a11y.docbook +share/doc/HTML/ca/kword/basics.docbook +share/doc/HTML/ca/kword/bookmarks.docbook +share/doc/HTML/ca/kword/chapnumb.docbook +share/doc/HTML/ca/kword/columns.docbook +share/doc/HTML/ca/kword/common +share/doc/HTML/ca/kword/doccomments.docbook +share/doc/HTML/ca/kword/doclinks.docbook +share/doc/HTML/ca/kword/docstruct.docbook +share/doc/HTML/ca/kword/docvariables.docbook +share/doc/HTML/ca/kword/editing.docbook +share/doc/HTML/ca/kword/expressions.docbook +share/doc/HTML/ca/kword/footendnotes.docbook +share/doc/HTML/ca/kword/formatchar.docbook +share/doc/HTML/ca/kword/formatframes.docbook +share/doc/HTML/ca/kword/formatpara.docbook +share/doc/HTML/ca/kword/formulas.docbook +share/doc/HTML/ca/kword/frames.docbook +share/doc/HTML/ca/kword/fundimentals.docbook +share/doc/HTML/ca/kword/graphics.docbook +share/doc/HTML/ca/kword/headerfooter.docbook +share/doc/HTML/ca/kword/index.cache.bz2 +share/doc/HTML/ca/kword/index.docbook +share/doc/HTML/ca/kword/insertfile.docbook +share/doc/HTML/ca/kword/kparts.docbook +share/doc/HTML/ca/kword/lists.docbook +share/doc/HTML/ca/kword/mailmerge.docbook +share/doc/HTML/ca/kword/mbtb.docbook +share/doc/HTML/ca/kword/migrating.docbook +share/doc/HTML/ca/kword/opt.docbook +share/doc/HTML/ca/kword/pageformat.docbook +share/doc/HTML/ca/kword/storeprint.docbook +share/doc/HTML/ca/kword/styles.docbook +share/doc/HTML/ca/kword/table.docbook +share/doc/HTML/ca/kword/tabstops.docbook +share/doc/HTML/ca/kword/techinfo.docbook +share/doc/HTML/ca/kword/templatecreation.docbook +share/doc/HTML/ca/kword/toc.docbook +share/doc/HTML/ca/kword/tutorial.docbook +share/doc/HTML/ca/thesaurus/common +share/doc/HTML/ca/thesaurus/index.cache.bz2 +share/doc/HTML/ca/thesaurus/index.docbook share/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/kchart.mo +share/locale/ca/LC_MESSAGES/kdgantt.mo share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -51,8 +154,15 @@ share/locale/ca/LC_MESSAGES/kthesaurus.mo share/locale/ca/LC_MESSAGES/kugar.mo share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/ca/thesaurus +@dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/kpresenter +@dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell @dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kivio +@dirrm share/doc/HTML/ca/kformula @dirrm share/doc/HTML/ca/kexi @dirrm share/doc/HTML/ca/kchart @dirrm share/doc/HTML/ca/karbon diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile index 47c61c8df6cd..248790d56afc 100644 --- a/editors/calligra-l10n-da/Makefile +++ b/editors/calligra-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-da/distinfo b/editors/calligra-l10n-da/distinfo index ea0cfc7cacff..fb79a71beb1c 100644 --- a/editors/calligra-l10n-da/distinfo +++ b/editors/calligra-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 58c13527c47dee445572d26141fd3269 -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 407a8ae7d39ff0aec51f622285447dd200bd87a1f80257b8548c1c16c317fd21 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 1013226 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 diff --git a/editors/calligra-l10n-da/pkg-plist b/editors/calligra-l10n-da/pkg-plist index 03db1c115f7c..834334517175 100644 --- a/editors/calligra-l10n-da/pkg-plist +++ b/editors/calligra-l10n-da/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/da/kchart/index.docbook share/doc/HTML/da/kexi/basics.docbook share/doc/HTML/da/kexi/building.docbook share/doc/HTML/da/kexi/common +share/doc/HTML/da/kexi/comparing.docbook share/doc/HTML/da/kexi/configuration.docbook share/doc/HTML/da/kexi/credits.docbook share/doc/HTML/da/kexi/database.docbook +share/doc/HTML/da/kexi/designingforms.docbook +share/doc/HTML/da/kexi/enteringdataintotables.docbook +share/doc/HTML/da/kexi/enteringdatausingforms.docbook share/doc/HTML/da/kexi/index.cache.bz2 share/doc/HTML/da/kexi/index.docbook share/doc/HTML/da/kexi/intro.docbook share/doc/HTML/da/kexi/menus.docbook +share/doc/HTML/da/kexi/querydesigning.docbook share/doc/HTML/da/kformula/common share/doc/HTML/da/kformula/index.cache.bz2 share/doc/HTML/da/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/da/krita/commands-toolbars.docbook share/doc/HTML/da/krita/commands.docbook share/doc/HTML/da/krita/common share/doc/HTML/da/krita/credits.docbook +share/doc/HTML/da/krita/developers-plugins.docbook +share/doc/HTML/da/krita/developers-scripting.docbook share/doc/HTML/da/krita/developers.docbook share/doc/HTML/da/krita/faq.docbook share/doc/HTML/da/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook share/doc/HTML/da/krita/tutorial-starting.docbook +share/doc/HTML/da/krita/tutorial-tablet.docbook share/doc/HTML/da/krita/tutorial.docbook share/doc/HTML/da/krita/using-colorspaces.docbook share/doc/HTML/da/krita/using-filters.docbook +share/doc/HTML/da/krita/using-images.docbook share/doc/HTML/da/krita/using-layers.docbook share/doc/HTML/da/krita/using-selections.docbook +share/doc/HTML/da/krita/using-views.docbook share/doc/HTML/da/kspread/a11y.docbook share/doc/HTML/da/kspread/advanced.docbook share/doc/HTML/da/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo +share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile index 00dab794c8cf..19bbb0d828b6 100644 --- a/editors/calligra-l10n-el/Makefile +++ b/editors/calligra-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-el/distinfo b/editors/calligra-l10n-el/distinfo index d99d2f341307..0a977fd50dd0 100644 --- a/editors/calligra-l10n-el/distinfo +++ b/editors/calligra-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 4392e652560adb8c83fe2aac9479fcb8 -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 94ea30d6c2c1968d216a6bb81c368f2ec68aab473d68450ea6c69818f737ecc0 -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 367648 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 diff --git a/editors/calligra-l10n-el/pkg-plist b/editors/calligra-l10n-el/pkg-plist index 423a32aa7c81..46c436194e10 100644 --- a/editors/calligra-l10n-el/pkg-plist +++ b/editors/calligra-l10n-el/pkg-plist @@ -2,6 +2,7 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo +share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile index 2aa1fd93bb12..cb490bb940b4 100644 --- a/editors/calligra-l10n-en_GB/Makefile +++ b/editors/calligra-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-en_GB/distinfo b/editors/calligra-l10n-en_GB/distinfo index 28cf71ee2884..97a08e6f157e 100644 --- a/editors/calligra-l10n-en_GB/distinfo +++ b/editors/calligra-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 11b499953ae1616c589e793abc4e474b -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 2e0630762213c90b14759e0c2a61633ee25554f83ea9617836775860a62f7880 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 341916 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 diff --git a/editors/calligra-l10n-en_GB/pkg-plist b/editors/calligra-l10n-en_GB/pkg-plist index adbbd5d4d225..0e783dd7b5e1 100644 --- a/editors/calligra-l10n-en_GB/pkg-plist +++ b/editors/calligra-l10n-en_GB/pkg-plist @@ -15,6 +15,7 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo +share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile index fe268dca1e63..1683f36421bd 100644 --- a/editors/calligra-l10n-es/Makefile +++ b/editors/calligra-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-es/distinfo b/editors/calligra-l10n-es/distinfo index 5aedacd37629..96a86103ba37 100644 --- a/editors/calligra-l10n-es/distinfo +++ b/editors/calligra-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 7bfea102b91490128779465db13e7a6d9a2a1908e109ec98076da469129a1308 -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 17190560 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 diff --git a/editors/calligra-l10n-es/pkg-plist b/editors/calligra-l10n-es/pkg-plist index a02bdd2b7e9d..de46c53cba38 100644 --- a/editors/calligra-l10n-es/pkg-plist +++ b/editors/calligra-l10n-es/pkg-plist @@ -1,5 +1,4 @@ share/apps/koffice/autocorrect/es.xml -share/doc/HTML/es/api/kfontdialog.png share/doc/HTML/es/karbon/common share/doc/HTML/es/karbon/index.cache.bz2 share/doc/HTML/es/karbon/index.docbook @@ -44,10 +43,12 @@ share/doc/HTML/es/kchart/shortcut.png share/doc/HTML/es/kchart/toolbars.png share/doc/HTML/es/kexi/basics.docbook share/doc/HTML/es/kexi/building.docbook +share/doc/HTML/es/kexi/comparing.docbook share/doc/HTML/es/kexi/configuration.docbook share/doc/HTML/es/kexi/contact-example.png share/doc/HTML/es/kexi/credits.docbook share/doc/HTML/es/kexi/database.docbook +share/doc/HTML/es/kexi/enteringdataintotables.docbook share/doc/HTML/es/kexi/intro.docbook share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png @@ -102,6 +103,7 @@ share/doc/HTML/es/koshell/main-view.png share/doc/HTML/es/koshell/new-dialog.png share/doc/HTML/es/koshell/side-pane.png share/doc/HTML/es/kplato/commands.docbook +share/doc/HTML/es/kplato/common share/doc/HTML/es/kplato/configure-wbs.png share/doc/HTML/es/kplato/configure2.1.png share/doc/HTML/es/kplato/configure2.png @@ -114,6 +116,8 @@ share/doc/HTML/es/kplato/edit-calendar2.png share/doc/HTML/es/kplato/edit-resources.png share/doc/HTML/es/kplato/edit-resources1.png share/doc/HTML/es/kplato/edit-worktime.png +share/doc/HTML/es/kplato/index.cache.bz2 +share/doc/HTML/es/kplato/index.docbook share/doc/HTML/es/kplato/mainwindow.docbook share/doc/HTML/es/kplato/mainwindow1.png share/doc/HTML/es/kplato/options.docbook @@ -236,6 +240,7 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook +share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -284,6 +289,8 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png +share/doc/HTML/es/krita/index.cache.bz2 +share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -720,6 +727,7 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo +share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo @@ -760,6 +768,5 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kexi @dirrm share/doc/HTML/es/kchart @dirrm share/doc/HTML/es/karbon -@dirrm share/doc/HTML/es/api @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/calligra-l10n-et/Makefile b/editors/calligra-l10n-et/Makefile index c0ba82e8d416..371637a8a638 100644 --- a/editors/calligra-l10n-et/Makefile +++ b/editors/calligra-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-et/distinfo b/editors/calligra-l10n-et/distinfo index 74cb277ae6f8..cab102edda59 100644 --- a/editors/calligra-l10n-et/distinfo +++ b/editors/calligra-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = fed89528182c0dc7baa2c50fee165270 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 8e78fe330053cc72f843475ca4771a6bdef5bc7d4e22cf15172584beabf30fad -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 1139684 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 diff --git a/editors/calligra-l10n-et/pkg-plist b/editors/calligra-l10n-et/pkg-plist index a36be5654b99..42a8b9044ec5 100644 --- a/editors/calligra-l10n-et/pkg-plist +++ b/editors/calligra-l10n-et/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/et/kchart/index.docbook share/doc/HTML/et/kexi/basics.docbook share/doc/HTML/et/kexi/building.docbook share/doc/HTML/et/kexi/common +share/doc/HTML/et/kexi/comparing.docbook share/doc/HTML/et/kexi/configuration.docbook share/doc/HTML/et/kexi/credits.docbook share/doc/HTML/et/kexi/database.docbook +share/doc/HTML/et/kexi/designingforms.docbook +share/doc/HTML/et/kexi/enteringdataintotables.docbook +share/doc/HTML/et/kexi/enteringdatausingforms.docbook share/doc/HTML/et/kexi/index.cache.bz2 share/doc/HTML/et/kexi/index.docbook share/doc/HTML/et/kexi/intro.docbook share/doc/HTML/et/kexi/menus.docbook +share/doc/HTML/et/kexi/querydesigning.docbook share/doc/HTML/et/kformula/common share/doc/HTML/et/kformula/index.cache.bz2 share/doc/HTML/et/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/et/krita/commands-toolbars.docbook share/doc/HTML/et/krita/commands.docbook share/doc/HTML/et/krita/common share/doc/HTML/et/krita/credits.docbook +share/doc/HTML/et/krita/developers-plugins.docbook +share/doc/HTML/et/krita/developers-scripting.docbook share/doc/HTML/et/krita/developers.docbook share/doc/HTML/et/krita/faq.docbook share/doc/HTML/et/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/et/krita/settings.docbook share/doc/HTML/et/krita/tutorial-quick-starts.docbook share/doc/HTML/et/krita/tutorial-select-layer.docbook share/doc/HTML/et/krita/tutorial-starting.docbook +share/doc/HTML/et/krita/tutorial-tablet.docbook share/doc/HTML/et/krita/tutorial.docbook share/doc/HTML/et/krita/using-colorspaces.docbook share/doc/HTML/et/krita/using-filters.docbook +share/doc/HTML/et/krita/using-images.docbook share/doc/HTML/et/krita/using-layers.docbook share/doc/HTML/et/krita/using-selections.docbook +share/doc/HTML/et/krita/using-views.docbook share/doc/HTML/et/kspread/a11y.docbook share/doc/HTML/et/kspread/advanced.docbook share/doc/HTML/et/kspread/basics.docbook @@ -148,6 +158,7 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo +share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile index 3549b46cc8ed..7f8a39972722 100644 --- a/editors/calligra-l10n-it/Makefile +++ b/editors/calligra-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-it/distinfo b/editors/calligra-l10n-it/distinfo index dc9a385818d7..9f417dfc625c 100644 --- a/editors/calligra-l10n-it/distinfo +++ b/editors/calligra-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9658442039b455e52cf68599e3250f54 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9a0a25a0ccc62c1d45d16ffb969e3146e1d7f7a2939407c542c2fffddb78b71f -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 1550186 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist index 81da090823f6..ac3627f19ced 100644 --- a/editors/calligra-l10n-it/pkg-plist +++ b/editors/calligra-l10n-it/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kexi/basics.docbook share/doc/HTML/it/kexi/building.docbook share/doc/HTML/it/kexi/common +share/doc/HTML/it/kexi/comparing.docbook share/doc/HTML/it/kexi/configuration.docbook share/doc/HTML/it/kexi/credits.docbook share/doc/HTML/it/kexi/database.docbook +share/doc/HTML/it/kexi/designingforms.docbook +share/doc/HTML/it/kexi/enteringdataintotables.docbook +share/doc/HTML/it/kexi/enteringdatausingforms.docbook share/doc/HTML/it/kexi/index.cache.bz2 share/doc/HTML/it/kexi/index.docbook share/doc/HTML/it/kexi/intro.docbook share/doc/HTML/it/kexi/menus.docbook +share/doc/HTML/it/kexi/querydesigning.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook @@ -57,22 +62,26 @@ share/doc/HTML/it/krita/commands-toolbars.docbook share/doc/HTML/it/krita/commands.docbook share/doc/HTML/it/krita/common share/doc/HTML/it/krita/credits.docbook +share/doc/HTML/it/krita/developers-plugins.docbook +share/doc/HTML/it/krita/developers-scripting.docbook share/doc/HTML/it/krita/developers.docbook share/doc/HTML/it/krita/faq.docbook share/doc/HTML/it/krita/index.cache.bz2 share/doc/HTML/it/krita/index.docbook share/doc/HTML/it/krita/installation.docbook share/doc/HTML/it/krita/introduction.docbook -share/doc/HTML/it/krita/scripting.docbook share/doc/HTML/it/krita/settings.docbook share/doc/HTML/it/krita/tutorial-quick-starts.docbook share/doc/HTML/it/krita/tutorial-select-layer.docbook share/doc/HTML/it/krita/tutorial-starting.docbook +share/doc/HTML/it/krita/tutorial-tablet.docbook share/doc/HTML/it/krita/tutorial.docbook share/doc/HTML/it/krita/using-colorspaces.docbook share/doc/HTML/it/krita/using-filters.docbook +share/doc/HTML/it/krita/using-images.docbook share/doc/HTML/it/krita/using-layers.docbook share/doc/HTML/it/krita/using-selections.docbook +share/doc/HTML/it/krita/using-views.docbook share/doc/HTML/it/kspread/a11y.docbook share/doc/HTML/it/kspread/advanced.docbook share/doc/HTML/it/kspread/basics.docbook @@ -170,6 +179,7 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo +share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile index 4e111dae8f7f..ca57ae929f6d 100644 --- a/editors/calligra-l10n-nb/Makefile +++ b/editors/calligra-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo index 3b1c0a14407b..a75ee96d5fcf 100644 --- a/editors/calligra-l10n-nb/distinfo +++ b/editors/calligra-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 02adef48c63e4a9f87fed63cefb19d1d -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 2eef79ddae5815c778684ad0cc0f7eb23d46f6f4929aea78f15c75b7d911476c -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 368950 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist index 56cd255ecfe9..febc3638272c 100644 --- a/editors/calligra-l10n-nb/pkg-plist +++ b/editors/calligra-l10n-nb/pkg-plist @@ -2,6 +2,7 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo +share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile index 04aeaa72ffb2..0973f3e6e064 100644 --- a/editors/calligra-l10n-nl/Makefile +++ b/editors/calligra-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-nl/distinfo b/editors/calligra-l10n-nl/distinfo index 9cbf82513851..65ecfeb4b961 100644 --- a/editors/calligra-l10n-nl/distinfo +++ b/editors/calligra-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 9847ff8d7dbddf4c2f1ae4a6cb0694d1 -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 10a856ed3bb2090691ee2f3695d631a2bb242a140eab54351fd94eb02335b4f9 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 3270123 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 diff --git a/editors/calligra-l10n-nl/pkg-plist b/editors/calligra-l10n-nl/pkg-plist index 62ad8f9c5997..40a6e68057bd 100644 --- a/editors/calligra-l10n-nl/pkg-plist +++ b/editors/calligra-l10n-nl/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/nl/kchart/index.docbook share/doc/HTML/nl/kexi/basics.docbook share/doc/HTML/nl/kexi/building.docbook share/doc/HTML/nl/kexi/common +share/doc/HTML/nl/kexi/comparing.docbook share/doc/HTML/nl/kexi/configuration.docbook share/doc/HTML/nl/kexi/credits.docbook share/doc/HTML/nl/kexi/database.docbook +share/doc/HTML/nl/kexi/designingforms.docbook +share/doc/HTML/nl/kexi/enteringdataintotables.docbook +share/doc/HTML/nl/kexi/enteringdatausingforms.docbook share/doc/HTML/nl/kexi/index.cache.bz2 share/doc/HTML/nl/kexi/index.docbook share/doc/HTML/nl/kexi/intro.docbook share/doc/HTML/nl/kexi/menus.docbook +share/doc/HTML/nl/kexi/querydesigning.docbook share/doc/HTML/nl/kformula/additional_fonts1.png share/doc/HTML/nl/kformula/ambiguous-string.png share/doc/HTML/nl/kformula/common @@ -146,6 +151,8 @@ share/doc/HTML/nl/krita/commands-toolbars.docbook share/doc/HTML/nl/krita/commands.docbook share/doc/HTML/nl/krita/common share/doc/HTML/nl/krita/credits.docbook +share/doc/HTML/nl/krita/developers-plugins.docbook +share/doc/HTML/nl/krita/developers-scripting.docbook share/doc/HTML/nl/krita/developers.docbook share/doc/HTML/nl/krita/faq.docbook share/doc/HTML/nl/krita/index.cache.bz2 @@ -157,11 +164,14 @@ share/doc/HTML/nl/krita/settings.docbook share/doc/HTML/nl/krita/tutorial-quick-starts.docbook share/doc/HTML/nl/krita/tutorial-select-layer.docbook share/doc/HTML/nl/krita/tutorial-starting.docbook +share/doc/HTML/nl/krita/tutorial-tablet.docbook share/doc/HTML/nl/krita/tutorial.docbook share/doc/HTML/nl/krita/using-colorspaces.docbook share/doc/HTML/nl/krita/using-filters.docbook +share/doc/HTML/nl/krita/using-images.docbook share/doc/HTML/nl/krita/using-layers.docbook share/doc/HTML/nl/krita/using-selections.docbook +share/doc/HTML/nl/krita/using-views.docbook share/doc/HTML/nl/kspread/a11y.docbook share/doc/HTML/nl/kspread/advanced.docbook share/doc/HTML/nl/kspread/basics.docbook @@ -462,6 +472,7 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo +share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile index 2dfe5de3c96e..a41463e11c3c 100644 --- a/editors/calligra-l10n-sv/Makefile +++ b/editors/calligra-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/calligra-l10n-sv/distinfo b/editors/calligra-l10n-sv/distinfo index c6c36bca9a65..57649992cc47 100644 --- a/editors/calligra-l10n-sv/distinfo +++ b/editors/calligra-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 83f73110f60ef4b5f633e3cca0dd4e12 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 1bd9c91f93cd99c81802efb7856ce55dcde18502770f24617647c8487005dd58 -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 5965263 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 diff --git a/editors/calligra-l10n-sv/pkg-plist b/editors/calligra-l10n-sv/pkg-plist index 57b962dbd819..0f24d03f2f32 100644 --- a/editors/calligra-l10n-sv/pkg-plist +++ b/editors/calligra-l10n-sv/pkg-plist @@ -36,14 +36,19 @@ share/doc/HTML/sv/kchart/toolbars.png share/doc/HTML/sv/kexi/basics.docbook share/doc/HTML/sv/kexi/building.docbook share/doc/HTML/sv/kexi/common +share/doc/HTML/sv/kexi/comparing.docbook share/doc/HTML/sv/kexi/configuration.docbook share/doc/HTML/sv/kexi/contact-example.png share/doc/HTML/sv/kexi/credits.docbook share/doc/HTML/sv/kexi/database.docbook +share/doc/HTML/sv/kexi/designingforms.docbook +share/doc/HTML/sv/kexi/enteringdataintotables.docbook +share/doc/HTML/sv/kexi/enteringdatausingforms.docbook share/doc/HTML/sv/kexi/index.cache.bz2 share/doc/HTML/sv/kexi/index.docbook share/doc/HTML/sv/kexi/intro.docbook share/doc/HTML/sv/kexi/menus.docbook +share/doc/HTML/sv/kexi/querydesigning.docbook share/doc/HTML/sv/kformula/additional_fonts1.png share/doc/HTML/sv/kformula/ambiguous-string.png share/doc/HTML/sv/kformula/common @@ -227,12 +232,17 @@ share/doc/HTML/sv/krita/commands.docbook share/doc/HTML/sv/krita/common share/doc/HTML/sv/krita/createdocument.png share/doc/HTML/sv/krita/credits.docbook +share/doc/HTML/sv/krita/developers-plugins.docbook +share/doc/HTML/sv/krita/developers-scripting.docbook share/doc/HTML/sv/krita/developers.docbook share/doc/HTML/sv/krita/dialogs-addpalette.png +share/doc/HTML/sv/krita/dialogs-blur.png share/doc/HTML/sv/krita/dialogs-brightnesscontrast.png share/doc/HTML/sv/krita/dialogs-bumpmap.png share/doc/HTML/sv/krita/dialogs-coloradjustment.png share/doc/HTML/sv/krita/dialogs-colorrange.png +share/doc/HTML/sv/krita/dialogs-colortoalpha.png +share/doc/HTML/sv/krita/dialogs-colortransfer.png share/doc/HTML/sv/krita/dialogs-convertimagetype.png share/doc/HTML/sv/krita/dialogs-convertlayertype.png share/doc/HTML/sv/krita/dialogs-cubism.png @@ -241,22 +251,33 @@ share/doc/HTML/sv/krita/dialogs-documentinformation.png share/doc/HTML/sv/krita/dialogs-dropshadow.png share/doc/HTML/sv/krita/dialogs-emboss.png share/doc/HTML/sv/krita/dialogs-filtersgallery.png +share/doc/HTML/sv/krita/dialogs-gaussiannoise.png share/doc/HTML/sv/krita/dialogs-histogram.png share/doc/HTML/sv/krita/dialogs-imageproperties.png +share/doc/HTML/sv/krita/dialogs-imagerestoration.png share/doc/HTML/sv/krita/dialogs-imagesize.png share/doc/HTML/sv/krita/dialogs-layerproperties.png share/doc/HTML/sv/krita/dialogs-layersize.png +share/doc/HTML/sv/krita/dialogs-lenscorrection.png share/doc/HTML/sv/krita/dialogs-newadjustmentlayer.png share/doc/HTML/sv/krita/dialogs-newlayer.png share/doc/HTML/sv/krita/dialogs-oilpaint.png share/doc/HTML/sv/krita/dialogs-pixelize.png share/doc/HTML/sv/krita/dialogs-raindrops.png +share/doc/HTML/sv/krita/dialogs-randomnoise.png +share/doc/HTML/sv/krita/dialogs-randompick.png share/doc/HTML/sv/krita/dialogs-rotateimage.png share/doc/HTML/sv/krita/dialogs-rotatelayer.png share/doc/HTML/sv/krita/dialogs-roundcorners.png share/doc/HTML/sv/krita/dialogs-separateimage.png share/doc/HTML/sv/krita/dialogs-shearimage.png share/doc/HTML/sv/krita/dialogs-shearlayer.png +share/doc/HTML/sv/krita/dialogs-smalltiles.png +share/doc/HTML/sv/krita/dialogs-sobel.png +share/doc/HTML/sv/krita/dialogs-substrate.png +share/doc/HTML/sv/krita/dialogs-unsharpmask.png +share/doc/HTML/sv/krita/dialogs-wave.png +share/doc/HTML/sv/krita/dialogs-waveletnoise.png share/doc/HTML/sv/krita/faq.docbook share/doc/HTML/sv/krita/filters-customconvolution.png share/doc/HTML/sv/krita/gotchi.png @@ -329,11 +350,14 @@ share/doc/HTML/sv/krita/tutorial-select-layer-8.png share/doc/HTML/sv/krita/tutorial-select-layer-9.png share/doc/HTML/sv/krita/tutorial-select-layer.docbook share/doc/HTML/sv/krita/tutorial-starting.docbook +share/doc/HTML/sv/krita/tutorial-tablet.docbook share/doc/HTML/sv/krita/tutorial.docbook share/doc/HTML/sv/krita/using-colorspaces.docbook share/doc/HTML/sv/krita/using-filters.docbook +share/doc/HTML/sv/krita/using-images.docbook share/doc/HTML/sv/krita/using-layers.docbook share/doc/HTML/sv/krita/using-selections.docbook +share/doc/HTML/sv/krita/using-views.docbook share/doc/HTML/sv/kspread/a11y.docbook share/doc/HTML/sv/kspread/advanced.docbook share/doc/HTML/sv/kspread/basics.docbook @@ -608,6 +632,7 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo +share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile index 4df487a14bda..bd8bae7d81c3 100644 --- a/editors/calligra-l10n/Makefile +++ b/editors/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 6f27fc720383..9cb07045d1ed 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -16,15 +16,16 @@ DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org COMMENT= Office Suite for KDE3 -BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx \ - Magick-config:${PORTSDIR}/graphics/ImageMagick -LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx +LIB_DEPENDS= GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick \ + art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ aspell:${PORTSDIR}/textproc/aspell \ exif.12:${PORTSDIR}/graphics/libexif \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ freetype:${PORTSDIR}/print/freetype2 \ lcms:${PORTSDIR}/graphics/lcms \ paper:${PORTSDIR}/print/libpaper \ + poppler-qt:${PORTSDIR}/graphics/poppler-qt \ wpd-0.8:${PORTSDIR}/textproc/libwpd \ wv2:${PORTSDIR}/textproc/wv2 \ xml2:${PORTSDIR}/textproc/libxml2 \ @@ -46,7 +47,9 @@ USE_PGSQL= yes .include <bsd.port.pre.mk> CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \ - --with-pgsqllibdir=${LOCALBASE}/lib + --with-pgsqllibdir=${LOCALBASE}/lib \ + --with-pqxx-includes=${LOCALBASE}/include \ + --with-pqxx-libraries=${LOCALBASE}/lib .if ${OSVERSION} < 500035 EXTRA_PATCHES= ${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp @@ -63,6 +66,14 @@ post-configure: ${WRKSRC}/kchart/kdchart/Makefile \ ${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \ ${WRKSRC}/kexi/migration/pqxx/Makefile + ${REINPLACE_CMD} -e 's|round(|rint(|g' \ + ${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc + ${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \ + ${WRKSRC}/krita/plugins/filters/cimg/Makefile + ${REINPLACE_CMD} -e 's|xor|^|g' \ + ${WRKSRC}/kspread/kspread_style.cc + ${REINPLACE_CMD} -e 's|trunc(|rint(|g' \ + ${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp .endif .include <bsd.port.post.mk> diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 746a0be2c24d..04ee84201ab5 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2 -SHA256 (KDE/koffice/koffice-1.5.2.tar.bz2) = d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 -SIZE (KDE/koffice/koffice-1.5.2.tar.bz2) = 35878218 +MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 +SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 +SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 diff --git a/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp b/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp deleted file mode 100644 index 2f0cd77eaa23..000000000000 --- a/editors/calligra/files/patch-kexi_kexidb-preparedstatement.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kexi/kexidb/preparedstatement.cpp.orig Thu May 25 15:55:54 2006 -+++ kexi/kexidb/preparedstatement.cpp Thu May 25 16:02:59 2006 -@@ -104,7 +104,7 @@ - } - s.append(")"); - s.prepend(QCString("INSERT INTO ") + table->name().latin1() -- + (allTableFieldsUsed ? "" : (" (" + namesList + ")")) -+ + (allTableFieldsUsed ? QCString("") : (" (" + namesList + ")")) - + " VALUES ("); - } - return s; diff --git a/editors/calligra/pkg-plist b/editors/calligra/pkg-plist index 00888ba57513..23edb3d4c816 100644 --- a/editors/calligra/pkg-plist +++ b/editors/calligra/pkg-plist @@ -19,19 +19,25 @@ bin/kudesigner bin/kugar bin/kword include/KDChartAxisParams.h +include/KDChartAxisParamsWrapper.h include/KDChartCustomBox.h +include/KDChartCustomBoxWrapper.h include/KDChartDataIntern.h include/KDChartDataRegion.h include/KDChartEnums.h include/KDChartGlobal.h include/KDChartListTable.h +include/KDChartObjectFactory.h include/KDChartParams.h +include/KDChartParamsWrapper.h include/KDChartPropertySet.h include/KDChartTable.h include/KDChartTableBase.h +include/KDChartTableDataWrapper.h include/KDChartTextPiece.h include/KDChartVectorTable.h include/KDChartWidget.h +include/KDChartWrapperFactory.h include/KDFrame.h include/KDFrameProfileSection.h include/KoApplication.h @@ -126,12 +132,15 @@ include/kexidb/object.h include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h +include/kexidb/queryschemaparameter.h include/kexidb/relationship.h include/kexidb/schemadata.h include/kexidb/tableschema.h include/kexidb/transaction.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h +include/kexiutils/longlongvalidator.h +include/kexiutils/styleproxy.h include/kexiutils/tristate.h include/kexiutils/utils.h include/kexiutils/validator.h @@ -146,7 +155,6 @@ include/kis_basic_histogram_producers.h include/kis_boundary.h include/kis_brush.h include/kis_button_event.h -include/kis_button_press_event.h include/kis_button_release_event.h include/kis_canvas_controller.h include/kis_canvas_observer.h @@ -204,7 +212,6 @@ include/kis_iteratorpixeltrait.h include/kis_iterators_pixel.h include/kis_label_zoom.h include/kis_layer.h -include/kis_layer_visitor.h include/kis_layerbox.h include/kis_layerlist.h include/kis_matrix_widget.ui.h @@ -217,7 +224,6 @@ include/kis_nameserver.h include/kis_opengl_image_context.h include/kis_paint_device.h include/kis_paint_device_iface.h -include/kis_paint_layer.h include/kis_painter.h include/kis_paintop.h include/kis_paintop_box.h @@ -225,6 +231,7 @@ include/kis_paintop_registry.h include/kis_palette.h include/kis_palette_widget.h include/kis_pattern.h +include/kis_perspective_math.h include/kis_point.h include/kis_previewdialog.h include/kis_previewwidget.h @@ -233,8 +240,10 @@ include/kis_progress_display_interface.h include/kis_progress_subject.h include/kis_rect.h include/kis_resource.h +include/kis_scale_visitor.h include/kis_selection.h include/kis_shared_ptr_vector.h +include/kis_substrate.h include/kis_tileddatamanager.h include/kis_tool.h include/kis_tool_controller.h @@ -259,7 +268,6 @@ include/kobirdeyepanel.h include/koffice_export.h include/kofficeversion.h include/kopalettemanager.h -include/kross/api/argument.h include/kross/api/callable.h include/kross/api/class.h include/kross/api/dict.h @@ -433,6 +441,15 @@ lib/kde3/krita_rgb_f32_plugin.so lib/kde3/krita_rgb_u16_plugin.a lib/kde3/krita_rgb_u16_plugin.la lib/kde3/krita_rgb_u16_plugin.so +lib/kde3/krita_ycbcr_u16_plugin.a +lib/kde3/krita_ycbcr_u16_plugin.la +lib/kde3/krita_ycbcr_u16_plugin.so +lib/kde3/krita_ycbcr_u8_plugin.a +lib/kde3/krita_ycbcr_u8_plugin.la +lib/kde3/krita_ycbcr_u8_plugin.so +lib/kde3/kritablurfilter.a +lib/kde3/kritablurfilter.la +lib/kde3/kritablurfilter.so lib/kde3/kritabumpmap.a lib/kde3/kritabumpmap.la lib/kde3/kritabumpmap.so @@ -469,6 +486,12 @@ lib/kde3/kritaembossfilter.so lib/kde3/kritaexample.a lib/kde3/kritaexample.la lib/kde3/kritaexample.so +lib/kde3/kritaextensioncolorsfilters.a +lib/kde3/kritaextensioncolorsfilters.la +lib/kde3/kritaextensioncolorsfilters.so +lib/kde3/kritafastcolortransfer.a +lib/kde3/kritafastcolortransfer.la +lib/kde3/kritafastcolortransfer.so lib/kde3/kritafiltersgallery.a lib/kde3/kritafiltersgallery.la lib/kde3/kritafiltersgallery.so @@ -487,6 +510,18 @@ lib/kde3/kritaimageenhancement.so lib/kde3/kritaimagesize.a lib/kde3/kritaimagesize.la lib/kde3/kritaimagesize.so +lib/kde3/kritalenscorrectionfilter.a +lib/kde3/kritalenscorrectionfilter.la +lib/kde3/kritalenscorrectionfilter.so +lib/kde3/kritalevelfilter.a +lib/kde3/kritalevelfilter.la +lib/kde3/kritalevelfilter.so +lib/kde3/kritamodifyselection.a +lib/kde3/kritamodifyselection.la +lib/kde3/kritamodifyselection.so +lib/kde3/kritanoisefilter.a +lib/kde3/kritanoisefilter.la +lib/kde3/kritanoisefilter.so lib/kde3/kritaoilpaintfilter.a lib/kde3/kritaoilpaintfilter.la lib/kde3/kritaoilpaintfilter.so @@ -496,6 +531,9 @@ lib/kde3/kritapixelizefilter.so lib/kde3/kritaraindropsfilter.a lib/kde3/kritaraindropsfilter.la lib/kde3/kritaraindropsfilter.so +lib/kde3/kritarandompickfilter.a +lib/kde3/kritarandompickfilter.la +lib/kde3/kritarandompickfilter.so lib/kde3/kritargbplugin.a lib/kde3/kritargbplugin.la lib/kde3/kritargbplugin.so @@ -523,18 +561,27 @@ lib/kde3/kritashearimage.so lib/kde3/kritasmalltilesfilter.a lib/kde3/kritasmalltilesfilter.la lib/kde3/kritasmalltilesfilter.so -lib/kde3/kritasmearybrush.a -lib/kde3/kritasmearybrush.la -lib/kde3/kritasmearybrush.so lib/kde3/kritasobelfilter.a lib/kde3/kritasobelfilter.la lib/kde3/kritasobelfilter.so +lib/kde3/kritasubstrate.a +lib/kde3/kritasubstrate.la +lib/kde3/kritasubstrate.so lib/kde3/kritatoolcrop.a lib/kde3/kritatoolcrop.la lib/kde3/kritatoolcrop.so +lib/kde3/kritatoolcurves.a +lib/kde3/kritatoolcurves.la +lib/kde3/kritatoolcurves.so lib/kde3/kritatoolfilter.a lib/kde3/kritatoolfilter.la lib/kde3/kritatoolfilter.so +lib/kde3/kritatoolperspectivegrid.a +lib/kde3/kritatoolperspectivegrid.la +lib/kde3/kritatoolperspectivegrid.so +lib/kde3/kritatoolperspectivetransform.a +lib/kde3/kritatoolperspectivetransform.la +lib/kde3/kritatoolperspectivetransform.so lib/kde3/kritatoolpolygon.a lib/kde3/kritatoolpolygon.la lib/kde3/kritatoolpolygon.so @@ -550,6 +597,12 @@ lib/kde3/kritatoolstar.so lib/kde3/kritatooltransform.a lib/kde3/kritatooltransform.la lib/kde3/kritatooltransform.so +lib/kde3/kritaunsharpfilter.a +lib/kde3/kritaunsharpfilter.la +lib/kde3/kritaunsharpfilter.so +lib/kde3/kritawavefilter.a +lib/kde3/kritawavefilter.la +lib/kde3/kritawavefilter.so lib/kde3/kritawetplugin.a lib/kde3/kritawetplugin.la lib/kde3/kritawetplugin.so @@ -562,6 +615,9 @@ lib/kde3/krosskexidb.so lib/kde3/krosskritacore.a lib/kde3/krosskritacore.la lib/kde3/krosskritacore.so +lib/kde3/krosskspreadcore.a +lib/kde3/krosskspreadcore.la +lib/kde3/krosskspreadcore.so lib/kde3/krosspython.a lib/kde3/krosspython.la lib/kde3/krosspython.so @@ -571,6 +627,9 @@ lib/kde3/krossruby.so lib/kde3/kspread.a lib/kde3/kspread.la lib/kde3/kspread.so +lib/kde3/kspreadscripting.a +lib/kde3/kspreadscripting.la +lib/kde3/kspreadscripting.so lib/kde3/kthesaurus.a lib/kde3/kthesaurus.la lib/kde3/kthesaurus.so @@ -790,21 +849,24 @@ lib/kde3/libkrita_openexr_import.so lib/kde3/libkrita_raw_import.a lib/kde3/libkrita_raw_import.la lib/kde3/libkrita_raw_import.so +lib/kde3/libkritagmagickexport.a +lib/kde3/libkritagmagickexport.la +lib/kde3/libkritagmagickexport.so +lib/kde3/libkritagmagickimport.a +lib/kde3/libkritagmagickimport.la +lib/kde3/libkritagmagickimport.so lib/kde3/libkritajpegexport.a lib/kde3/libkritajpegexport.la lib/kde3/libkritajpegexport.so lib/kde3/libkritajpegimport.a lib/kde3/libkritajpegimport.la lib/kde3/libkritajpegimport.so -lib/kde3/libkritamagickexport.a -lib/kde3/libkritamagickexport.la -lib/kde3/libkritamagickexport.so -lib/kde3/libkritamagickimport.a -lib/kde3/libkritamagickimport.la -lib/kde3/libkritamagickimport.so lib/kde3/libkritapart.a lib/kde3/libkritapart.la lib/kde3/libkritapart.so +lib/kde3/libkritapdfimport.a +lib/kde3/libkritapdfimport.la +lib/kde3/libkritapdfimport.so lib/kde3/libkritapngexport.a lib/kde3/libkritapngexport.la lib/kde3/libkritapngexport.so @@ -823,6 +885,9 @@ lib/kde3/libkspreadhtmlexport.so lib/kde3/libkspreadinsertcalendar.a lib/kde3/libkspreadinsertcalendar.la lib/kde3/libkspreadinsertcalendar.so +lib/kde3/libkspreadkexiimport.a +lib/kde3/libkspreadkexiimport.la +lib/kde3/libkspreadkexiimport.so lib/kde3/libkspreadlatexexport.a lib/kde3/libkspreadlatexexport.la lib/kde3/libkspreadlatexexport.so @@ -856,6 +921,9 @@ lib/kde3/libmswriteexport.so lib/kde3/libmswriteimport.a lib/kde3/libmswriteimport.la lib/kde3/libmswriteimport.so +lib/kde3/libolefilter.a +lib/kde3/libolefilter.la +lib/kde3/libolefilter.so lib/kde3/liboodrawimport.a lib/kde3/liboodrawimport.la lib/kde3/liboodrawimport.so @@ -886,9 +954,6 @@ lib/kde3/libpalmdocimport.so lib/kde3/libpdfimport.a lib/kde3/libpdfimport.la lib/kde3/libpdfimport.so -lib/kde3/libpowerpointimport.a -lib/kde3/libpowerpointimport.la -lib/kde3/libpowerpointimport.so lib/kde3/libqproimport.a lib/kde3/libqproimport.la lib/kde3/libqproimport.so @@ -989,43 +1054,43 @@ lib/libkdeinit_kword.so lib/libkexicore.a lib/libkexicore.la lib/libkexicore.so -lib/libkexicore.so.1 +lib/libkexicore.so.2 lib/libkexidatatable.a lib/libkexidatatable.la lib/libkexidatatable.so -lib/libkexidatatable.so.1 +lib/libkexidatatable.so.2 lib/libkexidb.a lib/libkexidb.la lib/libkexidb.so -lib/libkexidb.so.0 +lib/libkexidb.so.2 lib/libkexidbparser.a lib/libkexidbparser.la lib/libkexidbparser.so -lib/libkexidbparser.so.1 +lib/libkexidbparser.so.2 lib/libkexiextendedwidgets.a lib/libkexiextendedwidgets.la lib/libkexiextendedwidgets.so -lib/libkexiextendedwidgets.so.1 +lib/libkexiextendedwidgets.so.2 lib/libkexiformutils.a lib/libkexiformutils.la lib/libkexiformutils.so -lib/libkexiformutils.so.1 +lib/libkexiformutils.so.2 lib/libkexiguiutils.a lib/libkexiguiutils.la lib/libkexiguiutils.so -lib/libkexiguiutils.so.1 +lib/libkexiguiutils.so.2 lib/libkeximain.a lib/libkeximain.la lib/libkeximain.so -lib/libkeximain.so.1 +lib/libkeximain.so.2 lib/libkeximigrate.a lib/libkeximigrate.la lib/libkeximigrate.so -lib/libkeximigrate.so.1 +lib/libkeximigrate.so.2 lib/libkexirelationsview.a lib/libkexirelationsview.la lib/libkexirelationsview.so -lib/libkexirelationsview.so.1 +lib/libkexirelationsview.so.2 lib/libkexisql2.a lib/libkexisql2.la lib/libkexisql2.so @@ -1037,11 +1102,11 @@ lib/libkexisql3.so.3 lib/libkexiutils.a lib/libkexiutils.la lib/libkexiutils.so -lib/libkexiutils.so.1 +lib/libkexiutils.so.2 lib/libkformdesigner.a lib/libkformdesigner.la lib/libkformdesigner.so -lib/libkformdesigner.so.1 +lib/libkformdesigner.so.2 lib/libkformulalib.a lib/libkformulalib.la lib/libkformulalib.so @@ -1073,7 +1138,7 @@ lib/libkopalette.so.1 lib/libkoproperty.a lib/libkoproperty.la lib/libkoproperty.so -lib/libkoproperty.so.0 +lib/libkoproperty.so.2 lib/libkotext.a lib/libkotext.la lib/libkotext.so @@ -1114,6 +1179,14 @@ lib/libkrita_rgb_u16.a lib/libkrita_rgb_u16.la lib/libkrita_rgb_u16.so lib/libkrita_rgb_u16.so.0 +lib/libkrita_ycbcr_u16.a +lib/libkrita_ycbcr_u16.la +lib/libkrita_ycbcr_u16.so +lib/libkrita_ycbcr_u16.so.0 +lib/libkrita_ycbcr_u8.a +lib/libkrita_ycbcr_u8.la +lib/libkrita_ycbcr_u8.so +lib/libkrita_ycbcr_u8.so.0 lib/libkritacolor.a lib/libkritacolor.la lib/libkritacolor.so @@ -1183,6 +1256,13 @@ lib/libkwordprivate.so lib/libkwordprivate.so.4 share/applications/kde/kivio.desktop share/applications/kde/krita.desktop +share/applnk/.hidden/krita_jpeg.desktop +share/applnk/.hidden/krita_magick.desktop +share/applnk/.hidden/krita_openexr.desktop +share/applnk/.hidden/krita_pdf.desktop +share/applnk/.hidden/krita_png.desktop +share/applnk/.hidden/krita_raw.desktop +share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop @@ -1191,12 +1271,6 @@ share/applnk/Office/kformula.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kplato.desktop share/applnk/Office/kpresenter.desktop -share/applnk/Office/krita_jpeg.desktop -share/applnk/Office/krita_magick.desktop -share/applnk/Office/krita_openexr.desktop -share/applnk/Office/krita_png.desktop -share/applnk/Office/krita_raw.desktop -share/applnk/Office/krita_tiff.desktop share/applnk/Office/kspread.desktop share/applnk/Office/kudesigner.desktop share/applnk/Office/kugar.desktop @@ -1373,13 +1447,21 @@ share/apps/kchart/pics/chart_hilo_normal.png share/apps/kchart/pics/chart_hilo_openclose.png share/apps/kchart/pics/chart_legend_bottom.png share/apps/kchart/pics/chart_legend_bottomleft.png +share/apps/kchart/pics/chart_legend_bottomleftbottom.png +share/apps/kchart/pics/chart_legend_bottomleftleft.png share/apps/kchart/pics/chart_legend_bottomright.png +share/apps/kchart/pics/chart_legend_bottomrightbottom.png +share/apps/kchart/pics/chart_legend_bottomrightright.png share/apps/kchart/pics/chart_legend_left.png share/apps/kchart/pics/chart_legend_nolegend.png share/apps/kchart/pics/chart_legend_right.png share/apps/kchart/pics/chart_legend_top.png share/apps/kchart/pics/chart_legend_topleft.png +share/apps/kchart/pics/chart_legend_topleftleft.png +share/apps/kchart/pics/chart_legend_toplefttop.png share/apps/kchart/pics/chart_legend_topright.png +share/apps/kchart/pics/chart_legend_toprightright.png +share/apps/kchart/pics/chart_legend_toprighttop.png share/apps/kchart/pics/chart_line_normal.png share/apps/kchart/pics/chart_line_percent.png share/apps/kchart/pics/chart_line_stacked.png @@ -1401,6 +1483,7 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png share/apps/kexi/icons/crystalsvg/16x16/actions/check.png share/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png +share/apps/kexi/icons/crystalsvg/16x16/actions/combo.png share/apps/kexi/icons/crystalsvg/16x16/actions/database.png share/apps/kexi/icons/crystalsvg/16x16/actions/database_import.png share/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png @@ -1414,6 +1497,8 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/line.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_horizontal.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_vertical.png share/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/16x16/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/16x16/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png @@ -1484,6 +1569,8 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png share/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png share/apps/kexi/icons/crystalsvg/22x22/actions/listview.png share/apps/kexi/icons/crystalsvg/22x22/actions/lower.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/22x22/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png @@ -1522,6 +1609,8 @@ share/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png share/apps/kexi/icons/crystalsvg/32x32/actions/grid.png share/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png share/apps/kexi/icons/crystalsvg/32x32/actions/key.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png share/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png share/apps/kexi/icons/crystalsvg/32x32/actions/query.png @@ -1563,15 +1652,13 @@ share/apps/kexi/scripts/importxhtml/ImportXHTML.rc share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc share/apps/kformula/dtd/kformula.dtd -share/apps/kformula/fonts/cmbx10.ttf +share/apps/kformula/fonts/Arev.ttf +share/apps/kformula/fonts/ArevBI.ttf +share/apps/kformula/fonts/ArevBd.ttf +share/apps/kformula/fonts/ArevIt.ttf share/apps/kformula/fonts/cmex10.ttf -share/apps/kformula/fonts/cmmi10.ttf -share/apps/kformula/fonts/cmr10.ttf -share/apps/kformula/fonts/cmsy10.ttf share/apps/kformula/fonts/fonts.dir share/apps/kformula/fonts/fonts.scale -share/apps/kformula/fonts/msam10.ttf -share/apps/kformula/fonts/msbm10.ttf share/apps/kformula/kformula.rc share/apps/kformula/kformula_readonly.rc share/apps/kformula/tips @@ -3684,11 +3771,19 @@ share/apps/krita/pics/polyline.png share/apps/krita/pics/raiselayer.png share/apps/krita/pics/rotate_cursor.xpm share/apps/krita/pics/tablet.png +share/apps/krita/pics/tool_bezier_cursor.png +share/apps/krita/pics/tool_bezier_paint.png +share/apps/krita/pics/tool_bezier_select.png share/apps/krita/pics/tool_brush_selection.png share/apps/krita/pics/tool_brush_selection_cursor.png +share/apps/krita/pics/tool_color_fill.png +share/apps/krita/pics/tool_colorpicker.png share/apps/krita/pics/tool_contiguous_selection.png share/apps/krita/pics/tool_contiguous_selection_cursor.png +share/apps/krita/pics/tool_crop.png share/apps/krita/pics/tool_crop_cursor.png +share/apps/krita/pics/tool_curve_dragging.png +share/apps/krita/pics/tool_duplicate.png share/apps/krita/pics/tool_duplicate_cursor.png share/apps/krita/pics/tool_ellipse.png share/apps/krita/pics/tool_ellipse_cursor.png @@ -3696,6 +3791,8 @@ share/apps/krita/pics/tool_elliptical_selection.png share/apps/krita/pics/tool_elliptical_selection_cursor.png share/apps/krita/pics/tool_eraser_selection.png share/apps/krita/pics/tool_eraser_selection_cursor.png +share/apps/krita/pics/tool_example.png +share/apps/krita/pics/tool_example_cursor.png share/apps/krita/pics/tool_fill_cursor.png share/apps/krita/pics/tool_filter.png share/apps/krita/pics/tool_filter_cursor.png @@ -3705,9 +3802,15 @@ share/apps/krita/pics/tool_gradient.png share/apps/krita/pics/tool_gradient_cursor.png share/apps/krita/pics/tool_line.png share/apps/krita/pics/tool_line_cursor.png +share/apps/krita/pics/tool_moutline.png +share/apps/krita/pics/tool_moutline_cursor.png +share/apps/krita/pics/tool_moutline_editing.png +share/apps/krita/pics/tool_move.png share/apps/krita/pics/tool_outline_selection.png share/apps/krita/pics/tool_outline_selection_cursor.png share/apps/krita/pics/tool_pan.png +share/apps/krita/pics/tool_perspectivegrid.png +share/apps/krita/pics/tool_perspectivetransform.png share/apps/krita/pics/tool_polygon.png share/apps/krita/pics/tool_polygon_cursor.png share/apps/krita/pics/tool_polygonal_selection.png @@ -3725,6 +3828,8 @@ share/apps/krita/pics/tool_star.png share/apps/krita/pics/tool_star_cursor.png share/apps/krita/pics/tool_text.png share/apps/krita/pics/tool_text_cursor.png +share/apps/krita/pics/tool_transform.png +share/apps/krita/pics/tool_zoom.png share/apps/krita/pics/tool_zoom_minus_cursor.png share/apps/krita/pics/tool_zoom_plus_cursor.png share/apps/krita/pics/unlinked.png @@ -3740,6 +3845,7 @@ share/apps/krita/profiles/PAL.icm share/apps/krita/profiles/SMPTE-C.icm share/apps/krita/profiles/WideGamut.icm share/apps/krita/profiles/cmyk.icm +share/apps/krita/profiles/fogra27l.icm share/apps/krita/profiles/lcmslabi.icm share/apps/krita/profiles/lcmsxyzi.icm share/apps/krita/profiles/monoscnr.icm @@ -3796,10 +3902,12 @@ share/apps/kritaplugins/imageseparate.rc share/apps/kritaplugins/imagesize.rc share/apps/kritaplugins/kritafiltersgallery.rc share/apps/kritaplugins/kritahistogramdocker.rc +share/apps/kritaplugins/modify_selection.rc share/apps/kritaplugins/rotateimage.rc share/apps/kritaplugins/screenshot-krita.rc share/apps/kritaplugins/scripting.rc share/apps/kritaplugins/shearimage.rc +share/apps/kritaplugins/substrate.rc share/apps/kritaplugins/wetplugin.rc share/apps/kross/python/RestrictedPython/Eval.py share/apps/kross/python/RestrictedPython/Guards.py @@ -3947,8 +4055,13 @@ share/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz share/apps/kspread/kpartplugins/insertcalendar.rc +share/apps/kspread/kpartplugins/scripting.rc share/apps/kspread/kspread.rc share/apps/kspread/kspread_readonly.rc +share/apps/kspread/scripts/exporthtml/ExportHtml.py +share/apps/kspread/scripts/exporthtml/ExportHtml.rc +share/apps/kspread/scripts/scripteditor/ScriptEditor.py +share/apps/kspread/scripts/scripteditor/ScriptEditor.rc share/apps/kspread/sheetstyles/standard1.ksts share/apps/kspread/sheetstyles/standard1.png share/apps/kspread/sheetstyles/standard1.xml @@ -4190,14 +4303,19 @@ share/doc/HTML/en/kchart/toolbars.png share/doc/HTML/en/kexi/basics.docbook share/doc/HTML/en/kexi/building.docbook share/doc/HTML/en/kexi/common +share/doc/HTML/en/kexi/comparing.docbook share/doc/HTML/en/kexi/configuration.docbook share/doc/HTML/en/kexi/contact-example.png share/doc/HTML/en/kexi/credits.docbook share/doc/HTML/en/kexi/database.docbook +share/doc/HTML/en/kexi/designingforms.docbook +share/doc/HTML/en/kexi/enteringdataintotables.docbook +share/doc/HTML/en/kexi/enteringdatausingforms.docbook share/doc/HTML/en/kexi/index.cache.bz2 share/doc/HTML/en/kexi/index.docbook share/doc/HTML/en/kexi/intro.docbook share/doc/HTML/en/kexi/menus.docbook +share/doc/HTML/en/kexi/querydesigning.docbook share/doc/HTML/en/kformula/ambiguous-string.png share/doc/HTML/en/kformula/common share/doc/HTML/en/kformula/correct_index_location.png @@ -4374,6 +4492,7 @@ share/doc/HTML/en/kpresenter/tut25.png share/doc/HTML/en/kpresenter/tut26.png share/doc/HTML/en/kpresenter/tutorial.docbook share/doc/HTML/en/kpresenter/zoomfactor.png +share/doc/HTML/en/krita/README.SCREENSHOTS share/doc/HTML/en/krita/commands-dialogs.docbook share/doc/HTML/en/krita/commands-menus.docbook share/doc/HTML/en/krita/commands-palettes.docbook @@ -4382,7 +4501,15 @@ share/doc/HTML/en/krita/commands.docbook share/doc/HTML/en/krita/common share/doc/HTML/en/krita/createdocument.png share/doc/HTML/en/krita/credits.docbook +share/doc/HTML/en/krita/crocusses-autocontrast.png +share/doc/HTML/en/krita/crocusses-blur.png +share/doc/HTML/en/krita/crocusses-brightnesscontrast.png share/doc/HTML/en/krita/crocusses-bumpmap.png +share/doc/HTML/en/krita/crocusses-coloradjustment.png +share/doc/HTML/en/krita/crocusses-colortoalpha.png +share/doc/HTML/en/krita/crocusses-colortransfer.png +share/doc/HTML/en/krita/crocusses-customconvolution.png +share/doc/HTML/en/krita/crocusses-desaturate.png share/doc/HTML/en/krita/crocusses-edgebottom.png share/doc/HTML/en/krita/crocusses-edgeleft.png share/doc/HTML/en/krita/crocusses-edgeright.png @@ -4390,24 +4517,37 @@ share/doc/HTML/en/krita/crocusses-embossall.png share/doc/HTML/en/krita/crocusses-embosshorvert.png share/doc/HTML/en/krita/crocusses-embossvariable.png share/doc/HTML/en/krita/crocusses-gaussianblur.png +share/doc/HTML/en/krita/crocusses-gaussiannoise.png share/doc/HTML/en/krita/crocusses-invert.png +share/doc/HTML/en/krita/crocusses-lenscorrection.png +share/doc/HTML/en/krita/crocusses-maximizechannel.png share/doc/HTML/en/krita/crocusses-meanremoval.png +share/doc/HTML/en/krita/crocusses-minimizechannel.png share/doc/HTML/en/krita/crocusses-oilpaint.png share/doc/HTML/en/krita/crocusses-pixelize.png share/doc/HTML/en/krita/crocusses-raindrops.png +share/doc/HTML/en/krita/crocusses-randomnoise.png +share/doc/HTML/en/krita/crocusses-randompick.png share/doc/HTML/en/krita/crocusses-roundcorners.png share/doc/HTML/en/krita/crocusses-sharpen.png -share/doc/HTML/en/krita/crocusses-simplenoise.png +share/doc/HTML/en/krita/crocusses-smalltiles.png share/doc/HTML/en/krita/crocusses-sobel.png -share/doc/HTML/en/krita/crocusses-tiles.png share/doc/HTML/en/krita/crocusses-topedge.png +share/doc/HTML/en/krita/crocusses-unsharpmask.png +share/doc/HTML/en/krita/crocusses-wave.png +share/doc/HTML/en/krita/crocusses-waveletnoise.png share/doc/HTML/en/krita/crocusses.png +share/doc/HTML/en/krita/developers-plugins.docbook +share/doc/HTML/en/krita/developers-scripting.docbook share/doc/HTML/en/krita/developers.docbook share/doc/HTML/en/krita/dialogs-addpalette.png +share/doc/HTML/en/krita/dialogs-blur.png share/doc/HTML/en/krita/dialogs-brightnesscontrast.png share/doc/HTML/en/krita/dialogs-bumpmap.png share/doc/HTML/en/krita/dialogs-coloradjustment.png share/doc/HTML/en/krita/dialogs-colorrange.png +share/doc/HTML/en/krita/dialogs-colortoalpha.png +share/doc/HTML/en/krita/dialogs-colortransfer.png share/doc/HTML/en/krita/dialogs-convertimagetype.png share/doc/HTML/en/krita/dialogs-convertlayertype.png share/doc/HTML/en/krita/dialogs-cubism.png @@ -4416,17 +4556,21 @@ share/doc/HTML/en/krita/dialogs-documentinformation.png share/doc/HTML/en/krita/dialogs-dropshadow.png share/doc/HTML/en/krita/dialogs-emboss.png share/doc/HTML/en/krita/dialogs-filtersgallery.png +share/doc/HTML/en/krita/dialogs-gaussiannoise.png share/doc/HTML/en/krita/dialogs-histogram.png share/doc/HTML/en/krita/dialogs-imageproperties.png share/doc/HTML/en/krita/dialogs-imagerestoration.png share/doc/HTML/en/krita/dialogs-imagesize.png share/doc/HTML/en/krita/dialogs-layerproperties.png share/doc/HTML/en/krita/dialogs-layersize.png +share/doc/HTML/en/krita/dialogs-lenscorrection.png share/doc/HTML/en/krita/dialogs-newadjustmentlayer.png share/doc/HTML/en/krita/dialogs-newlayer.png share/doc/HTML/en/krita/dialogs-oilpaint.png share/doc/HTML/en/krita/dialogs-pixelize.png share/doc/HTML/en/krita/dialogs-raindrops.png +share/doc/HTML/en/krita/dialogs-randomnoise.png +share/doc/HTML/en/krita/dialogs-randompick.png share/doc/HTML/en/krita/dialogs-rotateimage.png share/doc/HTML/en/krita/dialogs-rotatelayer.png share/doc/HTML/en/krita/dialogs-roundcorners.png @@ -4435,31 +4579,56 @@ share/doc/HTML/en/krita/dialogs-shearimage.png share/doc/HTML/en/krita/dialogs-shearlayer.png share/doc/HTML/en/krita/dialogs-smalltiles.png share/doc/HTML/en/krita/dialogs-sobel.png +share/doc/HTML/en/krita/dialogs-substrate.png +share/doc/HTML/en/krita/dialogs-unsharpmask.png +share/doc/HTML/en/krita/dialogs-wave.png +share/doc/HTML/en/krita/dialogs-waveletnoise.png share/doc/HTML/en/krita/faq.docbook share/doc/HTML/en/krita/index.cache.bz2 share/doc/HTML/en/krita/index.docbook share/doc/HTML/en/krita/installation.docbook share/doc/HTML/en/krita/introduction.docbook share/doc/HTML/en/krita/mainscreen.png +share/doc/HTML/en/krita/mountains-burn.png +share/doc/HTML/en/krita/mountains-color.png +share/doc/HTML/en/krita/mountains-darken.png +share/doc/HTML/en/krita/mountains-divide.png +share/doc/HTML/en/krita/mountains-dodge.png +share/doc/HTML/en/krita/mountains-hue.png +share/doc/HTML/en/krita/mountains-lighten.png +share/doc/HTML/en/krita/mountains-multiply.png +share/doc/HTML/en/krita/mountains-normal.png +share/doc/HTML/en/krita/mountains-original.png +share/doc/HTML/en/krita/mountains-overlay.png +share/doc/HTML/en/krita/mountains-saturation.png +share/doc/HTML/en/krita/mountains-screen.png +share/doc/HTML/en/krita/mountains-value.png +share/doc/HTML/en/krita/mountains.png share/doc/HTML/en/krita/newimage.png share/doc/HTML/en/krita/palettes-colors-gray.png share/doc/HTML/en/krita/palettes-colors-hsv.png share/doc/HTML/en/krita/palettes-colors-palettes.png share/doc/HTML/en/krita/palettes-colors-rgb.png share/doc/HTML/en/krita/palettes-colors-watercolors.png +share/doc/HTML/en/krita/palettes-controlbox-bezier.png share/doc/HTML/en/krita/palettes-controlbox-brush.png share/doc/HTML/en/krita/palettes-controlbox-colorpicker.png share/doc/HTML/en/krita/palettes-controlbox-contiguousfill.png share/doc/HTML/en/krita/palettes-controlbox-crop.png +share/doc/HTML/en/krita/palettes-controlbox-duplicate.png +share/doc/HTML/en/krita/palettes-controlbox-ellipse.png +share/doc/HTML/en/krita/palettes-controlbox-fill.png share/doc/HTML/en/krita/palettes-controlbox-gradient.png share/doc/HTML/en/krita/palettes-controlbox-histogram.png share/doc/HTML/en/krita/palettes-controlbox-line.png share/doc/HTML/en/krita/palettes-controlbox-overview.png share/doc/HTML/en/krita/palettes-controlbox-paintwithfilters.png share/doc/HTML/en/krita/palettes-controlbox-polygon.png +share/doc/HTML/en/krita/palettes-controlbox-polyline.png share/doc/HTML/en/krita/palettes-controlbox-rectangle.png share/doc/HTML/en/krita/palettes-controlbox-select.png share/doc/HTML/en/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/en/krita/palettes-controlbox-selectmagnetic.png share/doc/HTML/en/krita/palettes-controlbox-selectsimilar.png share/doc/HTML/en/krita/palettes-controlbox-star.png share/doc/HTML/en/krita/palettes-controlbox-text.png @@ -4473,8 +4642,11 @@ share/doc/HTML/en/krita/preferences-grid.png share/doc/HTML/en/krita/preferences-performance.png share/doc/HTML/en/krita/preferences-sidebar.png share/doc/HTML/en/krita/preferences-tablet.png -share/doc/HTML/en/krita/scripting.docbook share/doc/HTML/en/krita/settings.docbook +share/doc/HTML/en/krita/tool-bezier-example.png +share/doc/HTML/en/krita/tool-bezier-example2.png +share/doc/HTML/en/krita/tool-bezier-example3.png +share/doc/HTML/en/krita/tool-bezier.png share/doc/HTML/en/krita/tool-brush.png share/doc/HTML/en/krita/tool-colorpicker.png share/doc/HTML/en/krita/tool-contiguousfill.png @@ -4486,13 +4658,18 @@ share/doc/HTML/en/krita/tool-gradient.png share/doc/HTML/en/krita/tool-line.png share/doc/HTML/en/krita/tool-move.png share/doc/HTML/en/krita/tool-paintselection.png +share/doc/HTML/en/krita/tool-paintwithfilters-example.png share/doc/HTML/en/krita/tool-paintwithfilters.png share/doc/HTML/en/krita/tool-pan.png +share/doc/HTML/en/krita/tool-perspectivegrid.png +share/doc/HTML/en/krita/tool-perspectivetransform.png share/doc/HTML/en/krita/tool-polygon.png share/doc/HTML/en/krita/tool-polyline.png share/doc/HTML/en/krita/tool-rectangle.png +share/doc/HTML/en/krita/tool-selectbezier.png share/doc/HTML/en/krita/tool-selectcontiguous.png share/doc/HTML/en/krita/tool-selectelliptical.png +share/doc/HTML/en/krita/tool-selectmagnetic.png share/doc/HTML/en/krita/tool-selectoutline.png share/doc/HTML/en/krita/tool-selectpolygonal.png share/doc/HTML/en/krita/tool-selectrectangular.png @@ -4513,6 +4690,8 @@ share/doc/HTML/en/krita/toolbar-file.png share/doc/HTML/en/krita/toolbar-krita.png share/doc/HTML/en/krita/toolbar-navigation.png share/doc/HTML/en/krita/toolbar-transformationtools.png +share/doc/HTML/en/krita/toolbars-button-zoomin.png +share/doc/HTML/en/krita/toolbars-button-zoomout.png share/doc/HTML/en/krita/tutorial-quick-starts.docbook share/doc/HTML/en/krita/tutorial-quick-starts1.png share/doc/HTML/en/krita/tutorial-quick-starts10.png @@ -4542,9 +4721,14 @@ share/doc/HTML/en/krita/tutorial-select-layer-9.png share/doc/HTML/en/krita/tutorial-select-layer-sample.png share/doc/HTML/en/krita/tutorial-select-layer.docbook share/doc/HTML/en/krita/tutorial-starting.docbook +share/doc/HTML/en/krita/tutorial-tablet-1.png +share/doc/HTML/en/krita/tutorial-tablet-2.png +share/doc/HTML/en/krita/tutorial-tablet-3.png +share/doc/HTML/en/krita/tutorial-tablet.docbook share/doc/HTML/en/krita/tutorial.docbook share/doc/HTML/en/krita/using-colorspaces.docbook share/doc/HTML/en/krita/using-filters.docbook +share/doc/HTML/en/krita/using-images.docbook share/doc/HTML/en/krita/using-layers.docbook share/doc/HTML/en/krita/using-selections-1.png share/doc/HTML/en/krita/using-selections-2.png @@ -4553,6 +4737,7 @@ share/doc/HTML/en/krita/using-selections-4.png share/doc/HTML/en/krita/using-selections-5.png share/doc/HTML/en/krita/using-selections-6.png share/doc/HTML/en/krita/using-selections.docbook +share/doc/HTML/en/krita/using-views.docbook share/doc/HTML/en/kspread/a11y.docbook share/doc/HTML/en/kspread/advanced.docbook share/doc/HTML/en/kspread/basics.docbook @@ -4748,6 +4933,7 @@ share/doc/HTML/en/kword/formframe2.png share/doc/HTML/en/kword/formframe3.png share/doc/HTML/en/kword/formframe4.png share/doc/HTML/en/kword/formframe5.png +share/doc/HTML/en/kword/formframe6.png share/doc/HTML/en/kword/forminteg.png share/doc/HTML/en/kword/formllind.png share/doc/HTML/en/kword/formlrind.png @@ -4831,6 +5017,7 @@ share/doc/HTML/en/kword/opt2.png share/doc/HTML/en/kword/opt3.png share/doc/HTML/en/kword/opt4.png share/doc/HTML/en/kword/opt5.png +share/doc/HTML/en/kword/opt6.png share/doc/HTML/en/kword/optkb.png share/doc/HTML/en/kword/optkb2.png share/doc/HTML/en/kword/opttb.png @@ -5104,7 +5291,6 @@ share/services/kpresenter_mng_export.desktop share/services/kpresenter_ooimpress_export.desktop share/services/kpresenter_ooimpress_import.desktop share/services/kpresenter_png_export.desktop -share/services/kpresenter_powerpoint_import.desktop share/services/kpresenter_svg_export.desktop share/services/kpresenter_xbm_export.desktop share/services/kpresenter_xpm_export.desktop @@ -5119,6 +5305,7 @@ share/services/krita_magick_export.desktop share/services/krita_magick_import.desktop share/services/krita_openexr_export.desktop share/services/krita_openexr_import.desktop +share/services/krita_pdf_import.desktop share/services/krita_png_export.desktop share/services/krita_png_import.desktop share/services/krita_raw_import.desktop @@ -5127,6 +5314,9 @@ share/services/krita_rgb_f32_plugin.desktop share/services/krita_rgb_u16_plugin.desktop share/services/krita_tiff_export.desktop share/services/krita_tiff_import.desktop +share/services/krita_ycbcr_u16_plugin.desktop +share/services/krita_ycbcr_u8_plugin.desktop +share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop @@ -5139,16 +5329,23 @@ share/services/kritadefaulttools.desktop share/services/kritadropshadow.desktop share/services/kritaembossfilter.desktop share/services/kritaexample.desktop +share/services/kritaextensioncolorsfilters.desktop +share/services/kritafastcolortransfer.desktop share/services/kritafiltersgallery.desktop share/services/kritagrayplugin.desktop share/services/kritahistogram.desktop share/services/kritahistogramdocker.desktop share/services/kritaimageenhancement.desktop share/services/kritaimagesize.desktop +share/services/kritalenscorrectionfilter.desktop +share/services/kritalevelfilter.desktop +share/services/kritamodifyselection.desktop +share/services/kritanoisefilter.desktop share/services/kritaoilpaintfilter.desktop share/services/kritapart.desktop share/services/kritapixelizefilter.desktop share/services/kritaraindropsfilter.desktop +share/services/kritarandompickfilter.desktop share/services/kritargbplugin.desktop share/services/kritarotateimage.desktop share/services/kritaroundcornersfilter.desktop @@ -5158,15 +5355,20 @@ share/services/kritaselectiontools.desktop share/services/kritaseparatechannels.desktop share/services/kritashearimage.desktop share/services/kritasmalltilesfilter.desktop -share/services/kritasmearybrush.desktop share/services/kritasobelfilter.desktop +share/services/kritasubstrate.desktop share/services/kritatoolcrop.desktop +share/services/kritatoolcurves.desktop share/services/kritatoolfilter.desktop +share/services/kritatoolperspectivegrid.desktop +share/services/kritatoolperspectivetransform.desktop share/services/kritatoolpolygon.desktop share/services/kritatoolpolyline.desktop share/services/kritatoolselectsimilar.desktop share/services/kritatoolstar.desktop share/services/kritatooltransform.desktop +share/services/kritaunsharpfilter.desktop +share/services/kritawavefilter.desktop share/services/kritawetplugin.desktop share/services/kspread_applixspread_import.desktop share/services/kspread_csv_export.desktop @@ -5176,11 +5378,13 @@ share/services/kspread_excel_import.desktop share/services/kspread_gnumeric_export.desktop share/services/kspread_gnumeric_import.desktop share/services/kspread_html_export.desktop +share/services/kspread_kexi_import.desktop share/services/kspread_latex_export.desktop share/services/kspread_opencalc_export.desktop share/services/kspread_opencalc_import.desktop share/services/kspread_qpro_import.desktop share/services/kspreadpart.desktop +share/services/kspreadscripting.desktop share/services/kugar_kugar_import.desktop share/services/kugarpart.desktop share/services/kwmailmerge_kabc.desktop @@ -5215,6 +5419,7 @@ share/services/kword_wp_import.desktop share/services/kwordpart.desktop share/services/kwserialletter_classic.desktop share/services/kwserialletter_qtsqldb_power.desktop +share/services/ole_powerpoint97_import.desktop share/services/thesaurustool.desktop share/services/xslt_export.desktop share/services/xslt_import.desktop @@ -5384,6 +5589,9 @@ share/templates/TextDocument.desktop @dirrm share/apps/kspread/templates/Business @dirrm share/apps/kspread/templates @dirrm share/apps/kspread/sheetstyles +@dirrm share/apps/kspread/scripts/scripteditor +@dirrm share/apps/kspread/scripts/exporthtml +@dirrm share/apps/kspread/scripts @dirrm share/apps/kspread/kpartplugins @dirrm share/apps/kspread/icons/crystalsvg/scalable/actions @dirrm share/apps/kspread/icons/crystalsvg/scalable diff --git a/editors/kate-plugins/distinfo b/editors/kate-plugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/editors/kate-plugins/distinfo +++ b/editors/kate-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/editors/kate-plugins/pkg-plist b/editors/kate-plugins/pkg-plist index ca0e8f31c34c..b0f0707e12a3 100644 --- a/editors/kate-plugins/pkg-plist +++ b/editors/kate-plugins/pkg-plist @@ -43,7 +43,7 @@ lib/kde3/katexmltoolsplugin.so lib/kde3/libkatetabbarextensionplugin.a lib/kde3/libkatetabbarextensionplugin.la lib/kde3/libkatetabbarextensionplugin.so -share/applications/kdeaddons-kate-plugins-3.5.4 +share/applications/kdeaddons-kate-plugins-3.5.5 share/applnk/.hidden/katefll.desktop share/apps/kate/plugins/katecppsymbolviewer/ui.rc share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile index 99d12bd89bdb..5b2c53c82e80 100644 --- a/editors/koffice-i18n-ca/Makefile +++ b/editors/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ca/distinfo b/editors/koffice-i18n-ca/distinfo index 5138bc7fcafb..64dc722ff740 100644 --- a/editors/koffice-i18n-ca/distinfo +++ b/editors/koffice-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 8e3ff02096b6574cf337430924d5af98 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 069f10ff118b9fdcb21ce37edd7cc6cf54184c2961868cdac5c1d606923a1658 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 524044 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 diff --git a/editors/koffice-i18n-ca/pkg-plist b/editors/koffice-i18n-ca/pkg-plist index 232a56980982..f9699d3b9475 100644 --- a/editors/koffice-i18n-ca/pkg-plist +++ b/editors/koffice-i18n-ca/pkg-plist @@ -15,16 +15,119 @@ share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kformula/common +share/doc/HTML/ca/kformula/index.cache.bz2 +share/doc/HTML/ca/kformula/index.docbook +share/doc/HTML/ca/kivio/common +share/doc/HTML/ca/kivio/credits.docbook +share/doc/HTML/ca/kivio/index.cache.bz2 +share/doc/HTML/ca/kivio/index.docbook +share/doc/HTML/ca/kivio/introduction.docbook +share/doc/HTML/ca/kivio/usage.docbook +share/doc/HTML/ca/kivio/working.docbook share/doc/HTML/ca/koffice/common share/doc/HTML/ca/koffice/index.cache.bz2 share/doc/HTML/ca/koffice/index.docbook share/doc/HTML/ca/koshell/common share/doc/HTML/ca/koshell/index.cache.bz2 share/doc/HTML/ca/koshell/index.docbook +share/doc/HTML/ca/kplato/commands.docbook +share/doc/HTML/ca/kplato/common +share/doc/HTML/ca/kplato/definitions.docbook +share/doc/HTML/ca/kplato/index.cache.bz2 +share/doc/HTML/ca/kplato/index.docbook +share/doc/HTML/ca/kplato/mainwindow.docbook +share/doc/HTML/ca/kplato/options.docbook +share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/faq.docbook +share/doc/HTML/ca/kpresenter/great-presentations.docbook +share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/menus.docbook +share/doc/HTML/ca/kpresenter/options.docbook +share/doc/HTML/ca/kpresenter/screen.docbook +share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/kspread/a11y.docbook +share/doc/HTML/ca/kspread/advanced.docbook +share/doc/HTML/ca/kspread/basics.docbook +share/doc/HTML/ca/kspread/cellformat0.png +share/doc/HTML/ca/kspread/cellformat1.png +share/doc/HTML/ca/kspread/cellformat2.png +share/doc/HTML/ca/kspread/cellformat3.png +share/doc/HTML/ca/kspread/cellformat4.png +share/doc/HTML/ca/kspread/cellformat5.png +share/doc/HTML/ca/kspread/cellformat6.png +share/doc/HTML/ca/kspread/cellformat7.png +share/doc/HTML/ca/kspread/cellprotection1.png +share/doc/HTML/ca/kspread/cellprotection2.png +share/doc/HTML/ca/kspread/commands.docbook +share/doc/HTML/ca/kspread/common +share/doc/HTML/ca/kspread/config.docbook +share/doc/HTML/ca/kspread/configdialog.docbook +share/doc/HTML/ca/kspread/configure1.png +share/doc/HTML/ca/kspread/configure2.png +share/doc/HTML/ca/kspread/configure3.png +share/doc/HTML/ca/kspread/configure4.png +share/doc/HTML/ca/kspread/configure5.png +share/doc/HTML/ca/kspread/configure6.png +share/doc/HTML/ca/kspread/faq.docbook +share/doc/HTML/ca/kspread/format.docbook +share/doc/HTML/ca/kspread/importexport.docbook +share/doc/HTML/ca/kspread/index.cache.bz2 +share/doc/HTML/ca/kspread/index.docbook +share/doc/HTML/ca/kspread/mousenav.png +share/doc/HTML/ca/kspread/newdocument.png +share/doc/HTML/ca/kspread/sheetproperties.png +share/doc/HTML/ca/kspread/shortcut1.png +share/doc/HTML/ca/kspread/shortcut2.png +share/doc/HTML/ca/kspread/shortcut3.png +share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kword/a11y.docbook +share/doc/HTML/ca/kword/basics.docbook +share/doc/HTML/ca/kword/bookmarks.docbook +share/doc/HTML/ca/kword/chapnumb.docbook +share/doc/HTML/ca/kword/columns.docbook +share/doc/HTML/ca/kword/common +share/doc/HTML/ca/kword/doccomments.docbook +share/doc/HTML/ca/kword/doclinks.docbook +share/doc/HTML/ca/kword/docstruct.docbook +share/doc/HTML/ca/kword/docvariables.docbook +share/doc/HTML/ca/kword/editing.docbook +share/doc/HTML/ca/kword/expressions.docbook +share/doc/HTML/ca/kword/footendnotes.docbook +share/doc/HTML/ca/kword/formatchar.docbook +share/doc/HTML/ca/kword/formatframes.docbook +share/doc/HTML/ca/kword/formatpara.docbook +share/doc/HTML/ca/kword/formulas.docbook +share/doc/HTML/ca/kword/frames.docbook +share/doc/HTML/ca/kword/fundimentals.docbook +share/doc/HTML/ca/kword/graphics.docbook +share/doc/HTML/ca/kword/headerfooter.docbook +share/doc/HTML/ca/kword/index.cache.bz2 +share/doc/HTML/ca/kword/index.docbook +share/doc/HTML/ca/kword/insertfile.docbook +share/doc/HTML/ca/kword/kparts.docbook +share/doc/HTML/ca/kword/lists.docbook +share/doc/HTML/ca/kword/mailmerge.docbook +share/doc/HTML/ca/kword/mbtb.docbook +share/doc/HTML/ca/kword/migrating.docbook +share/doc/HTML/ca/kword/opt.docbook +share/doc/HTML/ca/kword/pageformat.docbook +share/doc/HTML/ca/kword/storeprint.docbook +share/doc/HTML/ca/kword/styles.docbook +share/doc/HTML/ca/kword/table.docbook +share/doc/HTML/ca/kword/tabstops.docbook +share/doc/HTML/ca/kword/techinfo.docbook +share/doc/HTML/ca/kword/templatecreation.docbook +share/doc/HTML/ca/kword/toc.docbook +share/doc/HTML/ca/kword/tutorial.docbook +share/doc/HTML/ca/thesaurus/common +share/doc/HTML/ca/thesaurus/index.cache.bz2 +share/doc/HTML/ca/thesaurus/index.docbook share/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/kchart.mo +share/locale/ca/LC_MESSAGES/kdgantt.mo share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -51,8 +154,15 @@ share/locale/ca/LC_MESSAGES/kthesaurus.mo share/locale/ca/LC_MESSAGES/kugar.mo share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/ca/thesaurus +@dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/kpresenter +@dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell @dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kivio +@dirrm share/doc/HTML/ca/kformula @dirrm share/doc/HTML/ca/kexi @dirrm share/doc/HTML/ca/kchart @dirrm share/doc/HTML/ca/karbon diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile index 11a8257a6539..2ab74b0b019d 100644 --- a/editors/koffice-i18n-cs/Makefile +++ b/editors/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-cs/distinfo b/editors/koffice-i18n-cs/distinfo index 0eff1f2b120c..c8b2753d9841 100644 --- a/editors/koffice-i18n-cs/distinfo +++ b/editors/koffice-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = b8f83541b98ff0cb8361f797f665971c -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = f63efd3535aca0db808d14ce9a3b2a55575b4d65f8078ad0b0851ad79b70af7f -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = 343018 +MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = a90d191f1d84bd5c8090ca6e004253c4 +SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 063a1db2ad60fadda8f1ab64da96e2440ae34c3b9d406ea9a45a78d27bb257c3 +SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 356835 diff --git a/editors/koffice-i18n-cs/pkg-plist b/editors/koffice-i18n-cs/pkg-plist index f1283cce6bb0..64faa279489d 100644 --- a/editors/koffice-i18n-cs/pkg-plist +++ b/editors/koffice-i18n-cs/pkg-plist @@ -3,6 +3,7 @@ share/locale/cs/LC_MESSAGES/desktop_koffice.mo share/locale/cs/LC_MESSAGES/example.mo share/locale/cs/LC_MESSAGES/karbon.mo share/locale/cs/LC_MESSAGES/kchart.mo +share/locale/cs/LC_MESSAGES/kdgantt.mo share/locale/cs/LC_MESSAGES/kexi.mo share/locale/cs/LC_MESSAGES/kfile_koffice.mo share/locale/cs/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile index 47c61c8df6cd..248790d56afc 100644 --- a/editors/koffice-i18n-da/Makefile +++ b/editors/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-da/distinfo b/editors/koffice-i18n-da/distinfo index ea0cfc7cacff..fb79a71beb1c 100644 --- a/editors/koffice-i18n-da/distinfo +++ b/editors/koffice-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 58c13527c47dee445572d26141fd3269 -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 407a8ae7d39ff0aec51f622285447dd200bd87a1f80257b8548c1c16c317fd21 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 1013226 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 diff --git a/editors/koffice-i18n-da/pkg-plist b/editors/koffice-i18n-da/pkg-plist index 03db1c115f7c..834334517175 100644 --- a/editors/koffice-i18n-da/pkg-plist +++ b/editors/koffice-i18n-da/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/da/kchart/index.docbook share/doc/HTML/da/kexi/basics.docbook share/doc/HTML/da/kexi/building.docbook share/doc/HTML/da/kexi/common +share/doc/HTML/da/kexi/comparing.docbook share/doc/HTML/da/kexi/configuration.docbook share/doc/HTML/da/kexi/credits.docbook share/doc/HTML/da/kexi/database.docbook +share/doc/HTML/da/kexi/designingforms.docbook +share/doc/HTML/da/kexi/enteringdataintotables.docbook +share/doc/HTML/da/kexi/enteringdatausingforms.docbook share/doc/HTML/da/kexi/index.cache.bz2 share/doc/HTML/da/kexi/index.docbook share/doc/HTML/da/kexi/intro.docbook share/doc/HTML/da/kexi/menus.docbook +share/doc/HTML/da/kexi/querydesigning.docbook share/doc/HTML/da/kformula/common share/doc/HTML/da/kformula/index.cache.bz2 share/doc/HTML/da/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/da/krita/commands-toolbars.docbook share/doc/HTML/da/krita/commands.docbook share/doc/HTML/da/krita/common share/doc/HTML/da/krita/credits.docbook +share/doc/HTML/da/krita/developers-plugins.docbook +share/doc/HTML/da/krita/developers-scripting.docbook share/doc/HTML/da/krita/developers.docbook share/doc/HTML/da/krita/faq.docbook share/doc/HTML/da/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook share/doc/HTML/da/krita/tutorial-starting.docbook +share/doc/HTML/da/krita/tutorial-tablet.docbook share/doc/HTML/da/krita/tutorial.docbook share/doc/HTML/da/krita/using-colorspaces.docbook share/doc/HTML/da/krita/using-filters.docbook +share/doc/HTML/da/krita/using-images.docbook share/doc/HTML/da/krita/using-layers.docbook share/doc/HTML/da/krita/using-selections.docbook +share/doc/HTML/da/krita/using-views.docbook share/doc/HTML/da/kspread/a11y.docbook share/doc/HTML/da/kspread/advanced.docbook share/doc/HTML/da/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo +share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile index 00dab794c8cf..19bbb0d828b6 100644 --- a/editors/koffice-i18n-el/Makefile +++ b/editors/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-el/distinfo b/editors/koffice-i18n-el/distinfo index d99d2f341307..0a977fd50dd0 100644 --- a/editors/koffice-i18n-el/distinfo +++ b/editors/koffice-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 4392e652560adb8c83fe2aac9479fcb8 -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 94ea30d6c2c1968d216a6bb81c368f2ec68aab473d68450ea6c69818f737ecc0 -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 367648 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 diff --git a/editors/koffice-i18n-el/pkg-plist b/editors/koffice-i18n-el/pkg-plist index 423a32aa7c81..46c436194e10 100644 --- a/editors/koffice-i18n-el/pkg-plist +++ b/editors/koffice-i18n-el/pkg-plist @@ -2,6 +2,7 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo +share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile index 2aa1fd93bb12..cb490bb940b4 100644 --- a/editors/koffice-i18n-en_GB/Makefile +++ b/editors/koffice-i18n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-en_GB/distinfo b/editors/koffice-i18n-en_GB/distinfo index 28cf71ee2884..97a08e6f157e 100644 --- a/editors/koffice-i18n-en_GB/distinfo +++ b/editors/koffice-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 11b499953ae1616c589e793abc4e474b -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 2e0630762213c90b14759e0c2a61633ee25554f83ea9617836775860a62f7880 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 341916 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 diff --git a/editors/koffice-i18n-en_GB/pkg-plist b/editors/koffice-i18n-en_GB/pkg-plist index adbbd5d4d225..0e783dd7b5e1 100644 --- a/editors/koffice-i18n-en_GB/pkg-plist +++ b/editors/koffice-i18n-en_GB/pkg-plist @@ -15,6 +15,7 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo +share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile index fe268dca1e63..1683f36421bd 100644 --- a/editors/koffice-i18n-es/Makefile +++ b/editors/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-es/distinfo b/editors/koffice-i18n-es/distinfo index 5aedacd37629..96a86103ba37 100644 --- a/editors/koffice-i18n-es/distinfo +++ b/editors/koffice-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 7bfea102b91490128779465db13e7a6d9a2a1908e109ec98076da469129a1308 -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 17190560 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 diff --git a/editors/koffice-i18n-es/pkg-plist b/editors/koffice-i18n-es/pkg-plist index a02bdd2b7e9d..de46c53cba38 100644 --- a/editors/koffice-i18n-es/pkg-plist +++ b/editors/koffice-i18n-es/pkg-plist @@ -1,5 +1,4 @@ share/apps/koffice/autocorrect/es.xml -share/doc/HTML/es/api/kfontdialog.png share/doc/HTML/es/karbon/common share/doc/HTML/es/karbon/index.cache.bz2 share/doc/HTML/es/karbon/index.docbook @@ -44,10 +43,12 @@ share/doc/HTML/es/kchart/shortcut.png share/doc/HTML/es/kchart/toolbars.png share/doc/HTML/es/kexi/basics.docbook share/doc/HTML/es/kexi/building.docbook +share/doc/HTML/es/kexi/comparing.docbook share/doc/HTML/es/kexi/configuration.docbook share/doc/HTML/es/kexi/contact-example.png share/doc/HTML/es/kexi/credits.docbook share/doc/HTML/es/kexi/database.docbook +share/doc/HTML/es/kexi/enteringdataintotables.docbook share/doc/HTML/es/kexi/intro.docbook share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png @@ -102,6 +103,7 @@ share/doc/HTML/es/koshell/main-view.png share/doc/HTML/es/koshell/new-dialog.png share/doc/HTML/es/koshell/side-pane.png share/doc/HTML/es/kplato/commands.docbook +share/doc/HTML/es/kplato/common share/doc/HTML/es/kplato/configure-wbs.png share/doc/HTML/es/kplato/configure2.1.png share/doc/HTML/es/kplato/configure2.png @@ -114,6 +116,8 @@ share/doc/HTML/es/kplato/edit-calendar2.png share/doc/HTML/es/kplato/edit-resources.png share/doc/HTML/es/kplato/edit-resources1.png share/doc/HTML/es/kplato/edit-worktime.png +share/doc/HTML/es/kplato/index.cache.bz2 +share/doc/HTML/es/kplato/index.docbook share/doc/HTML/es/kplato/mainwindow.docbook share/doc/HTML/es/kplato/mainwindow1.png share/doc/HTML/es/kplato/options.docbook @@ -236,6 +240,7 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook +share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -284,6 +289,8 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png +share/doc/HTML/es/krita/index.cache.bz2 +share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -720,6 +727,7 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo +share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo @@ -760,6 +768,5 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kexi @dirrm share/doc/HTML/es/kchart @dirrm share/doc/HTML/es/karbon -@dirrm share/doc/HTML/es/api @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/koffice-i18n-et/Makefile b/editors/koffice-i18n-et/Makefile index c0ba82e8d416..371637a8a638 100644 --- a/editors/koffice-i18n-et/Makefile +++ b/editors/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-et/distinfo b/editors/koffice-i18n-et/distinfo index 74cb277ae6f8..cab102edda59 100644 --- a/editors/koffice-i18n-et/distinfo +++ b/editors/koffice-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = fed89528182c0dc7baa2c50fee165270 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 8e78fe330053cc72f843475ca4771a6bdef5bc7d4e22cf15172584beabf30fad -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 1139684 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 diff --git a/editors/koffice-i18n-et/pkg-plist b/editors/koffice-i18n-et/pkg-plist index a36be5654b99..42a8b9044ec5 100644 --- a/editors/koffice-i18n-et/pkg-plist +++ b/editors/koffice-i18n-et/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/et/kchart/index.docbook share/doc/HTML/et/kexi/basics.docbook share/doc/HTML/et/kexi/building.docbook share/doc/HTML/et/kexi/common +share/doc/HTML/et/kexi/comparing.docbook share/doc/HTML/et/kexi/configuration.docbook share/doc/HTML/et/kexi/credits.docbook share/doc/HTML/et/kexi/database.docbook +share/doc/HTML/et/kexi/designingforms.docbook +share/doc/HTML/et/kexi/enteringdataintotables.docbook +share/doc/HTML/et/kexi/enteringdatausingforms.docbook share/doc/HTML/et/kexi/index.cache.bz2 share/doc/HTML/et/kexi/index.docbook share/doc/HTML/et/kexi/intro.docbook share/doc/HTML/et/kexi/menus.docbook +share/doc/HTML/et/kexi/querydesigning.docbook share/doc/HTML/et/kformula/common share/doc/HTML/et/kformula/index.cache.bz2 share/doc/HTML/et/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/et/krita/commands-toolbars.docbook share/doc/HTML/et/krita/commands.docbook share/doc/HTML/et/krita/common share/doc/HTML/et/krita/credits.docbook +share/doc/HTML/et/krita/developers-plugins.docbook +share/doc/HTML/et/krita/developers-scripting.docbook share/doc/HTML/et/krita/developers.docbook share/doc/HTML/et/krita/faq.docbook share/doc/HTML/et/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/et/krita/settings.docbook share/doc/HTML/et/krita/tutorial-quick-starts.docbook share/doc/HTML/et/krita/tutorial-select-layer.docbook share/doc/HTML/et/krita/tutorial-starting.docbook +share/doc/HTML/et/krita/tutorial-tablet.docbook share/doc/HTML/et/krita/tutorial.docbook share/doc/HTML/et/krita/using-colorspaces.docbook share/doc/HTML/et/krita/using-filters.docbook +share/doc/HTML/et/krita/using-images.docbook share/doc/HTML/et/krita/using-layers.docbook share/doc/HTML/et/krita/using-selections.docbook +share/doc/HTML/et/krita/using-views.docbook share/doc/HTML/et/kspread/a11y.docbook share/doc/HTML/et/kspread/advanced.docbook share/doc/HTML/et/kspread/basics.docbook @@ -148,6 +158,7 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo +share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile index e5083e946e8c..1b3be23fc95f 100644 --- a/editors/koffice-i18n-eu/Makefile +++ b/editors/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-eu/distinfo b/editors/koffice-i18n-eu/distinfo index 338a0dd9e315..61676af5ecb9 100644 --- a/editors/koffice-i18n-eu/distinfo +++ b/editors/koffice-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = 3e15c7433f91486d8b76eefb19990a74 -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = fe3279b4517b17c1cc5b2f8cd178456576c071c9166244a377b8f413f32f0d34 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = 352156 +MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 33bb005893d82eeebbc1dc62495e018a +SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = ba9575d582365dfb530c7e656474fb0f775b0648582c9a3d128782130ba0b624 +SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 364401 diff --git a/editors/koffice-i18n-eu/pkg-plist b/editors/koffice-i18n-eu/pkg-plist index cd343ce7a6d9..0540a7282c7e 100644 --- a/editors/koffice-i18n-eu/pkg-plist +++ b/editors/koffice-i18n-eu/pkg-plist @@ -2,6 +2,7 @@ share/locale/eu/LC_MESSAGES/desktop_koffice.mo share/locale/eu/LC_MESSAGES/example.mo share/locale/eu/LC_MESSAGES/karbon.mo share/locale/eu/LC_MESSAGES/kchart.mo +share/locale/eu/LC_MESSAGES/kdgantt.mo share/locale/eu/LC_MESSAGES/kexi.mo share/locale/eu/LC_MESSAGES/kfile_koffice.mo share/locale/eu/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile index bf398813ab6b..8a405b0616db 100644 --- a/editors/koffice-i18n-fi/Makefile +++ b/editors/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-fi/distinfo b/editors/koffice-i18n-fi/distinfo index 148256ad170f..6e1c1ac19e88 100644 --- a/editors/koffice-i18n-fi/distinfo +++ b/editors/koffice-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = de6a7a2b2b2edc1a4eaad7523b1bab39 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = 852f840ed19c09de45be1f8fd292696c9234b52536d364a5c1364bda1b8ac5bb -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = 344438 +MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = dc0b99fe0b1c2f0bdc5823804cf5f7f7 +SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 08a5385cc0351072849ee7b4974b22b1448200bfe98231639f243d162e90ef8a +SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 359845 diff --git a/editors/koffice-i18n-fi/pkg-plist b/editors/koffice-i18n-fi/pkg-plist index 6259be7a77da..f1b34356427a 100644 --- a/editors/koffice-i18n-fi/pkg-plist +++ b/editors/koffice-i18n-fi/pkg-plist @@ -2,7 +2,10 @@ share/locale/fi/LC_MESSAGES/desktop_koffice.mo share/locale/fi/LC_MESSAGES/example.mo share/locale/fi/LC_MESSAGES/karbon.mo share/locale/fi/LC_MESSAGES/kchart.mo +share/locale/fi/LC_MESSAGES/kdgantt.mo share/locale/fi/LC_MESSAGES/kexi.mo +share/locale/fi/LC_MESSAGES/kfile_abiword.mo +share/locale/fi/LC_MESSAGES/kfile_gnumeric.mo share/locale/fi/LC_MESSAGES/kfile_koffice.mo share/locale/fi/LC_MESSAGES/kfile_ooo.mo share/locale/fi/LC_MESSAGES/kformdesigner.mo diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile index 3549b46cc8ed..7f8a39972722 100644 --- a/editors/koffice-i18n-it/Makefile +++ b/editors/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-it/distinfo b/editors/koffice-i18n-it/distinfo index dc9a385818d7..9f417dfc625c 100644 --- a/editors/koffice-i18n-it/distinfo +++ b/editors/koffice-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9658442039b455e52cf68599e3250f54 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9a0a25a0ccc62c1d45d16ffb969e3146e1d7f7a2939407c542c2fffddb78b71f -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 1550186 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 diff --git a/editors/koffice-i18n-it/pkg-plist b/editors/koffice-i18n-it/pkg-plist index 81da090823f6..ac3627f19ced 100644 --- a/editors/koffice-i18n-it/pkg-plist +++ b/editors/koffice-i18n-it/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kexi/basics.docbook share/doc/HTML/it/kexi/building.docbook share/doc/HTML/it/kexi/common +share/doc/HTML/it/kexi/comparing.docbook share/doc/HTML/it/kexi/configuration.docbook share/doc/HTML/it/kexi/credits.docbook share/doc/HTML/it/kexi/database.docbook +share/doc/HTML/it/kexi/designingforms.docbook +share/doc/HTML/it/kexi/enteringdataintotables.docbook +share/doc/HTML/it/kexi/enteringdatausingforms.docbook share/doc/HTML/it/kexi/index.cache.bz2 share/doc/HTML/it/kexi/index.docbook share/doc/HTML/it/kexi/intro.docbook share/doc/HTML/it/kexi/menus.docbook +share/doc/HTML/it/kexi/querydesigning.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook @@ -57,22 +62,26 @@ share/doc/HTML/it/krita/commands-toolbars.docbook share/doc/HTML/it/krita/commands.docbook share/doc/HTML/it/krita/common share/doc/HTML/it/krita/credits.docbook +share/doc/HTML/it/krita/developers-plugins.docbook +share/doc/HTML/it/krita/developers-scripting.docbook share/doc/HTML/it/krita/developers.docbook share/doc/HTML/it/krita/faq.docbook share/doc/HTML/it/krita/index.cache.bz2 share/doc/HTML/it/krita/index.docbook share/doc/HTML/it/krita/installation.docbook share/doc/HTML/it/krita/introduction.docbook -share/doc/HTML/it/krita/scripting.docbook share/doc/HTML/it/krita/settings.docbook share/doc/HTML/it/krita/tutorial-quick-starts.docbook share/doc/HTML/it/krita/tutorial-select-layer.docbook share/doc/HTML/it/krita/tutorial-starting.docbook +share/doc/HTML/it/krita/tutorial-tablet.docbook share/doc/HTML/it/krita/tutorial.docbook share/doc/HTML/it/krita/using-colorspaces.docbook share/doc/HTML/it/krita/using-filters.docbook +share/doc/HTML/it/krita/using-images.docbook share/doc/HTML/it/krita/using-layers.docbook share/doc/HTML/it/krita/using-selections.docbook +share/doc/HTML/it/krita/using-views.docbook share/doc/HTML/it/kspread/a11y.docbook share/doc/HTML/it/kspread/advanced.docbook share/doc/HTML/it/kspread/basics.docbook @@ -170,6 +179,7 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo +share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-lv/Makefile b/editors/koffice-i18n-lv/Makefile index 75e5dad5c8a1..3ec6ff5b12bf 100644 --- a/editors/koffice-i18n-lv/Makefile +++ b/editors/koffice-i18n-lv/Makefile @@ -1,17 +1,16 @@ -# New ports collection makefile for: koffice-i18n-lv -# Date created: 27 April 2003 -# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> +# New ports collection makefile for: koffice-i18n-ms +# Date created: May 20, 2006 +# Whom: Michael Nottebrock <lofi@freebsd.org> # # $FreeBSD$ # PORTNAME= koffice-i18n -PORTVERSION= 1.2.1 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= Attic/koffice-${PORTVERSION:S/.0//}/src/ +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= lv- -DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -19,15 +18,12 @@ COMMENT= Latvian messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext -DISTNAME_OVERRIDE=yes USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes KDE_I18N= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-//} - .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.mk> diff --git a/editors/koffice-i18n-lv/distinfo b/editors/koffice-i18n-lv/distinfo index 153ef1bdfd38..cfcbabb1821d 100644 --- a/editors/koffice-i18n-lv/distinfo +++ b/editors/koffice-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 15cf6b3a8ca3caa0f6e4b9b51810b555 -SHA256 (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = e08f06a81a830f782aae5ff1356a1a967dd9f8e7fc5bddcff2c3397a02d5be15 -SIZE (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 438315 +MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 512650fbc0638ac0f0bae2864f295cca +SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 1c28ae196d901ddaf7ad30802510b1668014c4d4ae0299b8dde267a9faf726e2 +SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 321620 diff --git a/editors/koffice-i18n-lv/pkg-plist b/editors/koffice-i18n-lv/pkg-plist index e6b6e8d33fa4..4d66dd45c186 100644 --- a/editors/koffice-i18n-lv/pkg-plist +++ b/editors/koffice-i18n-lv/pkg-plist @@ -1,32 +1,21 @@ -share/locale/lv/LC_MESSAGES/csvfilter.mo share/locale/lv/LC_MESSAGES/desktop_koffice.mo share/locale/lv/LC_MESSAGES/example.mo -share/locale/lv/LC_MESSAGES/graphite.mo share/locale/lv/LC_MESSAGES/kchart.mo +share/locale/lv/LC_MESSAGES/kfile_koffice.mo share/locale/lv/LC_MESSAGES/kformula.mo -share/locale/lv/LC_MESSAGES/kformulalatexfilter.mo -share/locale/lv/LC_MESSAGES/kformulapngfilter.mo share/locale/lv/LC_MESSAGES/kivio.mo -share/locale/lv/LC_MESSAGES/kocryptfilter.mo +share/locale/lv/LC_MESSAGES/koconverter.mo share/locale/lv/LC_MESSAGES/koffice.mo -share/locale/lv/LC_MESSAGES/kontour.mo +share/locale/lv/LC_MESSAGES/kofficefilters.mo share/locale/lv/LC_MESSAGES/koshell.mo share/locale/lv/LC_MESSAGES/kounavail.mo +share/locale/lv/LC_MESSAGES/kplato.mo share/locale/lv/LC_MESSAGES/kpresenter.mo -share/locale/lv/LC_MESSAGES/kpresenterkwordfilter.mo share/locale/lv/LC_MESSAGES/krita.mo share/locale/lv/LC_MESSAGES/kscan_plugin.mo share/locale/lv/LC_MESSAGES/kspread.mo share/locale/lv/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/lv/LC_MESSAGES/kspreadqprofilter.mo +share/locale/lv/LC_MESSAGES/kthesaurus.mo share/locale/lv/LC_MESSAGES/kugar.mo share/locale/lv/LC_MESSAGES/kword.mo -share/locale/lv/LC_MESSAGES/kwordasciifilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlfilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/lv/LC_MESSAGES/kwordlatexfilter.mo -share/locale/lv/LC_MESSAGES/olefilterswinword97filter.mo -share/locale/lv/LC_MESSAGES/xsltexportfilter.mo -share/locale/lv/LC_MESSAGES/xsltfilter.mo -share/locale/lv/LC_MESSAGES/xsltimportfilter.mo +share/locale/lv/LC_MESSAGES/thesaurus_tool.mo diff --git a/editors/koffice-i18n-ms/Makefile b/editors/koffice-i18n-ms/Makefile index 6f0ac75d4a06..a53ad3ba941b 100644 --- a/editors/koffice-i18n-ms/Makefile +++ b/editors/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ms/distinfo b/editors/koffice-i18n-ms/distinfo index 5bd45bdbd37f..4df1b70947bc 100644 --- a/editors/koffice-i18n-ms/distinfo +++ b/editors/koffice-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 617ab3344f714fa9109875bc50b79502 -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 36728cca86cd369d24d64fe5a0b586c884231206c0d6301f0dfe61f3111fe689 -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 347161 +MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = ff1d6abe79bf4b4239ebaccc2509c35e +SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 3f777241e8d22201f97b4be242624ec6c690ca3ee74fd9357e4e454598502d2a +SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 353895 diff --git a/editors/koffice-i18n-ms/pkg-plist b/editors/koffice-i18n-ms/pkg-plist index 99390aad8df2..e38de83005ca 100644 --- a/editors/koffice-i18n-ms/pkg-plist +++ b/editors/koffice-i18n-ms/pkg-plist @@ -2,6 +2,7 @@ share/locale/ms/LC_MESSAGES/desktop_koffice.mo share/locale/ms/LC_MESSAGES/example.mo share/locale/ms/LC_MESSAGES/karbon.mo share/locale/ms/LC_MESSAGES/kchart.mo +share/locale/ms/LC_MESSAGES/kdgantt.mo share/locale/ms/LC_MESSAGES/kexi.mo share/locale/ms/LC_MESSAGES/kfile_koffice.mo share/locale/ms/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile index 4e111dae8f7f..ca57ae929f6d 100644 --- a/editors/koffice-i18n-nb/Makefile +++ b/editors/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-nb/distinfo b/editors/koffice-i18n-nb/distinfo index 3b1c0a14407b..a75ee96d5fcf 100644 --- a/editors/koffice-i18n-nb/distinfo +++ b/editors/koffice-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 02adef48c63e4a9f87fed63cefb19d1d -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 2eef79ddae5815c778684ad0cc0f7eb23d46f6f4929aea78f15c75b7d911476c -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 368950 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 diff --git a/editors/koffice-i18n-nb/pkg-plist b/editors/koffice-i18n-nb/pkg-plist index 56cd255ecfe9..febc3638272c 100644 --- a/editors/koffice-i18n-nb/pkg-plist +++ b/editors/koffice-i18n-nb/pkg-plist @@ -2,6 +2,7 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo +share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile index 04aeaa72ffb2..0973f3e6e064 100644 --- a/editors/koffice-i18n-nl/Makefile +++ b/editors/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-nl/distinfo b/editors/koffice-i18n-nl/distinfo index 9cbf82513851..65ecfeb4b961 100644 --- a/editors/koffice-i18n-nl/distinfo +++ b/editors/koffice-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 9847ff8d7dbddf4c2f1ae4a6cb0694d1 -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 10a856ed3bb2090691ee2f3695d631a2bb242a140eab54351fd94eb02335b4f9 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 3270123 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 diff --git a/editors/koffice-i18n-nl/pkg-plist b/editors/koffice-i18n-nl/pkg-plist index 62ad8f9c5997..40a6e68057bd 100644 --- a/editors/koffice-i18n-nl/pkg-plist +++ b/editors/koffice-i18n-nl/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/nl/kchart/index.docbook share/doc/HTML/nl/kexi/basics.docbook share/doc/HTML/nl/kexi/building.docbook share/doc/HTML/nl/kexi/common +share/doc/HTML/nl/kexi/comparing.docbook share/doc/HTML/nl/kexi/configuration.docbook share/doc/HTML/nl/kexi/credits.docbook share/doc/HTML/nl/kexi/database.docbook +share/doc/HTML/nl/kexi/designingforms.docbook +share/doc/HTML/nl/kexi/enteringdataintotables.docbook +share/doc/HTML/nl/kexi/enteringdatausingforms.docbook share/doc/HTML/nl/kexi/index.cache.bz2 share/doc/HTML/nl/kexi/index.docbook share/doc/HTML/nl/kexi/intro.docbook share/doc/HTML/nl/kexi/menus.docbook +share/doc/HTML/nl/kexi/querydesigning.docbook share/doc/HTML/nl/kformula/additional_fonts1.png share/doc/HTML/nl/kformula/ambiguous-string.png share/doc/HTML/nl/kformula/common @@ -146,6 +151,8 @@ share/doc/HTML/nl/krita/commands-toolbars.docbook share/doc/HTML/nl/krita/commands.docbook share/doc/HTML/nl/krita/common share/doc/HTML/nl/krita/credits.docbook +share/doc/HTML/nl/krita/developers-plugins.docbook +share/doc/HTML/nl/krita/developers-scripting.docbook share/doc/HTML/nl/krita/developers.docbook share/doc/HTML/nl/krita/faq.docbook share/doc/HTML/nl/krita/index.cache.bz2 @@ -157,11 +164,14 @@ share/doc/HTML/nl/krita/settings.docbook share/doc/HTML/nl/krita/tutorial-quick-starts.docbook share/doc/HTML/nl/krita/tutorial-select-layer.docbook share/doc/HTML/nl/krita/tutorial-starting.docbook +share/doc/HTML/nl/krita/tutorial-tablet.docbook share/doc/HTML/nl/krita/tutorial.docbook share/doc/HTML/nl/krita/using-colorspaces.docbook share/doc/HTML/nl/krita/using-filters.docbook +share/doc/HTML/nl/krita/using-images.docbook share/doc/HTML/nl/krita/using-layers.docbook share/doc/HTML/nl/krita/using-selections.docbook +share/doc/HTML/nl/krita/using-views.docbook share/doc/HTML/nl/kspread/a11y.docbook share/doc/HTML/nl/kspread/advanced.docbook share/doc/HTML/nl/kspread/basics.docbook @@ -462,6 +472,7 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo +share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile index cb97a195f0ff..5a250b48c116 100644 --- a/editors/koffice-i18n-sk/Makefile +++ b/editors/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sk/distinfo b/editors/koffice-i18n-sk/distinfo index b4f11b186fe3..7c87ec248a99 100644 --- a/editors/koffice-i18n-sk/distinfo +++ b/editors/koffice-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = a7dbf6b5fa42d0cdee1f0928cbaadfd0 -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = 42c21359366a12a91921645b2cccaa6de73ed5693463b902f92dc63e66f38388 -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = 973025 +MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 63b2d698040b2f5ece72e7ca67407669 +SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 45c7fb18a7046466513526c30c3d2fde70f2ecb822e9eda4f9f12a7133c9499c +SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 987194 diff --git a/editors/koffice-i18n-sk/pkg-plist b/editors/koffice-i18n-sk/pkg-plist index 3ca903cfe97c..9fa58c01e183 100644 --- a/editors/koffice-i18n-sk/pkg-plist +++ b/editors/koffice-i18n-sk/pkg-plist @@ -34,6 +34,7 @@ share/locale/sk/LC_MESSAGES/desktop_koffice.mo share/locale/sk/LC_MESSAGES/example.mo share/locale/sk/LC_MESSAGES/karbon.mo share/locale/sk/LC_MESSAGES/kchart.mo +share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kexi.mo share/locale/sk/LC_MESSAGES/kfile_abiword.mo share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo @@ -44,6 +45,7 @@ share/locale/sk/LC_MESSAGES/kformula.mo share/locale/sk/LC_MESSAGES/kivio.mo share/locale/sk/LC_MESSAGES/koconverter.mo share/locale/sk/LC_MESSAGES/koffice.mo +share/locale/sk/LC_MESSAGES/kofficefilters.mo share/locale/sk/LC_MESSAGES/koproperty.mo share/locale/sk/LC_MESSAGES/koshell.mo share/locale/sk/LC_MESSAGES/kounavail.mo diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile index ac8fbfda995a..bb7e9a3fae66 100644 --- a/editors/koffice-i18n-sr/Makefile +++ b/editors/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr/distinfo b/editors/koffice-i18n-sr/distinfo index ff59034bf3ca..00cc0748b09d 100644 --- a/editors/koffice-i18n-sr/distinfo +++ b/editors/koffice-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = 2717a1e1e1ff92d1e962e3b69625e906 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = fa4acd98044fcc1a6326b7df8a903d66c041991b87012d568f5c90250b746a0a -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = 363807 +MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = ff1137b214460cfc6c647643da08e098 +SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 5a790a5ede02129e82f500dface6b1bc11592b14e60ed2c16865cafb883660a8 +SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 382309 diff --git a/editors/koffice-i18n-sr/pkg-plist b/editors/koffice-i18n-sr/pkg-plist index 44c0504be1af..2cbaa6d90f6b 100644 --- a/editors/koffice-i18n-sr/pkg-plist +++ b/editors/koffice-i18n-sr/pkg-plist @@ -2,6 +2,7 @@ share/locale/sr/LC_MESSAGES/desktop_koffice.mo share/locale/sr/LC_MESSAGES/example.mo share/locale/sr/LC_MESSAGES/karbon.mo share/locale/sr/LC_MESSAGES/kchart.mo +share/locale/sr/LC_MESSAGES/kdgantt.mo share/locale/sr/LC_MESSAGES/kexi.mo share/locale/sr/LC_MESSAGES/kfile_abiword.mo share/locale/sr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sr@Latn/Makefile b/editors/koffice-i18n-sr@Latn/Makefile index 78eb80519d7d..1d65f9705213 100644 --- a/editors/koffice-i18n-sr@Latn/Makefile +++ b/editors/koffice-i18n-sr@Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr@Latn/distinfo b/editors/koffice-i18n-sr@Latn/distinfo index 513cc76e21ac..366e86446314 100644 --- a/editors/koffice-i18n-sr@Latn/distinfo +++ b/editors/koffice-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f7774ad33c0efb072653495894865e0e -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f5e53db6cb43b1b06eed70d60232c87a670591a46b6422236ba5f17d28bf2b77 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = 373433 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 diff --git a/editors/koffice-i18n-sr@Latn/pkg-plist b/editors/koffice-i18n-sr@Latn/pkg-plist index 98143cd5c517..48ef6abe70ee 100644 --- a/editors/koffice-i18n-sr@Latn/pkg-plist +++ b/editors/koffice-i18n-sr@Latn/pkg-plist @@ -2,6 +2,7 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo +share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile index 78eb80519d7d..1d65f9705213 100644 --- a/editors/koffice-i18n-sr_Latn/Makefile +++ b/editors/koffice-i18n-sr_Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sr_Latn/distinfo b/editors/koffice-i18n-sr_Latn/distinfo index 513cc76e21ac..366e86446314 100644 --- a/editors/koffice-i18n-sr_Latn/distinfo +++ b/editors/koffice-i18n-sr_Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f7774ad33c0efb072653495894865e0e -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f5e53db6cb43b1b06eed70d60232c87a670591a46b6422236ba5f17d28bf2b77 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = 373433 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 diff --git a/editors/koffice-i18n-sr_Latn/pkg-plist b/editors/koffice-i18n-sr_Latn/pkg-plist index 98143cd5c517..48ef6abe70ee 100644 --- a/editors/koffice-i18n-sr_Latn/pkg-plist +++ b/editors/koffice-i18n-sr_Latn/pkg-plist @@ -2,6 +2,7 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo +share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile index 2dfe5de3c96e..a41463e11c3c 100644 --- a/editors/koffice-i18n-sv/Makefile +++ b/editors/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sv/distinfo b/editors/koffice-i18n-sv/distinfo index c6c36bca9a65..57649992cc47 100644 --- a/editors/koffice-i18n-sv/distinfo +++ b/editors/koffice-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 83f73110f60ef4b5f633e3cca0dd4e12 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 1bd9c91f93cd99c81802efb7856ce55dcde18502770f24617647c8487005dd58 -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 5965263 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 diff --git a/editors/koffice-i18n-sv/pkg-plist b/editors/koffice-i18n-sv/pkg-plist index 57b962dbd819..0f24d03f2f32 100644 --- a/editors/koffice-i18n-sv/pkg-plist +++ b/editors/koffice-i18n-sv/pkg-plist @@ -36,14 +36,19 @@ share/doc/HTML/sv/kchart/toolbars.png share/doc/HTML/sv/kexi/basics.docbook share/doc/HTML/sv/kexi/building.docbook share/doc/HTML/sv/kexi/common +share/doc/HTML/sv/kexi/comparing.docbook share/doc/HTML/sv/kexi/configuration.docbook share/doc/HTML/sv/kexi/contact-example.png share/doc/HTML/sv/kexi/credits.docbook share/doc/HTML/sv/kexi/database.docbook +share/doc/HTML/sv/kexi/designingforms.docbook +share/doc/HTML/sv/kexi/enteringdataintotables.docbook +share/doc/HTML/sv/kexi/enteringdatausingforms.docbook share/doc/HTML/sv/kexi/index.cache.bz2 share/doc/HTML/sv/kexi/index.docbook share/doc/HTML/sv/kexi/intro.docbook share/doc/HTML/sv/kexi/menus.docbook +share/doc/HTML/sv/kexi/querydesigning.docbook share/doc/HTML/sv/kformula/additional_fonts1.png share/doc/HTML/sv/kformula/ambiguous-string.png share/doc/HTML/sv/kformula/common @@ -227,12 +232,17 @@ share/doc/HTML/sv/krita/commands.docbook share/doc/HTML/sv/krita/common share/doc/HTML/sv/krita/createdocument.png share/doc/HTML/sv/krita/credits.docbook +share/doc/HTML/sv/krita/developers-plugins.docbook +share/doc/HTML/sv/krita/developers-scripting.docbook share/doc/HTML/sv/krita/developers.docbook share/doc/HTML/sv/krita/dialogs-addpalette.png +share/doc/HTML/sv/krita/dialogs-blur.png share/doc/HTML/sv/krita/dialogs-brightnesscontrast.png share/doc/HTML/sv/krita/dialogs-bumpmap.png share/doc/HTML/sv/krita/dialogs-coloradjustment.png share/doc/HTML/sv/krita/dialogs-colorrange.png +share/doc/HTML/sv/krita/dialogs-colortoalpha.png +share/doc/HTML/sv/krita/dialogs-colortransfer.png share/doc/HTML/sv/krita/dialogs-convertimagetype.png share/doc/HTML/sv/krita/dialogs-convertlayertype.png share/doc/HTML/sv/krita/dialogs-cubism.png @@ -241,22 +251,33 @@ share/doc/HTML/sv/krita/dialogs-documentinformation.png share/doc/HTML/sv/krita/dialogs-dropshadow.png share/doc/HTML/sv/krita/dialogs-emboss.png share/doc/HTML/sv/krita/dialogs-filtersgallery.png +share/doc/HTML/sv/krita/dialogs-gaussiannoise.png share/doc/HTML/sv/krita/dialogs-histogram.png share/doc/HTML/sv/krita/dialogs-imageproperties.png +share/doc/HTML/sv/krita/dialogs-imagerestoration.png share/doc/HTML/sv/krita/dialogs-imagesize.png share/doc/HTML/sv/krita/dialogs-layerproperties.png share/doc/HTML/sv/krita/dialogs-layersize.png +share/doc/HTML/sv/krita/dialogs-lenscorrection.png share/doc/HTML/sv/krita/dialogs-newadjustmentlayer.png share/doc/HTML/sv/krita/dialogs-newlayer.png share/doc/HTML/sv/krita/dialogs-oilpaint.png share/doc/HTML/sv/krita/dialogs-pixelize.png share/doc/HTML/sv/krita/dialogs-raindrops.png +share/doc/HTML/sv/krita/dialogs-randomnoise.png +share/doc/HTML/sv/krita/dialogs-randompick.png share/doc/HTML/sv/krita/dialogs-rotateimage.png share/doc/HTML/sv/krita/dialogs-rotatelayer.png share/doc/HTML/sv/krita/dialogs-roundcorners.png share/doc/HTML/sv/krita/dialogs-separateimage.png share/doc/HTML/sv/krita/dialogs-shearimage.png share/doc/HTML/sv/krita/dialogs-shearlayer.png +share/doc/HTML/sv/krita/dialogs-smalltiles.png +share/doc/HTML/sv/krita/dialogs-sobel.png +share/doc/HTML/sv/krita/dialogs-substrate.png +share/doc/HTML/sv/krita/dialogs-unsharpmask.png +share/doc/HTML/sv/krita/dialogs-wave.png +share/doc/HTML/sv/krita/dialogs-waveletnoise.png share/doc/HTML/sv/krita/faq.docbook share/doc/HTML/sv/krita/filters-customconvolution.png share/doc/HTML/sv/krita/gotchi.png @@ -329,11 +350,14 @@ share/doc/HTML/sv/krita/tutorial-select-layer-8.png share/doc/HTML/sv/krita/tutorial-select-layer-9.png share/doc/HTML/sv/krita/tutorial-select-layer.docbook share/doc/HTML/sv/krita/tutorial-starting.docbook +share/doc/HTML/sv/krita/tutorial-tablet.docbook share/doc/HTML/sv/krita/tutorial.docbook share/doc/HTML/sv/krita/using-colorspaces.docbook share/doc/HTML/sv/krita/using-filters.docbook +share/doc/HTML/sv/krita/using-images.docbook share/doc/HTML/sv/krita/using-layers.docbook share/doc/HTML/sv/krita/using-selections.docbook +share/doc/HTML/sv/krita/using-views.docbook share/doc/HTML/sv/kspread/a11y.docbook share/doc/HTML/sv/kspread/advanced.docbook share/doc/HTML/sv/kspread/basics.docbook @@ -608,6 +632,7 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo +share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile index 7e3333a820b6..7fbbde696c26 100644 --- a/editors/koffice-i18n-tr/Makefile +++ b/editors/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-tr/distinfo b/editors/koffice-i18n-tr/distinfo index 58c8a1243afa..8391191c7b6d 100644 --- a/editors/koffice-i18n-tr/distinfo +++ b/editors/koffice-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 6b7df893cae7725ca94979a4dcd73edf -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 0b6ed62326265302a06cc5874ff27b1a38bab13c1a5f195b216e37634bfc9be8 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 350945 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 diff --git a/editors/koffice-i18n-tr/pkg-plist b/editors/koffice-i18n-tr/pkg-plist index 590ad1345397..265074fd8d3e 100644 --- a/editors/koffice-i18n-tr/pkg-plist +++ b/editors/koffice-i18n-tr/pkg-plist @@ -2,7 +2,10 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo +share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo +share/locale/tr/LC_MESSAGES/kfile_abiword.mo +share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo share/locale/tr/LC_MESSAGES/kfile_koffice.mo share/locale/tr/LC_MESSAGES/kfile_ooo.mo share/locale/tr/LC_MESSAGES/kformdesigner.mo @@ -11,8 +14,10 @@ share/locale/tr/LC_MESSAGES/kivio.mo share/locale/tr/LC_MESSAGES/koconverter.mo share/locale/tr/LC_MESSAGES/koffice.mo share/locale/tr/LC_MESSAGES/kofficefilters.mo +share/locale/tr/LC_MESSAGES/koproperty.mo share/locale/tr/LC_MESSAGES/koshell.mo share/locale/tr/LC_MESSAGES/kounavail.mo +share/locale/tr/LC_MESSAGES/kplato.mo share/locale/tr/LC_MESSAGES/kpresenter.mo share/locale/tr/LC_MESSAGES/krita.mo share/locale/tr/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile index 4df487a14bda..bd8bae7d81c3 100644 --- a/editors/koffice-i18n/Makefile +++ b/editors/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 6f27fc720383..9cb07045d1ed 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -16,15 +16,16 @@ DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org COMMENT= Office Suite for KDE3 -BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx \ - Magick-config:${PORTSDIR}/graphics/ImageMagick -LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx +LIB_DEPENDS= GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick \ + art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ aspell:${PORTSDIR}/textproc/aspell \ exif.12:${PORTSDIR}/graphics/libexif \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ freetype:${PORTSDIR}/print/freetype2 \ lcms:${PORTSDIR}/graphics/lcms \ paper:${PORTSDIR}/print/libpaper \ + poppler-qt:${PORTSDIR}/graphics/poppler-qt \ wpd-0.8:${PORTSDIR}/textproc/libwpd \ wv2:${PORTSDIR}/textproc/wv2 \ xml2:${PORTSDIR}/textproc/libxml2 \ @@ -46,7 +47,9 @@ USE_PGSQL= yes .include <bsd.port.pre.mk> CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \ - --with-pgsqllibdir=${LOCALBASE}/lib + --with-pgsqllibdir=${LOCALBASE}/lib \ + --with-pqxx-includes=${LOCALBASE}/include \ + --with-pqxx-libraries=${LOCALBASE}/lib .if ${OSVERSION} < 500035 EXTRA_PATCHES= ${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp @@ -63,6 +66,14 @@ post-configure: ${WRKSRC}/kchart/kdchart/Makefile \ ${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \ ${WRKSRC}/kexi/migration/pqxx/Makefile + ${REINPLACE_CMD} -e 's|round(|rint(|g' \ + ${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc + ${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \ + ${WRKSRC}/krita/plugins/filters/cimg/Makefile + ${REINPLACE_CMD} -e 's|xor|^|g' \ + ${WRKSRC}/kspread/kspread_style.cc + ${REINPLACE_CMD} -e 's|trunc(|rint(|g' \ + ${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp .endif .include <bsd.port.post.mk> diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 746a0be2c24d..04ee84201ab5 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2 -SHA256 (KDE/koffice/koffice-1.5.2.tar.bz2) = d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 -SIZE (KDE/koffice/koffice-1.5.2.tar.bz2) = 35878218 +MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 +SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 +SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 diff --git a/editors/koffice-kde3/files/patch-kexi_kexidb-preparedstatement.cpp b/editors/koffice-kde3/files/patch-kexi_kexidb-preparedstatement.cpp deleted file mode 100644 index 2f0cd77eaa23..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_kexidb-preparedstatement.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kexi/kexidb/preparedstatement.cpp.orig Thu May 25 15:55:54 2006 -+++ kexi/kexidb/preparedstatement.cpp Thu May 25 16:02:59 2006 -@@ -104,7 +104,7 @@ - } - s.append(")"); - s.prepend(QCString("INSERT INTO ") + table->name().latin1() -- + (allTableFieldsUsed ? "" : (" (" + namesList + ")")) -+ + (allTableFieldsUsed ? QCString("") : (" (" + namesList + ")")) - + " VALUES ("); - } - return s; diff --git a/editors/koffice-kde3/pkg-plist b/editors/koffice-kde3/pkg-plist index 00888ba57513..23edb3d4c816 100644 --- a/editors/koffice-kde3/pkg-plist +++ b/editors/koffice-kde3/pkg-plist @@ -19,19 +19,25 @@ bin/kudesigner bin/kugar bin/kword include/KDChartAxisParams.h +include/KDChartAxisParamsWrapper.h include/KDChartCustomBox.h +include/KDChartCustomBoxWrapper.h include/KDChartDataIntern.h include/KDChartDataRegion.h include/KDChartEnums.h include/KDChartGlobal.h include/KDChartListTable.h +include/KDChartObjectFactory.h include/KDChartParams.h +include/KDChartParamsWrapper.h include/KDChartPropertySet.h include/KDChartTable.h include/KDChartTableBase.h +include/KDChartTableDataWrapper.h include/KDChartTextPiece.h include/KDChartVectorTable.h include/KDChartWidget.h +include/KDChartWrapperFactory.h include/KDFrame.h include/KDFrameProfileSection.h include/KoApplication.h @@ -126,12 +132,15 @@ include/kexidb/object.h include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h +include/kexidb/queryschemaparameter.h include/kexidb/relationship.h include/kexidb/schemadata.h include/kexidb/tableschema.h include/kexidb/transaction.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h +include/kexiutils/longlongvalidator.h +include/kexiutils/styleproxy.h include/kexiutils/tristate.h include/kexiutils/utils.h include/kexiutils/validator.h @@ -146,7 +155,6 @@ include/kis_basic_histogram_producers.h include/kis_boundary.h include/kis_brush.h include/kis_button_event.h -include/kis_button_press_event.h include/kis_button_release_event.h include/kis_canvas_controller.h include/kis_canvas_observer.h @@ -204,7 +212,6 @@ include/kis_iteratorpixeltrait.h include/kis_iterators_pixel.h include/kis_label_zoom.h include/kis_layer.h -include/kis_layer_visitor.h include/kis_layerbox.h include/kis_layerlist.h include/kis_matrix_widget.ui.h @@ -217,7 +224,6 @@ include/kis_nameserver.h include/kis_opengl_image_context.h include/kis_paint_device.h include/kis_paint_device_iface.h -include/kis_paint_layer.h include/kis_painter.h include/kis_paintop.h include/kis_paintop_box.h @@ -225,6 +231,7 @@ include/kis_paintop_registry.h include/kis_palette.h include/kis_palette_widget.h include/kis_pattern.h +include/kis_perspective_math.h include/kis_point.h include/kis_previewdialog.h include/kis_previewwidget.h @@ -233,8 +240,10 @@ include/kis_progress_display_interface.h include/kis_progress_subject.h include/kis_rect.h include/kis_resource.h +include/kis_scale_visitor.h include/kis_selection.h include/kis_shared_ptr_vector.h +include/kis_substrate.h include/kis_tileddatamanager.h include/kis_tool.h include/kis_tool_controller.h @@ -259,7 +268,6 @@ include/kobirdeyepanel.h include/koffice_export.h include/kofficeversion.h include/kopalettemanager.h -include/kross/api/argument.h include/kross/api/callable.h include/kross/api/class.h include/kross/api/dict.h @@ -433,6 +441,15 @@ lib/kde3/krita_rgb_f32_plugin.so lib/kde3/krita_rgb_u16_plugin.a lib/kde3/krita_rgb_u16_plugin.la lib/kde3/krita_rgb_u16_plugin.so +lib/kde3/krita_ycbcr_u16_plugin.a +lib/kde3/krita_ycbcr_u16_plugin.la +lib/kde3/krita_ycbcr_u16_plugin.so +lib/kde3/krita_ycbcr_u8_plugin.a +lib/kde3/krita_ycbcr_u8_plugin.la +lib/kde3/krita_ycbcr_u8_plugin.so +lib/kde3/kritablurfilter.a +lib/kde3/kritablurfilter.la +lib/kde3/kritablurfilter.so lib/kde3/kritabumpmap.a lib/kde3/kritabumpmap.la lib/kde3/kritabumpmap.so @@ -469,6 +486,12 @@ lib/kde3/kritaembossfilter.so lib/kde3/kritaexample.a lib/kde3/kritaexample.la lib/kde3/kritaexample.so +lib/kde3/kritaextensioncolorsfilters.a +lib/kde3/kritaextensioncolorsfilters.la +lib/kde3/kritaextensioncolorsfilters.so +lib/kde3/kritafastcolortransfer.a +lib/kde3/kritafastcolortransfer.la +lib/kde3/kritafastcolortransfer.so lib/kde3/kritafiltersgallery.a lib/kde3/kritafiltersgallery.la lib/kde3/kritafiltersgallery.so @@ -487,6 +510,18 @@ lib/kde3/kritaimageenhancement.so lib/kde3/kritaimagesize.a lib/kde3/kritaimagesize.la lib/kde3/kritaimagesize.so +lib/kde3/kritalenscorrectionfilter.a +lib/kde3/kritalenscorrectionfilter.la +lib/kde3/kritalenscorrectionfilter.so +lib/kde3/kritalevelfilter.a +lib/kde3/kritalevelfilter.la +lib/kde3/kritalevelfilter.so +lib/kde3/kritamodifyselection.a +lib/kde3/kritamodifyselection.la +lib/kde3/kritamodifyselection.so +lib/kde3/kritanoisefilter.a +lib/kde3/kritanoisefilter.la +lib/kde3/kritanoisefilter.so lib/kde3/kritaoilpaintfilter.a lib/kde3/kritaoilpaintfilter.la lib/kde3/kritaoilpaintfilter.so @@ -496,6 +531,9 @@ lib/kde3/kritapixelizefilter.so lib/kde3/kritaraindropsfilter.a lib/kde3/kritaraindropsfilter.la lib/kde3/kritaraindropsfilter.so +lib/kde3/kritarandompickfilter.a +lib/kde3/kritarandompickfilter.la +lib/kde3/kritarandompickfilter.so lib/kde3/kritargbplugin.a lib/kde3/kritargbplugin.la lib/kde3/kritargbplugin.so @@ -523,18 +561,27 @@ lib/kde3/kritashearimage.so lib/kde3/kritasmalltilesfilter.a lib/kde3/kritasmalltilesfilter.la lib/kde3/kritasmalltilesfilter.so -lib/kde3/kritasmearybrush.a -lib/kde3/kritasmearybrush.la -lib/kde3/kritasmearybrush.so lib/kde3/kritasobelfilter.a lib/kde3/kritasobelfilter.la lib/kde3/kritasobelfilter.so +lib/kde3/kritasubstrate.a +lib/kde3/kritasubstrate.la +lib/kde3/kritasubstrate.so lib/kde3/kritatoolcrop.a lib/kde3/kritatoolcrop.la lib/kde3/kritatoolcrop.so +lib/kde3/kritatoolcurves.a +lib/kde3/kritatoolcurves.la +lib/kde3/kritatoolcurves.so lib/kde3/kritatoolfilter.a lib/kde3/kritatoolfilter.la lib/kde3/kritatoolfilter.so +lib/kde3/kritatoolperspectivegrid.a +lib/kde3/kritatoolperspectivegrid.la +lib/kde3/kritatoolperspectivegrid.so +lib/kde3/kritatoolperspectivetransform.a +lib/kde3/kritatoolperspectivetransform.la +lib/kde3/kritatoolperspectivetransform.so lib/kde3/kritatoolpolygon.a lib/kde3/kritatoolpolygon.la lib/kde3/kritatoolpolygon.so @@ -550,6 +597,12 @@ lib/kde3/kritatoolstar.so lib/kde3/kritatooltransform.a lib/kde3/kritatooltransform.la lib/kde3/kritatooltransform.so +lib/kde3/kritaunsharpfilter.a +lib/kde3/kritaunsharpfilter.la +lib/kde3/kritaunsharpfilter.so +lib/kde3/kritawavefilter.a +lib/kde3/kritawavefilter.la +lib/kde3/kritawavefilter.so lib/kde3/kritawetplugin.a lib/kde3/kritawetplugin.la lib/kde3/kritawetplugin.so @@ -562,6 +615,9 @@ lib/kde3/krosskexidb.so lib/kde3/krosskritacore.a lib/kde3/krosskritacore.la lib/kde3/krosskritacore.so +lib/kde3/krosskspreadcore.a +lib/kde3/krosskspreadcore.la +lib/kde3/krosskspreadcore.so lib/kde3/krosspython.a lib/kde3/krosspython.la lib/kde3/krosspython.so @@ -571,6 +627,9 @@ lib/kde3/krossruby.so lib/kde3/kspread.a lib/kde3/kspread.la lib/kde3/kspread.so +lib/kde3/kspreadscripting.a +lib/kde3/kspreadscripting.la +lib/kde3/kspreadscripting.so lib/kde3/kthesaurus.a lib/kde3/kthesaurus.la lib/kde3/kthesaurus.so @@ -790,21 +849,24 @@ lib/kde3/libkrita_openexr_import.so lib/kde3/libkrita_raw_import.a lib/kde3/libkrita_raw_import.la lib/kde3/libkrita_raw_import.so +lib/kde3/libkritagmagickexport.a +lib/kde3/libkritagmagickexport.la +lib/kde3/libkritagmagickexport.so +lib/kde3/libkritagmagickimport.a +lib/kde3/libkritagmagickimport.la +lib/kde3/libkritagmagickimport.so lib/kde3/libkritajpegexport.a lib/kde3/libkritajpegexport.la lib/kde3/libkritajpegexport.so lib/kde3/libkritajpegimport.a lib/kde3/libkritajpegimport.la lib/kde3/libkritajpegimport.so -lib/kde3/libkritamagickexport.a -lib/kde3/libkritamagickexport.la -lib/kde3/libkritamagickexport.so -lib/kde3/libkritamagickimport.a -lib/kde3/libkritamagickimport.la -lib/kde3/libkritamagickimport.so lib/kde3/libkritapart.a lib/kde3/libkritapart.la lib/kde3/libkritapart.so +lib/kde3/libkritapdfimport.a +lib/kde3/libkritapdfimport.la +lib/kde3/libkritapdfimport.so lib/kde3/libkritapngexport.a lib/kde3/libkritapngexport.la lib/kde3/libkritapngexport.so @@ -823,6 +885,9 @@ lib/kde3/libkspreadhtmlexport.so lib/kde3/libkspreadinsertcalendar.a lib/kde3/libkspreadinsertcalendar.la lib/kde3/libkspreadinsertcalendar.so +lib/kde3/libkspreadkexiimport.a +lib/kde3/libkspreadkexiimport.la +lib/kde3/libkspreadkexiimport.so lib/kde3/libkspreadlatexexport.a lib/kde3/libkspreadlatexexport.la lib/kde3/libkspreadlatexexport.so @@ -856,6 +921,9 @@ lib/kde3/libmswriteexport.so lib/kde3/libmswriteimport.a lib/kde3/libmswriteimport.la lib/kde3/libmswriteimport.so +lib/kde3/libolefilter.a +lib/kde3/libolefilter.la +lib/kde3/libolefilter.so lib/kde3/liboodrawimport.a lib/kde3/liboodrawimport.la lib/kde3/liboodrawimport.so @@ -886,9 +954,6 @@ lib/kde3/libpalmdocimport.so lib/kde3/libpdfimport.a lib/kde3/libpdfimport.la lib/kde3/libpdfimport.so -lib/kde3/libpowerpointimport.a -lib/kde3/libpowerpointimport.la -lib/kde3/libpowerpointimport.so lib/kde3/libqproimport.a lib/kde3/libqproimport.la lib/kde3/libqproimport.so @@ -989,43 +1054,43 @@ lib/libkdeinit_kword.so lib/libkexicore.a lib/libkexicore.la lib/libkexicore.so -lib/libkexicore.so.1 +lib/libkexicore.so.2 lib/libkexidatatable.a lib/libkexidatatable.la lib/libkexidatatable.so -lib/libkexidatatable.so.1 +lib/libkexidatatable.so.2 lib/libkexidb.a lib/libkexidb.la lib/libkexidb.so -lib/libkexidb.so.0 +lib/libkexidb.so.2 lib/libkexidbparser.a lib/libkexidbparser.la lib/libkexidbparser.so -lib/libkexidbparser.so.1 +lib/libkexidbparser.so.2 lib/libkexiextendedwidgets.a lib/libkexiextendedwidgets.la lib/libkexiextendedwidgets.so -lib/libkexiextendedwidgets.so.1 +lib/libkexiextendedwidgets.so.2 lib/libkexiformutils.a lib/libkexiformutils.la lib/libkexiformutils.so -lib/libkexiformutils.so.1 +lib/libkexiformutils.so.2 lib/libkexiguiutils.a lib/libkexiguiutils.la lib/libkexiguiutils.so -lib/libkexiguiutils.so.1 +lib/libkexiguiutils.so.2 lib/libkeximain.a lib/libkeximain.la lib/libkeximain.so -lib/libkeximain.so.1 +lib/libkeximain.so.2 lib/libkeximigrate.a lib/libkeximigrate.la lib/libkeximigrate.so -lib/libkeximigrate.so.1 +lib/libkeximigrate.so.2 lib/libkexirelationsview.a lib/libkexirelationsview.la lib/libkexirelationsview.so -lib/libkexirelationsview.so.1 +lib/libkexirelationsview.so.2 lib/libkexisql2.a lib/libkexisql2.la lib/libkexisql2.so @@ -1037,11 +1102,11 @@ lib/libkexisql3.so.3 lib/libkexiutils.a lib/libkexiutils.la lib/libkexiutils.so -lib/libkexiutils.so.1 +lib/libkexiutils.so.2 lib/libkformdesigner.a lib/libkformdesigner.la lib/libkformdesigner.so -lib/libkformdesigner.so.1 +lib/libkformdesigner.so.2 lib/libkformulalib.a lib/libkformulalib.la lib/libkformulalib.so @@ -1073,7 +1138,7 @@ lib/libkopalette.so.1 lib/libkoproperty.a lib/libkoproperty.la lib/libkoproperty.so -lib/libkoproperty.so.0 +lib/libkoproperty.so.2 lib/libkotext.a lib/libkotext.la lib/libkotext.so @@ -1114,6 +1179,14 @@ lib/libkrita_rgb_u16.a lib/libkrita_rgb_u16.la lib/libkrita_rgb_u16.so lib/libkrita_rgb_u16.so.0 +lib/libkrita_ycbcr_u16.a +lib/libkrita_ycbcr_u16.la +lib/libkrita_ycbcr_u16.so +lib/libkrita_ycbcr_u16.so.0 +lib/libkrita_ycbcr_u8.a +lib/libkrita_ycbcr_u8.la +lib/libkrita_ycbcr_u8.so +lib/libkrita_ycbcr_u8.so.0 lib/libkritacolor.a lib/libkritacolor.la lib/libkritacolor.so @@ -1183,6 +1256,13 @@ lib/libkwordprivate.so lib/libkwordprivate.so.4 share/applications/kde/kivio.desktop share/applications/kde/krita.desktop +share/applnk/.hidden/krita_jpeg.desktop +share/applnk/.hidden/krita_magick.desktop +share/applnk/.hidden/krita_openexr.desktop +share/applnk/.hidden/krita_pdf.desktop +share/applnk/.hidden/krita_png.desktop +share/applnk/.hidden/krita_raw.desktop +share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop @@ -1191,12 +1271,6 @@ share/applnk/Office/kformula.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kplato.desktop share/applnk/Office/kpresenter.desktop -share/applnk/Office/krita_jpeg.desktop -share/applnk/Office/krita_magick.desktop -share/applnk/Office/krita_openexr.desktop -share/applnk/Office/krita_png.desktop -share/applnk/Office/krita_raw.desktop -share/applnk/Office/krita_tiff.desktop share/applnk/Office/kspread.desktop share/applnk/Office/kudesigner.desktop share/applnk/Office/kugar.desktop @@ -1373,13 +1447,21 @@ share/apps/kchart/pics/chart_hilo_normal.png share/apps/kchart/pics/chart_hilo_openclose.png share/apps/kchart/pics/chart_legend_bottom.png share/apps/kchart/pics/chart_legend_bottomleft.png +share/apps/kchart/pics/chart_legend_bottomleftbottom.png +share/apps/kchart/pics/chart_legend_bottomleftleft.png share/apps/kchart/pics/chart_legend_bottomright.png +share/apps/kchart/pics/chart_legend_bottomrightbottom.png +share/apps/kchart/pics/chart_legend_bottomrightright.png share/apps/kchart/pics/chart_legend_left.png share/apps/kchart/pics/chart_legend_nolegend.png share/apps/kchart/pics/chart_legend_right.png share/apps/kchart/pics/chart_legend_top.png share/apps/kchart/pics/chart_legend_topleft.png +share/apps/kchart/pics/chart_legend_topleftleft.png +share/apps/kchart/pics/chart_legend_toplefttop.png share/apps/kchart/pics/chart_legend_topright.png +share/apps/kchart/pics/chart_legend_toprightright.png +share/apps/kchart/pics/chart_legend_toprighttop.png share/apps/kchart/pics/chart_line_normal.png share/apps/kchart/pics/chart_line_percent.png share/apps/kchart/pics/chart_line_stacked.png @@ -1401,6 +1483,7 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png share/apps/kexi/icons/crystalsvg/16x16/actions/check.png share/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png +share/apps/kexi/icons/crystalsvg/16x16/actions/combo.png share/apps/kexi/icons/crystalsvg/16x16/actions/database.png share/apps/kexi/icons/crystalsvg/16x16/actions/database_import.png share/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png @@ -1414,6 +1497,8 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/line.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_horizontal.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_vertical.png share/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/16x16/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/16x16/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png @@ -1484,6 +1569,8 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png share/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png share/apps/kexi/icons/crystalsvg/22x22/actions/listview.png share/apps/kexi/icons/crystalsvg/22x22/actions/lower.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/22x22/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png @@ -1522,6 +1609,8 @@ share/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png share/apps/kexi/icons/crystalsvg/32x32/actions/grid.png share/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png share/apps/kexi/icons/crystalsvg/32x32/actions/key.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png share/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png share/apps/kexi/icons/crystalsvg/32x32/actions/query.png @@ -1563,15 +1652,13 @@ share/apps/kexi/scripts/importxhtml/ImportXHTML.rc share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc share/apps/kformula/dtd/kformula.dtd -share/apps/kformula/fonts/cmbx10.ttf +share/apps/kformula/fonts/Arev.ttf +share/apps/kformula/fonts/ArevBI.ttf +share/apps/kformula/fonts/ArevBd.ttf +share/apps/kformula/fonts/ArevIt.ttf share/apps/kformula/fonts/cmex10.ttf -share/apps/kformula/fonts/cmmi10.ttf -share/apps/kformula/fonts/cmr10.ttf -share/apps/kformula/fonts/cmsy10.ttf share/apps/kformula/fonts/fonts.dir share/apps/kformula/fonts/fonts.scale -share/apps/kformula/fonts/msam10.ttf -share/apps/kformula/fonts/msbm10.ttf share/apps/kformula/kformula.rc share/apps/kformula/kformula_readonly.rc share/apps/kformula/tips @@ -3684,11 +3771,19 @@ share/apps/krita/pics/polyline.png share/apps/krita/pics/raiselayer.png share/apps/krita/pics/rotate_cursor.xpm share/apps/krita/pics/tablet.png +share/apps/krita/pics/tool_bezier_cursor.png +share/apps/krita/pics/tool_bezier_paint.png +share/apps/krita/pics/tool_bezier_select.png share/apps/krita/pics/tool_brush_selection.png share/apps/krita/pics/tool_brush_selection_cursor.png +share/apps/krita/pics/tool_color_fill.png +share/apps/krita/pics/tool_colorpicker.png share/apps/krita/pics/tool_contiguous_selection.png share/apps/krita/pics/tool_contiguous_selection_cursor.png +share/apps/krita/pics/tool_crop.png share/apps/krita/pics/tool_crop_cursor.png +share/apps/krita/pics/tool_curve_dragging.png +share/apps/krita/pics/tool_duplicate.png share/apps/krita/pics/tool_duplicate_cursor.png share/apps/krita/pics/tool_ellipse.png share/apps/krita/pics/tool_ellipse_cursor.png @@ -3696,6 +3791,8 @@ share/apps/krita/pics/tool_elliptical_selection.png share/apps/krita/pics/tool_elliptical_selection_cursor.png share/apps/krita/pics/tool_eraser_selection.png share/apps/krita/pics/tool_eraser_selection_cursor.png +share/apps/krita/pics/tool_example.png +share/apps/krita/pics/tool_example_cursor.png share/apps/krita/pics/tool_fill_cursor.png share/apps/krita/pics/tool_filter.png share/apps/krita/pics/tool_filter_cursor.png @@ -3705,9 +3802,15 @@ share/apps/krita/pics/tool_gradient.png share/apps/krita/pics/tool_gradient_cursor.png share/apps/krita/pics/tool_line.png share/apps/krita/pics/tool_line_cursor.png +share/apps/krita/pics/tool_moutline.png +share/apps/krita/pics/tool_moutline_cursor.png +share/apps/krita/pics/tool_moutline_editing.png +share/apps/krita/pics/tool_move.png share/apps/krita/pics/tool_outline_selection.png share/apps/krita/pics/tool_outline_selection_cursor.png share/apps/krita/pics/tool_pan.png +share/apps/krita/pics/tool_perspectivegrid.png +share/apps/krita/pics/tool_perspectivetransform.png share/apps/krita/pics/tool_polygon.png share/apps/krita/pics/tool_polygon_cursor.png share/apps/krita/pics/tool_polygonal_selection.png @@ -3725,6 +3828,8 @@ share/apps/krita/pics/tool_star.png share/apps/krita/pics/tool_star_cursor.png share/apps/krita/pics/tool_text.png share/apps/krita/pics/tool_text_cursor.png +share/apps/krita/pics/tool_transform.png +share/apps/krita/pics/tool_zoom.png share/apps/krita/pics/tool_zoom_minus_cursor.png share/apps/krita/pics/tool_zoom_plus_cursor.png share/apps/krita/pics/unlinked.png @@ -3740,6 +3845,7 @@ share/apps/krita/profiles/PAL.icm share/apps/krita/profiles/SMPTE-C.icm share/apps/krita/profiles/WideGamut.icm share/apps/krita/profiles/cmyk.icm +share/apps/krita/profiles/fogra27l.icm share/apps/krita/profiles/lcmslabi.icm share/apps/krita/profiles/lcmsxyzi.icm share/apps/krita/profiles/monoscnr.icm @@ -3796,10 +3902,12 @@ share/apps/kritaplugins/imageseparate.rc share/apps/kritaplugins/imagesize.rc share/apps/kritaplugins/kritafiltersgallery.rc share/apps/kritaplugins/kritahistogramdocker.rc +share/apps/kritaplugins/modify_selection.rc share/apps/kritaplugins/rotateimage.rc share/apps/kritaplugins/screenshot-krita.rc share/apps/kritaplugins/scripting.rc share/apps/kritaplugins/shearimage.rc +share/apps/kritaplugins/substrate.rc share/apps/kritaplugins/wetplugin.rc share/apps/kross/python/RestrictedPython/Eval.py share/apps/kross/python/RestrictedPython/Guards.py @@ -3947,8 +4055,13 @@ share/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz share/apps/kspread/kpartplugins/insertcalendar.rc +share/apps/kspread/kpartplugins/scripting.rc share/apps/kspread/kspread.rc share/apps/kspread/kspread_readonly.rc +share/apps/kspread/scripts/exporthtml/ExportHtml.py +share/apps/kspread/scripts/exporthtml/ExportHtml.rc +share/apps/kspread/scripts/scripteditor/ScriptEditor.py +share/apps/kspread/scripts/scripteditor/ScriptEditor.rc share/apps/kspread/sheetstyles/standard1.ksts share/apps/kspread/sheetstyles/standard1.png share/apps/kspread/sheetstyles/standard1.xml @@ -4190,14 +4303,19 @@ share/doc/HTML/en/kchart/toolbars.png share/doc/HTML/en/kexi/basics.docbook share/doc/HTML/en/kexi/building.docbook share/doc/HTML/en/kexi/common +share/doc/HTML/en/kexi/comparing.docbook share/doc/HTML/en/kexi/configuration.docbook share/doc/HTML/en/kexi/contact-example.png share/doc/HTML/en/kexi/credits.docbook share/doc/HTML/en/kexi/database.docbook +share/doc/HTML/en/kexi/designingforms.docbook +share/doc/HTML/en/kexi/enteringdataintotables.docbook +share/doc/HTML/en/kexi/enteringdatausingforms.docbook share/doc/HTML/en/kexi/index.cache.bz2 share/doc/HTML/en/kexi/index.docbook share/doc/HTML/en/kexi/intro.docbook share/doc/HTML/en/kexi/menus.docbook +share/doc/HTML/en/kexi/querydesigning.docbook share/doc/HTML/en/kformula/ambiguous-string.png share/doc/HTML/en/kformula/common share/doc/HTML/en/kformula/correct_index_location.png @@ -4374,6 +4492,7 @@ share/doc/HTML/en/kpresenter/tut25.png share/doc/HTML/en/kpresenter/tut26.png share/doc/HTML/en/kpresenter/tutorial.docbook share/doc/HTML/en/kpresenter/zoomfactor.png +share/doc/HTML/en/krita/README.SCREENSHOTS share/doc/HTML/en/krita/commands-dialogs.docbook share/doc/HTML/en/krita/commands-menus.docbook share/doc/HTML/en/krita/commands-palettes.docbook @@ -4382,7 +4501,15 @@ share/doc/HTML/en/krita/commands.docbook share/doc/HTML/en/krita/common share/doc/HTML/en/krita/createdocument.png share/doc/HTML/en/krita/credits.docbook +share/doc/HTML/en/krita/crocusses-autocontrast.png +share/doc/HTML/en/krita/crocusses-blur.png +share/doc/HTML/en/krita/crocusses-brightnesscontrast.png share/doc/HTML/en/krita/crocusses-bumpmap.png +share/doc/HTML/en/krita/crocusses-coloradjustment.png +share/doc/HTML/en/krita/crocusses-colortoalpha.png +share/doc/HTML/en/krita/crocusses-colortransfer.png +share/doc/HTML/en/krita/crocusses-customconvolution.png +share/doc/HTML/en/krita/crocusses-desaturate.png share/doc/HTML/en/krita/crocusses-edgebottom.png share/doc/HTML/en/krita/crocusses-edgeleft.png share/doc/HTML/en/krita/crocusses-edgeright.png @@ -4390,24 +4517,37 @@ share/doc/HTML/en/krita/crocusses-embossall.png share/doc/HTML/en/krita/crocusses-embosshorvert.png share/doc/HTML/en/krita/crocusses-embossvariable.png share/doc/HTML/en/krita/crocusses-gaussianblur.png +share/doc/HTML/en/krita/crocusses-gaussiannoise.png share/doc/HTML/en/krita/crocusses-invert.png +share/doc/HTML/en/krita/crocusses-lenscorrection.png +share/doc/HTML/en/krita/crocusses-maximizechannel.png share/doc/HTML/en/krita/crocusses-meanremoval.png +share/doc/HTML/en/krita/crocusses-minimizechannel.png share/doc/HTML/en/krita/crocusses-oilpaint.png share/doc/HTML/en/krita/crocusses-pixelize.png share/doc/HTML/en/krita/crocusses-raindrops.png +share/doc/HTML/en/krita/crocusses-randomnoise.png +share/doc/HTML/en/krita/crocusses-randompick.png share/doc/HTML/en/krita/crocusses-roundcorners.png share/doc/HTML/en/krita/crocusses-sharpen.png -share/doc/HTML/en/krita/crocusses-simplenoise.png +share/doc/HTML/en/krita/crocusses-smalltiles.png share/doc/HTML/en/krita/crocusses-sobel.png -share/doc/HTML/en/krita/crocusses-tiles.png share/doc/HTML/en/krita/crocusses-topedge.png +share/doc/HTML/en/krita/crocusses-unsharpmask.png +share/doc/HTML/en/krita/crocusses-wave.png +share/doc/HTML/en/krita/crocusses-waveletnoise.png share/doc/HTML/en/krita/crocusses.png +share/doc/HTML/en/krita/developers-plugins.docbook +share/doc/HTML/en/krita/developers-scripting.docbook share/doc/HTML/en/krita/developers.docbook share/doc/HTML/en/krita/dialogs-addpalette.png +share/doc/HTML/en/krita/dialogs-blur.png share/doc/HTML/en/krita/dialogs-brightnesscontrast.png share/doc/HTML/en/krita/dialogs-bumpmap.png share/doc/HTML/en/krita/dialogs-coloradjustment.png share/doc/HTML/en/krita/dialogs-colorrange.png +share/doc/HTML/en/krita/dialogs-colortoalpha.png +share/doc/HTML/en/krita/dialogs-colortransfer.png share/doc/HTML/en/krita/dialogs-convertimagetype.png share/doc/HTML/en/krita/dialogs-convertlayertype.png share/doc/HTML/en/krita/dialogs-cubism.png @@ -4416,17 +4556,21 @@ share/doc/HTML/en/krita/dialogs-documentinformation.png share/doc/HTML/en/krita/dialogs-dropshadow.png share/doc/HTML/en/krita/dialogs-emboss.png share/doc/HTML/en/krita/dialogs-filtersgallery.png +share/doc/HTML/en/krita/dialogs-gaussiannoise.png share/doc/HTML/en/krita/dialogs-histogram.png share/doc/HTML/en/krita/dialogs-imageproperties.png share/doc/HTML/en/krita/dialogs-imagerestoration.png share/doc/HTML/en/krita/dialogs-imagesize.png share/doc/HTML/en/krita/dialogs-layerproperties.png share/doc/HTML/en/krita/dialogs-layersize.png +share/doc/HTML/en/krita/dialogs-lenscorrection.png share/doc/HTML/en/krita/dialogs-newadjustmentlayer.png share/doc/HTML/en/krita/dialogs-newlayer.png share/doc/HTML/en/krita/dialogs-oilpaint.png share/doc/HTML/en/krita/dialogs-pixelize.png share/doc/HTML/en/krita/dialogs-raindrops.png +share/doc/HTML/en/krita/dialogs-randomnoise.png +share/doc/HTML/en/krita/dialogs-randompick.png share/doc/HTML/en/krita/dialogs-rotateimage.png share/doc/HTML/en/krita/dialogs-rotatelayer.png share/doc/HTML/en/krita/dialogs-roundcorners.png @@ -4435,31 +4579,56 @@ share/doc/HTML/en/krita/dialogs-shearimage.png share/doc/HTML/en/krita/dialogs-shearlayer.png share/doc/HTML/en/krita/dialogs-smalltiles.png share/doc/HTML/en/krita/dialogs-sobel.png +share/doc/HTML/en/krita/dialogs-substrate.png +share/doc/HTML/en/krita/dialogs-unsharpmask.png +share/doc/HTML/en/krita/dialogs-wave.png +share/doc/HTML/en/krita/dialogs-waveletnoise.png share/doc/HTML/en/krita/faq.docbook share/doc/HTML/en/krita/index.cache.bz2 share/doc/HTML/en/krita/index.docbook share/doc/HTML/en/krita/installation.docbook share/doc/HTML/en/krita/introduction.docbook share/doc/HTML/en/krita/mainscreen.png +share/doc/HTML/en/krita/mountains-burn.png +share/doc/HTML/en/krita/mountains-color.png +share/doc/HTML/en/krita/mountains-darken.png +share/doc/HTML/en/krita/mountains-divide.png +share/doc/HTML/en/krita/mountains-dodge.png +share/doc/HTML/en/krita/mountains-hue.png +share/doc/HTML/en/krita/mountains-lighten.png +share/doc/HTML/en/krita/mountains-multiply.png +share/doc/HTML/en/krita/mountains-normal.png +share/doc/HTML/en/krita/mountains-original.png +share/doc/HTML/en/krita/mountains-overlay.png +share/doc/HTML/en/krita/mountains-saturation.png +share/doc/HTML/en/krita/mountains-screen.png +share/doc/HTML/en/krita/mountains-value.png +share/doc/HTML/en/krita/mountains.png share/doc/HTML/en/krita/newimage.png share/doc/HTML/en/krita/palettes-colors-gray.png share/doc/HTML/en/krita/palettes-colors-hsv.png share/doc/HTML/en/krita/palettes-colors-palettes.png share/doc/HTML/en/krita/palettes-colors-rgb.png share/doc/HTML/en/krita/palettes-colors-watercolors.png +share/doc/HTML/en/krita/palettes-controlbox-bezier.png share/doc/HTML/en/krita/palettes-controlbox-brush.png share/doc/HTML/en/krita/palettes-controlbox-colorpicker.png share/doc/HTML/en/krita/palettes-controlbox-contiguousfill.png share/doc/HTML/en/krita/palettes-controlbox-crop.png +share/doc/HTML/en/krita/palettes-controlbox-duplicate.png +share/doc/HTML/en/krita/palettes-controlbox-ellipse.png +share/doc/HTML/en/krita/palettes-controlbox-fill.png share/doc/HTML/en/krita/palettes-controlbox-gradient.png share/doc/HTML/en/krita/palettes-controlbox-histogram.png share/doc/HTML/en/krita/palettes-controlbox-line.png share/doc/HTML/en/krita/palettes-controlbox-overview.png share/doc/HTML/en/krita/palettes-controlbox-paintwithfilters.png share/doc/HTML/en/krita/palettes-controlbox-polygon.png +share/doc/HTML/en/krita/palettes-controlbox-polyline.png share/doc/HTML/en/krita/palettes-controlbox-rectangle.png share/doc/HTML/en/krita/palettes-controlbox-select.png share/doc/HTML/en/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/en/krita/palettes-controlbox-selectmagnetic.png share/doc/HTML/en/krita/palettes-controlbox-selectsimilar.png share/doc/HTML/en/krita/palettes-controlbox-star.png share/doc/HTML/en/krita/palettes-controlbox-text.png @@ -4473,8 +4642,11 @@ share/doc/HTML/en/krita/preferences-grid.png share/doc/HTML/en/krita/preferences-performance.png share/doc/HTML/en/krita/preferences-sidebar.png share/doc/HTML/en/krita/preferences-tablet.png -share/doc/HTML/en/krita/scripting.docbook share/doc/HTML/en/krita/settings.docbook +share/doc/HTML/en/krita/tool-bezier-example.png +share/doc/HTML/en/krita/tool-bezier-example2.png +share/doc/HTML/en/krita/tool-bezier-example3.png +share/doc/HTML/en/krita/tool-bezier.png share/doc/HTML/en/krita/tool-brush.png share/doc/HTML/en/krita/tool-colorpicker.png share/doc/HTML/en/krita/tool-contiguousfill.png @@ -4486,13 +4658,18 @@ share/doc/HTML/en/krita/tool-gradient.png share/doc/HTML/en/krita/tool-line.png share/doc/HTML/en/krita/tool-move.png share/doc/HTML/en/krita/tool-paintselection.png +share/doc/HTML/en/krita/tool-paintwithfilters-example.png share/doc/HTML/en/krita/tool-paintwithfilters.png share/doc/HTML/en/krita/tool-pan.png +share/doc/HTML/en/krita/tool-perspectivegrid.png +share/doc/HTML/en/krita/tool-perspectivetransform.png share/doc/HTML/en/krita/tool-polygon.png share/doc/HTML/en/krita/tool-polyline.png share/doc/HTML/en/krita/tool-rectangle.png +share/doc/HTML/en/krita/tool-selectbezier.png share/doc/HTML/en/krita/tool-selectcontiguous.png share/doc/HTML/en/krita/tool-selectelliptical.png +share/doc/HTML/en/krita/tool-selectmagnetic.png share/doc/HTML/en/krita/tool-selectoutline.png share/doc/HTML/en/krita/tool-selectpolygonal.png share/doc/HTML/en/krita/tool-selectrectangular.png @@ -4513,6 +4690,8 @@ share/doc/HTML/en/krita/toolbar-file.png share/doc/HTML/en/krita/toolbar-krita.png share/doc/HTML/en/krita/toolbar-navigation.png share/doc/HTML/en/krita/toolbar-transformationtools.png +share/doc/HTML/en/krita/toolbars-button-zoomin.png +share/doc/HTML/en/krita/toolbars-button-zoomout.png share/doc/HTML/en/krita/tutorial-quick-starts.docbook share/doc/HTML/en/krita/tutorial-quick-starts1.png share/doc/HTML/en/krita/tutorial-quick-starts10.png @@ -4542,9 +4721,14 @@ share/doc/HTML/en/krita/tutorial-select-layer-9.png share/doc/HTML/en/krita/tutorial-select-layer-sample.png share/doc/HTML/en/krita/tutorial-select-layer.docbook share/doc/HTML/en/krita/tutorial-starting.docbook +share/doc/HTML/en/krita/tutorial-tablet-1.png +share/doc/HTML/en/krita/tutorial-tablet-2.png +share/doc/HTML/en/krita/tutorial-tablet-3.png +share/doc/HTML/en/krita/tutorial-tablet.docbook share/doc/HTML/en/krita/tutorial.docbook share/doc/HTML/en/krita/using-colorspaces.docbook share/doc/HTML/en/krita/using-filters.docbook +share/doc/HTML/en/krita/using-images.docbook share/doc/HTML/en/krita/using-layers.docbook share/doc/HTML/en/krita/using-selections-1.png share/doc/HTML/en/krita/using-selections-2.png @@ -4553,6 +4737,7 @@ share/doc/HTML/en/krita/using-selections-4.png share/doc/HTML/en/krita/using-selections-5.png share/doc/HTML/en/krita/using-selections-6.png share/doc/HTML/en/krita/using-selections.docbook +share/doc/HTML/en/krita/using-views.docbook share/doc/HTML/en/kspread/a11y.docbook share/doc/HTML/en/kspread/advanced.docbook share/doc/HTML/en/kspread/basics.docbook @@ -4748,6 +4933,7 @@ share/doc/HTML/en/kword/formframe2.png share/doc/HTML/en/kword/formframe3.png share/doc/HTML/en/kword/formframe4.png share/doc/HTML/en/kword/formframe5.png +share/doc/HTML/en/kword/formframe6.png share/doc/HTML/en/kword/forminteg.png share/doc/HTML/en/kword/formllind.png share/doc/HTML/en/kword/formlrind.png @@ -4831,6 +5017,7 @@ share/doc/HTML/en/kword/opt2.png share/doc/HTML/en/kword/opt3.png share/doc/HTML/en/kword/opt4.png share/doc/HTML/en/kword/opt5.png +share/doc/HTML/en/kword/opt6.png share/doc/HTML/en/kword/optkb.png share/doc/HTML/en/kword/optkb2.png share/doc/HTML/en/kword/opttb.png @@ -5104,7 +5291,6 @@ share/services/kpresenter_mng_export.desktop share/services/kpresenter_ooimpress_export.desktop share/services/kpresenter_ooimpress_import.desktop share/services/kpresenter_png_export.desktop -share/services/kpresenter_powerpoint_import.desktop share/services/kpresenter_svg_export.desktop share/services/kpresenter_xbm_export.desktop share/services/kpresenter_xpm_export.desktop @@ -5119,6 +5305,7 @@ share/services/krita_magick_export.desktop share/services/krita_magick_import.desktop share/services/krita_openexr_export.desktop share/services/krita_openexr_import.desktop +share/services/krita_pdf_import.desktop share/services/krita_png_export.desktop share/services/krita_png_import.desktop share/services/krita_raw_import.desktop @@ -5127,6 +5314,9 @@ share/services/krita_rgb_f32_plugin.desktop share/services/krita_rgb_u16_plugin.desktop share/services/krita_tiff_export.desktop share/services/krita_tiff_import.desktop +share/services/krita_ycbcr_u16_plugin.desktop +share/services/krita_ycbcr_u8_plugin.desktop +share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop @@ -5139,16 +5329,23 @@ share/services/kritadefaulttools.desktop share/services/kritadropshadow.desktop share/services/kritaembossfilter.desktop share/services/kritaexample.desktop +share/services/kritaextensioncolorsfilters.desktop +share/services/kritafastcolortransfer.desktop share/services/kritafiltersgallery.desktop share/services/kritagrayplugin.desktop share/services/kritahistogram.desktop share/services/kritahistogramdocker.desktop share/services/kritaimageenhancement.desktop share/services/kritaimagesize.desktop +share/services/kritalenscorrectionfilter.desktop +share/services/kritalevelfilter.desktop +share/services/kritamodifyselection.desktop +share/services/kritanoisefilter.desktop share/services/kritaoilpaintfilter.desktop share/services/kritapart.desktop share/services/kritapixelizefilter.desktop share/services/kritaraindropsfilter.desktop +share/services/kritarandompickfilter.desktop share/services/kritargbplugin.desktop share/services/kritarotateimage.desktop share/services/kritaroundcornersfilter.desktop @@ -5158,15 +5355,20 @@ share/services/kritaselectiontools.desktop share/services/kritaseparatechannels.desktop share/services/kritashearimage.desktop share/services/kritasmalltilesfilter.desktop -share/services/kritasmearybrush.desktop share/services/kritasobelfilter.desktop +share/services/kritasubstrate.desktop share/services/kritatoolcrop.desktop +share/services/kritatoolcurves.desktop share/services/kritatoolfilter.desktop +share/services/kritatoolperspectivegrid.desktop +share/services/kritatoolperspectivetransform.desktop share/services/kritatoolpolygon.desktop share/services/kritatoolpolyline.desktop share/services/kritatoolselectsimilar.desktop share/services/kritatoolstar.desktop share/services/kritatooltransform.desktop +share/services/kritaunsharpfilter.desktop +share/services/kritawavefilter.desktop share/services/kritawetplugin.desktop share/services/kspread_applixspread_import.desktop share/services/kspread_csv_export.desktop @@ -5176,11 +5378,13 @@ share/services/kspread_excel_import.desktop share/services/kspread_gnumeric_export.desktop share/services/kspread_gnumeric_import.desktop share/services/kspread_html_export.desktop +share/services/kspread_kexi_import.desktop share/services/kspread_latex_export.desktop share/services/kspread_opencalc_export.desktop share/services/kspread_opencalc_import.desktop share/services/kspread_qpro_import.desktop share/services/kspreadpart.desktop +share/services/kspreadscripting.desktop share/services/kugar_kugar_import.desktop share/services/kugarpart.desktop share/services/kwmailmerge_kabc.desktop @@ -5215,6 +5419,7 @@ share/services/kword_wp_import.desktop share/services/kwordpart.desktop share/services/kwserialletter_classic.desktop share/services/kwserialletter_qtsqldb_power.desktop +share/services/ole_powerpoint97_import.desktop share/services/thesaurustool.desktop share/services/xslt_export.desktop share/services/xslt_import.desktop @@ -5384,6 +5589,9 @@ share/templates/TextDocument.desktop @dirrm share/apps/kspread/templates/Business @dirrm share/apps/kspread/templates @dirrm share/apps/kspread/sheetstyles +@dirrm share/apps/kspread/scripts/scripteditor +@dirrm share/apps/kspread/scripts/exporthtml +@dirrm share/apps/kspread/scripts @dirrm share/apps/kspread/kpartplugins @dirrm share/apps/kspread/icons/crystalsvg/scalable/actions @dirrm share/apps/kspread/icons/crystalsvg/scalable diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile index 99d12bd89bdb..5b2c53c82e80 100644 --- a/editors/koffice-kde4-l10n-ca/Makefile +++ b/editors/koffice-kde4-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-ca/distinfo b/editors/koffice-kde4-l10n-ca/distinfo index 5138bc7fcafb..64dc722ff740 100644 --- a/editors/koffice-kde4-l10n-ca/distinfo +++ b/editors/koffice-kde4-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 8e3ff02096b6574cf337430924d5af98 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 069f10ff118b9fdcb21ce37edd7cc6cf54184c2961868cdac5c1d606923a1658 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 524044 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist index 232a56980982..f9699d3b9475 100644 --- a/editors/koffice-kde4-l10n-ca/pkg-plist +++ b/editors/koffice-kde4-l10n-ca/pkg-plist @@ -15,16 +15,119 @@ share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kformula/common +share/doc/HTML/ca/kformula/index.cache.bz2 +share/doc/HTML/ca/kformula/index.docbook +share/doc/HTML/ca/kivio/common +share/doc/HTML/ca/kivio/credits.docbook +share/doc/HTML/ca/kivio/index.cache.bz2 +share/doc/HTML/ca/kivio/index.docbook +share/doc/HTML/ca/kivio/introduction.docbook +share/doc/HTML/ca/kivio/usage.docbook +share/doc/HTML/ca/kivio/working.docbook share/doc/HTML/ca/koffice/common share/doc/HTML/ca/koffice/index.cache.bz2 share/doc/HTML/ca/koffice/index.docbook share/doc/HTML/ca/koshell/common share/doc/HTML/ca/koshell/index.cache.bz2 share/doc/HTML/ca/koshell/index.docbook +share/doc/HTML/ca/kplato/commands.docbook +share/doc/HTML/ca/kplato/common +share/doc/HTML/ca/kplato/definitions.docbook +share/doc/HTML/ca/kplato/index.cache.bz2 +share/doc/HTML/ca/kplato/index.docbook +share/doc/HTML/ca/kplato/mainwindow.docbook +share/doc/HTML/ca/kplato/options.docbook +share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/faq.docbook +share/doc/HTML/ca/kpresenter/great-presentations.docbook +share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/menus.docbook +share/doc/HTML/ca/kpresenter/options.docbook +share/doc/HTML/ca/kpresenter/screen.docbook +share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/kspread/a11y.docbook +share/doc/HTML/ca/kspread/advanced.docbook +share/doc/HTML/ca/kspread/basics.docbook +share/doc/HTML/ca/kspread/cellformat0.png +share/doc/HTML/ca/kspread/cellformat1.png +share/doc/HTML/ca/kspread/cellformat2.png +share/doc/HTML/ca/kspread/cellformat3.png +share/doc/HTML/ca/kspread/cellformat4.png +share/doc/HTML/ca/kspread/cellformat5.png +share/doc/HTML/ca/kspread/cellformat6.png +share/doc/HTML/ca/kspread/cellformat7.png +share/doc/HTML/ca/kspread/cellprotection1.png +share/doc/HTML/ca/kspread/cellprotection2.png +share/doc/HTML/ca/kspread/commands.docbook +share/doc/HTML/ca/kspread/common +share/doc/HTML/ca/kspread/config.docbook +share/doc/HTML/ca/kspread/configdialog.docbook +share/doc/HTML/ca/kspread/configure1.png +share/doc/HTML/ca/kspread/configure2.png +share/doc/HTML/ca/kspread/configure3.png +share/doc/HTML/ca/kspread/configure4.png +share/doc/HTML/ca/kspread/configure5.png +share/doc/HTML/ca/kspread/configure6.png +share/doc/HTML/ca/kspread/faq.docbook +share/doc/HTML/ca/kspread/format.docbook +share/doc/HTML/ca/kspread/importexport.docbook +share/doc/HTML/ca/kspread/index.cache.bz2 +share/doc/HTML/ca/kspread/index.docbook +share/doc/HTML/ca/kspread/mousenav.png +share/doc/HTML/ca/kspread/newdocument.png +share/doc/HTML/ca/kspread/sheetproperties.png +share/doc/HTML/ca/kspread/shortcut1.png +share/doc/HTML/ca/kspread/shortcut2.png +share/doc/HTML/ca/kspread/shortcut3.png +share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kword/a11y.docbook +share/doc/HTML/ca/kword/basics.docbook +share/doc/HTML/ca/kword/bookmarks.docbook +share/doc/HTML/ca/kword/chapnumb.docbook +share/doc/HTML/ca/kword/columns.docbook +share/doc/HTML/ca/kword/common +share/doc/HTML/ca/kword/doccomments.docbook +share/doc/HTML/ca/kword/doclinks.docbook +share/doc/HTML/ca/kword/docstruct.docbook +share/doc/HTML/ca/kword/docvariables.docbook +share/doc/HTML/ca/kword/editing.docbook +share/doc/HTML/ca/kword/expressions.docbook +share/doc/HTML/ca/kword/footendnotes.docbook +share/doc/HTML/ca/kword/formatchar.docbook +share/doc/HTML/ca/kword/formatframes.docbook +share/doc/HTML/ca/kword/formatpara.docbook +share/doc/HTML/ca/kword/formulas.docbook +share/doc/HTML/ca/kword/frames.docbook +share/doc/HTML/ca/kword/fundimentals.docbook +share/doc/HTML/ca/kword/graphics.docbook +share/doc/HTML/ca/kword/headerfooter.docbook +share/doc/HTML/ca/kword/index.cache.bz2 +share/doc/HTML/ca/kword/index.docbook +share/doc/HTML/ca/kword/insertfile.docbook +share/doc/HTML/ca/kword/kparts.docbook +share/doc/HTML/ca/kword/lists.docbook +share/doc/HTML/ca/kword/mailmerge.docbook +share/doc/HTML/ca/kword/mbtb.docbook +share/doc/HTML/ca/kword/migrating.docbook +share/doc/HTML/ca/kword/opt.docbook +share/doc/HTML/ca/kword/pageformat.docbook +share/doc/HTML/ca/kword/storeprint.docbook +share/doc/HTML/ca/kword/styles.docbook +share/doc/HTML/ca/kword/table.docbook +share/doc/HTML/ca/kword/tabstops.docbook +share/doc/HTML/ca/kword/techinfo.docbook +share/doc/HTML/ca/kword/templatecreation.docbook +share/doc/HTML/ca/kword/toc.docbook +share/doc/HTML/ca/kword/tutorial.docbook +share/doc/HTML/ca/thesaurus/common +share/doc/HTML/ca/thesaurus/index.cache.bz2 +share/doc/HTML/ca/thesaurus/index.docbook share/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/kchart.mo +share/locale/ca/LC_MESSAGES/kdgantt.mo share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -51,8 +154,15 @@ share/locale/ca/LC_MESSAGES/kthesaurus.mo share/locale/ca/LC_MESSAGES/kugar.mo share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/ca/thesaurus +@dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/kpresenter +@dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell @dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kivio +@dirrm share/doc/HTML/ca/kformula @dirrm share/doc/HTML/ca/kexi @dirrm share/doc/HTML/ca/kchart @dirrm share/doc/HTML/ca/karbon diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile index 47c61c8df6cd..248790d56afc 100644 --- a/editors/koffice-kde4-l10n-da/Makefile +++ b/editors/koffice-kde4-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-da/distinfo b/editors/koffice-kde4-l10n-da/distinfo index ea0cfc7cacff..fb79a71beb1c 100644 --- a/editors/koffice-kde4-l10n-da/distinfo +++ b/editors/koffice-kde4-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 58c13527c47dee445572d26141fd3269 -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 407a8ae7d39ff0aec51f622285447dd200bd87a1f80257b8548c1c16c317fd21 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 1013226 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 diff --git a/editors/koffice-kde4-l10n-da/pkg-plist b/editors/koffice-kde4-l10n-da/pkg-plist index 03db1c115f7c..834334517175 100644 --- a/editors/koffice-kde4-l10n-da/pkg-plist +++ b/editors/koffice-kde4-l10n-da/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/da/kchart/index.docbook share/doc/HTML/da/kexi/basics.docbook share/doc/HTML/da/kexi/building.docbook share/doc/HTML/da/kexi/common +share/doc/HTML/da/kexi/comparing.docbook share/doc/HTML/da/kexi/configuration.docbook share/doc/HTML/da/kexi/credits.docbook share/doc/HTML/da/kexi/database.docbook +share/doc/HTML/da/kexi/designingforms.docbook +share/doc/HTML/da/kexi/enteringdataintotables.docbook +share/doc/HTML/da/kexi/enteringdatausingforms.docbook share/doc/HTML/da/kexi/index.cache.bz2 share/doc/HTML/da/kexi/index.docbook share/doc/HTML/da/kexi/intro.docbook share/doc/HTML/da/kexi/menus.docbook +share/doc/HTML/da/kexi/querydesigning.docbook share/doc/HTML/da/kformula/common share/doc/HTML/da/kformula/index.cache.bz2 share/doc/HTML/da/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/da/krita/commands-toolbars.docbook share/doc/HTML/da/krita/commands.docbook share/doc/HTML/da/krita/common share/doc/HTML/da/krita/credits.docbook +share/doc/HTML/da/krita/developers-plugins.docbook +share/doc/HTML/da/krita/developers-scripting.docbook share/doc/HTML/da/krita/developers.docbook share/doc/HTML/da/krita/faq.docbook share/doc/HTML/da/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook share/doc/HTML/da/krita/tutorial-starting.docbook +share/doc/HTML/da/krita/tutorial-tablet.docbook share/doc/HTML/da/krita/tutorial.docbook share/doc/HTML/da/krita/using-colorspaces.docbook share/doc/HTML/da/krita/using-filters.docbook +share/doc/HTML/da/krita/using-images.docbook share/doc/HTML/da/krita/using-layers.docbook share/doc/HTML/da/krita/using-selections.docbook +share/doc/HTML/da/krita/using-views.docbook share/doc/HTML/da/kspread/a11y.docbook share/doc/HTML/da/kspread/advanced.docbook share/doc/HTML/da/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo +share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile index 00dab794c8cf..19bbb0d828b6 100644 --- a/editors/koffice-kde4-l10n-el/Makefile +++ b/editors/koffice-kde4-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-el/distinfo b/editors/koffice-kde4-l10n-el/distinfo index d99d2f341307..0a977fd50dd0 100644 --- a/editors/koffice-kde4-l10n-el/distinfo +++ b/editors/koffice-kde4-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 4392e652560adb8c83fe2aac9479fcb8 -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 94ea30d6c2c1968d216a6bb81c368f2ec68aab473d68450ea6c69818f737ecc0 -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 367648 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 diff --git a/editors/koffice-kde4-l10n-el/pkg-plist b/editors/koffice-kde4-l10n-el/pkg-plist index 423a32aa7c81..46c436194e10 100644 --- a/editors/koffice-kde4-l10n-el/pkg-plist +++ b/editors/koffice-kde4-l10n-el/pkg-plist @@ -2,6 +2,7 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo +share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile index 2aa1fd93bb12..cb490bb940b4 100644 --- a/editors/koffice-kde4-l10n-en_GB/Makefile +++ b/editors/koffice-kde4-l10n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-en_GB/distinfo b/editors/koffice-kde4-l10n-en_GB/distinfo index 28cf71ee2884..97a08e6f157e 100644 --- a/editors/koffice-kde4-l10n-en_GB/distinfo +++ b/editors/koffice-kde4-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 11b499953ae1616c589e793abc4e474b -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 2e0630762213c90b14759e0c2a61633ee25554f83ea9617836775860a62f7880 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 341916 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 diff --git a/editors/koffice-kde4-l10n-en_GB/pkg-plist b/editors/koffice-kde4-l10n-en_GB/pkg-plist index adbbd5d4d225..0e783dd7b5e1 100644 --- a/editors/koffice-kde4-l10n-en_GB/pkg-plist +++ b/editors/koffice-kde4-l10n-en_GB/pkg-plist @@ -15,6 +15,7 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo +share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile index fe268dca1e63..1683f36421bd 100644 --- a/editors/koffice-kde4-l10n-es/Makefile +++ b/editors/koffice-kde4-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-es/distinfo b/editors/koffice-kde4-l10n-es/distinfo index 5aedacd37629..96a86103ba37 100644 --- a/editors/koffice-kde4-l10n-es/distinfo +++ b/editors/koffice-kde4-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 7bfea102b91490128779465db13e7a6d9a2a1908e109ec98076da469129a1308 -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 17190560 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 diff --git a/editors/koffice-kde4-l10n-es/pkg-plist b/editors/koffice-kde4-l10n-es/pkg-plist index a02bdd2b7e9d..de46c53cba38 100644 --- a/editors/koffice-kde4-l10n-es/pkg-plist +++ b/editors/koffice-kde4-l10n-es/pkg-plist @@ -1,5 +1,4 @@ share/apps/koffice/autocorrect/es.xml -share/doc/HTML/es/api/kfontdialog.png share/doc/HTML/es/karbon/common share/doc/HTML/es/karbon/index.cache.bz2 share/doc/HTML/es/karbon/index.docbook @@ -44,10 +43,12 @@ share/doc/HTML/es/kchart/shortcut.png share/doc/HTML/es/kchart/toolbars.png share/doc/HTML/es/kexi/basics.docbook share/doc/HTML/es/kexi/building.docbook +share/doc/HTML/es/kexi/comparing.docbook share/doc/HTML/es/kexi/configuration.docbook share/doc/HTML/es/kexi/contact-example.png share/doc/HTML/es/kexi/credits.docbook share/doc/HTML/es/kexi/database.docbook +share/doc/HTML/es/kexi/enteringdataintotables.docbook share/doc/HTML/es/kexi/intro.docbook share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png @@ -102,6 +103,7 @@ share/doc/HTML/es/koshell/main-view.png share/doc/HTML/es/koshell/new-dialog.png share/doc/HTML/es/koshell/side-pane.png share/doc/HTML/es/kplato/commands.docbook +share/doc/HTML/es/kplato/common share/doc/HTML/es/kplato/configure-wbs.png share/doc/HTML/es/kplato/configure2.1.png share/doc/HTML/es/kplato/configure2.png @@ -114,6 +116,8 @@ share/doc/HTML/es/kplato/edit-calendar2.png share/doc/HTML/es/kplato/edit-resources.png share/doc/HTML/es/kplato/edit-resources1.png share/doc/HTML/es/kplato/edit-worktime.png +share/doc/HTML/es/kplato/index.cache.bz2 +share/doc/HTML/es/kplato/index.docbook share/doc/HTML/es/kplato/mainwindow.docbook share/doc/HTML/es/kplato/mainwindow1.png share/doc/HTML/es/kplato/options.docbook @@ -236,6 +240,7 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook +share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -284,6 +289,8 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png +share/doc/HTML/es/krita/index.cache.bz2 +share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -720,6 +727,7 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo +share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo @@ -760,6 +768,5 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kexi @dirrm share/doc/HTML/es/kchart @dirrm share/doc/HTML/es/karbon -@dirrm share/doc/HTML/es/api @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/koffice-kde4-l10n-et/Makefile b/editors/koffice-kde4-l10n-et/Makefile index c0ba82e8d416..371637a8a638 100644 --- a/editors/koffice-kde4-l10n-et/Makefile +++ b/editors/koffice-kde4-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-et/distinfo b/editors/koffice-kde4-l10n-et/distinfo index 74cb277ae6f8..cab102edda59 100644 --- a/editors/koffice-kde4-l10n-et/distinfo +++ b/editors/koffice-kde4-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = fed89528182c0dc7baa2c50fee165270 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 8e78fe330053cc72f843475ca4771a6bdef5bc7d4e22cf15172584beabf30fad -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 1139684 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 diff --git a/editors/koffice-kde4-l10n-et/pkg-plist b/editors/koffice-kde4-l10n-et/pkg-plist index a36be5654b99..42a8b9044ec5 100644 --- a/editors/koffice-kde4-l10n-et/pkg-plist +++ b/editors/koffice-kde4-l10n-et/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/et/kchart/index.docbook share/doc/HTML/et/kexi/basics.docbook share/doc/HTML/et/kexi/building.docbook share/doc/HTML/et/kexi/common +share/doc/HTML/et/kexi/comparing.docbook share/doc/HTML/et/kexi/configuration.docbook share/doc/HTML/et/kexi/credits.docbook share/doc/HTML/et/kexi/database.docbook +share/doc/HTML/et/kexi/designingforms.docbook +share/doc/HTML/et/kexi/enteringdataintotables.docbook +share/doc/HTML/et/kexi/enteringdatausingforms.docbook share/doc/HTML/et/kexi/index.cache.bz2 share/doc/HTML/et/kexi/index.docbook share/doc/HTML/et/kexi/intro.docbook share/doc/HTML/et/kexi/menus.docbook +share/doc/HTML/et/kexi/querydesigning.docbook share/doc/HTML/et/kformula/common share/doc/HTML/et/kformula/index.cache.bz2 share/doc/HTML/et/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/et/krita/commands-toolbars.docbook share/doc/HTML/et/krita/commands.docbook share/doc/HTML/et/krita/common share/doc/HTML/et/krita/credits.docbook +share/doc/HTML/et/krita/developers-plugins.docbook +share/doc/HTML/et/krita/developers-scripting.docbook share/doc/HTML/et/krita/developers.docbook share/doc/HTML/et/krita/faq.docbook share/doc/HTML/et/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/et/krita/settings.docbook share/doc/HTML/et/krita/tutorial-quick-starts.docbook share/doc/HTML/et/krita/tutorial-select-layer.docbook share/doc/HTML/et/krita/tutorial-starting.docbook +share/doc/HTML/et/krita/tutorial-tablet.docbook share/doc/HTML/et/krita/tutorial.docbook share/doc/HTML/et/krita/using-colorspaces.docbook share/doc/HTML/et/krita/using-filters.docbook +share/doc/HTML/et/krita/using-images.docbook share/doc/HTML/et/krita/using-layers.docbook share/doc/HTML/et/krita/using-selections.docbook +share/doc/HTML/et/krita/using-views.docbook share/doc/HTML/et/kspread/a11y.docbook share/doc/HTML/et/kspread/advanced.docbook share/doc/HTML/et/kspread/basics.docbook @@ -148,6 +158,7 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo +share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile index 3549b46cc8ed..7f8a39972722 100644 --- a/editors/koffice-kde4-l10n-it/Makefile +++ b/editors/koffice-kde4-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-it/distinfo b/editors/koffice-kde4-l10n-it/distinfo index dc9a385818d7..9f417dfc625c 100644 --- a/editors/koffice-kde4-l10n-it/distinfo +++ b/editors/koffice-kde4-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9658442039b455e52cf68599e3250f54 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9a0a25a0ccc62c1d45d16ffb969e3146e1d7f7a2939407c542c2fffddb78b71f -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 1550186 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist index 81da090823f6..ac3627f19ced 100644 --- a/editors/koffice-kde4-l10n-it/pkg-plist +++ b/editors/koffice-kde4-l10n-it/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kexi/basics.docbook share/doc/HTML/it/kexi/building.docbook share/doc/HTML/it/kexi/common +share/doc/HTML/it/kexi/comparing.docbook share/doc/HTML/it/kexi/configuration.docbook share/doc/HTML/it/kexi/credits.docbook share/doc/HTML/it/kexi/database.docbook +share/doc/HTML/it/kexi/designingforms.docbook +share/doc/HTML/it/kexi/enteringdataintotables.docbook +share/doc/HTML/it/kexi/enteringdatausingforms.docbook share/doc/HTML/it/kexi/index.cache.bz2 share/doc/HTML/it/kexi/index.docbook share/doc/HTML/it/kexi/intro.docbook share/doc/HTML/it/kexi/menus.docbook +share/doc/HTML/it/kexi/querydesigning.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook @@ -57,22 +62,26 @@ share/doc/HTML/it/krita/commands-toolbars.docbook share/doc/HTML/it/krita/commands.docbook share/doc/HTML/it/krita/common share/doc/HTML/it/krita/credits.docbook +share/doc/HTML/it/krita/developers-plugins.docbook +share/doc/HTML/it/krita/developers-scripting.docbook share/doc/HTML/it/krita/developers.docbook share/doc/HTML/it/krita/faq.docbook share/doc/HTML/it/krita/index.cache.bz2 share/doc/HTML/it/krita/index.docbook share/doc/HTML/it/krita/installation.docbook share/doc/HTML/it/krita/introduction.docbook -share/doc/HTML/it/krita/scripting.docbook share/doc/HTML/it/krita/settings.docbook share/doc/HTML/it/krita/tutorial-quick-starts.docbook share/doc/HTML/it/krita/tutorial-select-layer.docbook share/doc/HTML/it/krita/tutorial-starting.docbook +share/doc/HTML/it/krita/tutorial-tablet.docbook share/doc/HTML/it/krita/tutorial.docbook share/doc/HTML/it/krita/using-colorspaces.docbook share/doc/HTML/it/krita/using-filters.docbook +share/doc/HTML/it/krita/using-images.docbook share/doc/HTML/it/krita/using-layers.docbook share/doc/HTML/it/krita/using-selections.docbook +share/doc/HTML/it/krita/using-views.docbook share/doc/HTML/it/kspread/a11y.docbook share/doc/HTML/it/kspread/advanced.docbook share/doc/HTML/it/kspread/basics.docbook @@ -170,6 +179,7 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo +share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile index 4e111dae8f7f..ca57ae929f6d 100644 --- a/editors/koffice-kde4-l10n-nb/Makefile +++ b/editors/koffice-kde4-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo index 3b1c0a14407b..a75ee96d5fcf 100644 --- a/editors/koffice-kde4-l10n-nb/distinfo +++ b/editors/koffice-kde4-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 02adef48c63e4a9f87fed63cefb19d1d -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 2eef79ddae5815c778684ad0cc0f7eb23d46f6f4929aea78f15c75b7d911476c -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 368950 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist index 56cd255ecfe9..febc3638272c 100644 --- a/editors/koffice-kde4-l10n-nb/pkg-plist +++ b/editors/koffice-kde4-l10n-nb/pkg-plist @@ -2,6 +2,7 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo +share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile index 04aeaa72ffb2..0973f3e6e064 100644 --- a/editors/koffice-kde4-l10n-nl/Makefile +++ b/editors/koffice-kde4-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-nl/distinfo b/editors/koffice-kde4-l10n-nl/distinfo index 9cbf82513851..65ecfeb4b961 100644 --- a/editors/koffice-kde4-l10n-nl/distinfo +++ b/editors/koffice-kde4-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 9847ff8d7dbddf4c2f1ae4a6cb0694d1 -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 10a856ed3bb2090691ee2f3695d631a2bb242a140eab54351fd94eb02335b4f9 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 3270123 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 diff --git a/editors/koffice-kde4-l10n-nl/pkg-plist b/editors/koffice-kde4-l10n-nl/pkg-plist index 62ad8f9c5997..40a6e68057bd 100644 --- a/editors/koffice-kde4-l10n-nl/pkg-plist +++ b/editors/koffice-kde4-l10n-nl/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/nl/kchart/index.docbook share/doc/HTML/nl/kexi/basics.docbook share/doc/HTML/nl/kexi/building.docbook share/doc/HTML/nl/kexi/common +share/doc/HTML/nl/kexi/comparing.docbook share/doc/HTML/nl/kexi/configuration.docbook share/doc/HTML/nl/kexi/credits.docbook share/doc/HTML/nl/kexi/database.docbook +share/doc/HTML/nl/kexi/designingforms.docbook +share/doc/HTML/nl/kexi/enteringdataintotables.docbook +share/doc/HTML/nl/kexi/enteringdatausingforms.docbook share/doc/HTML/nl/kexi/index.cache.bz2 share/doc/HTML/nl/kexi/index.docbook share/doc/HTML/nl/kexi/intro.docbook share/doc/HTML/nl/kexi/menus.docbook +share/doc/HTML/nl/kexi/querydesigning.docbook share/doc/HTML/nl/kformula/additional_fonts1.png share/doc/HTML/nl/kformula/ambiguous-string.png share/doc/HTML/nl/kformula/common @@ -146,6 +151,8 @@ share/doc/HTML/nl/krita/commands-toolbars.docbook share/doc/HTML/nl/krita/commands.docbook share/doc/HTML/nl/krita/common share/doc/HTML/nl/krita/credits.docbook +share/doc/HTML/nl/krita/developers-plugins.docbook +share/doc/HTML/nl/krita/developers-scripting.docbook share/doc/HTML/nl/krita/developers.docbook share/doc/HTML/nl/krita/faq.docbook share/doc/HTML/nl/krita/index.cache.bz2 @@ -157,11 +164,14 @@ share/doc/HTML/nl/krita/settings.docbook share/doc/HTML/nl/krita/tutorial-quick-starts.docbook share/doc/HTML/nl/krita/tutorial-select-layer.docbook share/doc/HTML/nl/krita/tutorial-starting.docbook +share/doc/HTML/nl/krita/tutorial-tablet.docbook share/doc/HTML/nl/krita/tutorial.docbook share/doc/HTML/nl/krita/using-colorspaces.docbook share/doc/HTML/nl/krita/using-filters.docbook +share/doc/HTML/nl/krita/using-images.docbook share/doc/HTML/nl/krita/using-layers.docbook share/doc/HTML/nl/krita/using-selections.docbook +share/doc/HTML/nl/krita/using-views.docbook share/doc/HTML/nl/kspread/a11y.docbook share/doc/HTML/nl/kspread/advanced.docbook share/doc/HTML/nl/kspread/basics.docbook @@ -462,6 +472,7 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo +share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile index 2dfe5de3c96e..a41463e11c3c 100644 --- a/editors/koffice-kde4-l10n-sv/Makefile +++ b/editors/koffice-kde4-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-sv/distinfo b/editors/koffice-kde4-l10n-sv/distinfo index c6c36bca9a65..57649992cc47 100644 --- a/editors/koffice-kde4-l10n-sv/distinfo +++ b/editors/koffice-kde4-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 83f73110f60ef4b5f633e3cca0dd4e12 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 1bd9c91f93cd99c81802efb7856ce55dcde18502770f24617647c8487005dd58 -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 5965263 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 diff --git a/editors/koffice-kde4-l10n-sv/pkg-plist b/editors/koffice-kde4-l10n-sv/pkg-plist index 57b962dbd819..0f24d03f2f32 100644 --- a/editors/koffice-kde4-l10n-sv/pkg-plist +++ b/editors/koffice-kde4-l10n-sv/pkg-plist @@ -36,14 +36,19 @@ share/doc/HTML/sv/kchart/toolbars.png share/doc/HTML/sv/kexi/basics.docbook share/doc/HTML/sv/kexi/building.docbook share/doc/HTML/sv/kexi/common +share/doc/HTML/sv/kexi/comparing.docbook share/doc/HTML/sv/kexi/configuration.docbook share/doc/HTML/sv/kexi/contact-example.png share/doc/HTML/sv/kexi/credits.docbook share/doc/HTML/sv/kexi/database.docbook +share/doc/HTML/sv/kexi/designingforms.docbook +share/doc/HTML/sv/kexi/enteringdataintotables.docbook +share/doc/HTML/sv/kexi/enteringdatausingforms.docbook share/doc/HTML/sv/kexi/index.cache.bz2 share/doc/HTML/sv/kexi/index.docbook share/doc/HTML/sv/kexi/intro.docbook share/doc/HTML/sv/kexi/menus.docbook +share/doc/HTML/sv/kexi/querydesigning.docbook share/doc/HTML/sv/kformula/additional_fonts1.png share/doc/HTML/sv/kformula/ambiguous-string.png share/doc/HTML/sv/kformula/common @@ -227,12 +232,17 @@ share/doc/HTML/sv/krita/commands.docbook share/doc/HTML/sv/krita/common share/doc/HTML/sv/krita/createdocument.png share/doc/HTML/sv/krita/credits.docbook +share/doc/HTML/sv/krita/developers-plugins.docbook +share/doc/HTML/sv/krita/developers-scripting.docbook share/doc/HTML/sv/krita/developers.docbook share/doc/HTML/sv/krita/dialogs-addpalette.png +share/doc/HTML/sv/krita/dialogs-blur.png share/doc/HTML/sv/krita/dialogs-brightnesscontrast.png share/doc/HTML/sv/krita/dialogs-bumpmap.png share/doc/HTML/sv/krita/dialogs-coloradjustment.png share/doc/HTML/sv/krita/dialogs-colorrange.png +share/doc/HTML/sv/krita/dialogs-colortoalpha.png +share/doc/HTML/sv/krita/dialogs-colortransfer.png share/doc/HTML/sv/krita/dialogs-convertimagetype.png share/doc/HTML/sv/krita/dialogs-convertlayertype.png share/doc/HTML/sv/krita/dialogs-cubism.png @@ -241,22 +251,33 @@ share/doc/HTML/sv/krita/dialogs-documentinformation.png share/doc/HTML/sv/krita/dialogs-dropshadow.png share/doc/HTML/sv/krita/dialogs-emboss.png share/doc/HTML/sv/krita/dialogs-filtersgallery.png +share/doc/HTML/sv/krita/dialogs-gaussiannoise.png share/doc/HTML/sv/krita/dialogs-histogram.png share/doc/HTML/sv/krita/dialogs-imageproperties.png +share/doc/HTML/sv/krita/dialogs-imagerestoration.png share/doc/HTML/sv/krita/dialogs-imagesize.png share/doc/HTML/sv/krita/dialogs-layerproperties.png share/doc/HTML/sv/krita/dialogs-layersize.png +share/doc/HTML/sv/krita/dialogs-lenscorrection.png share/doc/HTML/sv/krita/dialogs-newadjustmentlayer.png share/doc/HTML/sv/krita/dialogs-newlayer.png share/doc/HTML/sv/krita/dialogs-oilpaint.png share/doc/HTML/sv/krita/dialogs-pixelize.png share/doc/HTML/sv/krita/dialogs-raindrops.png +share/doc/HTML/sv/krita/dialogs-randomnoise.png +share/doc/HTML/sv/krita/dialogs-randompick.png share/doc/HTML/sv/krita/dialogs-rotateimage.png share/doc/HTML/sv/krita/dialogs-rotatelayer.png share/doc/HTML/sv/krita/dialogs-roundcorners.png share/doc/HTML/sv/krita/dialogs-separateimage.png share/doc/HTML/sv/krita/dialogs-shearimage.png share/doc/HTML/sv/krita/dialogs-shearlayer.png +share/doc/HTML/sv/krita/dialogs-smalltiles.png +share/doc/HTML/sv/krita/dialogs-sobel.png +share/doc/HTML/sv/krita/dialogs-substrate.png +share/doc/HTML/sv/krita/dialogs-unsharpmask.png +share/doc/HTML/sv/krita/dialogs-wave.png +share/doc/HTML/sv/krita/dialogs-waveletnoise.png share/doc/HTML/sv/krita/faq.docbook share/doc/HTML/sv/krita/filters-customconvolution.png share/doc/HTML/sv/krita/gotchi.png @@ -329,11 +350,14 @@ share/doc/HTML/sv/krita/tutorial-select-layer-8.png share/doc/HTML/sv/krita/tutorial-select-layer-9.png share/doc/HTML/sv/krita/tutorial-select-layer.docbook share/doc/HTML/sv/krita/tutorial-starting.docbook +share/doc/HTML/sv/krita/tutorial-tablet.docbook share/doc/HTML/sv/krita/tutorial.docbook share/doc/HTML/sv/krita/using-colorspaces.docbook share/doc/HTML/sv/krita/using-filters.docbook +share/doc/HTML/sv/krita/using-images.docbook share/doc/HTML/sv/krita/using-layers.docbook share/doc/HTML/sv/krita/using-selections.docbook +share/doc/HTML/sv/krita/using-views.docbook share/doc/HTML/sv/kspread/a11y.docbook share/doc/HTML/sv/kspread/advanced.docbook share/doc/HTML/sv/kspread/basics.docbook @@ -608,6 +632,7 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo +share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile index 7e3333a820b6..7fbbde696c26 100644 --- a/editors/koffice-kde4-l10n-tr/Makefile +++ b/editors/koffice-kde4-l10n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-kde4-l10n-tr/distinfo b/editors/koffice-kde4-l10n-tr/distinfo index 58c8a1243afa..8391191c7b6d 100644 --- a/editors/koffice-kde4-l10n-tr/distinfo +++ b/editors/koffice-kde4-l10n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 6b7df893cae7725ca94979a4dcd73edf -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 0b6ed62326265302a06cc5874ff27b1a38bab13c1a5f195b216e37634bfc9be8 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 350945 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 diff --git a/editors/koffice-kde4-l10n-tr/pkg-plist b/editors/koffice-kde4-l10n-tr/pkg-plist index 590ad1345397..265074fd8d3e 100644 --- a/editors/koffice-kde4-l10n-tr/pkg-plist +++ b/editors/koffice-kde4-l10n-tr/pkg-plist @@ -2,7 +2,10 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo +share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo +share/locale/tr/LC_MESSAGES/kfile_abiword.mo +share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo share/locale/tr/LC_MESSAGES/kfile_koffice.mo share/locale/tr/LC_MESSAGES/kfile_ooo.mo share/locale/tr/LC_MESSAGES/kformdesigner.mo @@ -11,8 +14,10 @@ share/locale/tr/LC_MESSAGES/kivio.mo share/locale/tr/LC_MESSAGES/koconverter.mo share/locale/tr/LC_MESSAGES/koffice.mo share/locale/tr/LC_MESSAGES/kofficefilters.mo +share/locale/tr/LC_MESSAGES/koproperty.mo share/locale/tr/LC_MESSAGES/koshell.mo share/locale/tr/LC_MESSAGES/kounavail.mo +share/locale/tr/LC_MESSAGES/kplato.mo share/locale/tr/LC_MESSAGES/kpresenter.mo share/locale/tr/LC_MESSAGES/krita.mo share/locale/tr/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile index 4df487a14bda..bd8bae7d81c3 100644 --- a/editors/koffice-kde4-l10n/Makefile +++ b/editors/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 6f27fc720383..9cb07045d1ed 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} @@ -16,15 +16,16 @@ DIST_SUBDIR= KDE/koffice MAINTAINER= kde@FreeBSD.org COMMENT= Office Suite for KDE3 -BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx \ - Magick-config:${PORTSDIR}/graphics/ImageMagick -LIB_DEPENDS= art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx +LIB_DEPENDS= GraphicsMagick++:${PORTSDIR}/graphics/GraphicsMagick \ + art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ aspell:${PORTSDIR}/textproc/aspell \ exif.12:${PORTSDIR}/graphics/libexif \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ freetype:${PORTSDIR}/print/freetype2 \ lcms:${PORTSDIR}/graphics/lcms \ paper:${PORTSDIR}/print/libpaper \ + poppler-qt:${PORTSDIR}/graphics/poppler-qt \ wpd-0.8:${PORTSDIR}/textproc/libwpd \ wv2:${PORTSDIR}/textproc/wv2 \ xml2:${PORTSDIR}/textproc/libxml2 \ @@ -46,7 +47,9 @@ USE_PGSQL= yes .include <bsd.port.pre.mk> CONFIGURE_ARGS+=--with-pgsqlincdir=${LOCALBASE}/include \ - --with-pgsqllibdir=${LOCALBASE}/lib + --with-pgsqllibdir=${LOCALBASE}/lib \ + --with-pqxx-includes=${LOCALBASE}/include \ + --with-pqxx-libraries=${LOCALBASE}/lib .if ${OSVERSION} < 500035 EXTRA_PATCHES= ${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp @@ -63,6 +66,14 @@ post-configure: ${WRKSRC}/kchart/kdchart/Makefile \ ${WRKSRC}/kexi/kexidb/drivers/pqxx/Makefile \ ${WRKSRC}/kexi/migration/pqxx/Makefile + ${REINPLACE_CMD} -e 's|round(|rint(|g' \ + ${WRKSRC}/krita/plugins/filters/levelfilter/kgradientslider.cc + ${REINPLACE_CMD} -e 's|-O[s23]||g' -e 's|-O|-O0|g' \ + ${WRKSRC}/krita/plugins/filters/cimg/Makefile + ${REINPLACE_CMD} -e 's|xor|^|g' \ + ${WRKSRC}/kspread/kspread_style.cc + ${REINPLACE_CMD} -e 's|trunc(|rint(|g' \ + ${WRKSRC}/kchart/kdchart/KDChartAxesPainter.cpp .endif .include <bsd.port.post.mk> diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 746a0be2c24d..04ee84201ab5 100644 --- a/editors/koffice-kde4/distinfo +++ b/editors/koffice-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2 -SHA256 (KDE/koffice/koffice-1.5.2.tar.bz2) = d57d8a7611337f2678a7e28b100b9ab64148bf5483c01dbd204529f07b148611 -SIZE (KDE/koffice/koffice-1.5.2.tar.bz2) = 35878218 +MD5 (KDE/koffice/koffice-1.6.1.tar.bz2) = f7b90b46b79019edc60761a6bff2d387 +SHA256 (KDE/koffice/koffice-1.6.1.tar.bz2) = 5505a6c54009dd0cb75a3770c3daa476154958f92692ca0748b1842d9cd6e728 +SIZE (KDE/koffice/koffice-1.6.1.tar.bz2) = 56999028 diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb-preparedstatement.cpp b/editors/koffice-kde4/files/patch-kexi_kexidb-preparedstatement.cpp deleted file mode 100644 index 2f0cd77eaa23..000000000000 --- a/editors/koffice-kde4/files/patch-kexi_kexidb-preparedstatement.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kexi/kexidb/preparedstatement.cpp.orig Thu May 25 15:55:54 2006 -+++ kexi/kexidb/preparedstatement.cpp Thu May 25 16:02:59 2006 -@@ -104,7 +104,7 @@ - } - s.append(")"); - s.prepend(QCString("INSERT INTO ") + table->name().latin1() -- + (allTableFieldsUsed ? "" : (" (" + namesList + ")")) -+ + (allTableFieldsUsed ? QCString("") : (" (" + namesList + ")")) - + " VALUES ("); - } - return s; diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index 00888ba57513..23edb3d4c816 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -19,19 +19,25 @@ bin/kudesigner bin/kugar bin/kword include/KDChartAxisParams.h +include/KDChartAxisParamsWrapper.h include/KDChartCustomBox.h +include/KDChartCustomBoxWrapper.h include/KDChartDataIntern.h include/KDChartDataRegion.h include/KDChartEnums.h include/KDChartGlobal.h include/KDChartListTable.h +include/KDChartObjectFactory.h include/KDChartParams.h +include/KDChartParamsWrapper.h include/KDChartPropertySet.h include/KDChartTable.h include/KDChartTableBase.h +include/KDChartTableDataWrapper.h include/KDChartTextPiece.h include/KDChartVectorTable.h include/KDChartWidget.h +include/KDChartWrapperFactory.h include/KDFrame.h include/KDFrameProfileSection.h include/KoApplication.h @@ -126,12 +132,15 @@ include/kexidb/object.h include/kexidb/parser.h include/kexidb/preparedstatement.h include/kexidb/queryschema.h +include/kexidb/queryschemaparameter.h include/kexidb/relationship.h include/kexidb/schemadata.h include/kexidb/tableschema.h include/kexidb/transaction.h include/kexiutils/identifier.h include/kexiutils/kexiutils_export.h +include/kexiutils/longlongvalidator.h +include/kexiutils/styleproxy.h include/kexiutils/tristate.h include/kexiutils/utils.h include/kexiutils/validator.h @@ -146,7 +155,6 @@ include/kis_basic_histogram_producers.h include/kis_boundary.h include/kis_brush.h include/kis_button_event.h -include/kis_button_press_event.h include/kis_button_release_event.h include/kis_canvas_controller.h include/kis_canvas_observer.h @@ -204,7 +212,6 @@ include/kis_iteratorpixeltrait.h include/kis_iterators_pixel.h include/kis_label_zoom.h include/kis_layer.h -include/kis_layer_visitor.h include/kis_layerbox.h include/kis_layerlist.h include/kis_matrix_widget.ui.h @@ -217,7 +224,6 @@ include/kis_nameserver.h include/kis_opengl_image_context.h include/kis_paint_device.h include/kis_paint_device_iface.h -include/kis_paint_layer.h include/kis_painter.h include/kis_paintop.h include/kis_paintop_box.h @@ -225,6 +231,7 @@ include/kis_paintop_registry.h include/kis_palette.h include/kis_palette_widget.h include/kis_pattern.h +include/kis_perspective_math.h include/kis_point.h include/kis_previewdialog.h include/kis_previewwidget.h @@ -233,8 +240,10 @@ include/kis_progress_display_interface.h include/kis_progress_subject.h include/kis_rect.h include/kis_resource.h +include/kis_scale_visitor.h include/kis_selection.h include/kis_shared_ptr_vector.h +include/kis_substrate.h include/kis_tileddatamanager.h include/kis_tool.h include/kis_tool_controller.h @@ -259,7 +268,6 @@ include/kobirdeyepanel.h include/koffice_export.h include/kofficeversion.h include/kopalettemanager.h -include/kross/api/argument.h include/kross/api/callable.h include/kross/api/class.h include/kross/api/dict.h @@ -433,6 +441,15 @@ lib/kde3/krita_rgb_f32_plugin.so lib/kde3/krita_rgb_u16_plugin.a lib/kde3/krita_rgb_u16_plugin.la lib/kde3/krita_rgb_u16_plugin.so +lib/kde3/krita_ycbcr_u16_plugin.a +lib/kde3/krita_ycbcr_u16_plugin.la +lib/kde3/krita_ycbcr_u16_plugin.so +lib/kde3/krita_ycbcr_u8_plugin.a +lib/kde3/krita_ycbcr_u8_plugin.la +lib/kde3/krita_ycbcr_u8_plugin.so +lib/kde3/kritablurfilter.a +lib/kde3/kritablurfilter.la +lib/kde3/kritablurfilter.so lib/kde3/kritabumpmap.a lib/kde3/kritabumpmap.la lib/kde3/kritabumpmap.so @@ -469,6 +486,12 @@ lib/kde3/kritaembossfilter.so lib/kde3/kritaexample.a lib/kde3/kritaexample.la lib/kde3/kritaexample.so +lib/kde3/kritaextensioncolorsfilters.a +lib/kde3/kritaextensioncolorsfilters.la +lib/kde3/kritaextensioncolorsfilters.so +lib/kde3/kritafastcolortransfer.a +lib/kde3/kritafastcolortransfer.la +lib/kde3/kritafastcolortransfer.so lib/kde3/kritafiltersgallery.a lib/kde3/kritafiltersgallery.la lib/kde3/kritafiltersgallery.so @@ -487,6 +510,18 @@ lib/kde3/kritaimageenhancement.so lib/kde3/kritaimagesize.a lib/kde3/kritaimagesize.la lib/kde3/kritaimagesize.so +lib/kde3/kritalenscorrectionfilter.a +lib/kde3/kritalenscorrectionfilter.la +lib/kde3/kritalenscorrectionfilter.so +lib/kde3/kritalevelfilter.a +lib/kde3/kritalevelfilter.la +lib/kde3/kritalevelfilter.so +lib/kde3/kritamodifyselection.a +lib/kde3/kritamodifyselection.la +lib/kde3/kritamodifyselection.so +lib/kde3/kritanoisefilter.a +lib/kde3/kritanoisefilter.la +lib/kde3/kritanoisefilter.so lib/kde3/kritaoilpaintfilter.a lib/kde3/kritaoilpaintfilter.la lib/kde3/kritaoilpaintfilter.so @@ -496,6 +531,9 @@ lib/kde3/kritapixelizefilter.so lib/kde3/kritaraindropsfilter.a lib/kde3/kritaraindropsfilter.la lib/kde3/kritaraindropsfilter.so +lib/kde3/kritarandompickfilter.a +lib/kde3/kritarandompickfilter.la +lib/kde3/kritarandompickfilter.so lib/kde3/kritargbplugin.a lib/kde3/kritargbplugin.la lib/kde3/kritargbplugin.so @@ -523,18 +561,27 @@ lib/kde3/kritashearimage.so lib/kde3/kritasmalltilesfilter.a lib/kde3/kritasmalltilesfilter.la lib/kde3/kritasmalltilesfilter.so -lib/kde3/kritasmearybrush.a -lib/kde3/kritasmearybrush.la -lib/kde3/kritasmearybrush.so lib/kde3/kritasobelfilter.a lib/kde3/kritasobelfilter.la lib/kde3/kritasobelfilter.so +lib/kde3/kritasubstrate.a +lib/kde3/kritasubstrate.la +lib/kde3/kritasubstrate.so lib/kde3/kritatoolcrop.a lib/kde3/kritatoolcrop.la lib/kde3/kritatoolcrop.so +lib/kde3/kritatoolcurves.a +lib/kde3/kritatoolcurves.la +lib/kde3/kritatoolcurves.so lib/kde3/kritatoolfilter.a lib/kde3/kritatoolfilter.la lib/kde3/kritatoolfilter.so +lib/kde3/kritatoolperspectivegrid.a +lib/kde3/kritatoolperspectivegrid.la +lib/kde3/kritatoolperspectivegrid.so +lib/kde3/kritatoolperspectivetransform.a +lib/kde3/kritatoolperspectivetransform.la +lib/kde3/kritatoolperspectivetransform.so lib/kde3/kritatoolpolygon.a lib/kde3/kritatoolpolygon.la lib/kde3/kritatoolpolygon.so @@ -550,6 +597,12 @@ lib/kde3/kritatoolstar.so lib/kde3/kritatooltransform.a lib/kde3/kritatooltransform.la lib/kde3/kritatooltransform.so +lib/kde3/kritaunsharpfilter.a +lib/kde3/kritaunsharpfilter.la +lib/kde3/kritaunsharpfilter.so +lib/kde3/kritawavefilter.a +lib/kde3/kritawavefilter.la +lib/kde3/kritawavefilter.so lib/kde3/kritawetplugin.a lib/kde3/kritawetplugin.la lib/kde3/kritawetplugin.so @@ -562,6 +615,9 @@ lib/kde3/krosskexidb.so lib/kde3/krosskritacore.a lib/kde3/krosskritacore.la lib/kde3/krosskritacore.so +lib/kde3/krosskspreadcore.a +lib/kde3/krosskspreadcore.la +lib/kde3/krosskspreadcore.so lib/kde3/krosspython.a lib/kde3/krosspython.la lib/kde3/krosspython.so @@ -571,6 +627,9 @@ lib/kde3/krossruby.so lib/kde3/kspread.a lib/kde3/kspread.la lib/kde3/kspread.so +lib/kde3/kspreadscripting.a +lib/kde3/kspreadscripting.la +lib/kde3/kspreadscripting.so lib/kde3/kthesaurus.a lib/kde3/kthesaurus.la lib/kde3/kthesaurus.so @@ -790,21 +849,24 @@ lib/kde3/libkrita_openexr_import.so lib/kde3/libkrita_raw_import.a lib/kde3/libkrita_raw_import.la lib/kde3/libkrita_raw_import.so +lib/kde3/libkritagmagickexport.a +lib/kde3/libkritagmagickexport.la +lib/kde3/libkritagmagickexport.so +lib/kde3/libkritagmagickimport.a +lib/kde3/libkritagmagickimport.la +lib/kde3/libkritagmagickimport.so lib/kde3/libkritajpegexport.a lib/kde3/libkritajpegexport.la lib/kde3/libkritajpegexport.so lib/kde3/libkritajpegimport.a lib/kde3/libkritajpegimport.la lib/kde3/libkritajpegimport.so -lib/kde3/libkritamagickexport.a -lib/kde3/libkritamagickexport.la -lib/kde3/libkritamagickexport.so -lib/kde3/libkritamagickimport.a -lib/kde3/libkritamagickimport.la -lib/kde3/libkritamagickimport.so lib/kde3/libkritapart.a lib/kde3/libkritapart.la lib/kde3/libkritapart.so +lib/kde3/libkritapdfimport.a +lib/kde3/libkritapdfimport.la +lib/kde3/libkritapdfimport.so lib/kde3/libkritapngexport.a lib/kde3/libkritapngexport.la lib/kde3/libkritapngexport.so @@ -823,6 +885,9 @@ lib/kde3/libkspreadhtmlexport.so lib/kde3/libkspreadinsertcalendar.a lib/kde3/libkspreadinsertcalendar.la lib/kde3/libkspreadinsertcalendar.so +lib/kde3/libkspreadkexiimport.a +lib/kde3/libkspreadkexiimport.la +lib/kde3/libkspreadkexiimport.so lib/kde3/libkspreadlatexexport.a lib/kde3/libkspreadlatexexport.la lib/kde3/libkspreadlatexexport.so @@ -856,6 +921,9 @@ lib/kde3/libmswriteexport.so lib/kde3/libmswriteimport.a lib/kde3/libmswriteimport.la lib/kde3/libmswriteimport.so +lib/kde3/libolefilter.a +lib/kde3/libolefilter.la +lib/kde3/libolefilter.so lib/kde3/liboodrawimport.a lib/kde3/liboodrawimport.la lib/kde3/liboodrawimport.so @@ -886,9 +954,6 @@ lib/kde3/libpalmdocimport.so lib/kde3/libpdfimport.a lib/kde3/libpdfimport.la lib/kde3/libpdfimport.so -lib/kde3/libpowerpointimport.a -lib/kde3/libpowerpointimport.la -lib/kde3/libpowerpointimport.so lib/kde3/libqproimport.a lib/kde3/libqproimport.la lib/kde3/libqproimport.so @@ -989,43 +1054,43 @@ lib/libkdeinit_kword.so lib/libkexicore.a lib/libkexicore.la lib/libkexicore.so -lib/libkexicore.so.1 +lib/libkexicore.so.2 lib/libkexidatatable.a lib/libkexidatatable.la lib/libkexidatatable.so -lib/libkexidatatable.so.1 +lib/libkexidatatable.so.2 lib/libkexidb.a lib/libkexidb.la lib/libkexidb.so -lib/libkexidb.so.0 +lib/libkexidb.so.2 lib/libkexidbparser.a lib/libkexidbparser.la lib/libkexidbparser.so -lib/libkexidbparser.so.1 +lib/libkexidbparser.so.2 lib/libkexiextendedwidgets.a lib/libkexiextendedwidgets.la lib/libkexiextendedwidgets.so -lib/libkexiextendedwidgets.so.1 +lib/libkexiextendedwidgets.so.2 lib/libkexiformutils.a lib/libkexiformutils.la lib/libkexiformutils.so -lib/libkexiformutils.so.1 +lib/libkexiformutils.so.2 lib/libkexiguiutils.a lib/libkexiguiutils.la lib/libkexiguiutils.so -lib/libkexiguiutils.so.1 +lib/libkexiguiutils.so.2 lib/libkeximain.a lib/libkeximain.la lib/libkeximain.so -lib/libkeximain.so.1 +lib/libkeximain.so.2 lib/libkeximigrate.a lib/libkeximigrate.la lib/libkeximigrate.so -lib/libkeximigrate.so.1 +lib/libkeximigrate.so.2 lib/libkexirelationsview.a lib/libkexirelationsview.la lib/libkexirelationsview.so -lib/libkexirelationsview.so.1 +lib/libkexirelationsview.so.2 lib/libkexisql2.a lib/libkexisql2.la lib/libkexisql2.so @@ -1037,11 +1102,11 @@ lib/libkexisql3.so.3 lib/libkexiutils.a lib/libkexiutils.la lib/libkexiutils.so -lib/libkexiutils.so.1 +lib/libkexiutils.so.2 lib/libkformdesigner.a lib/libkformdesigner.la lib/libkformdesigner.so -lib/libkformdesigner.so.1 +lib/libkformdesigner.so.2 lib/libkformulalib.a lib/libkformulalib.la lib/libkformulalib.so @@ -1073,7 +1138,7 @@ lib/libkopalette.so.1 lib/libkoproperty.a lib/libkoproperty.la lib/libkoproperty.so -lib/libkoproperty.so.0 +lib/libkoproperty.so.2 lib/libkotext.a lib/libkotext.la lib/libkotext.so @@ -1114,6 +1179,14 @@ lib/libkrita_rgb_u16.a lib/libkrita_rgb_u16.la lib/libkrita_rgb_u16.so lib/libkrita_rgb_u16.so.0 +lib/libkrita_ycbcr_u16.a +lib/libkrita_ycbcr_u16.la +lib/libkrita_ycbcr_u16.so +lib/libkrita_ycbcr_u16.so.0 +lib/libkrita_ycbcr_u8.a +lib/libkrita_ycbcr_u8.la +lib/libkrita_ycbcr_u8.so +lib/libkrita_ycbcr_u8.so.0 lib/libkritacolor.a lib/libkritacolor.la lib/libkritacolor.so @@ -1183,6 +1256,13 @@ lib/libkwordprivate.so lib/libkwordprivate.so.4 share/applications/kde/kivio.desktop share/applications/kde/krita.desktop +share/applnk/.hidden/krita_jpeg.desktop +share/applnk/.hidden/krita_magick.desktop +share/applnk/.hidden/krita_openexr.desktop +share/applnk/.hidden/krita_pdf.desktop +share/applnk/.hidden/krita_png.desktop +share/applnk/.hidden/krita_raw.desktop +share/applnk/.hidden/krita_tiff.desktop share/applnk/Office/KThesaurus.desktop share/applnk/Office/karbon.desktop share/applnk/Office/kchart.desktop @@ -1191,12 +1271,6 @@ share/applnk/Office/kformula.desktop share/applnk/Office/koshell.desktop share/applnk/Office/kplato.desktop share/applnk/Office/kpresenter.desktop -share/applnk/Office/krita_jpeg.desktop -share/applnk/Office/krita_magick.desktop -share/applnk/Office/krita_openexr.desktop -share/applnk/Office/krita_png.desktop -share/applnk/Office/krita_raw.desktop -share/applnk/Office/krita_tiff.desktop share/applnk/Office/kspread.desktop share/applnk/Office/kudesigner.desktop share/applnk/Office/kugar.desktop @@ -1373,13 +1447,21 @@ share/apps/kchart/pics/chart_hilo_normal.png share/apps/kchart/pics/chart_hilo_openclose.png share/apps/kchart/pics/chart_legend_bottom.png share/apps/kchart/pics/chart_legend_bottomleft.png +share/apps/kchart/pics/chart_legend_bottomleftbottom.png +share/apps/kchart/pics/chart_legend_bottomleftleft.png share/apps/kchart/pics/chart_legend_bottomright.png +share/apps/kchart/pics/chart_legend_bottomrightbottom.png +share/apps/kchart/pics/chart_legend_bottomrightright.png share/apps/kchart/pics/chart_legend_left.png share/apps/kchart/pics/chart_legend_nolegend.png share/apps/kchart/pics/chart_legend_right.png share/apps/kchart/pics/chart_legend_top.png share/apps/kchart/pics/chart_legend_topleft.png +share/apps/kchart/pics/chart_legend_topleftleft.png +share/apps/kchart/pics/chart_legend_toplefttop.png share/apps/kchart/pics/chart_legend_topright.png +share/apps/kchart/pics/chart_legend_toprightright.png +share/apps/kchart/pics/chart_legend_toprighttop.png share/apps/kchart/pics/chart_line_normal.png share/apps/kchart/pics/chart_line_percent.png share/apps/kchart/pics/chart_line_stacked.png @@ -1401,6 +1483,7 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png share/apps/kexi/icons/crystalsvg/16x16/actions/button.png share/apps/kexi/icons/crystalsvg/16x16/actions/check.png share/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png +share/apps/kexi/icons/crystalsvg/16x16/actions/combo.png share/apps/kexi/icons/crystalsvg/16x16/actions/database.png share/apps/kexi/icons/crystalsvg/16x16/actions/database_import.png share/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png @@ -1414,6 +1497,8 @@ share/apps/kexi/icons/crystalsvg/16x16/actions/line.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_horizontal.png share/apps/kexi/icons/crystalsvg/16x16/actions/line_vertical.png share/apps/kexi/icons/crystalsvg/16x16/actions/lineedit.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro.png +share/apps/kexi/icons/crystalsvg/16x16/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/16x16/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/16x16/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png @@ -1484,6 +1569,8 @@ share/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png share/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png share/apps/kexi/icons/crystalsvg/22x22/actions/listview.png share/apps/kexi/icons/crystalsvg/22x22/actions/lower.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro.png +share/apps/kexi/icons/crystalsvg/22x22/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png share/apps/kexi/icons/crystalsvg/22x22/actions/multiple_obj.png share/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png @@ -1522,6 +1609,8 @@ share/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png share/apps/kexi/icons/crystalsvg/32x32/actions/grid.png share/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png share/apps/kexi/icons/crystalsvg/32x32/actions/key.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro.png +share/apps/kexi/icons/crystalsvg/32x32/actions/macro_newobj.png share/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png share/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png share/apps/kexi/icons/crystalsvg/32x32/actions/query.png @@ -1563,15 +1652,13 @@ share/apps/kexi/scripts/importxhtml/ImportXHTML.rc share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.py share/apps/kexi/scripts/projectdocumentor/ProjectDocumentor.rc share/apps/kformula/dtd/kformula.dtd -share/apps/kformula/fonts/cmbx10.ttf +share/apps/kformula/fonts/Arev.ttf +share/apps/kformula/fonts/ArevBI.ttf +share/apps/kformula/fonts/ArevBd.ttf +share/apps/kformula/fonts/ArevIt.ttf share/apps/kformula/fonts/cmex10.ttf -share/apps/kformula/fonts/cmmi10.ttf -share/apps/kformula/fonts/cmr10.ttf -share/apps/kformula/fonts/cmsy10.ttf share/apps/kformula/fonts/fonts.dir share/apps/kformula/fonts/fonts.scale -share/apps/kformula/fonts/msam10.ttf -share/apps/kformula/fonts/msbm10.ttf share/apps/kformula/kformula.rc share/apps/kformula/kformula_readonly.rc share/apps/kformula/tips @@ -3684,11 +3771,19 @@ share/apps/krita/pics/polyline.png share/apps/krita/pics/raiselayer.png share/apps/krita/pics/rotate_cursor.xpm share/apps/krita/pics/tablet.png +share/apps/krita/pics/tool_bezier_cursor.png +share/apps/krita/pics/tool_bezier_paint.png +share/apps/krita/pics/tool_bezier_select.png share/apps/krita/pics/tool_brush_selection.png share/apps/krita/pics/tool_brush_selection_cursor.png +share/apps/krita/pics/tool_color_fill.png +share/apps/krita/pics/tool_colorpicker.png share/apps/krita/pics/tool_contiguous_selection.png share/apps/krita/pics/tool_contiguous_selection_cursor.png +share/apps/krita/pics/tool_crop.png share/apps/krita/pics/tool_crop_cursor.png +share/apps/krita/pics/tool_curve_dragging.png +share/apps/krita/pics/tool_duplicate.png share/apps/krita/pics/tool_duplicate_cursor.png share/apps/krita/pics/tool_ellipse.png share/apps/krita/pics/tool_ellipse_cursor.png @@ -3696,6 +3791,8 @@ share/apps/krita/pics/tool_elliptical_selection.png share/apps/krita/pics/tool_elliptical_selection_cursor.png share/apps/krita/pics/tool_eraser_selection.png share/apps/krita/pics/tool_eraser_selection_cursor.png +share/apps/krita/pics/tool_example.png +share/apps/krita/pics/tool_example_cursor.png share/apps/krita/pics/tool_fill_cursor.png share/apps/krita/pics/tool_filter.png share/apps/krita/pics/tool_filter_cursor.png @@ -3705,9 +3802,15 @@ share/apps/krita/pics/tool_gradient.png share/apps/krita/pics/tool_gradient_cursor.png share/apps/krita/pics/tool_line.png share/apps/krita/pics/tool_line_cursor.png +share/apps/krita/pics/tool_moutline.png +share/apps/krita/pics/tool_moutline_cursor.png +share/apps/krita/pics/tool_moutline_editing.png +share/apps/krita/pics/tool_move.png share/apps/krita/pics/tool_outline_selection.png share/apps/krita/pics/tool_outline_selection_cursor.png share/apps/krita/pics/tool_pan.png +share/apps/krita/pics/tool_perspectivegrid.png +share/apps/krita/pics/tool_perspectivetransform.png share/apps/krita/pics/tool_polygon.png share/apps/krita/pics/tool_polygon_cursor.png share/apps/krita/pics/tool_polygonal_selection.png @@ -3725,6 +3828,8 @@ share/apps/krita/pics/tool_star.png share/apps/krita/pics/tool_star_cursor.png share/apps/krita/pics/tool_text.png share/apps/krita/pics/tool_text_cursor.png +share/apps/krita/pics/tool_transform.png +share/apps/krita/pics/tool_zoom.png share/apps/krita/pics/tool_zoom_minus_cursor.png share/apps/krita/pics/tool_zoom_plus_cursor.png share/apps/krita/pics/unlinked.png @@ -3740,6 +3845,7 @@ share/apps/krita/profiles/PAL.icm share/apps/krita/profiles/SMPTE-C.icm share/apps/krita/profiles/WideGamut.icm share/apps/krita/profiles/cmyk.icm +share/apps/krita/profiles/fogra27l.icm share/apps/krita/profiles/lcmslabi.icm share/apps/krita/profiles/lcmsxyzi.icm share/apps/krita/profiles/monoscnr.icm @@ -3796,10 +3902,12 @@ share/apps/kritaplugins/imageseparate.rc share/apps/kritaplugins/imagesize.rc share/apps/kritaplugins/kritafiltersgallery.rc share/apps/kritaplugins/kritahistogramdocker.rc +share/apps/kritaplugins/modify_selection.rc share/apps/kritaplugins/rotateimage.rc share/apps/kritaplugins/screenshot-krita.rc share/apps/kritaplugins/scripting.rc share/apps/kritaplugins/shearimage.rc +share/apps/kritaplugins/substrate.rc share/apps/kritaplugins/wetplugin.rc share/apps/kross/python/RestrictedPython/Eval.py share/apps/kross/python/RestrictedPython/Guards.py @@ -3947,8 +4055,13 @@ share/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz share/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz share/apps/kspread/kpartplugins/insertcalendar.rc +share/apps/kspread/kpartplugins/scripting.rc share/apps/kspread/kspread.rc share/apps/kspread/kspread_readonly.rc +share/apps/kspread/scripts/exporthtml/ExportHtml.py +share/apps/kspread/scripts/exporthtml/ExportHtml.rc +share/apps/kspread/scripts/scripteditor/ScriptEditor.py +share/apps/kspread/scripts/scripteditor/ScriptEditor.rc share/apps/kspread/sheetstyles/standard1.ksts share/apps/kspread/sheetstyles/standard1.png share/apps/kspread/sheetstyles/standard1.xml @@ -4190,14 +4303,19 @@ share/doc/HTML/en/kchart/toolbars.png share/doc/HTML/en/kexi/basics.docbook share/doc/HTML/en/kexi/building.docbook share/doc/HTML/en/kexi/common +share/doc/HTML/en/kexi/comparing.docbook share/doc/HTML/en/kexi/configuration.docbook share/doc/HTML/en/kexi/contact-example.png share/doc/HTML/en/kexi/credits.docbook share/doc/HTML/en/kexi/database.docbook +share/doc/HTML/en/kexi/designingforms.docbook +share/doc/HTML/en/kexi/enteringdataintotables.docbook +share/doc/HTML/en/kexi/enteringdatausingforms.docbook share/doc/HTML/en/kexi/index.cache.bz2 share/doc/HTML/en/kexi/index.docbook share/doc/HTML/en/kexi/intro.docbook share/doc/HTML/en/kexi/menus.docbook +share/doc/HTML/en/kexi/querydesigning.docbook share/doc/HTML/en/kformula/ambiguous-string.png share/doc/HTML/en/kformula/common share/doc/HTML/en/kformula/correct_index_location.png @@ -4374,6 +4492,7 @@ share/doc/HTML/en/kpresenter/tut25.png share/doc/HTML/en/kpresenter/tut26.png share/doc/HTML/en/kpresenter/tutorial.docbook share/doc/HTML/en/kpresenter/zoomfactor.png +share/doc/HTML/en/krita/README.SCREENSHOTS share/doc/HTML/en/krita/commands-dialogs.docbook share/doc/HTML/en/krita/commands-menus.docbook share/doc/HTML/en/krita/commands-palettes.docbook @@ -4382,7 +4501,15 @@ share/doc/HTML/en/krita/commands.docbook share/doc/HTML/en/krita/common share/doc/HTML/en/krita/createdocument.png share/doc/HTML/en/krita/credits.docbook +share/doc/HTML/en/krita/crocusses-autocontrast.png +share/doc/HTML/en/krita/crocusses-blur.png +share/doc/HTML/en/krita/crocusses-brightnesscontrast.png share/doc/HTML/en/krita/crocusses-bumpmap.png +share/doc/HTML/en/krita/crocusses-coloradjustment.png +share/doc/HTML/en/krita/crocusses-colortoalpha.png +share/doc/HTML/en/krita/crocusses-colortransfer.png +share/doc/HTML/en/krita/crocusses-customconvolution.png +share/doc/HTML/en/krita/crocusses-desaturate.png share/doc/HTML/en/krita/crocusses-edgebottom.png share/doc/HTML/en/krita/crocusses-edgeleft.png share/doc/HTML/en/krita/crocusses-edgeright.png @@ -4390,24 +4517,37 @@ share/doc/HTML/en/krita/crocusses-embossall.png share/doc/HTML/en/krita/crocusses-embosshorvert.png share/doc/HTML/en/krita/crocusses-embossvariable.png share/doc/HTML/en/krita/crocusses-gaussianblur.png +share/doc/HTML/en/krita/crocusses-gaussiannoise.png share/doc/HTML/en/krita/crocusses-invert.png +share/doc/HTML/en/krita/crocusses-lenscorrection.png +share/doc/HTML/en/krita/crocusses-maximizechannel.png share/doc/HTML/en/krita/crocusses-meanremoval.png +share/doc/HTML/en/krita/crocusses-minimizechannel.png share/doc/HTML/en/krita/crocusses-oilpaint.png share/doc/HTML/en/krita/crocusses-pixelize.png share/doc/HTML/en/krita/crocusses-raindrops.png +share/doc/HTML/en/krita/crocusses-randomnoise.png +share/doc/HTML/en/krita/crocusses-randompick.png share/doc/HTML/en/krita/crocusses-roundcorners.png share/doc/HTML/en/krita/crocusses-sharpen.png -share/doc/HTML/en/krita/crocusses-simplenoise.png +share/doc/HTML/en/krita/crocusses-smalltiles.png share/doc/HTML/en/krita/crocusses-sobel.png -share/doc/HTML/en/krita/crocusses-tiles.png share/doc/HTML/en/krita/crocusses-topedge.png +share/doc/HTML/en/krita/crocusses-unsharpmask.png +share/doc/HTML/en/krita/crocusses-wave.png +share/doc/HTML/en/krita/crocusses-waveletnoise.png share/doc/HTML/en/krita/crocusses.png +share/doc/HTML/en/krita/developers-plugins.docbook +share/doc/HTML/en/krita/developers-scripting.docbook share/doc/HTML/en/krita/developers.docbook share/doc/HTML/en/krita/dialogs-addpalette.png +share/doc/HTML/en/krita/dialogs-blur.png share/doc/HTML/en/krita/dialogs-brightnesscontrast.png share/doc/HTML/en/krita/dialogs-bumpmap.png share/doc/HTML/en/krita/dialogs-coloradjustment.png share/doc/HTML/en/krita/dialogs-colorrange.png +share/doc/HTML/en/krita/dialogs-colortoalpha.png +share/doc/HTML/en/krita/dialogs-colortransfer.png share/doc/HTML/en/krita/dialogs-convertimagetype.png share/doc/HTML/en/krita/dialogs-convertlayertype.png share/doc/HTML/en/krita/dialogs-cubism.png @@ -4416,17 +4556,21 @@ share/doc/HTML/en/krita/dialogs-documentinformation.png share/doc/HTML/en/krita/dialogs-dropshadow.png share/doc/HTML/en/krita/dialogs-emboss.png share/doc/HTML/en/krita/dialogs-filtersgallery.png +share/doc/HTML/en/krita/dialogs-gaussiannoise.png share/doc/HTML/en/krita/dialogs-histogram.png share/doc/HTML/en/krita/dialogs-imageproperties.png share/doc/HTML/en/krita/dialogs-imagerestoration.png share/doc/HTML/en/krita/dialogs-imagesize.png share/doc/HTML/en/krita/dialogs-layerproperties.png share/doc/HTML/en/krita/dialogs-layersize.png +share/doc/HTML/en/krita/dialogs-lenscorrection.png share/doc/HTML/en/krita/dialogs-newadjustmentlayer.png share/doc/HTML/en/krita/dialogs-newlayer.png share/doc/HTML/en/krita/dialogs-oilpaint.png share/doc/HTML/en/krita/dialogs-pixelize.png share/doc/HTML/en/krita/dialogs-raindrops.png +share/doc/HTML/en/krita/dialogs-randomnoise.png +share/doc/HTML/en/krita/dialogs-randompick.png share/doc/HTML/en/krita/dialogs-rotateimage.png share/doc/HTML/en/krita/dialogs-rotatelayer.png share/doc/HTML/en/krita/dialogs-roundcorners.png @@ -4435,31 +4579,56 @@ share/doc/HTML/en/krita/dialogs-shearimage.png share/doc/HTML/en/krita/dialogs-shearlayer.png share/doc/HTML/en/krita/dialogs-smalltiles.png share/doc/HTML/en/krita/dialogs-sobel.png +share/doc/HTML/en/krita/dialogs-substrate.png +share/doc/HTML/en/krita/dialogs-unsharpmask.png +share/doc/HTML/en/krita/dialogs-wave.png +share/doc/HTML/en/krita/dialogs-waveletnoise.png share/doc/HTML/en/krita/faq.docbook share/doc/HTML/en/krita/index.cache.bz2 share/doc/HTML/en/krita/index.docbook share/doc/HTML/en/krita/installation.docbook share/doc/HTML/en/krita/introduction.docbook share/doc/HTML/en/krita/mainscreen.png +share/doc/HTML/en/krita/mountains-burn.png +share/doc/HTML/en/krita/mountains-color.png +share/doc/HTML/en/krita/mountains-darken.png +share/doc/HTML/en/krita/mountains-divide.png +share/doc/HTML/en/krita/mountains-dodge.png +share/doc/HTML/en/krita/mountains-hue.png +share/doc/HTML/en/krita/mountains-lighten.png +share/doc/HTML/en/krita/mountains-multiply.png +share/doc/HTML/en/krita/mountains-normal.png +share/doc/HTML/en/krita/mountains-original.png +share/doc/HTML/en/krita/mountains-overlay.png +share/doc/HTML/en/krita/mountains-saturation.png +share/doc/HTML/en/krita/mountains-screen.png +share/doc/HTML/en/krita/mountains-value.png +share/doc/HTML/en/krita/mountains.png share/doc/HTML/en/krita/newimage.png share/doc/HTML/en/krita/palettes-colors-gray.png share/doc/HTML/en/krita/palettes-colors-hsv.png share/doc/HTML/en/krita/palettes-colors-palettes.png share/doc/HTML/en/krita/palettes-colors-rgb.png share/doc/HTML/en/krita/palettes-colors-watercolors.png +share/doc/HTML/en/krita/palettes-controlbox-bezier.png share/doc/HTML/en/krita/palettes-controlbox-brush.png share/doc/HTML/en/krita/palettes-controlbox-colorpicker.png share/doc/HTML/en/krita/palettes-controlbox-contiguousfill.png share/doc/HTML/en/krita/palettes-controlbox-crop.png +share/doc/HTML/en/krita/palettes-controlbox-duplicate.png +share/doc/HTML/en/krita/palettes-controlbox-ellipse.png +share/doc/HTML/en/krita/palettes-controlbox-fill.png share/doc/HTML/en/krita/palettes-controlbox-gradient.png share/doc/HTML/en/krita/palettes-controlbox-histogram.png share/doc/HTML/en/krita/palettes-controlbox-line.png share/doc/HTML/en/krita/palettes-controlbox-overview.png share/doc/HTML/en/krita/palettes-controlbox-paintwithfilters.png share/doc/HTML/en/krita/palettes-controlbox-polygon.png +share/doc/HTML/en/krita/palettes-controlbox-polyline.png share/doc/HTML/en/krita/palettes-controlbox-rectangle.png share/doc/HTML/en/krita/palettes-controlbox-select.png share/doc/HTML/en/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/en/krita/palettes-controlbox-selectmagnetic.png share/doc/HTML/en/krita/palettes-controlbox-selectsimilar.png share/doc/HTML/en/krita/palettes-controlbox-star.png share/doc/HTML/en/krita/palettes-controlbox-text.png @@ -4473,8 +4642,11 @@ share/doc/HTML/en/krita/preferences-grid.png share/doc/HTML/en/krita/preferences-performance.png share/doc/HTML/en/krita/preferences-sidebar.png share/doc/HTML/en/krita/preferences-tablet.png -share/doc/HTML/en/krita/scripting.docbook share/doc/HTML/en/krita/settings.docbook +share/doc/HTML/en/krita/tool-bezier-example.png +share/doc/HTML/en/krita/tool-bezier-example2.png +share/doc/HTML/en/krita/tool-bezier-example3.png +share/doc/HTML/en/krita/tool-bezier.png share/doc/HTML/en/krita/tool-brush.png share/doc/HTML/en/krita/tool-colorpicker.png share/doc/HTML/en/krita/tool-contiguousfill.png @@ -4486,13 +4658,18 @@ share/doc/HTML/en/krita/tool-gradient.png share/doc/HTML/en/krita/tool-line.png share/doc/HTML/en/krita/tool-move.png share/doc/HTML/en/krita/tool-paintselection.png +share/doc/HTML/en/krita/tool-paintwithfilters-example.png share/doc/HTML/en/krita/tool-paintwithfilters.png share/doc/HTML/en/krita/tool-pan.png +share/doc/HTML/en/krita/tool-perspectivegrid.png +share/doc/HTML/en/krita/tool-perspectivetransform.png share/doc/HTML/en/krita/tool-polygon.png share/doc/HTML/en/krita/tool-polyline.png share/doc/HTML/en/krita/tool-rectangle.png +share/doc/HTML/en/krita/tool-selectbezier.png share/doc/HTML/en/krita/tool-selectcontiguous.png share/doc/HTML/en/krita/tool-selectelliptical.png +share/doc/HTML/en/krita/tool-selectmagnetic.png share/doc/HTML/en/krita/tool-selectoutline.png share/doc/HTML/en/krita/tool-selectpolygonal.png share/doc/HTML/en/krita/tool-selectrectangular.png @@ -4513,6 +4690,8 @@ share/doc/HTML/en/krita/toolbar-file.png share/doc/HTML/en/krita/toolbar-krita.png share/doc/HTML/en/krita/toolbar-navigation.png share/doc/HTML/en/krita/toolbar-transformationtools.png +share/doc/HTML/en/krita/toolbars-button-zoomin.png +share/doc/HTML/en/krita/toolbars-button-zoomout.png share/doc/HTML/en/krita/tutorial-quick-starts.docbook share/doc/HTML/en/krita/tutorial-quick-starts1.png share/doc/HTML/en/krita/tutorial-quick-starts10.png @@ -4542,9 +4721,14 @@ share/doc/HTML/en/krita/tutorial-select-layer-9.png share/doc/HTML/en/krita/tutorial-select-layer-sample.png share/doc/HTML/en/krita/tutorial-select-layer.docbook share/doc/HTML/en/krita/tutorial-starting.docbook +share/doc/HTML/en/krita/tutorial-tablet-1.png +share/doc/HTML/en/krita/tutorial-tablet-2.png +share/doc/HTML/en/krita/tutorial-tablet-3.png +share/doc/HTML/en/krita/tutorial-tablet.docbook share/doc/HTML/en/krita/tutorial.docbook share/doc/HTML/en/krita/using-colorspaces.docbook share/doc/HTML/en/krita/using-filters.docbook +share/doc/HTML/en/krita/using-images.docbook share/doc/HTML/en/krita/using-layers.docbook share/doc/HTML/en/krita/using-selections-1.png share/doc/HTML/en/krita/using-selections-2.png @@ -4553,6 +4737,7 @@ share/doc/HTML/en/krita/using-selections-4.png share/doc/HTML/en/krita/using-selections-5.png share/doc/HTML/en/krita/using-selections-6.png share/doc/HTML/en/krita/using-selections.docbook +share/doc/HTML/en/krita/using-views.docbook share/doc/HTML/en/kspread/a11y.docbook share/doc/HTML/en/kspread/advanced.docbook share/doc/HTML/en/kspread/basics.docbook @@ -4748,6 +4933,7 @@ share/doc/HTML/en/kword/formframe2.png share/doc/HTML/en/kword/formframe3.png share/doc/HTML/en/kword/formframe4.png share/doc/HTML/en/kword/formframe5.png +share/doc/HTML/en/kword/formframe6.png share/doc/HTML/en/kword/forminteg.png share/doc/HTML/en/kword/formllind.png share/doc/HTML/en/kword/formlrind.png @@ -4831,6 +5017,7 @@ share/doc/HTML/en/kword/opt2.png share/doc/HTML/en/kword/opt3.png share/doc/HTML/en/kword/opt4.png share/doc/HTML/en/kword/opt5.png +share/doc/HTML/en/kword/opt6.png share/doc/HTML/en/kword/optkb.png share/doc/HTML/en/kword/optkb2.png share/doc/HTML/en/kword/opttb.png @@ -5104,7 +5291,6 @@ share/services/kpresenter_mng_export.desktop share/services/kpresenter_ooimpress_export.desktop share/services/kpresenter_ooimpress_import.desktop share/services/kpresenter_png_export.desktop -share/services/kpresenter_powerpoint_import.desktop share/services/kpresenter_svg_export.desktop share/services/kpresenter_xbm_export.desktop share/services/kpresenter_xpm_export.desktop @@ -5119,6 +5305,7 @@ share/services/krita_magick_export.desktop share/services/krita_magick_import.desktop share/services/krita_openexr_export.desktop share/services/krita_openexr_import.desktop +share/services/krita_pdf_import.desktop share/services/krita_png_export.desktop share/services/krita_png_import.desktop share/services/krita_raw_import.desktop @@ -5127,6 +5314,9 @@ share/services/krita_rgb_f32_plugin.desktop share/services/krita_rgb_u16_plugin.desktop share/services/krita_tiff_export.desktop share/services/krita_tiff_import.desktop +share/services/krita_ycbcr_u16_plugin.desktop +share/services/krita_ycbcr_u8_plugin.desktop +share/services/kritablurfilter.desktop share/services/kritabumpmapfilter.desktop share/services/kritacimg.desktop share/services/kritacmykplugin.desktop @@ -5139,16 +5329,23 @@ share/services/kritadefaulttools.desktop share/services/kritadropshadow.desktop share/services/kritaembossfilter.desktop share/services/kritaexample.desktop +share/services/kritaextensioncolorsfilters.desktop +share/services/kritafastcolortransfer.desktop share/services/kritafiltersgallery.desktop share/services/kritagrayplugin.desktop share/services/kritahistogram.desktop share/services/kritahistogramdocker.desktop share/services/kritaimageenhancement.desktop share/services/kritaimagesize.desktop +share/services/kritalenscorrectionfilter.desktop +share/services/kritalevelfilter.desktop +share/services/kritamodifyselection.desktop +share/services/kritanoisefilter.desktop share/services/kritaoilpaintfilter.desktop share/services/kritapart.desktop share/services/kritapixelizefilter.desktop share/services/kritaraindropsfilter.desktop +share/services/kritarandompickfilter.desktop share/services/kritargbplugin.desktop share/services/kritarotateimage.desktop share/services/kritaroundcornersfilter.desktop @@ -5158,15 +5355,20 @@ share/services/kritaselectiontools.desktop share/services/kritaseparatechannels.desktop share/services/kritashearimage.desktop share/services/kritasmalltilesfilter.desktop -share/services/kritasmearybrush.desktop share/services/kritasobelfilter.desktop +share/services/kritasubstrate.desktop share/services/kritatoolcrop.desktop +share/services/kritatoolcurves.desktop share/services/kritatoolfilter.desktop +share/services/kritatoolperspectivegrid.desktop +share/services/kritatoolperspectivetransform.desktop share/services/kritatoolpolygon.desktop share/services/kritatoolpolyline.desktop share/services/kritatoolselectsimilar.desktop share/services/kritatoolstar.desktop share/services/kritatooltransform.desktop +share/services/kritaunsharpfilter.desktop +share/services/kritawavefilter.desktop share/services/kritawetplugin.desktop share/services/kspread_applixspread_import.desktop share/services/kspread_csv_export.desktop @@ -5176,11 +5378,13 @@ share/services/kspread_excel_import.desktop share/services/kspread_gnumeric_export.desktop share/services/kspread_gnumeric_import.desktop share/services/kspread_html_export.desktop +share/services/kspread_kexi_import.desktop share/services/kspread_latex_export.desktop share/services/kspread_opencalc_export.desktop share/services/kspread_opencalc_import.desktop share/services/kspread_qpro_import.desktop share/services/kspreadpart.desktop +share/services/kspreadscripting.desktop share/services/kugar_kugar_import.desktop share/services/kugarpart.desktop share/services/kwmailmerge_kabc.desktop @@ -5215,6 +5419,7 @@ share/services/kword_wp_import.desktop share/services/kwordpart.desktop share/services/kwserialletter_classic.desktop share/services/kwserialletter_qtsqldb_power.desktop +share/services/ole_powerpoint97_import.desktop share/services/thesaurustool.desktop share/services/xslt_export.desktop share/services/xslt_import.desktop @@ -5384,6 +5589,9 @@ share/templates/TextDocument.desktop @dirrm share/apps/kspread/templates/Business @dirrm share/apps/kspread/templates @dirrm share/apps/kspread/sheetstyles +@dirrm share/apps/kspread/scripts/scripteditor +@dirrm share/apps/kspread/scripts/exporthtml +@dirrm share/apps/kspread/scripts @dirrm share/apps/kspread/kpartplugins @dirrm share/apps/kspread/icons/crystalsvg/scalable/actions @dirrm share/apps/kspread/icons/crystalsvg/scalable diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile index 3fa52e8eb71e..772cd8a5320b 100644 --- a/french/calligra-l10n/Makefile +++ b/french/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/calligra-l10n/distinfo b/french/calligra-l10n/distinfo index 02435d2ce79b..b4d9b06a4253 100644 --- a/french/calligra-l10n/distinfo +++ b/french/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 8f868a919c6ccb66b719196d3e842910 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 518d1c7a20fe440fbb977ff80ee716088a584c770c932366aee51cc1fdad0137 -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 6613741 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 diff --git a/french/calligra-l10n/pkg-plist b/french/calligra-l10n/pkg-plist index a9a3581bbfcd..26b46d27aa38 100644 --- a/french/calligra-l10n/pkg-plist +++ b/french/calligra-l10n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/fr.xml +share/doc/HTML/fr/karbon/common +share/doc/HTML/fr/karbon/index.cache.bz2 +share/doc/HTML/fr/karbon/index.docbook share/doc/HTML/fr/kchart/common share/doc/HTML/fr/kchart/file-toolbar.png share/doc/HTML/fr/kchart/file-toolbar2.png @@ -395,6 +398,7 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo +share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo @@ -433,5 +437,6 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kivio @dirrm share/doc/HTML/fr/kformula @dirrm share/doc/HTML/fr/kchart +@dirrm share/doc/HTML/fr/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/french/kde3-i18n/distinfo b/french/kde3-i18n/distinfo index 19f8352d9d1e..df9bb6fe995b 100644 --- a/french/kde3-i18n/distinfo +++ b/french/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 1fdeb2af12a6096258d08ff339000e8c -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 477627ef33321ced2a78462331a722f03ca2802dbdfc95242c3821d8c7cb6f9c -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 19929878 +MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 0a0e9ba98b33e81a092110563def9ca4 +SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 69ac0f012a711437691d3ad2e1404ac839f9244abe6917c02f6d980b4e1fa688 +SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 19954633 diff --git a/french/kde3-i18n/pkg-plist b/french/kde3-i18n/pkg-plist index d24df720f9a7..3537303787ef 100644 --- a/french/kde3-i18n/pkg-plist +++ b/french/kde3-i18n/pkg-plist @@ -385,6 +385,10 @@ share/doc/HTML/fr/kdebugdialog/index.cache.bz2 share/doc/HTML/fr/kdebugdialog/index.docbook share/doc/HTML/fr/kdelibs/man-artsmessage.1.docbook share/doc/HTML/fr/kdelibs/man-checkXML.1.docbook +share/doc/HTML/fr/kdelibs/man-dcop.1.docbook +share/doc/HTML/fr/kdelibs/man-kbuildsycoca.8.docbook +share/doc/HTML/fr/kdelibs/man-kdeoptions.7.docbook +share/doc/HTML/fr/kdelibs/man-qtoptions.7.docbook share/doc/HTML/fr/kdelirc/irkick/common share/doc/HTML/fr/kdelirc/irkick/index.cache.bz2 share/doc/HTML/fr/kdelirc/irkick/index.docbook @@ -443,9 +447,6 @@ share/doc/HTML/fr/kdf/kdf_config.png share/doc/HTML/fr/kdict/common share/doc/HTML/fr/kdict/index.cache.bz2 share/doc/HTML/fr/kdict/index.docbook -share/doc/HTML/fr/kdm/common -share/doc/HTML/fr/kdm/index.cache.bz2 -share/doc/HTML/fr/kdm/index.docbook share/doc/HTML/fr/kdm/kdmrc-ref.docbook share/doc/HTML/fr/kdvi/common share/doc/HTML/fr/kdvi/index.cache.bz2 @@ -793,10 +794,7 @@ share/doc/HTML/fr/kjots/index.docbook share/doc/HTML/fr/kjumpingcube/common share/doc/HTML/fr/kjumpingcube/index.cache.bz2 share/doc/HTML/fr/kjumpingcube/index.docbook -share/doc/HTML/fr/kleopatra/common share/doc/HTML/fr/kleopatra/entities.docbook -share/doc/HTML/fr/kleopatra/index.cache.bz2 -share/doc/HTML/fr/kleopatra/index.docbook share/doc/HTML/fr/klettres/common share/doc/HTML/fr/klettres/index.cache.bz2 share/doc/HTML/fr/klettres/index.docbook @@ -897,6 +895,9 @@ share/doc/HTML/fr/kmplot/menu.docbook share/doc/HTML/fr/kmplot/reference.docbook share/doc/HTML/fr/kmplot/settingsdlg.png share/doc/HTML/fr/kmplot/using.docbook +share/doc/HTML/fr/knetworkconf/common +share/doc/HTML/fr/knetworkconf/index.cache.bz2 +share/doc/HTML/fr/knetworkconf/index.docbook share/doc/HTML/fr/knewsticker/common share/doc/HTML/fr/knewsticker/contextmenu.png share/doc/HTML/fr/knewsticker/index.cache.bz2 @@ -2211,6 +2212,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/knotes @dirrm share/doc/HTML/fr/knode @dirrm share/doc/HTML/fr/knewsticker +@dirrm share/doc/HTML/fr/knetworkconf @dirrm share/doc/HTML/fr/kmplot @dirrm share/doc/HTML/fr/kmouth @dirrm share/doc/HTML/fr/kmousetool diff --git a/french/kde4-l10n/distinfo b/french/kde4-l10n/distinfo index 19f8352d9d1e..df9bb6fe995b 100644 --- a/french/kde4-l10n/distinfo +++ b/french/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 1fdeb2af12a6096258d08ff339000e8c -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 477627ef33321ced2a78462331a722f03ca2802dbdfc95242c3821d8c7cb6f9c -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.4.tar.bz2) = 19929878 +MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 0a0e9ba98b33e81a092110563def9ca4 +SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 69ac0f012a711437691d3ad2e1404ac839f9244abe6917c02f6d980b4e1fa688 +SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.5.tar.bz2) = 19954633 diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist index d24df720f9a7..3537303787ef 100644 --- a/french/kde4-l10n/pkg-plist +++ b/french/kde4-l10n/pkg-plist @@ -385,6 +385,10 @@ share/doc/HTML/fr/kdebugdialog/index.cache.bz2 share/doc/HTML/fr/kdebugdialog/index.docbook share/doc/HTML/fr/kdelibs/man-artsmessage.1.docbook share/doc/HTML/fr/kdelibs/man-checkXML.1.docbook +share/doc/HTML/fr/kdelibs/man-dcop.1.docbook +share/doc/HTML/fr/kdelibs/man-kbuildsycoca.8.docbook +share/doc/HTML/fr/kdelibs/man-kdeoptions.7.docbook +share/doc/HTML/fr/kdelibs/man-qtoptions.7.docbook share/doc/HTML/fr/kdelirc/irkick/common share/doc/HTML/fr/kdelirc/irkick/index.cache.bz2 share/doc/HTML/fr/kdelirc/irkick/index.docbook @@ -443,9 +447,6 @@ share/doc/HTML/fr/kdf/kdf_config.png share/doc/HTML/fr/kdict/common share/doc/HTML/fr/kdict/index.cache.bz2 share/doc/HTML/fr/kdict/index.docbook -share/doc/HTML/fr/kdm/common -share/doc/HTML/fr/kdm/index.cache.bz2 -share/doc/HTML/fr/kdm/index.docbook share/doc/HTML/fr/kdm/kdmrc-ref.docbook share/doc/HTML/fr/kdvi/common share/doc/HTML/fr/kdvi/index.cache.bz2 @@ -793,10 +794,7 @@ share/doc/HTML/fr/kjots/index.docbook share/doc/HTML/fr/kjumpingcube/common share/doc/HTML/fr/kjumpingcube/index.cache.bz2 share/doc/HTML/fr/kjumpingcube/index.docbook -share/doc/HTML/fr/kleopatra/common share/doc/HTML/fr/kleopatra/entities.docbook -share/doc/HTML/fr/kleopatra/index.cache.bz2 -share/doc/HTML/fr/kleopatra/index.docbook share/doc/HTML/fr/klettres/common share/doc/HTML/fr/klettres/index.cache.bz2 share/doc/HTML/fr/klettres/index.docbook @@ -897,6 +895,9 @@ share/doc/HTML/fr/kmplot/menu.docbook share/doc/HTML/fr/kmplot/reference.docbook share/doc/HTML/fr/kmplot/settingsdlg.png share/doc/HTML/fr/kmplot/using.docbook +share/doc/HTML/fr/knetworkconf/common +share/doc/HTML/fr/knetworkconf/index.cache.bz2 +share/doc/HTML/fr/knetworkconf/index.docbook share/doc/HTML/fr/knewsticker/common share/doc/HTML/fr/knewsticker/contextmenu.png share/doc/HTML/fr/knewsticker/index.cache.bz2 @@ -2211,6 +2212,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/knotes @dirrm share/doc/HTML/fr/knode @dirrm share/doc/HTML/fr/knewsticker +@dirrm share/doc/HTML/fr/knetworkconf @dirrm share/doc/HTML/fr/kmplot @dirrm share/doc/HTML/fr/kmouth @dirrm share/doc/HTML/fr/kmousetool diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile index 3fa52e8eb71e..772cd8a5320b 100644 --- a/french/koffice-i18n/Makefile +++ b/french/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/koffice-i18n/distinfo b/french/koffice-i18n/distinfo index 02435d2ce79b..b4d9b06a4253 100644 --- a/french/koffice-i18n/distinfo +++ b/french/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 8f868a919c6ccb66b719196d3e842910 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 518d1c7a20fe440fbb977ff80ee716088a584c770c932366aee51cc1fdad0137 -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 6613741 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 diff --git a/french/koffice-i18n/pkg-plist b/french/koffice-i18n/pkg-plist index a9a3581bbfcd..26b46d27aa38 100644 --- a/french/koffice-i18n/pkg-plist +++ b/french/koffice-i18n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/fr.xml +share/doc/HTML/fr/karbon/common +share/doc/HTML/fr/karbon/index.cache.bz2 +share/doc/HTML/fr/karbon/index.docbook share/doc/HTML/fr/kchart/common share/doc/HTML/fr/kchart/file-toolbar.png share/doc/HTML/fr/kchart/file-toolbar2.png @@ -395,6 +398,7 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo +share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo @@ -433,5 +437,6 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kivio @dirrm share/doc/HTML/fr/kformula @dirrm share/doc/HTML/fr/kchart +@dirrm share/doc/HTML/fr/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile index 3fa52e8eb71e..772cd8a5320b 100644 --- a/french/koffice-kde4-l10n/Makefile +++ b/french/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= french kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/french/koffice-kde4-l10n/distinfo b/french/koffice-kde4-l10n/distinfo index 02435d2ce79b..b4d9b06a4253 100644 --- a/french/koffice-kde4-l10n/distinfo +++ b/french/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 8f868a919c6ccb66b719196d3e842910 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 518d1c7a20fe440fbb977ff80ee716088a584c770c932366aee51cc1fdad0137 -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.2.tar.bz2) = 6613741 +MD5 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 74a658f3f323f016b202cc4e2063da19 +SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = b180dd0d941883eac98304a54445e8c2046ab523af799f0c0cdf045d9fc0d27d +SIZE (KDE/kde-i18n/koffice-l10n-fr-1.6.1.tar.bz2) = 6597505 diff --git a/french/koffice-kde4-l10n/pkg-plist b/french/koffice-kde4-l10n/pkg-plist index a9a3581bbfcd..26b46d27aa38 100644 --- a/french/koffice-kde4-l10n/pkg-plist +++ b/french/koffice-kde4-l10n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/fr.xml +share/doc/HTML/fr/karbon/common +share/doc/HTML/fr/karbon/index.cache.bz2 +share/doc/HTML/fr/karbon/index.docbook share/doc/HTML/fr/kchart/common share/doc/HTML/fr/kchart/file-toolbar.png share/doc/HTML/fr/kchart/file-toolbar2.png @@ -395,6 +398,7 @@ share/locale/fr/LC_MESSAGES/desktop_koffice.mo share/locale/fr/LC_MESSAGES/example.mo share/locale/fr/LC_MESSAGES/karbon.mo share/locale/fr/LC_MESSAGES/kchart.mo +share/locale/fr/LC_MESSAGES/kdgantt.mo share/locale/fr/LC_MESSAGES/kexi.mo share/locale/fr/LC_MESSAGES/kfile_abiword.mo share/locale/fr/LC_MESSAGES/kfile_gnumeric.mo @@ -433,5 +437,6 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kivio @dirrm share/doc/HTML/fr/kformula @dirrm share/doc/HTML/fr/kchart +@dirrm share/doc/HTML/fr/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/games/atlantikdesigner/distinfo b/games/atlantikdesigner/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/games/atlantikdesigner/distinfo +++ b/games/atlantikdesigner/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/games/atlantikdesigner/pkg-plist b/games/atlantikdesigner/pkg-plist index 3e514b457576..4468941b87ba 100644 --- a/games/atlantikdesigner/pkg-plist +++ b/games/atlantikdesigner/pkg-plist @@ -1,6 +1,6 @@ bin/atlantikdesigner share/applications/kde/atlantikdesigner.desktop -share/applications/kdeaddons-atlantikdesigner-3.5.4 +share/applications/kdeaddons-atlantikdesigner-3.5.5 share/apps/atlantikdesigner/atlantikdesignerui.rc share/icons/hicolor/16x16/apps/atlantikdesigner.png share/icons/hicolor/32x32/apps/atlantikdesigner.png diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 243c3edb7b70..ec8e97dc049c 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -27,6 +27,23 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib CONFIGURE_ARGS= --disable-setgid +DECKS= ${WRKSRC}/libkdegames/carddecks/decks/ + +.if defined(WITHOUT_TUX) +PLIST_SUB+= FREEBSD_DECK="@comment " +.else +PLIST_SUB+= FREEBSD_DECK="" +.endif + +post-extract: +.if defined(WITHOUT_TUX) + ${CP} ${FILESDIR}/deck_freebsd.desktop ${DECKS}deck14.desktop + ${CP} ${FILESDIR}/deck_freebsd.png ${DECKS}/deck14.png +.else + ${CP} ${FILESDIR}/deck_freebsd.desktop ${DECKS} + ${CP} ${FILESDIR}/deck_freebsd.png ${DECKS} +.endif + post-patch: @${REINPLACE_CMD} -e 's|root:root|${BINOWN}:${BINGRP}|g' \ ${WRKSRC}/kgoldrunner/gamedata/Makefile.in diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 9a750aa43f91..5870312f8c71 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.4.tar.bz2) = 60bb42c51c2e86a826188da457ed21d0 -SHA256 (KDE/kdegames-3.5.4.tar.bz2) = 280d0b257f51d383cd2bdd78ce36767d8bfebe6a56f3cf28c1fd558041917625 -SIZE (KDE/kdegames-3.5.4.tar.bz2) = 10737313 +MD5 (KDE/kdegames-3.5.5.tar.bz2) = 1db8e3960ffb6af0a8d683756b89efa7 +SHA256 (KDE/kdegames-3.5.5.tar.bz2) = 957563339f241c7bd5d6ec3a4fedc21a0c20387b7a01fc4bd62ce892eae68935 +SIZE (KDE/kdegames-3.5.5.tar.bz2) = 10749927 diff --git a/games/kdegames3/files/deck_freebsd.desktop b/games/kdegames3/files/deck_freebsd.desktop new file mode 100644 index 000000000000..0ce51c823526 --- /dev/null +++ b/games/kdegames3/files/deck_freebsd.desktop @@ -0,0 +1,60 @@ +[KDE Cards] +Name=FreeBSD +Name[af]=FreeBSD +Name[ar]=FreeBSD +Name[az]=FreeBSD +Name[bg]=FreeBSD +Name[bn]=FreeBSD +Name[br]=FreeBSD +Name[bs]=FreeBSD +Name[ca]=FreeBSD +Name[cs]=FreeBSD +Name[cy]=FreeBSD +Name[da]=FreeBSD +Name[de]=FreeBSD +Name[el]=FreeBSD +Name[eo]=FreeBSD +Name[es]=FreeBSD +Name[et]=FreeBSD +Name[eu]=FreeBSD +Name[fi]=FreeBSD +Name[fr]=FreeBSD +Name[gl]=FreeBSD +Name[he]=FreeBSD +Name[hi]=FreeBSD +Name[hr]=FreeBSD +Name[hu]=FreeBSD +Name[is]=FreeBSD +Name[it]=FreeBSD +Name[km]=FreeBSD +Name[ko]=FreeBSD +Name[lt]=FreeBSD +Name[lv]=FreeBSD +Name[mk]=FreeBSD +Name[mt]=FreeBSD +Name[nb]=FreeBSD +Name[nl]=FreeBSD +Name[nn]=FreeBSD +Name[pa]=FreeBSD +Name[pl]=FreeBSD +Name[pt]=FreeBSD +Name[pt_BR]=FreeBSD +Name[ro]=FreeBSD +Name[ru]=FreeBSD +Name[sk]=FreeBSD +Name[sl]=FreeBSD +Name[sr]=FreeBSD +Name[sr@Latn]=FreeBSD +Name[sv]=FreeBSD +Name[ta]=FreeBSD +Name[tg]=FreeBSD +Name[th]=FreeBSD +Name[tr]=FreeBSD +Name[uk]=FreeBSD +Name[uz]=FreeBSD +Name[vi]=FreeBSD +Name[wa]=FreeBSD +Name[xh]=FreeBSD +Name[zh_CN]=FreeBSD +Name[zh_TW]=FreeBSD +Name[zu]=FreeBSD diff --git a/games/kdegames3/files/deck_freebsd.png b/games/kdegames3/files/deck_freebsd.png Binary files differnew file mode 100644 index 000000000000..649d9c188be0 --- /dev/null +++ b/games/kdegames3/files/deck_freebsd.png diff --git a/games/kdegames3/pkg-plist b/games/kdegames3/pkg-plist index 2c7507c26ad2..f849dcb8affb 100644 --- a/games/kdegames3/pkg-plist +++ b/games/kdegames3/pkg-plist @@ -844,6 +844,8 @@ share/apps/carddecks/decks/deck8.desktop share/apps/carddecks/decks/deck8.png share/apps/carddecks/decks/deck9.desktop share/apps/carddecks/decks/deck9.png +%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.desktop +%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.png share/apps/kasteroids/kasteroidsui.rc share/apps/kasteroids/sounds/Explosion.wav share/apps/kasteroids/sprites/bg.png diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile index 243c3edb7b70..ec8e97dc049c 100644 --- a/games/kdegames4/Makefile +++ b/games/kdegames4/Makefile @@ -27,6 +27,23 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib CONFIGURE_ARGS= --disable-setgid +DECKS= ${WRKSRC}/libkdegames/carddecks/decks/ + +.if defined(WITHOUT_TUX) +PLIST_SUB+= FREEBSD_DECK="@comment " +.else +PLIST_SUB+= FREEBSD_DECK="" +.endif + +post-extract: +.if defined(WITHOUT_TUX) + ${CP} ${FILESDIR}/deck_freebsd.desktop ${DECKS}deck14.desktop + ${CP} ${FILESDIR}/deck_freebsd.png ${DECKS}/deck14.png +.else + ${CP} ${FILESDIR}/deck_freebsd.desktop ${DECKS} + ${CP} ${FILESDIR}/deck_freebsd.png ${DECKS} +.endif + post-patch: @${REINPLACE_CMD} -e 's|root:root|${BINOWN}:${BINGRP}|g' \ ${WRKSRC}/kgoldrunner/gamedata/Makefile.in diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index 9a750aa43f91..5870312f8c71 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.4.tar.bz2) = 60bb42c51c2e86a826188da457ed21d0 -SHA256 (KDE/kdegames-3.5.4.tar.bz2) = 280d0b257f51d383cd2bdd78ce36767d8bfebe6a56f3cf28c1fd558041917625 -SIZE (KDE/kdegames-3.5.4.tar.bz2) = 10737313 +MD5 (KDE/kdegames-3.5.5.tar.bz2) = 1db8e3960ffb6af0a8d683756b89efa7 +SHA256 (KDE/kdegames-3.5.5.tar.bz2) = 957563339f241c7bd5d6ec3a4fedc21a0c20387b7a01fc4bd62ce892eae68935 +SIZE (KDE/kdegames-3.5.5.tar.bz2) = 10749927 diff --git a/games/kdegames4/files/deck_freebsd.desktop b/games/kdegames4/files/deck_freebsd.desktop new file mode 100644 index 000000000000..0ce51c823526 --- /dev/null +++ b/games/kdegames4/files/deck_freebsd.desktop @@ -0,0 +1,60 @@ +[KDE Cards] +Name=FreeBSD +Name[af]=FreeBSD +Name[ar]=FreeBSD +Name[az]=FreeBSD +Name[bg]=FreeBSD +Name[bn]=FreeBSD +Name[br]=FreeBSD +Name[bs]=FreeBSD +Name[ca]=FreeBSD +Name[cs]=FreeBSD +Name[cy]=FreeBSD +Name[da]=FreeBSD +Name[de]=FreeBSD +Name[el]=FreeBSD +Name[eo]=FreeBSD +Name[es]=FreeBSD +Name[et]=FreeBSD +Name[eu]=FreeBSD +Name[fi]=FreeBSD +Name[fr]=FreeBSD +Name[gl]=FreeBSD +Name[he]=FreeBSD +Name[hi]=FreeBSD +Name[hr]=FreeBSD +Name[hu]=FreeBSD +Name[is]=FreeBSD +Name[it]=FreeBSD +Name[km]=FreeBSD +Name[ko]=FreeBSD +Name[lt]=FreeBSD +Name[lv]=FreeBSD +Name[mk]=FreeBSD +Name[mt]=FreeBSD +Name[nb]=FreeBSD +Name[nl]=FreeBSD +Name[nn]=FreeBSD +Name[pa]=FreeBSD +Name[pl]=FreeBSD +Name[pt]=FreeBSD +Name[pt_BR]=FreeBSD +Name[ro]=FreeBSD +Name[ru]=FreeBSD +Name[sk]=FreeBSD +Name[sl]=FreeBSD +Name[sr]=FreeBSD +Name[sr@Latn]=FreeBSD +Name[sv]=FreeBSD +Name[ta]=FreeBSD +Name[tg]=FreeBSD +Name[th]=FreeBSD +Name[tr]=FreeBSD +Name[uk]=FreeBSD +Name[uz]=FreeBSD +Name[vi]=FreeBSD +Name[wa]=FreeBSD +Name[xh]=FreeBSD +Name[zh_CN]=FreeBSD +Name[zh_TW]=FreeBSD +Name[zu]=FreeBSD diff --git a/games/kdegames4/files/deck_freebsd.png b/games/kdegames4/files/deck_freebsd.png Binary files differnew file mode 100644 index 000000000000..649d9c188be0 --- /dev/null +++ b/games/kdegames4/files/deck_freebsd.png diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist index 2c7507c26ad2..f849dcb8affb 100644 --- a/games/kdegames4/pkg-plist +++ b/games/kdegames4/pkg-plist @@ -844,6 +844,8 @@ share/apps/carddecks/decks/deck8.desktop share/apps/carddecks/decks/deck8.png share/apps/carddecks/decks/deck9.desktop share/apps/carddecks/decks/deck9.png +%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.desktop +%%FREEBSD_DECK%%share/apps/carddecks/decks/deck_freebsd.png share/apps/kasteroids/kasteroidsui.rc share/apps/kasteroids/sounds/Explosion.wav share/apps/kasteroids/sprites/bg.png diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile index 7ec8da990525..2755f853e1ca 100644 --- a/german/calligra-l10n/Makefile +++ b/german/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/calligra-l10n/distinfo b/german/calligra-l10n/distinfo index 8bf77d0cbc69..20b79849be3b 100644 --- a/german/calligra-l10n/distinfo +++ b/german/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = ef007ab98ffe65ce072a9245f51b01e1 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 18ef230b484c0a844fb73fd54d4b00d6bfd77950bff74b9ab277dd76cef534b3 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 4361303 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 diff --git a/german/calligra-l10n/pkg-plist b/german/calligra-l10n/pkg-plist index cac9dfebd987..32270fbc27d7 100644 --- a/german/calligra-l10n/pkg-plist +++ b/german/calligra-l10n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/de.xml +share/doc/HTML/de/karbon/common +share/doc/HTML/de/karbon/index.cache.bz2 +share/doc/HTML/de/karbon/index.docbook share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook @@ -29,6 +32,7 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/credits.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -71,6 +75,10 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/installation.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -243,6 +251,7 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo +share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -273,11 +282,14 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kword @dirrm share/doc/HTML/de/kugar @dirrm share/doc/HTML/de/kspread +@dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio @dirrm share/doc/HTML/de/kformula +@dirrm share/doc/HTML/de/kexi @dirrm share/doc/HTML/de/kchart +@dirrm share/doc/HTML/de/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/german/kde3-i18n/distinfo b/german/kde3-i18n/distinfo index e72482d3b439..7ca53a0c4233 100644 --- a/german/kde3-i18n/distinfo +++ b/german/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 45b90d7e08391836108ca3db19c0febf -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 978365a591d183fb2775276a6e7d7f89b09fe3227283d385f0cd44c130929578 -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 22257504 +MD5 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = a99bf0e5d298fce191ad2c938af3afdb +SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = b50ee614bc6045ba3b7e2508fcd1213c0d2c45b31a6da9e50513a6aff0a66d80 +SIZE (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = 23235722 diff --git a/german/kde3-i18n/pkg-plist b/german/kde3-i18n/pkg-plist index 2d337a221d78..ec3a7321ed84 100644 --- a/german/kde3-i18n/pkg-plist +++ b/german/kde3-i18n/pkg-plist @@ -252,6 +252,7 @@ share/doc/HTML/de/kbabel/catman.docbook share/doc/HTML/de/kbabel/faq.docbook share/doc/HTML/de/kbabel/glossary.docbook share/doc/HTML/de/kbabel/kbabeldict.docbook +share/doc/HTML/de/kbabel/man-catalogmanager.1.docbook share/doc/HTML/de/kbabel/menu.docbook share/doc/HTML/de/kbabel/preferences.docbook share/doc/HTML/de/kbabel/using.docbook @@ -537,9 +538,35 @@ share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 share/doc/HTML/de/kenolaba/index.docbook share/doc/HTML/de/kenolaba/man-kenolaba.6.docbook +share/doc/HTML/de/kfilereplace/addstringsdialog_window.png +share/doc/HTML/de/kfilereplace/backup_option.png +share/doc/HTML/de/kfilereplace/casesensitive_option.png +share/doc/HTML/de/kfilereplace/command_option.png share/doc/HTML/de/kfilereplace/common +share/doc/HTML/de/kfilereplace/edit.png +share/doc/HTML/de/kfilereplace/edit_add.png +share/doc/HTML/de/kfilereplace/edit_remove.png +share/doc/HTML/de/kfilereplace/eraser.png +share/doc/HTML/de/kfilereplace/filereplace.png +share/doc/HTML/de/kfilereplace/filesearch.png +share/doc/HTML/de/kfilereplace/filesimulate.png share/doc/HTML/de/kfilereplace/index.cache.bz2 share/doc/HTML/de/kfilereplace/index.docbook +share/doc/HTML/de/kfilereplace/invert.png +share/doc/HTML/de/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/de/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/de/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/de/kfilereplace/project.png +share/doc/HTML/de/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/de/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/de/kfilereplace/recursive_option.png +share/doc/HTML/de/kfilereplace/regularexpression_option.png +share/doc/HTML/de/kfilereplace/report_example.png +share/doc/HTML/de/kfilereplace/results_view.png +share/doc/HTML/de/kfilereplace/stop.png +share/doc/HTML/de/kfilereplace/strings_view.png +share/doc/HTML/de/kfilereplace/toolbar.png +share/doc/HTML/de/kfilereplace/unsortedList.png share/doc/HTML/de/kfind/common share/doc/HTML/de/kfind/index.cache.bz2 share/doc/HTML/de/kfind/index.docbook @@ -867,6 +894,7 @@ share/doc/HTML/de/klines/index.docbook share/doc/HTML/de/klinkstatus/common share/doc/HTML/de/klinkstatus/index.cache.bz2 share/doc/HTML/de/klinkstatus/index.docbook +share/doc/HTML/de/klinkstatus/screenshot.png share/doc/HTML/de/klipper/common share/doc/HTML/de/klipper/index.cache.bz2 share/doc/HTML/de/klipper/index.docbook @@ -955,6 +983,20 @@ share/doc/HTML/de/kmplot/using.docbook share/doc/HTML/de/knetattach/common share/doc/HTML/de/knetattach/index.cache.bz2 share/doc/HTML/de/knetattach/index.docbook +share/doc/HTML/de/knetworkconf/01.png +share/doc/HTML/de/knetworkconf/02.png +share/doc/HTML/de/knetworkconf/03.png +share/doc/HTML/de/knetworkconf/04.png +share/doc/HTML/de/knetworkconf/05.png +share/doc/HTML/de/knetworkconf/06.png +share/doc/HTML/de/knetworkconf/07.png +share/doc/HTML/de/knetworkconf/08.png +share/doc/HTML/de/knetworkconf/09.png +share/doc/HTML/de/knetworkconf/11.png +share/doc/HTML/de/knetworkconf/about1.png +share/doc/HTML/de/knetworkconf/common +share/doc/HTML/de/knetworkconf/index.cache.bz2 +share/doc/HTML/de/knetworkconf/index.docbook share/doc/HTML/de/knewsticker/common share/doc/HTML/de/knewsticker/contextmenu.png share/doc/HTML/de/knewsticker/index.cache.bz2 @@ -2355,6 +2397,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/knotes @dirrm share/doc/HTML/de/knode @dirrm share/doc/HTML/de/knewsticker +@dirrm share/doc/HTML/de/knetworkconf @dirrm share/doc/HTML/de/knetattach @dirrm share/doc/HTML/de/kmplot @dirrm share/doc/HTML/de/kmouth diff --git a/german/kde4-l10n/distinfo b/german/kde4-l10n/distinfo index e72482d3b439..7ca53a0c4233 100644 --- a/german/kde4-l10n/distinfo +++ b/german/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 45b90d7e08391836108ca3db19c0febf -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 978365a591d183fb2775276a6e7d7f89b09fe3227283d385f0cd44c130929578 -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.4.tar.bz2) = 22257504 +MD5 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = a99bf0e5d298fce191ad2c938af3afdb +SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = b50ee614bc6045ba3b7e2508fcd1213c0d2c45b31a6da9e50513a6aff0a66d80 +SIZE (KDE/kde-i18n/kde-i18n-de-3.5.5.tar.bz2) = 23235722 diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist index 2d337a221d78..ec3a7321ed84 100644 --- a/german/kde4-l10n/pkg-plist +++ b/german/kde4-l10n/pkg-plist @@ -252,6 +252,7 @@ share/doc/HTML/de/kbabel/catman.docbook share/doc/HTML/de/kbabel/faq.docbook share/doc/HTML/de/kbabel/glossary.docbook share/doc/HTML/de/kbabel/kbabeldict.docbook +share/doc/HTML/de/kbabel/man-catalogmanager.1.docbook share/doc/HTML/de/kbabel/menu.docbook share/doc/HTML/de/kbabel/preferences.docbook share/doc/HTML/de/kbabel/using.docbook @@ -537,9 +538,35 @@ share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 share/doc/HTML/de/kenolaba/index.docbook share/doc/HTML/de/kenolaba/man-kenolaba.6.docbook +share/doc/HTML/de/kfilereplace/addstringsdialog_window.png +share/doc/HTML/de/kfilereplace/backup_option.png +share/doc/HTML/de/kfilereplace/casesensitive_option.png +share/doc/HTML/de/kfilereplace/command_option.png share/doc/HTML/de/kfilereplace/common +share/doc/HTML/de/kfilereplace/edit.png +share/doc/HTML/de/kfilereplace/edit_add.png +share/doc/HTML/de/kfilereplace/edit_remove.png +share/doc/HTML/de/kfilereplace/eraser.png +share/doc/HTML/de/kfilereplace/filereplace.png +share/doc/HTML/de/kfilereplace/filesearch.png +share/doc/HTML/de/kfilereplace/filesimulate.png share/doc/HTML/de/kfilereplace/index.cache.bz2 share/doc/HTML/de/kfilereplace/index.docbook +share/doc/HTML/de/kfilereplace/invert.png +share/doc/HTML/de/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/de/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/de/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/de/kfilereplace/project.png +share/doc/HTML/de/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/de/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/de/kfilereplace/recursive_option.png +share/doc/HTML/de/kfilereplace/regularexpression_option.png +share/doc/HTML/de/kfilereplace/report_example.png +share/doc/HTML/de/kfilereplace/results_view.png +share/doc/HTML/de/kfilereplace/stop.png +share/doc/HTML/de/kfilereplace/strings_view.png +share/doc/HTML/de/kfilereplace/toolbar.png +share/doc/HTML/de/kfilereplace/unsortedList.png share/doc/HTML/de/kfind/common share/doc/HTML/de/kfind/index.cache.bz2 share/doc/HTML/de/kfind/index.docbook @@ -867,6 +894,7 @@ share/doc/HTML/de/klines/index.docbook share/doc/HTML/de/klinkstatus/common share/doc/HTML/de/klinkstatus/index.cache.bz2 share/doc/HTML/de/klinkstatus/index.docbook +share/doc/HTML/de/klinkstatus/screenshot.png share/doc/HTML/de/klipper/common share/doc/HTML/de/klipper/index.cache.bz2 share/doc/HTML/de/klipper/index.docbook @@ -955,6 +983,20 @@ share/doc/HTML/de/kmplot/using.docbook share/doc/HTML/de/knetattach/common share/doc/HTML/de/knetattach/index.cache.bz2 share/doc/HTML/de/knetattach/index.docbook +share/doc/HTML/de/knetworkconf/01.png +share/doc/HTML/de/knetworkconf/02.png +share/doc/HTML/de/knetworkconf/03.png +share/doc/HTML/de/knetworkconf/04.png +share/doc/HTML/de/knetworkconf/05.png +share/doc/HTML/de/knetworkconf/06.png +share/doc/HTML/de/knetworkconf/07.png +share/doc/HTML/de/knetworkconf/08.png +share/doc/HTML/de/knetworkconf/09.png +share/doc/HTML/de/knetworkconf/11.png +share/doc/HTML/de/knetworkconf/about1.png +share/doc/HTML/de/knetworkconf/common +share/doc/HTML/de/knetworkconf/index.cache.bz2 +share/doc/HTML/de/knetworkconf/index.docbook share/doc/HTML/de/knewsticker/common share/doc/HTML/de/knewsticker/contextmenu.png share/doc/HTML/de/knewsticker/index.cache.bz2 @@ -2355,6 +2397,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/knotes @dirrm share/doc/HTML/de/knode @dirrm share/doc/HTML/de/knewsticker +@dirrm share/doc/HTML/de/knetworkconf @dirrm share/doc/HTML/de/knetattach @dirrm share/doc/HTML/de/kmplot @dirrm share/doc/HTML/de/kmouth diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile index 7ec8da990525..2755f853e1ca 100644 --- a/german/koffice-i18n/Makefile +++ b/german/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/koffice-i18n/distinfo b/german/koffice-i18n/distinfo index 8bf77d0cbc69..20b79849be3b 100644 --- a/german/koffice-i18n/distinfo +++ b/german/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = ef007ab98ffe65ce072a9245f51b01e1 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 18ef230b484c0a844fb73fd54d4b00d6bfd77950bff74b9ab277dd76cef534b3 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 4361303 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 diff --git a/german/koffice-i18n/pkg-plist b/german/koffice-i18n/pkg-plist index cac9dfebd987..32270fbc27d7 100644 --- a/german/koffice-i18n/pkg-plist +++ b/german/koffice-i18n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/de.xml +share/doc/HTML/de/karbon/common +share/doc/HTML/de/karbon/index.cache.bz2 +share/doc/HTML/de/karbon/index.docbook share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook @@ -29,6 +32,7 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/credits.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -71,6 +75,10 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/installation.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -243,6 +251,7 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo +share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -273,11 +282,14 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kword @dirrm share/doc/HTML/de/kugar @dirrm share/doc/HTML/de/kspread +@dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio @dirrm share/doc/HTML/de/kformula +@dirrm share/doc/HTML/de/kexi @dirrm share/doc/HTML/de/kchart +@dirrm share/doc/HTML/de/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile index 7ec8da990525..2755f853e1ca 100644 --- a/german/koffice-kde4-l10n/Makefile +++ b/german/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= german kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/german/koffice-kde4-l10n/distinfo b/german/koffice-kde4-l10n/distinfo index 8bf77d0cbc69..20b79849be3b 100644 --- a/german/koffice-kde4-l10n/distinfo +++ b/german/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = ef007ab98ffe65ce072a9245f51b01e1 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 18ef230b484c0a844fb73fd54d4b00d6bfd77950bff74b9ab277dd76cef534b3 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.2.tar.bz2) = 4361303 +MD5 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 9ec1030ec8f55b4689a4664a3032050d +SHA256 (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 54e661582f985092e171e5a7fde9397f123a2fc4764af507612050b8d760bc40 +SIZE (KDE/kde-i18n/koffice-l10n-de-1.6.1.tar.bz2) = 4402474 diff --git a/german/koffice-kde4-l10n/pkg-plist b/german/koffice-kde4-l10n/pkg-plist index cac9dfebd987..32270fbc27d7 100644 --- a/german/koffice-kde4-l10n/pkg-plist +++ b/german/koffice-kde4-l10n/pkg-plist @@ -1,4 +1,7 @@ share/apps/koffice/autocorrect/de.xml +share/doc/HTML/de/karbon/common +share/doc/HTML/de/karbon/index.cache.bz2 +share/doc/HTML/de/karbon/index.docbook share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook @@ -29,6 +32,7 @@ share/doc/HTML/de/kchart/kchart-wizard3.png share/doc/HTML/de/kchart/kchart-wizard4.png share/doc/HTML/de/kchart/shortcut.png share/doc/HTML/de/kchart/toolbars.png +share/doc/HTML/de/kexi/credits.docbook share/doc/HTML/de/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common share/doc/HTML/de/kformula/green1.png @@ -71,6 +75,10 @@ share/doc/HTML/de/kpresenter/menus.docbook share/doc/HTML/de/kpresenter/options.docbook share/doc/HTML/de/kpresenter/screen.docbook share/doc/HTML/de/kpresenter/tutorial.docbook +share/doc/HTML/de/krita/commands.docbook +share/doc/HTML/de/krita/credits.docbook +share/doc/HTML/de/krita/developers.docbook +share/doc/HTML/de/krita/installation.docbook share/doc/HTML/de/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook @@ -243,6 +251,7 @@ share/locale/de/LC_MESSAGES/desktop_koffice.mo share/locale/de/LC_MESSAGES/example.mo share/locale/de/LC_MESSAGES/karbon.mo share/locale/de/LC_MESSAGES/kchart.mo +share/locale/de/LC_MESSAGES/kdgantt.mo share/locale/de/LC_MESSAGES/kexi.mo share/locale/de/LC_MESSAGES/kfile_abiword.mo share/locale/de/LC_MESSAGES/kfile_gnumeric.mo @@ -273,11 +282,14 @@ share/locale/de/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/de/kword @dirrm share/doc/HTML/de/kugar @dirrm share/doc/HTML/de/kspread +@dirrm share/doc/HTML/de/krita @dirrm share/doc/HTML/de/kpresenter @dirrm share/doc/HTML/de/koshell @dirrm share/doc/HTML/de/koffice @dirrm share/doc/HTML/de/kivio @dirrm share/doc/HTML/de/kformula +@dirrm share/doc/HTML/de/kexi @dirrm share/doc/HTML/de/kchart +@dirrm share/doc/HTML/de/karbon @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/graphics/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kamera-kde4/distinfo +++ b/graphics/kamera-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kamera/distinfo +++ b/graphics/kamera/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 46c674add9b9..d9274f56f546 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index 46c674add9b9..d9274f56f546 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdegraphics PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= graphics kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kooka/distinfo +++ b/graphics/kooka/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kuickshow-kde4/distinfo +++ b/graphics/kuickshow-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo index 4ea8461c008f..3ec4b021f4d2 100644 --- a/graphics/kuickshow/distinfo +++ b/graphics/kuickshow/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.4.tar.bz2) = de1f6d0597235f52186aaeeaabe7dc08 -SHA256 (KDE/kdegraphics-3.5.4.tar.bz2) = 88d9801bd13eec622f17528f61ccfb509a8aeb34befa1f2428ad36b7b57e756e -SIZE (KDE/kdegraphics-3.5.4.tar.bz2) = 7326485 +MD5 (KDE/kdegraphics-3.5.5.tar.bz2) = cdbe15afc01c5da7af9557e803bbb7e6 +SHA256 (KDE/kdegraphics-3.5.5.tar.bz2) = b6706d37568686e1ca4b4bb2cf1f79c027b94a512f6fe1156b7c7b7f79336f16 +SIZE (KDE/kdegraphics-3.5.5.tar.bz2) = 7334117 diff --git a/hebrew/kde3-i18n/distinfo b/hebrew/kde3-i18n/distinfo index 56b4c9958e8d..18b0099355f4 100644 --- a/hebrew/kde3-i18n/distinfo +++ b/hebrew/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = b861796702141e198873614b1428cc3a -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = 0059eb8ef4c2a3397a90aa8f91180dfafbdb9d0fe1376e8efca4f6facfb81054 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = 1538947 +MD5 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2099f23192fe79f1e94c0da2184871c0 +SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = c82ec2cc67f652612b18cb9e90e4707cdb23729198b802068b25bde7a8aa4321 +SIZE (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2152893 diff --git a/hebrew/kde3-i18n/pkg-plist b/hebrew/kde3-i18n/pkg-plist index c3372faddcfa..f86601db0917 100644 --- a/hebrew/kde3-i18n/pkg-plist +++ b/hebrew/kde3-i18n/pkg-plist @@ -1,3 +1,56 @@ +share/apps/klettres/he/alpha/a-01.ogg +share/apps/klettres/he/alpha/a-02.ogg +share/apps/klettres/he/alpha/a-03.ogg +share/apps/klettres/he/alpha/a-04.ogg +share/apps/klettres/he/alpha/a-05.ogg +share/apps/klettres/he/alpha/a-06.ogg +share/apps/klettres/he/alpha/a-07.ogg +share/apps/klettres/he/alpha/a-08.ogg +share/apps/klettres/he/alpha/a-09.ogg +share/apps/klettres/he/alpha/a-10.ogg +share/apps/klettres/he/alpha/a-11.ogg +share/apps/klettres/he/alpha/a-12.ogg +share/apps/klettres/he/alpha/a-13.ogg +share/apps/klettres/he/alpha/a-14.ogg +share/apps/klettres/he/alpha/a-15.ogg +share/apps/klettres/he/alpha/a-16.ogg +share/apps/klettres/he/alpha/a-17.ogg +share/apps/klettres/he/alpha/a-18.ogg +share/apps/klettres/he/alpha/a-19.ogg +share/apps/klettres/he/alpha/a-20.ogg +share/apps/klettres/he/alpha/a-21.ogg +share/apps/klettres/he/alpha/a-22.ogg +share/apps/klettres/he/alpha/a-23.ogg +share/apps/klettres/he/alpha/a-24.ogg +share/apps/klettres/he/alpha/a-25.ogg +share/apps/klettres/he/alpha/a-26.ogg +share/apps/klettres/he/alpha/a-27.ogg +share/apps/klettres/he/sounds.xml +share/apps/klettres/he/syllab/ad-01.ogg +share/apps/klettres/he/syllab/ad-02.ogg +share/apps/klettres/he/syllab/ad-03.ogg +share/apps/klettres/he/syllab/ad-04.ogg +share/apps/klettres/he/syllab/ad-05.ogg +share/apps/klettres/he/syllab/ad-07.ogg +share/apps/klettres/he/syllab/ad-08.ogg +share/apps/klettres/he/syllab/ad-09.ogg +share/apps/klettres/he/syllab/ad-10.ogg +share/apps/klettres/he/syllab/ad-11.ogg +share/apps/klettres/he/syllab/ad-12.ogg +share/apps/klettres/he/syllab/ad-13.ogg +share/apps/klettres/he/syllab/ad-14.ogg +share/apps/klettres/he/syllab/ad-15.ogg +share/apps/klettres/he/syllab/ad-16.ogg +share/apps/klettres/he/syllab/ad-17.ogg +share/apps/klettres/he/syllab/ad-18.ogg +share/apps/klettres/he/syllab/ad-19.ogg +share/apps/klettres/he/syllab/ad-20.ogg +share/apps/klettres/he/syllab/ad-21.ogg +share/apps/klettres/he/syllab/ad-22.ogg +share/apps/klettres/he/syllab/ad-23.ogg +share/apps/klettres/he/syllab/ad-24.ogg +share/apps/klettres/he/syllab/ad-25.ogg +share/apps/klettres/he/syllab/ad-26.ogg share/doc/HTML/he/docs/common/fdl-translated.html share/doc/HTML/he/docs/common/gpl-translated.html share/doc/HTML/he/docs/common/kde-localised.css @@ -413,6 +466,7 @@ share/locale/he/LC_MESSAGES/ktimer.mo share/locale/he/LC_MESSAGES/ktip.mo share/locale/he/LC_MESSAGES/ktouch.mo share/locale/he/LC_MESSAGES/ktron.mo +share/locale/he/LC_MESSAGES/kttsd.mo share/locale/he/LC_MESSAGES/ktuberling.mo share/locale/he/LC_MESSAGES/kturtle.mo share/locale/he/LC_MESSAGES/ktux.mo @@ -498,3 +552,7 @@ share/locale/he/flag.png @dirrm share/doc/HTML/he/khelpcenter @dirrm share/doc/HTML/he/docs/common @dirrm share/doc/HTML/he/docs +@dirrm share/apps/klettres/he/syllab +@dirrm share/apps/klettres/he/alpha +@dirrm share/apps/klettres/he +@dirrm share/apps/klettres diff --git a/hebrew/kde4-l10n/distinfo b/hebrew/kde4-l10n/distinfo index 56b4c9958e8d..18b0099355f4 100644 --- a/hebrew/kde4-l10n/distinfo +++ b/hebrew/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = b861796702141e198873614b1428cc3a -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = 0059eb8ef4c2a3397a90aa8f91180dfafbdb9d0fe1376e8efca4f6facfb81054 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.4.tar.bz2) = 1538947 +MD5 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2099f23192fe79f1e94c0da2184871c0 +SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = c82ec2cc67f652612b18cb9e90e4707cdb23729198b802068b25bde7a8aa4321 +SIZE (KDE/kde-i18n/kde-i18n-he-3.5.5.tar.bz2) = 2152893 diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist index c3372faddcfa..f86601db0917 100644 --- a/hebrew/kde4-l10n/pkg-plist +++ b/hebrew/kde4-l10n/pkg-plist @@ -1,3 +1,56 @@ +share/apps/klettres/he/alpha/a-01.ogg +share/apps/klettres/he/alpha/a-02.ogg +share/apps/klettres/he/alpha/a-03.ogg +share/apps/klettres/he/alpha/a-04.ogg +share/apps/klettres/he/alpha/a-05.ogg +share/apps/klettres/he/alpha/a-06.ogg +share/apps/klettres/he/alpha/a-07.ogg +share/apps/klettres/he/alpha/a-08.ogg +share/apps/klettres/he/alpha/a-09.ogg +share/apps/klettres/he/alpha/a-10.ogg +share/apps/klettres/he/alpha/a-11.ogg +share/apps/klettres/he/alpha/a-12.ogg +share/apps/klettres/he/alpha/a-13.ogg +share/apps/klettres/he/alpha/a-14.ogg +share/apps/klettres/he/alpha/a-15.ogg +share/apps/klettres/he/alpha/a-16.ogg +share/apps/klettres/he/alpha/a-17.ogg +share/apps/klettres/he/alpha/a-18.ogg +share/apps/klettres/he/alpha/a-19.ogg +share/apps/klettres/he/alpha/a-20.ogg +share/apps/klettres/he/alpha/a-21.ogg +share/apps/klettres/he/alpha/a-22.ogg +share/apps/klettres/he/alpha/a-23.ogg +share/apps/klettres/he/alpha/a-24.ogg +share/apps/klettres/he/alpha/a-25.ogg +share/apps/klettres/he/alpha/a-26.ogg +share/apps/klettres/he/alpha/a-27.ogg +share/apps/klettres/he/sounds.xml +share/apps/klettres/he/syllab/ad-01.ogg +share/apps/klettres/he/syllab/ad-02.ogg +share/apps/klettres/he/syllab/ad-03.ogg +share/apps/klettres/he/syllab/ad-04.ogg +share/apps/klettres/he/syllab/ad-05.ogg +share/apps/klettres/he/syllab/ad-07.ogg +share/apps/klettres/he/syllab/ad-08.ogg +share/apps/klettres/he/syllab/ad-09.ogg +share/apps/klettres/he/syllab/ad-10.ogg +share/apps/klettres/he/syllab/ad-11.ogg +share/apps/klettres/he/syllab/ad-12.ogg +share/apps/klettres/he/syllab/ad-13.ogg +share/apps/klettres/he/syllab/ad-14.ogg +share/apps/klettres/he/syllab/ad-15.ogg +share/apps/klettres/he/syllab/ad-16.ogg +share/apps/klettres/he/syllab/ad-17.ogg +share/apps/klettres/he/syllab/ad-18.ogg +share/apps/klettres/he/syllab/ad-19.ogg +share/apps/klettres/he/syllab/ad-20.ogg +share/apps/klettres/he/syllab/ad-21.ogg +share/apps/klettres/he/syllab/ad-22.ogg +share/apps/klettres/he/syllab/ad-23.ogg +share/apps/klettres/he/syllab/ad-24.ogg +share/apps/klettres/he/syllab/ad-25.ogg +share/apps/klettres/he/syllab/ad-26.ogg share/doc/HTML/he/docs/common/fdl-translated.html share/doc/HTML/he/docs/common/gpl-translated.html share/doc/HTML/he/docs/common/kde-localised.css @@ -413,6 +466,7 @@ share/locale/he/LC_MESSAGES/ktimer.mo share/locale/he/LC_MESSAGES/ktip.mo share/locale/he/LC_MESSAGES/ktouch.mo share/locale/he/LC_MESSAGES/ktron.mo +share/locale/he/LC_MESSAGES/kttsd.mo share/locale/he/LC_MESSAGES/ktuberling.mo share/locale/he/LC_MESSAGES/kturtle.mo share/locale/he/LC_MESSAGES/ktux.mo @@ -498,3 +552,7 @@ share/locale/he/flag.png @dirrm share/doc/HTML/he/khelpcenter @dirrm share/doc/HTML/he/docs/common @dirrm share/doc/HTML/he/docs +@dirrm share/apps/klettres/he/syllab +@dirrm share/apps/klettres/he/alpha +@dirrm share/apps/klettres/he +@dirrm share/apps/klettres diff --git a/hungarian/kde3-i18n/distinfo b/hungarian/kde3-i18n/distinfo index f0017d49b8e4..cfaf8a726bf8 100644 --- a/hungarian/kde3-i18n/distinfo +++ b/hungarian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = cc25aebee25f07bfe6510cdcf39e743d -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = 023033b435a222eb8314eefeef1ea76134d9b8e4bf2fe8c8e4ee4ace7fd42f92 -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = 2974328 +MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 9638821a380cf7a8697b03dca2f3513d +SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 68726fb3261558cffa08c160c08274b7fee743ab0200769bdc6c3a2ed577317b +SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 2980243 diff --git a/hungarian/kde4-l10n/distinfo b/hungarian/kde4-l10n/distinfo index f0017d49b8e4..cfaf8a726bf8 100644 --- a/hungarian/kde4-l10n/distinfo +++ b/hungarian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = cc25aebee25f07bfe6510cdcf39e743d -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = 023033b435a222eb8314eefeef1ea76134d9b8e4bf2fe8c8e4ee4ace7fd42f92 -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.4.tar.bz2) = 2974328 +MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 9638821a380cf7a8697b03dca2f3513d +SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 68726fb3261558cffa08c160c08274b7fee743ab0200769bdc6c3a2ed577317b +SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.5.tar.bz2) = 2980243 diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile index 9fece577406f..e25e0b67fd35 100644 --- a/hungarian/koffice-i18n/Makefile +++ b/hungarian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= hungarian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/hungarian/koffice-i18n/distinfo b/hungarian/koffice-i18n/distinfo index bfac6389c370..aa1fc0e064ee 100644 --- a/hungarian/koffice-i18n/distinfo +++ b/hungarian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-hu-1.5.2.tar.bz2) = cd57e11f100ffabf6a3c72faa6433569 -SHA256 (KDE/kde-i18n/koffice-l10n-hu-1.5.2.tar.bz2) = 7936460ea14c26219c81e7c402253da2dbc1d86fe3391bdd27112d39574fc0bb -SIZE (KDE/kde-i18n/koffice-l10n-hu-1.5.2.tar.bz2) = 368794 +MD5 (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = 406eef87386bea965c9d0ec224b0a6aa +SHA256 (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = bbb9c6dd0c8cb799469c3ce86b9fb30e4d9cb8b0566855f5899a581306d421bd +SIZE (KDE/kde-i18n/koffice-l10n-hu-1.6.1.tar.bz2) = 379271 diff --git a/hungarian/koffice-i18n/pkg-plist b/hungarian/koffice-i18n/pkg-plist index 414549d32b67..f8f919a9cfc4 100644 --- a/hungarian/koffice-i18n/pkg-plist +++ b/hungarian/koffice-i18n/pkg-plist @@ -3,6 +3,7 @@ share/locale/hu/LC_MESSAGES/desktop_koffice.mo share/locale/hu/LC_MESSAGES/example.mo share/locale/hu/LC_MESSAGES/karbon.mo share/locale/hu/LC_MESSAGES/kchart.mo +share/locale/hu/LC_MESSAGES/kdgantt.mo share/locale/hu/LC_MESSAGES/kexi.mo share/locale/hu/LC_MESSAGES/kfile_abiword.mo share/locale/hu/LC_MESSAGES/kfile_gnumeric.mo diff --git a/japanese/kde3-i18n/distinfo b/japanese/kde3-i18n/distinfo index 992d2786863f..c42703656cc3 100644 --- a/japanese/kde3-i18n/distinfo +++ b/japanese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = 48f1c83d7a1b08429ec4ac003a85293f -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = c6d2987159db4ab1cbf07705fe8a5fad6107d18050472f84c07360542ff8a551 -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = 2375431 +MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 3b89aa140388f7b0e3beb80ef2b8b247 +SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 8ec25e54c9d13ef78cd49f630cf8f79671027f7574c9820241976e04d6d61c4b +SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 2395539 diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo index 992d2786863f..c42703656cc3 100644 --- a/japanese/kde4-l10n/distinfo +++ b/japanese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = 48f1c83d7a1b08429ec4ac003a85293f -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = c6d2987159db4ab1cbf07705fe8a5fad6107d18050472f84c07360542ff8a551 -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.4.tar.bz2) = 2375431 +MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 3b89aa140388f7b0e3beb80ef2b8b247 +SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 8ec25e54c9d13ef78cd49f630cf8f79671027f7574c9820241976e04d6d61c4b +SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.5.tar.bz2) = 2395539 diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile index d1dac099dddd..6ecc72c0c4de 100644 --- a/japanese/koffice-i18n/Makefile +++ b/japanese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= japanese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/japanese/koffice-i18n/distinfo b/japanese/koffice-i18n/distinfo index cfbb2d757e6b..803afe0f73b2 100644 --- a/japanese/koffice-i18n/distinfo +++ b/japanese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 7eb7880c8e03a8c905a7bba06423fdde -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 420fcb3b97b3705436aa2e7284fef8ddc426f903ab3f0f03ff3ab15926f179df -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 347399 +MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 39ba5b3618221ee6fa896aa16aa9f6a9 +SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 547292119e33e560aec4e2224bff22a376358485a90f2acd6057fbf0fc8cfd57 +SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 355377 diff --git a/japanese/koffice-i18n/pkg-plist b/japanese/koffice-i18n/pkg-plist index 0c56a506f727..543e5552a3ed 100644 --- a/japanese/koffice-i18n/pkg-plist +++ b/japanese/koffice-i18n/pkg-plist @@ -2,6 +2,7 @@ share/locale/ja/LC_MESSAGES/desktop_koffice.mo share/locale/ja/LC_MESSAGES/example.mo share/locale/ja/LC_MESSAGES/karbon.mo share/locale/ja/LC_MESSAGES/kchart.mo +share/locale/ja/LC_MESSAGES/kdgantt.mo share/locale/ja/LC_MESSAGES/kexi.mo share/locale/ja/LC_MESSAGES/kfile_abiword.mo share/locale/ja/LC_MESSAGES/kfile_gnumeric.mo diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile index d1dac099dddd..6ecc72c0c4de 100644 --- a/japanese/koffice-kde4-l10n/Makefile +++ b/japanese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= japanese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/japanese/koffice-kde4-l10n/distinfo b/japanese/koffice-kde4-l10n/distinfo index cfbb2d757e6b..803afe0f73b2 100644 --- a/japanese/koffice-kde4-l10n/distinfo +++ b/japanese/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 7eb7880c8e03a8c905a7bba06423fdde -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 420fcb3b97b3705436aa2e7284fef8ddc426f903ab3f0f03ff3ab15926f179df -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.5.2.tar.bz2) = 347399 +MD5 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 39ba5b3618221ee6fa896aa16aa9f6a9 +SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 547292119e33e560aec4e2224bff22a376358485a90f2acd6057fbf0fc8cfd57 +SIZE (KDE/kde-i18n/koffice-l10n-ja-1.6.1.tar.bz2) = 355377 diff --git a/japanese/koffice-kde4-l10n/pkg-plist b/japanese/koffice-kde4-l10n/pkg-plist index 0c56a506f727..543e5552a3ed 100644 --- a/japanese/koffice-kde4-l10n/pkg-plist +++ b/japanese/koffice-kde4-l10n/pkg-plist @@ -2,6 +2,7 @@ share/locale/ja/LC_MESSAGES/desktop_koffice.mo share/locale/ja/LC_MESSAGES/example.mo share/locale/ja/LC_MESSAGES/karbon.mo share/locale/ja/LC_MESSAGES/kchart.mo +share/locale/ja/LC_MESSAGES/kdgantt.mo share/locale/ja/LC_MESSAGES/kexi.mo share/locale/ja/LC_MESSAGES/kfile_abiword.mo share/locale/ja/LC_MESSAGES/kfile_gnumeric.mo diff --git a/korean/kde3-i18n/distinfo b/korean/kde3-i18n/distinfo index b2d48b966ed9..99a4bb515dad 100644 --- a/korean/kde3-i18n/distinfo +++ b/korean/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = af106fb9c73f61b08eb5441b0c15871f -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = c42b26ff4a2da24816b31fafda0fceae57211f3e1996b080598ac7ab42d13db6 -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = 1057617 +MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 7a364e95e894e9c58d56054edab21142 +SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 20dd325d8d20aab8e4022404533dd3cd808cd6e3e3e86fb8349c261398efc3e6 +SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 1063228 diff --git a/korean/kde4-l10n/distinfo b/korean/kde4-l10n/distinfo index b2d48b966ed9..99a4bb515dad 100644 --- a/korean/kde4-l10n/distinfo +++ b/korean/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = af106fb9c73f61b08eb5441b0c15871f -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = c42b26ff4a2da24816b31fafda0fceae57211f3e1996b080598ac7ab42d13db6 -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.4.tar.bz2) = 1057617 +MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 7a364e95e894e9c58d56054edab21142 +SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 20dd325d8d20aab8e4022404533dd3cd808cd6e3e3e86fb8349c261398efc3e6 +SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.5.tar.bz2) = 1063228 diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/misc/kaddressbook-plugins/distinfo b/misc/kaddressbook-plugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/kaddressbook-plugins/distinfo +++ b/misc/kaddressbook-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/kaddressbook-plugins/pkg-plist b/misc/kaddressbook-plugins/pkg-plist index 758b8c2a49ee..3d2f5df32f8a 100644 --- a/misc/kaddressbook-plugins/pkg-plist +++ b/misc/kaddressbook-plugins/pkg-plist @@ -4,7 +4,7 @@ lib/kde3/libkaddrbk_geo_xxport.so lib/kde3/libkaddrbk_gmx_xxport.a lib/kde3/libkaddrbk_gmx_xxport.la lib/kde3/libkaddrbk_gmx_xxport.so -share/applications/kdeaddons-kaddressbook-plugins-3.5.4 +share/applications/kdeaddons-kaddressbook-plugins-3.5.5 share/apps/kaddressbook/geo_xxportui.rc share/apps/kaddressbook/gmx_xxportui.rc share/services/kaddressbook/geo_xxport.desktop diff --git a/misc/kde3-i18n-af/distinfo b/misc/kde3-i18n-af/distinfo index 58839ef0c5d9..857af4e6afac 100644 --- a/misc/kde3-i18n-af/distinfo +++ b/misc/kde3-i18n-af/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-af-3.5.4.tar.bz2) = d2b2555c5ede01470c18684660e4940b -SHA256 (KDE/kde-i18n/kde-i18n-af-3.5.4.tar.bz2) = dfecc0ac5b5f7ce9fe3591e8bb14b60be725610cb7d677ce0101e9981f9817f8 -SIZE (KDE/kde-i18n/kde-i18n-af-3.5.4.tar.bz2) = 1530800 +MD5 (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = 3de24c2c32aba906b9e2cea304b151be +SHA256 (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = e516767fe1282cace605f1383fdf448c34c38a03f900a20606408bc55941cdee +SIZE (KDE/kde-i18n/kde-i18n-af-3.5.5.tar.bz2) = 1542197 diff --git a/misc/kde3-i18n-az/distinfo b/misc/kde3-i18n-az/distinfo index 56e17a7172dc..f02ceaaf1186 100644 --- a/misc/kde3-i18n-az/distinfo +++ b/misc/kde3-i18n-az/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-az-3.5.4.tar.bz2) = f68abcc30e9ce048e530d065654ee177 -SHA256 (KDE/kde-i18n/kde-i18n-az-3.5.4.tar.bz2) = 995f1fea1358725c7d22b0ac85e49807f0fa50bed4f6f491cdc0174776c5cbf2 -SIZE (KDE/kde-i18n/kde-i18n-az-3.5.4.tar.bz2) = 1574572 +MD5 (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = c63e0b5e0682571498b168e6f6707caf +SHA256 (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = d7b9934408e5de0b2785f62cb13b7baaa11934f6b8ed3a88da4d3817d473d635 +SIZE (KDE/kde-i18n/kde-i18n-az-3.5.5.tar.bz2) = 1579852 diff --git a/misc/kde3-i18n-bg/distinfo b/misc/kde3-i18n-bg/distinfo index 25440aab4d9f..6f10ba16fe36 100644 --- a/misc/kde3-i18n-bg/distinfo +++ b/misc/kde3-i18n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = 2340d20511d54856883c53536138da41 -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = cd2cb4dd0d98bcf7f6809d4ce0f3db0e8c3306bb1d060d2d3ea194ecc6e68c17 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = 1721444 +MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 28871147d247f33072a278f0d16a96be +SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = a860a8e8f917b3b84546a8f761bddd20ebb52950e7cedbf51b9cbd7fa7f0f361 +SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 1729850 diff --git a/misc/kde3-i18n-bn/distinfo b/misc/kde3-i18n-bn/distinfo index 9dfc3a9e52f2..11f2120aa044 100644 --- a/misc/kde3-i18n-bn/distinfo +++ b/misc/kde3-i18n-bn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bn-3.5.4.tar.bz2) = a68c7180e9229db5c308892d89a626d5 -SHA256 (KDE/kde-i18n/kde-i18n-bn-3.5.4.tar.bz2) = 8d797cdb8abc1864188a5e7eb03a1e45d31fb6e3645e57fa5975bfe62ca4ba4a -SIZE (KDE/kde-i18n/kde-i18n-bn-3.5.4.tar.bz2) = 833005 +MD5 (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = bfd5159743442c47a02ee5af4bd17c68 +SHA256 (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = 3540e560359518f8f32e4b14f467ca91832dc78b0c345c55f2a4d5e5171f41fe +SIZE (KDE/kde-i18n/kde-i18n-bn-3.5.5.tar.bz2) = 834225 diff --git a/misc/kde3-i18n-br/distinfo b/misc/kde3-i18n-br/distinfo index e00bcc0bdefe..e80478cad8b8 100644 --- a/misc/kde3-i18n-br/distinfo +++ b/misc/kde3-i18n-br/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-br-3.5.4.tar.bz2) = bd5448ae157a7d7eb064c59181737037 -SHA256 (KDE/kde-i18n/kde-i18n-br-3.5.4.tar.bz2) = 8f41765b28bd6711d8539b555c5b205f56f3e8475c5666156fcec7fc22176941 -SIZE (KDE/kde-i18n/kde-i18n-br-3.5.4.tar.bz2) = 1690518 +MD5 (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = f96e07c3b9f4905dc3f37eb829feba89 +SHA256 (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = c5b9a6e4d63880bf40bf4b9fd7f5a213f8f4cb06e14a0aaf837a018c2d95dac6 +SIZE (KDE/kde-i18n/kde-i18n-br-3.5.5.tar.bz2) = 1713238 diff --git a/misc/kde3-i18n-bs/distinfo b/misc/kde3-i18n-bs/distinfo index 2fda5b83cbd0..2f9344b6cafc 100644 --- a/misc/kde3-i18n-bs/distinfo +++ b/misc/kde3-i18n-bs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bs-3.5.4.tar.bz2) = e0f67121889538864146693390b334f6 -SHA256 (KDE/kde-i18n/kde-i18n-bs-3.5.4.tar.bz2) = dd5ddbbba9d56aed1467bdee7fcd4c8c0be1e17fb2496e45cfaba4ddf92219c6 -SIZE (KDE/kde-i18n/kde-i18n-bs-3.5.4.tar.bz2) = 1725192 +MD5 (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = 8441891d28b9785504ab1151a603d8f4 +SHA256 (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = a47732bd03379bfc96a9f18694d673feef1242f98f9807b4686976dc32eb614e +SIZE (KDE/kde-i18n/kde-i18n-bs-3.5.5.tar.bz2) = 1725587 diff --git a/misc/kde3-i18n-ca/distinfo b/misc/kde3-i18n-ca/distinfo index f2a1f0d04da5..18a1395ac0e9 100644 --- a/misc/kde3-i18n-ca/distinfo +++ b/misc/kde3-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 3666508969cbe2ce8a52f0a6f67bf3f4 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 2327caba7df4a9a960766babd4efddfbc3fe5ea326d284d82511b8a76d40c3f5 -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 4687349 +MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = fec16708dc8c3e9a864d5ad9e45f06b8 +SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 4141d21cbc7d6a3f039afc43532061e5fc8c5b874b3768e8c0ed1919bb9b6a57 +SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 6787316 diff --git a/misc/kde3-i18n-ca/pkg-plist b/misc/kde3-i18n-ca/pkg-plist index d5c4c96c0495..84eec115a90c 100644 --- a/misc/kde3-i18n-ca/pkg-plist +++ b/misc/kde3-i18n-ca/pkg-plist @@ -23,6 +23,31 @@ share/doc/HTML/ca/docs/common/gpl-translated.html share/doc/HTML/ca/docs/common/kde-localised.css share/doc/HTML/ca/docs/common/lgpl-translated.html share/doc/HTML/ca/docs/common/logotp3.png +share/doc/HTML/ca/kalzium/common +share/doc/HTML/ca/kalzium/gradient.png +share/doc/HTML/ca/kalzium/index.cache.bz2 +share/doc/HTML/ca/kalzium/index.docbook +share/doc/HTML/ca/kalzium/infodialog_bohr.png +share/doc/HTML/ca/kalzium/infodialog_chemicaldata.png +share/doc/HTML/ca/kalzium/infodialog_energies.png +share/doc/HTML/ca/kalzium/infodialog_misc.png +share/doc/HTML/ca/kalzium/infodialog_overview.png +share/doc/HTML/ca/kalzium/infodialog_picture.png +share/doc/HTML/ca/kalzium/infodialog_spectrum.png +share/doc/HTML/ca/kalzium/man-kalzium.1.docbook +share/doc/HTML/ca/kalzium/plottingdialog.png +share/doc/HTML/ca/kalzium/quick-1.png +share/doc/HTML/ca/kalzium/screenshot1.png +share/doc/HTML/ca/kalzium/screenshot2.png +share/doc/HTML/ca/kalzium/screenshot7.png +share/doc/HTML/ca/kalzium/screenshoteqsolver.png +share/doc/HTML/ca/kalzium/settings1.png +share/doc/HTML/ca/kalzium/settings2.png +share/doc/HTML/ca/kalzium/settings3.png +share/doc/HTML/ca/kalzium/sidebar1.png +share/doc/HTML/ca/kalzium/sidebar2.png +share/doc/HTML/ca/kalzium/sidebar3.png +share/doc/HTML/ca/kalzium/timeline.png share/doc/HTML/ca/kappfinder/man-kappfinder.1.docbook share/doc/HTML/ca/kapptemplate/man-kapptemplate.1.docbook share/doc/HTML/ca/kate-plugins/common @@ -37,11 +62,14 @@ share/doc/HTML/ca/kate-plugins/xmlcheck.docbook share/doc/HTML/ca/kate-plugins/xmltools.docbook share/doc/HTML/ca/kate/advanced.docbook share/doc/HTML/ca/kate/common +share/doc/HTML/ca/kate/configdialog01.png +share/doc/HTML/ca/kate/configdialog02.png share/doc/HTML/ca/kate/configuring.docbook share/doc/HTML/ca/kate/fundamentals.docbook share/doc/HTML/ca/kate/highlighting.docbook share/doc/HTML/ca/kate/index.cache.bz2 share/doc/HTML/ca/kate/index.docbook +share/doc/HTML/ca/kate/kate.png share/doc/HTML/ca/kate/man-kate.1.docbook share/doc/HTML/ca/kate/mdi.docbook share/doc/HTML/ca/kate/menus.docbook @@ -328,6 +356,7 @@ share/doc/HTML/ca/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/ca/khelpcenter/quickstart/index.docbook share/doc/HTML/ca/khelpcenter/support.docbook share/doc/HTML/ca/khelpcenter/userguide/accessibility.docbook +share/doc/HTML/ca/khelpcenter/userguide/amarok.png share/doc/HTML/ca/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/ca/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/ca/khelpcenter/userguide/burning-cds.docbook @@ -345,10 +374,21 @@ share/doc/HTML/ca/khelpcenter/userguide/groupware-kontact.docbook share/doc/HTML/ca/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/ca/khelpcenter/userguide/index.docbook share/doc/HTML/ca/khelpcenter/userguide/internet-shortcuts.docbook +share/doc/HTML/ca/khelpcenter/userguide/kcontrol.png share/doc/HTML/ca/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-office.docbook +share/doc/HTML/ca/khelpcenter/userguide/kmag.png +share/doc/HTML/ca/khelpcenter/userguide/kmousetool.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth2.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth3.png +share/doc/HTML/ca/khelpcenter/userguide/knode-identity.png +share/doc/HTML/ca/khelpcenter/userguide/knode-mail-account.png +share/doc/HTML/ca/khelpcenter/userguide/knode-news-account.png +share/doc/HTML/ca/khelpcenter/userguide/knode-start.png +share/doc/HTML/ca/khelpcenter/userguide/konq-sidebar.png share/doc/HTML/ca/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/ca/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/ca/khelpcenter/userguide/migrator-applications.docbook @@ -366,10 +406,12 @@ share/doc/HTML/ca/khelpcenter/userguide/programs-and-documents.docbook share/doc/HTML/ca/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/ca/khelpcenter/userguide/removable-disks.docbook share/doc/HTML/ca/khelpcenter/userguide/screen-captures.docbook +share/doc/HTML/ca/khelpcenter/userguide/services.png share/doc/HTML/ca/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/ca/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/ca/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/ca/khelpcenter/userguide/the-filemanager.docbook +share/doc/HTML/ca/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/ca/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/ca/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/ca/khelpcenter/userguide/under-the-hood.docbook @@ -523,8 +565,14 @@ share/doc/HTML/ca/kmail/intro.docbook share/doc/HTML/ca/kmail/menus.docbook share/doc/HTML/ca/kmail/using-kmail.docbook share/doc/HTML/ca/kmenuedit/common +share/doc/HTML/ca/kmenuedit/done.png share/doc/HTML/ca/kmenuedit/index.cache.bz2 share/doc/HTML/ca/kmenuedit/index.docbook +share/doc/HTML/ca/kmenuedit/itemname.png +share/doc/HTML/ca/kmenuedit/kmenueditmain.png +share/doc/HTML/ca/kmenuedit/new.png +share/doc/HTML/ca/kmenuedit/selecticon.png +share/doc/HTML/ca/kmenuedit/selectinternet.png share/doc/HTML/ca/kmessedwords/common share/doc/HTML/ca/kmessedwords/index.cache.bz2 share/doc/HTML/ca/kmessedwords/index.docbook @@ -542,6 +590,8 @@ share/doc/HTML/ca/kmouth/man-kmouth.1.docbook share/doc/HTML/ca/knetattach/common share/doc/HTML/ca/knetattach/index.cache.bz2 share/doc/HTML/ca/knetattach/index.docbook +share/doc/HTML/ca/knetattach/screenshot.png +share/doc/HTML/ca/knetattach/screenshot2.png share/doc/HTML/ca/knetworkconf/common share/doc/HTML/ca/knetworkconf/index.cache.bz2 share/doc/HTML/ca/knetworkconf/index.docbook @@ -599,10 +649,13 @@ share/doc/HTML/ca/konq-plugins/webarchiver/index.docbook share/doc/HTML/ca/konqueror/basics.docbook share/doc/HTML/ca/konqueror/bookmarks.docbook share/doc/HTML/ca/konqueror/browser.docbook +share/doc/HTML/ca/konqueror/cmndline.png share/doc/HTML/ca/konqueror/commands.docbook share/doc/HTML/ca/konqueror/common share/doc/HTML/ca/konqueror/config.docbook share/doc/HTML/ca/konqueror/credits.docbook +share/doc/HTML/ca/konqueror/dirtree.png +share/doc/HTML/ca/konqueror/dragdrop.png share/doc/HTML/ca/konqueror/faq.docbook share/doc/HTML/ca/konqueror/filemanager.docbook share/doc/HTML/ca/konqueror/index.cache.bz2 @@ -612,10 +665,14 @@ share/doc/HTML/ca/konqueror/man-kbookmarkmerger.1.docbook share/doc/HTML/ca/konqueror/path-complete.docbook share/doc/HTML/ca/konqueror/plugins.docbook share/doc/HTML/ca/konqueror/save-settings.docbook +share/doc/HTML/ca/konqueror/shortcut1.png +share/doc/HTML/ca/konqueror/shortcut2.png share/doc/HTML/ca/konqueror/sidebar.docbook share/doc/HTML/ca/konsole/common share/doc/HTML/ca/konsole/index.cache.bz2 share/doc/HTML/ca/konsole/index.docbook +share/doc/HTML/ca/konsole/konsole.png +share/doc/HTML/ca/konsole/tabbar.png share/doc/HTML/ca/kontact/common share/doc/HTML/ca/kontact/index.cache.bz2 share/doc/HTML/ca/kontact/index.docbook @@ -625,6 +682,8 @@ share/doc/HTML/ca/kpackage/index.docbook share/doc/HTML/ca/kpager/common share/doc/HTML/ca/kpager/index.cache.bz2 share/doc/HTML/ca/kpager/index.docbook +share/doc/HTML/ca/kpager/screenshot.png +share/doc/HTML/ca/kpager/settings.png share/doc/HTML/ca/kpercentage/commands.docbook share/doc/HTML/ca/kpercentage/common share/doc/HTML/ca/kpercentage/credits.docbook @@ -744,6 +803,9 @@ share/doc/HTML/ca/kuser/index.docbook share/doc/HTML/ca/kwallet/common share/doc/HTML/ca/kwallet/index.cache.bz2 share/doc/HTML/ca/kwallet/index.docbook +share/doc/HTML/ca/kwatchgnupg/common +share/doc/HTML/ca/kwatchgnupg/index.cache.bz2 +share/doc/HTML/ca/kwatchgnupg/index.docbook share/doc/HTML/ca/kweather/common share/doc/HTML/ca/kweather/index.cache.bz2 share/doc/HTML/ca/kweather/index.docbook @@ -763,6 +825,7 @@ share/doc/HTML/ca/kwrite/index.docbook share/doc/HTML/ca/kxkb/common share/doc/HTML/ca/kxkb/index.cache.bz2 share/doc/HTML/ca/kxkb/index.docbook +share/doc/HTML/ca/kxkb/switching.png share/doc/HTML/ca/lilo-config/common share/doc/HTML/ca/lilo-config/index.cache.bz2 share/doc/HTML/ca/lilo-config/index.docbook @@ -1379,6 +1442,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kwordquiz @dirrm share/doc/HTML/ca/kwifimanager @dirrm share/doc/HTML/ca/kweather +@dirrm share/doc/HTML/ca/kwatchgnupg @dirrm share/doc/HTML/ca/kwallet @dirrm share/doc/HTML/ca/kuser @dirrm share/doc/HTML/ca/kturtle @@ -1539,6 +1603,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kate @dirrm share/doc/HTML/ca/kapptemplate @dirrm share/doc/HTML/ca/kappfinder +@dirrm share/doc/HTML/ca/kalzium @dirrm share/doc/HTML/ca/docs/common @dirrm share/doc/HTML/ca/docs @dirrm share/doc/HTML/ca/amor diff --git a/misc/kde3-i18n-cs/distinfo b/misc/kde3-i18n-cs/distinfo index 46924108f34a..dca2d63d179d 100644 --- a/misc/kde3-i18n-cs/distinfo +++ b/misc/kde3-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 639887411d07ea92f0c733e66eb01b47 -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 1380da365361ee07e3b904c38a87d4291f7869215d8fa6193ea7236f4d4b0212 -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 3366797 +MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = aaace6da2097b2f98f163a5da7667752 +SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = b37f0c24a4efe08d7f79bf73971208bcded3cb42905d381865cb74be4cb72a1d +SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = 3383764 diff --git a/misc/kde3-i18n-cy/distinfo b/misc/kde3-i18n-cy/distinfo index 039aea2ff37e..3b12eeffde44 100644 --- a/misc/kde3-i18n-cy/distinfo +++ b/misc/kde3-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cy-3.5.4.tar.bz2) = 971b97e8c99df7abccbc7c4e603c324e -SHA256 (KDE/kde-i18n/kde-i18n-cy-3.5.4.tar.bz2) = 7d310261411889ab9c46330970bbb2d33e0748e373b6c63087a36416b2477261 -SIZE (KDE/kde-i18n/kde-i18n-cy-3.5.4.tar.bz2) = 1909452 +MD5 (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = fae86d2ffa550c4d831eeb9a5a3ecdb2 +SHA256 (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = a8eaafc56a7fe70d4f293534e5c0f3b87b99fda49fa82eec35736eaecc4d503c +SIZE (KDE/kde-i18n/kde-i18n-cy-3.5.5.tar.bz2) = 1916577 diff --git a/misc/kde3-i18n-da/distinfo b/misc/kde3-i18n-da/distinfo index ae07f5515ee1..f2c96eff350f 100644 --- a/misc/kde3-i18n-da/distinfo +++ b/misc/kde3-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = ef845c89fac91948ea9784593cd1b3fb -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = d0866db30dfab41964842ba6e97f3115791919688a871c32e60238798caf99db -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = 12299521 +MD5 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 70c041ca96330834c6f988255d7bd6ae +SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 72def6d70d3ff623bba05a106d66935b18ae9775d7ba4a4f70e8142eb04027ce +SIZE (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 12308598 diff --git a/misc/kde3-i18n-da/pkg-plist b/misc/kde3-i18n-da/pkg-plist index 82b3a7001690..904c58d3b45d 100644 --- a/misc/kde3-i18n-da/pkg-plist +++ b/misc/kde3-i18n-da/pkg-plist @@ -706,6 +706,9 @@ share/doc/HTML/da/kig/man-kig.1.docbook share/doc/HTML/da/kinfocenter/blockdevices/common share/doc/HTML/da/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/da/kinfocenter/blockdevices/index.docbook +share/doc/HTML/da/kinfocenter/cdinfo/common +share/doc/HTML/da/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/da/kinfocenter/cdinfo/index.docbook share/doc/HTML/da/kinfocenter/common share/doc/HTML/da/kinfocenter/devices/common share/doc/HTML/da/kinfocenter/devices/index.cache.bz2 @@ -2186,6 +2189,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kinfocenter/interrupts @dirrm share/doc/HTML/da/kinfocenter/dma @dirrm share/doc/HTML/da/kinfocenter/devices +@dirrm share/doc/HTML/da/kinfocenter/cdinfo @dirrm share/doc/HTML/da/kinfocenter/blockdevices @dirrm share/doc/HTML/da/kinfocenter @dirrm share/doc/HTML/da/kig diff --git a/misc/kde3-i18n-el/distinfo b/misc/kde3-i18n-el/distinfo index c91d76b9470e..47334624cc33 100644 --- a/misc/kde3-i18n-el/distinfo +++ b/misc/kde3-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = 00d834a86e31d9d03a583c6c40565094 -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = d70cdaa5cee53d647546154901f420643343be308378ca0b6aa8b43ad0dd2f9a -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = 2248006 +MD5 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = a2cb7afd4c5883bc2eb5d9c8a96d04c0 +SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2ccb85695fa1c5c8b5e8db659d868c6934522c5f6bb4c5ea6fb3a8f646cc59cd +SIZE (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2267715 diff --git a/misc/kde3-i18n-en_GB/distinfo b/misc/kde3-i18n-en_GB/distinfo index cfba5a263cd5..64142e03cac8 100644 --- a/misc/kde3-i18n-en_GB/distinfo +++ b/misc/kde3-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = 244175fa2be8023a4a6246c795972b5e -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = a8c3bdedf83c26c112555a653ddf35d7c7c770e412a261e30549b29eb21050d4 -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = 3705330 +MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 50af460c4b69e5cd91b820ed656f99bd +SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 77b44d25f2d569dc7e36e26ff7d518134f632263d44ad6dfb4b12a23ec3ce37d +SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 3701881 diff --git a/misc/kde3-i18n-eo/distinfo b/misc/kde3-i18n-eo/distinfo index c950b7bb5362..f0f1edb1a313 100644 --- a/misc/kde3-i18n-eo/distinfo +++ b/misc/kde3-i18n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = bd30d69bfbe6af8fc4a0840a9e8462e3 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = bd28e03ee2d4819065425edbc0e617046032fc0797143a1497fb6025bae3d34c -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = 1266538 +MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = c55c9ae0c001e5214f1ad97f4b6d02a1 +SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 3247c97e52a098660c0e892f7db4d46e047330508a7f714e2e3e7e3226620cef +SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 1271107 diff --git a/misc/kde3-i18n-es/distinfo b/misc/kde3-i18n-es/distinfo index 23d46b6c04eb..82f2f7e3dc1f 100644 --- a/misc/kde3-i18n-es/distinfo +++ b/misc/kde3-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 2c4e049753425d9405e86fed98f3c958 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 93979e971c8576dd46653df992955f51a8e7d80fd05f05e06b7a8a435fdb5df0 -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 36521578 +MD5 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = d8dc649138fe136c57a808eac1fdd719 +SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = adde40b9a1aa7774ded2e2c6bb3e092fd33ad5806660c04aae21be9b0874b0c7 +SIZE (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = 36641045 diff --git a/misc/kde3-i18n-es/pkg-plist b/misc/kde3-i18n-es/pkg-plist index a270104fbf75..0f039b55f64b 100644 --- a/misc/kde3-i18n-es/pkg-plist +++ b/misc/kde3-i18n-es/pkg-plist @@ -330,6 +330,9 @@ share/doc/HTML/es/blinken/blinken_helpbutton.png share/doc/HTML/es/blinken/blinken_highscoresbutton.png share/doc/HTML/es/blinken/blinken_nickprompt.png share/doc/HTML/es/blinken/blinken_quitbutton.png +share/doc/HTML/es/blinken/common +share/doc/HTML/es/blinken/index.cache.bz2 +share/doc/HTML/es/blinken/index.docbook share/doc/HTML/es/cervisia/annotate.png share/doc/HTML/es/cervisia/checkout.png share/doc/HTML/es/cervisia/commit.png @@ -583,6 +586,7 @@ share/doc/HTML/es/kbruch/factorize.png share/doc/HTML/es/kbruch/gui_main.png share/doc/HTML/es/kbruch/index.cache.bz2 share/doc/HTML/es/kbruch/index.docbook +share/doc/HTML/es/kbruch/man-kbruch.1.docbook share/doc/HTML/es/kbruch/reduced.png share/doc/HTML/es/kbruch/settings.png share/doc/HTML/es/kbugbuster/common @@ -968,6 +972,7 @@ share/doc/HTML/es/keduca/common share/doc/HTML/es/keduca/index.cache.bz2 share/doc/HTML/es/keduca/index.docbook share/doc/HTML/es/keduca/man-keduca.1.docbook +share/doc/HTML/es/keduca/man-keducabuilder.1.docbook share/doc/HTML/es/keduca/screenshot.png share/doc/HTML/es/kenolaba/common share/doc/HTML/es/kenolaba/index.cache.bz2 @@ -1072,6 +1077,7 @@ share/doc/HTML/es/khangman/index.cache.bz2 share/doc/HTML/es/khangman/index.docbook share/doc/HTML/es/khangman/khangman1.png share/doc/HTML/es/khangman/khangman2.png +share/doc/HTML/es/khangman/man-khangman.6.docbook share/doc/HTML/es/khangman/settings1.png share/doc/HTML/es/khangman/settings2.png share/doc/HTML/es/khangman/settings3.png @@ -1286,6 +1292,9 @@ share/doc/HTML/es/kig/text_label_wizard__select_property.png share/doc/HTML/es/kinfocenter/blockdevices/common share/doc/HTML/es/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/es/kinfocenter/blockdevices/index.docbook +share/doc/HTML/es/kinfocenter/cdinfo/common +share/doc/HTML/es/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/es/kinfocenter/cdinfo/index.docbook share/doc/HTML/es/kinfocenter/common share/doc/HTML/es/kinfocenter/devices/common share/doc/HTML/es/kinfocenter/devices/index.cache.bz2 @@ -1845,6 +1854,7 @@ share/doc/HTML/es/kooka/shortcut1.png share/doc/HTML/es/kooka/toolbar.png share/doc/HTML/es/kooka/toolbar1.png share/doc/HTML/es/kooka/toolbar2.png +share/doc/HTML/es/kopete/chatstyle.docbook share/doc/HTML/es/kopete/common share/doc/HTML/es/kopete/index.cache.bz2 share/doc/HTML/es/kopete/index.docbook @@ -2466,6 +2476,9 @@ share/doc/HTML/es/kwifimanager/index.docbook share/doc/HTML/es/kwin4/common share/doc/HTML/es/kwin4/index.cache.bz2 share/doc/HTML/es/kwin4/index.docbook +share/doc/HTML/es/kwordquiz/common +share/doc/HTML/es/kwordquiz/index.cache.bz2 +share/doc/HTML/es/kwordquiz/index.docbook share/doc/HTML/es/kwordquiz/kwq-dlg-characters.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-appearance.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-characters.png @@ -3400,6 +3413,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kinfocenter/interrupts @dirrm share/doc/HTML/es/kinfocenter/dma @dirrm share/doc/HTML/es/kinfocenter/devices +@dirrm share/doc/HTML/es/kinfocenter/cdinfo @dirrm share/doc/HTML/es/kinfocenter/blockdevices @dirrm share/doc/HTML/es/kinfocenter @dirrm share/doc/HTML/es/kig/scripting-api diff --git a/misc/kde3-i18n-et/distinfo b/misc/kde3-i18n-et/distinfo index 6f4e4d9a8163..32c2ef8509d7 100644 --- a/misc/kde3-i18n-et/distinfo +++ b/misc/kde3-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 7209f997e7c418d2884bc278ff6d642c -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 2340443591cf1f91beece41664e6e09fd0ee7a108165f1ebd6c633e4e1e1e97e -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 10487400 +MD5 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = d3065d66591fa0ea4e304e9bcbb6dc10 +SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 5b16805308aefb3e0fa79c9df4d89b92ff407406b91ce2a68ef9a3bf01c6ae54 +SIZE (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 10540364 diff --git a/misc/kde3-i18n-et/pkg-plist b/misc/kde3-i18n-et/pkg-plist index 47d93e462dcb..67c7989c1d19 100644 --- a/misc/kde3-i18n-et/pkg-plist +++ b/misc/kde3-i18n-et/pkg-plist @@ -981,6 +981,7 @@ share/doc/HTML/et/kontact/index.docbook share/doc/HTML/et/kooka/common share/doc/HTML/et/kooka/index.cache.bz2 share/doc/HTML/et/kooka/index.docbook +share/doc/HTML/et/kopete/chatstyle.docbook share/doc/HTML/et/kopete/common share/doc/HTML/et/kopete/index.cache.bz2 share/doc/HTML/et/kopete/index.docbook diff --git a/misc/kde3-i18n-eu/distinfo b/misc/kde3-i18n-eu/distinfo index 876e9610b769..30c41eab5537 100644 --- a/misc/kde3-i18n-eu/distinfo +++ b/misc/kde3-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 69d50a4a7a89572d3d66782381fc6811 -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 416c4f233f2a122e961fb34315092f1cc5a68cfb2b1b14ee81f1313775c30b59 -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 2226839 +MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 45a4361f11c14b8cbc0a5bb29ab18edb +SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = ad6c905811d6659541735a5d6a0d5f2ea4d140c7ac6aafe32e3d1bf1a81ea884 +SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 2236745 diff --git a/misc/kde3-i18n-fa/distinfo b/misc/kde3-i18n-fa/distinfo index e7db44b6e9a6..d936fe74a798 100644 --- a/misc/kde3-i18n-fa/distinfo +++ b/misc/kde3-i18n-fa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fa-3.5.4.tar.bz2) = 36afb560dc781b2009b12479e9758755 -SHA256 (KDE/kde-i18n/kde-i18n-fa-3.5.4.tar.bz2) = 73c987a13f5b2591b61b94801dfa67ee9402a2cc8ef06fcfe7f38abdf6412d9f -SIZE (KDE/kde-i18n/kde-i18n-fa-3.5.4.tar.bz2) = 573255 +MD5 (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = e55d8c8d06097b3daaa71eb499114e3d +SHA256 (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = bd52e15b9dd1267f9766713222dab0ca2a881fddfbdb8f52a32f97d3d102bb6e +SIZE (KDE/kde-i18n/kde-i18n-fa-3.5.5.tar.bz2) = 2188743 diff --git a/misc/kde3-i18n-fa/pkg-plist b/misc/kde3-i18n-fa/pkg-plist index cf801c0de672..c5e974d8dfe6 100644 --- a/misc/kde3-i18n-fa/pkg-plist +++ b/misc/kde3-i18n-fa/pkg-plist @@ -1,28 +1,111 @@ share/locale/fa/COPYING +share/locale/fa/LC_MESSAGES/akregator.mo +share/locale/fa/LC_MESSAGES/akregator_konqplugin.mo +share/locale/fa/LC_MESSAGES/alsaplayerui.mo +share/locale/fa/LC_MESSAGES/amor.mo share/locale/fa/LC_MESSAGES/appletproxy.mo +share/locale/fa/LC_MESSAGES/ark.mo +share/locale/fa/LC_MESSAGES/ark_plugin.mo +share/locale/fa/LC_MESSAGES/artsbuilder.mo +share/locale/fa/LC_MESSAGES/artscontrol.mo +share/locale/fa/LC_MESSAGES/artsmodules.mo +share/locale/fa/LC_MESSAGES/atlantik.mo +share/locale/fa/LC_MESSAGES/atlantikdesigner.mo +share/locale/fa/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/fa/LC_MESSAGES/audiocd_encoder_vorbis.mo +share/locale/fa/LC_MESSAGES/audiorename_plugin.mo +share/locale/fa/LC_MESSAGES/autorefresh.mo +share/locale/fa/LC_MESSAGES/babelfish.mo +share/locale/fa/LC_MESSAGES/blinken.mo +share/locale/fa/LC_MESSAGES/cervisia.mo +share/locale/fa/LC_MESSAGES/charlatanui.mo share/locale/fa/LC_MESSAGES/clockapplet.mo +share/locale/fa/LC_MESSAGES/crashesplugin.mo share/locale/fa/LC_MESSAGES/cupsdconf.mo +share/locale/fa/LC_MESSAGES/cvsservice.mo +share/locale/fa/LC_MESSAGES/dcoprss.mo +share/locale/fa/LC_MESSAGES/dirfilterplugin.mo share/locale/fa/LC_MESSAGES/display.mo share/locale/fa/LC_MESSAGES/dockbarextension.mo +share/locale/fa/LC_MESSAGES/domtreeviewer.mo share/locale/fa/LC_MESSAGES/drkonqi.mo +share/locale/fa/LC_MESSAGES/dub.mo share/locale/fa/LC_MESSAGES/extensionproxy.mo +share/locale/fa/LC_MESSAGES/ffrs.mo share/locale/fa/LC_MESSAGES/filetypes.mo +share/locale/fa/LC_MESSAGES/fsview.mo share/locale/fa/LC_MESSAGES/htmlsearch.mo +share/locale/fa/LC_MESSAGES/imagerename_plugin.mo +share/locale/fa/LC_MESSAGES/imgalleryplugin.mo +share/locale/fa/LC_MESSAGES/irkick.mo +share/locale/fa/LC_MESSAGES/joystick.mo +share/locale/fa/LC_MESSAGES/juk.mo +share/locale/fa/LC_MESSAGES/kabc2mutt.mo share/locale/fa/LC_MESSAGES/kabc_dir.mo share/locale/fa/LC_MESSAGES/kabc_file.mo share/locale/fa/LC_MESSAGES/kabc_ldapkio.mo share/locale/fa/LC_MESSAGES/kabc_net.mo +share/locale/fa/LC_MESSAGES/kabc_slox.mo share/locale/fa/LC_MESSAGES/kabc_sql.mo share/locale/fa/LC_MESSAGES/kabcformat_binary.mo +share/locale/fa/LC_MESSAGES/kaboodle.mo share/locale/fa/LC_MESSAGES/kaccess.mo +share/locale/fa/LC_MESSAGES/kaddressbook.mo +share/locale/fa/LC_MESSAGES/kalarm.mo +share/locale/fa/LC_MESSAGES/kalzium.mo +share/locale/fa/LC_MESSAGES/kanagram.mo +share/locale/fa/LC_MESSAGES/kandy.mo share/locale/fa/LC_MESSAGES/kappfinder.mo +share/locale/fa/LC_MESSAGES/karm.mo share/locale/fa/LC_MESSAGES/kasbarextension.mo +share/locale/fa/LC_MESSAGES/kasteroids.mo share/locale/fa/LC_MESSAGES/kate.mo +share/locale/fa/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/fa/LC_MESSAGES/katefiletemplates.mo +share/locale/fa/LC_MESSAGES/katefll_initplugin.mo +share/locale/fa/LC_MESSAGES/katefll_plugin.mo +share/locale/fa/LC_MESSAGES/katehelloworld.mo +share/locale/fa/LC_MESSAGES/katehtmltools.mo +share/locale/fa/LC_MESSAGES/kateinsertcommand.mo +share/locale/fa/LC_MESSAGES/katekjswrapper.mo +share/locale/fa/LC_MESSAGES/katemake.mo +share/locale/fa/LC_MESSAGES/katemodeline.mo +share/locale/fa/LC_MESSAGES/kateopenheader.mo +share/locale/fa/LC_MESSAGES/katepart.mo +share/locale/fa/LC_MESSAGES/katepybrowse.mo +share/locale/fa/LC_MESSAGES/katesnippets.mo +share/locale/fa/LC_MESSAGES/katetabbarextension.mo +share/locale/fa/LC_MESSAGES/katetextfilter.mo +share/locale/fa/LC_MESSAGES/katexmlcheck.mo +share/locale/fa/LC_MESSAGES/katexmltools.mo +share/locale/fa/LC_MESSAGES/katomic.mo +share/locale/fa/LC_MESSAGES/kaudiocreator.mo +share/locale/fa/LC_MESSAGES/kay.mo +share/locale/fa/LC_MESSAGES/kbabel.mo +share/locale/fa/LC_MESSAGES/kbackgammon.mo +share/locale/fa/LC_MESSAGES/kbattleship.mo +share/locale/fa/LC_MESSAGES/kbinaryclock.mo +share/locale/fa/LC_MESSAGES/kblackbox.mo +share/locale/fa/LC_MESSAGES/kbounce.mo +share/locale/fa/LC_MESSAGES/kbruch.mo +share/locale/fa/LC_MESSAGES/kbstateapplet.mo +share/locale/fa/LC_MESSAGES/kbugbuster.mo +share/locale/fa/LC_MESSAGES/kcachegrind.mo +share/locale/fa/LC_MESSAGES/kcalc.mo +share/locale/fa/LC_MESSAGES/kcharselect.mo +share/locale/fa/LC_MESSAGES/kcharselectapplet.mo +share/locale/fa/LC_MESSAGES/kcm_krfb.mo +share/locale/fa/LC_MESSAGES/kcm_kviewcanvasconfig.mo +share/locale/fa/LC_MESSAGES/kcm_kviewgeneralconfig.mo +share/locale/fa/LC_MESSAGES/kcm_kviewpluginsconfig.mo +share/locale/fa/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo share/locale/fa/LC_MESSAGES/kcmaccess.mo share/locale/fa/LC_MESSAGES/kcmaccessibility.mo share/locale/fa/LC_MESSAGES/kcmarts.mo +share/locale/fa/LC_MESSAGES/kcmaudiocd.mo share/locale/fa/LC_MESSAGES/kcmbackground.mo share/locale/fa/LC_MESSAGES/kcmbell.mo +share/locale/fa/LC_MESSAGES/kcmcddb.mo share/locale/fa/LC_MESSAGES/kcmcgi.mo share/locale/fa/LC_MESSAGES/kcmcolors.mo share/locale/fa/LC_MESSAGES/kcmcomponentchooser.mo @@ -35,129 +118,448 @@ share/locale/fa/LC_MESSAGES/kcmicons.mo share/locale/fa/LC_MESSAGES/kcminfo.mo share/locale/fa/LC_MESSAGES/kcminput.mo share/locale/fa/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/fa/LC_MESSAGES/kcmkabconfig.mo +share/locale/fa/LC_MESSAGES/kcmkamera.mo share/locale/fa/LC_MESSAGES/kcmkclock.mo share/locale/fa/LC_MESSAGES/kcmkded.mo +share/locale/fa/LC_MESSAGES/kcmkdnssd.mo share/locale/fa/LC_MESSAGES/kcmkeys.mo share/locale/fa/LC_MESSAGES/kcmkicker.mo share/locale/fa/LC_MESSAGES/kcmkio.mo share/locale/fa/LC_MESSAGES/kcmkonq.mo share/locale/fa/LC_MESSAGES/kcmkonqhtml.mo share/locale/fa/LC_MESSAGES/kcmkonsole.mo +share/locale/fa/LC_MESSAGES/kcmkontactnt.mo +share/locale/fa/LC_MESSAGES/kcmktalkd.mo +share/locale/fa/LC_MESSAGES/kcmkuick.mo share/locale/fa/LC_MESSAGES/kcmkurifilt.mo +share/locale/fa/LC_MESSAGES/kcmkvaio.mo +share/locale/fa/LC_MESSAGES/kcmkwallet.mo share/locale/fa/LC_MESSAGES/kcmkwindecoration.mo +share/locale/fa/LC_MESSAGES/kcmkwinrules.mo share/locale/fa/LC_MESSAGES/kcmkwm.mo +share/locale/fa/LC_MESSAGES/kcmlanbrowser.mo +share/locale/fa/LC_MESSAGES/kcmlaptop.mo share/locale/fa/LC_MESSAGES/kcmlaunch.mo share/locale/fa/LC_MESSAGES/kcmlayout.mo +share/locale/fa/LC_MESSAGES/kcmlilo.mo +share/locale/fa/LC_MESSAGES/kcmlirc.mo share/locale/fa/LC_MESSAGES/kcmlocale.mo +share/locale/fa/LC_MESSAGES/kcmmedia.mo share/locale/fa/LC_MESSAGES/kcmnic.mo share/locale/fa/LC_MESSAGES/kcmnotify.mo share/locale/fa/LC_MESSAGES/kcmperformance.mo share/locale/fa/LC_MESSAGES/kcmprintmgr.mo share/locale/fa/LC_MESSAGES/kcmsamba.mo share/locale/fa/LC_MESSAGES/kcmscreensaver.mo +share/locale/fa/LC_MESSAGES/kcmshell.mo share/locale/fa/LC_MESSAGES/kcmsmartcard.mo share/locale/fa/LC_MESSAGES/kcmsmserver.mo share/locale/fa/LC_MESSAGES/kcmspellchecking.mo share/locale/fa/LC_MESSAGES/kcmstyle.mo share/locale/fa/LC_MESSAGES/kcmtaskbar.mo +share/locale/fa/LC_MESSAGES/kcmthinkpad.mo share/locale/fa/LC_MESSAGES/kcmusb.mo share/locale/fa/LC_MESSAGES/kcmview1394.mo +share/locale/fa/LC_MESSAGES/kcmwifi.mo share/locale/fa/LC_MESSAGES/kcmxinerama.mo +share/locale/fa/LC_MESSAGES/kcoloredit.mo share/locale/fa/LC_MESSAGES/kcontrol.mo +share/locale/fa/LC_MESSAGES/kcron.mo +share/locale/fa/LC_MESSAGES/kdat.mo share/locale/fa/LC_MESSAGES/kdcop.mo share/locale/fa/LC_MESSAGES/kdebugdialog.mo share/locale/fa/LC_MESSAGES/kdelibs.mo +share/locale/fa/LC_MESSAGES/kdelibs_colors.mo +share/locale/fa/LC_MESSAGES/kdelirc.mo +share/locale/fa/LC_MESSAGES/kdepasswd.mo +share/locale/fa/LC_MESSAGES/kdepimresources.mo +share/locale/fa/LC_MESSAGES/kdepimwizards.mo share/locale/fa/LC_MESSAGES/kdeprint.mo share/locale/fa/LC_MESSAGES/kdeprint_part.mo share/locale/fa/LC_MESSAGES/kdeprintfax.mo share/locale/fa/LC_MESSAGES/kdesktop.mo +share/locale/fa/LC_MESSAGES/kdessh.mo share/locale/fa/LC_MESSAGES/kdesu.mo share/locale/fa/LC_MESSAGES/kdesud.mo +share/locale/fa/LC_MESSAGES/kdevdesigner.mo +share/locale/fa/LC_MESSAGES/kdevelop.mo +share/locale/fa/LC_MESSAGES/kdevtipofday.mo +share/locale/fa/LC_MESSAGES/kdf.mo +share/locale/fa/LC_MESSAGES/kdgantt.mo share/locale/fa/LC_MESSAGES/kdialog.mo +share/locale/fa/LC_MESSAGES/kdict.mo +share/locale/fa/LC_MESSAGES/kdictapplet.mo +share/locale/fa/LC_MESSAGES/kdjview.mo share/locale/fa/LC_MESSAGES/kdmconfig.mo share/locale/fa/LC_MESSAGES/kdmgreet.mo +share/locale/fa/LC_MESSAGES/kdvi.mo +share/locale/fa/LC_MESSAGES/kedit.mo +share/locale/fa/LC_MESSAGES/keduca.mo +share/locale/fa/LC_MESSAGES/kenolaba.mo +share/locale/fa/LC_MESSAGES/kfax.mo +share/locale/fa/LC_MESSAGES/kfaxview.mo +share/locale/fa/LC_MESSAGES/kfifteenapplet.mo +share/locale/fa/LC_MESSAGES/kfile_au.mo +share/locale/fa/LC_MESSAGES/kfile_avi.mo +share/locale/fa/LC_MESSAGES/kfile_bmp.mo +share/locale/fa/LC_MESSAGES/kfile_cert.mo share/locale/fa/LC_MESSAGES/kfile_cpp.mo +share/locale/fa/LC_MESSAGES/kfile_dds.mo +share/locale/fa/LC_MESSAGES/kfile_deb.mo +share/locale/fa/LC_MESSAGES/kfile_desktop.mo share/locale/fa/LC_MESSAGES/kfile_diff.mo +share/locale/fa/LC_MESSAGES/kfile_drgeo.mo +share/locale/fa/LC_MESSAGES/kfile_dvi.mo +share/locale/fa/LC_MESSAGES/kfile_exr.mo +share/locale/fa/LC_MESSAGES/kfile_flac.mo +share/locale/fa/LC_MESSAGES/kfile_folder.mo +share/locale/fa/LC_MESSAGES/kfile_gif.mo +share/locale/fa/LC_MESSAGES/kfile_html.mo +share/locale/fa/LC_MESSAGES/kfile_ico.mo +share/locale/fa/LC_MESSAGES/kfile_ics.mo +share/locale/fa/LC_MESSAGES/kfile_jpeg.mo +share/locale/fa/LC_MESSAGES/kfile_kig.mo +share/locale/fa/LC_MESSAGES/kfile_lnk.mo +share/locale/fa/LC_MESSAGES/kfile_m3u.mo +share/locale/fa/LC_MESSAGES/kfile_mhtml.mo +share/locale/fa/LC_MESSAGES/kfile_mp3.mo +share/locale/fa/LC_MESSAGES/kfile_mpc.mo +share/locale/fa/LC_MESSAGES/kfile_mpeg.mo +share/locale/fa/LC_MESSAGES/kfile_ogg.mo +share/locale/fa/LC_MESSAGES/kfile_palm.mo +share/locale/fa/LC_MESSAGES/kfile_pcx.mo +share/locale/fa/LC_MESSAGES/kfile_pdf.mo +share/locale/fa/LC_MESSAGES/kfile_png.mo +share/locale/fa/LC_MESSAGES/kfile_pnm.mo share/locale/fa/LC_MESSAGES/kfile_po.mo +share/locale/fa/LC_MESSAGES/kfile_ps.mo +share/locale/fa/LC_MESSAGES/kfile_rfc822.mo +share/locale/fa/LC_MESSAGES/kfile_rgb.mo +share/locale/fa/LC_MESSAGES/kfile_rpm.mo +share/locale/fa/LC_MESSAGES/kfile_sid.mo +share/locale/fa/LC_MESSAGES/kfile_tga.mo +share/locale/fa/LC_MESSAGES/kfile_theora.mo +share/locale/fa/LC_MESSAGES/kfile_tiff.mo +share/locale/fa/LC_MESSAGES/kfile_torrent.mo share/locale/fa/LC_MESSAGES/kfile_ts.mo +share/locale/fa/LC_MESSAGES/kfile_txt.mo +share/locale/fa/LC_MESSAGES/kfile_vcf.mo +share/locale/fa/LC_MESSAGES/kfile_wav.mo +share/locale/fa/LC_MESSAGES/kfile_xbm.mo +share/locale/fa/LC_MESSAGES/kfile_xpm.mo share/locale/fa/LC_MESSAGES/kfileaudiopreview.mo +share/locale/fa/LC_MESSAGES/kfilereplace.mo +share/locale/fa/LC_MESSAGES/kfileshare.mo share/locale/fa/LC_MESSAGES/kfindpart.mo +share/locale/fa/LC_MESSAGES/kfloppy.mo share/locale/fa/LC_MESSAGES/kfmclient.mo share/locale/fa/LC_MESSAGES/kfontinst.mo +share/locale/fa/LC_MESSAGES/kfouleggs.mo +share/locale/fa/LC_MESSAGES/kgamma.mo +share/locale/fa/LC_MESSAGES/kgantt.mo +share/locale/fa/LC_MESSAGES/kgeography.mo +share/locale/fa/LC_MESSAGES/kget.mo +share/locale/fa/LC_MESSAGES/kghostview.mo +share/locale/fa/LC_MESSAGES/kgoldrunner.mo +share/locale/fa/LC_MESSAGES/kgpg.mo share/locale/fa/LC_MESSAGES/kgreet_classic.mo +share/locale/fa/LC_MESSAGES/kgreet_winbind.mo +share/locale/fa/LC_MESSAGES/khangman.mo share/locale/fa/LC_MESSAGES/khelpcenter.mo +share/locale/fa/LC_MESSAGES/khexedit.mo +share/locale/fa/LC_MESSAGES/khexedit2part.mo share/locale/fa/LC_MESSAGES/khotkeys.mo +share/locale/fa/LC_MESSAGES/khtmlkttsd.mo +share/locale/fa/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/fa/LC_MESSAGES/kicker.mo +share/locale/fa/LC_MESSAGES/kiconedit.mo +share/locale/fa/LC_MESSAGES/kig.mo +share/locale/fa/LC_MESSAGES/kimagemapeditor.mo +share/locale/fa/LC_MESSAGES/kinetd.mo share/locale/fa/LC_MESSAGES/kio.mo +share/locale/fa/LC_MESSAGES/kio_audiocd.mo share/locale/fa/LC_MESSAGES/kio_finger.mo share/locale/fa/LC_MESSAGES/kio_fish.mo share/locale/fa/LC_MESSAGES/kio_floppy.mo +share/locale/fa/LC_MESSAGES/kio_groupwise.mo share/locale/fa/LC_MESSAGES/kio_help.mo +share/locale/fa/LC_MESSAGES/kio_home.mo share/locale/fa/LC_MESSAGES/kio_imap4.mo +share/locale/fa/LC_MESSAGES/kio_jabberdisco.mo +share/locale/fa/LC_MESSAGES/kio_lan.mo +share/locale/fa/LC_MESSAGES/kio_ldap.mo share/locale/fa/LC_MESSAGES/kio_mac.mo share/locale/fa/LC_MESSAGES/kio_man.mo share/locale/fa/LC_MESSAGES/kio_media.mo +share/locale/fa/LC_MESSAGES/kio_mobile.mo share/locale/fa/LC_MESSAGES/kio_nfs.mo share/locale/fa/LC_MESSAGES/kio_nntp.mo share/locale/fa/LC_MESSAGES/kio_pop3.mo share/locale/fa/LC_MESSAGES/kio_print.mo +share/locale/fa/LC_MESSAGES/kio_remote.mo share/locale/fa/LC_MESSAGES/kio_settings.mo share/locale/fa/LC_MESSAGES/kio_sftp.mo +share/locale/fa/LC_MESSAGES/kio_sieve.mo share/locale/fa/LC_MESSAGES/kio_smb.mo share/locale/fa/LC_MESSAGES/kio_smtp.mo +share/locale/fa/LC_MESSAGES/kio_svn.mo +share/locale/fa/LC_MESSAGES/kio_system.mo +share/locale/fa/LC_MESSAGES/kio_tar.mo +share/locale/fa/LC_MESSAGES/kio_thumbnail.mo +share/locale/fa/LC_MESSAGES/kio_trash.mo +share/locale/fa/LC_MESSAGES/kio_zeroconf.mo share/locale/fa/LC_MESSAGES/kioexec.mo +share/locale/fa/LC_MESSAGES/kiten.mo share/locale/fa/LC_MESSAGES/kjobviewer.mo +share/locale/fa/LC_MESSAGES/kjots.mo +share/locale/fa/LC_MESSAGES/kjumpingcube.mo +share/locale/fa/LC_MESSAGES/klaptopdaemon.mo +share/locale/fa/LC_MESSAGES/klatin.mo +share/locale/fa/LC_MESSAGES/kleopatra.mo +share/locale/fa/LC_MESSAGES/klettres.mo +share/locale/fa/LC_MESSAGES/klickety.mo +share/locale/fa/LC_MESSAGES/klines.mo +share/locale/fa/LC_MESSAGES/klinkstatus.mo share/locale/fa/LC_MESSAGES/klipper.mo +share/locale/fa/LC_MESSAGES/klock.mo +share/locale/fa/LC_MESSAGES/kmag.mo +share/locale/fa/LC_MESSAGES/kmahjongg.mo +share/locale/fa/LC_MESSAGES/kmail.mo +share/locale/fa/LC_MESSAGES/kmail_text_calendar_plugin.mo +share/locale/fa/LC_MESSAGES/kmail_text_vcard_plugin.mo +share/locale/fa/LC_MESSAGES/kmailcvt.mo +share/locale/fa/LC_MESSAGES/kmathapplet.mo share/locale/fa/LC_MESSAGES/kmcop.mo share/locale/fa/LC_MESSAGES/kmenuapplet.mo share/locale/fa/LC_MESSAGES/kmenuedit.mo +share/locale/fa/LC_MESSAGES/kmid.mo +share/locale/fa/LC_MESSAGES/kmilo_delli8k.mo +share/locale/fa/LC_MESSAGES/kmilo_generic.mo +share/locale/fa/LC_MESSAGES/kmilo_kvaio.mo +share/locale/fa/LC_MESSAGES/kmilo_powerbook.mo +share/locale/fa/LC_MESSAGES/kmilo_thinkpad.mo +share/locale/fa/LC_MESSAGES/kmilod.mo +share/locale/fa/LC_MESSAGES/kmines.mo share/locale/fa/LC_MESSAGES/kminipagerapplet.mo +share/locale/fa/LC_MESSAGES/kmix.mo +share/locale/fa/LC_MESSAGES/kmobile.mo +share/locale/fa/LC_MESSAGES/kmoon.mo +share/locale/fa/LC_MESSAGES/kmousetool.mo +share/locale/fa/LC_MESSAGES/kmouth.mo +share/locale/fa/LC_MESSAGES/kmplot.mo +share/locale/fa/LC_MESSAGES/kmrml.mo +share/locale/fa/LC_MESSAGES/knetattach.mo +share/locale/fa/LC_MESSAGES/knetwalk.mo +share/locale/fa/LC_MESSAGES/knetworkconf.mo +share/locale/fa/LC_MESSAGES/knewsticker.mo +share/locale/fa/LC_MESSAGES/knode.mo +share/locale/fa/LC_MESSAGES/knotes.mo share/locale/fa/LC_MESSAGES/knotify.mo +share/locale/fa/LC_MESSAGES/kodo.mo +share/locale/fa/LC_MESSAGES/kolf.mo +share/locale/fa/LC_MESSAGES/kolourpaint.mo +share/locale/fa/LC_MESSAGES/kolourpicker.mo +share/locale/fa/LC_MESSAGES/kommander.mo +share/locale/fa/LC_MESSAGES/kompare.mo +share/locale/fa/LC_MESSAGES/konnector_dummy.mo +share/locale/fa/LC_MESSAGES/konnector_kabc.mo +share/locale/fa/LC_MESSAGES/konnector_kcal.mo +share/locale/fa/LC_MESSAGES/konnector_local.mo +share/locale/fa/LC_MESSAGES/konnector_qtopia.mo +share/locale/fa/LC_MESSAGES/konnector_remote.mo +share/locale/fa/LC_MESSAGES/konqsidebar_delicious.mo +share/locale/fa/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/fa/LC_MESSAGES/konqsidebar_metabar.mo +share/locale/fa/LC_MESSAGES/konqsidebar_news.mo share/locale/fa/LC_MESSAGES/konqueror.mo +share/locale/fa/LC_MESSAGES/konquest.mo share/locale/fa/LC_MESSAGES/konsole.mo +share/locale/fa/LC_MESSAGES/konsolekalendar.mo +share/locale/fa/LC_MESSAGES/kontact.mo +share/locale/fa/LC_MESSAGES/kooka.mo +share/locale/fa/LC_MESSAGES/kopete.mo +share/locale/fa/LC_MESSAGES/korganizer.mo +share/locale/fa/LC_MESSAGES/korn.mo +share/locale/fa/LC_MESSAGES/kpackage.mo share/locale/fa/LC_MESSAGES/kpager.mo +share/locale/fa/LC_MESSAGES/kpartsaver.mo +share/locale/fa/LC_MESSAGES/kpat.mo +share/locale/fa/LC_MESSAGES/kpdf.mo +share/locale/fa/LC_MESSAGES/kpercentage.mo share/locale/fa/LC_MESSAGES/kpersonalizer.mo +share/locale/fa/LC_MESSAGES/kpf.mo +share/locale/fa/LC_MESSAGES/kpilot.mo +share/locale/fa/LC_MESSAGES/kpoker.mo +share/locale/fa/LC_MESSAGES/kpovmodeler.mo share/locale/fa/LC_MESSAGES/kppp.mo share/locale/fa/LC_MESSAGES/kppplogview.mo share/locale/fa/LC_MESSAGES/kprinter.mo share/locale/fa/LC_MESSAGES/krandr.mo share/locale/fa/LC_MESSAGES/krdb.mo +share/locale/fa/LC_MESSAGES/krdc.mo share/locale/fa/LC_MESSAGES/kreadconfig.mo +share/locale/fa/LC_MESSAGES/krec.mo +share/locale/fa/LC_MESSAGES/kregexpeditor.mo +share/locale/fa/LC_MESSAGES/kres_birthday.mo +share/locale/fa/LC_MESSAGES/kres_blogging.mo +share/locale/fa/LC_MESSAGES/kres_bugzilla.mo +share/locale/fa/LC_MESSAGES/kres_exchange.mo +share/locale/fa/LC_MESSAGES/kres_featureplan.mo +share/locale/fa/LC_MESSAGES/kres_groupware.mo +share/locale/fa/LC_MESSAGES/kres_groupwise.mo +share/locale/fa/LC_MESSAGES/kres_kolab.mo +share/locale/fa/LC_MESSAGES/kres_remote.mo +share/locale/fa/LC_MESSAGES/kres_tvanytime.mo +share/locale/fa/LC_MESSAGES/kres_xmlrpc.mo +share/locale/fa/LC_MESSAGES/kreversi.mo +share/locale/fa/LC_MESSAGES/krfb.mo +share/locale/fa/LC_MESSAGES/kruler.mo share/locale/fa/LC_MESSAGES/krunapplet.mo +share/locale/fa/LC_MESSAGES/ksame.mo +share/locale/fa/LC_MESSAGES/ksayit.mo +share/locale/fa/LC_MESSAGES/kscd.mo share/locale/fa/LC_MESSAGES/kscreensaver.mo +share/locale/fa/LC_MESSAGES/kshisen.mo +share/locale/fa/LC_MESSAGES/ksig.mo +share/locale/fa/LC_MESSAGES/ksim.mo +share/locale/fa/LC_MESSAGES/ksirc.mo +share/locale/fa/LC_MESSAGES/ksirtet.mo +share/locale/fa/LC_MESSAGES/ksmiletris.mo share/locale/fa/LC_MESSAGES/ksmserver.mo +share/locale/fa/LC_MESSAGES/ksnake.mo +share/locale/fa/LC_MESSAGES/ksnapshot.mo +share/locale/fa/LC_MESSAGES/ksokoban.mo +share/locale/fa/LC_MESSAGES/kspaceduel.mo share/locale/fa/LC_MESSAGES/ksplash.mo share/locale/fa/LC_MESSAGES/ksplashthemes.mo +share/locale/fa/LC_MESSAGES/kstars.mo share/locale/fa/LC_MESSAGES/kstart.mo share/locale/fa/LC_MESSAGES/kstartperf.mo +share/locale/fa/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/fa/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/fa/LC_MESSAGES/kstyle_phase_config.mo +share/locale/fa/LC_MESSAGES/kstyle_plastik_config.mo +share/locale/fa/LC_MESSAGES/ksvgplugin.mo +share/locale/fa/LC_MESSAGES/ksync.mo share/locale/fa/LC_MESSAGES/ksysguard.mo share/locale/fa/LC_MESSAGES/ksystemtrayapplet.mo share/locale/fa/LC_MESSAGES/ksystraycmd.mo +share/locale/fa/LC_MESSAGES/ksysv.mo +share/locale/fa/LC_MESSAGES/kteatime.mo +share/locale/fa/LC_MESSAGES/ktexteditor_autobookmarker.mo +share/locale/fa/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/fa/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/fa/LC_MESSAGES/ktexteditor_isearch.mo share/locale/fa/LC_MESSAGES/ktexteditor_kdatatool.mo +share/locale/fa/LC_MESSAGES/kthememanager.mo +share/locale/fa/LC_MESSAGES/ktimemon.mo +share/locale/fa/LC_MESSAGES/ktimer.mo share/locale/fa/LC_MESSAGES/ktip.mo +share/locale/fa/LC_MESSAGES/ktnef.mo +share/locale/fa/LC_MESSAGES/ktouch.mo +share/locale/fa/LC_MESSAGES/ktron.mo +share/locale/fa/LC_MESSAGES/kttsd.mo +share/locale/fa/LC_MESSAGES/ktuberling.mo +share/locale/fa/LC_MESSAGES/kturtle.mo +share/locale/fa/LC_MESSAGES/ktux.mo +share/locale/fa/LC_MESSAGES/kuick_plugin.mo +share/locale/fa/LC_MESSAGES/kuickshow.mo +share/locale/fa/LC_MESSAGES/kuiviewer.mo +share/locale/fa/LC_MESSAGES/kuser.mo +share/locale/fa/LC_MESSAGES/kverbos.mo +share/locale/fa/LC_MESSAGES/kview.mo +share/locale/fa/LC_MESSAGES/kview_scale.mo +share/locale/fa/LC_MESSAGES/kviewbrowserplugin.mo +share/locale/fa/LC_MESSAGES/kviewcanvas.mo +share/locale/fa/LC_MESSAGES/kvieweffectsplugin.mo +share/locale/fa/LC_MESSAGES/kviewpresenterplugin.mo +share/locale/fa/LC_MESSAGES/kviewscannerplugin.mo +share/locale/fa/LC_MESSAGES/kviewshell.mo +share/locale/fa/LC_MESSAGES/kviewviewer.mo +share/locale/fa/LC_MESSAGES/kvoctrain.mo +share/locale/fa/LC_MESSAGES/kwalletmanager.mo +share/locale/fa/LC_MESSAGES/kwatchgnupg.mo +share/locale/fa/LC_MESSAGES/kweather.mo +share/locale/fa/LC_MESSAGES/kwifimanager.mo share/locale/fa/LC_MESSAGES/kwin.mo +share/locale/fa/LC_MESSAGES/kwin4.mo +share/locale/fa/LC_MESSAGES/kwin_art_clients.mo +share/locale/fa/LC_MESSAGES/kwin_clients.mo +share/locale/fa/LC_MESSAGES/kwin_lib.mo +share/locale/fa/LC_MESSAGES/kwireless.mo +share/locale/fa/LC_MESSAGES/kwordquiz.mo +share/locale/fa/LC_MESSAGES/kworldclock.mo share/locale/fa/LC_MESSAGES/kwriteconfig.mo share/locale/fa/LC_MESSAGES/kxkb.mo +share/locale/fa/LC_MESSAGES/kxsconfig.mo +share/locale/fa/LC_MESSAGES/kxsldbg.mo +share/locale/fa/LC_MESSAGES/libKTTSD.mo +share/locale/fa/LC_MESSAGES/libdmctl.mo +share/locale/fa/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/fa/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/fa/LC_MESSAGES/libkcal.mo +share/locale/fa/LC_MESSAGES/libkcddb.mo +share/locale/fa/LC_MESSAGES/libkdeedu.mo +share/locale/fa/LC_MESSAGES/libkdegames.mo +share/locale/fa/LC_MESSAGES/libkdepim.mo +share/locale/fa/LC_MESSAGES/libkfaximgage.mo +share/locale/fa/LC_MESSAGES/libkholidays.mo share/locale/fa/LC_MESSAGES/libkicker.mo share/locale/fa/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/fa/LC_MESSAGES/libkickermenu_konsole.mo share/locale/fa/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/fa/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/fa/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/fa/LC_MESSAGES/libkickermenu_systemmenu.mo +share/locale/fa/LC_MESSAGES/libkickermenu_tom.mo +share/locale/fa/LC_MESSAGES/libkleopatra.mo +share/locale/fa/LC_MESSAGES/libkmime.mo share/locale/fa/LC_MESSAGES/libkonq.mo +share/locale/fa/LC_MESSAGES/libkpgp.mo +share/locale/fa/LC_MESSAGES/libkpimexchange.mo +share/locale/fa/LC_MESSAGES/libkscan.mo share/locale/fa/LC_MESSAGES/libkscreensaver.mo +share/locale/fa/LC_MESSAGES/libksieve.mo +share/locale/fa/LC_MESSAGES/libksirtet.mo +share/locale/fa/LC_MESSAGES/libksync.mo share/locale/fa/LC_MESSAGES/libtaskbar.mo share/locale/fa/LC_MESSAGES/libtaskmanager.mo share/locale/fa/LC_MESSAGES/lockout.mo +share/locale/fa/LC_MESSAGES/lskat.mo +share/locale/fa/LC_MESSAGES/lyrics.mo share/locale/fa/LC_MESSAGES/mediaapplet.mo +share/locale/fa/LC_MESSAGES/mediacontrol.mo +share/locale/fa/LC_MESSAGES/mf_konqplugin.mo +share/locale/fa/LC_MESSAGES/minitoolsplugin.mo +share/locale/fa/LC_MESSAGES/multisynk.mo share/locale/fa/LC_MESSAGES/naughtyapplet.mo +share/locale/fa/LC_MESSAGES/nexscope.mo +share/locale/fa/LC_MESSAGES/noatun.mo share/locale/fa/LC_MESSAGES/nsplugin.mo +share/locale/fa/LC_MESSAGES/pitchablespeed.mo share/locale/fa/LC_MESSAGES/ppdtranslations.mo +share/locale/fa/LC_MESSAGES/privacy.mo +share/locale/fa/LC_MESSAGES/qeditor.mo +share/locale/fa/LC_MESSAGES/quanta.mo share/locale/fa/LC_MESSAGES/quicklauncher.mo +share/locale/fa/LC_MESSAGES/rellinks.mo +share/locale/fa/LC_MESSAGES/searchbarplugin.mo +share/locale/fa/LC_MESSAGES/secpolicy.mo share/locale/fa/LC_MESSAGES/spy.mo +share/locale/fa/LC_MESSAGES/superkaramba.mo +share/locale/fa/LC_MESSAGES/synaescope.mo share/locale/fa/LC_MESSAGES/timezones.mo +share/locale/fa/LC_MESSAGES/tippecanoe.mo +share/locale/fa/LC_MESSAGES/trashapplet.mo +share/locale/fa/LC_MESSAGES/tyler.mo +share/locale/fa/LC_MESSAGES/uachangerplugin.mo +share/locale/fa/LC_MESSAGES/umbrello.mo +share/locale/fa/LC_MESSAGES/useraccount.mo +share/locale/fa/LC_MESSAGES/validatorsplugin.mo +share/locale/fa/LC_MESSAGES/wakeup.mo +share/locale/fa/LC_MESSAGES/wavecapture.mo +share/locale/fa/LC_MESSAGES/webarchiver.mo share/locale/fa/charset share/locale/fa/entry.desktop share/locale/fa/flag.png diff --git a/misc/kde3-i18n-fi/distinfo b/misc/kde3-i18n-fi/distinfo index 7c4180b8cb4f..17f97ba15edc 100644 --- a/misc/kde3-i18n-fi/distinfo +++ b/misc/kde3-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = c2ef5fad94bcb04ee7e1a363593ff685 -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = ed40a6e70255cdfce5c389b85bce50f1f05c8aefabce4ab6d7b6a7285749550c -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = 2315529 +MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 5693b184f6d3e2d79c78248a9506ba11 +SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 9f709a0ff8403da6137c0e48b172c79ff8c875ebf04500a4c586bcdf37a4054e +SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 2400361 diff --git a/misc/kde3-i18n-fi/pkg-plist b/misc/kde3-i18n-fi/pkg-plist index 71873dbd4f5e..89a1db17cd45 100644 --- a/misc/kde3-i18n-fi/pkg-plist +++ b/misc/kde3-i18n-fi/pkg-plist @@ -40,6 +40,7 @@ share/locale/fi/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/fi/LC_MESSAGES/audiorename_plugin.mo share/locale/fi/LC_MESSAGES/autorefresh.mo share/locale/fi/LC_MESSAGES/babelfish.mo +share/locale/fi/LC_MESSAGES/blinken.mo share/locale/fi/LC_MESSAGES/cervisia.mo share/locale/fi/LC_MESSAGES/charlatanui.mo share/locale/fi/LC_MESSAGES/clockapplet.mo @@ -76,6 +77,7 @@ share/locale/fi/LC_MESSAGES/kaccess.mo share/locale/fi/LC_MESSAGES/kaddressbook.mo share/locale/fi/LC_MESSAGES/kalarm.mo share/locale/fi/LC_MESSAGES/kalzium.mo +share/locale/fi/LC_MESSAGES/kanagram.mo share/locale/fi/LC_MESSAGES/kandy.mo share/locale/fi/LC_MESSAGES/kappfinder.mo share/locale/fi/LC_MESSAGES/karm.mo @@ -112,6 +114,7 @@ share/locale/fi/LC_MESSAGES/kbounce.mo share/locale/fi/LC_MESSAGES/kbruch.mo share/locale/fi/LC_MESSAGES/kbstateapplet.mo share/locale/fi/LC_MESSAGES/kbugbuster.mo +share/locale/fi/LC_MESSAGES/kcachegrind.mo share/locale/fi/LC_MESSAGES/kcalc.mo share/locale/fi/LC_MESSAGES/kcharselect.mo share/locale/fi/LC_MESSAGES/kcharselectapplet.mo @@ -271,6 +274,7 @@ share/locale/fi/LC_MESSAGES/kfile_xbm.mo share/locale/fi/LC_MESSAGES/kfile_xpm.mo share/locale/fi/LC_MESSAGES/kfileaudiopreview.mo share/locale/fi/LC_MESSAGES/kfilereplace.mo +share/locale/fi/LC_MESSAGES/kfileshare.mo share/locale/fi/LC_MESSAGES/kfindpart.mo share/locale/fi/LC_MESSAGES/kfloppy.mo share/locale/fi/LC_MESSAGES/kfmclient.mo @@ -278,6 +282,7 @@ share/locale/fi/LC_MESSAGES/kfontinst.mo share/locale/fi/LC_MESSAGES/kfouleggs.mo share/locale/fi/LC_MESSAGES/kgamma.mo share/locale/fi/LC_MESSAGES/kgantt.mo +share/locale/fi/LC_MESSAGES/kgeography.mo share/locale/fi/LC_MESSAGES/kget.mo share/locale/fi/LC_MESSAGES/kghostview.mo share/locale/fi/LC_MESSAGES/kgoldrunner.mo diff --git a/misc/kde3-i18n-fy/distinfo b/misc/kde3-i18n-fy/distinfo index 7fdacf9d70a7..0b098fa7c814 100644 --- a/misc/kde3-i18n-fy/distinfo +++ b/misc/kde3-i18n-fy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = 345532f5d35b333ff3fd1782f550a40d -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = a00dd20075deaf99bd09bdf2788f1d1cd683687a7c531c1154501b66abc6e204 -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = 688060 +MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 98a3bbe04e82b89c8ab2a821741ffc34 +SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 1cf20414172ad6b4b3578777190f4db5ff3f437fce5b1619fc62738a38f5cc7f +SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 691937 diff --git a/misc/kde3-i18n-ga/distinfo b/misc/kde3-i18n-ga/distinfo index 0adccda2edf2..5f5825de146e 100644 --- a/misc/kde3-i18n-ga/distinfo +++ b/misc/kde3-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = cf7f957445f540058ab4bca4b6701559 -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = 17bf428c1f80b3f18f48084150aaa360d54ba2fcc8fac08d2ac49783212c9231 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = 1682840 +MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = e82a3ff13cb0f8d73578f1a3770a119c +SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = ec9bc93828a5a690bfd9ec8d93ffe9f8fee0ee4d36b7bd1da8ac27b757c05336 +SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = 1698887 diff --git a/misc/kde3-i18n-gl/distinfo b/misc/kde3-i18n-gl/distinfo index c98aa1646529..f319b6d332d8 100644 --- a/misc/kde3-i18n-gl/distinfo +++ b/misc/kde3-i18n-gl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = 17cdcec622097a328b583755861b30e3 -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = f4dcbd540fdc99fd29ac9e0678567cf56ed31830ddda8d6e74ea18d9fbbdcae9 -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = 1341746 +MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = bf3ad88fea56ded7fd451cc83826e4c5 +SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = f997219bd0382843ed7be7b3ef9a18fc672a476b1c9321b730cbfeb16d5a406f +SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = 1354712 diff --git a/misc/kde3-i18n-hi/distinfo b/misc/kde3-i18n-hi/distinfo index 0a0dc8fcad38..4738d5ef7845 100644 --- a/misc/kde3-i18n-hi/distinfo +++ b/misc/kde3-i18n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 9b07d10f948803f6fca49666934517c3 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 1faae0637af46c171f6f19bc168fb622ef25bb2427a5d445cfc2ef720c1515d0 -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 1652572 +MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = a046a16fd6575ee67a9086702414bac1 +SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = d5bc830048aafa372cfdce66fe48edc1e798b7e660162cd559e4c50dbf43708a +SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = 1663837 diff --git a/misc/kde3-i18n-hr/distinfo b/misc/kde3-i18n-hr/distinfo index 6eaca1c602e5..30f5d74c4d87 100644 --- a/misc/kde3-i18n-hr/distinfo +++ b/misc/kde3-i18n-hr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hr-3.5.4.tar.bz2) = 954e690a2d7fba5e21056655c77d3b9e -SHA256 (KDE/kde-i18n/kde-i18n-hr-3.5.4.tar.bz2) = 241180778a74de4d5755df299bdbdb369a899fb8f09aed6240d38729839c2491 -SIZE (KDE/kde-i18n/kde-i18n-hr-3.5.4.tar.bz2) = 1685776 +MD5 (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = 486262b00bab42965aa0d25c86d65f84 +SHA256 (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = bcd08af577aa07f0e43c390edbf1762d783f668cac52af6bb63750ef11daaa17 +SIZE (KDE/kde-i18n/kde-i18n-hr-3.5.5.tar.bz2) = 1704629 diff --git a/misc/kde3-i18n-hr/pkg-plist b/misc/kde3-i18n-hr/pkg-plist index 0aa3962fb944..dcbe490efa79 100644 --- a/misc/kde3-i18n-hr/pkg-plist +++ b/misc/kde3-i18n-hr/pkg-plist @@ -133,6 +133,7 @@ share/locale/hr/LC_MESSAGES/kcmperformance.mo share/locale/hr/LC_MESSAGES/kcmprintmgr.mo share/locale/hr/LC_MESSAGES/kcmsamba.mo share/locale/hr/LC_MESSAGES/kcmscreensaver.mo +share/locale/hr/LC_MESSAGES/kcmshell.mo share/locale/hr/LC_MESSAGES/kcmsmartcard.mo share/locale/hr/LC_MESSAGES/kcmsmserver.mo share/locale/hr/LC_MESSAGES/kcmspellchecking.mo @@ -207,6 +208,7 @@ share/locale/hr/LC_MESSAGES/kgamma.mo share/locale/hr/LC_MESSAGES/kgantt.mo share/locale/hr/LC_MESSAGES/kget.mo share/locale/hr/LC_MESSAGES/kghostview.mo +share/locale/hr/LC_MESSAGES/kgoldrunner.mo share/locale/hr/LC_MESSAGES/kgpg.mo share/locale/hr/LC_MESSAGES/kgreet_classic.mo share/locale/hr/LC_MESSAGES/kgreet_winbind.mo @@ -266,6 +268,7 @@ share/locale/hr/LC_MESSAGES/kmobile.mo share/locale/hr/LC_MESSAGES/kmoon.mo share/locale/hr/LC_MESSAGES/kmplot.mo share/locale/hr/LC_MESSAGES/kmrml.mo +share/locale/hr/LC_MESSAGES/knetwalk.mo share/locale/hr/LC_MESSAGES/knewsticker.mo share/locale/hr/LC_MESSAGES/knode.mo share/locale/hr/LC_MESSAGES/knotes.mo @@ -363,6 +366,7 @@ share/locale/hr/LC_MESSAGES/kworldclock.mo share/locale/hr/LC_MESSAGES/kwriteconfig.mo share/locale/hr/LC_MESSAGES/kxkb.mo share/locale/hr/LC_MESSAGES/kxsconfig.mo +share/locale/hr/LC_MESSAGES/libdmctl.mo share/locale/hr/LC_MESSAGES/libkcal.mo share/locale/hr/LC_MESSAGES/libkdegames.mo share/locale/hr/LC_MESSAGES/libkdepim.mo @@ -371,6 +375,9 @@ share/locale/hr/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/hr/LC_MESSAGES/libkickermenu_konsole.mo share/locale/hr/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/hr/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/hr/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/hr/LC_MESSAGES/libkickermenu_systemmenu.mo +share/locale/hr/LC_MESSAGES/libkickermenu_tom.mo share/locale/hr/LC_MESSAGES/libkonq.mo share/locale/hr/LC_MESSAGES/libkpimexchange.mo share/locale/hr/LC_MESSAGES/libkscan.mo @@ -381,18 +388,23 @@ share/locale/hr/LC_MESSAGES/libtaskbar.mo share/locale/hr/LC_MESSAGES/libtaskmanager.mo share/locale/hr/LC_MESSAGES/lockout.mo share/locale/hr/LC_MESSAGES/lskat.mo +share/locale/hr/LC_MESSAGES/mediaapplet.mo share/locale/hr/LC_MESSAGES/naughtyapplet.mo share/locale/hr/LC_MESSAGES/noatun.mo share/locale/hr/LC_MESSAGES/nsplugin.mo share/locale/hr/LC_MESSAGES/ppdtranslations.mo +share/locale/hr/LC_MESSAGES/privacy.mo share/locale/hr/LC_MESSAGES/qeditor.mo share/locale/hr/LC_MESSAGES/quanta.mo share/locale/hr/LC_MESSAGES/quicklauncher.mo share/locale/hr/LC_MESSAGES/secpolicy.mo share/locale/hr/LC_MESSAGES/spy.mo share/locale/hr/LC_MESSAGES/timezones.mo +share/locale/hr/LC_MESSAGES/trashapplet.mo +share/locale/hr/LC_MESSAGES/tyler.mo share/locale/hr/LC_MESSAGES/uachangerplugin.mo share/locale/hr/LC_MESSAGES/umbrello.mo +share/locale/hr/LC_MESSAGES/useraccount.mo share/locale/hr/LC_MESSAGES/validatorsplugin.mo share/locale/hr/LC_MESSAGES/webarchiver.mo share/locale/hr/charset diff --git a/misc/kde3-i18n-is/distinfo b/misc/kde3-i18n-is/distinfo index e861df656248..d8817e5cd3f5 100644 --- a/misc/kde3-i18n-is/distinfo +++ b/misc/kde3-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = ff1e7b4b500a2032530c101a1473895a -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 1db086325890d212c3910b5f9d0f486b8f9c5e596409552d691191bdbc83f2e7 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 2090071 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 diff --git a/misc/kde3-i18n-it/distinfo b/misc/kde3-i18n-it/distinfo index 5a5b4dc9c4c2..8264fd14e9cc 100644 --- a/misc/kde3-i18n-it/distinfo +++ b/misc/kde3-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = b050d738e3e7386134e4a657a38b5c24 -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = 01e7fc47275222204ab79c64863162f29720927695f286cb1a80346d44636b5b -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = 15622631 +MD5 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = a69220e5a700a277238924a3675d9dbd +SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 235702d3f8ad96edd820f01588554dfd1c4d5ac1a7bb3103c7a17922af08cedd +SIZE (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 15749338 diff --git a/misc/kde3-i18n-it/pkg-plist b/misc/kde3-i18n-it/pkg-plist index ae75cdb7bd0e..6fbf37275330 100644 --- a/misc/kde3-i18n-it/pkg-plist +++ b/misc/kde3-i18n-it/pkg-plist @@ -364,6 +364,9 @@ share/doc/HTML/it/kcontrol/filetypes/index.docbook share/doc/HTML/it/kcontrol/fonts/common share/doc/HTML/it/kcontrol/fonts/index.cache.bz2 share/doc/HTML/it/kcontrol/fonts/index.docbook +share/doc/HTML/it/kcontrol/helpindex/common +share/doc/HTML/it/kcontrol/helpindex/index.cache.bz2 +share/doc/HTML/it/kcontrol/helpindex/index.docbook share/doc/HTML/it/kcontrol/icons/common share/doc/HTML/it/kcontrol/icons/index.cache.bz2 share/doc/HTML/it/kcontrol/icons/index.docbook @@ -372,6 +375,9 @@ share/doc/HTML/it/kcontrol/index.docbook share/doc/HTML/it/kcontrol/kalarmd/common share/doc/HTML/it/kcontrol/kalarmd/index.cache.bz2 share/doc/HTML/it/kcontrol/kalarmd/index.docbook +share/doc/HTML/it/kcontrol/kcmaccess/common +share/doc/HTML/it/kcontrol/kcmaccess/index.cache.bz2 +share/doc/HTML/it/kcontrol/kcmaccess/index.docbook share/doc/HTML/it/kcontrol/kcmcss/common share/doc/HTML/it/kcontrol/kcmcss/index.cache.bz2 share/doc/HTML/it/kcontrol/kcmcss/index.docbook @@ -445,6 +451,9 @@ share/doc/HTML/it/kcontrol/panelappearance/index.docbook share/doc/HTML/it/kcontrol/passwords/common share/doc/HTML/it/kcontrol/passwords/index.cache.bz2 share/doc/HTML/it/kcontrol/passwords/index.docbook +share/doc/HTML/it/kcontrol/performance/common +share/doc/HTML/it/kcontrol/performance/index.cache.bz2 +share/doc/HTML/it/kcontrol/performance/index.docbook share/doc/HTML/it/kcontrol/powerctrl/common share/doc/HTML/it/kcontrol/powerctrl/index.cache.bz2 share/doc/HTML/it/kcontrol/powerctrl/index.docbook @@ -510,6 +519,7 @@ share/doc/HTML/it/kdeprint/rlpr.docbook share/doc/HTML/it/kdesu/common share/doc/HTML/it/kdesu/index.cache.bz2 share/doc/HTML/it/kdesu/index.docbook +share/doc/HTML/it/kdesu/man-kdesu.1.docbook share/doc/HTML/it/kdevelop/SF-general.png share/doc/HTML/it/kdevelop/SF-indent.png share/doc/HTML/it/kdevelop/SF-other.png @@ -617,6 +627,7 @@ share/doc/HTML/it/kfilereplace/index.docbook share/doc/HTML/it/kfind/common share/doc/HTML/it/kfind/index.cache.bz2 share/doc/HTML/it/kfind/index.docbook +share/doc/HTML/it/kfind/man-kfind.1.docbook share/doc/HTML/it/kfloppy/common share/doc/HTML/it/kfloppy/index.cache.bz2 share/doc/HTML/it/kfloppy/index.docbook @@ -689,6 +700,7 @@ share/doc/HTML/it/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/it/khelpcenter/quickstart/index.docbook share/doc/HTML/it/khelpcenter/support.docbook share/doc/HTML/it/khelpcenter/userguide/about-desktop.docbook +share/doc/HTML/it/khelpcenter/userguide/accessibility.docbook share/doc/HTML/it/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/it/khelpcenter/userguide/burning-cds.docbook share/doc/HTML/it/khelpcenter/userguide/control-center.docbook @@ -703,6 +715,7 @@ share/doc/HTML/it/khelpcenter/userguide/history.docbook share/doc/HTML/it/khelpcenter/userguide/installation.docbook share/doc/HTML/it/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/it/khelpcenter/userguide/intro.docbook +share/doc/HTML/it/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/it/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/it/khelpcenter/userguide/kdeadmin-apps.docbook share/doc/HTML/it/khelpcenter/userguide/kdebase-apps.docbook @@ -733,9 +746,11 @@ share/doc/HTML/it/khelpcenter/userguide/shortcuts.docbook share/doc/HTML/it/khelpcenter/userguide/staff.docbook share/doc/HTML/it/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/it/khelpcenter/userguide/switching-sessions.docbook +share/doc/HTML/it/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/it/khelpcenter/userguide/ug-faq.docbook +share/doc/HTML/it/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/it/khelpcenter/userguide/usenet.docbook share/doc/HTML/it/khelpcenter/userguide/where-next.docbook share/doc/HTML/it/khelpcenter/userguide/windows-how-to.docbook @@ -753,6 +768,7 @@ share/doc/HTML/it/kicker-applets/ktimemon.docbook share/doc/HTML/it/kicker/common share/doc/HTML/it/kicker/index.cache.bz2 share/doc/HTML/it/kicker/index.docbook +share/doc/HTML/it/kicker/man-appletproxy.1.docbook share/doc/HTML/it/kicker/man-kicker.1.docbook share/doc/HTML/it/kiconedit/common share/doc/HTML/it/kiconedit/index.cache.bz2 @@ -764,6 +780,9 @@ share/doc/HTML/it/kig/man-kig.1.docbook share/doc/HTML/it/kinfocenter/blockdevices/common share/doc/HTML/it/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/it/kinfocenter/blockdevices/index.docbook +share/doc/HTML/it/kinfocenter/cdinfo/common +share/doc/HTML/it/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/it/kinfocenter/cdinfo/index.docbook share/doc/HTML/it/kinfocenter/common share/doc/HTML/it/kinfocenter/devices/common share/doc/HTML/it/kinfocenter/devices/index.cache.bz2 @@ -960,12 +979,15 @@ share/doc/HTML/it/kmplot/using.docbook share/doc/HTML/it/knetworkconf/common share/doc/HTML/it/knetworkconf/index.cache.bz2 share/doc/HTML/it/knetworkconf/index.docbook +share/doc/HTML/it/knode/commands.docbook share/doc/HTML/it/knode/credits.docbook share/doc/HTML/it/knode/faq.docbook share/doc/HTML/it/knode/gloss.docbook share/doc/HTML/it/knode/install.docbook share/doc/HTML/it/knode/introduction.docbook +share/doc/HTML/it/knode/journey.docbook share/doc/HTML/it/knode/more.docbook +share/doc/HTML/it/knode/using-subscribing.docbook share/doc/HTML/it/knotes/common share/doc/HTML/it/knotes/index.cache.bz2 share/doc/HTML/it/knotes/index.docbook @@ -1064,6 +1086,9 @@ share/doc/HTML/it/konsole/index.cache.bz2 share/doc/HTML/it/konsole/index.docbook share/doc/HTML/it/konsole/konsole.png share/doc/HTML/it/konsole/tabbar.png +share/doc/HTML/it/konsolekalendar/common +share/doc/HTML/it/konsolekalendar/index.cache.bz2 +share/doc/HTML/it/konsolekalendar/index.docbook share/doc/HTML/it/kontact/common share/doc/HTML/it/kontact/index.cache.bz2 share/doc/HTML/it/kontact/index.docbook @@ -1534,6 +1559,7 @@ share/doc/HTML/it/umbrello/other_features.docbook share/doc/HTML/it/umbrello/uml_basics.docbook share/doc/HTML/it/umbrello/working_with_umbrello.docbook share/doc/HTML/it/xsldbg/credits.docbook +share/doc/HTML/it/xsldbg/usage.docbook share/locale/it/LC_MESSAGES/akregator.mo share/locale/it/LC_MESSAGES/akregator_konqplugin.mo share/locale/it/LC_MESSAGES/alsaplayerui.mo @@ -2166,6 +2192,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kopete @dirrm share/doc/HTML/it/kooka @dirrm share/doc/HTML/it/kontact +@dirrm share/doc/HTML/it/konsolekalendar @dirrm share/doc/HTML/it/konsole @dirrm share/doc/HTML/it/konquest @dirrm share/doc/HTML/it/konqueror @@ -2230,6 +2257,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kinfocenter/interrupts @dirrm share/doc/HTML/it/kinfocenter/dma @dirrm share/doc/HTML/it/kinfocenter/devices +@dirrm share/doc/HTML/it/kinfocenter/cdinfo @dirrm share/doc/HTML/it/kinfocenter/blockdevices @dirrm share/doc/HTML/it/kinfocenter @dirrm share/doc/HTML/it/kig @@ -2277,6 +2305,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/screensaver @dirrm share/doc/HTML/it/kcontrol/proxy @dirrm share/doc/HTML/it/kcontrol/powerctrl +@dirrm share/doc/HTML/it/kcontrol/performance @dirrm share/doc/HTML/it/kcontrol/passwords @dirrm share/doc/HTML/it/kcontrol/panelappearance @dirrm share/doc/HTML/it/kcontrol/panel @@ -2301,8 +2330,10 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/kcmkonsole @dirrm share/doc/HTML/it/kcontrol/kcmfontinst @dirrm share/doc/HTML/it/kcontrol/kcmcss +@dirrm share/doc/HTML/it/kcontrol/kcmaccess @dirrm share/doc/HTML/it/kcontrol/kalarmd @dirrm share/doc/HTML/it/kcontrol/icons +@dirrm share/doc/HTML/it/kcontrol/helpindex @dirrm share/doc/HTML/it/kcontrol/fonts @dirrm share/doc/HTML/it/kcontrol/filetypes @dirrm share/doc/HTML/it/kcontrol/filemanager diff --git a/misc/kde3-i18n-kk/distinfo b/misc/kde3-i18n-kk/distinfo index d53df3f40317..fa45a31807ec 100644 --- a/misc/kde3-i18n-kk/distinfo +++ b/misc/kde3-i18n-kk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = b2a0dbd4a6c32dfce58aa488db27aa4d -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = 4e5ab7ea74ccdd8439f47e1976b5d141fbf5fd1f99f6014d1f2015c906b86d90 -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = 800194 +MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = a0811b606aecac2a854af9f27ce7e716 +SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = d700f7b53f9faba130246191669ffe553ce864bad2f35338ab1d9799e57f4e09 +SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = 926318 diff --git a/misc/kde3-i18n-kk/pkg-plist b/misc/kde3-i18n-kk/pkg-plist index 53e6b84253aa..cdde694d51eb 100644 --- a/misc/kde3-i18n-kk/pkg-plist +++ b/misc/kde3-i18n-kk/pkg-plist @@ -138,6 +138,7 @@ share/locale/kk/LC_MESSAGES/kdesu.mo share/locale/kk/LC_MESSAGES/kdesud.mo share/locale/kk/LC_MESSAGES/kdf.mo share/locale/kk/LC_MESSAGES/kdialog.mo +share/locale/kk/LC_MESSAGES/kdict.mo share/locale/kk/LC_MESSAGES/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo @@ -153,6 +154,7 @@ share/locale/kk/LC_MESSAGES/kfile_rpm.mo share/locale/kk/LC_MESSAGES/kfile_torrent.mo share/locale/kk/LC_MESSAGES/kfile_txt.mo share/locale/kk/LC_MESSAGES/kfileaudiopreview.mo +share/locale/kk/LC_MESSAGES/kfileshare.mo share/locale/kk/LC_MESSAGES/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo share/locale/kk/LC_MESSAGES/kfmclient.mo @@ -209,9 +211,11 @@ share/locale/kk/LC_MESSAGES/kmilo_kvaio.mo share/locale/kk/LC_MESSAGES/kmilo_powerbook.mo share/locale/kk/LC_MESSAGES/kmilo_thinkpad.mo share/locale/kk/LC_MESSAGES/kmilod.mo +share/locale/kk/LC_MESSAGES/kmines.mo share/locale/kk/LC_MESSAGES/kminipagerapplet.mo share/locale/kk/LC_MESSAGES/knetattach.mo share/locale/kk/LC_MESSAGES/knetworkconf.mo +share/locale/kk/LC_MESSAGES/knewsticker.mo share/locale/kk/LC_MESSAGES/knotify.mo share/locale/kk/LC_MESSAGES/kolourpicker.mo share/locale/kk/LC_MESSAGES/konqsidebar_delicious.mo @@ -220,15 +224,18 @@ share/locale/kk/LC_MESSAGES/konqsidebar_metabar.mo share/locale/kk/LC_MESSAGES/konqsidebar_news.mo share/locale/kk/LC_MESSAGES/konqueror.mo share/locale/kk/LC_MESSAGES/konsole.mo +share/locale/kk/LC_MESSAGES/kopete.mo share/locale/kk/LC_MESSAGES/kpackage.mo share/locale/kk/LC_MESSAGES/kpager.mo share/locale/kk/LC_MESSAGES/kpersonalizer.mo share/locale/kk/LC_MESSAGES/kppp.mo +share/locale/kk/LC_MESSAGES/kppplogview.mo share/locale/kk/LC_MESSAGES/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo share/locale/kk/LC_MESSAGES/kreadconfig.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo +share/locale/kk/LC_MESSAGES/krfb.mo share/locale/kk/LC_MESSAGES/krunapplet.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo share/locale/kk/LC_MESSAGES/ksig.mo diff --git a/misc/kde3-i18n-km/distinfo b/misc/kde3-i18n-km/distinfo index 7870071d140b..a8113e46c0f1 100644 --- a/misc/kde3-i18n-km/distinfo +++ b/misc/kde3-i18n-km/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = 36cc11549a23ecc2967222ea76826cbf -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = b6eb783d5072974968be45dc45f8a56bbe8447a3fb567ba96c3bd482f94f743f -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = 1265931 +MD5 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = c11c4653c9e211deb4c16bf346bd03ad +SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 818b3be6a18afeb99771f0746b0c1b593f1abc31438dae3bc18a796b4700bd61 +SIZE (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 1656443 diff --git a/misc/kde3-i18n-km/pkg-plist b/misc/kde3-i18n-km/pkg-plist index 21f5cc7068f2..799943d795dc 100644 --- a/misc/kde3-i18n-km/pkg-plist +++ b/misc/kde3-i18n-km/pkg-plist @@ -49,9 +49,11 @@ share/locale/km/LC_MESSAGES/kaboodle.mo share/locale/km/LC_MESSAGES/kaccess.mo share/locale/km/LC_MESSAGES/kaddressbook.mo share/locale/km/LC_MESSAGES/kalarm.mo +share/locale/km/LC_MESSAGES/kalzium.mo share/locale/km/LC_MESSAGES/kanagram.mo share/locale/km/LC_MESSAGES/kandy.mo share/locale/km/LC_MESSAGES/kappfinder.mo +share/locale/km/LC_MESSAGES/karm.mo share/locale/km/LC_MESSAGES/kasbarextension.mo share/locale/km/LC_MESSAGES/kasteroids.mo share/locale/km/LC_MESSAGES/kate.mo @@ -87,10 +89,12 @@ share/locale/km/LC_MESSAGES/kbinaryclock.mo share/locale/km/LC_MESSAGES/kblackbox.mo share/locale/km/LC_MESSAGES/kbounce.mo share/locale/km/LC_MESSAGES/kbruch.mo +share/locale/km/LC_MESSAGES/kbstateapplet.mo share/locale/km/LC_MESSAGES/kcalc.mo share/locale/km/LC_MESSAGES/kcharselect.mo share/locale/km/LC_MESSAGES/kcharselectapplet.mo share/locale/km/LC_MESSAGES/kcm_krfb.mo +share/locale/km/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -127,6 +131,7 @@ share/locale/km/LC_MESSAGES/kcmkonqhtml.mo share/locale/km/LC_MESSAGES/kcmkonsole.mo share/locale/km/LC_MESSAGES/kcmkontactnt.mo share/locale/km/LC_MESSAGES/kcmktalkd.mo +share/locale/km/LC_MESSAGES/kcmkttsd.mo share/locale/km/LC_MESSAGES/kcmkuick.mo share/locale/km/LC_MESSAGES/kcmkurifilt.mo share/locale/km/LC_MESSAGES/kcmkvaio.mo @@ -183,8 +188,10 @@ share/locale/km/LC_MESSAGES/kdgantt.mo share/locale/km/LC_MESSAGES/kdialog.mo share/locale/km/LC_MESSAGES/kdict.mo share/locale/km/LC_MESSAGES/kdictapplet.mo +share/locale/km/LC_MESSAGES/kdjview.mo share/locale/km/LC_MESSAGES/kdmconfig.mo share/locale/km/LC_MESSAGES/kdmgreet.mo +share/locale/km/LC_MESSAGES/kdvi.mo share/locale/km/LC_MESSAGES/kedit.mo share/locale/km/LC_MESSAGES/keduca.mo share/locale/km/LC_MESSAGES/kenolaba.mo @@ -198,6 +205,7 @@ share/locale/km/LC_MESSAGES/kfile_cert.mo share/locale/km/LC_MESSAGES/kfile_dds.mo share/locale/km/LC_MESSAGES/kfile_deb.mo share/locale/km/LC_MESSAGES/kfile_desktop.mo +share/locale/km/LC_MESSAGES/kfile_drgeo.mo share/locale/km/LC_MESSAGES/kfile_dvi.mo share/locale/km/LC_MESSAGES/kfile_exr.mo share/locale/km/LC_MESSAGES/kfile_flac.mo @@ -207,6 +215,7 @@ share/locale/km/LC_MESSAGES/kfile_html.mo share/locale/km/LC_MESSAGES/kfile_ico.mo share/locale/km/LC_MESSAGES/kfile_ics.mo share/locale/km/LC_MESSAGES/kfile_jpeg.mo +share/locale/km/LC_MESSAGES/kfile_kig.mo share/locale/km/LC_MESSAGES/kfile_lnk.mo share/locale/km/LC_MESSAGES/kfile_m3u.mo share/locale/km/LC_MESSAGES/kfile_mhtml.mo @@ -242,6 +251,7 @@ share/locale/km/LC_MESSAGES/kfontinst.mo share/locale/km/LC_MESSAGES/kfouleggs.mo share/locale/km/LC_MESSAGES/kgamma.mo share/locale/km/LC_MESSAGES/kgantt.mo +share/locale/km/LC_MESSAGES/kgeography.mo share/locale/km/LC_MESSAGES/kget.mo share/locale/km/LC_MESSAGES/kghostview.mo share/locale/km/LC_MESSAGES/kgoldrunner.mo @@ -255,6 +265,7 @@ share/locale/km/LC_MESSAGES/khtmlkttsd.mo share/locale/km/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/km/LC_MESSAGES/kicker.mo share/locale/km/LC_MESSAGES/kiconedit.mo +share/locale/km/LC_MESSAGES/kig.mo share/locale/km/LC_MESSAGES/kinetd.mo share/locale/km/LC_MESSAGES/kio.mo share/locale/km/LC_MESSAGES/kio_audiocd.mo @@ -289,11 +300,14 @@ share/locale/km/LC_MESSAGES/kio_thumbnail.mo share/locale/km/LC_MESSAGES/kio_trash.mo share/locale/km/LC_MESSAGES/kio_zeroconf.mo share/locale/km/LC_MESSAGES/kioexec.mo +share/locale/km/LC_MESSAGES/kiten.mo share/locale/km/LC_MESSAGES/kjobviewer.mo share/locale/km/LC_MESSAGES/kjots.mo share/locale/km/LC_MESSAGES/kjumpingcube.mo share/locale/km/LC_MESSAGES/klaptopdaemon.mo +share/locale/km/LC_MESSAGES/klatin.mo share/locale/km/LC_MESSAGES/klegacyimport.mo +share/locale/km/LC_MESSAGES/kleopatra.mo share/locale/km/LC_MESSAGES/klettres.mo share/locale/km/LC_MESSAGES/klickety.mo share/locale/km/LC_MESSAGES/klines.mo @@ -304,9 +318,11 @@ share/locale/km/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/km/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/km/LC_MESSAGES/kmailcvt.mo share/locale/km/LC_MESSAGES/kmathapplet.mo +share/locale/km/LC_MESSAGES/kmathtool.mo share/locale/km/LC_MESSAGES/kmcop.mo share/locale/km/LC_MESSAGES/kmenuapplet.mo share/locale/km/LC_MESSAGES/kmenuedit.mo +share/locale/km/LC_MESSAGES/kmessedwords.mo share/locale/km/LC_MESSAGES/kmid.mo share/locale/km/LC_MESSAGES/kmilo_delli8k.mo share/locale/km/LC_MESSAGES/kmilo_generic.mo @@ -320,8 +336,11 @@ share/locale/km/LC_MESSAGES/kmix.mo share/locale/km/LC_MESSAGES/kmobile.mo share/locale/km/LC_MESSAGES/kmoon.mo share/locale/km/LC_MESSAGES/kmouth.mo +share/locale/km/LC_MESSAGES/kmplot.mo +share/locale/km/LC_MESSAGES/kmrml.mo share/locale/km/LC_MESSAGES/knetattach.mo share/locale/km/LC_MESSAGES/knetwalk.mo +share/locale/km/LC_MESSAGES/knode.mo share/locale/km/LC_MESSAGES/knotes.mo share/locale/km/LC_MESSAGES/knotify.mo share/locale/km/LC_MESSAGES/kodo.mo @@ -347,6 +366,7 @@ share/locale/km/LC_MESSAGES/kontact.mo share/locale/km/LC_MESSAGES/kooka.mo share/locale/km/LC_MESSAGES/kopete.mo share/locale/km/LC_MESSAGES/korganizer.mo +share/locale/km/LC_MESSAGES/korn.mo share/locale/km/LC_MESSAGES/kpager.mo share/locale/km/LC_MESSAGES/kpartapp.mo share/locale/km/LC_MESSAGES/kpat.mo @@ -354,7 +374,9 @@ share/locale/km/LC_MESSAGES/kpdf.mo share/locale/km/LC_MESSAGES/kpercentage.mo share/locale/km/LC_MESSAGES/kpersonalizer.mo share/locale/km/LC_MESSAGES/kpf.mo +share/locale/km/LC_MESSAGES/kpilot.mo share/locale/km/LC_MESSAGES/kpoker.mo +share/locale/km/LC_MESSAGES/kpovmodeler.mo share/locale/km/LC_MESSAGES/kppplogview.mo share/locale/km/LC_MESSAGES/kprinter.mo share/locale/km/LC_MESSAGES/krandr.mo @@ -393,10 +415,12 @@ share/locale/km/LC_MESSAGES/ksokoban.mo share/locale/km/LC_MESSAGES/kspaceduel.mo share/locale/km/LC_MESSAGES/ksplash.mo share/locale/km/LC_MESSAGES/ksplashthemes.mo +share/locale/km/LC_MESSAGES/kstars.mo share/locale/km/LC_MESSAGES/kstart.mo share/locale/km/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/km/LC_MESSAGES/kstyle_keramik_config.mo share/locale/km/LC_MESSAGES/kstyle_plastik_config.mo +share/locale/km/LC_MESSAGES/ksvgplugin.mo share/locale/km/LC_MESSAGES/ksync.mo share/locale/km/LC_MESSAGES/ksysguard.mo share/locale/km/LC_MESSAGES/ksystemtrayapplet.mo @@ -409,21 +433,40 @@ share/locale/km/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/km/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/km/LC_MESSAGES/ktexteditor_isearch.mo share/locale/km/LC_MESSAGES/ktexteditor_kdatatool.mo +share/locale/km/LC_MESSAGES/ktexteditor_kttsd.mo share/locale/km/LC_MESSAGES/kthememanager.mo share/locale/km/LC_MESSAGES/ktimemon.mo share/locale/km/LC_MESSAGES/ktimer.mo share/locale/km/LC_MESSAGES/ktip.mo +share/locale/km/LC_MESSAGES/ktnef.mo +share/locale/km/LC_MESSAGES/ktouch.mo share/locale/km/LC_MESSAGES/ktron.mo +share/locale/km/LC_MESSAGES/kttsd_commandplugin.mo +share/locale/km/LC_MESSAGES/kttsd_eposplugin.mo +share/locale/km/LC_MESSAGES/kttsd_fliteplugin.mo +share/locale/km/LC_MESSAGES/kttsd_freettsplugin.mo +share/locale/km/LC_MESSAGES/kttsd_sbdplugin.mo +share/locale/km/LC_MESSAGES/kttsd_xmltransformerplugin.mo +share/locale/km/LC_MESSAGES/kttsmgr.mo share/locale/km/LC_MESSAGES/ktuberling.mo +share/locale/km/LC_MESSAGES/kturtle.mo share/locale/km/LC_MESSAGES/ktux.mo share/locale/km/LC_MESSAGES/kuick_plugin.mo share/locale/km/LC_MESSAGES/kuickshow.mo +share/locale/km/LC_MESSAGES/kverbos.mo share/locale/km/LC_MESSAGES/kview.mo +share/locale/km/LC_MESSAGES/kview_scale.mo share/locale/km/LC_MESSAGES/kviewbrowserplugin.mo share/locale/km/LC_MESSAGES/kviewcanvas.mo share/locale/km/LC_MESSAGES/kvieweffectsplugin.mo +share/locale/km/LC_MESSAGES/kviewpresenterplugin.mo share/locale/km/LC_MESSAGES/kviewscannerplugin.mo +share/locale/km/LC_MESSAGES/kviewshell.mo +share/locale/km/LC_MESSAGES/kviewtemplateplugin.mo +share/locale/km/LC_MESSAGES/kviewviewer.mo +share/locale/km/LC_MESSAGES/kvoctrain.mo share/locale/km/LC_MESSAGES/kwalletmanager.mo +share/locale/km/LC_MESSAGES/kwatchgnupg.mo share/locale/km/LC_MESSAGES/kweather.mo share/locale/km/LC_MESSAGES/kwifimanager.mo share/locale/km/LC_MESSAGES/kwin.mo @@ -431,15 +474,18 @@ share/locale/km/LC_MESSAGES/kwin4.mo share/locale/km/LC_MESSAGES/kwin_clients.mo share/locale/km/LC_MESSAGES/kwin_lib.mo share/locale/km/LC_MESSAGES/kwireless.mo +share/locale/km/LC_MESSAGES/kwordquiz.mo share/locale/km/LC_MESSAGES/kworldclock.mo share/locale/km/LC_MESSAGES/kwriteconfig.mo share/locale/km/LC_MESSAGES/kxkb.mo share/locale/km/LC_MESSAGES/kxmlrpcd.mo +share/locale/km/LC_MESSAGES/libKTTSD.mo share/locale/km/LC_MESSAGES/libcalendarresources.mo share/locale/km/LC_MESSAGES/libdmctl.mo share/locale/km/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/km/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/km/LC_MESSAGES/libkcal.mo +share/locale/km/LC_MESSAGES/libkcalsystem.mo share/locale/km/LC_MESSAGES/libkcddb.mo share/locale/km/LC_MESSAGES/libkdeedu.mo share/locale/km/LC_MESSAGES/libkdegames.mo @@ -456,6 +502,7 @@ share/locale/km/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/km/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/km/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/km/LC_MESSAGES/libkickermenu_tom.mo +share/locale/km/LC_MESSAGES/libkleopatra.mo share/locale/km/LC_MESSAGES/libkmime.mo share/locale/km/LC_MESSAGES/libkonq.mo share/locale/km/LC_MESSAGES/libkpgp.mo @@ -481,6 +528,7 @@ share/locale/km/LC_MESSAGES/noatun.mo share/locale/km/LC_MESSAGES/nsplugin.mo share/locale/km/LC_MESSAGES/pitchablespeed.mo share/locale/km/LC_MESSAGES/privacy.mo +share/locale/km/LC_MESSAGES/quanta.mo share/locale/km/LC_MESSAGES/quicklauncher.mo share/locale/km/LC_MESSAGES/rellinks.mo share/locale/km/LC_MESSAGES/searchbarplugin.mo diff --git a/misc/kde3-i18n-lt/distinfo b/misc/kde3-i18n-lt/distinfo index 2423dc732c2e..77afcbf9f51c 100644 --- a/misc/kde3-i18n-lt/distinfo +++ b/misc/kde3-i18n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 5c8bf80d151685785cf16d0d60912441 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 24dcc5d304184c55432367a76dac1dd541dfed7fc6906eabc1449c367e266670 -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 1872233 +MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = aa799b8fac440c0b70188e0f9df16350 +SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = d55c4f4ff50dc2b2f3b365594bae75a491a57c32aa251a565fa6a4699304d866 +SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = 1888636 diff --git a/misc/kde3-i18n-lv/distinfo b/misc/kde3-i18n-lv/distinfo index d84d478ac379..3df0e3c0fe72 100644 --- a/misc/kde3-i18n-lv/distinfo +++ b/misc/kde3-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 0f0f1fd8542552fb25a6cd4dbc99aece -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 0c8fc496e0e24d12cfb8b2564263925e5b58782fc11fa8556f6d601d3b0da6f0 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 1348144 +MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = f541bb2957e1f0469d76711cc86ba851 +SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = d99b0d080abc56c53b2fc3058a0ad945f971e891870b995c7bced4dfdbabe437 +SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = 1352071 diff --git a/misc/kde3-i18n-lv/pkg-plist b/misc/kde3-i18n-lv/pkg-plist index 9945da1791fd..57999f50d42e 100644 --- a/misc/kde3-i18n-lv/pkg-plist +++ b/misc/kde3-i18n-lv/pkg-plist @@ -237,6 +237,7 @@ share/locale/lv/LC_MESSAGES/ktip.mo share/locale/lv/LC_MESSAGES/ktouch.mo share/locale/lv/LC_MESSAGES/ktron.mo share/locale/lv/LC_MESSAGES/ktuberling.mo +share/locale/lv/LC_MESSAGES/ktux.mo share/locale/lv/LC_MESSAGES/kuick_plugin.mo share/locale/lv/LC_MESSAGES/kuickshow.mo share/locale/lv/LC_MESSAGES/kuser.mo diff --git a/misc/kde3-i18n-mk/distinfo b/misc/kde3-i18n-mk/distinfo index 096f9bf1eee6..ae3676d8bd8e 100644 --- a/misc/kde3-i18n-mk/distinfo +++ b/misc/kde3-i18n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = e5eb21657932cd4997af337bd41c336c -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = 42e888c4de3009d07d0a038e31e6c9ca7f9d9dc195910c57f3e2d0c6d6e35aee -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = 1714571 +MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 014b290f599e808ff3b885c50d150fe5 +SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 6c19733a4c6304441427a58f4e0de71d0d064e2fb4618edc05c2cd271aa5ff39 +SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 1734951 diff --git a/misc/kde3-i18n-mk/pkg-plist b/misc/kde3-i18n-mk/pkg-plist index c2c20b9ba7f7..9178ea3526e6 100644 --- a/misc/kde3-i18n-mk/pkg-plist +++ b/misc/kde3-i18n-mk/pkg-plist @@ -43,6 +43,7 @@ share/locale/mk/LC_MESSAGES/kabc_dir.mo share/locale/mk/LC_MESSAGES/kabc_file.mo share/locale/mk/LC_MESSAGES/kabc_ldapkio.mo share/locale/mk/LC_MESSAGES/kabc_net.mo +share/locale/mk/LC_MESSAGES/kabc_slox.mo share/locale/mk/LC_MESSAGES/kabc_sql.mo share/locale/mk/LC_MESSAGES/kabcformat_binary.mo share/locale/mk/LC_MESSAGES/kaboodle.mo @@ -513,6 +514,7 @@ share/locale/mk/LC_MESSAGES/tippecanoe.mo share/locale/mk/LC_MESSAGES/trashapplet.mo share/locale/mk/LC_MESSAGES/tyler.mo share/locale/mk/LC_MESSAGES/uachangerplugin.mo +share/locale/mk/LC_MESSAGES/umbrello.mo share/locale/mk/LC_MESSAGES/useraccount.mo share/locale/mk/LC_MESSAGES/validatorsplugin.mo share/locale/mk/LC_MESSAGES/wakeup.mo diff --git a/misc/kde3-i18n-mn/distinfo b/misc/kde3-i18n-mn/distinfo index c1f0a4b84904..103c9f441df8 100644 --- a/misc/kde3-i18n-mn/distinfo +++ b/misc/kde3-i18n-mn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mn-3.5.4.tar.bz2) = 80741b12a56109903917dfeb746a7213 -SHA256 (KDE/kde-i18n/kde-i18n-mn-3.5.4.tar.bz2) = fae80154dc73127316a01c3ee0ab10e1591e0d7d6e09f8673389910065fe3e76 -SIZE (KDE/kde-i18n/kde-i18n-mn-3.5.4.tar.bz2) = 675239 +MD5 (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 67fb64745786c2ef908b192432e51040 +SHA256 (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 6e3d571159821a84305fea88d86ab8816cb5ede99884765d1bdaccdddb9f4841 +SIZE (KDE/kde-i18n/kde-i18n-mn-3.5.5.tar.bz2) = 675863 diff --git a/misc/kde3-i18n-ms/distinfo b/misc/kde3-i18n-ms/distinfo index bf50271f1b59..c869ac912ca3 100644 --- a/misc/kde3-i18n-ms/distinfo +++ b/misc/kde3-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ms-3.5.4.tar.bz2) = 4eeb384dafc9166abdf68243446f6ba5 -SHA256 (KDE/kde-i18n/kde-i18n-ms-3.5.4.tar.bz2) = e26ea3c8f2118d7948b7fab029cb76a94557593d3783ca231c4917d93a579cff -SIZE (KDE/kde-i18n/kde-i18n-ms-3.5.4.tar.bz2) = 1548914 +MD5 (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = 2757eb622ace8a2f231dda1bd5cd454d +SHA256 (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = b60c33b2b7881d8dd7109a78a62b1542d97e408d4b550300e778456384d75a35 +SIZE (KDE/kde-i18n/kde-i18n-ms-3.5.5.tar.bz2) = 1783197 diff --git a/misc/kde3-i18n-ms/pkg-plist b/misc/kde3-i18n-ms/pkg-plist index 40c48cd2b580..12933710ffb7 100644 --- a/misc/kde3-i18n-ms/pkg-plist +++ b/misc/kde3-i18n-ms/pkg-plist @@ -15,10 +15,13 @@ share/locale/ms/LC_MESSAGES/audiorename_plugin.mo share/locale/ms/LC_MESSAGES/autorefresh.mo share/locale/ms/LC_MESSAGES/babelfish.mo share/locale/ms/LC_MESSAGES/blinken.mo +share/locale/ms/LC_MESSAGES/cervisia.mo share/locale/ms/LC_MESSAGES/charlatanui.mo share/locale/ms/LC_MESSAGES/clockapplet.mo share/locale/ms/LC_MESSAGES/crashesplugin.mo share/locale/ms/LC_MESSAGES/cupsdconf.mo +share/locale/ms/LC_MESSAGES/cvsservice.mo +share/locale/ms/LC_MESSAGES/dcoprss.mo share/locale/ms/LC_MESSAGES/dirfilterplugin.mo share/locale/ms/LC_MESSAGES/display.mo share/locale/ms/LC_MESSAGES/dockbarextension.mo @@ -75,6 +78,7 @@ share/locale/ms/LC_MESSAGES/katexmltools.mo share/locale/ms/LC_MESSAGES/katomic.mo share/locale/ms/LC_MESSAGES/kaudiocreator.mo share/locale/ms/LC_MESSAGES/kay.mo +share/locale/ms/LC_MESSAGES/kbabel.mo share/locale/ms/LC_MESSAGES/kbinaryclock.mo share/locale/ms/LC_MESSAGES/kblackbox.mo share/locale/ms/LC_MESSAGES/kbounce.mo @@ -83,6 +87,7 @@ share/locale/ms/LC_MESSAGES/kbstateapplet.mo share/locale/ms/LC_MESSAGES/kcalc.mo share/locale/ms/LC_MESSAGES/kcharselect.mo share/locale/ms/LC_MESSAGES/kcharselectapplet.mo +share/locale/ms/LC_MESSAGES/kcm_krfb.mo share/locale/ms/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/ms/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/ms/LC_MESSAGES/kcm_kviewpluginsconfig.mo @@ -118,6 +123,7 @@ share/locale/ms/LC_MESSAGES/kcmkonq.mo share/locale/ms/LC_MESSAGES/kcmkonqhtml.mo share/locale/ms/LC_MESSAGES/kcmkonsole.mo share/locale/ms/LC_MESSAGES/kcmkontactnt.mo +share/locale/ms/LC_MESSAGES/kcmktalkd.mo share/locale/ms/LC_MESSAGES/kcmkuick.mo share/locale/ms/LC_MESSAGES/kcmkurifilt.mo share/locale/ms/LC_MESSAGES/kcmkvaio.mo @@ -125,6 +131,7 @@ share/locale/ms/LC_MESSAGES/kcmkwallet.mo share/locale/ms/LC_MESSAGES/kcmkwindecoration.mo share/locale/ms/LC_MESSAGES/kcmkwinrules.mo share/locale/ms/LC_MESSAGES/kcmkwm.mo +share/locale/ms/LC_MESSAGES/kcmlanbrowser.mo share/locale/ms/LC_MESSAGES/kcmlaptop.mo share/locale/ms/LC_MESSAGES/kcmlaunch.mo share/locale/ms/LC_MESSAGES/kcmlayout.mo @@ -147,6 +154,7 @@ share/locale/ms/LC_MESSAGES/kcmtaskbar.mo share/locale/ms/LC_MESSAGES/kcmthinkpad.mo share/locale/ms/LC_MESSAGES/kcmusb.mo share/locale/ms/LC_MESSAGES/kcmview1394.mo +share/locale/ms/LC_MESSAGES/kcmwifi.mo share/locale/ms/LC_MESSAGES/kcmxinerama.mo share/locale/ms/LC_MESSAGES/kcoloredit.mo share/locale/ms/LC_MESSAGES/kcontrol.mo @@ -167,9 +175,14 @@ share/locale/ms/LC_MESSAGES/kdesktop.mo share/locale/ms/LC_MESSAGES/kdessh.mo share/locale/ms/LC_MESSAGES/kdesu.mo share/locale/ms/LC_MESSAGES/kdesud.mo +share/locale/ms/LC_MESSAGES/kdevdesigner.mo +share/locale/ms/LC_MESSAGES/kdevelop.mo +share/locale/ms/LC_MESSAGES/kdevtipofday.mo share/locale/ms/LC_MESSAGES/kdf.mo share/locale/ms/LC_MESSAGES/kdgantt.mo share/locale/ms/LC_MESSAGES/kdialog.mo +share/locale/ms/LC_MESSAGES/kdict.mo +share/locale/ms/LC_MESSAGES/kdictapplet.mo share/locale/ms/LC_MESSAGES/kdjview.mo share/locale/ms/LC_MESSAGES/kdmconfig.mo share/locale/ms/LC_MESSAGES/kdmgreet.mo @@ -216,12 +229,15 @@ share/locale/ms/LC_MESSAGES/kfile_sid.mo share/locale/ms/LC_MESSAGES/kfile_tga.mo share/locale/ms/LC_MESSAGES/kfile_theora.mo share/locale/ms/LC_MESSAGES/kfile_tiff.mo +share/locale/ms/LC_MESSAGES/kfile_torrent.mo share/locale/ms/LC_MESSAGES/kfile_txt.mo share/locale/ms/LC_MESSAGES/kfile_vcf.mo share/locale/ms/LC_MESSAGES/kfile_wav.mo share/locale/ms/LC_MESSAGES/kfile_xbm.mo share/locale/ms/LC_MESSAGES/kfile_xpm.mo share/locale/ms/LC_MESSAGES/kfileaudiopreview.mo +share/locale/ms/LC_MESSAGES/kfilereplace.mo +share/locale/ms/LC_MESSAGES/kfileshare.mo share/locale/ms/LC_MESSAGES/kfindpart.mo share/locale/ms/LC_MESSAGES/kfloppy.mo share/locale/ms/LC_MESSAGES/kfmclient.mo @@ -229,6 +245,7 @@ share/locale/ms/LC_MESSAGES/kfontinst.mo share/locale/ms/LC_MESSAGES/kgamma.mo share/locale/ms/LC_MESSAGES/kgantt.mo share/locale/ms/LC_MESSAGES/kgeography.mo +share/locale/ms/LC_MESSAGES/kget.mo share/locale/ms/LC_MESSAGES/kghostview.mo share/locale/ms/LC_MESSAGES/kgpg.mo share/locale/ms/LC_MESSAGES/kgreet_classic.mo @@ -243,6 +260,8 @@ share/locale/ms/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/ms/LC_MESSAGES/kicker.mo share/locale/ms/LC_MESSAGES/kiconedit.mo share/locale/ms/LC_MESSAGES/kig.mo +share/locale/ms/LC_MESSAGES/kimagemapeditor.mo +share/locale/ms/LC_MESSAGES/kinetd.mo share/locale/ms/LC_MESSAGES/kio.mo share/locale/ms/LC_MESSAGES/kio_audiocd.mo share/locale/ms/LC_MESSAGES/kio_finger.mo @@ -252,6 +271,8 @@ share/locale/ms/LC_MESSAGES/kio_groupwise.mo share/locale/ms/LC_MESSAGES/kio_help.mo share/locale/ms/LC_MESSAGES/kio_home.mo share/locale/ms/LC_MESSAGES/kio_imap4.mo +share/locale/ms/LC_MESSAGES/kio_jabberdisco.mo +share/locale/ms/LC_MESSAGES/kio_lan.mo share/locale/ms/LC_MESSAGES/kio_ldap.mo share/locale/ms/LC_MESSAGES/kio_mac.mo share/locale/ms/LC_MESSAGES/kio_man.mo @@ -271,6 +292,7 @@ share/locale/ms/LC_MESSAGES/kio_system.mo share/locale/ms/LC_MESSAGES/kio_tar.mo share/locale/ms/LC_MESSAGES/kio_thumbnail.mo share/locale/ms/LC_MESSAGES/kio_trash.mo +share/locale/ms/LC_MESSAGES/kio_zeroconf.mo share/locale/ms/LC_MESSAGES/kioexec.mo share/locale/ms/LC_MESSAGES/kiten.mo share/locale/ms/LC_MESSAGES/kjobviewer.mo @@ -279,6 +301,7 @@ share/locale/ms/LC_MESSAGES/klaptopdaemon.mo share/locale/ms/LC_MESSAGES/klatin.mo share/locale/ms/LC_MESSAGES/kleopatra.mo share/locale/ms/LC_MESSAGES/klettres.mo +share/locale/ms/LC_MESSAGES/klinkstatus.mo share/locale/ms/LC_MESSAGES/klipper.mo share/locale/ms/LC_MESSAGES/klock.mo share/locale/ms/LC_MESSAGES/kmag.mo @@ -307,6 +330,7 @@ share/locale/ms/LC_MESSAGES/kmouth.mo share/locale/ms/LC_MESSAGES/kmplot.mo share/locale/ms/LC_MESSAGES/kmrml.mo share/locale/ms/LC_MESSAGES/knetattach.mo +share/locale/ms/LC_MESSAGES/knewsticker.mo share/locale/ms/LC_MESSAGES/knode.mo share/locale/ms/LC_MESSAGES/knotes.mo share/locale/ms/LC_MESSAGES/knotify.mo @@ -314,6 +338,7 @@ share/locale/ms/LC_MESSAGES/kodo.mo share/locale/ms/LC_MESSAGES/kolf.mo share/locale/ms/LC_MESSAGES/kolourpaint.mo share/locale/ms/LC_MESSAGES/kolourpicker.mo +share/locale/ms/LC_MESSAGES/kommander.mo share/locale/ms/LC_MESSAGES/kompare.mo share/locale/ms/LC_MESSAGES/konnector_dummy.mo share/locale/ms/LC_MESSAGES/konnector_kabc.mo @@ -337,8 +362,10 @@ share/locale/ms/LC_MESSAGES/kpartsaver.mo share/locale/ms/LC_MESSAGES/kpdf.mo share/locale/ms/LC_MESSAGES/kpercentage.mo share/locale/ms/LC_MESSAGES/kpersonalizer.mo +share/locale/ms/LC_MESSAGES/kpf.mo share/locale/ms/LC_MESSAGES/kpilot.mo share/locale/ms/LC_MESSAGES/kpovmodeler.mo +share/locale/ms/LC_MESSAGES/kppp.mo share/locale/ms/LC_MESSAGES/kprinter.mo share/locale/ms/LC_MESSAGES/krandr.mo share/locale/ms/LC_MESSAGES/krdb.mo @@ -422,6 +449,7 @@ share/locale/ms/LC_MESSAGES/kworldclock.mo share/locale/ms/LC_MESSAGES/kwriteconfig.mo share/locale/ms/LC_MESSAGES/kxkb.mo share/locale/ms/LC_MESSAGES/kxsconfig.mo +share/locale/ms/LC_MESSAGES/kxsldbg.mo share/locale/ms/LC_MESSAGES/libKTTSD.mo share/locale/ms/LC_MESSAGES/libdmctl.mo share/locale/ms/LC_MESSAGES/libkaddrbk_geo_xxport.mo @@ -465,6 +493,7 @@ share/locale/ms/LC_MESSAGES/nsplugin.mo share/locale/ms/LC_MESSAGES/pitchablespeed.mo share/locale/ms/LC_MESSAGES/ppdtranslations.mo share/locale/ms/LC_MESSAGES/privacy.mo +share/locale/ms/LC_MESSAGES/qeditor.mo share/locale/ms/LC_MESSAGES/quicklauncher.mo share/locale/ms/LC_MESSAGES/rellinks.mo share/locale/ms/LC_MESSAGES/searchbarplugin.mo diff --git a/misc/kde3-i18n-nb/distinfo b/misc/kde3-i18n-nb/distinfo index 06fce1430198..fdbc558d11af 100644 --- a/misc/kde3-i18n-nb/distinfo +++ b/misc/kde3-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = c322d1d4a04e327a76effd78d36b407d -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = 0d820339e984060b6235c70d81293a9503ec58f709f4fb9b097a56d81ca8afae -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = 2137633 +MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 1b3edcfa11bb648e98bab07f93e898a9 +SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = cdcb4dd7a73daa6cda4eff2c44e36c749b1dfefe69cd2ee05b5b066cd75b2fd3 +SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 2153235 diff --git a/misc/kde3-i18n-nds/distinfo b/misc/kde3-i18n-nds/distinfo index 53a96866a7f6..49e954321a7d 100644 --- a/misc/kde3-i18n-nds/distinfo +++ b/misc/kde3-i18n-nds/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = e47b93f27bda95970a0de286f13f999f -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = 10670fb2b9fdf58a32d493eea2b05ae26b3accecd8790edf48aca1af170905b3 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = 1353075 +MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = f159dd39c2385403a0f95c0b102ef67b +SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2f88b016ca70522a934244a076ecaae3a1886974f62b9f1adf217057cc6c4374 +SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2044198 diff --git a/misc/kde3-i18n-nds/pkg-plist b/misc/kde3-i18n-nds/pkg-plist index da2397782ffe..796972738f54 100644 --- a/misc/kde3-i18n-nds/pkg-plist +++ b/misc/kde3-i18n-nds/pkg-plist @@ -1,3 +1,30 @@ +share/apps/ktuberling/sounds/nds/afteken.wav +share/apps/ktuberling/sounds/nds/aquarium.wav +share/apps/ktuberling/sounds/nds/brill.wav +share/apps/ktuberling/sounds/nds/duekerhoot.wav +share/apps/ktuberling/sounds/nds/fisch.wav +share/apps/ktuberling/sounds/nds/fleeg.wav +share/apps/ktuberling/sounds/nds/halskeed.wav +share/apps/ktuberling/sounds/nds/hoor.wav +share/apps/ktuberling/sounds/nds/hoorn.wav +share/apps/ktuberling/sounds/nds/hoot.wav +share/apps/ktuberling/sounds/nds/kantueffel.wav +share/apps/ktuberling/sounds/nds/klock.wav +share/apps/ktuberling/sounds/nds/mund.wav +share/apps/ktuberling/sounds/nds/nees.wav +share/apps/ktuberling/sounds/nds/neesboort.wav +share/apps/ktuberling/sounds/nds/ohr.wav +share/apps/ktuberling/sounds/nds/ohrring.wav +share/apps/ktuberling/sounds/nds/oog.wav +share/apps/ktuberling/sounds/nds/oogbro.wav +share/apps/ktuberling/sounds/nds/penguin.wav +share/apps/ktuberling/sounds/nds/quall.wav +share/apps/ktuberling/sounds/nds/schaal.wav +share/apps/ktuberling/sounds/nds/schatz.wav +share/apps/ktuberling/sounds/nds/seepeerd.wav +share/apps/ktuberling/sounds/nds/slips.wav +share/apps/ktuberling/sounds/nds/suennbrill.wav +share/apps/ktuberling/sounds/nds/zigarr.wav share/locale/nds/LC_MESSAGES/akregator.mo share/locale/nds/LC_MESSAGES/akregator_konqplugin.mo share/locale/nds/LC_MESSAGES/alsaplayerui.mo @@ -5,8 +32,13 @@ share/locale/nds/LC_MESSAGES/amor.mo share/locale/nds/LC_MESSAGES/appletproxy.mo share/locale/nds/LC_MESSAGES/ark.mo share/locale/nds/LC_MESSAGES/ark_plugin.mo +share/locale/nds/LC_MESSAGES/artsbuilder.mo +share/locale/nds/LC_MESSAGES/artscontrol.mo +share/locale/nds/LC_MESSAGES/artsmodules.mo share/locale/nds/LC_MESSAGES/atlantik.mo share/locale/nds/LC_MESSAGES/atlantikdesigner.mo +share/locale/nds/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/nds/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo share/locale/nds/LC_MESSAGES/babelfish.mo @@ -32,6 +64,7 @@ share/locale/nds/LC_MESSAGES/imagerename_plugin.mo share/locale/nds/LC_MESSAGES/imgalleryplugin.mo share/locale/nds/LC_MESSAGES/irkick.mo share/locale/nds/LC_MESSAGES/joystick.mo +share/locale/nds/LC_MESSAGES/juk.mo share/locale/nds/LC_MESSAGES/kabc2mutt.mo share/locale/nds/LC_MESSAGES/kabc_dir.mo share/locale/nds/LC_MESSAGES/kabc_file.mo @@ -40,6 +73,7 @@ share/locale/nds/LC_MESSAGES/kabc_net.mo share/locale/nds/LC_MESSAGES/kabc_slox.mo share/locale/nds/LC_MESSAGES/kabc_sql.mo share/locale/nds/LC_MESSAGES/kabcformat_binary.mo +share/locale/nds/LC_MESSAGES/kaboodle.mo share/locale/nds/LC_MESSAGES/kaccess.mo share/locale/nds/LC_MESSAGES/kaddressbook.mo share/locale/nds/LC_MESSAGES/kalarm.mo @@ -68,22 +102,32 @@ share/locale/nds/LC_MESSAGES/katetextfilter.mo share/locale/nds/LC_MESSAGES/katexmlcheck.mo share/locale/nds/LC_MESSAGES/katexmltools.mo share/locale/nds/LC_MESSAGES/katomic.mo +share/locale/nds/LC_MESSAGES/kaudiocreator.mo share/locale/nds/LC_MESSAGES/kay.mo share/locale/nds/LC_MESSAGES/kbabel.mo +share/locale/nds/LC_MESSAGES/kbackgammon.mo +share/locale/nds/LC_MESSAGES/kbattleship.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo +share/locale/nds/LC_MESSAGES/kblackbox.mo +share/locale/nds/LC_MESSAGES/kbounce.mo share/locale/nds/LC_MESSAGES/kbstateapplet.mo +share/locale/nds/LC_MESSAGES/kbugbuster.mo +share/locale/nds/LC_MESSAGES/kcachegrind.mo share/locale/nds/LC_MESSAGES/kcalc.mo share/locale/nds/LC_MESSAGES/kcharselect.mo share/locale/nds/LC_MESSAGES/kcharselectapplet.mo share/locale/nds/LC_MESSAGES/kcm_krfb.mo +share/locale/nds/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcmaccess.mo share/locale/nds/LC_MESSAGES/kcmaccessibility.mo share/locale/nds/LC_MESSAGES/kcmarts.mo +share/locale/nds/LC_MESSAGES/kcmaudiocd.mo share/locale/nds/LC_MESSAGES/kcmbackground.mo share/locale/nds/LC_MESSAGES/kcmbell.mo +share/locale/nds/LC_MESSAGES/kcmcddb.mo share/locale/nds/LC_MESSAGES/kcmcgi.mo share/locale/nds/LC_MESSAGES/kcmcolors.mo share/locale/nds/LC_MESSAGES/kcmcomponentchooser.mo @@ -97,6 +141,7 @@ share/locale/nds/LC_MESSAGES/kcminfo.mo share/locale/nds/LC_MESSAGES/kcminput.mo share/locale/nds/LC_MESSAGES/kcmioslaveinfo.mo share/locale/nds/LC_MESSAGES/kcmkabconfig.mo +share/locale/nds/LC_MESSAGES/kcmkamera.mo share/locale/nds/LC_MESSAGES/kcmkclock.mo share/locale/nds/LC_MESSAGES/kcmkded.mo share/locale/nds/LC_MESSAGES/kcmkdnssd.mo @@ -160,14 +205,18 @@ share/locale/nds/LC_MESSAGES/kdessh.mo share/locale/nds/LC_MESSAGES/kdesu.mo share/locale/nds/LC_MESSAGES/kdesud.mo share/locale/nds/LC_MESSAGES/kdevdesigner.mo +share/locale/nds/LC_MESSAGES/kdevelop.mo +share/locale/nds/LC_MESSAGES/kdevtipofday.mo share/locale/nds/LC_MESSAGES/kdf.mo share/locale/nds/LC_MESSAGES/kdgantt.mo share/locale/nds/LC_MESSAGES/kdialog.mo share/locale/nds/LC_MESSAGES/kdict.mo share/locale/nds/LC_MESSAGES/kdictapplet.mo +share/locale/nds/LC_MESSAGES/kdjview.mo share/locale/nds/LC_MESSAGES/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo share/locale/nds/LC_MESSAGES/kedit.mo +share/locale/nds/LC_MESSAGES/kenolaba.mo share/locale/nds/LC_MESSAGES/kfifteenapplet.mo share/locale/nds/LC_MESSAGES/kfile_au.mo share/locale/nds/LC_MESSAGES/kfile_avi.mo @@ -187,6 +236,7 @@ share/locale/nds/LC_MESSAGES/kfile_lnk.mo share/locale/nds/LC_MESSAGES/kfile_m3u.mo share/locale/nds/LC_MESSAGES/kfile_mhtml.mo share/locale/nds/LC_MESSAGES/kfile_mp3.mo +share/locale/nds/LC_MESSAGES/kfile_mpc.mo share/locale/nds/LC_MESSAGES/kfile_mpeg.mo share/locale/nds/LC_MESSAGES/kfile_ogg.mo share/locale/nds/LC_MESSAGES/kfile_palm.mo @@ -216,6 +266,8 @@ share/locale/nds/LC_MESSAGES/kfontinst.mo share/locale/nds/LC_MESSAGES/kfouleggs.mo share/locale/nds/LC_MESSAGES/kgantt.mo share/locale/nds/LC_MESSAGES/kgeography.mo +share/locale/nds/LC_MESSAGES/kget.mo +share/locale/nds/LC_MESSAGES/kgoldrunner.mo share/locale/nds/LC_MESSAGES/kgpg.mo share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo @@ -228,6 +280,7 @@ share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nds/LC_MESSAGES/kicker.mo share/locale/nds/LC_MESSAGES/kinetd.mo share/locale/nds/LC_MESSAGES/kio.mo +share/locale/nds/LC_MESSAGES/kio_audiocd.mo share/locale/nds/LC_MESSAGES/kio_finger.mo share/locale/nds/LC_MESSAGES/kio_fish.mo share/locale/nds/LC_MESSAGES/kio_floppy.mo @@ -252,6 +305,7 @@ share/locale/nds/LC_MESSAGES/kio_sftp.mo share/locale/nds/LC_MESSAGES/kio_sieve.mo share/locale/nds/LC_MESSAGES/kio_smb.mo share/locale/nds/LC_MESSAGES/kio_smtp.mo +share/locale/nds/LC_MESSAGES/kio_svn.mo share/locale/nds/LC_MESSAGES/kio_system.mo share/locale/nds/LC_MESSAGES/kio_tar.mo share/locale/nds/LC_MESSAGES/kio_thumbnail.mo @@ -260,9 +314,11 @@ share/locale/nds/LC_MESSAGES/kio_zeroconf.mo share/locale/nds/LC_MESSAGES/kioexec.mo share/locale/nds/LC_MESSAGES/kjobviewer.mo share/locale/nds/LC_MESSAGES/kjots.mo +share/locale/nds/LC_MESSAGES/kjumpingcube.mo share/locale/nds/LC_MESSAGES/klaptopdaemon.mo share/locale/nds/LC_MESSAGES/kleopatra.mo share/locale/nds/LC_MESSAGES/klickety.mo +share/locale/nds/LC_MESSAGES/klines.mo share/locale/nds/LC_MESSAGES/klipper.mo share/locale/nds/LC_MESSAGES/klock.mo share/locale/nds/LC_MESSAGES/kmag.mo @@ -275,6 +331,7 @@ share/locale/nds/LC_MESSAGES/kmathapplet.mo share/locale/nds/LC_MESSAGES/kmcop.mo share/locale/nds/LC_MESSAGES/kmenuapplet.mo share/locale/nds/LC_MESSAGES/kmenuedit.mo +share/locale/nds/LC_MESSAGES/kmid.mo share/locale/nds/LC_MESSAGES/kmilo_delli8k.mo share/locale/nds/LC_MESSAGES/kmilo_generic.mo share/locale/nds/LC_MESSAGES/kmilo_kvaio.mo @@ -283,17 +340,20 @@ share/locale/nds/LC_MESSAGES/kmilo_thinkpad.mo share/locale/nds/LC_MESSAGES/kmilod.mo share/locale/nds/LC_MESSAGES/kmines.mo share/locale/nds/LC_MESSAGES/kminipagerapplet.mo +share/locale/nds/LC_MESSAGES/kmix.mo share/locale/nds/LC_MESSAGES/kmobile.mo share/locale/nds/LC_MESSAGES/kmoon.mo share/locale/nds/LC_MESSAGES/kmousetool.mo share/locale/nds/LC_MESSAGES/kmouth.mo share/locale/nds/LC_MESSAGES/knetattach.mo +share/locale/nds/LC_MESSAGES/knetwalk.mo share/locale/nds/LC_MESSAGES/knetworkconf.mo share/locale/nds/LC_MESSAGES/knewsticker.mo share/locale/nds/LC_MESSAGES/knode.mo share/locale/nds/LC_MESSAGES/knotes.mo share/locale/nds/LC_MESSAGES/knotify.mo share/locale/nds/LC_MESSAGES/kodo.mo +share/locale/nds/LC_MESSAGES/kolf.mo share/locale/nds/LC_MESSAGES/kolourpicker.mo share/locale/nds/LC_MESSAGES/kompare.mo share/locale/nds/LC_MESSAGES/konnector_dummy.mo @@ -307,22 +367,29 @@ share/locale/nds/LC_MESSAGES/konqsidebar_mediaplayer.mo share/locale/nds/LC_MESSAGES/konqsidebar_metabar.mo share/locale/nds/LC_MESSAGES/konqsidebar_news.mo share/locale/nds/LC_MESSAGES/konqueror.mo +share/locale/nds/LC_MESSAGES/konquest.mo share/locale/nds/LC_MESSAGES/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo share/locale/nds/LC_MESSAGES/kontact.mo +share/locale/nds/LC_MESSAGES/kopete.mo share/locale/nds/LC_MESSAGES/korganizer.mo share/locale/nds/LC_MESSAGES/korn.mo share/locale/nds/LC_MESSAGES/kpackage.mo share/locale/nds/LC_MESSAGES/kpager.mo share/locale/nds/LC_MESSAGES/kpartsaver.mo +share/locale/nds/LC_MESSAGES/kpat.mo share/locale/nds/LC_MESSAGES/kpersonalizer.mo +share/locale/nds/LC_MESSAGES/kpf.mo share/locale/nds/LC_MESSAGES/kpilot.mo +share/locale/nds/LC_MESSAGES/kpoker.mo +share/locale/nds/LC_MESSAGES/kppp.mo share/locale/nds/LC_MESSAGES/kppplogview.mo share/locale/nds/LC_MESSAGES/kprinter.mo share/locale/nds/LC_MESSAGES/krandr.mo share/locale/nds/LC_MESSAGES/krdb.mo share/locale/nds/LC_MESSAGES/krdc.mo share/locale/nds/LC_MESSAGES/kreadconfig.mo +share/locale/nds/LC_MESSAGES/krec.mo share/locale/nds/LC_MESSAGES/kregexpeditor.mo share/locale/nds/LC_MESSAGES/kres_birthday.mo share/locale/nds/LC_MESSAGES/kres_blogging.mo @@ -335,18 +402,24 @@ share/locale/nds/LC_MESSAGES/kres_kolab.mo share/locale/nds/LC_MESSAGES/kres_remote.mo share/locale/nds/LC_MESSAGES/kres_tvanytime.mo share/locale/nds/LC_MESSAGES/kres_xmlrpc.mo +share/locale/nds/LC_MESSAGES/kreversi.mo share/locale/nds/LC_MESSAGES/krfb.mo share/locale/nds/LC_MESSAGES/kruler.mo share/locale/nds/LC_MESSAGES/krunapplet.mo +share/locale/nds/LC_MESSAGES/ksame.mo share/locale/nds/LC_MESSAGES/ksayit.mo +share/locale/nds/LC_MESSAGES/kscd.mo share/locale/nds/LC_MESSAGES/kscreensaver.mo share/locale/nds/LC_MESSAGES/kshisen.mo share/locale/nds/LC_MESSAGES/ksig.mo share/locale/nds/LC_MESSAGES/ksim.mo +share/locale/nds/LC_MESSAGES/ksirc.mo share/locale/nds/LC_MESSAGES/ksirtet.mo share/locale/nds/LC_MESSAGES/ksmiletris.mo share/locale/nds/LC_MESSAGES/ksmserver.mo share/locale/nds/LC_MESSAGES/ksnake.mo +share/locale/nds/LC_MESSAGES/ksokoban.mo +share/locale/nds/LC_MESSAGES/kspaceduel.mo share/locale/nds/LC_MESSAGES/ksplash.mo share/locale/nds/LC_MESSAGES/ksplashthemes.mo share/locale/nds/LC_MESSAGES/kstars.mo @@ -373,6 +446,7 @@ share/locale/nds/LC_MESSAGES/ktimer.mo share/locale/nds/LC_MESSAGES/ktip.mo share/locale/nds/LC_MESSAGES/ktnef.mo share/locale/nds/LC_MESSAGES/ktron.mo +share/locale/nds/LC_MESSAGES/ktuberling.mo share/locale/nds/LC_MESSAGES/ktux.mo share/locale/nds/LC_MESSAGES/kuick_plugin.mo share/locale/nds/LC_MESSAGES/kuiviewer.mo @@ -386,6 +460,8 @@ share/locale/nds/LC_MESSAGES/kwatchgnupg.mo share/locale/nds/LC_MESSAGES/kweather.mo share/locale/nds/LC_MESSAGES/kwifimanager.mo share/locale/nds/LC_MESSAGES/kwin.mo +share/locale/nds/LC_MESSAGES/kwin4.mo +share/locale/nds/LC_MESSAGES/kwin_art_clients.mo share/locale/nds/LC_MESSAGES/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo share/locale/nds/LC_MESSAGES/kwireless.mo @@ -398,6 +474,7 @@ share/locale/nds/LC_MESSAGES/libdmctl.mo share/locale/nds/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nds/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nds/LC_MESSAGES/libkcal.mo +share/locale/nds/LC_MESSAGES/libkcddb.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo share/locale/nds/LC_MESSAGES/libkholidays.mo @@ -421,6 +498,7 @@ share/locale/nds/LC_MESSAGES/libksync.mo share/locale/nds/LC_MESSAGES/libtaskbar.mo share/locale/nds/LC_MESSAGES/libtaskmanager.mo share/locale/nds/LC_MESSAGES/lockout.mo +share/locale/nds/LC_MESSAGES/lskat.mo share/locale/nds/LC_MESSAGES/lyrics.mo share/locale/nds/LC_MESSAGES/mediaapplet.mo share/locale/nds/LC_MESSAGES/mediacontrol.mo @@ -429,10 +507,12 @@ share/locale/nds/LC_MESSAGES/minitoolsplugin.mo share/locale/nds/LC_MESSAGES/multisynk.mo share/locale/nds/LC_MESSAGES/naughtyapplet.mo share/locale/nds/LC_MESSAGES/nexscope.mo +share/locale/nds/LC_MESSAGES/noatun.mo share/locale/nds/LC_MESSAGES/nsplugin.mo share/locale/nds/LC_MESSAGES/pitchablespeed.mo share/locale/nds/LC_MESSAGES/ppdtranslations.mo share/locale/nds/LC_MESSAGES/privacy.mo +share/locale/nds/LC_MESSAGES/qeditor.mo share/locale/nds/LC_MESSAGES/quicklauncher.mo share/locale/nds/LC_MESSAGES/rellinks.mo share/locale/nds/LC_MESSAGES/searchbarplugin.mo @@ -445,6 +525,7 @@ share/locale/nds/LC_MESSAGES/tippecanoe.mo share/locale/nds/LC_MESSAGES/trashapplet.mo share/locale/nds/LC_MESSAGES/tyler.mo share/locale/nds/LC_MESSAGES/uachangerplugin.mo +share/locale/nds/LC_MESSAGES/umbrello.mo share/locale/nds/LC_MESSAGES/useraccount.mo share/locale/nds/LC_MESSAGES/validatorsplugin.mo share/locale/nds/LC_MESSAGES/wakeup.mo @@ -454,3 +535,6 @@ share/locale/nds/charset share/locale/nds/entry.desktop @dirrm share/locale/nds/LC_MESSAGES @dirrm share/locale/nds +@dirrm share/apps/ktuberling/sounds/nds +@dirrm share/apps/ktuberling/sounds +@dirrm share/apps/ktuberling diff --git a/misc/kde3-i18n-nl/distinfo b/misc/kde3-i18n-nl/distinfo index 1cd0bfe4f9d5..76ff1c5fc412 100644 --- a/misc/kde3-i18n-nl/distinfo +++ b/misc/kde3-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = c97771e5c1398182a99d50926fa58eb3 -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = 50fff561a448be55e24902eb0c9379b8e30f06b4be66e2d0138303b817910f34 -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = 10206592 +MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 44b404fc4d0b9d12714fdf2357fa3f56 +SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = dfd23221fd9498438d8aa53e9d3899bac53a990ab549caaff506100c29bae17c +SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 10207419 diff --git a/misc/kde3-i18n-nn/distinfo b/misc/kde3-i18n-nn/distinfo index 23af7daf022a..4afe999dd24e 100644 --- a/misc/kde3-i18n-nn/distinfo +++ b/misc/kde3-i18n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 97b12a156442c4da083423789f8d1506 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 34a16a173c23365ce442d4674c36f988217b75a6794336f66ef8434a0d490adb -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 1862161 +MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 964c91710f2b28cdde7b8cdfef961791 +SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = d5e9ca40cb03bcbeb49f9441bfa79458db373fb55117c135cf27651a82fd3057 +SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 1877259 diff --git a/misc/kde3-i18n-pa/distinfo b/misc/kde3-i18n-pa/distinfo index dc0b355e1290..3372b8304ffb 100644 --- a/misc/kde3-i18n-pa/distinfo +++ b/misc/kde3-i18n-pa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = c513951282dc7918acde5e29220f7103 -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = 57e276ec520a6bd0e380b4f29ae6a46adecd079bfedda3129bff79315c3d2790 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = 1268724 +MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1881a7e5b1fc6b75ca74dc4c504ad16d +SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = c6819eb7d6dfeef7b8c06f96a77db9af08a68680f915b50fc22ffee5bb4c10e6 +SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1282232 diff --git a/misc/kde3-i18n-ro/distinfo b/misc/kde3-i18n-ro/distinfo index 7907462c6074..1e6e3aa806c3 100644 --- a/misc/kde3-i18n-ro/distinfo +++ b/misc/kde3-i18n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = 40f3c27e4aa33d80fe4d7d97ae761d74 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = dff1c0d4c47290e7ee9c185915171b3f9556bd275cf63706297cca3056dbd329 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = 3166304 +MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = b31d031cbf2deae408c94a665677dfd2 +SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 457b694d0f33904d17ed09245af0787bcc7b110f6966ef04accdb360dce35986 +SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 3154718 diff --git a/misc/kde3-i18n-ro/pkg-plist b/misc/kde3-i18n-ro/pkg-plist index e5e6a2c39bc1..f462dfa019e7 100644 --- a/misc/kde3-i18n-ro/pkg-plist +++ b/misc/kde3-i18n-ro/pkg-plist @@ -531,6 +531,7 @@ share/locale/ro/LC_MESSAGES/ksplashthemes.mo share/locale/ro/LC_MESSAGES/kstars.mo share/locale/ro/LC_MESSAGES/kstart.mo share/locale/ro/LC_MESSAGES/kstartperf.mo +share/locale/ro/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/ro/LC_MESSAGES/kstyle_keramik_config.mo share/locale/ro/LC_MESSAGES/kstyle_plastik_config.mo share/locale/ro/LC_MESSAGES/ksvgplugin.mo diff --git a/misc/kde3-i18n-rw/distinfo b/misc/kde3-i18n-rw/distinfo index eb0191e3ca13..ccbd0d302fe9 100644 --- a/misc/kde3-i18n-rw/distinfo +++ b/misc/kde3-i18n-rw/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-rw-3.5.4.tar.bz2) = 4dba338790dfa9f77ffcc36ed4cd3134 -SHA256 (KDE/kde-i18n/kde-i18n-rw-3.5.4.tar.bz2) = 2cde0be0a4ac398cd3867f4e8276791b0b95ae267b875161b793e193dbb7ba83 -SIZE (KDE/kde-i18n/kde-i18n-rw-3.5.4.tar.bz2) = 2007313 +MD5 (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = b94681f15ccb61cd9760e2e7830e7592 +SHA256 (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = 4c28560b2d3b4f25292ccf06ff77a11b780bb99e1f849441e9906811379045c5 +SIZE (KDE/kde-i18n/kde-i18n-rw-3.5.5.tar.bz2) = 2013489 diff --git a/misc/kde3-i18n-se/distinfo b/misc/kde3-i18n-se/distinfo index a5783072aeb1..7ed87521492b 100644 --- a/misc/kde3-i18n-se/distinfo +++ b/misc/kde3-i18n-se/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-se-3.5.4.tar.bz2) = 607bf14fd29c1840abe28b8c22ce51bd -SHA256 (KDE/kde-i18n/kde-i18n-se-3.5.4.tar.bz2) = d87d2defe83928c6ce44127c749113a03257c04837ba7afea8148a183911bca2 -SIZE (KDE/kde-i18n/kde-i18n-se-3.5.4.tar.bz2) = 974035 +MD5 (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 4492ee7304d4539b3dfd4d1349c6a838 +SHA256 (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 7b84611f6aa6550d7cf198d384e43d8d4c7465b9bbf2889c27c70453f0a41a3e +SIZE (KDE/kde-i18n/kde-i18n-se-3.5.5.tar.bz2) = 980658 diff --git a/misc/kde3-i18n-sk/distinfo b/misc/kde3-i18n-sk/distinfo index cb0f289ad3bf..0e40edf024b4 100644 --- a/misc/kde3-i18n-sk/distinfo +++ b/misc/kde3-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = 2c4d939f395894b14c976235b81ae81e -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = bf2a578dfde235f8a4f46b00668e4729d24d01d9f62ca6edd6c04e87d5c55653 -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = 5654085 +MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 0a1bccde30cf25cf37974362585b118a +SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5597e59e2b8e4895e473b097048edaab6603ed1fe614f12cb9b373d48de2b533 +SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5729936 diff --git a/misc/kde3-i18n-sl/distinfo b/misc/kde3-i18n-sl/distinfo index 2f66f43feb20..451f996a8bb8 100644 --- a/misc/kde3-i18n-sl/distinfo +++ b/misc/kde3-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 7f253c3e29e1fed72014b2101a9c2ce9 -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 71ae2770c94a2b1b3ed5d20266334757c20f553e4c1d4d653cd27b094e28dd47 -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 4462296 +MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 3574861dc47aa09ada8cc6c7bca2307e +SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 9bc04643fea3cd750a05898c882e36c9e9e49892a7e0a11e8531238f47a58c0e +SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 4483401 diff --git a/misc/kde3-i18n-sr/distinfo b/misc/kde3-i18n-sr/distinfo index be96771e41a0..d18ee9691cb2 100644 --- a/misc/kde3-i18n-sr/distinfo +++ b/misc/kde3-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 6736f6480dcdffab6bd25883495fb661 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 5289f938d99fb6231d2b726d9f45c2ac147bdf1402df8819d5276b167d05877f -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 2629013 +MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = e308f4f37c5509bd5583f7fcd90bcb32 +SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 9d7cac3b05f17385941bbbc3d05ca792717bf50a92b9d32e318d1f2f11ed78c9 +SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 2641104 diff --git a/misc/kde3-i18n-sr@Latn/distinfo b/misc/kde3-i18n-sr@Latn/distinfo index 578a7d38b6a0..a57061cf1583 100644 --- a/misc/kde3-i18n-sr@Latn/distinfo +++ b/misc/kde3-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 24f25a0f5b418d3cac42d62a0bc14c2a -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 9386a4bd6c5a5333d2579aee4566bb8f3f4a2b942a79a0c9078b05f4afc931e3 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 2620922 +MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 0e3d6ba65882faadc89791c3691b19b6 +SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 146e9ec5682bbeee82f88ab256a931729fb3b90ca1fb3aa99ccf0deff5d8eca0 +SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 2645661 diff --git a/misc/kde3-i18n-sr_Latn/distinfo b/misc/kde3-i18n-sr_Latn/distinfo index 578a7d38b6a0..a57061cf1583 100644 --- a/misc/kde3-i18n-sr_Latn/distinfo +++ b/misc/kde3-i18n-sr_Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 24f25a0f5b418d3cac42d62a0bc14c2a -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 9386a4bd6c5a5333d2579aee4566bb8f3f4a2b942a79a0c9078b05f4afc931e3 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.4.tar.bz2) = 2620922 +MD5 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 0e3d6ba65882faadc89791c3691b19b6 +SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 146e9ec5682bbeee82f88ab256a931729fb3b90ca1fb3aa99ccf0deff5d8eca0 +SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.5.tar.bz2) = 2645661 diff --git a/misc/kde3-i18n-ss/distinfo b/misc/kde3-i18n-ss/distinfo index 00975ec9dca8..426531db68ac 100644 --- a/misc/kde3-i18n-ss/distinfo +++ b/misc/kde3-i18n-ss/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ss-3.5.4.tar.bz2) = 871f2bc475991fbce4789430617d0a21 -SHA256 (KDE/kde-i18n/kde-i18n-ss-3.5.4.tar.bz2) = a5a2fe02fe62efdba06c1b1527ce51075ed5bc7088adb924e087aca7bbacf896 -SIZE (KDE/kde-i18n/kde-i18n-ss-3.5.4.tar.bz2) = 650895 +MD5 (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 8a08733c9cd4d367a42f0c0a69accc8a +SHA256 (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 8e260046c5864d19e46ad9f56bea9c615dda22dfa69e4ba8a9a97f7b52a074f5 +SIZE (KDE/kde-i18n/kde-i18n-ss-3.5.5.tar.bz2) = 653182 diff --git a/misc/kde3-i18n-sv/distinfo b/misc/kde3-i18n-sv/distinfo index dee2774642e5..dd6be29006bd 100644 --- a/misc/kde3-i18n-sv/distinfo +++ b/misc/kde3-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 5097306cb3d02d45366471cfa4dbe7b2 -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 2650694bab48661603db6e12ae4511f91ca06dc92ffb67e86b3fa2e36a4000be -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 28425731 +MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0a614fc596f082a1a11d7ee91b1bae2a +SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0ce57064f077ce362e7b956904a662a0b303c8c7cc2c0131082e1fccc65c0d1e +SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 28420728 diff --git a/misc/kde3-i18n-sv/pkg-plist b/misc/kde3-i18n-sv/pkg-plist index ed3c1a3c11d5..0ef52760315c 100644 --- a/misc/kde3-i18n-sv/pkg-plist +++ b/misc/kde3-i18n-sv/pkg-plist @@ -1429,6 +1429,7 @@ share/doc/HTML/sv/kooka/shortcut1.png share/doc/HTML/sv/kooka/toolbar.png share/doc/HTML/sv/kooka/toolbar1.png share/doc/HTML/sv/kooka/toolbar2.png +share/doc/HTML/sv/kopete/chatstyle.docbook share/doc/HTML/sv/kopete/common share/doc/HTML/sv/kopete/index.cache.bz2 share/doc/HTML/sv/kopete/index.docbook diff --git a/misc/kde3-i18n-ta/distinfo b/misc/kde3-i18n-ta/distinfo index 9a26f11b3a09..af7159301293 100644 --- a/misc/kde3-i18n-ta/distinfo +++ b/misc/kde3-i18n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = e5e11f4e3b1b3e4a40079ad963efbfe3 -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = fe2fe435b99b825272eb7fcecaceff7ce08831485c1158e25d593bf216399c2f -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = 2115800 +MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 4ab3c05628fc635609218d17cce6d138 +SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 3a60470355f948bf258327a1369962cf1a950fd45dcce17e3cd365546b689cfb +SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 2120321 diff --git a/misc/kde3-i18n-tg/distinfo b/misc/kde3-i18n-tg/distinfo index dc7398a1d6eb..825e82222f2d 100644 --- a/misc/kde3-i18n-tg/distinfo +++ b/misc/kde3-i18n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 108c07984f635cbee648df86d620afdb -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 37ced00d888f39e8714093e713d3d766db2a207d3ca9890ba9b292842f93c0c5 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 2120517 +MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 135a419bb0d3429dde4bc698d095bf86 +SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 36210149528026f8cf4c0414a0006ff4d7c81f983a78242d1aa682246fb86f56 +SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 2137881 diff --git a/misc/kde3-i18n-tr/distinfo b/misc/kde3-i18n-tr/distinfo index d5f37c24edae..9eb05293d2be 100644 --- a/misc/kde3-i18n-tr/distinfo +++ b/misc/kde3-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 01453f054f5595660c8bc0aa5d589520 -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 89aa25b9c87eeba6065f3b2f268153e6eab02b42ed3f5ea0788839e341e94c84 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 2127635 +MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 001d5909b3fd8121b1f4f7970d88215b +SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 901fd81fbfd81db73f7f14b07d2db34d54e2bbb04850a4f5bc3b0ca6eb9920d8 +SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 2133194 diff --git a/misc/kde3-i18n-uz/distinfo b/misc/kde3-i18n-uz/distinfo index 47c41bb9e844..7e06fa13d22b 100644 --- a/misc/kde3-i18n-uz/distinfo +++ b/misc/kde3-i18n-uz/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uz-3.5.4.tar.bz2) = fd0d89c8f74c84933c3c05d978ed7f67 -SHA256 (KDE/kde-i18n/kde-i18n-uz-3.5.4.tar.bz2) = f5310d28fd42ff6915cd670dd72594ea317e84a842203fc46ab5578a6bd7e68a -SIZE (KDE/kde-i18n/kde-i18n-uz-3.5.4.tar.bz2) = 824813 +MD5 (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = b66b574eff1fd2349a9a767098e5430e +SHA256 (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = 93a5c8cbd66c9608d0b564d7e7b9e9019bf61279a62a275f8efa55f00721e740 +SIZE (KDE/kde-i18n/kde-i18n-uz-3.5.5.tar.bz2) = 837135 diff --git a/misc/kde4-i18n-is/distinfo b/misc/kde4-i18n-is/distinfo index e861df656248..d8817e5cd3f5 100644 --- a/misc/kde4-i18n-is/distinfo +++ b/misc/kde4-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = ff1e7b4b500a2032530c101a1473895a -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 1db086325890d212c3910b5f9d0f486b8f9c5e596409552d691191bdbc83f2e7 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 2090071 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 diff --git a/misc/kde4-l10n-bg/distinfo b/misc/kde4-l10n-bg/distinfo index 25440aab4d9f..6f10ba16fe36 100644 --- a/misc/kde4-l10n-bg/distinfo +++ b/misc/kde4-l10n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = 2340d20511d54856883c53536138da41 -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = cd2cb4dd0d98bcf7f6809d4ce0f3db0e8c3306bb1d060d2d3ea194ecc6e68c17 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.4.tar.bz2) = 1721444 +MD5 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 28871147d247f33072a278f0d16a96be +SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = a860a8e8f917b3b84546a8f761bddd20ebb52950e7cedbf51b9cbd7fa7f0f361 +SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.5.tar.bz2) = 1729850 diff --git a/misc/kde4-l10n-ca/distinfo b/misc/kde4-l10n-ca/distinfo index f2a1f0d04da5..18a1395ac0e9 100644 --- a/misc/kde4-l10n-ca/distinfo +++ b/misc/kde4-l10n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 3666508969cbe2ce8a52f0a6f67bf3f4 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 2327caba7df4a9a960766babd4efddfbc3fe5ea326d284d82511b8a76d40c3f5 -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.4.tar.bz2) = 4687349 +MD5 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = fec16708dc8c3e9a864d5ad9e45f06b8 +SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 4141d21cbc7d6a3f039afc43532061e5fc8c5b874b3768e8c0ed1919bb9b6a57 +SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.5.tar.bz2) = 6787316 diff --git a/misc/kde4-l10n-ca/pkg-plist b/misc/kde4-l10n-ca/pkg-plist index d5c4c96c0495..84eec115a90c 100644 --- a/misc/kde4-l10n-ca/pkg-plist +++ b/misc/kde4-l10n-ca/pkg-plist @@ -23,6 +23,31 @@ share/doc/HTML/ca/docs/common/gpl-translated.html share/doc/HTML/ca/docs/common/kde-localised.css share/doc/HTML/ca/docs/common/lgpl-translated.html share/doc/HTML/ca/docs/common/logotp3.png +share/doc/HTML/ca/kalzium/common +share/doc/HTML/ca/kalzium/gradient.png +share/doc/HTML/ca/kalzium/index.cache.bz2 +share/doc/HTML/ca/kalzium/index.docbook +share/doc/HTML/ca/kalzium/infodialog_bohr.png +share/doc/HTML/ca/kalzium/infodialog_chemicaldata.png +share/doc/HTML/ca/kalzium/infodialog_energies.png +share/doc/HTML/ca/kalzium/infodialog_misc.png +share/doc/HTML/ca/kalzium/infodialog_overview.png +share/doc/HTML/ca/kalzium/infodialog_picture.png +share/doc/HTML/ca/kalzium/infodialog_spectrum.png +share/doc/HTML/ca/kalzium/man-kalzium.1.docbook +share/doc/HTML/ca/kalzium/plottingdialog.png +share/doc/HTML/ca/kalzium/quick-1.png +share/doc/HTML/ca/kalzium/screenshot1.png +share/doc/HTML/ca/kalzium/screenshot2.png +share/doc/HTML/ca/kalzium/screenshot7.png +share/doc/HTML/ca/kalzium/screenshoteqsolver.png +share/doc/HTML/ca/kalzium/settings1.png +share/doc/HTML/ca/kalzium/settings2.png +share/doc/HTML/ca/kalzium/settings3.png +share/doc/HTML/ca/kalzium/sidebar1.png +share/doc/HTML/ca/kalzium/sidebar2.png +share/doc/HTML/ca/kalzium/sidebar3.png +share/doc/HTML/ca/kalzium/timeline.png share/doc/HTML/ca/kappfinder/man-kappfinder.1.docbook share/doc/HTML/ca/kapptemplate/man-kapptemplate.1.docbook share/doc/HTML/ca/kate-plugins/common @@ -37,11 +62,14 @@ share/doc/HTML/ca/kate-plugins/xmlcheck.docbook share/doc/HTML/ca/kate-plugins/xmltools.docbook share/doc/HTML/ca/kate/advanced.docbook share/doc/HTML/ca/kate/common +share/doc/HTML/ca/kate/configdialog01.png +share/doc/HTML/ca/kate/configdialog02.png share/doc/HTML/ca/kate/configuring.docbook share/doc/HTML/ca/kate/fundamentals.docbook share/doc/HTML/ca/kate/highlighting.docbook share/doc/HTML/ca/kate/index.cache.bz2 share/doc/HTML/ca/kate/index.docbook +share/doc/HTML/ca/kate/kate.png share/doc/HTML/ca/kate/man-kate.1.docbook share/doc/HTML/ca/kate/mdi.docbook share/doc/HTML/ca/kate/menus.docbook @@ -328,6 +356,7 @@ share/doc/HTML/ca/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/ca/khelpcenter/quickstart/index.docbook share/doc/HTML/ca/khelpcenter/support.docbook share/doc/HTML/ca/khelpcenter/userguide/accessibility.docbook +share/doc/HTML/ca/khelpcenter/userguide/amarok.png share/doc/HTML/ca/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/ca/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/ca/khelpcenter/userguide/burning-cds.docbook @@ -345,10 +374,21 @@ share/doc/HTML/ca/khelpcenter/userguide/groupware-kontact.docbook share/doc/HTML/ca/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/ca/khelpcenter/userguide/index.docbook share/doc/HTML/ca/khelpcenter/userguide/internet-shortcuts.docbook +share/doc/HTML/ca/khelpcenter/userguide/kcontrol.png share/doc/HTML/ca/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/ca/khelpcenter/userguide/kde-office.docbook +share/doc/HTML/ca/khelpcenter/userguide/kmag.png +share/doc/HTML/ca/khelpcenter/userguide/kmousetool.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth2.png +share/doc/HTML/ca/khelpcenter/userguide/kmouth3.png +share/doc/HTML/ca/khelpcenter/userguide/knode-identity.png +share/doc/HTML/ca/khelpcenter/userguide/knode-mail-account.png +share/doc/HTML/ca/khelpcenter/userguide/knode-news-account.png +share/doc/HTML/ca/khelpcenter/userguide/knode-start.png +share/doc/HTML/ca/khelpcenter/userguide/konq-sidebar.png share/doc/HTML/ca/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/ca/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/ca/khelpcenter/userguide/migrator-applications.docbook @@ -366,10 +406,12 @@ share/doc/HTML/ca/khelpcenter/userguide/programs-and-documents.docbook share/doc/HTML/ca/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/ca/khelpcenter/userguide/removable-disks.docbook share/doc/HTML/ca/khelpcenter/userguide/screen-captures.docbook +share/doc/HTML/ca/khelpcenter/userguide/services.png share/doc/HTML/ca/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/ca/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/ca/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/ca/khelpcenter/userguide/the-filemanager.docbook +share/doc/HTML/ca/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/ca/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/ca/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/ca/khelpcenter/userguide/under-the-hood.docbook @@ -523,8 +565,14 @@ share/doc/HTML/ca/kmail/intro.docbook share/doc/HTML/ca/kmail/menus.docbook share/doc/HTML/ca/kmail/using-kmail.docbook share/doc/HTML/ca/kmenuedit/common +share/doc/HTML/ca/kmenuedit/done.png share/doc/HTML/ca/kmenuedit/index.cache.bz2 share/doc/HTML/ca/kmenuedit/index.docbook +share/doc/HTML/ca/kmenuedit/itemname.png +share/doc/HTML/ca/kmenuedit/kmenueditmain.png +share/doc/HTML/ca/kmenuedit/new.png +share/doc/HTML/ca/kmenuedit/selecticon.png +share/doc/HTML/ca/kmenuedit/selectinternet.png share/doc/HTML/ca/kmessedwords/common share/doc/HTML/ca/kmessedwords/index.cache.bz2 share/doc/HTML/ca/kmessedwords/index.docbook @@ -542,6 +590,8 @@ share/doc/HTML/ca/kmouth/man-kmouth.1.docbook share/doc/HTML/ca/knetattach/common share/doc/HTML/ca/knetattach/index.cache.bz2 share/doc/HTML/ca/knetattach/index.docbook +share/doc/HTML/ca/knetattach/screenshot.png +share/doc/HTML/ca/knetattach/screenshot2.png share/doc/HTML/ca/knetworkconf/common share/doc/HTML/ca/knetworkconf/index.cache.bz2 share/doc/HTML/ca/knetworkconf/index.docbook @@ -599,10 +649,13 @@ share/doc/HTML/ca/konq-plugins/webarchiver/index.docbook share/doc/HTML/ca/konqueror/basics.docbook share/doc/HTML/ca/konqueror/bookmarks.docbook share/doc/HTML/ca/konqueror/browser.docbook +share/doc/HTML/ca/konqueror/cmndline.png share/doc/HTML/ca/konqueror/commands.docbook share/doc/HTML/ca/konqueror/common share/doc/HTML/ca/konqueror/config.docbook share/doc/HTML/ca/konqueror/credits.docbook +share/doc/HTML/ca/konqueror/dirtree.png +share/doc/HTML/ca/konqueror/dragdrop.png share/doc/HTML/ca/konqueror/faq.docbook share/doc/HTML/ca/konqueror/filemanager.docbook share/doc/HTML/ca/konqueror/index.cache.bz2 @@ -612,10 +665,14 @@ share/doc/HTML/ca/konqueror/man-kbookmarkmerger.1.docbook share/doc/HTML/ca/konqueror/path-complete.docbook share/doc/HTML/ca/konqueror/plugins.docbook share/doc/HTML/ca/konqueror/save-settings.docbook +share/doc/HTML/ca/konqueror/shortcut1.png +share/doc/HTML/ca/konqueror/shortcut2.png share/doc/HTML/ca/konqueror/sidebar.docbook share/doc/HTML/ca/konsole/common share/doc/HTML/ca/konsole/index.cache.bz2 share/doc/HTML/ca/konsole/index.docbook +share/doc/HTML/ca/konsole/konsole.png +share/doc/HTML/ca/konsole/tabbar.png share/doc/HTML/ca/kontact/common share/doc/HTML/ca/kontact/index.cache.bz2 share/doc/HTML/ca/kontact/index.docbook @@ -625,6 +682,8 @@ share/doc/HTML/ca/kpackage/index.docbook share/doc/HTML/ca/kpager/common share/doc/HTML/ca/kpager/index.cache.bz2 share/doc/HTML/ca/kpager/index.docbook +share/doc/HTML/ca/kpager/screenshot.png +share/doc/HTML/ca/kpager/settings.png share/doc/HTML/ca/kpercentage/commands.docbook share/doc/HTML/ca/kpercentage/common share/doc/HTML/ca/kpercentage/credits.docbook @@ -744,6 +803,9 @@ share/doc/HTML/ca/kuser/index.docbook share/doc/HTML/ca/kwallet/common share/doc/HTML/ca/kwallet/index.cache.bz2 share/doc/HTML/ca/kwallet/index.docbook +share/doc/HTML/ca/kwatchgnupg/common +share/doc/HTML/ca/kwatchgnupg/index.cache.bz2 +share/doc/HTML/ca/kwatchgnupg/index.docbook share/doc/HTML/ca/kweather/common share/doc/HTML/ca/kweather/index.cache.bz2 share/doc/HTML/ca/kweather/index.docbook @@ -763,6 +825,7 @@ share/doc/HTML/ca/kwrite/index.docbook share/doc/HTML/ca/kxkb/common share/doc/HTML/ca/kxkb/index.cache.bz2 share/doc/HTML/ca/kxkb/index.docbook +share/doc/HTML/ca/kxkb/switching.png share/doc/HTML/ca/lilo-config/common share/doc/HTML/ca/lilo-config/index.cache.bz2 share/doc/HTML/ca/lilo-config/index.docbook @@ -1379,6 +1442,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kwordquiz @dirrm share/doc/HTML/ca/kwifimanager @dirrm share/doc/HTML/ca/kweather +@dirrm share/doc/HTML/ca/kwatchgnupg @dirrm share/doc/HTML/ca/kwallet @dirrm share/doc/HTML/ca/kuser @dirrm share/doc/HTML/ca/kturtle @@ -1539,6 +1603,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kate @dirrm share/doc/HTML/ca/kapptemplate @dirrm share/doc/HTML/ca/kappfinder +@dirrm share/doc/HTML/ca/kalzium @dirrm share/doc/HTML/ca/docs/common @dirrm share/doc/HTML/ca/docs @dirrm share/doc/HTML/ca/amor diff --git a/misc/kde4-l10n-cs/distinfo b/misc/kde4-l10n-cs/distinfo index 46924108f34a..dca2d63d179d 100644 --- a/misc/kde4-l10n-cs/distinfo +++ b/misc/kde4-l10n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 639887411d07ea92f0c733e66eb01b47 -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 1380da365361ee07e3b904c38a87d4291f7869215d8fa6193ea7236f4d4b0212 -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.4.tar.bz2) = 3366797 +MD5 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = aaace6da2097b2f98f163a5da7667752 +SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = b37f0c24a4efe08d7f79bf73971208bcded3cb42905d381865cb74be4cb72a1d +SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.5.tar.bz2) = 3383764 diff --git a/misc/kde4-l10n-da/distinfo b/misc/kde4-l10n-da/distinfo index ae07f5515ee1..f2c96eff350f 100644 --- a/misc/kde4-l10n-da/distinfo +++ b/misc/kde4-l10n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = ef845c89fac91948ea9784593cd1b3fb -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = d0866db30dfab41964842ba6e97f3115791919688a871c32e60238798caf99db -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.4.tar.bz2) = 12299521 +MD5 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 70c041ca96330834c6f988255d7bd6ae +SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 72def6d70d3ff623bba05a106d66935b18ae9775d7ba4a4f70e8142eb04027ce +SIZE (KDE/kde-i18n/kde-i18n-da-3.5.5.tar.bz2) = 12308598 diff --git a/misc/kde4-l10n-da/pkg-plist b/misc/kde4-l10n-da/pkg-plist index 82b3a7001690..904c58d3b45d 100644 --- a/misc/kde4-l10n-da/pkg-plist +++ b/misc/kde4-l10n-da/pkg-plist @@ -706,6 +706,9 @@ share/doc/HTML/da/kig/man-kig.1.docbook share/doc/HTML/da/kinfocenter/blockdevices/common share/doc/HTML/da/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/da/kinfocenter/blockdevices/index.docbook +share/doc/HTML/da/kinfocenter/cdinfo/common +share/doc/HTML/da/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/da/kinfocenter/cdinfo/index.docbook share/doc/HTML/da/kinfocenter/common share/doc/HTML/da/kinfocenter/devices/common share/doc/HTML/da/kinfocenter/devices/index.cache.bz2 @@ -2186,6 +2189,7 @@ share/locale/da/flag.png @dirrm share/doc/HTML/da/kinfocenter/interrupts @dirrm share/doc/HTML/da/kinfocenter/dma @dirrm share/doc/HTML/da/kinfocenter/devices +@dirrm share/doc/HTML/da/kinfocenter/cdinfo @dirrm share/doc/HTML/da/kinfocenter/blockdevices @dirrm share/doc/HTML/da/kinfocenter @dirrm share/doc/HTML/da/kig diff --git a/misc/kde4-l10n-el/distinfo b/misc/kde4-l10n-el/distinfo index c91d76b9470e..47334624cc33 100644 --- a/misc/kde4-l10n-el/distinfo +++ b/misc/kde4-l10n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = 00d834a86e31d9d03a583c6c40565094 -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = d70cdaa5cee53d647546154901f420643343be308378ca0b6aa8b43ad0dd2f9a -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.4.tar.bz2) = 2248006 +MD5 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = a2cb7afd4c5883bc2eb5d9c8a96d04c0 +SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2ccb85695fa1c5c8b5e8db659d868c6934522c5f6bb4c5ea6fb3a8f646cc59cd +SIZE (KDE/kde-i18n/kde-i18n-el-3.5.5.tar.bz2) = 2267715 diff --git a/misc/kde4-l10n-en_GB/distinfo b/misc/kde4-l10n-en_GB/distinfo index cfba5a263cd5..64142e03cac8 100644 --- a/misc/kde4-l10n-en_GB/distinfo +++ b/misc/kde4-l10n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = 244175fa2be8023a4a6246c795972b5e -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = a8c3bdedf83c26c112555a653ddf35d7c7c770e412a261e30549b29eb21050d4 -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.4.tar.bz2) = 3705330 +MD5 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 50af460c4b69e5cd91b820ed656f99bd +SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 77b44d25f2d569dc7e36e26ff7d518134f632263d44ad6dfb4b12a23ec3ce37d +SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.5.tar.bz2) = 3701881 diff --git a/misc/kde4-l10n-eo/distinfo b/misc/kde4-l10n-eo/distinfo index c950b7bb5362..f0f1edb1a313 100644 --- a/misc/kde4-l10n-eo/distinfo +++ b/misc/kde4-l10n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = bd30d69bfbe6af8fc4a0840a9e8462e3 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = bd28e03ee2d4819065425edbc0e617046032fc0797143a1497fb6025bae3d34c -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.4.tar.bz2) = 1266538 +MD5 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = c55c9ae0c001e5214f1ad97f4b6d02a1 +SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 3247c97e52a098660c0e892f7db4d46e047330508a7f714e2e3e7e3226620cef +SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.5.tar.bz2) = 1271107 diff --git a/misc/kde4-l10n-es/distinfo b/misc/kde4-l10n-es/distinfo index 23d46b6c04eb..82f2f7e3dc1f 100644 --- a/misc/kde4-l10n-es/distinfo +++ b/misc/kde4-l10n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 2c4e049753425d9405e86fed98f3c958 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 93979e971c8576dd46653df992955f51a8e7d80fd05f05e06b7a8a435fdb5df0 -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.4.tar.bz2) = 36521578 +MD5 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = d8dc649138fe136c57a808eac1fdd719 +SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = adde40b9a1aa7774ded2e2c6bb3e092fd33ad5806660c04aae21be9b0874b0c7 +SIZE (KDE/kde-i18n/kde-i18n-es-3.5.5.tar.bz2) = 36641045 diff --git a/misc/kde4-l10n-es/pkg-plist b/misc/kde4-l10n-es/pkg-plist index a270104fbf75..0f039b55f64b 100644 --- a/misc/kde4-l10n-es/pkg-plist +++ b/misc/kde4-l10n-es/pkg-plist @@ -330,6 +330,9 @@ share/doc/HTML/es/blinken/blinken_helpbutton.png share/doc/HTML/es/blinken/blinken_highscoresbutton.png share/doc/HTML/es/blinken/blinken_nickprompt.png share/doc/HTML/es/blinken/blinken_quitbutton.png +share/doc/HTML/es/blinken/common +share/doc/HTML/es/blinken/index.cache.bz2 +share/doc/HTML/es/blinken/index.docbook share/doc/HTML/es/cervisia/annotate.png share/doc/HTML/es/cervisia/checkout.png share/doc/HTML/es/cervisia/commit.png @@ -583,6 +586,7 @@ share/doc/HTML/es/kbruch/factorize.png share/doc/HTML/es/kbruch/gui_main.png share/doc/HTML/es/kbruch/index.cache.bz2 share/doc/HTML/es/kbruch/index.docbook +share/doc/HTML/es/kbruch/man-kbruch.1.docbook share/doc/HTML/es/kbruch/reduced.png share/doc/HTML/es/kbruch/settings.png share/doc/HTML/es/kbugbuster/common @@ -968,6 +972,7 @@ share/doc/HTML/es/keduca/common share/doc/HTML/es/keduca/index.cache.bz2 share/doc/HTML/es/keduca/index.docbook share/doc/HTML/es/keduca/man-keduca.1.docbook +share/doc/HTML/es/keduca/man-keducabuilder.1.docbook share/doc/HTML/es/keduca/screenshot.png share/doc/HTML/es/kenolaba/common share/doc/HTML/es/kenolaba/index.cache.bz2 @@ -1072,6 +1077,7 @@ share/doc/HTML/es/khangman/index.cache.bz2 share/doc/HTML/es/khangman/index.docbook share/doc/HTML/es/khangman/khangman1.png share/doc/HTML/es/khangman/khangman2.png +share/doc/HTML/es/khangman/man-khangman.6.docbook share/doc/HTML/es/khangman/settings1.png share/doc/HTML/es/khangman/settings2.png share/doc/HTML/es/khangman/settings3.png @@ -1286,6 +1292,9 @@ share/doc/HTML/es/kig/text_label_wizard__select_property.png share/doc/HTML/es/kinfocenter/blockdevices/common share/doc/HTML/es/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/es/kinfocenter/blockdevices/index.docbook +share/doc/HTML/es/kinfocenter/cdinfo/common +share/doc/HTML/es/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/es/kinfocenter/cdinfo/index.docbook share/doc/HTML/es/kinfocenter/common share/doc/HTML/es/kinfocenter/devices/common share/doc/HTML/es/kinfocenter/devices/index.cache.bz2 @@ -1845,6 +1854,7 @@ share/doc/HTML/es/kooka/shortcut1.png share/doc/HTML/es/kooka/toolbar.png share/doc/HTML/es/kooka/toolbar1.png share/doc/HTML/es/kooka/toolbar2.png +share/doc/HTML/es/kopete/chatstyle.docbook share/doc/HTML/es/kopete/common share/doc/HTML/es/kopete/index.cache.bz2 share/doc/HTML/es/kopete/index.docbook @@ -2466,6 +2476,9 @@ share/doc/HTML/es/kwifimanager/index.docbook share/doc/HTML/es/kwin4/common share/doc/HTML/es/kwin4/index.cache.bz2 share/doc/HTML/es/kwin4/index.docbook +share/doc/HTML/es/kwordquiz/common +share/doc/HTML/es/kwordquiz/index.cache.bz2 +share/doc/HTML/es/kwordquiz/index.docbook share/doc/HTML/es/kwordquiz/kwq-dlg-characters.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-appearance.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-characters.png @@ -3400,6 +3413,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kinfocenter/interrupts @dirrm share/doc/HTML/es/kinfocenter/dma @dirrm share/doc/HTML/es/kinfocenter/devices +@dirrm share/doc/HTML/es/kinfocenter/cdinfo @dirrm share/doc/HTML/es/kinfocenter/blockdevices @dirrm share/doc/HTML/es/kinfocenter @dirrm share/doc/HTML/es/kig/scripting-api diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo index 6f4e4d9a8163..32c2ef8509d7 100644 --- a/misc/kde4-l10n-et/distinfo +++ b/misc/kde4-l10n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 7209f997e7c418d2884bc278ff6d642c -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 2340443591cf1f91beece41664e6e09fd0ee7a108165f1ebd6c633e4e1e1e97e -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.4.tar.bz2) = 10487400 +MD5 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = d3065d66591fa0ea4e304e9bcbb6dc10 +SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 5b16805308aefb3e0fa79c9df4d89b92ff407406b91ce2a68ef9a3bf01c6ae54 +SIZE (KDE/kde-i18n/kde-i18n-et-3.5.5.tar.bz2) = 10540364 diff --git a/misc/kde4-l10n-et/pkg-plist b/misc/kde4-l10n-et/pkg-plist index 47d93e462dcb..67c7989c1d19 100644 --- a/misc/kde4-l10n-et/pkg-plist +++ b/misc/kde4-l10n-et/pkg-plist @@ -981,6 +981,7 @@ share/doc/HTML/et/kontact/index.docbook share/doc/HTML/et/kooka/common share/doc/HTML/et/kooka/index.cache.bz2 share/doc/HTML/et/kooka/index.docbook +share/doc/HTML/et/kopete/chatstyle.docbook share/doc/HTML/et/kopete/common share/doc/HTML/et/kopete/index.cache.bz2 share/doc/HTML/et/kopete/index.docbook diff --git a/misc/kde4-l10n-eu/distinfo b/misc/kde4-l10n-eu/distinfo index 876e9610b769..30c41eab5537 100644 --- a/misc/kde4-l10n-eu/distinfo +++ b/misc/kde4-l10n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 69d50a4a7a89572d3d66782381fc6811 -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 416c4f233f2a122e961fb34315092f1cc5a68cfb2b1b14ee81f1313775c30b59 -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.4.tar.bz2) = 2226839 +MD5 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 45a4361f11c14b8cbc0a5bb29ab18edb +SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = ad6c905811d6659541735a5d6a0d5f2ea4d140c7ac6aafe32e3d1bf1a81ea884 +SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.5.tar.bz2) = 2236745 diff --git a/misc/kde4-l10n-fi/distinfo b/misc/kde4-l10n-fi/distinfo index 7c4180b8cb4f..17f97ba15edc 100644 --- a/misc/kde4-l10n-fi/distinfo +++ b/misc/kde4-l10n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = c2ef5fad94bcb04ee7e1a363593ff685 -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = ed40a6e70255cdfce5c389b85bce50f1f05c8aefabce4ab6d7b6a7285749550c -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.4.tar.bz2) = 2315529 +MD5 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 5693b184f6d3e2d79c78248a9506ba11 +SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 9f709a0ff8403da6137c0e48b172c79ff8c875ebf04500a4c586bcdf37a4054e +SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.5.tar.bz2) = 2400361 diff --git a/misc/kde4-l10n-fi/pkg-plist b/misc/kde4-l10n-fi/pkg-plist index 71873dbd4f5e..89a1db17cd45 100644 --- a/misc/kde4-l10n-fi/pkg-plist +++ b/misc/kde4-l10n-fi/pkg-plist @@ -40,6 +40,7 @@ share/locale/fi/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/fi/LC_MESSAGES/audiorename_plugin.mo share/locale/fi/LC_MESSAGES/autorefresh.mo share/locale/fi/LC_MESSAGES/babelfish.mo +share/locale/fi/LC_MESSAGES/blinken.mo share/locale/fi/LC_MESSAGES/cervisia.mo share/locale/fi/LC_MESSAGES/charlatanui.mo share/locale/fi/LC_MESSAGES/clockapplet.mo @@ -76,6 +77,7 @@ share/locale/fi/LC_MESSAGES/kaccess.mo share/locale/fi/LC_MESSAGES/kaddressbook.mo share/locale/fi/LC_MESSAGES/kalarm.mo share/locale/fi/LC_MESSAGES/kalzium.mo +share/locale/fi/LC_MESSAGES/kanagram.mo share/locale/fi/LC_MESSAGES/kandy.mo share/locale/fi/LC_MESSAGES/kappfinder.mo share/locale/fi/LC_MESSAGES/karm.mo @@ -112,6 +114,7 @@ share/locale/fi/LC_MESSAGES/kbounce.mo share/locale/fi/LC_MESSAGES/kbruch.mo share/locale/fi/LC_MESSAGES/kbstateapplet.mo share/locale/fi/LC_MESSAGES/kbugbuster.mo +share/locale/fi/LC_MESSAGES/kcachegrind.mo share/locale/fi/LC_MESSAGES/kcalc.mo share/locale/fi/LC_MESSAGES/kcharselect.mo share/locale/fi/LC_MESSAGES/kcharselectapplet.mo @@ -271,6 +274,7 @@ share/locale/fi/LC_MESSAGES/kfile_xbm.mo share/locale/fi/LC_MESSAGES/kfile_xpm.mo share/locale/fi/LC_MESSAGES/kfileaudiopreview.mo share/locale/fi/LC_MESSAGES/kfilereplace.mo +share/locale/fi/LC_MESSAGES/kfileshare.mo share/locale/fi/LC_MESSAGES/kfindpart.mo share/locale/fi/LC_MESSAGES/kfloppy.mo share/locale/fi/LC_MESSAGES/kfmclient.mo @@ -278,6 +282,7 @@ share/locale/fi/LC_MESSAGES/kfontinst.mo share/locale/fi/LC_MESSAGES/kfouleggs.mo share/locale/fi/LC_MESSAGES/kgamma.mo share/locale/fi/LC_MESSAGES/kgantt.mo +share/locale/fi/LC_MESSAGES/kgeography.mo share/locale/fi/LC_MESSAGES/kget.mo share/locale/fi/LC_MESSAGES/kghostview.mo share/locale/fi/LC_MESSAGES/kgoldrunner.mo diff --git a/misc/kde4-l10n-fy/distinfo b/misc/kde4-l10n-fy/distinfo index 7fdacf9d70a7..0b098fa7c814 100644 --- a/misc/kde4-l10n-fy/distinfo +++ b/misc/kde4-l10n-fy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = 345532f5d35b333ff3fd1782f550a40d -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = a00dd20075deaf99bd09bdf2788f1d1cd683687a7c531c1154501b66abc6e204 -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.4.tar.bz2) = 688060 +MD5 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 98a3bbe04e82b89c8ab2a821741ffc34 +SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 1cf20414172ad6b4b3578777190f4db5ff3f437fce5b1619fc62738a38f5cc7f +SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.5.tar.bz2) = 691937 diff --git a/misc/kde4-l10n-ga/distinfo b/misc/kde4-l10n-ga/distinfo index 0adccda2edf2..5f5825de146e 100644 --- a/misc/kde4-l10n-ga/distinfo +++ b/misc/kde4-l10n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = cf7f957445f540058ab4bca4b6701559 -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = 17bf428c1f80b3f18f48084150aaa360d54ba2fcc8fac08d2ac49783212c9231 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.4.tar.bz2) = 1682840 +MD5 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = e82a3ff13cb0f8d73578f1a3770a119c +SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = ec9bc93828a5a690bfd9ec8d93ffe9f8fee0ee4d36b7bd1da8ac27b757c05336 +SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.5.tar.bz2) = 1698887 diff --git a/misc/kde4-l10n-gl/distinfo b/misc/kde4-l10n-gl/distinfo index c98aa1646529..f319b6d332d8 100644 --- a/misc/kde4-l10n-gl/distinfo +++ b/misc/kde4-l10n-gl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = 17cdcec622097a328b583755861b30e3 -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = f4dcbd540fdc99fd29ac9e0678567cf56ed31830ddda8d6e74ea18d9fbbdcae9 -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.4.tar.bz2) = 1341746 +MD5 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = bf3ad88fea56ded7fd451cc83826e4c5 +SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = f997219bd0382843ed7be7b3ef9a18fc672a476b1c9321b730cbfeb16d5a406f +SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.5.tar.bz2) = 1354712 diff --git a/misc/kde4-l10n-hi/distinfo b/misc/kde4-l10n-hi/distinfo index 0a0dc8fcad38..4738d5ef7845 100644 --- a/misc/kde4-l10n-hi/distinfo +++ b/misc/kde4-l10n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 9b07d10f948803f6fca49666934517c3 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 1faae0637af46c171f6f19bc168fb622ef25bb2427a5d445cfc2ef720c1515d0 -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.4.tar.bz2) = 1652572 +MD5 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = a046a16fd6575ee67a9086702414bac1 +SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = d5bc830048aafa372cfdce66fe48edc1e798b7e660162cd559e4c50dbf43708a +SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.5.tar.bz2) = 1663837 diff --git a/misc/kde4-l10n-is/distinfo b/misc/kde4-l10n-is/distinfo index e861df656248..d8817e5cd3f5 100644 --- a/misc/kde4-l10n-is/distinfo +++ b/misc/kde4-l10n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = ff1e7b4b500a2032530c101a1473895a -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 1db086325890d212c3910b5f9d0f486b8f9c5e596409552d691191bdbc83f2e7 -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.4.tar.bz2) = 2090071 +MD5 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 4bdd95af464b36e7d52b4848291c9717 +SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 139faf5c75268314195bf861d4042ce22a3434a84513d72de3755326cee1f056 +SIZE (KDE/kde-i18n/kde-i18n-is-3.5.5.tar.bz2) = 2101713 diff --git a/misc/kde4-l10n-it/distinfo b/misc/kde4-l10n-it/distinfo index 5a5b4dc9c4c2..8264fd14e9cc 100644 --- a/misc/kde4-l10n-it/distinfo +++ b/misc/kde4-l10n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = b050d738e3e7386134e4a657a38b5c24 -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = 01e7fc47275222204ab79c64863162f29720927695f286cb1a80346d44636b5b -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.4.tar.bz2) = 15622631 +MD5 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = a69220e5a700a277238924a3675d9dbd +SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 235702d3f8ad96edd820f01588554dfd1c4d5ac1a7bb3103c7a17922af08cedd +SIZE (KDE/kde-i18n/kde-i18n-it-3.5.5.tar.bz2) = 15749338 diff --git a/misc/kde4-l10n-it/pkg-plist b/misc/kde4-l10n-it/pkg-plist index ae75cdb7bd0e..6fbf37275330 100644 --- a/misc/kde4-l10n-it/pkg-plist +++ b/misc/kde4-l10n-it/pkg-plist @@ -364,6 +364,9 @@ share/doc/HTML/it/kcontrol/filetypes/index.docbook share/doc/HTML/it/kcontrol/fonts/common share/doc/HTML/it/kcontrol/fonts/index.cache.bz2 share/doc/HTML/it/kcontrol/fonts/index.docbook +share/doc/HTML/it/kcontrol/helpindex/common +share/doc/HTML/it/kcontrol/helpindex/index.cache.bz2 +share/doc/HTML/it/kcontrol/helpindex/index.docbook share/doc/HTML/it/kcontrol/icons/common share/doc/HTML/it/kcontrol/icons/index.cache.bz2 share/doc/HTML/it/kcontrol/icons/index.docbook @@ -372,6 +375,9 @@ share/doc/HTML/it/kcontrol/index.docbook share/doc/HTML/it/kcontrol/kalarmd/common share/doc/HTML/it/kcontrol/kalarmd/index.cache.bz2 share/doc/HTML/it/kcontrol/kalarmd/index.docbook +share/doc/HTML/it/kcontrol/kcmaccess/common +share/doc/HTML/it/kcontrol/kcmaccess/index.cache.bz2 +share/doc/HTML/it/kcontrol/kcmaccess/index.docbook share/doc/HTML/it/kcontrol/kcmcss/common share/doc/HTML/it/kcontrol/kcmcss/index.cache.bz2 share/doc/HTML/it/kcontrol/kcmcss/index.docbook @@ -445,6 +451,9 @@ share/doc/HTML/it/kcontrol/panelappearance/index.docbook share/doc/HTML/it/kcontrol/passwords/common share/doc/HTML/it/kcontrol/passwords/index.cache.bz2 share/doc/HTML/it/kcontrol/passwords/index.docbook +share/doc/HTML/it/kcontrol/performance/common +share/doc/HTML/it/kcontrol/performance/index.cache.bz2 +share/doc/HTML/it/kcontrol/performance/index.docbook share/doc/HTML/it/kcontrol/powerctrl/common share/doc/HTML/it/kcontrol/powerctrl/index.cache.bz2 share/doc/HTML/it/kcontrol/powerctrl/index.docbook @@ -510,6 +519,7 @@ share/doc/HTML/it/kdeprint/rlpr.docbook share/doc/HTML/it/kdesu/common share/doc/HTML/it/kdesu/index.cache.bz2 share/doc/HTML/it/kdesu/index.docbook +share/doc/HTML/it/kdesu/man-kdesu.1.docbook share/doc/HTML/it/kdevelop/SF-general.png share/doc/HTML/it/kdevelop/SF-indent.png share/doc/HTML/it/kdevelop/SF-other.png @@ -617,6 +627,7 @@ share/doc/HTML/it/kfilereplace/index.docbook share/doc/HTML/it/kfind/common share/doc/HTML/it/kfind/index.cache.bz2 share/doc/HTML/it/kfind/index.docbook +share/doc/HTML/it/kfind/man-kfind.1.docbook share/doc/HTML/it/kfloppy/common share/doc/HTML/it/kfloppy/index.cache.bz2 share/doc/HTML/it/kfloppy/index.docbook @@ -689,6 +700,7 @@ share/doc/HTML/it/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/it/khelpcenter/quickstart/index.docbook share/doc/HTML/it/khelpcenter/support.docbook share/doc/HTML/it/khelpcenter/userguide/about-desktop.docbook +share/doc/HTML/it/khelpcenter/userguide/accessibility.docbook share/doc/HTML/it/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/it/khelpcenter/userguide/burning-cds.docbook share/doc/HTML/it/khelpcenter/userguide/control-center.docbook @@ -703,6 +715,7 @@ share/doc/HTML/it/khelpcenter/userguide/history.docbook share/doc/HTML/it/khelpcenter/userguide/installation.docbook share/doc/HTML/it/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/it/khelpcenter/userguide/intro.docbook +share/doc/HTML/it/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/it/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/it/khelpcenter/userguide/kdeadmin-apps.docbook share/doc/HTML/it/khelpcenter/userguide/kdebase-apps.docbook @@ -733,9 +746,11 @@ share/doc/HTML/it/khelpcenter/userguide/shortcuts.docbook share/doc/HTML/it/khelpcenter/userguide/staff.docbook share/doc/HTML/it/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/it/khelpcenter/userguide/switching-sessions.docbook +share/doc/HTML/it/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/it/khelpcenter/userguide/ug-faq.docbook +share/doc/HTML/it/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/it/khelpcenter/userguide/usenet.docbook share/doc/HTML/it/khelpcenter/userguide/where-next.docbook share/doc/HTML/it/khelpcenter/userguide/windows-how-to.docbook @@ -753,6 +768,7 @@ share/doc/HTML/it/kicker-applets/ktimemon.docbook share/doc/HTML/it/kicker/common share/doc/HTML/it/kicker/index.cache.bz2 share/doc/HTML/it/kicker/index.docbook +share/doc/HTML/it/kicker/man-appletproxy.1.docbook share/doc/HTML/it/kicker/man-kicker.1.docbook share/doc/HTML/it/kiconedit/common share/doc/HTML/it/kiconedit/index.cache.bz2 @@ -764,6 +780,9 @@ share/doc/HTML/it/kig/man-kig.1.docbook share/doc/HTML/it/kinfocenter/blockdevices/common share/doc/HTML/it/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/it/kinfocenter/blockdevices/index.docbook +share/doc/HTML/it/kinfocenter/cdinfo/common +share/doc/HTML/it/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/it/kinfocenter/cdinfo/index.docbook share/doc/HTML/it/kinfocenter/common share/doc/HTML/it/kinfocenter/devices/common share/doc/HTML/it/kinfocenter/devices/index.cache.bz2 @@ -960,12 +979,15 @@ share/doc/HTML/it/kmplot/using.docbook share/doc/HTML/it/knetworkconf/common share/doc/HTML/it/knetworkconf/index.cache.bz2 share/doc/HTML/it/knetworkconf/index.docbook +share/doc/HTML/it/knode/commands.docbook share/doc/HTML/it/knode/credits.docbook share/doc/HTML/it/knode/faq.docbook share/doc/HTML/it/knode/gloss.docbook share/doc/HTML/it/knode/install.docbook share/doc/HTML/it/knode/introduction.docbook +share/doc/HTML/it/knode/journey.docbook share/doc/HTML/it/knode/more.docbook +share/doc/HTML/it/knode/using-subscribing.docbook share/doc/HTML/it/knotes/common share/doc/HTML/it/knotes/index.cache.bz2 share/doc/HTML/it/knotes/index.docbook @@ -1064,6 +1086,9 @@ share/doc/HTML/it/konsole/index.cache.bz2 share/doc/HTML/it/konsole/index.docbook share/doc/HTML/it/konsole/konsole.png share/doc/HTML/it/konsole/tabbar.png +share/doc/HTML/it/konsolekalendar/common +share/doc/HTML/it/konsolekalendar/index.cache.bz2 +share/doc/HTML/it/konsolekalendar/index.docbook share/doc/HTML/it/kontact/common share/doc/HTML/it/kontact/index.cache.bz2 share/doc/HTML/it/kontact/index.docbook @@ -1534,6 +1559,7 @@ share/doc/HTML/it/umbrello/other_features.docbook share/doc/HTML/it/umbrello/uml_basics.docbook share/doc/HTML/it/umbrello/working_with_umbrello.docbook share/doc/HTML/it/xsldbg/credits.docbook +share/doc/HTML/it/xsldbg/usage.docbook share/locale/it/LC_MESSAGES/akregator.mo share/locale/it/LC_MESSAGES/akregator_konqplugin.mo share/locale/it/LC_MESSAGES/alsaplayerui.mo @@ -2166,6 +2192,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kopete @dirrm share/doc/HTML/it/kooka @dirrm share/doc/HTML/it/kontact +@dirrm share/doc/HTML/it/konsolekalendar @dirrm share/doc/HTML/it/konsole @dirrm share/doc/HTML/it/konquest @dirrm share/doc/HTML/it/konqueror @@ -2230,6 +2257,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kinfocenter/interrupts @dirrm share/doc/HTML/it/kinfocenter/dma @dirrm share/doc/HTML/it/kinfocenter/devices +@dirrm share/doc/HTML/it/kinfocenter/cdinfo @dirrm share/doc/HTML/it/kinfocenter/blockdevices @dirrm share/doc/HTML/it/kinfocenter @dirrm share/doc/HTML/it/kig @@ -2277,6 +2305,7 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/screensaver @dirrm share/doc/HTML/it/kcontrol/proxy @dirrm share/doc/HTML/it/kcontrol/powerctrl +@dirrm share/doc/HTML/it/kcontrol/performance @dirrm share/doc/HTML/it/kcontrol/passwords @dirrm share/doc/HTML/it/kcontrol/panelappearance @dirrm share/doc/HTML/it/kcontrol/panel @@ -2301,8 +2330,10 @@ share/locale/it/flag.png @dirrm share/doc/HTML/it/kcontrol/kcmkonsole @dirrm share/doc/HTML/it/kcontrol/kcmfontinst @dirrm share/doc/HTML/it/kcontrol/kcmcss +@dirrm share/doc/HTML/it/kcontrol/kcmaccess @dirrm share/doc/HTML/it/kcontrol/kalarmd @dirrm share/doc/HTML/it/kcontrol/icons +@dirrm share/doc/HTML/it/kcontrol/helpindex @dirrm share/doc/HTML/it/kcontrol/fonts @dirrm share/doc/HTML/it/kcontrol/filetypes @dirrm share/doc/HTML/it/kcontrol/filemanager diff --git a/misc/kde4-l10n-kk/distinfo b/misc/kde4-l10n-kk/distinfo index d53df3f40317..fa45a31807ec 100644 --- a/misc/kde4-l10n-kk/distinfo +++ b/misc/kde4-l10n-kk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = b2a0dbd4a6c32dfce58aa488db27aa4d -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = 4e5ab7ea74ccdd8439f47e1976b5d141fbf5fd1f99f6014d1f2015c906b86d90 -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.4.tar.bz2) = 800194 +MD5 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = a0811b606aecac2a854af9f27ce7e716 +SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = d700f7b53f9faba130246191669ffe553ce864bad2f35338ab1d9799e57f4e09 +SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.5.tar.bz2) = 926318 diff --git a/misc/kde4-l10n-kk/pkg-plist b/misc/kde4-l10n-kk/pkg-plist index 53e6b84253aa..cdde694d51eb 100644 --- a/misc/kde4-l10n-kk/pkg-plist +++ b/misc/kde4-l10n-kk/pkg-plist @@ -138,6 +138,7 @@ share/locale/kk/LC_MESSAGES/kdesu.mo share/locale/kk/LC_MESSAGES/kdesud.mo share/locale/kk/LC_MESSAGES/kdf.mo share/locale/kk/LC_MESSAGES/kdialog.mo +share/locale/kk/LC_MESSAGES/kdict.mo share/locale/kk/LC_MESSAGES/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo @@ -153,6 +154,7 @@ share/locale/kk/LC_MESSAGES/kfile_rpm.mo share/locale/kk/LC_MESSAGES/kfile_torrent.mo share/locale/kk/LC_MESSAGES/kfile_txt.mo share/locale/kk/LC_MESSAGES/kfileaudiopreview.mo +share/locale/kk/LC_MESSAGES/kfileshare.mo share/locale/kk/LC_MESSAGES/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo share/locale/kk/LC_MESSAGES/kfmclient.mo @@ -209,9 +211,11 @@ share/locale/kk/LC_MESSAGES/kmilo_kvaio.mo share/locale/kk/LC_MESSAGES/kmilo_powerbook.mo share/locale/kk/LC_MESSAGES/kmilo_thinkpad.mo share/locale/kk/LC_MESSAGES/kmilod.mo +share/locale/kk/LC_MESSAGES/kmines.mo share/locale/kk/LC_MESSAGES/kminipagerapplet.mo share/locale/kk/LC_MESSAGES/knetattach.mo share/locale/kk/LC_MESSAGES/knetworkconf.mo +share/locale/kk/LC_MESSAGES/knewsticker.mo share/locale/kk/LC_MESSAGES/knotify.mo share/locale/kk/LC_MESSAGES/kolourpicker.mo share/locale/kk/LC_MESSAGES/konqsidebar_delicious.mo @@ -220,15 +224,18 @@ share/locale/kk/LC_MESSAGES/konqsidebar_metabar.mo share/locale/kk/LC_MESSAGES/konqsidebar_news.mo share/locale/kk/LC_MESSAGES/konqueror.mo share/locale/kk/LC_MESSAGES/konsole.mo +share/locale/kk/LC_MESSAGES/kopete.mo share/locale/kk/LC_MESSAGES/kpackage.mo share/locale/kk/LC_MESSAGES/kpager.mo share/locale/kk/LC_MESSAGES/kpersonalizer.mo share/locale/kk/LC_MESSAGES/kppp.mo +share/locale/kk/LC_MESSAGES/kppplogview.mo share/locale/kk/LC_MESSAGES/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo share/locale/kk/LC_MESSAGES/kreadconfig.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo +share/locale/kk/LC_MESSAGES/krfb.mo share/locale/kk/LC_MESSAGES/krunapplet.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo share/locale/kk/LC_MESSAGES/ksig.mo diff --git a/misc/kde4-l10n-km/distinfo b/misc/kde4-l10n-km/distinfo index 7870071d140b..a8113e46c0f1 100644 --- a/misc/kde4-l10n-km/distinfo +++ b/misc/kde4-l10n-km/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = 36cc11549a23ecc2967222ea76826cbf -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = b6eb783d5072974968be45dc45f8a56bbe8447a3fb567ba96c3bd482f94f743f -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.4.tar.bz2) = 1265931 +MD5 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = c11c4653c9e211deb4c16bf346bd03ad +SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 818b3be6a18afeb99771f0746b0c1b593f1abc31438dae3bc18a796b4700bd61 +SIZE (KDE/kde-i18n/kde-i18n-km-3.5.5.tar.bz2) = 1656443 diff --git a/misc/kde4-l10n-km/pkg-plist b/misc/kde4-l10n-km/pkg-plist index 21f5cc7068f2..799943d795dc 100644 --- a/misc/kde4-l10n-km/pkg-plist +++ b/misc/kde4-l10n-km/pkg-plist @@ -49,9 +49,11 @@ share/locale/km/LC_MESSAGES/kaboodle.mo share/locale/km/LC_MESSAGES/kaccess.mo share/locale/km/LC_MESSAGES/kaddressbook.mo share/locale/km/LC_MESSAGES/kalarm.mo +share/locale/km/LC_MESSAGES/kalzium.mo share/locale/km/LC_MESSAGES/kanagram.mo share/locale/km/LC_MESSAGES/kandy.mo share/locale/km/LC_MESSAGES/kappfinder.mo +share/locale/km/LC_MESSAGES/karm.mo share/locale/km/LC_MESSAGES/kasbarextension.mo share/locale/km/LC_MESSAGES/kasteroids.mo share/locale/km/LC_MESSAGES/kate.mo @@ -87,10 +89,12 @@ share/locale/km/LC_MESSAGES/kbinaryclock.mo share/locale/km/LC_MESSAGES/kblackbox.mo share/locale/km/LC_MESSAGES/kbounce.mo share/locale/km/LC_MESSAGES/kbruch.mo +share/locale/km/LC_MESSAGES/kbstateapplet.mo share/locale/km/LC_MESSAGES/kcalc.mo share/locale/km/LC_MESSAGES/kcharselect.mo share/locale/km/LC_MESSAGES/kcharselectapplet.mo share/locale/km/LC_MESSAGES/kcm_krfb.mo +share/locale/km/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/km/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -127,6 +131,7 @@ share/locale/km/LC_MESSAGES/kcmkonqhtml.mo share/locale/km/LC_MESSAGES/kcmkonsole.mo share/locale/km/LC_MESSAGES/kcmkontactnt.mo share/locale/km/LC_MESSAGES/kcmktalkd.mo +share/locale/km/LC_MESSAGES/kcmkttsd.mo share/locale/km/LC_MESSAGES/kcmkuick.mo share/locale/km/LC_MESSAGES/kcmkurifilt.mo share/locale/km/LC_MESSAGES/kcmkvaio.mo @@ -183,8 +188,10 @@ share/locale/km/LC_MESSAGES/kdgantt.mo share/locale/km/LC_MESSAGES/kdialog.mo share/locale/km/LC_MESSAGES/kdict.mo share/locale/km/LC_MESSAGES/kdictapplet.mo +share/locale/km/LC_MESSAGES/kdjview.mo share/locale/km/LC_MESSAGES/kdmconfig.mo share/locale/km/LC_MESSAGES/kdmgreet.mo +share/locale/km/LC_MESSAGES/kdvi.mo share/locale/km/LC_MESSAGES/kedit.mo share/locale/km/LC_MESSAGES/keduca.mo share/locale/km/LC_MESSAGES/kenolaba.mo @@ -198,6 +205,7 @@ share/locale/km/LC_MESSAGES/kfile_cert.mo share/locale/km/LC_MESSAGES/kfile_dds.mo share/locale/km/LC_MESSAGES/kfile_deb.mo share/locale/km/LC_MESSAGES/kfile_desktop.mo +share/locale/km/LC_MESSAGES/kfile_drgeo.mo share/locale/km/LC_MESSAGES/kfile_dvi.mo share/locale/km/LC_MESSAGES/kfile_exr.mo share/locale/km/LC_MESSAGES/kfile_flac.mo @@ -207,6 +215,7 @@ share/locale/km/LC_MESSAGES/kfile_html.mo share/locale/km/LC_MESSAGES/kfile_ico.mo share/locale/km/LC_MESSAGES/kfile_ics.mo share/locale/km/LC_MESSAGES/kfile_jpeg.mo +share/locale/km/LC_MESSAGES/kfile_kig.mo share/locale/km/LC_MESSAGES/kfile_lnk.mo share/locale/km/LC_MESSAGES/kfile_m3u.mo share/locale/km/LC_MESSAGES/kfile_mhtml.mo @@ -242,6 +251,7 @@ share/locale/km/LC_MESSAGES/kfontinst.mo share/locale/km/LC_MESSAGES/kfouleggs.mo share/locale/km/LC_MESSAGES/kgamma.mo share/locale/km/LC_MESSAGES/kgantt.mo +share/locale/km/LC_MESSAGES/kgeography.mo share/locale/km/LC_MESSAGES/kget.mo share/locale/km/LC_MESSAGES/kghostview.mo share/locale/km/LC_MESSAGES/kgoldrunner.mo @@ -255,6 +265,7 @@ share/locale/km/LC_MESSAGES/khtmlkttsd.mo share/locale/km/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/km/LC_MESSAGES/kicker.mo share/locale/km/LC_MESSAGES/kiconedit.mo +share/locale/km/LC_MESSAGES/kig.mo share/locale/km/LC_MESSAGES/kinetd.mo share/locale/km/LC_MESSAGES/kio.mo share/locale/km/LC_MESSAGES/kio_audiocd.mo @@ -289,11 +300,14 @@ share/locale/km/LC_MESSAGES/kio_thumbnail.mo share/locale/km/LC_MESSAGES/kio_trash.mo share/locale/km/LC_MESSAGES/kio_zeroconf.mo share/locale/km/LC_MESSAGES/kioexec.mo +share/locale/km/LC_MESSAGES/kiten.mo share/locale/km/LC_MESSAGES/kjobviewer.mo share/locale/km/LC_MESSAGES/kjots.mo share/locale/km/LC_MESSAGES/kjumpingcube.mo share/locale/km/LC_MESSAGES/klaptopdaemon.mo +share/locale/km/LC_MESSAGES/klatin.mo share/locale/km/LC_MESSAGES/klegacyimport.mo +share/locale/km/LC_MESSAGES/kleopatra.mo share/locale/km/LC_MESSAGES/klettres.mo share/locale/km/LC_MESSAGES/klickety.mo share/locale/km/LC_MESSAGES/klines.mo @@ -304,9 +318,11 @@ share/locale/km/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/km/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/km/LC_MESSAGES/kmailcvt.mo share/locale/km/LC_MESSAGES/kmathapplet.mo +share/locale/km/LC_MESSAGES/kmathtool.mo share/locale/km/LC_MESSAGES/kmcop.mo share/locale/km/LC_MESSAGES/kmenuapplet.mo share/locale/km/LC_MESSAGES/kmenuedit.mo +share/locale/km/LC_MESSAGES/kmessedwords.mo share/locale/km/LC_MESSAGES/kmid.mo share/locale/km/LC_MESSAGES/kmilo_delli8k.mo share/locale/km/LC_MESSAGES/kmilo_generic.mo @@ -320,8 +336,11 @@ share/locale/km/LC_MESSAGES/kmix.mo share/locale/km/LC_MESSAGES/kmobile.mo share/locale/km/LC_MESSAGES/kmoon.mo share/locale/km/LC_MESSAGES/kmouth.mo +share/locale/km/LC_MESSAGES/kmplot.mo +share/locale/km/LC_MESSAGES/kmrml.mo share/locale/km/LC_MESSAGES/knetattach.mo share/locale/km/LC_MESSAGES/knetwalk.mo +share/locale/km/LC_MESSAGES/knode.mo share/locale/km/LC_MESSAGES/knotes.mo share/locale/km/LC_MESSAGES/knotify.mo share/locale/km/LC_MESSAGES/kodo.mo @@ -347,6 +366,7 @@ share/locale/km/LC_MESSAGES/kontact.mo share/locale/km/LC_MESSAGES/kooka.mo share/locale/km/LC_MESSAGES/kopete.mo share/locale/km/LC_MESSAGES/korganizer.mo +share/locale/km/LC_MESSAGES/korn.mo share/locale/km/LC_MESSAGES/kpager.mo share/locale/km/LC_MESSAGES/kpartapp.mo share/locale/km/LC_MESSAGES/kpat.mo @@ -354,7 +374,9 @@ share/locale/km/LC_MESSAGES/kpdf.mo share/locale/km/LC_MESSAGES/kpercentage.mo share/locale/km/LC_MESSAGES/kpersonalizer.mo share/locale/km/LC_MESSAGES/kpf.mo +share/locale/km/LC_MESSAGES/kpilot.mo share/locale/km/LC_MESSAGES/kpoker.mo +share/locale/km/LC_MESSAGES/kpovmodeler.mo share/locale/km/LC_MESSAGES/kppplogview.mo share/locale/km/LC_MESSAGES/kprinter.mo share/locale/km/LC_MESSAGES/krandr.mo @@ -393,10 +415,12 @@ share/locale/km/LC_MESSAGES/ksokoban.mo share/locale/km/LC_MESSAGES/kspaceduel.mo share/locale/km/LC_MESSAGES/ksplash.mo share/locale/km/LC_MESSAGES/ksplashthemes.mo +share/locale/km/LC_MESSAGES/kstars.mo share/locale/km/LC_MESSAGES/kstart.mo share/locale/km/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/km/LC_MESSAGES/kstyle_keramik_config.mo share/locale/km/LC_MESSAGES/kstyle_plastik_config.mo +share/locale/km/LC_MESSAGES/ksvgplugin.mo share/locale/km/LC_MESSAGES/ksync.mo share/locale/km/LC_MESSAGES/ksysguard.mo share/locale/km/LC_MESSAGES/ksystemtrayapplet.mo @@ -409,21 +433,40 @@ share/locale/km/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/km/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/km/LC_MESSAGES/ktexteditor_isearch.mo share/locale/km/LC_MESSAGES/ktexteditor_kdatatool.mo +share/locale/km/LC_MESSAGES/ktexteditor_kttsd.mo share/locale/km/LC_MESSAGES/kthememanager.mo share/locale/km/LC_MESSAGES/ktimemon.mo share/locale/km/LC_MESSAGES/ktimer.mo share/locale/km/LC_MESSAGES/ktip.mo +share/locale/km/LC_MESSAGES/ktnef.mo +share/locale/km/LC_MESSAGES/ktouch.mo share/locale/km/LC_MESSAGES/ktron.mo +share/locale/km/LC_MESSAGES/kttsd_commandplugin.mo +share/locale/km/LC_MESSAGES/kttsd_eposplugin.mo +share/locale/km/LC_MESSAGES/kttsd_fliteplugin.mo +share/locale/km/LC_MESSAGES/kttsd_freettsplugin.mo +share/locale/km/LC_MESSAGES/kttsd_sbdplugin.mo +share/locale/km/LC_MESSAGES/kttsd_xmltransformerplugin.mo +share/locale/km/LC_MESSAGES/kttsmgr.mo share/locale/km/LC_MESSAGES/ktuberling.mo +share/locale/km/LC_MESSAGES/kturtle.mo share/locale/km/LC_MESSAGES/ktux.mo share/locale/km/LC_MESSAGES/kuick_plugin.mo share/locale/km/LC_MESSAGES/kuickshow.mo +share/locale/km/LC_MESSAGES/kverbos.mo share/locale/km/LC_MESSAGES/kview.mo +share/locale/km/LC_MESSAGES/kview_scale.mo share/locale/km/LC_MESSAGES/kviewbrowserplugin.mo share/locale/km/LC_MESSAGES/kviewcanvas.mo share/locale/km/LC_MESSAGES/kvieweffectsplugin.mo +share/locale/km/LC_MESSAGES/kviewpresenterplugin.mo share/locale/km/LC_MESSAGES/kviewscannerplugin.mo +share/locale/km/LC_MESSAGES/kviewshell.mo +share/locale/km/LC_MESSAGES/kviewtemplateplugin.mo +share/locale/km/LC_MESSAGES/kviewviewer.mo +share/locale/km/LC_MESSAGES/kvoctrain.mo share/locale/km/LC_MESSAGES/kwalletmanager.mo +share/locale/km/LC_MESSAGES/kwatchgnupg.mo share/locale/km/LC_MESSAGES/kweather.mo share/locale/km/LC_MESSAGES/kwifimanager.mo share/locale/km/LC_MESSAGES/kwin.mo @@ -431,15 +474,18 @@ share/locale/km/LC_MESSAGES/kwin4.mo share/locale/km/LC_MESSAGES/kwin_clients.mo share/locale/km/LC_MESSAGES/kwin_lib.mo share/locale/km/LC_MESSAGES/kwireless.mo +share/locale/km/LC_MESSAGES/kwordquiz.mo share/locale/km/LC_MESSAGES/kworldclock.mo share/locale/km/LC_MESSAGES/kwriteconfig.mo share/locale/km/LC_MESSAGES/kxkb.mo share/locale/km/LC_MESSAGES/kxmlrpcd.mo +share/locale/km/LC_MESSAGES/libKTTSD.mo share/locale/km/LC_MESSAGES/libcalendarresources.mo share/locale/km/LC_MESSAGES/libdmctl.mo share/locale/km/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/km/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/km/LC_MESSAGES/libkcal.mo +share/locale/km/LC_MESSAGES/libkcalsystem.mo share/locale/km/LC_MESSAGES/libkcddb.mo share/locale/km/LC_MESSAGES/libkdeedu.mo share/locale/km/LC_MESSAGES/libkdegames.mo @@ -456,6 +502,7 @@ share/locale/km/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/km/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/km/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/km/LC_MESSAGES/libkickermenu_tom.mo +share/locale/km/LC_MESSAGES/libkleopatra.mo share/locale/km/LC_MESSAGES/libkmime.mo share/locale/km/LC_MESSAGES/libkonq.mo share/locale/km/LC_MESSAGES/libkpgp.mo @@ -481,6 +528,7 @@ share/locale/km/LC_MESSAGES/noatun.mo share/locale/km/LC_MESSAGES/nsplugin.mo share/locale/km/LC_MESSAGES/pitchablespeed.mo share/locale/km/LC_MESSAGES/privacy.mo +share/locale/km/LC_MESSAGES/quanta.mo share/locale/km/LC_MESSAGES/quicklauncher.mo share/locale/km/LC_MESSAGES/rellinks.mo share/locale/km/LC_MESSAGES/searchbarplugin.mo diff --git a/misc/kde4-l10n-lt/distinfo b/misc/kde4-l10n-lt/distinfo index 2423dc732c2e..77afcbf9f51c 100644 --- a/misc/kde4-l10n-lt/distinfo +++ b/misc/kde4-l10n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 5c8bf80d151685785cf16d0d60912441 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 24dcc5d304184c55432367a76dac1dd541dfed7fc6906eabc1449c367e266670 -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.4.tar.bz2) = 1872233 +MD5 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = aa799b8fac440c0b70188e0f9df16350 +SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = d55c4f4ff50dc2b2f3b365594bae75a491a57c32aa251a565fa6a4699304d866 +SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.5.tar.bz2) = 1888636 diff --git a/misc/kde4-l10n-lv/distinfo b/misc/kde4-l10n-lv/distinfo index d84d478ac379..3df0e3c0fe72 100644 --- a/misc/kde4-l10n-lv/distinfo +++ b/misc/kde4-l10n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 0f0f1fd8542552fb25a6cd4dbc99aece -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 0c8fc496e0e24d12cfb8b2564263925e5b58782fc11fa8556f6d601d3b0da6f0 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.4.tar.bz2) = 1348144 +MD5 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = f541bb2957e1f0469d76711cc86ba851 +SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = d99b0d080abc56c53b2fc3058a0ad945f971e891870b995c7bced4dfdbabe437 +SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.5.tar.bz2) = 1352071 diff --git a/misc/kde4-l10n-lv/pkg-plist b/misc/kde4-l10n-lv/pkg-plist index 9945da1791fd..57999f50d42e 100644 --- a/misc/kde4-l10n-lv/pkg-plist +++ b/misc/kde4-l10n-lv/pkg-plist @@ -237,6 +237,7 @@ share/locale/lv/LC_MESSAGES/ktip.mo share/locale/lv/LC_MESSAGES/ktouch.mo share/locale/lv/LC_MESSAGES/ktron.mo share/locale/lv/LC_MESSAGES/ktuberling.mo +share/locale/lv/LC_MESSAGES/ktux.mo share/locale/lv/LC_MESSAGES/kuick_plugin.mo share/locale/lv/LC_MESSAGES/kuickshow.mo share/locale/lv/LC_MESSAGES/kuser.mo diff --git a/misc/kde4-l10n-mk/distinfo b/misc/kde4-l10n-mk/distinfo index 096f9bf1eee6..ae3676d8bd8e 100644 --- a/misc/kde4-l10n-mk/distinfo +++ b/misc/kde4-l10n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = e5eb21657932cd4997af337bd41c336c -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = 42e888c4de3009d07d0a038e31e6c9ca7f9d9dc195910c57f3e2d0c6d6e35aee -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.4.tar.bz2) = 1714571 +MD5 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 014b290f599e808ff3b885c50d150fe5 +SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 6c19733a4c6304441427a58f4e0de71d0d064e2fb4618edc05c2cd271aa5ff39 +SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.5.tar.bz2) = 1734951 diff --git a/misc/kde4-l10n-mk/pkg-plist b/misc/kde4-l10n-mk/pkg-plist index c2c20b9ba7f7..9178ea3526e6 100644 --- a/misc/kde4-l10n-mk/pkg-plist +++ b/misc/kde4-l10n-mk/pkg-plist @@ -43,6 +43,7 @@ share/locale/mk/LC_MESSAGES/kabc_dir.mo share/locale/mk/LC_MESSAGES/kabc_file.mo share/locale/mk/LC_MESSAGES/kabc_ldapkio.mo share/locale/mk/LC_MESSAGES/kabc_net.mo +share/locale/mk/LC_MESSAGES/kabc_slox.mo share/locale/mk/LC_MESSAGES/kabc_sql.mo share/locale/mk/LC_MESSAGES/kabcformat_binary.mo share/locale/mk/LC_MESSAGES/kaboodle.mo @@ -513,6 +514,7 @@ share/locale/mk/LC_MESSAGES/tippecanoe.mo share/locale/mk/LC_MESSAGES/trashapplet.mo share/locale/mk/LC_MESSAGES/tyler.mo share/locale/mk/LC_MESSAGES/uachangerplugin.mo +share/locale/mk/LC_MESSAGES/umbrello.mo share/locale/mk/LC_MESSAGES/useraccount.mo share/locale/mk/LC_MESSAGES/validatorsplugin.mo share/locale/mk/LC_MESSAGES/wakeup.mo diff --git a/misc/kde4-l10n-nb/distinfo b/misc/kde4-l10n-nb/distinfo index 06fce1430198..fdbc558d11af 100644 --- a/misc/kde4-l10n-nb/distinfo +++ b/misc/kde4-l10n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = c322d1d4a04e327a76effd78d36b407d -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = 0d820339e984060b6235c70d81293a9503ec58f709f4fb9b097a56d81ca8afae -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.4.tar.bz2) = 2137633 +MD5 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 1b3edcfa11bb648e98bab07f93e898a9 +SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = cdcb4dd7a73daa6cda4eff2c44e36c749b1dfefe69cd2ee05b5b066cd75b2fd3 +SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.5.tar.bz2) = 2153235 diff --git a/misc/kde4-l10n-nds/distinfo b/misc/kde4-l10n-nds/distinfo index 53a96866a7f6..49e954321a7d 100644 --- a/misc/kde4-l10n-nds/distinfo +++ b/misc/kde4-l10n-nds/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = e47b93f27bda95970a0de286f13f999f -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = 10670fb2b9fdf58a32d493eea2b05ae26b3accecd8790edf48aca1af170905b3 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.4.tar.bz2) = 1353075 +MD5 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = f159dd39c2385403a0f95c0b102ef67b +SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2f88b016ca70522a934244a076ecaae3a1886974f62b9f1adf217057cc6c4374 +SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.5.tar.bz2) = 2044198 diff --git a/misc/kde4-l10n-nds/pkg-plist b/misc/kde4-l10n-nds/pkg-plist index da2397782ffe..796972738f54 100644 --- a/misc/kde4-l10n-nds/pkg-plist +++ b/misc/kde4-l10n-nds/pkg-plist @@ -1,3 +1,30 @@ +share/apps/ktuberling/sounds/nds/afteken.wav +share/apps/ktuberling/sounds/nds/aquarium.wav +share/apps/ktuberling/sounds/nds/brill.wav +share/apps/ktuberling/sounds/nds/duekerhoot.wav +share/apps/ktuberling/sounds/nds/fisch.wav +share/apps/ktuberling/sounds/nds/fleeg.wav +share/apps/ktuberling/sounds/nds/halskeed.wav +share/apps/ktuberling/sounds/nds/hoor.wav +share/apps/ktuberling/sounds/nds/hoorn.wav +share/apps/ktuberling/sounds/nds/hoot.wav +share/apps/ktuberling/sounds/nds/kantueffel.wav +share/apps/ktuberling/sounds/nds/klock.wav +share/apps/ktuberling/sounds/nds/mund.wav +share/apps/ktuberling/sounds/nds/nees.wav +share/apps/ktuberling/sounds/nds/neesboort.wav +share/apps/ktuberling/sounds/nds/ohr.wav +share/apps/ktuberling/sounds/nds/ohrring.wav +share/apps/ktuberling/sounds/nds/oog.wav +share/apps/ktuberling/sounds/nds/oogbro.wav +share/apps/ktuberling/sounds/nds/penguin.wav +share/apps/ktuberling/sounds/nds/quall.wav +share/apps/ktuberling/sounds/nds/schaal.wav +share/apps/ktuberling/sounds/nds/schatz.wav +share/apps/ktuberling/sounds/nds/seepeerd.wav +share/apps/ktuberling/sounds/nds/slips.wav +share/apps/ktuberling/sounds/nds/suennbrill.wav +share/apps/ktuberling/sounds/nds/zigarr.wav share/locale/nds/LC_MESSAGES/akregator.mo share/locale/nds/LC_MESSAGES/akregator_konqplugin.mo share/locale/nds/LC_MESSAGES/alsaplayerui.mo @@ -5,8 +32,13 @@ share/locale/nds/LC_MESSAGES/amor.mo share/locale/nds/LC_MESSAGES/appletproxy.mo share/locale/nds/LC_MESSAGES/ark.mo share/locale/nds/LC_MESSAGES/ark_plugin.mo +share/locale/nds/LC_MESSAGES/artsbuilder.mo +share/locale/nds/LC_MESSAGES/artscontrol.mo +share/locale/nds/LC_MESSAGES/artsmodules.mo share/locale/nds/LC_MESSAGES/atlantik.mo share/locale/nds/LC_MESSAGES/atlantikdesigner.mo +share/locale/nds/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/nds/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo share/locale/nds/LC_MESSAGES/babelfish.mo @@ -32,6 +64,7 @@ share/locale/nds/LC_MESSAGES/imagerename_plugin.mo share/locale/nds/LC_MESSAGES/imgalleryplugin.mo share/locale/nds/LC_MESSAGES/irkick.mo share/locale/nds/LC_MESSAGES/joystick.mo +share/locale/nds/LC_MESSAGES/juk.mo share/locale/nds/LC_MESSAGES/kabc2mutt.mo share/locale/nds/LC_MESSAGES/kabc_dir.mo share/locale/nds/LC_MESSAGES/kabc_file.mo @@ -40,6 +73,7 @@ share/locale/nds/LC_MESSAGES/kabc_net.mo share/locale/nds/LC_MESSAGES/kabc_slox.mo share/locale/nds/LC_MESSAGES/kabc_sql.mo share/locale/nds/LC_MESSAGES/kabcformat_binary.mo +share/locale/nds/LC_MESSAGES/kaboodle.mo share/locale/nds/LC_MESSAGES/kaccess.mo share/locale/nds/LC_MESSAGES/kaddressbook.mo share/locale/nds/LC_MESSAGES/kalarm.mo @@ -68,22 +102,32 @@ share/locale/nds/LC_MESSAGES/katetextfilter.mo share/locale/nds/LC_MESSAGES/katexmlcheck.mo share/locale/nds/LC_MESSAGES/katexmltools.mo share/locale/nds/LC_MESSAGES/katomic.mo +share/locale/nds/LC_MESSAGES/kaudiocreator.mo share/locale/nds/LC_MESSAGES/kay.mo share/locale/nds/LC_MESSAGES/kbabel.mo +share/locale/nds/LC_MESSAGES/kbackgammon.mo +share/locale/nds/LC_MESSAGES/kbattleship.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo +share/locale/nds/LC_MESSAGES/kblackbox.mo +share/locale/nds/LC_MESSAGES/kbounce.mo share/locale/nds/LC_MESSAGES/kbstateapplet.mo +share/locale/nds/LC_MESSAGES/kbugbuster.mo +share/locale/nds/LC_MESSAGES/kcachegrind.mo share/locale/nds/LC_MESSAGES/kcalc.mo share/locale/nds/LC_MESSAGES/kcharselect.mo share/locale/nds/LC_MESSAGES/kcharselectapplet.mo share/locale/nds/LC_MESSAGES/kcm_krfb.mo +share/locale/nds/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcmaccess.mo share/locale/nds/LC_MESSAGES/kcmaccessibility.mo share/locale/nds/LC_MESSAGES/kcmarts.mo +share/locale/nds/LC_MESSAGES/kcmaudiocd.mo share/locale/nds/LC_MESSAGES/kcmbackground.mo share/locale/nds/LC_MESSAGES/kcmbell.mo +share/locale/nds/LC_MESSAGES/kcmcddb.mo share/locale/nds/LC_MESSAGES/kcmcgi.mo share/locale/nds/LC_MESSAGES/kcmcolors.mo share/locale/nds/LC_MESSAGES/kcmcomponentchooser.mo @@ -97,6 +141,7 @@ share/locale/nds/LC_MESSAGES/kcminfo.mo share/locale/nds/LC_MESSAGES/kcminput.mo share/locale/nds/LC_MESSAGES/kcmioslaveinfo.mo share/locale/nds/LC_MESSAGES/kcmkabconfig.mo +share/locale/nds/LC_MESSAGES/kcmkamera.mo share/locale/nds/LC_MESSAGES/kcmkclock.mo share/locale/nds/LC_MESSAGES/kcmkded.mo share/locale/nds/LC_MESSAGES/kcmkdnssd.mo @@ -160,14 +205,18 @@ share/locale/nds/LC_MESSAGES/kdessh.mo share/locale/nds/LC_MESSAGES/kdesu.mo share/locale/nds/LC_MESSAGES/kdesud.mo share/locale/nds/LC_MESSAGES/kdevdesigner.mo +share/locale/nds/LC_MESSAGES/kdevelop.mo +share/locale/nds/LC_MESSAGES/kdevtipofday.mo share/locale/nds/LC_MESSAGES/kdf.mo share/locale/nds/LC_MESSAGES/kdgantt.mo share/locale/nds/LC_MESSAGES/kdialog.mo share/locale/nds/LC_MESSAGES/kdict.mo share/locale/nds/LC_MESSAGES/kdictapplet.mo +share/locale/nds/LC_MESSAGES/kdjview.mo share/locale/nds/LC_MESSAGES/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo share/locale/nds/LC_MESSAGES/kedit.mo +share/locale/nds/LC_MESSAGES/kenolaba.mo share/locale/nds/LC_MESSAGES/kfifteenapplet.mo share/locale/nds/LC_MESSAGES/kfile_au.mo share/locale/nds/LC_MESSAGES/kfile_avi.mo @@ -187,6 +236,7 @@ share/locale/nds/LC_MESSAGES/kfile_lnk.mo share/locale/nds/LC_MESSAGES/kfile_m3u.mo share/locale/nds/LC_MESSAGES/kfile_mhtml.mo share/locale/nds/LC_MESSAGES/kfile_mp3.mo +share/locale/nds/LC_MESSAGES/kfile_mpc.mo share/locale/nds/LC_MESSAGES/kfile_mpeg.mo share/locale/nds/LC_MESSAGES/kfile_ogg.mo share/locale/nds/LC_MESSAGES/kfile_palm.mo @@ -216,6 +266,8 @@ share/locale/nds/LC_MESSAGES/kfontinst.mo share/locale/nds/LC_MESSAGES/kfouleggs.mo share/locale/nds/LC_MESSAGES/kgantt.mo share/locale/nds/LC_MESSAGES/kgeography.mo +share/locale/nds/LC_MESSAGES/kget.mo +share/locale/nds/LC_MESSAGES/kgoldrunner.mo share/locale/nds/LC_MESSAGES/kgpg.mo share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo @@ -228,6 +280,7 @@ share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/nds/LC_MESSAGES/kicker.mo share/locale/nds/LC_MESSAGES/kinetd.mo share/locale/nds/LC_MESSAGES/kio.mo +share/locale/nds/LC_MESSAGES/kio_audiocd.mo share/locale/nds/LC_MESSAGES/kio_finger.mo share/locale/nds/LC_MESSAGES/kio_fish.mo share/locale/nds/LC_MESSAGES/kio_floppy.mo @@ -252,6 +305,7 @@ share/locale/nds/LC_MESSAGES/kio_sftp.mo share/locale/nds/LC_MESSAGES/kio_sieve.mo share/locale/nds/LC_MESSAGES/kio_smb.mo share/locale/nds/LC_MESSAGES/kio_smtp.mo +share/locale/nds/LC_MESSAGES/kio_svn.mo share/locale/nds/LC_MESSAGES/kio_system.mo share/locale/nds/LC_MESSAGES/kio_tar.mo share/locale/nds/LC_MESSAGES/kio_thumbnail.mo @@ -260,9 +314,11 @@ share/locale/nds/LC_MESSAGES/kio_zeroconf.mo share/locale/nds/LC_MESSAGES/kioexec.mo share/locale/nds/LC_MESSAGES/kjobviewer.mo share/locale/nds/LC_MESSAGES/kjots.mo +share/locale/nds/LC_MESSAGES/kjumpingcube.mo share/locale/nds/LC_MESSAGES/klaptopdaemon.mo share/locale/nds/LC_MESSAGES/kleopatra.mo share/locale/nds/LC_MESSAGES/klickety.mo +share/locale/nds/LC_MESSAGES/klines.mo share/locale/nds/LC_MESSAGES/klipper.mo share/locale/nds/LC_MESSAGES/klock.mo share/locale/nds/LC_MESSAGES/kmag.mo @@ -275,6 +331,7 @@ share/locale/nds/LC_MESSAGES/kmathapplet.mo share/locale/nds/LC_MESSAGES/kmcop.mo share/locale/nds/LC_MESSAGES/kmenuapplet.mo share/locale/nds/LC_MESSAGES/kmenuedit.mo +share/locale/nds/LC_MESSAGES/kmid.mo share/locale/nds/LC_MESSAGES/kmilo_delli8k.mo share/locale/nds/LC_MESSAGES/kmilo_generic.mo share/locale/nds/LC_MESSAGES/kmilo_kvaio.mo @@ -283,17 +340,20 @@ share/locale/nds/LC_MESSAGES/kmilo_thinkpad.mo share/locale/nds/LC_MESSAGES/kmilod.mo share/locale/nds/LC_MESSAGES/kmines.mo share/locale/nds/LC_MESSAGES/kminipagerapplet.mo +share/locale/nds/LC_MESSAGES/kmix.mo share/locale/nds/LC_MESSAGES/kmobile.mo share/locale/nds/LC_MESSAGES/kmoon.mo share/locale/nds/LC_MESSAGES/kmousetool.mo share/locale/nds/LC_MESSAGES/kmouth.mo share/locale/nds/LC_MESSAGES/knetattach.mo +share/locale/nds/LC_MESSAGES/knetwalk.mo share/locale/nds/LC_MESSAGES/knetworkconf.mo share/locale/nds/LC_MESSAGES/knewsticker.mo share/locale/nds/LC_MESSAGES/knode.mo share/locale/nds/LC_MESSAGES/knotes.mo share/locale/nds/LC_MESSAGES/knotify.mo share/locale/nds/LC_MESSAGES/kodo.mo +share/locale/nds/LC_MESSAGES/kolf.mo share/locale/nds/LC_MESSAGES/kolourpicker.mo share/locale/nds/LC_MESSAGES/kompare.mo share/locale/nds/LC_MESSAGES/konnector_dummy.mo @@ -307,22 +367,29 @@ share/locale/nds/LC_MESSAGES/konqsidebar_mediaplayer.mo share/locale/nds/LC_MESSAGES/konqsidebar_metabar.mo share/locale/nds/LC_MESSAGES/konqsidebar_news.mo share/locale/nds/LC_MESSAGES/konqueror.mo +share/locale/nds/LC_MESSAGES/konquest.mo share/locale/nds/LC_MESSAGES/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo share/locale/nds/LC_MESSAGES/kontact.mo +share/locale/nds/LC_MESSAGES/kopete.mo share/locale/nds/LC_MESSAGES/korganizer.mo share/locale/nds/LC_MESSAGES/korn.mo share/locale/nds/LC_MESSAGES/kpackage.mo share/locale/nds/LC_MESSAGES/kpager.mo share/locale/nds/LC_MESSAGES/kpartsaver.mo +share/locale/nds/LC_MESSAGES/kpat.mo share/locale/nds/LC_MESSAGES/kpersonalizer.mo +share/locale/nds/LC_MESSAGES/kpf.mo share/locale/nds/LC_MESSAGES/kpilot.mo +share/locale/nds/LC_MESSAGES/kpoker.mo +share/locale/nds/LC_MESSAGES/kppp.mo share/locale/nds/LC_MESSAGES/kppplogview.mo share/locale/nds/LC_MESSAGES/kprinter.mo share/locale/nds/LC_MESSAGES/krandr.mo share/locale/nds/LC_MESSAGES/krdb.mo share/locale/nds/LC_MESSAGES/krdc.mo share/locale/nds/LC_MESSAGES/kreadconfig.mo +share/locale/nds/LC_MESSAGES/krec.mo share/locale/nds/LC_MESSAGES/kregexpeditor.mo share/locale/nds/LC_MESSAGES/kres_birthday.mo share/locale/nds/LC_MESSAGES/kres_blogging.mo @@ -335,18 +402,24 @@ share/locale/nds/LC_MESSAGES/kres_kolab.mo share/locale/nds/LC_MESSAGES/kres_remote.mo share/locale/nds/LC_MESSAGES/kres_tvanytime.mo share/locale/nds/LC_MESSAGES/kres_xmlrpc.mo +share/locale/nds/LC_MESSAGES/kreversi.mo share/locale/nds/LC_MESSAGES/krfb.mo share/locale/nds/LC_MESSAGES/kruler.mo share/locale/nds/LC_MESSAGES/krunapplet.mo +share/locale/nds/LC_MESSAGES/ksame.mo share/locale/nds/LC_MESSAGES/ksayit.mo +share/locale/nds/LC_MESSAGES/kscd.mo share/locale/nds/LC_MESSAGES/kscreensaver.mo share/locale/nds/LC_MESSAGES/kshisen.mo share/locale/nds/LC_MESSAGES/ksig.mo share/locale/nds/LC_MESSAGES/ksim.mo +share/locale/nds/LC_MESSAGES/ksirc.mo share/locale/nds/LC_MESSAGES/ksirtet.mo share/locale/nds/LC_MESSAGES/ksmiletris.mo share/locale/nds/LC_MESSAGES/ksmserver.mo share/locale/nds/LC_MESSAGES/ksnake.mo +share/locale/nds/LC_MESSAGES/ksokoban.mo +share/locale/nds/LC_MESSAGES/kspaceduel.mo share/locale/nds/LC_MESSAGES/ksplash.mo share/locale/nds/LC_MESSAGES/ksplashthemes.mo share/locale/nds/LC_MESSAGES/kstars.mo @@ -373,6 +446,7 @@ share/locale/nds/LC_MESSAGES/ktimer.mo share/locale/nds/LC_MESSAGES/ktip.mo share/locale/nds/LC_MESSAGES/ktnef.mo share/locale/nds/LC_MESSAGES/ktron.mo +share/locale/nds/LC_MESSAGES/ktuberling.mo share/locale/nds/LC_MESSAGES/ktux.mo share/locale/nds/LC_MESSAGES/kuick_plugin.mo share/locale/nds/LC_MESSAGES/kuiviewer.mo @@ -386,6 +460,8 @@ share/locale/nds/LC_MESSAGES/kwatchgnupg.mo share/locale/nds/LC_MESSAGES/kweather.mo share/locale/nds/LC_MESSAGES/kwifimanager.mo share/locale/nds/LC_MESSAGES/kwin.mo +share/locale/nds/LC_MESSAGES/kwin4.mo +share/locale/nds/LC_MESSAGES/kwin_art_clients.mo share/locale/nds/LC_MESSAGES/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo share/locale/nds/LC_MESSAGES/kwireless.mo @@ -398,6 +474,7 @@ share/locale/nds/LC_MESSAGES/libdmctl.mo share/locale/nds/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nds/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nds/LC_MESSAGES/libkcal.mo +share/locale/nds/LC_MESSAGES/libkcddb.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo share/locale/nds/LC_MESSAGES/libkholidays.mo @@ -421,6 +498,7 @@ share/locale/nds/LC_MESSAGES/libksync.mo share/locale/nds/LC_MESSAGES/libtaskbar.mo share/locale/nds/LC_MESSAGES/libtaskmanager.mo share/locale/nds/LC_MESSAGES/lockout.mo +share/locale/nds/LC_MESSAGES/lskat.mo share/locale/nds/LC_MESSAGES/lyrics.mo share/locale/nds/LC_MESSAGES/mediaapplet.mo share/locale/nds/LC_MESSAGES/mediacontrol.mo @@ -429,10 +507,12 @@ share/locale/nds/LC_MESSAGES/minitoolsplugin.mo share/locale/nds/LC_MESSAGES/multisynk.mo share/locale/nds/LC_MESSAGES/naughtyapplet.mo share/locale/nds/LC_MESSAGES/nexscope.mo +share/locale/nds/LC_MESSAGES/noatun.mo share/locale/nds/LC_MESSAGES/nsplugin.mo share/locale/nds/LC_MESSAGES/pitchablespeed.mo share/locale/nds/LC_MESSAGES/ppdtranslations.mo share/locale/nds/LC_MESSAGES/privacy.mo +share/locale/nds/LC_MESSAGES/qeditor.mo share/locale/nds/LC_MESSAGES/quicklauncher.mo share/locale/nds/LC_MESSAGES/rellinks.mo share/locale/nds/LC_MESSAGES/searchbarplugin.mo @@ -445,6 +525,7 @@ share/locale/nds/LC_MESSAGES/tippecanoe.mo share/locale/nds/LC_MESSAGES/trashapplet.mo share/locale/nds/LC_MESSAGES/tyler.mo share/locale/nds/LC_MESSAGES/uachangerplugin.mo +share/locale/nds/LC_MESSAGES/umbrello.mo share/locale/nds/LC_MESSAGES/useraccount.mo share/locale/nds/LC_MESSAGES/validatorsplugin.mo share/locale/nds/LC_MESSAGES/wakeup.mo @@ -454,3 +535,6 @@ share/locale/nds/charset share/locale/nds/entry.desktop @dirrm share/locale/nds/LC_MESSAGES @dirrm share/locale/nds +@dirrm share/apps/ktuberling/sounds/nds +@dirrm share/apps/ktuberling/sounds +@dirrm share/apps/ktuberling diff --git a/misc/kde4-l10n-nl/distinfo b/misc/kde4-l10n-nl/distinfo index 1cd0bfe4f9d5..76ff1c5fc412 100644 --- a/misc/kde4-l10n-nl/distinfo +++ b/misc/kde4-l10n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = c97771e5c1398182a99d50926fa58eb3 -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = 50fff561a448be55e24902eb0c9379b8e30f06b4be66e2d0138303b817910f34 -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.4.tar.bz2) = 10206592 +MD5 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 44b404fc4d0b9d12714fdf2357fa3f56 +SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = dfd23221fd9498438d8aa53e9d3899bac53a990ab549caaff506100c29bae17c +SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.5.tar.bz2) = 10207419 diff --git a/misc/kde4-l10n-nn/distinfo b/misc/kde4-l10n-nn/distinfo index 23af7daf022a..4afe999dd24e 100644 --- a/misc/kde4-l10n-nn/distinfo +++ b/misc/kde4-l10n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 97b12a156442c4da083423789f8d1506 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 34a16a173c23365ce442d4674c36f988217b75a6794336f66ef8434a0d490adb -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.4.tar.bz2) = 1862161 +MD5 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 964c91710f2b28cdde7b8cdfef961791 +SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = d5e9ca40cb03bcbeb49f9441bfa79458db373fb55117c135cf27651a82fd3057 +SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.5.tar.bz2) = 1877259 diff --git a/misc/kde4-l10n-pa/distinfo b/misc/kde4-l10n-pa/distinfo index dc0b355e1290..3372b8304ffb 100644 --- a/misc/kde4-l10n-pa/distinfo +++ b/misc/kde4-l10n-pa/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = c513951282dc7918acde5e29220f7103 -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = 57e276ec520a6bd0e380b4f29ae6a46adecd079bfedda3129bff79315c3d2790 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.4.tar.bz2) = 1268724 +MD5 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1881a7e5b1fc6b75ca74dc4c504ad16d +SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = c6819eb7d6dfeef7b8c06f96a77db9af08a68680f915b50fc22ffee5bb4c10e6 +SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.5.tar.bz2) = 1282232 diff --git a/misc/kde4-l10n-ro/distinfo b/misc/kde4-l10n-ro/distinfo index 7907462c6074..1e6e3aa806c3 100644 --- a/misc/kde4-l10n-ro/distinfo +++ b/misc/kde4-l10n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = 40f3c27e4aa33d80fe4d7d97ae761d74 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = dff1c0d4c47290e7ee9c185915171b3f9556bd275cf63706297cca3056dbd329 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.4.tar.bz2) = 3166304 +MD5 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = b31d031cbf2deae408c94a665677dfd2 +SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 457b694d0f33904d17ed09245af0787bcc7b110f6966ef04accdb360dce35986 +SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.5.tar.bz2) = 3154718 diff --git a/misc/kde4-l10n-ro/pkg-plist b/misc/kde4-l10n-ro/pkg-plist index e5e6a2c39bc1..f462dfa019e7 100644 --- a/misc/kde4-l10n-ro/pkg-plist +++ b/misc/kde4-l10n-ro/pkg-plist @@ -531,6 +531,7 @@ share/locale/ro/LC_MESSAGES/ksplashthemes.mo share/locale/ro/LC_MESSAGES/kstars.mo share/locale/ro/LC_MESSAGES/kstart.mo share/locale/ro/LC_MESSAGES/kstartperf.mo +share/locale/ro/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/ro/LC_MESSAGES/kstyle_keramik_config.mo share/locale/ro/LC_MESSAGES/kstyle_plastik_config.mo share/locale/ro/LC_MESSAGES/ksvgplugin.mo diff --git a/misc/kde4-l10n-sk/distinfo b/misc/kde4-l10n-sk/distinfo index cb0f289ad3bf..0e40edf024b4 100644 --- a/misc/kde4-l10n-sk/distinfo +++ b/misc/kde4-l10n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = 2c4d939f395894b14c976235b81ae81e -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = bf2a578dfde235f8a4f46b00668e4729d24d01d9f62ca6edd6c04e87d5c55653 -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.4.tar.bz2) = 5654085 +MD5 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 0a1bccde30cf25cf37974362585b118a +SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5597e59e2b8e4895e473b097048edaab6603ed1fe614f12cb9b373d48de2b533 +SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.5.tar.bz2) = 5729936 diff --git a/misc/kde4-l10n-sl/distinfo b/misc/kde4-l10n-sl/distinfo index 2f66f43feb20..451f996a8bb8 100644 --- a/misc/kde4-l10n-sl/distinfo +++ b/misc/kde4-l10n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 7f253c3e29e1fed72014b2101a9c2ce9 -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 71ae2770c94a2b1b3ed5d20266334757c20f553e4c1d4d653cd27b094e28dd47 -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.4.tar.bz2) = 4462296 +MD5 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 3574861dc47aa09ada8cc6c7bca2307e +SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 9bc04643fea3cd750a05898c882e36c9e9e49892a7e0a11e8531238f47a58c0e +SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.5.tar.bz2) = 4483401 diff --git a/misc/kde4-l10n-sr/distinfo b/misc/kde4-l10n-sr/distinfo index be96771e41a0..d18ee9691cb2 100644 --- a/misc/kde4-l10n-sr/distinfo +++ b/misc/kde4-l10n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 6736f6480dcdffab6bd25883495fb661 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 5289f938d99fb6231d2b726d9f45c2ac147bdf1402df8819d5276b167d05877f -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.4.tar.bz2) = 2629013 +MD5 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = e308f4f37c5509bd5583f7fcd90bcb32 +SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 9d7cac3b05f17385941bbbc3d05ca792717bf50a92b9d32e318d1f2f11ed78c9 +SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.5.tar.bz2) = 2641104 diff --git a/misc/kde4-l10n-sv/distinfo b/misc/kde4-l10n-sv/distinfo index dee2774642e5..dd6be29006bd 100644 --- a/misc/kde4-l10n-sv/distinfo +++ b/misc/kde4-l10n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 5097306cb3d02d45366471cfa4dbe7b2 -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 2650694bab48661603db6e12ae4511f91ca06dc92ffb67e86b3fa2e36a4000be -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.4.tar.bz2) = 28425731 +MD5 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0a614fc596f082a1a11d7ee91b1bae2a +SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 0ce57064f077ce362e7b956904a662a0b303c8c7cc2c0131082e1fccc65c0d1e +SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.5.tar.bz2) = 28420728 diff --git a/misc/kde4-l10n-sv/pkg-plist b/misc/kde4-l10n-sv/pkg-plist index ed3c1a3c11d5..0ef52760315c 100644 --- a/misc/kde4-l10n-sv/pkg-plist +++ b/misc/kde4-l10n-sv/pkg-plist @@ -1429,6 +1429,7 @@ share/doc/HTML/sv/kooka/shortcut1.png share/doc/HTML/sv/kooka/toolbar.png share/doc/HTML/sv/kooka/toolbar1.png share/doc/HTML/sv/kooka/toolbar2.png +share/doc/HTML/sv/kopete/chatstyle.docbook share/doc/HTML/sv/kopete/common share/doc/HTML/sv/kopete/index.cache.bz2 share/doc/HTML/sv/kopete/index.docbook diff --git a/misc/kde4-l10n-ta/distinfo b/misc/kde4-l10n-ta/distinfo index 9a26f11b3a09..af7159301293 100644 --- a/misc/kde4-l10n-ta/distinfo +++ b/misc/kde4-l10n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = e5e11f4e3b1b3e4a40079ad963efbfe3 -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = fe2fe435b99b825272eb7fcecaceff7ce08831485c1158e25d593bf216399c2f -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.4.tar.bz2) = 2115800 +MD5 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 4ab3c05628fc635609218d17cce6d138 +SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 3a60470355f948bf258327a1369962cf1a950fd45dcce17e3cd365546b689cfb +SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.5.tar.bz2) = 2120321 diff --git a/misc/kde4-l10n-tg/distinfo b/misc/kde4-l10n-tg/distinfo index dc7398a1d6eb..825e82222f2d 100644 --- a/misc/kde4-l10n-tg/distinfo +++ b/misc/kde4-l10n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 108c07984f635cbee648df86d620afdb -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 37ced00d888f39e8714093e713d3d766db2a207d3ca9890ba9b292842f93c0c5 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.4.tar.bz2) = 2120517 +MD5 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 135a419bb0d3429dde4bc698d095bf86 +SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 36210149528026f8cf4c0414a0006ff4d7c81f983a78242d1aa682246fb86f56 +SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.5.tar.bz2) = 2137881 diff --git a/misc/kde4-l10n-tr/distinfo b/misc/kde4-l10n-tr/distinfo index d5f37c24edae..9eb05293d2be 100644 --- a/misc/kde4-l10n-tr/distinfo +++ b/misc/kde4-l10n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 01453f054f5595660c8bc0aa5d589520 -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 89aa25b9c87eeba6065f3b2f268153e6eab02b42ed3f5ea0788839e341e94c84 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.4.tar.bz2) = 2127635 +MD5 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 001d5909b3fd8121b1f4f7970d88215b +SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 901fd81fbfd81db73f7f14b07d2db34d54e2bbb04850a4f5bc3b0ca6eb9920d8 +SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.5.tar.bz2) = 2133194 diff --git a/misc/kdeaddons3/Makefile.split b/misc/kdeaddons3/Makefile.split index 9d5bbd7aa28c..4df36d447955 100644 --- a/misc/kdeaddons3/Makefile.split +++ b/misc/kdeaddons3/Makefile.split @@ -54,7 +54,7 @@ KSIG_PKGNAME= ${KSIG_PORTNAME}-${KSIG_PORTVERSION} NOATUNPLUG_PORTNAME= ${KDE_SPLIT_DIST}-noatun-plugins NOATUNPLUG_PORTVERSION= ${KDE_VERSION} -NOATUNPLUG_PORTREVISION= 1 +NOATUNPLUG_PORTREVISION= 0 NOATUNPLUG_PORTEPOCH= 0 NOATUNPLUG_PKGNAME= ${NOATUNPLUG_PORTNAME}-${NOATUNPLUG_PORTVERSION} diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index 11b2c4da6035..f8e4a14869ed 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.4.tar.bz2) = 81dfdea2ed6eaaa440ee868a69b8fc7e -SHA256 (KDE/kdeedu-3.5.4.tar.bz2) = f49b55dedec9d330600c6545cd1585416b3b714158c04412f0b95c825995e506 -SIZE (KDE/kdeedu-3.5.4.tar.bz2) = 29872123 +MD5 (KDE/kdeedu-3.5.5.tar.bz2) = 1659863d74a510bee412d0cb404b4542 +SHA256 (KDE/kdeedu-3.5.5.tar.bz2) = f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891 +SIZE (KDE/kdeedu-3.5.5.tar.bz2) = 30016358 diff --git a/misc/kdeedu3/pkg-plist b/misc/kdeedu3/pkg-plist index 27316fc4835e..37897c4be01a 100644 --- a/misc/kdeedu3/pkg-plist +++ b/misc/kdeedu3/pkg-plist @@ -586,6 +586,7 @@ share/apps/kgeography/flags/mecklenburg_western_pomerania.png share/apps/kgeography/flags/mexico.png share/apps/kgeography/flags/moldova.png share/apps/kgeography/flags/mongolia.png +share/apps/kgeography/flags/montenegro.png share/apps/kgeography/flags/morocco.png share/apps/kgeography/flags/mozambique.png share/apps/kgeography/flags/myanmar.png @@ -628,7 +629,7 @@ share/apps/kgeography/flags/saxony.png share/apps/kgeography/flags/saxony_anhalt.png share/apps/kgeography/flags/schleswig_holstein.png share/apps/kgeography/flags/senegal.png -share/apps/kgeography/flags/serbiamontenegro_3x2.png +share/apps/kgeography/flags/serbia.png share/apps/kgeography/flags/sierra_leone.png share/apps/kgeography/flags/singapore.png share/apps/kgeography/flags/skorea.png @@ -1707,6 +1708,7 @@ share/apps/ktouch/german.neo.ktouch.xml share/apps/ktouch/german.number.ktouch.xml share/apps/ktouch/german2.ktouch.xml share/apps/ktouch/german3.ktouch.xml +share/apps/ktouch/hu.keyboard share/apps/ktouch/hungarian.ktouch.xml share/apps/ktouch/hungarian_expert.ktouch.xml share/apps/ktouch/italian.ktouch.xml @@ -1722,6 +1724,7 @@ share/apps/ktouch/russian_long.ktouch.xml share/apps/ktouch/slovenian.ktouch.xml share/apps/ktouch/spanish.ktouch.xml share/apps/ktouch/splash.png +share/apps/ktouch/typewriter.wav share/apps/ktouch/up.wav share/apps/kturtle/data/logokeywords.en_US.xml share/apps/kturtle/examples/en_US/ad.logo diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo index 11b2c4da6035..f8e4a14869ed 100644 --- a/misc/kdeedu4/distinfo +++ b/misc/kdeedu4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.4.tar.bz2) = 81dfdea2ed6eaaa440ee868a69b8fc7e -SHA256 (KDE/kdeedu-3.5.4.tar.bz2) = f49b55dedec9d330600c6545cd1585416b3b714158c04412f0b95c825995e506 -SIZE (KDE/kdeedu-3.5.4.tar.bz2) = 29872123 +MD5 (KDE/kdeedu-3.5.5.tar.bz2) = 1659863d74a510bee412d0cb404b4542 +SHA256 (KDE/kdeedu-3.5.5.tar.bz2) = f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891 +SIZE (KDE/kdeedu-3.5.5.tar.bz2) = 30016358 diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist index 27316fc4835e..37897c4be01a 100644 --- a/misc/kdeedu4/pkg-plist +++ b/misc/kdeedu4/pkg-plist @@ -586,6 +586,7 @@ share/apps/kgeography/flags/mecklenburg_western_pomerania.png share/apps/kgeography/flags/mexico.png share/apps/kgeography/flags/moldova.png share/apps/kgeography/flags/mongolia.png +share/apps/kgeography/flags/montenegro.png share/apps/kgeography/flags/morocco.png share/apps/kgeography/flags/mozambique.png share/apps/kgeography/flags/myanmar.png @@ -628,7 +629,7 @@ share/apps/kgeography/flags/saxony.png share/apps/kgeography/flags/saxony_anhalt.png share/apps/kgeography/flags/schleswig_holstein.png share/apps/kgeography/flags/senegal.png -share/apps/kgeography/flags/serbiamontenegro_3x2.png +share/apps/kgeography/flags/serbia.png share/apps/kgeography/flags/sierra_leone.png share/apps/kgeography/flags/singapore.png share/apps/kgeography/flags/skorea.png @@ -1707,6 +1708,7 @@ share/apps/ktouch/german.neo.ktouch.xml share/apps/ktouch/german.number.ktouch.xml share/apps/ktouch/german2.ktouch.xml share/apps/ktouch/german3.ktouch.xml +share/apps/ktouch/hu.keyboard share/apps/ktouch/hungarian.ktouch.xml share/apps/ktouch/hungarian_expert.ktouch.xml share/apps/ktouch/italian.ktouch.xml @@ -1722,6 +1724,7 @@ share/apps/ktouch/russian_long.ktouch.xml share/apps/ktouch/slovenian.ktouch.xml share/apps/ktouch/spanish.ktouch.xml share/apps/ktouch/splash.png +share/apps/ktouch/typewriter.wav share/apps/ktouch/up.wav share/apps/kturtle/data/logokeywords.en_US.xml share/apps/kturtle/examples/en_US/ad.logo diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/misc/kfile-plugins/distinfo b/misc/kfile-plugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/kfile-plugins/distinfo +++ b/misc/kfile-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/kfile-plugins/pkg-plist b/misc/kfile-plugins/pkg-plist index cf8284dd8f9f..5f03e4a1fe24 100644 --- a/misc/kfile-plugins/pkg-plist +++ b/misc/kfile-plugins/pkg-plist @@ -20,7 +20,7 @@ lib/kde3/kfile_mhtml.so lib/kde3/kfile_txt.a lib/kde3/kfile_txt.la lib/kde3/kfile_txt.so -share/applications/kdeaddons-kfile-plugins-3.5.4 +share/applications/kdeaddons-kfile-plugins-3.5.5 share/applnk/.hidden/lnkforward.desktop share/mimelnk/application/x-win-lnk.desktop share/services/kfile_cert.desktop diff --git a/misc/kicker-applets/distinfo b/misc/kicker-applets/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/kicker-applets/distinfo +++ b/misc/kicker-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/kicker-applets/pkg-plist b/misc/kicker-applets/pkg-plist index 10d4637ce477..870f03252e90 100644 --- a/misc/kicker-applets/pkg-plist +++ b/misc/kicker-applets/pkg-plist @@ -13,7 +13,7 @@ lib/kde3/math_panelapplet.so lib/kde3/mediacontrol_panelapplet.a lib/kde3/mediacontrol_panelapplet.la lib/kde3/mediacontrol_panelapplet.so -share/applications/kdeaddons-kicker-applets-3.5.4 +share/applications/kdeaddons-kicker-applets-3.5.5 share/apps/kicker/applets/kbinaryclock.desktop share/apps/kicker/applets/kolourpicker.desktop share/apps/kicker/applets/ktimemon.desktop diff --git a/misc/knewsticker-scripts/distinfo b/misc/knewsticker-scripts/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/knewsticker-scripts/distinfo +++ b/misc/knewsticker-scripts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/knewsticker-scripts/pkg-plist b/misc/knewsticker-scripts/pkg-plist index 9ab6d8408026..8f293e04dcc7 100644 --- a/misc/knewsticker-scripts/pkg-plist +++ b/misc/knewsticker-scripts/pkg-plist @@ -1,4 +1,4 @@ -share/applications/kdeaddons-knewsticker-scripts-3.5.4 +share/applications/kdeaddons-knewsticker-scripts-3.5.5 share/apps/knewsticker/scripts/Generic.Newsticker.Error share/apps/knewsticker/scripts/Readme.ErrorHandling share/apps/knewsticker/scripts/Readme.newsrss diff --git a/misc/koffice-i18n-ca/Makefile b/misc/koffice-i18n-ca/Makefile index 99d12bd89bdb..5b2c53c82e80 100644 --- a/misc/koffice-i18n-ca/Makefile +++ b/misc/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ca/distinfo b/misc/koffice-i18n-ca/distinfo index 5138bc7fcafb..64dc722ff740 100644 --- a/misc/koffice-i18n-ca/distinfo +++ b/misc/koffice-i18n-ca/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 8e3ff02096b6574cf337430924d5af98 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 069f10ff118b9fdcb21ce37edd7cc6cf54184c2961868cdac5c1d606923a1658 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.2.tar.bz2) = 524044 +MD5 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 2af9ee48900b76f13c7b205f9f44e454 +SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = bfcd51cae7df0a9985e007a0f7a275b2d0e95a2c0d8f202888c90a8b49ed6346 +SIZE (KDE/kde-i18n/koffice-l10n-ca-1.6.1.tar.bz2) = 1410868 diff --git a/misc/koffice-i18n-ca/pkg-plist b/misc/koffice-i18n-ca/pkg-plist index 232a56980982..f9699d3b9475 100644 --- a/misc/koffice-i18n-ca/pkg-plist +++ b/misc/koffice-i18n-ca/pkg-plist @@ -15,16 +15,119 @@ share/doc/HTML/ca/kexi/index.cache.bz2 share/doc/HTML/ca/kexi/index.docbook share/doc/HTML/ca/kexi/intro.docbook share/doc/HTML/ca/kexi/menus.docbook +share/doc/HTML/ca/kformula/common +share/doc/HTML/ca/kformula/index.cache.bz2 +share/doc/HTML/ca/kformula/index.docbook +share/doc/HTML/ca/kivio/common +share/doc/HTML/ca/kivio/credits.docbook +share/doc/HTML/ca/kivio/index.cache.bz2 +share/doc/HTML/ca/kivio/index.docbook +share/doc/HTML/ca/kivio/introduction.docbook +share/doc/HTML/ca/kivio/usage.docbook +share/doc/HTML/ca/kivio/working.docbook share/doc/HTML/ca/koffice/common share/doc/HTML/ca/koffice/index.cache.bz2 share/doc/HTML/ca/koffice/index.docbook share/doc/HTML/ca/koshell/common share/doc/HTML/ca/koshell/index.cache.bz2 share/doc/HTML/ca/koshell/index.docbook +share/doc/HTML/ca/kplato/commands.docbook +share/doc/HTML/ca/kplato/common +share/doc/HTML/ca/kplato/definitions.docbook +share/doc/HTML/ca/kplato/index.cache.bz2 +share/doc/HTML/ca/kplato/index.docbook +share/doc/HTML/ca/kplato/mainwindow.docbook +share/doc/HTML/ca/kplato/options.docbook +share/doc/HTML/ca/kplato/wbs.docbook +share/doc/HTML/ca/kpresenter/faq.docbook +share/doc/HTML/ca/kpresenter/great-presentations.docbook +share/doc/HTML/ca/kpresenter/guides.docbook +share/doc/HTML/ca/kpresenter/menus.docbook +share/doc/HTML/ca/kpresenter/options.docbook +share/doc/HTML/ca/kpresenter/screen.docbook +share/doc/HTML/ca/kpresenter/tutorial.docbook +share/doc/HTML/ca/kspread/a11y.docbook +share/doc/HTML/ca/kspread/advanced.docbook +share/doc/HTML/ca/kspread/basics.docbook +share/doc/HTML/ca/kspread/cellformat0.png +share/doc/HTML/ca/kspread/cellformat1.png +share/doc/HTML/ca/kspread/cellformat2.png +share/doc/HTML/ca/kspread/cellformat3.png +share/doc/HTML/ca/kspread/cellformat4.png +share/doc/HTML/ca/kspread/cellformat5.png +share/doc/HTML/ca/kspread/cellformat6.png +share/doc/HTML/ca/kspread/cellformat7.png +share/doc/HTML/ca/kspread/cellprotection1.png +share/doc/HTML/ca/kspread/cellprotection2.png +share/doc/HTML/ca/kspread/commands.docbook +share/doc/HTML/ca/kspread/common +share/doc/HTML/ca/kspread/config.docbook +share/doc/HTML/ca/kspread/configdialog.docbook +share/doc/HTML/ca/kspread/configure1.png +share/doc/HTML/ca/kspread/configure2.png +share/doc/HTML/ca/kspread/configure3.png +share/doc/HTML/ca/kspread/configure4.png +share/doc/HTML/ca/kspread/configure5.png +share/doc/HTML/ca/kspread/configure6.png +share/doc/HTML/ca/kspread/faq.docbook +share/doc/HTML/ca/kspread/format.docbook +share/doc/HTML/ca/kspread/importexport.docbook +share/doc/HTML/ca/kspread/index.cache.bz2 +share/doc/HTML/ca/kspread/index.docbook +share/doc/HTML/ca/kspread/mousenav.png +share/doc/HTML/ca/kspread/newdocument.png +share/doc/HTML/ca/kspread/sheetproperties.png +share/doc/HTML/ca/kspread/shortcut1.png +share/doc/HTML/ca/kspread/shortcut2.png +share/doc/HTML/ca/kspread/shortcut3.png +share/doc/HTML/ca/kspread/tts.png +share/doc/HTML/ca/kword/a11y.docbook +share/doc/HTML/ca/kword/basics.docbook +share/doc/HTML/ca/kword/bookmarks.docbook +share/doc/HTML/ca/kword/chapnumb.docbook +share/doc/HTML/ca/kword/columns.docbook +share/doc/HTML/ca/kword/common +share/doc/HTML/ca/kword/doccomments.docbook +share/doc/HTML/ca/kword/doclinks.docbook +share/doc/HTML/ca/kword/docstruct.docbook +share/doc/HTML/ca/kword/docvariables.docbook +share/doc/HTML/ca/kword/editing.docbook +share/doc/HTML/ca/kword/expressions.docbook +share/doc/HTML/ca/kword/footendnotes.docbook +share/doc/HTML/ca/kword/formatchar.docbook +share/doc/HTML/ca/kword/formatframes.docbook +share/doc/HTML/ca/kword/formatpara.docbook +share/doc/HTML/ca/kword/formulas.docbook +share/doc/HTML/ca/kword/frames.docbook +share/doc/HTML/ca/kword/fundimentals.docbook +share/doc/HTML/ca/kword/graphics.docbook +share/doc/HTML/ca/kword/headerfooter.docbook +share/doc/HTML/ca/kword/index.cache.bz2 +share/doc/HTML/ca/kword/index.docbook +share/doc/HTML/ca/kword/insertfile.docbook +share/doc/HTML/ca/kword/kparts.docbook +share/doc/HTML/ca/kword/lists.docbook +share/doc/HTML/ca/kword/mailmerge.docbook +share/doc/HTML/ca/kword/mbtb.docbook +share/doc/HTML/ca/kword/migrating.docbook +share/doc/HTML/ca/kword/opt.docbook +share/doc/HTML/ca/kword/pageformat.docbook +share/doc/HTML/ca/kword/storeprint.docbook +share/doc/HTML/ca/kword/styles.docbook +share/doc/HTML/ca/kword/table.docbook +share/doc/HTML/ca/kword/tabstops.docbook +share/doc/HTML/ca/kword/techinfo.docbook +share/doc/HTML/ca/kword/templatecreation.docbook +share/doc/HTML/ca/kword/toc.docbook +share/doc/HTML/ca/kword/tutorial.docbook +share/doc/HTML/ca/thesaurus/common +share/doc/HTML/ca/thesaurus/index.cache.bz2 +share/doc/HTML/ca/thesaurus/index.docbook share/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo share/locale/ca/LC_MESSAGES/kchart.mo +share/locale/ca/LC_MESSAGES/kdgantt.mo share/locale/ca/LC_MESSAGES/kexi.mo share/locale/ca/LC_MESSAGES/kfile_abiword.mo share/locale/ca/LC_MESSAGES/kfile_gnumeric.mo @@ -51,8 +154,15 @@ share/locale/ca/LC_MESSAGES/kthesaurus.mo share/locale/ca/LC_MESSAGES/kugar.mo share/locale/ca/LC_MESSAGES/kword.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo +@dirrm share/doc/HTML/ca/thesaurus +@dirrm share/doc/HTML/ca/kword +@dirrm share/doc/HTML/ca/kspread +@dirrm share/doc/HTML/ca/kpresenter +@dirrm share/doc/HTML/ca/kplato @dirrm share/doc/HTML/ca/koshell @dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kivio +@dirrm share/doc/HTML/ca/kformula @dirrm share/doc/HTML/ca/kexi @dirrm share/doc/HTML/ca/kchart @dirrm share/doc/HTML/ca/karbon diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile index 11a8257a6539..2ab74b0b019d 100644 --- a/misc/koffice-i18n-cs/Makefile +++ b/misc/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-cs/distinfo b/misc/koffice-i18n-cs/distinfo index 0eff1f2b120c..c8b2753d9841 100644 --- a/misc/koffice-i18n-cs/distinfo +++ b/misc/koffice-i18n-cs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = b8f83541b98ff0cb8361f797f665971c -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = f63efd3535aca0db808d14ce9a3b2a55575b4d65f8078ad0b0851ad79b70af7f -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.5.2.tar.bz2) = 343018 +MD5 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = a90d191f1d84bd5c8090ca6e004253c4 +SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 063a1db2ad60fadda8f1ab64da96e2440ae34c3b9d406ea9a45a78d27bb257c3 +SIZE (KDE/kde-i18n/koffice-l10n-cs-1.6.1.tar.bz2) = 356835 diff --git a/misc/koffice-i18n-cs/pkg-plist b/misc/koffice-i18n-cs/pkg-plist index f1283cce6bb0..64faa279489d 100644 --- a/misc/koffice-i18n-cs/pkg-plist +++ b/misc/koffice-i18n-cs/pkg-plist @@ -3,6 +3,7 @@ share/locale/cs/LC_MESSAGES/desktop_koffice.mo share/locale/cs/LC_MESSAGES/example.mo share/locale/cs/LC_MESSAGES/karbon.mo share/locale/cs/LC_MESSAGES/kchart.mo +share/locale/cs/LC_MESSAGES/kdgantt.mo share/locale/cs/LC_MESSAGES/kexi.mo share/locale/cs/LC_MESSAGES/kfile_koffice.mo share/locale/cs/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile index 47c61c8df6cd..248790d56afc 100644 --- a/misc/koffice-i18n-da/Makefile +++ b/misc/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-da/distinfo b/misc/koffice-i18n-da/distinfo index ea0cfc7cacff..fb79a71beb1c 100644 --- a/misc/koffice-i18n-da/distinfo +++ b/misc/koffice-i18n-da/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 58c13527c47dee445572d26141fd3269 -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 407a8ae7d39ff0aec51f622285447dd200bd87a1f80257b8548c1c16c317fd21 -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.2.tar.bz2) = 1013226 +MD5 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 34ac13ce5bf8452f5f8b44686d03781a +SHA256 (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 456b9fa8dd88e20d22ccecf0fb6390738642aea1cbdacd5ae395e40981dfdfb8 +SIZE (KDE/kde-i18n/koffice-l10n-da-1.6.1.tar.bz2) = 1112047 diff --git a/misc/koffice-i18n-da/pkg-plist b/misc/koffice-i18n-da/pkg-plist index 03db1c115f7c..834334517175 100644 --- a/misc/koffice-i18n-da/pkg-plist +++ b/misc/koffice-i18n-da/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/da/kchart/index.docbook share/doc/HTML/da/kexi/basics.docbook share/doc/HTML/da/kexi/building.docbook share/doc/HTML/da/kexi/common +share/doc/HTML/da/kexi/comparing.docbook share/doc/HTML/da/kexi/configuration.docbook share/doc/HTML/da/kexi/credits.docbook share/doc/HTML/da/kexi/database.docbook +share/doc/HTML/da/kexi/designingforms.docbook +share/doc/HTML/da/kexi/enteringdataintotables.docbook +share/doc/HTML/da/kexi/enteringdatausingforms.docbook share/doc/HTML/da/kexi/index.cache.bz2 share/doc/HTML/da/kexi/index.docbook share/doc/HTML/da/kexi/intro.docbook share/doc/HTML/da/kexi/menus.docbook +share/doc/HTML/da/kexi/querydesigning.docbook share/doc/HTML/da/kformula/common share/doc/HTML/da/kformula/index.cache.bz2 share/doc/HTML/da/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/da/krita/commands-toolbars.docbook share/doc/HTML/da/krita/commands.docbook share/doc/HTML/da/krita/common share/doc/HTML/da/krita/credits.docbook +share/doc/HTML/da/krita/developers-plugins.docbook +share/doc/HTML/da/krita/developers-scripting.docbook share/doc/HTML/da/krita/developers.docbook share/doc/HTML/da/krita/faq.docbook share/doc/HTML/da/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/da/krita/settings.docbook share/doc/HTML/da/krita/tutorial-quick-starts.docbook share/doc/HTML/da/krita/tutorial-select-layer.docbook share/doc/HTML/da/krita/tutorial-starting.docbook +share/doc/HTML/da/krita/tutorial-tablet.docbook share/doc/HTML/da/krita/tutorial.docbook share/doc/HTML/da/krita/using-colorspaces.docbook share/doc/HTML/da/krita/using-filters.docbook +share/doc/HTML/da/krita/using-images.docbook share/doc/HTML/da/krita/using-layers.docbook share/doc/HTML/da/krita/using-selections.docbook +share/doc/HTML/da/krita/using-views.docbook share/doc/HTML/da/kspread/a11y.docbook share/doc/HTML/da/kspread/advanced.docbook share/doc/HTML/da/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/da/LC_MESSAGES/desktop_koffice.mo share/locale/da/LC_MESSAGES/example.mo share/locale/da/LC_MESSAGES/karbon.mo share/locale/da/LC_MESSAGES/kchart.mo +share/locale/da/LC_MESSAGES/kdgantt.mo share/locale/da/LC_MESSAGES/kexi.mo share/locale/da/LC_MESSAGES/kfile_abiword.mo share/locale/da/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile index 00dab794c8cf..19bbb0d828b6 100644 --- a/misc/koffice-i18n-el/Makefile +++ b/misc/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-el/distinfo b/misc/koffice-i18n-el/distinfo index d99d2f341307..0a977fd50dd0 100644 --- a/misc/koffice-i18n-el/distinfo +++ b/misc/koffice-i18n-el/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 4392e652560adb8c83fe2aac9479fcb8 -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 94ea30d6c2c1968d216a6bb81c368f2ec68aab473d68450ea6c69818f737ecc0 -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.2.tar.bz2) = 367648 +MD5 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = c2028907c0675534694b5bad4c85ac0f +SHA256 (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 0fbd0569d485b233a7366d3013bd4b57ab6295e012c4bc2fd73ed961920a7a9d +SIZE (KDE/kde-i18n/koffice-l10n-el-1.6.1.tar.bz2) = 385670 diff --git a/misc/koffice-i18n-el/pkg-plist b/misc/koffice-i18n-el/pkg-plist index 423a32aa7c81..46c436194e10 100644 --- a/misc/koffice-i18n-el/pkg-plist +++ b/misc/koffice-i18n-el/pkg-plist @@ -2,6 +2,7 @@ share/locale/el/LC_MESSAGES/desktop_koffice.mo share/locale/el/LC_MESSAGES/example.mo share/locale/el/LC_MESSAGES/karbon.mo share/locale/el/LC_MESSAGES/kchart.mo +share/locale/el/LC_MESSAGES/kdgantt.mo share/locale/el/LC_MESSAGES/kexi.mo share/locale/el/LC_MESSAGES/kfile_abiword.mo share/locale/el/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile index 2aa1fd93bb12..cb490bb940b4 100644 --- a/misc/koffice-i18n-en_GB/Makefile +++ b/misc/koffice-i18n-en_GB/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-en_GB/distinfo b/misc/koffice-i18n-en_GB/distinfo index 28cf71ee2884..97a08e6f157e 100644 --- a/misc/koffice-i18n-en_GB/distinfo +++ b/misc/koffice-i18n-en_GB/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 11b499953ae1616c589e793abc4e474b -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 2e0630762213c90b14759e0c2a61633ee25554f83ea9617836775860a62f7880 -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.2.tar.bz2) = 341916 +MD5 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 0c8edcc2fb6570ff7629e610580cac2f +SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = bd003552c53b0b7d949cdb967b9053993e6810061c4922034e520c7e5afbb111 +SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.6.1.tar.bz2) = 357746 diff --git a/misc/koffice-i18n-en_GB/pkg-plist b/misc/koffice-i18n-en_GB/pkg-plist index adbbd5d4d225..0e783dd7b5e1 100644 --- a/misc/koffice-i18n-en_GB/pkg-plist +++ b/misc/koffice-i18n-en_GB/pkg-plist @@ -15,6 +15,7 @@ share/locale/en_GB/LC_MESSAGES/desktop_koffice.mo share/locale/en_GB/LC_MESSAGES/example.mo share/locale/en_GB/LC_MESSAGES/karbon.mo share/locale/en_GB/LC_MESSAGES/kchart.mo +share/locale/en_GB/LC_MESSAGES/kdgantt.mo share/locale/en_GB/LC_MESSAGES/kexi.mo share/locale/en_GB/LC_MESSAGES/kfile_koffice.mo share/locale/en_GB/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile index fe268dca1e63..1683f36421bd 100644 --- a/misc/koffice-i18n-es/Makefile +++ b/misc/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-es/distinfo b/misc/koffice-i18n-es/distinfo index 5aedacd37629..96a86103ba37 100644 --- a/misc/koffice-i18n-es/distinfo +++ b/misc/koffice-i18n-es/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = fb0ddfb9d7e6bbcb8fe9ebfc8d04b2cc -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 7bfea102b91490128779465db13e7a6d9a2a1908e109ec98076da469129a1308 -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.2.tar.bz2) = 17190560 +MD5 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = e3095320b087fdbaf9dea4ca7384c4e7 +SHA256 (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 94dc8b87aea0f8e1d34ecc2b0762db9fbf0a6914c561c27d8eb6903337521c0d +SIZE (KDE/kde-i18n/koffice-l10n-es-1.6.1.tar.bz2) = 17259132 diff --git a/misc/koffice-i18n-es/pkg-plist b/misc/koffice-i18n-es/pkg-plist index a02bdd2b7e9d..de46c53cba38 100644 --- a/misc/koffice-i18n-es/pkg-plist +++ b/misc/koffice-i18n-es/pkg-plist @@ -1,5 +1,4 @@ share/apps/koffice/autocorrect/es.xml -share/doc/HTML/es/api/kfontdialog.png share/doc/HTML/es/karbon/common share/doc/HTML/es/karbon/index.cache.bz2 share/doc/HTML/es/karbon/index.docbook @@ -44,10 +43,12 @@ share/doc/HTML/es/kchart/shortcut.png share/doc/HTML/es/kchart/toolbars.png share/doc/HTML/es/kexi/basics.docbook share/doc/HTML/es/kexi/building.docbook +share/doc/HTML/es/kexi/comparing.docbook share/doc/HTML/es/kexi/configuration.docbook share/doc/HTML/es/kexi/contact-example.png share/doc/HTML/es/kexi/credits.docbook share/doc/HTML/es/kexi/database.docbook +share/doc/HTML/es/kexi/enteringdataintotables.docbook share/doc/HTML/es/kexi/intro.docbook share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png @@ -102,6 +103,7 @@ share/doc/HTML/es/koshell/main-view.png share/doc/HTML/es/koshell/new-dialog.png share/doc/HTML/es/koshell/side-pane.png share/doc/HTML/es/kplato/commands.docbook +share/doc/HTML/es/kplato/common share/doc/HTML/es/kplato/configure-wbs.png share/doc/HTML/es/kplato/configure2.1.png share/doc/HTML/es/kplato/configure2.png @@ -114,6 +116,8 @@ share/doc/HTML/es/kplato/edit-calendar2.png share/doc/HTML/es/kplato/edit-resources.png share/doc/HTML/es/kplato/edit-resources1.png share/doc/HTML/es/kplato/edit-worktime.png +share/doc/HTML/es/kplato/index.cache.bz2 +share/doc/HTML/es/kplato/index.docbook share/doc/HTML/es/kplato/mainwindow.docbook share/doc/HTML/es/kplato/mainwindow1.png share/doc/HTML/es/kplato/options.docbook @@ -236,6 +240,7 @@ share/doc/HTML/es/krita/commands-menus.docbook share/doc/HTML/es/krita/commands-palettes.docbook share/doc/HTML/es/krita/commands-toolbars.docbook share/doc/HTML/es/krita/commands.docbook +share/doc/HTML/es/krita/common share/doc/HTML/es/krita/createdocument.png share/doc/HTML/es/krita/credits.docbook share/doc/HTML/es/krita/crocusses-bumpmap.png @@ -284,6 +289,8 @@ share/doc/HTML/es/krita/dialogs-shearimage.png share/doc/HTML/es/krita/dialogs-shearlayer.png share/doc/HTML/es/krita/faq.docbook share/doc/HTML/es/krita/filters-customconvolution.png +share/doc/HTML/es/krita/index.cache.bz2 +share/doc/HTML/es/krita/index.docbook share/doc/HTML/es/krita/installation.docbook share/doc/HTML/es/krita/introduction.docbook share/doc/HTML/es/krita/mainscreen.png @@ -720,6 +727,7 @@ share/locale/es/LC_MESSAGES/desktop_koffice.mo share/locale/es/LC_MESSAGES/example.mo share/locale/es/LC_MESSAGES/karbon.mo share/locale/es/LC_MESSAGES/kchart.mo +share/locale/es/LC_MESSAGES/kdgantt.mo share/locale/es/LC_MESSAGES/kexi.mo share/locale/es/LC_MESSAGES/kfile_abiword.mo share/locale/es/LC_MESSAGES/kfile_gnumeric.mo @@ -760,6 +768,5 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kexi @dirrm share/doc/HTML/es/kchart @dirrm share/doc/HTML/es/karbon -@dirrm share/doc/HTML/es/api @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile index c0ba82e8d416..371637a8a638 100644 --- a/misc/koffice-i18n-et/Makefile +++ b/misc/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-et/distinfo b/misc/koffice-i18n-et/distinfo index 74cb277ae6f8..cab102edda59 100644 --- a/misc/koffice-i18n-et/distinfo +++ b/misc/koffice-i18n-et/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = fed89528182c0dc7baa2c50fee165270 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 8e78fe330053cc72f843475ca4771a6bdef5bc7d4e22cf15172584beabf30fad -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.2.tar.bz2) = 1139684 +MD5 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = d7e32d741c284880ff01530d956cd524 +SHA256 (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 3af8d5733581df95d5280abfe927f922e364764c64ba5c6ca04be78c310ca395 +SIZE (KDE/kde-i18n/koffice-l10n-et-1.6.1.tar.bz2) = 1218454 diff --git a/misc/koffice-i18n-et/pkg-plist b/misc/koffice-i18n-et/pkg-plist index a36be5654b99..42a8b9044ec5 100644 --- a/misc/koffice-i18n-et/pkg-plist +++ b/misc/koffice-i18n-et/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/et/kchart/index.docbook share/doc/HTML/et/kexi/basics.docbook share/doc/HTML/et/kexi/building.docbook share/doc/HTML/et/kexi/common +share/doc/HTML/et/kexi/comparing.docbook share/doc/HTML/et/kexi/configuration.docbook share/doc/HTML/et/kexi/credits.docbook share/doc/HTML/et/kexi/database.docbook +share/doc/HTML/et/kexi/designingforms.docbook +share/doc/HTML/et/kexi/enteringdataintotables.docbook +share/doc/HTML/et/kexi/enteringdatausingforms.docbook share/doc/HTML/et/kexi/index.cache.bz2 share/doc/HTML/et/kexi/index.docbook share/doc/HTML/et/kexi/intro.docbook share/doc/HTML/et/kexi/menus.docbook +share/doc/HTML/et/kexi/querydesigning.docbook share/doc/HTML/et/kformula/common share/doc/HTML/et/kformula/index.cache.bz2 share/doc/HTML/et/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/et/krita/commands-toolbars.docbook share/doc/HTML/et/krita/commands.docbook share/doc/HTML/et/krita/common share/doc/HTML/et/krita/credits.docbook +share/doc/HTML/et/krita/developers-plugins.docbook +share/doc/HTML/et/krita/developers-scripting.docbook share/doc/HTML/et/krita/developers.docbook share/doc/HTML/et/krita/faq.docbook share/doc/HTML/et/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/et/krita/settings.docbook share/doc/HTML/et/krita/tutorial-quick-starts.docbook share/doc/HTML/et/krita/tutorial-select-layer.docbook share/doc/HTML/et/krita/tutorial-starting.docbook +share/doc/HTML/et/krita/tutorial-tablet.docbook share/doc/HTML/et/krita/tutorial.docbook share/doc/HTML/et/krita/using-colorspaces.docbook share/doc/HTML/et/krita/using-filters.docbook +share/doc/HTML/et/krita/using-images.docbook share/doc/HTML/et/krita/using-layers.docbook share/doc/HTML/et/krita/using-selections.docbook +share/doc/HTML/et/krita/using-views.docbook share/doc/HTML/et/kspread/a11y.docbook share/doc/HTML/et/kspread/advanced.docbook share/doc/HTML/et/kspread/basics.docbook @@ -148,6 +158,7 @@ share/locale/et/LC_MESSAGES/desktop_koffice.mo share/locale/et/LC_MESSAGES/example.mo share/locale/et/LC_MESSAGES/karbon.mo share/locale/et/LC_MESSAGES/kchart.mo +share/locale/et/LC_MESSAGES/kdgantt.mo share/locale/et/LC_MESSAGES/kexi.mo share/locale/et/LC_MESSAGES/kfile_abiword.mo share/locale/et/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-eu/Makefile b/misc/koffice-i18n-eu/Makefile index e5083e946e8c..1b3be23fc95f 100644 --- a/misc/koffice-i18n-eu/Makefile +++ b/misc/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-eu/distinfo b/misc/koffice-i18n-eu/distinfo index 338a0dd9e315..61676af5ecb9 100644 --- a/misc/koffice-i18n-eu/distinfo +++ b/misc/koffice-i18n-eu/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = 3e15c7433f91486d8b76eefb19990a74 -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = fe3279b4517b17c1cc5b2f8cd178456576c071c9166244a377b8f413f32f0d34 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.5.2.tar.bz2) = 352156 +MD5 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 33bb005893d82eeebbc1dc62495e018a +SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = ba9575d582365dfb530c7e656474fb0f775b0648582c9a3d128782130ba0b624 +SIZE (KDE/kde-i18n/koffice-l10n-eu-1.6.1.tar.bz2) = 364401 diff --git a/misc/koffice-i18n-eu/pkg-plist b/misc/koffice-i18n-eu/pkg-plist index cd343ce7a6d9..0540a7282c7e 100644 --- a/misc/koffice-i18n-eu/pkg-plist +++ b/misc/koffice-i18n-eu/pkg-plist @@ -2,6 +2,7 @@ share/locale/eu/LC_MESSAGES/desktop_koffice.mo share/locale/eu/LC_MESSAGES/example.mo share/locale/eu/LC_MESSAGES/karbon.mo share/locale/eu/LC_MESSAGES/kchart.mo +share/locale/eu/LC_MESSAGES/kdgantt.mo share/locale/eu/LC_MESSAGES/kexi.mo share/locale/eu/LC_MESSAGES/kfile_koffice.mo share/locale/eu/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-fi/Makefile b/misc/koffice-i18n-fi/Makefile index bf398813ab6b..8a405b0616db 100644 --- a/misc/koffice-i18n-fi/Makefile +++ b/misc/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-fi/distinfo b/misc/koffice-i18n-fi/distinfo index 148256ad170f..6e1c1ac19e88 100644 --- a/misc/koffice-i18n-fi/distinfo +++ b/misc/koffice-i18n-fi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = de6a7a2b2b2edc1a4eaad7523b1bab39 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = 852f840ed19c09de45be1f8fd292696c9234b52536d364a5c1364bda1b8ac5bb -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.5.2.tar.bz2) = 344438 +MD5 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = dc0b99fe0b1c2f0bdc5823804cf5f7f7 +SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 08a5385cc0351072849ee7b4974b22b1448200bfe98231639f243d162e90ef8a +SIZE (KDE/kde-i18n/koffice-l10n-fi-1.6.1.tar.bz2) = 359845 diff --git a/misc/koffice-i18n-fi/pkg-plist b/misc/koffice-i18n-fi/pkg-plist index 6259be7a77da..f1b34356427a 100644 --- a/misc/koffice-i18n-fi/pkg-plist +++ b/misc/koffice-i18n-fi/pkg-plist @@ -2,7 +2,10 @@ share/locale/fi/LC_MESSAGES/desktop_koffice.mo share/locale/fi/LC_MESSAGES/example.mo share/locale/fi/LC_MESSAGES/karbon.mo share/locale/fi/LC_MESSAGES/kchart.mo +share/locale/fi/LC_MESSAGES/kdgantt.mo share/locale/fi/LC_MESSAGES/kexi.mo +share/locale/fi/LC_MESSAGES/kfile_abiword.mo +share/locale/fi/LC_MESSAGES/kfile_gnumeric.mo share/locale/fi/LC_MESSAGES/kfile_koffice.mo share/locale/fi/LC_MESSAGES/kfile_ooo.mo share/locale/fi/LC_MESSAGES/kformdesigner.mo diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile index 3549b46cc8ed..7f8a39972722 100644 --- a/misc/koffice-i18n-it/Makefile +++ b/misc/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-it/distinfo b/misc/koffice-i18n-it/distinfo index dc9a385818d7..9f417dfc625c 100644 --- a/misc/koffice-i18n-it/distinfo +++ b/misc/koffice-i18n-it/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9658442039b455e52cf68599e3250f54 -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 9a0a25a0ccc62c1d45d16ffb969e3146e1d7f7a2939407c542c2fffddb78b71f -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.2.tar.bz2) = 1550186 +MD5 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 5fc389a6885af2acce7e5b9b48a9ce12 +SHA256 (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 6679bf2decdf63313bf001a51f8b89cdee2efc8c9d32d51319a84a910ff02b2b +SIZE (KDE/kde-i18n/koffice-l10n-it-1.6.1.tar.bz2) = 1638276 diff --git a/misc/koffice-i18n-it/pkg-plist b/misc/koffice-i18n-it/pkg-plist index 81da090823f6..ac3627f19ced 100644 --- a/misc/koffice-i18n-it/pkg-plist +++ b/misc/koffice-i18n-it/pkg-plist @@ -8,13 +8,18 @@ share/doc/HTML/it/kchart/index.docbook share/doc/HTML/it/kexi/basics.docbook share/doc/HTML/it/kexi/building.docbook share/doc/HTML/it/kexi/common +share/doc/HTML/it/kexi/comparing.docbook share/doc/HTML/it/kexi/configuration.docbook share/doc/HTML/it/kexi/credits.docbook share/doc/HTML/it/kexi/database.docbook +share/doc/HTML/it/kexi/designingforms.docbook +share/doc/HTML/it/kexi/enteringdataintotables.docbook +share/doc/HTML/it/kexi/enteringdatausingforms.docbook share/doc/HTML/it/kexi/index.cache.bz2 share/doc/HTML/it/kexi/index.docbook share/doc/HTML/it/kexi/intro.docbook share/doc/HTML/it/kexi/menus.docbook +share/doc/HTML/it/kexi/querydesigning.docbook share/doc/HTML/it/kformula/common share/doc/HTML/it/kformula/index.cache.bz2 share/doc/HTML/it/kformula/index.docbook @@ -57,22 +62,26 @@ share/doc/HTML/it/krita/commands-toolbars.docbook share/doc/HTML/it/krita/commands.docbook share/doc/HTML/it/krita/common share/doc/HTML/it/krita/credits.docbook +share/doc/HTML/it/krita/developers-plugins.docbook +share/doc/HTML/it/krita/developers-scripting.docbook share/doc/HTML/it/krita/developers.docbook share/doc/HTML/it/krita/faq.docbook share/doc/HTML/it/krita/index.cache.bz2 share/doc/HTML/it/krita/index.docbook share/doc/HTML/it/krita/installation.docbook share/doc/HTML/it/krita/introduction.docbook -share/doc/HTML/it/krita/scripting.docbook share/doc/HTML/it/krita/settings.docbook share/doc/HTML/it/krita/tutorial-quick-starts.docbook share/doc/HTML/it/krita/tutorial-select-layer.docbook share/doc/HTML/it/krita/tutorial-starting.docbook +share/doc/HTML/it/krita/tutorial-tablet.docbook share/doc/HTML/it/krita/tutorial.docbook share/doc/HTML/it/krita/using-colorspaces.docbook share/doc/HTML/it/krita/using-filters.docbook +share/doc/HTML/it/krita/using-images.docbook share/doc/HTML/it/krita/using-layers.docbook share/doc/HTML/it/krita/using-selections.docbook +share/doc/HTML/it/krita/using-views.docbook share/doc/HTML/it/kspread/a11y.docbook share/doc/HTML/it/kspread/advanced.docbook share/doc/HTML/it/kspread/basics.docbook @@ -170,6 +179,7 @@ share/locale/it/LC_MESSAGES/desktop_koffice.mo share/locale/it/LC_MESSAGES/example.mo share/locale/it/LC_MESSAGES/karbon.mo share/locale/it/LC_MESSAGES/kchart.mo +share/locale/it/LC_MESSAGES/kdgantt.mo share/locale/it/LC_MESSAGES/kexi.mo share/locale/it/LC_MESSAGES/kfile_abiword.mo share/locale/it/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-lv/Makefile b/misc/koffice-i18n-lv/Makefile index 75e5dad5c8a1..3ec6ff5b12bf 100644 --- a/misc/koffice-i18n-lv/Makefile +++ b/misc/koffice-i18n-lv/Makefile @@ -1,17 +1,16 @@ -# New ports collection makefile for: koffice-i18n-lv -# Date created: 27 April 2003 -# Whom: Michael Nottebrock <michaelnottebrock@gmx.net> +# New ports collection makefile for: koffice-i18n-ms +# Date created: May 20, 2006 +# Whom: Michael Nottebrock <lofi@freebsd.org> # # $FreeBSD$ # PORTNAME= koffice-i18n -PORTVERSION= 1.2.1 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= Attic/koffice-${PORTVERSION:S/.0//}/src/ +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= lv- -DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org @@ -19,15 +18,12 @@ COMMENT= Latvian messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext -DISTNAME_OVERRIDE=yes USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes KDE_I18N= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${PKGNAMEPREFIX:S/-//} - .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.mk> diff --git a/misc/koffice-i18n-lv/distinfo b/misc/koffice-i18n-lv/distinfo index 153ef1bdfd38..cfcbabb1821d 100644 --- a/misc/koffice-i18n-lv/distinfo +++ b/misc/koffice-i18n-lv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 15cf6b3a8ca3caa0f6e4b9b51810b555 -SHA256 (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = e08f06a81a830f782aae5ff1356a1a967dd9f8e7fc5bddcff2c3397a02d5be15 -SIZE (KDE/kde-i18n/koffice-i18n-lv-1.2.1.tar.bz2) = 438315 +MD5 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 512650fbc0638ac0f0bae2864f295cca +SHA256 (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 1c28ae196d901ddaf7ad30802510b1668014c4d4ae0299b8dde267a9faf726e2 +SIZE (KDE/kde-i18n/koffice-l10n-lv-1.6.1.tar.bz2) = 321620 diff --git a/misc/koffice-i18n-lv/pkg-plist b/misc/koffice-i18n-lv/pkg-plist index e6b6e8d33fa4..4d66dd45c186 100644 --- a/misc/koffice-i18n-lv/pkg-plist +++ b/misc/koffice-i18n-lv/pkg-plist @@ -1,32 +1,21 @@ -share/locale/lv/LC_MESSAGES/csvfilter.mo share/locale/lv/LC_MESSAGES/desktop_koffice.mo share/locale/lv/LC_MESSAGES/example.mo -share/locale/lv/LC_MESSAGES/graphite.mo share/locale/lv/LC_MESSAGES/kchart.mo +share/locale/lv/LC_MESSAGES/kfile_koffice.mo share/locale/lv/LC_MESSAGES/kformula.mo -share/locale/lv/LC_MESSAGES/kformulalatexfilter.mo -share/locale/lv/LC_MESSAGES/kformulapngfilter.mo share/locale/lv/LC_MESSAGES/kivio.mo -share/locale/lv/LC_MESSAGES/kocryptfilter.mo +share/locale/lv/LC_MESSAGES/koconverter.mo share/locale/lv/LC_MESSAGES/koffice.mo -share/locale/lv/LC_MESSAGES/kontour.mo +share/locale/lv/LC_MESSAGES/kofficefilters.mo share/locale/lv/LC_MESSAGES/koshell.mo share/locale/lv/LC_MESSAGES/kounavail.mo +share/locale/lv/LC_MESSAGES/kplato.mo share/locale/lv/LC_MESSAGES/kpresenter.mo -share/locale/lv/LC_MESSAGES/kpresenterkwordfilter.mo share/locale/lv/LC_MESSAGES/krita.mo share/locale/lv/LC_MESSAGES/kscan_plugin.mo share/locale/lv/LC_MESSAGES/kspread.mo share/locale/lv/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/lv/LC_MESSAGES/kspreadqprofilter.mo +share/locale/lv/LC_MESSAGES/kthesaurus.mo share/locale/lv/LC_MESSAGES/kugar.mo share/locale/lv/LC_MESSAGES/kword.mo -share/locale/lv/LC_MESSAGES/kwordasciifilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlfilter.mo -share/locale/lv/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/lv/LC_MESSAGES/kwordlatexfilter.mo -share/locale/lv/LC_MESSAGES/olefilterswinword97filter.mo -share/locale/lv/LC_MESSAGES/xsltexportfilter.mo -share/locale/lv/LC_MESSAGES/xsltfilter.mo -share/locale/lv/LC_MESSAGES/xsltimportfilter.mo +share/locale/lv/LC_MESSAGES/thesaurus_tool.mo diff --git a/misc/koffice-i18n-ms/Makefile b/misc/koffice-i18n-ms/Makefile index 6f0ac75d4a06..a53ad3ba941b 100644 --- a/misc/koffice-i18n-ms/Makefile +++ b/misc/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ms/distinfo b/misc/koffice-i18n-ms/distinfo index 5bd45bdbd37f..4df1b70947bc 100644 --- a/misc/koffice-i18n-ms/distinfo +++ b/misc/koffice-i18n-ms/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 617ab3344f714fa9109875bc50b79502 -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 36728cca86cd369d24d64fe5a0b586c884231206c0d6301f0dfe61f3111fe689 -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.5.2.tar.bz2) = 347161 +MD5 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = ff1d6abe79bf4b4239ebaccc2509c35e +SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 3f777241e8d22201f97b4be242624ec6c690ca3ee74fd9357e4e454598502d2a +SIZE (KDE/kde-i18n/koffice-l10n-ms-1.6.1.tar.bz2) = 353895 diff --git a/misc/koffice-i18n-ms/pkg-plist b/misc/koffice-i18n-ms/pkg-plist index 99390aad8df2..e38de83005ca 100644 --- a/misc/koffice-i18n-ms/pkg-plist +++ b/misc/koffice-i18n-ms/pkg-plist @@ -2,6 +2,7 @@ share/locale/ms/LC_MESSAGES/desktop_koffice.mo share/locale/ms/LC_MESSAGES/example.mo share/locale/ms/LC_MESSAGES/karbon.mo share/locale/ms/LC_MESSAGES/kchart.mo +share/locale/ms/LC_MESSAGES/kdgantt.mo share/locale/ms/LC_MESSAGES/kexi.mo share/locale/ms/LC_MESSAGES/kfile_koffice.mo share/locale/ms/LC_MESSAGES/kfile_ooo.mo diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile index 4e111dae8f7f..ca57ae929f6d 100644 --- a/misc/koffice-i18n-nb/Makefile +++ b/misc/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-nb/distinfo b/misc/koffice-i18n-nb/distinfo index 3b1c0a14407b..a75ee96d5fcf 100644 --- a/misc/koffice-i18n-nb/distinfo +++ b/misc/koffice-i18n-nb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 02adef48c63e4a9f87fed63cefb19d1d -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 2eef79ddae5815c778684ad0cc0f7eb23d46f6f4929aea78f15c75b7d911476c -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.2.tar.bz2) = 368950 +MD5 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 65d3a4d15e8911faf43d1aa9c6f7b6a7 +SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 50ed91fec8debd0be62ec356107f3d7c661bd04df480719921f7c45a11e69a1d +SIZE (KDE/kde-i18n/koffice-l10n-nb-1.6.1.tar.bz2) = 380380 diff --git a/misc/koffice-i18n-nb/pkg-plist b/misc/koffice-i18n-nb/pkg-plist index 56cd255ecfe9..febc3638272c 100644 --- a/misc/koffice-i18n-nb/pkg-plist +++ b/misc/koffice-i18n-nb/pkg-plist @@ -2,6 +2,7 @@ share/locale/nb/LC_MESSAGES/desktop_koffice.mo share/locale/nb/LC_MESSAGES/example.mo share/locale/nb/LC_MESSAGES/karbon.mo share/locale/nb/LC_MESSAGES/kchart.mo +share/locale/nb/LC_MESSAGES/kdgantt.mo share/locale/nb/LC_MESSAGES/kexi.mo share/locale/nb/LC_MESSAGES/kfile_abiword.mo share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile index 04aeaa72ffb2..0973f3e6e064 100644 --- a/misc/koffice-i18n-nl/Makefile +++ b/misc/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-nl/distinfo b/misc/koffice-i18n-nl/distinfo index 9cbf82513851..65ecfeb4b961 100644 --- a/misc/koffice-i18n-nl/distinfo +++ b/misc/koffice-i18n-nl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 9847ff8d7dbddf4c2f1ae4a6cb0694d1 -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 10a856ed3bb2090691ee2f3695d631a2bb242a140eab54351fd94eb02335b4f9 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.2.tar.bz2) = 3270123 +MD5 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 006bc0ff8b292fc8836c989d244a45bc +SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 5a5ea924223b95c56ac32e98e1f63c702574629c6d51786f2697b02f61613fb3 +SIZE (KDE/kde-i18n/koffice-l10n-nl-1.6.1.tar.bz2) = 3374788 diff --git a/misc/koffice-i18n-nl/pkg-plist b/misc/koffice-i18n-nl/pkg-plist index 62ad8f9c5997..40a6e68057bd 100644 --- a/misc/koffice-i18n-nl/pkg-plist +++ b/misc/koffice-i18n-nl/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/nl/kchart/index.docbook share/doc/HTML/nl/kexi/basics.docbook share/doc/HTML/nl/kexi/building.docbook share/doc/HTML/nl/kexi/common +share/doc/HTML/nl/kexi/comparing.docbook share/doc/HTML/nl/kexi/configuration.docbook share/doc/HTML/nl/kexi/credits.docbook share/doc/HTML/nl/kexi/database.docbook +share/doc/HTML/nl/kexi/designingforms.docbook +share/doc/HTML/nl/kexi/enteringdataintotables.docbook +share/doc/HTML/nl/kexi/enteringdatausingforms.docbook share/doc/HTML/nl/kexi/index.cache.bz2 share/doc/HTML/nl/kexi/index.docbook share/doc/HTML/nl/kexi/intro.docbook share/doc/HTML/nl/kexi/menus.docbook +share/doc/HTML/nl/kexi/querydesigning.docbook share/doc/HTML/nl/kformula/additional_fonts1.png share/doc/HTML/nl/kformula/ambiguous-string.png share/doc/HTML/nl/kformula/common @@ -146,6 +151,8 @@ share/doc/HTML/nl/krita/commands-toolbars.docbook share/doc/HTML/nl/krita/commands.docbook share/doc/HTML/nl/krita/common share/doc/HTML/nl/krita/credits.docbook +share/doc/HTML/nl/krita/developers-plugins.docbook +share/doc/HTML/nl/krita/developers-scripting.docbook share/doc/HTML/nl/krita/developers.docbook share/doc/HTML/nl/krita/faq.docbook share/doc/HTML/nl/krita/index.cache.bz2 @@ -157,11 +164,14 @@ share/doc/HTML/nl/krita/settings.docbook share/doc/HTML/nl/krita/tutorial-quick-starts.docbook share/doc/HTML/nl/krita/tutorial-select-layer.docbook share/doc/HTML/nl/krita/tutorial-starting.docbook +share/doc/HTML/nl/krita/tutorial-tablet.docbook share/doc/HTML/nl/krita/tutorial.docbook share/doc/HTML/nl/krita/using-colorspaces.docbook share/doc/HTML/nl/krita/using-filters.docbook +share/doc/HTML/nl/krita/using-images.docbook share/doc/HTML/nl/krita/using-layers.docbook share/doc/HTML/nl/krita/using-selections.docbook +share/doc/HTML/nl/krita/using-views.docbook share/doc/HTML/nl/kspread/a11y.docbook share/doc/HTML/nl/kspread/advanced.docbook share/doc/HTML/nl/kspread/basics.docbook @@ -462,6 +472,7 @@ share/locale/nl/LC_MESSAGES/desktop_koffice.mo share/locale/nl/LC_MESSAGES/example.mo share/locale/nl/LC_MESSAGES/karbon.mo share/locale/nl/LC_MESSAGES/kchart.mo +share/locale/nl/LC_MESSAGES/kdgantt.mo share/locale/nl/LC_MESSAGES/kexi.mo share/locale/nl/LC_MESSAGES/kfile_abiword.mo share/locale/nl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile index cb97a195f0ff..5a250b48c116 100644 --- a/misc/koffice-i18n-sk/Makefile +++ b/misc/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sk/distinfo b/misc/koffice-i18n-sk/distinfo index b4f11b186fe3..7c87ec248a99 100644 --- a/misc/koffice-i18n-sk/distinfo +++ b/misc/koffice-i18n-sk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = a7dbf6b5fa42d0cdee1f0928cbaadfd0 -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = 42c21359366a12a91921645b2cccaa6de73ed5693463b902f92dc63e66f38388 -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.5.2.tar.bz2) = 973025 +MD5 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 63b2d698040b2f5ece72e7ca67407669 +SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 45c7fb18a7046466513526c30c3d2fde70f2ecb822e9eda4f9f12a7133c9499c +SIZE (KDE/kde-i18n/koffice-l10n-sk-1.6.1.tar.bz2) = 987194 diff --git a/misc/koffice-i18n-sk/pkg-plist b/misc/koffice-i18n-sk/pkg-plist index 3ca903cfe97c..9fa58c01e183 100644 --- a/misc/koffice-i18n-sk/pkg-plist +++ b/misc/koffice-i18n-sk/pkg-plist @@ -34,6 +34,7 @@ share/locale/sk/LC_MESSAGES/desktop_koffice.mo share/locale/sk/LC_MESSAGES/example.mo share/locale/sk/LC_MESSAGES/karbon.mo share/locale/sk/LC_MESSAGES/kchart.mo +share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kexi.mo share/locale/sk/LC_MESSAGES/kfile_abiword.mo share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo @@ -44,6 +45,7 @@ share/locale/sk/LC_MESSAGES/kformula.mo share/locale/sk/LC_MESSAGES/kivio.mo share/locale/sk/LC_MESSAGES/koconverter.mo share/locale/sk/LC_MESSAGES/koffice.mo +share/locale/sk/LC_MESSAGES/kofficefilters.mo share/locale/sk/LC_MESSAGES/koproperty.mo share/locale/sk/LC_MESSAGES/koshell.mo share/locale/sk/LC_MESSAGES/kounavail.mo diff --git a/misc/koffice-i18n-sr/Makefile b/misc/koffice-i18n-sr/Makefile index ac8fbfda995a..bb7e9a3fae66 100644 --- a/misc/koffice-i18n-sr/Makefile +++ b/misc/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sr/distinfo b/misc/koffice-i18n-sr/distinfo index ff59034bf3ca..00cc0748b09d 100644 --- a/misc/koffice-i18n-sr/distinfo +++ b/misc/koffice-i18n-sr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = 2717a1e1e1ff92d1e962e3b69625e906 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = fa4acd98044fcc1a6326b7df8a903d66c041991b87012d568f5c90250b746a0a -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.5.2.tar.bz2) = 363807 +MD5 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = ff1137b214460cfc6c647643da08e098 +SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 5a790a5ede02129e82f500dface6b1bc11592b14e60ed2c16865cafb883660a8 +SIZE (KDE/kde-i18n/koffice-l10n-sr-1.6.1.tar.bz2) = 382309 diff --git a/misc/koffice-i18n-sr/pkg-plist b/misc/koffice-i18n-sr/pkg-plist index 44c0504be1af..2cbaa6d90f6b 100644 --- a/misc/koffice-i18n-sr/pkg-plist +++ b/misc/koffice-i18n-sr/pkg-plist @@ -2,6 +2,7 @@ share/locale/sr/LC_MESSAGES/desktop_koffice.mo share/locale/sr/LC_MESSAGES/example.mo share/locale/sr/LC_MESSAGES/karbon.mo share/locale/sr/LC_MESSAGES/kchart.mo +share/locale/sr/LC_MESSAGES/kdgantt.mo share/locale/sr/LC_MESSAGES/kexi.mo share/locale/sr/LC_MESSAGES/kfile_abiword.mo share/locale/sr/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sr@Latn/Makefile b/misc/koffice-i18n-sr@Latn/Makefile index 78eb80519d7d..1d65f9705213 100644 --- a/misc/koffice-i18n-sr@Latn/Makefile +++ b/misc/koffice-i18n-sr@Latn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sr@Latn/distinfo b/misc/koffice-i18n-sr@Latn/distinfo index 513cc76e21ac..366e86446314 100644 --- a/misc/koffice-i18n-sr@Latn/distinfo +++ b/misc/koffice-i18n-sr@Latn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f7774ad33c0efb072653495894865e0e -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = f5e53db6cb43b1b06eed70d60232c87a670591a46b6422236ba5f17d28bf2b77 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.2.tar.bz2) = 373433 +MD5 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = ed4eab803a7c0443ff3c4839e32757d1 +SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = e3305d41f6fb1b812f091c56ab390f9094d191916ee23bde883c13b93d36b85f +SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.6.1.tar.bz2) = 385044 diff --git a/misc/koffice-i18n-sr@Latn/pkg-plist b/misc/koffice-i18n-sr@Latn/pkg-plist index 98143cd5c517..48ef6abe70ee 100644 --- a/misc/koffice-i18n-sr@Latn/pkg-plist +++ b/misc/koffice-i18n-sr@Latn/pkg-plist @@ -2,6 +2,7 @@ share/locale/sr@Latn/LC_MESSAGES/desktop_koffice.mo share/locale/sr@Latn/LC_MESSAGES/example.mo share/locale/sr@Latn/LC_MESSAGES/karbon.mo share/locale/sr@Latn/LC_MESSAGES/kchart.mo +share/locale/sr@Latn/LC_MESSAGES/kdgantt.mo share/locale/sr@Latn/LC_MESSAGES/kexi.mo share/locale/sr@Latn/LC_MESSAGES/kfile_abiword.mo share/locale/sr@Latn/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile index 2dfe5de3c96e..a41463e11c3c 100644 --- a/misc/koffice-i18n-sv/Makefile +++ b/misc/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sv/distinfo b/misc/koffice-i18n-sv/distinfo index c6c36bca9a65..57649992cc47 100644 --- a/misc/koffice-i18n-sv/distinfo +++ b/misc/koffice-i18n-sv/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 83f73110f60ef4b5f633e3cca0dd4e12 -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 1bd9c91f93cd99c81802efb7856ce55dcde18502770f24617647c8487005dd58 -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.2.tar.bz2) = 5965263 +MD5 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = fd5ebf8d8480797f84121f9efcb00823 +SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 721174f990db6d5ea8254100048463e5d8a721335f7ec318ed52d393fd410bbb +SIZE (KDE/kde-i18n/koffice-l10n-sv-1.6.1.tar.bz2) = 6445810 diff --git a/misc/koffice-i18n-sv/pkg-plist b/misc/koffice-i18n-sv/pkg-plist index 57b962dbd819..0f24d03f2f32 100644 --- a/misc/koffice-i18n-sv/pkg-plist +++ b/misc/koffice-i18n-sv/pkg-plist @@ -36,14 +36,19 @@ share/doc/HTML/sv/kchart/toolbars.png share/doc/HTML/sv/kexi/basics.docbook share/doc/HTML/sv/kexi/building.docbook share/doc/HTML/sv/kexi/common +share/doc/HTML/sv/kexi/comparing.docbook share/doc/HTML/sv/kexi/configuration.docbook share/doc/HTML/sv/kexi/contact-example.png share/doc/HTML/sv/kexi/credits.docbook share/doc/HTML/sv/kexi/database.docbook +share/doc/HTML/sv/kexi/designingforms.docbook +share/doc/HTML/sv/kexi/enteringdataintotables.docbook +share/doc/HTML/sv/kexi/enteringdatausingforms.docbook share/doc/HTML/sv/kexi/index.cache.bz2 share/doc/HTML/sv/kexi/index.docbook share/doc/HTML/sv/kexi/intro.docbook share/doc/HTML/sv/kexi/menus.docbook +share/doc/HTML/sv/kexi/querydesigning.docbook share/doc/HTML/sv/kformula/additional_fonts1.png share/doc/HTML/sv/kformula/ambiguous-string.png share/doc/HTML/sv/kformula/common @@ -227,12 +232,17 @@ share/doc/HTML/sv/krita/commands.docbook share/doc/HTML/sv/krita/common share/doc/HTML/sv/krita/createdocument.png share/doc/HTML/sv/krita/credits.docbook +share/doc/HTML/sv/krita/developers-plugins.docbook +share/doc/HTML/sv/krita/developers-scripting.docbook share/doc/HTML/sv/krita/developers.docbook share/doc/HTML/sv/krita/dialogs-addpalette.png +share/doc/HTML/sv/krita/dialogs-blur.png share/doc/HTML/sv/krita/dialogs-brightnesscontrast.png share/doc/HTML/sv/krita/dialogs-bumpmap.png share/doc/HTML/sv/krita/dialogs-coloradjustment.png share/doc/HTML/sv/krita/dialogs-colorrange.png +share/doc/HTML/sv/krita/dialogs-colortoalpha.png +share/doc/HTML/sv/krita/dialogs-colortransfer.png share/doc/HTML/sv/krita/dialogs-convertimagetype.png share/doc/HTML/sv/krita/dialogs-convertlayertype.png share/doc/HTML/sv/krita/dialogs-cubism.png @@ -241,22 +251,33 @@ share/doc/HTML/sv/krita/dialogs-documentinformation.png share/doc/HTML/sv/krita/dialogs-dropshadow.png share/doc/HTML/sv/krita/dialogs-emboss.png share/doc/HTML/sv/krita/dialogs-filtersgallery.png +share/doc/HTML/sv/krita/dialogs-gaussiannoise.png share/doc/HTML/sv/krita/dialogs-histogram.png share/doc/HTML/sv/krita/dialogs-imageproperties.png +share/doc/HTML/sv/krita/dialogs-imagerestoration.png share/doc/HTML/sv/krita/dialogs-imagesize.png share/doc/HTML/sv/krita/dialogs-layerproperties.png share/doc/HTML/sv/krita/dialogs-layersize.png +share/doc/HTML/sv/krita/dialogs-lenscorrection.png share/doc/HTML/sv/krita/dialogs-newadjustmentlayer.png share/doc/HTML/sv/krita/dialogs-newlayer.png share/doc/HTML/sv/krita/dialogs-oilpaint.png share/doc/HTML/sv/krita/dialogs-pixelize.png share/doc/HTML/sv/krita/dialogs-raindrops.png +share/doc/HTML/sv/krita/dialogs-randomnoise.png +share/doc/HTML/sv/krita/dialogs-randompick.png share/doc/HTML/sv/krita/dialogs-rotateimage.png share/doc/HTML/sv/krita/dialogs-rotatelayer.png share/doc/HTML/sv/krita/dialogs-roundcorners.png share/doc/HTML/sv/krita/dialogs-separateimage.png share/doc/HTML/sv/krita/dialogs-shearimage.png share/doc/HTML/sv/krita/dialogs-shearlayer.png +share/doc/HTML/sv/krita/dialogs-smalltiles.png +share/doc/HTML/sv/krita/dialogs-sobel.png +share/doc/HTML/sv/krita/dialogs-substrate.png +share/doc/HTML/sv/krita/dialogs-unsharpmask.png +share/doc/HTML/sv/krita/dialogs-wave.png +share/doc/HTML/sv/krita/dialogs-waveletnoise.png share/doc/HTML/sv/krita/faq.docbook share/doc/HTML/sv/krita/filters-customconvolution.png share/doc/HTML/sv/krita/gotchi.png @@ -329,11 +350,14 @@ share/doc/HTML/sv/krita/tutorial-select-layer-8.png share/doc/HTML/sv/krita/tutorial-select-layer-9.png share/doc/HTML/sv/krita/tutorial-select-layer.docbook share/doc/HTML/sv/krita/tutorial-starting.docbook +share/doc/HTML/sv/krita/tutorial-tablet.docbook share/doc/HTML/sv/krita/tutorial.docbook share/doc/HTML/sv/krita/using-colorspaces.docbook share/doc/HTML/sv/krita/using-filters.docbook +share/doc/HTML/sv/krita/using-images.docbook share/doc/HTML/sv/krita/using-layers.docbook share/doc/HTML/sv/krita/using-selections.docbook +share/doc/HTML/sv/krita/using-views.docbook share/doc/HTML/sv/kspread/a11y.docbook share/doc/HTML/sv/kspread/advanced.docbook share/doc/HTML/sv/kspread/basics.docbook @@ -608,6 +632,7 @@ share/locale/sv/LC_MESSAGES/desktop_koffice.mo share/locale/sv/LC_MESSAGES/example.mo share/locale/sv/LC_MESSAGES/karbon.mo share/locale/sv/LC_MESSAGES/kchart.mo +share/locale/sv/LC_MESSAGES/kdgantt.mo share/locale/sv/LC_MESSAGES/kexi.mo share/locale/sv/LC_MESSAGES/kfile_abiword.mo share/locale/sv/LC_MESSAGES/kfile_gnumeric.mo diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile index 7e3333a820b6..7fbbde696c26 100644 --- a/misc/koffice-i18n-tr/Makefile +++ b/misc/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-tr/distinfo b/misc/koffice-i18n-tr/distinfo index 58c8a1243afa..8391191c7b6d 100644 --- a/misc/koffice-i18n-tr/distinfo +++ b/misc/koffice-i18n-tr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 6b7df893cae7725ca94979a4dcd73edf -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 0b6ed62326265302a06cc5874ff27b1a38bab13c1a5f195b216e37634bfc9be8 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.2.tar.bz2) = 350945 +MD5 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 909ed845836e7219a4cf6710ee128846 +SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 70433437988733b889eaa4b62d7f3f7f34df9f13517dfd190dbdb8bde0975058 +SIZE (KDE/kde-i18n/koffice-l10n-tr-1.6.1.tar.bz2) = 369415 diff --git a/misc/koffice-i18n-tr/pkg-plist b/misc/koffice-i18n-tr/pkg-plist index 590ad1345397..265074fd8d3e 100644 --- a/misc/koffice-i18n-tr/pkg-plist +++ b/misc/koffice-i18n-tr/pkg-plist @@ -2,7 +2,10 @@ share/locale/tr/LC_MESSAGES/desktop_koffice.mo share/locale/tr/LC_MESSAGES/example.mo share/locale/tr/LC_MESSAGES/karbon.mo share/locale/tr/LC_MESSAGES/kchart.mo +share/locale/tr/LC_MESSAGES/kdgantt.mo share/locale/tr/LC_MESSAGES/kexi.mo +share/locale/tr/LC_MESSAGES/kfile_abiword.mo +share/locale/tr/LC_MESSAGES/kfile_gnumeric.mo share/locale/tr/LC_MESSAGES/kfile_koffice.mo share/locale/tr/LC_MESSAGES/kfile_ooo.mo share/locale/tr/LC_MESSAGES/kformdesigner.mo @@ -11,8 +14,10 @@ share/locale/tr/LC_MESSAGES/kivio.mo share/locale/tr/LC_MESSAGES/koconverter.mo share/locale/tr/LC_MESSAGES/koffice.mo share/locale/tr/LC_MESSAGES/kofficefilters.mo +share/locale/tr/LC_MESSAGES/koproperty.mo share/locale/tr/LC_MESSAGES/koshell.mo share/locale/tr/LC_MESSAGES/kounavail.mo +share/locale/tr/LC_MESSAGES/kplato.mo share/locale/tr/LC_MESSAGES/kpresenter.mo share/locale/tr/LC_MESSAGES/krita.mo share/locale/tr/LC_MESSAGES/kscan_plugin.mo diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile index 4df487a14bda..bd8bae7d81c3 100644 --- a/misc/koffice-i18n/Makefile +++ b/misc/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/misc/konq-plugins-kde4/distinfo b/misc/konq-plugins-kde4/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/konq-plugins-kde4/distinfo +++ b/misc/konq-plugins-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/konq-plugins-kde4/pkg-plist b/misc/konq-plugins-kde4/pkg-plist index 251bb8db087a..6c09f11eb267 100644 --- a/misc/konq-plugins-kde4/pkg-plist +++ b/misc/konq-plugins-kde4/pkg-plist @@ -76,7 +76,7 @@ lib/kde3/libwebarchiverplugin.so lib/kde3/webarchivethumbnail.a lib/kde3/webarchivethumbnail.la lib/kde3/webarchivethumbnail.so -share/applications/kdeaddons-konq-plugins-3.5.4 +share/applications/kdeaddons-konq-plugins-3.5.5 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop diff --git a/misc/konq-plugins/distinfo b/misc/konq-plugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/konq-plugins/distinfo +++ b/misc/konq-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/konq-plugins/pkg-plist b/misc/konq-plugins/pkg-plist index 251bb8db087a..6c09f11eb267 100644 --- a/misc/konq-plugins/pkg-plist +++ b/misc/konq-plugins/pkg-plist @@ -76,7 +76,7 @@ lib/kde3/libwebarchiverplugin.so lib/kde3/webarchivethumbnail.a lib/kde3/webarchivethumbnail.la lib/kde3/webarchivethumbnail.so -share/applications/kdeaddons-konq-plugins-3.5.4 +share/applications/kdeaddons-konq-plugins-3.5.5 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop diff --git a/misc/ksig/distinfo b/misc/ksig/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/ksig/distinfo +++ b/misc/ksig/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/ksig/pkg-plist b/misc/ksig/pkg-plist index 94eea5f7f2e3..81dc74ea25af 100644 --- a/misc/ksig/pkg-plist +++ b/misc/ksig/pkg-plist @@ -1,6 +1,6 @@ bin/ksig share/applications/kde/ksig.desktop -share/applications/kdeaddons-ksig-3.5.4 +share/applications/kdeaddons-ksig-3.5.5 share/apps/ksig/ksigui.rc share/icons/hicolor/16x16/apps/ksig.png share/icons/hicolor/32x32/apps/ksig.png diff --git a/misc/renamedlgplugins/distinfo b/misc/renamedlgplugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/misc/renamedlgplugins/distinfo +++ b/misc/renamedlgplugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/misc/renamedlgplugins/pkg-plist b/misc/renamedlgplugins/pkg-plist index ab3f2f45c068..366419940a45 100644 --- a/misc/renamedlgplugins/pkg-plist +++ b/misc/renamedlgplugins/pkg-plist @@ -4,6 +4,6 @@ lib/kde3/librenaudioplugin.so lib/kde3/librenimageplugin.a lib/kde3/librenimageplugin.la lib/kde3/librenimageplugin.so -share/applications/kdeaddons-renamedlg-plugins-3.5.4 +share/applications/kdeaddons-renamedlg-plugins-3.5.5 share/services/renaudiodlg.desktop share/services/renimagedlg.desktop diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 0d42c358df9f..86d55342209f 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -49,12 +48,12 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500035 +#.if ${OSVERSION} > 500035 LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora PLIST_SUB+= THEORA="" -.else -PLIST_SUB+= THEORA="@comment " -.endif +#.else +#PLIST_SUB+= THEORA="@comment " +#.endif .if !defined(WITHOUT_AKODE) RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index a3c9dfa3cb96..9b50fd30006c 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 -SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b -SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 +MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba +SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c +SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 0d42c358df9f..86d55342209f 100644 --- a/multimedia/kdemultimedia4/Makefile +++ b/multimedia/kdemultimedia4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdemultimedia PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -49,12 +48,12 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500035 +#.if ${OSVERSION} > 500035 LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora PLIST_SUB+= THEORA="" -.else -PLIST_SUB+= THEORA="@comment " -.endif +#.else +#PLIST_SUB+= THEORA="@comment " +#.endif .if !defined(WITHOUT_AKODE) RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index a3c9dfa3cb96..9b50fd30006c 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 -SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b -SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 +MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba +SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c +SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo index 4f56fe634057..b86dc7b77b7f 100644 --- a/multimedia/noatun-plugins/distinfo +++ b/multimedia/noatun-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.4.tar.bz2) = 840d18fbcadec9f94bb70563876b4dcd -SHA256 (KDE/kdeaddons-3.5.4.tar.bz2) = b80db0ba118ce345315d99800d56972a3c93b95f598830f71de27af7ba5b003c -SIZE (KDE/kdeaddons-3.5.4.tar.bz2) = 1653229 +MD5 (KDE/kdeaddons-3.5.5.tar.bz2) = 71c0a690abf8ad0f43135fa887d0b40c +SHA256 (KDE/kdeaddons-3.5.5.tar.bz2) = 1db58293a8b967d254a39c9bdb0c5dfb3759a7d067280dd3d637e2423beb632c +SIZE (KDE/kdeaddons-3.5.5.tar.bz2) = 1663195 diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist index ca220a6c9d4c..58afe67885f9 100644 --- a/multimedia/noatun-plugins/pkg-plist +++ b/multimedia/noatun-plugins/pkg-plist @@ -43,7 +43,7 @@ lib/kde3/noatunwakeup.so lib/kde3/noatunwavecapture.a lib/kde3/noatunwavecapture.la lib/kde3/noatunwavecapture.so -share/applications/kdeaddons-noatun-plugins-3.5.4 +share/applications/kdeaddons-noatun-plugins-3.5.5 share/apps/noatun/alsaplayerui.plugin share/apps/noatun/blurscope.plugin share/apps/noatun/charlatanui.plugin diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile index c07864da2882..f62d47738f32 100644 --- a/multimedia/xine_artsplugin/Makefile +++ b/multimedia/xine_artsplugin/Makefile @@ -7,7 +7,6 @@ PORTNAME= xine_artsplugin PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo index a3c9dfa3cb96..9b50fd30006c 100644 --- a/multimedia/xine_artsplugin/distinfo +++ b/multimedia/xine_artsplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.4.tar.bz2) = 921680248b5f5793b9201715fffe6e33 -SHA256 (KDE/kdemultimedia-3.5.4.tar.bz2) = 3ea07b8bd6340516642629b7e741d18cae53984ebb7d007acdb184e1c6f79d4b -SIZE (KDE/kdemultimedia-3.5.4.tar.bz2) = 6276789 +MD5 (KDE/kdemultimedia-3.5.5.tar.bz2) = fc8f0911050c42aec0636cf3873e22ba +SHA256 (KDE/kdemultimedia-3.5.5.tar.bz2) = 1c15f9572bec29fbfac5224b7f7c88bd57375c827622a9017d3861475881fb4c +SIZE (KDE/kdemultimedia-3.5.5.tar.bz2) = 6287234 diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index df0ae0ca1f1b..e3d223bf2775 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -1,25 +1,22 @@ -# -*-mode: makefile-*- -# New ports collection makefile for: kdenetwork2 -# Date created: 2 November 2001 -# Whom: will@cvs.kde.org +# New ports collection makefile for: kopete +# Date created: Wed Apr 12 17:51:07 UTC 2006 +# Whom: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> # # $FreeBSD$ # PORTNAME= kopete -PORTVERSION= 0.11 -PORTREVISION= 2 +PORTVERSION= 0.12.3 CATEGORIES?= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/3.5.4/src +MASTER_SITE_SUBDIR= stable/3.5.5/src PKGNAMEPREFIX= kdenetwork- -DISTNAME= kdenetwork-3.5.4 +DISTNAME= kdenetwork-3.5.5 DIST_SUBDIR= KDE -MAINTAINER?= kde@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= KDE multi-protocol instant messenger (IM) -LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn RUN_DEPENDS= ${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls CONFLICTS= kdenetwork-[0-2]* kdenetwork-3.[0-4]* kdenetwork-3.5.[0-2]* kvirc-[0-9]* @@ -28,26 +25,60 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes +USE_GNOME= glib20 USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes -CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \ + --with-speex=${LOCALBASE} \ + --with-ssl-dir=${OPENSSLBASE} \ + --without-external-libgadu +USE_LDCONFIG= yes +_NO_KDE_FINAL= yes WRKSRC= ${WRKDIR}/${DISTNAME} BUILD_WRKSRC= ${WRKSRC}/kopete INSTALL_WRKSRC= ${WRKSRC}/kopete -INSTALLS_SHLIB= yes -LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 +PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config -.include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} > 500028 +CONFIGURE_ARGS+=--enable-jingle +LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex \ + ilbc:${PORTSDIR}/net/ilbc \ + ortp:${PORTSDIR}/net/ortp +CONFIGURE_ENV+= PKG_CONFIG="${PKG_CONFIG}" \ + EXPAT_CFLAGS="-I${LOCALBASE}/include" \ + EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \ + ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \ + ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \ + SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \ + SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)" +.endif + +post-patch: +# force usage of gthread for libjingle's benefit + @${REINPLACE_CMD} -E \ + -e 's|(glib-2.0)|gthread-2.0 \1|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + post-configure: .if ${OSVERSION} < 500028 @${REINPLACE_CMD} -e 's|$$(depcomp)||g' \ ${WRKSRC}/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile .endif +# configure does not handle OSS support +.for feature in \ + FEATURE_ENABLE_CHAT_ARCHIVING \ + FEATURE_ENABLE_SSL \ + HAVE_SYS_SOUNDCARD_H + @${ECHO_CMD} \ + '#define ${feature} 1' >> \ + ${CONFIGURE_WRKSRC}/config.h +.endfor .include <bsd.port.post.mk> diff --git a/net-im/kopete/distinfo b/net-im/kopete/distinfo index ac4de7a39c3c..7615aba07796 100644 --- a/net-im/kopete/distinfo +++ b/net-im/kopete/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.4.tar.bz2) = 81660b1a73e81b6c01a55861c154dd3b -SHA256 (KDE/kdenetwork-3.5.4.tar.bz2) = fc6841b1dbe6747dcce6b23406bb2d29793f9029a1084c2372fad44952e82569 -SIZE (KDE/kdenetwork-3.5.4.tar.bz2) = 7526158 +MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 +SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f +SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 diff --git a/net-im/kopete/files/patch-kopete-jingle b/net-im/kopete/files/patch-kopete-jingle new file mode 100644 index 000000000000..519a7058332c --- /dev/null +++ b/net-im/kopete/files/patch-kopete-jingle @@ -0,0 +1,449 @@ +--- ./kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h.orig Mon Mar 20 23:18:37 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h Thu Apr 20 02:38:21 2006 +@@ -83,8 +83,10 @@ + public: + CriticalSection() { + pthread_mutexattr_t mutex_attribute; ++ pthread_mutexattr_init(&mutex_attribute); + pthread_mutexattr_settype(&mutex_attribute, PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(&mutex_, &mutex_attribute); ++ pthread_mutexattr_destroy(&mutex_attribute); + } + ~CriticalSection() { + pthread_mutex_destroy(&mutex_); +--- kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc.orig Tue May 2 11:43:09 2006 ++++ kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc Tue May 2 11:43:21 2006 +@@ -113,6 +113,7 @@ + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_create(&thread_, &attr, PreLoop, this); ++ pthread_attr_destroy(&attr); + started_ = true; + } + +--- kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in.orig Thu Apr 20 10:32:14 2006 ++++ kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in Thu Apr 20 10:33:01 2006 +@@ -699,7 +699,7 @@ + for dir in "$(DESTDIR)$(bindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +-install: install-am ++install: + install-exec: install-exec-am + install-data: install-data-am + uninstall: uninstall-am +--- kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc.orig Wed Feb 22 16:32:44 2006 ++++ kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc Wed Feb 22 16:41:45 2006 +@@ -65,6 +65,7 @@ + + pthread_attr_init(&attr); + pthread_create(&thread_, &attr, &thread_function, this); ++ pthread_attr_destroy(&attr); + } + + LinphoneMediaChannel::~LinphoneMediaChannel() { +@@ -118,8 +119,8 @@ + mute_ = !send; + } + +-float LinphoneMediaChannel::GetCurrentQuality() {} +-int LinphoneMediaChannel::GetOutputLevel() {} ++float LinphoneMediaChannel::GetCurrentQuality() { return 0; } ++int LinphoneMediaChannel::GetOutputLevel() { return 0; } + + LinphoneMediaEngine::LinphoneMediaEngine() {} + LinphoneMediaEngine::~LinphoneMediaEngine() {} +@@ -139,7 +140,7 @@ + + #ifdef HAVE_SPEEX + ms_speex_codec_init(); +- rtp_profile_set_payload(&av_profile, 110, &speex_wb); ++ rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb); + codecs_.push_back(Codec(110, "speex", 8)); + #endif + +@@ -149,7 +150,7 @@ + codecs_.push_back(Codec(102, "iLBC", 4)); + #endif + +- rtp_profile_set_payload(&av_profile, 0, &pcmu8000); ++ rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000); + codecs_.push_back(Codec(0, "PCMU", 2)); + + return true; +@@ -163,8 +164,8 @@ + return new LinphoneMediaChannel(); + } + +-int LinphoneMediaEngine::SetAudioOptions(int options) {} +-int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) {} ++int LinphoneMediaEngine::SetAudioOptions(int options) { return 0; } ++int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) { return 0; } + +-float LinphoneMediaEngine::GetCurrentQuality() {} +-int LinphoneMediaEngine::GetInputLevel() {} ++float LinphoneMediaEngine::GetCurrentQuality() { return 0; } ++int LinphoneMediaEngine::GetInputLevel() { return 0; } +--- ./kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc.orig Mon Mar 20 23:18:35 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc Thu Apr 20 02:38:21 2006 +@@ -30,6 +30,7 @@ + // ORTP settings + #define MAX_RTP_SIZE 1500 // From mediastreamer + ++#define rtp_session_max_buf_size_set(session, bufsize) (rtp_session_set_recv_buf_size(session, bufsize)) + + // ----------------------------------------------------------------------------- + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c Thu Apr 20 02:38:21 2006 +@@ -29,6 +29,8 @@ + + #define MAX_RTP_SIZE 1500 + ++#define rtp_session_max_buf_size_set(session, bufsize) (rtp_session_set_recv_buf_size(session, bufsize)) ++ + /* this code is not part of the library itself, it is part of the mediastream program */ + void audio_stream_free(AudioStream *stream) + { +@@ -118,7 +120,8 @@ + if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport); + rtp_session_set_scheduling_mode(rtpr,0); + rtp_session_set_blocking_mode(rtpr,0); +- rtp_session_set_payload_type(rtpr,payload); ++ rtp_session_set_send_payload_type(rtpr,payload); ++ rtp_session_set_recv_payload_type(rtpr,payload); + rtp_session_set_jitter_compensation(rtpr,jitt_comp); + rtp_session_enable_adaptive_jitter_compensation(rtpr,TRUE); + /*rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL);*/ +@@ -143,7 +146,8 @@ + rtp_session_set_remote_addr(rtps,remip,remport); + rtp_session_set_scheduling_mode(rtps,0); + rtp_session_set_blocking_mode(rtps,0); +- rtp_session_set_payload_type(rtps,payload); ++ rtp_session_set_send_payload_type(rtps,payload); ++ rtp_session_set_recv_payload_type(rtps,payload); + rtp_session_set_jitter_compensation(rtps,jitt_comp); + + rtpr=rtp_session_new(RTP_SESSION_RECVONLY); +@@ -158,7 +162,6 @@ + rtp_session_set_blocking_mode(rtpr,0); + rtp_session_set_payload_type(rtpr,payload); + rtp_session_set_jitter_compensation(rtpr,jitt_comp); +- rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,NULL); + rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL); + *recv=rtpr; + *send=rtps; +@@ -179,8 +182,6 @@ + rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,(gpointer)stream); + rtps=rtpr; + +- stream->recv_session = rtpr; +- stream->send_session = rtps; + stream->rtpsend=ms_rtp_send_new(); + ms_rtp_send_set_session(MS_RTP_SEND(stream->rtpsend),rtps); + stream->rtprecv=ms_rtp_recv_new(); +@@ -192,7 +193,13 @@ + else stream->soundread=ms_read_new(infile); + if (outfile==NULL) stream->soundwrite=snd_card_create_write_filter(playcard); + else stream->soundwrite=ms_write_new(outfile); +- ++ ++ if ((stream->soundread==NULL) || (stream->soundwrite==NULL)){ ++ /* big problem: we do not have valid sound input/output */ ++ g_error("mediastream.c: No soundcard input/output available."); ++ return NULL; ++ } ++ + /* creates the couple of encoder/decoder */ + pt=rtp_profile_get_payload(profile,payload); + if (pt==NULL){ +@@ -217,8 +224,8 @@ + ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FREQ,&pt->clock_rate); + ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_BITRATE,&pt->normal_bitrate); + +- ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP, (void*)pt->fmtp); +- ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->fmtp); ++ ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->send_fmtp); ++ ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->recv_fmtp); + /* create the synchronisation source */ + stream->timer=ms_timer_new(); + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h Thu Apr 20 02:38:21 2006 +@@ -36,7 +36,7 @@ + /* the MSGSMDecoder derivates from MSFilter, so the MSFilter object MUST be the first of the MSGSMDecoder object + in order to the object mechanism to work*/ + MSFilter filter; +- MSFifo *f_inputs[MSGSMDECODER_MAX_INPUTS]; ++ MSQueue *q_inputs[MSGSMDECODER_MAX_INPUTS]; + MSFifo *f_outputs[MSGSMDECODER_MAX_INPUTS]; + gsm gsm_handle; + } MSGSMDecoder; +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h Thu Apr 20 02:38:21 2006 +@@ -36,7 +36,7 @@ + in order to the object mechanism to work*/ + MSFilter filter; + MSFifo *f_inputs[MSGSMENCODER_MAX_INPUTS]; +- MSFifo *f_outputs[MSGSMENCODER_MAX_INPUTS]; ++ MSQueue *q_outputs[MSGSMENCODER_MAX_INPUTS]; + gsm gsm_handle; + } MSGSMEncoder; + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msbuffer.h.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msbuffer.h Thu Apr 20 02:38:21 2006 +@@ -48,11 +48,12 @@ + struct _MSMessage + { + MSBuffer *buffer; /* points to a MSBuffer */ +- void *data; /*points to buffer->buffer */ ++ char *data; /*points to buffer->buffer */ + guint32 size; /* the size of the buffer to read in data. It may not be the + physical size (I mean buffer->buffer->size */ + struct _MSMessage *next; + struct _MSMessage *prev; /* MSMessage are queued into MSQueues */ ++ gboolean markbit; + }; + + typedef struct _MSMessage MSMessage; +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfifo.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfifo.c Thu Apr 20 02:38:21 2006 +@@ -123,7 +123,7 @@ + /* fix readsize and writesize */ + fifo->readsize-=unwritten; + fifo->writesize+=unwritten; +- fifo->wr_ptr+=written; ++ fifo->wr_ptr=fifo->prev_wr_ptr+written; + } + + gint ms_fifo_get_write_ptr(MSFifo *fifo, gint bsize, void **ret_ptr) +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.c Thu Apr 20 02:38:21 2006 +@@ -53,4 +53,7 @@ + q->size++; + } + ++MSMessage *ms_queue_peek_last(MSQueue *q){ ++ return q->last; ++} + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h Thu Apr 20 02:38:21 2006 +@@ -41,6 +41,8 @@ + + void ms_queue_put(MSQueue *q, MSMessage *m); + ++MSMessage *ms_queue_peek_last(MSQueue *q); ++ + #define ms_queue_can_get(q) ( (q)->size!=0 ) + + #define ms_queue_destroy(q) g_free(q) + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h.orig Thu Mar 16 18:43:05 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h Fri Apr 21 10:56:34 2006 +@@ -34,7 +34,7 @@ + + #define MSRTPRECV_MAX_OUTPUTS 1 /* max output per filter*/ + +-#define MSRTPRECV_DEF_GRAN 4096 /* the default granularity*/ ++#define MSRTPRECV_DEF_GRAN 320 /* the default granularity*/ + + struct _MSRtpRecv + { +@@ -47,6 +47,8 @@ + RtpSession *rtpsession; + guint32 prev_ts; + gint stream_started; ++ gint payload_expected; ++ gboolean ignore; + }; + + typedef struct _MSRtpRecv MSRtpRecv; +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c Thu Apr 20 02:38:21 2006 +@@ -85,7 +85,7 @@ + { + guint32 clockts; + /* use the sync system time to compute a timestamp */ +- PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type); ++ PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->recv_pt); + g_return_val_if_fail(pt!=NULL,0); + clockts=(guint32)(((double)synctime * (double)pt->clock_rate)/1000.0); + ms_trace("ms_rtp_send_process: sync->time=%i clock=%i",synctime,clockts); +@@ -139,8 +139,9 @@ + ts=get_new_timestamp(r,synctime); + if (!skip) { + /*g_message("Sending packet with ts=%u",ts);*/ +- rtp_session_send_with_ts(r->rtpsession,msg->data,msg->size,ts); +- ++ mblk_t *packet=rtp_session_create_packet_with_data(r->rtpsession,msg->data,msg->size,NULL); ++ rtp_set_markbit(packet,msg->markbit); ++ rtp_session_sendm_with_ts(r->rtpsession,packet,ts); + } + ms_message_destroy(msg); + } +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h.orig Fri May 5 23:32:24 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h Fri May 5 23:32:42 2006 +@@ -34,7 +34,7 @@ + + #define MSRTPSEND_MAX_INPUTS 1 /* max input per filter*/ + +-#define MSRTPSEND_DEF_GRAN 4096/* the default granularity*/ ++#define MSRTPSEND_DEF_GRAN 160 /* the default granularity*/ + + struct _MSRtpSend + { +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.c Thu Apr 20 02:38:22 2006 +@@ -171,6 +171,7 @@ + void ms_speex_dec_uninit_core(MSSpeexDec *obj) + { + speex_decoder_destroy(obj->speex_state); ++ speex_bits_destroy(&obj->bits); + obj->initialized=0; + } + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.c Thu Apr 20 02:38:22 2006 +@@ -157,6 +157,7 @@ + { + if (obj->initialized){ + speex_encoder_destroy(obj->speex_state); ++ speex_bits_destroy(&obj->bits); + obj->initialized=0; + } + } +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c Thu Apr 20 02:38:22 2006 +@@ -189,5 +189,6 @@ + g_mutex_free(sync->lock); + g_cond_free(sync->thread_cond); + g_cond_free(sync->stop_cond); ++ return 0; + } + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.c Thu Apr 20 02:38:22 2006 +@@ -66,6 +66,8 @@ + else { + gint32 diff,time; + struct timeval tv,cur; ++ ++ timer->sync.time+=timer->milisec; + + gettimeofday(&cur,NULL); + time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 ); +@@ -74,14 +76,13 @@ + } + while((diff = timer->sync.time-time) > 0) + { +- tv.tv_sec = diff/1000; +- tv.tv_usec = (diff%1000)*1000; ++ tv.tv_sec = timer->milisec/1000; ++ tv.tv_usec = (timer->milisec%1000)*1000; + select(0,NULL,NULL,NULL,&tv); + gettimeofday(&cur,NULL); + time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 ); + } + } +- timer->sync.time+=timer->milisec; + return; + } + +--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.c.orig Mon Mar 20 23:18:36 2006 ++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.c Thu Apr 20 02:38:22 2006 +@@ -342,7 +342,7 @@ + { + int p=0,mix_fd; + int osscmd; +- g_return_if_fail(obj->mixdev_name!=NULL); ++ g_return_val_if_fail(obj->mixdev_name!=NULL,-1); + #ifdef HAVE_SYS_SOUNDCARD_H + switch(way){ + case SND_CARD_LEVEL_GENERAL: +--- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h.orig Wed May 10 07:43:35 2006 ++++ kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h Wed May 10 07:44:01 2006 +@@ -48,7 +48,7 @@ + + FormatXmppPassword credential; + credential.Append("\0", 1); +- credential.Append(user_jid_.Str()); ++ credential.Append(user_jid_.node()); + credential.Append("\0", 1); + credential.Append(&password_); + el->AddText(Base64EncodeFromArray(credential.GetData(), credential.GetLength())); +--- kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c.orig Sun Oct 1 19:26:45 2006 ++++ kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c Mon Dec 18 16:26:36 2006 +@@ -26,7 +26,7 @@ + MSMessage *msgb_2_ms_message(mblk_t* mp){ + MSMessage *msg; + MSBuffer *msbuf; +- if (mp->b_datap->ref_count!=1) return NULL; /* cannot handle properly non-unique buffers*/ ++ if (mp->b_datap->db_ref!=1) return NULL; /* cannot handle properly non-unique buffers*/ + /* create a MSBuffer using the mblk_t buffer */ + msg=ms_message_alloc(); + msbuf=ms_buffer_alloc(0); +@@ -70,6 +70,8 @@ + memset(r->q_outputs,0,sizeof(MSFifo*)*MSRTPRECV_MAX_OUTPUTS); + r->rtpsession=NULL; + r->stream_started=0; ++ r->ignore=FALSE; ++ r->payload_expected=0; + } + + void ms_rtp_recv_class_init(MSRtpRecvClass *klass) +@@ -120,7 +122,7 @@ + gint got=0; + /* we are connected with queues (surely for video)*/ + /* use the sync system time to compute a timestamp */ +- PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type); ++ PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->send_pt); + if (pt==NULL) { + ms_warning("ms_rtp_recv_process(): NULL RtpPayload- skipping."); + return; +@@ -134,10 +136,16 @@ + /*g_message("Got packet with timestamp %u",clock);*/ + got++; + r->stream_started=1; +- mdata=mp->b_cont; +- freeb(mp); +- msg=msgb_2_ms_message(mdata); +- ms_queue_put(qo,msg); ++ if (!r->ignore){ ++ gboolean markbit=((rtp_header_t*)mp->b_rptr)->markbit; ++ mdata=mp->b_cont; ++ freeb(mp); ++ msg=msgb_2_ms_message(mdata); ++ msg->markbit=markbit; ++ ms_queue_put(qo,msg); ++ }else{ ++ freemsg(mp); ++ } + } + } + } +@@ -147,10 +155,24 @@ + g_free(obj); + } + ++static void __payload_type_changed(RtpSession *session,MSRtpRecv *obj){ ++ int pt_num=rtp_session_get_recv_payload_type(session); ++ PayloadType *pt=rtp_profile_get_payload(rtp_session_get_profile(session),pt_num); ++ if (pt==NULL){ ++ /* sip phone should ignore payload types they don't understand */ ++ g_warning("Ignoring payload type %i",pt_num); ++ obj->ignore=TRUE; ++ }else{ ++ if (obj->ignore) g_warning("payload type is coming back to something known"); ++ obj->ignore=FALSE; ++ } ++} ++ + RtpSession * ms_rtp_recv_set_session(MSRtpRecv *obj,RtpSession *session) + { + RtpSession *old=obj->rtpsession; + obj->rtpsession=session; ++ rtp_session_signal_connect(session,"payload_type_changed",(RtpCallback)__payload_type_changed,(unsigned long)obj); + obj->prev_ts=0; + return old; + } diff --git a/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h b/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h deleted file mode 100644 index 98cf48d8dd43..000000000000 --- a/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- kopete/protocols/oscar/liboscar/oscartypes.h.orig Tue Aug 15 18:44:35 2006 -+++ kopete/protocols/oscar/liboscar/oscartypes.h Tue Aug 15 18:45:06 2006 -@@ -237,7 +237,7 @@ - const WORD ICQ_MAJOR = 0x0014; - const WORD ICQ_MINOR = 0x0034; - const WORD ICQ_POINT = 0x0000; -- const WORD ICQ_BUILD = 0x0A0F; -+ const WORD ICQ_BUILD = 0x0BB8; - const char ICQ_OTHER[] = { 0x00, 0x00, 0x04, 0x3d }; - const char ICQ_COUNTRY[] = "us"; - const char ICQ_LANG[] = "en"; diff --git a/net-im/kopete/pkg-plist b/net-im/kopete/pkg-plist index bba9565d24b8..e6b076161a67 100644 --- a/net-im/kopete/pkg-plist +++ b/net-im/kopete/pkg-plist @@ -1,5 +1,7 @@ bin/kopete bin/kopete_latexconvert.sh +bin/winpopup-install.sh +bin/winpopup-send.sh include/kopete/kabcpersistence.h include/kopete/kopete_export.h include/kopete/kopeteaccount.h @@ -29,17 +31,19 @@ include/kopete/kopeteonlinestatus.h include/kopete/kopeteonlinestatusmanager.h include/kopete/kopetepassword.h include/kopete/kopetepasswordedaccount.h +include/kopete/kopetepicture.h include/kopete/kopeteplugin.h +include/kopete/kopeteprefs.h include/kopete/kopeteprotocol.h include/kopete/kopetesimplemessagehandler.h include/kopete/kopetetask.h include/kopete/kopetetransfermanager.h include/kopete/kopeteuiglobal.h include/kopete/kopeteversion.h -include/kopete/kopetexsl.h include/kopete/managedconnectionaccount.h include/kopete/ui/accountselector.h include/kopete/ui/addcontactpage.h +include/kopete/ui/addressbooklinkwidget.h include/kopete/ui/addressbookselectordialog.h include/kopete/ui/addressbookselectorwidget.h include/kopete/ui/editaccountwidget.h @@ -57,6 +61,7 @@ include/kopete/ui/kopetestdaction.h include/kopete/ui/kopeteview.h include/kopete/ui/kopeteviewplugin.h include/kopete/ui/userinfodialog.h +include/kopete/webcamwidget.h lib/kconf_update_bin/kopete-account-kconf_update lib/kconf_update_bin/kopete-nameTracking-kconf_update lib/kconf_update_bin/kopete-pluginloader2-kconf_update @@ -177,9 +182,6 @@ lib/kde3/kopete_netmeeting.so lib/kde3/kopete_nowlistening.a lib/kde3/kopete_nowlistening.la lib/kde3/kopete_nowlistening.so -lib/kde3/kopete_sms.a -lib/kde3/kopete_sms.la -lib/kde3/kopete_sms.so lib/kde3/kopete_statistics.a lib/kde3/kopete_statistics.la lib/kde3/kopete_statistics.so @@ -195,6 +197,9 @@ lib/kde3/kopete_translator.so lib/kde3/kopete_webpresence.a lib/kde3/kopete_webpresence.la lib/kde3/kopete_webpresence.so +lib/kde3/kopete_wp.a +lib/kde3/kopete_wp.la +lib/kde3/kopete_wp.so lib/kde3/kopete_yahoo.a lib/kde3/kopete_yahoo.la lib/kde3/kopete_yahoo.so @@ -235,21 +240,13 @@ share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/kopete_avdevice.png share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/testbed_protocol.png +share/apps/kopete/icons/crystalsvg/128x128/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/actions/account_offline_overlay.png share/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng share/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png share/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_away_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_busy_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_food_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_invisible_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_phone_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/contact_xa_overlay.png -share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png share/apps/kopete/icons/crystalsvg/16x16/actions/gg_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy.png share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png @@ -285,29 +282,10 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png share/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png share/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png share/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png -share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key1.png share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png -share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png @@ -320,41 +298,30 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png -share/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png -share/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png +share/apps/kopete/icons/crystalsvg/16x16/actions/wp_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png +share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_stealthed.png share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/testbed_protocol.png +share/apps/kopete/icons/crystalsvg/16x16/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/22x22/actions/account_offline_overlay.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png share/apps/kopete/icons/crystalsvg/22x22/actions/logging.png +share/apps/kopete/icons/crystalsvg/22x22/actions/yahoo_stealthed.png share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/22x22/apps/kopete_avdevice.png -share/apps/kopete/icons/crystalsvg/32x32/actions/account_offline_overlay.png -share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_online.png -share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_unknown.png -share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng -share/apps/kopete/icons/crystalsvg/32x32/actions/newmsg.png +share/apps/kopete/icons/crystalsvg/32x32/actions/yahoo_stealthed.png share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png @@ -362,27 +329,20 @@ share/apps/kopete/icons/crystalsvg/32x32/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/kopete_avdevice.png share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/testbed_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png +share/apps/kopete/icons/crystalsvg/32x32/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png -share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png share/apps/kopete/icons/crystalsvg/48x48/actions/logging.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_away.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_offline.png -share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_online.png share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/testbed_protocol.png +share/apps/kopete/icons/crystalsvg/48x48/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png share/apps/kopete/icons/crystalsvg/64x64/actions/logging.png share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png @@ -390,15 +350,13 @@ share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/kopete_avdevice.png share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png -share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/testbed_protocol.png +share/apps/kopete/icons/crystalsvg/64x64/apps/wp_protocol.png share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png -share/apps/kopete/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz share/apps/kopete/icons/hicolor/16x16/actions/aim_away.png share/apps/kopete/icons/hicolor/16x16/actions/aim_connecting.mng share/apps/kopete/icons/hicolor/16x16/actions/aim_offline.png share/apps/kopete/icons/hicolor/16x16/actions/aim_online.png -share/apps/kopete/icons/hicolor/16x16/actions/emoticon.png share/apps/kopete/icons/hicolor/16x16/actions/icq_away.png share/apps/kopete/icons/hicolor/16x16/actions/icq_connecting.mng share/apps/kopete/icons/hicolor/16x16/actions/icq_dnd.png @@ -408,37 +366,10 @@ share/apps/kopete/icons/hicolor/16x16/actions/icq_na.png share/apps/kopete/icons/hicolor/16x16/actions/icq_occupied.png share/apps/kopete/icons/hicolor/16x16/actions/icq_offline.png share/apps/kopete/icons/hicolor/16x16/actions/icq_online.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_away.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_chatty.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng -share/apps/kopete/icons/hicolor/16x16/actions/jabber_group.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_invisible.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_na.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_offline.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_online.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_original.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_raw.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_off.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_on.png -share/apps/kopete/icons/hicolor/16x16/actions/jabber_xa.png -share/apps/kopete/icons/hicolor/16x16/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/16x16/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/16x16/actions/newmsg.png -share/apps/kopete/icons/hicolor/16x16/actions/status_unknown.png share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png -share/apps/kopete/icons/hicolor/16x16/apps/jabber_protocol.png -share/apps/kopete/icons/hicolor/22x22/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/22x22/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/32x32/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/32x32/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/32x32/actions/newmessage.mng share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png -share/apps/kopete/icons/hicolor/32x32/apps/jabber_protocol.png -share/apps/kopete/icons/hicolor/48x48/actions/kopeteavailable.png -share/apps/kopete/icons/hicolor/48x48/actions/kopeteaway.png -share/apps/kopete/icons/hicolor/48x48/apps/jabber_protocol.png share/apps/kopete/ircchatui.rc share/apps/kopete/ircnetworks.xml share/apps/kopete/kopetechatwindow.rc @@ -451,341 +382,158 @@ share/apps/kopete/pics/statistics/black.png share/apps/kopete/pics/statistics/blue.png share/apps/kopete/pics/statistics/gray.png share/apps/kopete/pics/statistics/navy.png -share/apps/kopete/styles/Adium.xsl -share/apps/kopete/styles/Enclosed.xsl -share/apps/kopete/styles/Gaim.xsl -share/apps/kopete/styles/Keramik.xsl -share/apps/kopete/styles/Konsole.xsl -share/apps/kopete/styles/Kopete-old.xsl -share/apps/kopete/styles/Kopete.xsl -share/apps/kopete/styles/MSN.xsl -share/apps/kopete/styles/Minimal.xsl -share/apps/kopete/styles/XChat.xsl -share/apps/kopete/styles/data/Adium/adium.js -share/apps/kopete/styles/data/Kopete/action.png -share/apps/kopete/styles/data/Kopete/important.png -share/apps/kopete/styles/data/Kopete/system.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/br.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/blue/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/br.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/blue/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/blue/me.png -share/apps/kopete/styles/data/iChat-Trans/blue/them.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/br.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/clear/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/br.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/clear/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/clear/me.png -share/apps/kopete/styles/data/iChat-Trans/clear/them.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/br.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/br.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/graphite/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/graphite/me.png -share/apps/kopete/styles/data/iChat-Trans/graphite/them.png -share/apps/kopete/styles/data/iChat-Trans/green/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/green/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/br.png -share/apps/kopete/styles/data/iChat-Trans/green/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/green/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/green/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/green/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/green/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/br.png -share/apps/kopete/styles/data/iChat-Trans/green/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/green/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/green/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/green/me.png -share/apps/kopete/styles/data/iChat-Trans/green/them.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/br.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/orange/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/br.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/orange/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/orange/me.png -share/apps/kopete/styles/data/iChat-Trans/orange/them.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/br.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/pink/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/br.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/pink/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/pink/me.png -share/apps/kopete/styles/data/iChat-Trans/pink/them.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/br.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/purple/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/br.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/purple/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/purple/me.png -share/apps/kopete/styles/data/iChat-Trans/purple/them.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/bl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/bm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/br.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/ml.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/mm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/mr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/From/tr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/bl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/bm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/br.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/ml.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/mm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/mr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tl.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tm.png -share/apps/kopete/styles/data/iChat-Trans/yellow/To/tr.png -share/apps/kopete/styles/data/iChat-Trans/yellow/me.png -share/apps/kopete/styles/data/iChat-Trans/yellow/them.png -share/apps/kopete/styles/data/iChat/blue/From/bl.png -share/apps/kopete/styles/data/iChat/blue/From/bm.png -share/apps/kopete/styles/data/iChat/blue/From/br.png -share/apps/kopete/styles/data/iChat/blue/From/ml.png -share/apps/kopete/styles/data/iChat/blue/From/mm.png -share/apps/kopete/styles/data/iChat/blue/From/mr.png -share/apps/kopete/styles/data/iChat/blue/From/tl.png -share/apps/kopete/styles/data/iChat/blue/From/tm.png -share/apps/kopete/styles/data/iChat/blue/From/tr.png -share/apps/kopete/styles/data/iChat/blue/To/bl.png -share/apps/kopete/styles/data/iChat/blue/To/bm.png -share/apps/kopete/styles/data/iChat/blue/To/br.png -share/apps/kopete/styles/data/iChat/blue/To/ml.png -share/apps/kopete/styles/data/iChat/blue/To/mm.png -share/apps/kopete/styles/data/iChat/blue/To/mr.png -share/apps/kopete/styles/data/iChat/blue/To/tl.png -share/apps/kopete/styles/data/iChat/blue/To/tm.png -share/apps/kopete/styles/data/iChat/blue/To/tr.png -share/apps/kopete/styles/data/iChat/blue/me.png -share/apps/kopete/styles/data/iChat/blue/them.png -share/apps/kopete/styles/data/iChat/clear/From/bl.png -share/apps/kopete/styles/data/iChat/clear/From/bm.png -share/apps/kopete/styles/data/iChat/clear/From/br.png -share/apps/kopete/styles/data/iChat/clear/From/ml.png -share/apps/kopete/styles/data/iChat/clear/From/mm.png -share/apps/kopete/styles/data/iChat/clear/From/mr.png -share/apps/kopete/styles/data/iChat/clear/From/tl.png -share/apps/kopete/styles/data/iChat/clear/From/tm.png -share/apps/kopete/styles/data/iChat/clear/From/tr.png -share/apps/kopete/styles/data/iChat/clear/To/bl.png -share/apps/kopete/styles/data/iChat/clear/To/bm.png -share/apps/kopete/styles/data/iChat/clear/To/br.png -share/apps/kopete/styles/data/iChat/clear/To/ml.png -share/apps/kopete/styles/data/iChat/clear/To/mm.png -share/apps/kopete/styles/data/iChat/clear/To/mr.png -share/apps/kopete/styles/data/iChat/clear/To/tl.png -share/apps/kopete/styles/data/iChat/clear/To/tm.png -share/apps/kopete/styles/data/iChat/clear/To/tr.png -share/apps/kopete/styles/data/iChat/clear/me.png -share/apps/kopete/styles/data/iChat/clear/them.png -share/apps/kopete/styles/data/iChat/graphite/From/bl.png -share/apps/kopete/styles/data/iChat/graphite/From/bm.png -share/apps/kopete/styles/data/iChat/graphite/From/br.png -share/apps/kopete/styles/data/iChat/graphite/From/ml.png -share/apps/kopete/styles/data/iChat/graphite/From/mm.png -share/apps/kopete/styles/data/iChat/graphite/From/mr.png -share/apps/kopete/styles/data/iChat/graphite/From/tl.png -share/apps/kopete/styles/data/iChat/graphite/From/tm.png -share/apps/kopete/styles/data/iChat/graphite/From/tr.png -share/apps/kopete/styles/data/iChat/graphite/To/bl.png -share/apps/kopete/styles/data/iChat/graphite/To/bm.png -share/apps/kopete/styles/data/iChat/graphite/To/br.png -share/apps/kopete/styles/data/iChat/graphite/To/ml.png -share/apps/kopete/styles/data/iChat/graphite/To/mm.png -share/apps/kopete/styles/data/iChat/graphite/To/mr.png -share/apps/kopete/styles/data/iChat/graphite/To/tl.png -share/apps/kopete/styles/data/iChat/graphite/To/tm.png -share/apps/kopete/styles/data/iChat/graphite/To/tr.png -share/apps/kopete/styles/data/iChat/graphite/me.png -share/apps/kopete/styles/data/iChat/graphite/them.png -share/apps/kopete/styles/data/iChat/green/From/bl.png -share/apps/kopete/styles/data/iChat/green/From/bm.png -share/apps/kopete/styles/data/iChat/green/From/br.png -share/apps/kopete/styles/data/iChat/green/From/ml.png -share/apps/kopete/styles/data/iChat/green/From/mm.png -share/apps/kopete/styles/data/iChat/green/From/mr.png -share/apps/kopete/styles/data/iChat/green/From/tl.png -share/apps/kopete/styles/data/iChat/green/From/tm.png -share/apps/kopete/styles/data/iChat/green/From/tr.png -share/apps/kopete/styles/data/iChat/green/To/bl.png -share/apps/kopete/styles/data/iChat/green/To/bm.png -share/apps/kopete/styles/data/iChat/green/To/br.png -share/apps/kopete/styles/data/iChat/green/To/ml.png -share/apps/kopete/styles/data/iChat/green/To/mm.png -share/apps/kopete/styles/data/iChat/green/To/mr.png -share/apps/kopete/styles/data/iChat/green/To/tl.png -share/apps/kopete/styles/data/iChat/green/To/tm.png -share/apps/kopete/styles/data/iChat/green/To/tr.png -share/apps/kopete/styles/data/iChat/green/me.png -share/apps/kopete/styles/data/iChat/green/them.png -share/apps/kopete/styles/data/iChat/orange/From/bl.png -share/apps/kopete/styles/data/iChat/orange/From/bm.png -share/apps/kopete/styles/data/iChat/orange/From/br.png -share/apps/kopete/styles/data/iChat/orange/From/ml.png -share/apps/kopete/styles/data/iChat/orange/From/mm.png -share/apps/kopete/styles/data/iChat/orange/From/mr.png -share/apps/kopete/styles/data/iChat/orange/From/tl.png -share/apps/kopete/styles/data/iChat/orange/From/tm.png -share/apps/kopete/styles/data/iChat/orange/From/tr.png -share/apps/kopete/styles/data/iChat/orange/To/bl.png -share/apps/kopete/styles/data/iChat/orange/To/bm.png -share/apps/kopete/styles/data/iChat/orange/To/br.png -share/apps/kopete/styles/data/iChat/orange/To/ml.png -share/apps/kopete/styles/data/iChat/orange/To/mm.png -share/apps/kopete/styles/data/iChat/orange/To/mr.png -share/apps/kopete/styles/data/iChat/orange/To/tl.png -share/apps/kopete/styles/data/iChat/orange/To/tm.png -share/apps/kopete/styles/data/iChat/orange/To/tr.png -share/apps/kopete/styles/data/iChat/orange/me.png -share/apps/kopete/styles/data/iChat/orange/them.png -share/apps/kopete/styles/data/iChat/pink/From/bl.png -share/apps/kopete/styles/data/iChat/pink/From/bm.png -share/apps/kopete/styles/data/iChat/pink/From/br.png -share/apps/kopete/styles/data/iChat/pink/From/ml.png -share/apps/kopete/styles/data/iChat/pink/From/mm.png -share/apps/kopete/styles/data/iChat/pink/From/mr.png -share/apps/kopete/styles/data/iChat/pink/From/tl.png -share/apps/kopete/styles/data/iChat/pink/From/tm.png -share/apps/kopete/styles/data/iChat/pink/From/tr.png -share/apps/kopete/styles/data/iChat/pink/To/bl.png -share/apps/kopete/styles/data/iChat/pink/To/bm.png -share/apps/kopete/styles/data/iChat/pink/To/br.png -share/apps/kopete/styles/data/iChat/pink/To/ml.png -share/apps/kopete/styles/data/iChat/pink/To/mm.png -share/apps/kopete/styles/data/iChat/pink/To/mr.png -share/apps/kopete/styles/data/iChat/pink/To/tl.png -share/apps/kopete/styles/data/iChat/pink/To/tm.png -share/apps/kopete/styles/data/iChat/pink/To/tr.png -share/apps/kopete/styles/data/iChat/pink/me.png -share/apps/kopete/styles/data/iChat/pink/them.png -share/apps/kopete/styles/data/iChat/purple/From/bl.png -share/apps/kopete/styles/data/iChat/purple/From/bm.png -share/apps/kopete/styles/data/iChat/purple/From/br.png -share/apps/kopete/styles/data/iChat/purple/From/ml.png -share/apps/kopete/styles/data/iChat/purple/From/mm.png -share/apps/kopete/styles/data/iChat/purple/From/mr.png -share/apps/kopete/styles/data/iChat/purple/From/tl.png -share/apps/kopete/styles/data/iChat/purple/From/tm.png -share/apps/kopete/styles/data/iChat/purple/From/tr.png -share/apps/kopete/styles/data/iChat/purple/To/bl.png -share/apps/kopete/styles/data/iChat/purple/To/bm.png -share/apps/kopete/styles/data/iChat/purple/To/br.png -share/apps/kopete/styles/data/iChat/purple/To/ml.png -share/apps/kopete/styles/data/iChat/purple/To/mm.png -share/apps/kopete/styles/data/iChat/purple/To/mr.png -share/apps/kopete/styles/data/iChat/purple/To/tl.png -share/apps/kopete/styles/data/iChat/purple/To/tm.png -share/apps/kopete/styles/data/iChat/purple/To/tr.png -share/apps/kopete/styles/data/iChat/purple/me.png -share/apps/kopete/styles/data/iChat/purple/them.png -share/apps/kopete/styles/data/iChat/yellow/From/bl.png -share/apps/kopete/styles/data/iChat/yellow/From/bm.png -share/apps/kopete/styles/data/iChat/yellow/From/br.png -share/apps/kopete/styles/data/iChat/yellow/From/ml.png -share/apps/kopete/styles/data/iChat/yellow/From/mm.png -share/apps/kopete/styles/data/iChat/yellow/From/mr.png -share/apps/kopete/styles/data/iChat/yellow/From/tl.png -share/apps/kopete/styles/data/iChat/yellow/From/tm.png -share/apps/kopete/styles/data/iChat/yellow/From/tr.png -share/apps/kopete/styles/data/iChat/yellow/To/bl.png -share/apps/kopete/styles/data/iChat/yellow/To/bm.png -share/apps/kopete/styles/data/iChat/yellow/To/br.png -share/apps/kopete/styles/data/iChat/yellow/To/ml.png -share/apps/kopete/styles/data/iChat/yellow/To/mm.png -share/apps/kopete/styles/data/iChat/yellow/To/mr.png -share/apps/kopete/styles/data/iChat/yellow/To/tl.png -share/apps/kopete/styles/data/iChat/yellow/To/tm.png -share/apps/kopete/styles/data/iChat/yellow/To/tr.png -share/apps/kopete/styles/data/iChat/yellow/me.png -share/apps/kopete/styles/data/iChat/yellow/them.png -share/apps/kopete/styles/iChat.xsl +share/apps/kopete/styles/Clean/Contents/Resources/Footer.html +share/apps/kopete/styles/Clean/Contents/Resources/Header.html +share/apps/kopete/styles/Clean/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png +share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png +share/apps/kopete/styles/Clean/Contents/Resources/Status.html +share/apps/kopete/styles/Clean/Contents/Resources/images/action.png +share/apps/kopete/styles/Clean/Contents/Resources/images/important.png +share/apps/kopete/styles/Clean/Contents/Resources/images/internal.png +share/apps/kopete/styles/Clean/Contents/Resources/main.css +share/apps/kopete/styles/Clear/Contents/Resources/Footer.html +share/apps/kopete/styles/Clear/Contents/Resources/Header.html +share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Action.html +share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png +share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Action.html +share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/buddy_icon.png +share/apps/kopete/styles/Clear/Contents/Resources/Status.html +share/apps/kopete/styles/Clear/Contents/Resources/images/body-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-arrow.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-avatar.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-arrow.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-avatar.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-background.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-left.png +share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-right.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-action.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-highlighted.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-internal.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-me.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-time.png +share/apps/kopete/styles/Clear/Contents/Resources/images/icon-you.png +share/apps/kopete/styles/Clear/Contents/Resources/main.css +share/apps/kopete/styles/Gaim/Contents/Resources/Footer.html +share/apps/kopete/styles/Gaim/Contents/Resources/Header.html +share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html +share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html +share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Gaim/Contents/Resources/Status.html +share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css +share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css +share/apps/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css +share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css +share/apps/kopete/styles/Gaim/Contents/Resources/main.css +share/apps/kopete/styles/Hacker/COPYRIGHT +share/apps/kopete/styles/Hacker/Contents/Info.plist +share/apps/kopete/styles/Hacker/Contents/Resources/Footer.html +share/apps/kopete/styles/Hacker/Contents/Resources/Header.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Action.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Context.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContext.html +share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/buddy_icon.png +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Action.html +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Context.html +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContext.html +share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/buddy_icon.png +share/apps/kopete/styles/Hacker/Contents/Resources/Status.html +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark-Noback.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2-Noback.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light-Noback.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2-Noback.css +share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2.css +share/apps/kopete/styles/Hacker/Contents/Resources/images/background.png +share/apps/kopete/styles/Hacker/Contents/Resources/images/background2.png +share/apps/kopete/styles/Hacker/Contents/Resources/images/kopete.png +share/apps/kopete/styles/Hacker/Contents/Resources/main.css +share/apps/kopete/styles/Hacker/README +share/apps/kopete/styles/Hacker/gpl.txt +share/apps/kopete/styles/Konqi/Contents/Resources/Footer.html +share/apps/kopete/styles/Konqi/Contents/Resources/Header.html +share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png +share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/buddy_icon.png +share/apps/kopete/styles/Konqi/Contents/Resources/Status.html +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon_without_transparency.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_without_transparency.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_trans.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_transparency.css +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre1.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre2.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre3.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre4.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre5.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre6.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png +share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-moon.jpg +share/apps/kopete/styles/Konqi/Contents/Resources/main.css +share/apps/kopete/styles/Konqi/Contents/Resources/puce.png +share/apps/kopete/styles/Kopete/Contents/Resources/Footer.html +share/apps/kopete/styles/Kopete/Contents/Resources/Header.html +share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Action.html +share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png +share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html +share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png +share/apps/kopete/styles/Kopete/Contents/Resources/Status.html +share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css +share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css +share/apps/kopete/styles/Kopete/Contents/Resources/images/action.png +share/apps/kopete/styles/Kopete/Contents/Resources/images/important.png +share/apps/kopete/styles/Kopete/Contents/Resources/images/system.png +share/apps/kopete/styles/Kopete/Contents/Resources/main.css +share/apps/kopete/styles/Retropete/Contents/Resources/Footer.html +share/apps/kopete/styles/Retropete/Contents/Resources/Header.html +share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Action.html +share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Content.html +share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/NextContent.html +share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Action.html +share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Content.html +share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/NextContent.html +share/apps/kopete/styles/Retropete/Contents/Resources/Status.html +share/apps/kopete/styles/Retropete/Contents/Resources/main.css share/apps/kopete/webpresence/webpresence_html.xsl share/apps/kopete/webpresence/webpresence_html_images.xsl share/apps/kopete/webpresence/webpresence_xhtml.xsl @@ -796,6 +544,7 @@ share/apps/kopete_cryptography/cryptographyui.rc share/apps/kopete_groupwise/gwchatui.rc share/apps/kopete_history/historychatui.rc share/apps/kopete_history/historyui.rc +share/apps/kopete_jabber/jabberchatui.rc share/apps/kopete_latex/latexchatui.rc share/apps/kopete_msn/msnchatui.rc share/apps/kopete_netmeeting/netmeetingchatui.rc @@ -803,22 +552,151 @@ share/apps/kopete_statistics/statisticsui.rc share/apps/kopete_translator/translatorchatui.rc share/apps/kopete_translator/translatorui.rc share/apps/kopete_yahoo/yahoochatui.rc +share/apps/kopete_yahoo/yahooconferenceui.rc share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc share/config.kcfg/historyconfig.kcfg share/config.kcfg/kopete.kcfg share/config.kcfg/kopeteidentityconfigpreferences.kcfg share/config.kcfg/latexconfig.kcfg share/config.kcfg/nowlisteningconfig.kcfg +share/icons/crystalsvg/128x128/actions/voicecall.png +share/icons/crystalsvg/128x128/actions/webcamreceive.png +share/icons/crystalsvg/128x128/actions/webcamsend.png +share/icons/crystalsvg/16x16/actions/account_offline_overlay.png +share/icons/crystalsvg/16x16/actions/add_user.png +share/icons/crystalsvg/16x16/actions/contact_away_overlay.png +share/icons/crystalsvg/16x16/actions/contact_busy_overlay.png +share/icons/crystalsvg/16x16/actions/contact_food_overlay.png +share/icons/crystalsvg/16x16/actions/contact_invisible_overlay.png +share/icons/crystalsvg/16x16/actions/contact_phone_overlay.png +share/icons/crystalsvg/16x16/actions/contact_xa_overlay.png +share/icons/crystalsvg/16x16/actions/delete_user.png +share/icons/crystalsvg/16x16/actions/edit_user.png +share/icons/crystalsvg/16x16/actions/emoticon.png +share/icons/crystalsvg/16x16/actions/jabber_away.png +share/icons/crystalsvg/16x16/actions/jabber_chatty.png +share/icons/crystalsvg/16x16/actions/jabber_connecting.mng +share/icons/crystalsvg/16x16/actions/jabber_group.png +share/icons/crystalsvg/16x16/actions/jabber_invisible.png +share/icons/crystalsvg/16x16/actions/jabber_na.png +share/icons/crystalsvg/16x16/actions/jabber_offline.png +share/icons/crystalsvg/16x16/actions/jabber_online.png +share/icons/crystalsvg/16x16/actions/jabber_original.png +share/icons/crystalsvg/16x16/actions/jabber_raw.png +share/icons/crystalsvg/16x16/actions/jabber_serv_off.png +share/icons/crystalsvg/16x16/actions/jabber_serv_on.png +share/icons/crystalsvg/16x16/actions/jabber_xa.png +share/icons/crystalsvg/16x16/actions/kopeteavailable.png +share/icons/crystalsvg/16x16/actions/kopeteaway.png +share/icons/crystalsvg/16x16/actions/kopeteeditstatusmessage.png +share/icons/crystalsvg/16x16/actions/kopetestatusmessage.png +share/icons/crystalsvg/16x16/actions/metacontact_away.png +share/icons/crystalsvg/16x16/actions/metacontact_offline.png +share/icons/crystalsvg/16x16/actions/metacontact_online.png +share/icons/crystalsvg/16x16/actions/metacontact_unknown.png +share/icons/crystalsvg/16x16/actions/newmsg.png +share/icons/crystalsvg/16x16/actions/search_user.png +share/icons/crystalsvg/16x16/actions/show_offliners.png +share/icons/crystalsvg/16x16/actions/status_unknown.png +share/icons/crystalsvg/16x16/actions/status_unknown_overlay.png +share/icons/crystalsvg/16x16/actions/voicecall.png +share/icons/crystalsvg/16x16/actions/webcamreceive.png +share/icons/crystalsvg/16x16/actions/webcamsend.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_aim.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_gadu.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_http/ws.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_icq.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_irc.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_msn.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_qq.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_smtp.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_tlen.png +share/icons/crystalsvg/16x16/apps/jabber_gateway_yahoo.png +share/icons/crystalsvg/16x16/apps/jabber_protocol.png share/icons/crystalsvg/16x16/mimetypes/kopete_emoticons.png +share/icons/crystalsvg/22x22/actions/account_offline_overlay.png +share/icons/crystalsvg/22x22/actions/add_user.png +share/icons/crystalsvg/22x22/actions/delete_user.png +share/icons/crystalsvg/22x22/actions/edit_user.png +share/icons/crystalsvg/22x22/actions/kopeteavailable.png +share/icons/crystalsvg/22x22/actions/kopeteaway.png +share/icons/crystalsvg/22x22/actions/kopeteeditstatusmessage.png +share/icons/crystalsvg/22x22/actions/search_user.png +share/icons/crystalsvg/22x22/actions/show_offliners.png +share/icons/crystalsvg/22x22/actions/voicecall.png +share/icons/crystalsvg/22x22/actions/webcamreceive.png +share/icons/crystalsvg/22x22/actions/webcamsend.png share/icons/crystalsvg/22x22/apps/kopete_all_away.png share/icons/crystalsvg/22x22/apps/kopete_offline.png share/icons/crystalsvg/22x22/apps/kopete_some_away.png share/icons/crystalsvg/22x22/apps/kopete_some_online.png share/icons/crystalsvg/22x22/mimetypes/kopete_emoticons.png +share/icons/crystalsvg/32x32/actions/account_offline_overlay.png +share/icons/crystalsvg/32x32/actions/add_user.png +share/icons/crystalsvg/32x32/actions/delete_user.png +share/icons/crystalsvg/32x32/actions/edit_user.png +share/icons/crystalsvg/32x32/actions/kopeteavailable.png +share/icons/crystalsvg/32x32/actions/kopeteaway.png +share/icons/crystalsvg/32x32/actions/kopeteeditstatusmessage.png +share/icons/crystalsvg/32x32/actions/metacontact_away.png +share/icons/crystalsvg/32x32/actions/metacontact_offline.png +share/icons/crystalsvg/32x32/actions/metacontact_online.png +share/icons/crystalsvg/32x32/actions/metacontact_unknown.png +share/icons/crystalsvg/32x32/actions/newmessage.mng +share/icons/crystalsvg/32x32/actions/newmsg.png +share/icons/crystalsvg/32x32/actions/search_user.png +share/icons/crystalsvg/32x32/actions/show_offliners.png +share/icons/crystalsvg/32x32/actions/voicecall.png +share/icons/crystalsvg/32x32/actions/webcamreceive.png +share/icons/crystalsvg/32x32/actions/webcamsend.png +share/icons/crystalsvg/32x32/apps/jabber_protocol.png +share/icons/crystalsvg/48x48/actions/kopeteavailable.png +share/icons/crystalsvg/48x48/actions/kopeteaway.png +share/icons/crystalsvg/48x48/actions/metacontact_away.png +share/icons/crystalsvg/48x48/actions/metacontact_offline.png +share/icons/crystalsvg/48x48/actions/metacontact_online.png +share/icons/crystalsvg/48x48/actions/voicecall.png +share/icons/crystalsvg/48x48/actions/webcamreceive.png +share/icons/crystalsvg/48x48/actions/webcamsend.png +share/icons/crystalsvg/48x48/apps/jabber_protocol.png +share/icons/crystalsvg/64x64/actions/voicecall.png +share/icons/crystalsvg/64x64/actions/webcamreceive.png +share/icons/crystalsvg/64x64/actions/webcamsend.png +share/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz share/icons/hicolor/128x128/apps/kopete.png +share/icons/hicolor/16x16/actions/emoticon.png +share/icons/hicolor/16x16/actions/jabber_away.png +share/icons/hicolor/16x16/actions/jabber_chatty.png +share/icons/hicolor/16x16/actions/jabber_connecting.mng +share/icons/hicolor/16x16/actions/jabber_group.png +share/icons/hicolor/16x16/actions/jabber_invisible.png +share/icons/hicolor/16x16/actions/jabber_na.png +share/icons/hicolor/16x16/actions/jabber_offline.png +share/icons/hicolor/16x16/actions/jabber_online.png +share/icons/hicolor/16x16/actions/jabber_original.png +share/icons/hicolor/16x16/actions/jabber_raw.png +share/icons/hicolor/16x16/actions/jabber_serv_off.png +share/icons/hicolor/16x16/actions/jabber_serv_on.png +share/icons/hicolor/16x16/actions/jabber_xa.png +share/icons/hicolor/16x16/actions/kopeteavailable.png +share/icons/hicolor/16x16/actions/kopeteaway.png +share/icons/hicolor/16x16/actions/newmsg.png +share/icons/hicolor/16x16/actions/status_unknown.png +share/icons/hicolor/16x16/actions/status_unknown_overlay.png +share/icons/hicolor/16x16/apps/jabber_protocol.png share/icons/hicolor/16x16/apps/kopete.png +share/icons/hicolor/22x22/actions/kopeteavailable.png +share/icons/hicolor/22x22/actions/kopeteaway.png share/icons/hicolor/22x22/apps/kopete.png +share/icons/hicolor/32x32/actions/kopeteavailable.png +share/icons/hicolor/32x32/actions/kopeteaway.png +share/icons/hicolor/32x32/actions/newmessage.mng +share/icons/hicolor/32x32/apps/jabber_protocol.png share/icons/hicolor/32x32/apps/kopete.png +share/icons/hicolor/48x48/actions/kopeteavailable.png +share/icons/hicolor/48x48/actions/kopeteaway.png +share/icons/hicolor/48x48/apps/jabber_protocol.png share/icons/hicolor/48x48/apps/kopete.png share/icons/hicolor/64x64/apps/kopete.png share/icons/hicolor/scalable/apps/kopete2.svgz @@ -865,12 +743,12 @@ share/services/kopete_latex.desktop share/services/kopete_msn.desktop share/services/kopete_netmeeting.desktop share/services/kopete_nowlistening.desktop -share/services/kopete_sms.desktop share/services/kopete_statistics.desktop share/services/kopete_testbed.desktop share/services/kopete_texteffect.desktop share/services/kopete_translator.desktop share/services/kopete_webpresence.desktop +share/services/kopete_wp.desktop share/services/kopete_yahoo.desktop share/servicetypes/kopeteplugin.desktop share/servicetypes/kopeteprotocol.desktop @@ -887,6 +765,7 @@ share/sounds/Kopete_User_is_Online.ogg @exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html @exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/html @dirrm share/services/kconfiguredialog +@dirrm share/icons/crystalsvg/16x16/apps/jabber_gateway_http @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/html @@ -899,81 +778,65 @@ share/sounds/Kopete_User_is_Online.ogg @dirrm share/apps/kopete_netmeeting @dirrm share/apps/kopete_msn @dirrm share/apps/kopete_latex +@dirrm share/apps/kopete_jabber @dirrm share/apps/kopete_history @dirrm share/apps/kopete_groupwise @dirrm share/apps/kopete_cryptography @dirrm share/apps/kopete_contactnotes @dirrm share/apps/kopete/webpresence -@dirrm share/apps/kopete/styles/data/iChat/yellow/To -@dirrm share/apps/kopete/styles/data/iChat/yellow/From -@dirrm share/apps/kopete/styles/data/iChat/yellow -@dirrm share/apps/kopete/styles/data/iChat/purple/To -@dirrm share/apps/kopete/styles/data/iChat/purple/From -@dirrm share/apps/kopete/styles/data/iChat/purple -@dirrm share/apps/kopete/styles/data/iChat/pink/To -@dirrm share/apps/kopete/styles/data/iChat/pink/From -@dirrm share/apps/kopete/styles/data/iChat/pink -@dirrm share/apps/kopete/styles/data/iChat/orange/To -@dirrm share/apps/kopete/styles/data/iChat/orange/From -@dirrm share/apps/kopete/styles/data/iChat/orange -@dirrm share/apps/kopete/styles/data/iChat/green/To -@dirrm share/apps/kopete/styles/data/iChat/green/From -@dirrm share/apps/kopete/styles/data/iChat/green -@dirrm share/apps/kopete/styles/data/iChat/graphite/To -@dirrm share/apps/kopete/styles/data/iChat/graphite/From -@dirrm share/apps/kopete/styles/data/iChat/graphite -@dirrm share/apps/kopete/styles/data/iChat/clear/To -@dirrm share/apps/kopete/styles/data/iChat/clear/From -@dirrm share/apps/kopete/styles/data/iChat/clear -@dirrm share/apps/kopete/styles/data/iChat/blue/To -@dirrm share/apps/kopete/styles/data/iChat/blue/From -@dirrm share/apps/kopete/styles/data/iChat/blue -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/purple -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/pink -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/orange -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/green/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/green -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/clear -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/To -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/From -@dirrm share/apps/kopete/styles/data/iChat-Trans/blue -@dirrm share/apps/kopete/styles/data/iChat-Trans -@dirrm share/apps/kopete/styles/data/iChat -@dirrm share/apps/kopete/styles/data/Kopete -@dirrm share/apps/kopete/styles/data/Adium -@dirrm share/apps/kopete/styles/data +@dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Retropete/Contents/Resources +@dirrm share/apps/kopete/styles/Retropete/Contents +@dirrm share/apps/kopete/styles/Retropete +@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/images +@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Variants +@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Kopete/Contents/Resources +@dirrm share/apps/kopete/styles/Kopete/Contents +@dirrm share/apps/kopete/styles/Kopete +@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui +@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants +@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Konqi/Contents/Resources +@dirrm share/apps/kopete/styles/Konqi/Contents +@dirrm share/apps/kopete/styles/Konqi +@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/images +@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Variants +@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Hacker/Contents/Resources +@dirrm share/apps/kopete/styles/Hacker/Contents +@dirrm share/apps/kopete/styles/Hacker +@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Variants +@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Gaim/Contents/Resources +@dirrm share/apps/kopete/styles/Gaim/Contents +@dirrm share/apps/kopete/styles/Gaim +@dirrm share/apps/kopete/styles/Clear/Contents/Resources/images +@dirrm share/apps/kopete/styles/Clear/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Clear/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Clear/Contents/Resources +@dirrm share/apps/kopete/styles/Clear/Contents +@dirrm share/apps/kopete/styles/Clear +@dirrm share/apps/kopete/styles/Clean/Contents/Resources/images +@dirrm share/apps/kopete/styles/Clean/Contents/Resources/Outgoing +@dirrm share/apps/kopete/styles/Clean/Contents/Resources/Incoming +@dirrm share/apps/kopete/styles/Clean/Contents/Resources +@dirrm share/apps/kopete/styles/Clean/Contents +@dirrm share/apps/kopete/styles/Clean @dirrm share/apps/kopete/styles @dirrm share/apps/kopete/pics/statistics @dirrm share/apps/kopete/pics -@dirrm share/apps/kopete/icons/hicolor/48x48/apps -@dirrm share/apps/kopete/icons/hicolor/48x48/actions -@dirrm share/apps/kopete/icons/hicolor/48x48 @dirrm share/apps/kopete/icons/hicolor/32x32/apps -@dirrm share/apps/kopete/icons/hicolor/32x32/actions @dirrm share/apps/kopete/icons/hicolor/32x32 -@dirrm share/apps/kopete/icons/hicolor/22x22/actions -@dirrm share/apps/kopete/icons/hicolor/22x22 @dirrm share/apps/kopete/icons/hicolor/16x16/apps @dirrm share/apps/kopete/icons/hicolor/16x16/actions @dirrm share/apps/kopete/icons/hicolor/16x16 @dirrm share/apps/kopete/icons/hicolor -@dirrm share/apps/kopete/icons/crystalsvg/scalable/actions -@dirrm share/apps/kopete/icons/crystalsvg/scalable @dirrm share/apps/kopete/icons/crystalsvg/64x64/apps @dirrm share/apps/kopete/icons/crystalsvg/64x64/actions @dirrm share/apps/kopete/icons/crystalsvg/64x64 diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index ffc7dfa837d8..e66369c90626 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -31,7 +31,7 @@ USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -DO_NOT_COMPILE+=kopete lanbrowsing +DO_NOT_COMPILE+=kopete lanbrowsing filesharing CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} @@ -46,6 +46,10 @@ pre-configure: @${REINPLACE_CMD} \ -E -e '/^SUBDIRS/s/lisa//g' \ ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} \ + -e 's|/etc/security/|${LOCALBASE}/etc/|g' \ + ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp \ + ${WRKSRC}/filesharing/simple/fileshare.cpp ## # OPTIONS handling diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index ac4de7a39c3c..7615aba07796 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.4.tar.bz2) = 81660b1a73e81b6c01a55861c154dd3b -SHA256 (KDE/kdenetwork-3.5.4.tar.bz2) = fc6841b1dbe6747dcce6b23406bb2d29793f9029a1084c2372fad44952e82569 -SIZE (KDE/kdenetwork-3.5.4.tar.bz2) = 7526158 +MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 +SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f +SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 diff --git a/net/kdenetwork3/pkg-plist b/net/kdenetwork3/pkg-plist index c8005d46f240..f2f5c3a2b284 100644 --- a/net/kdenetwork3/pkg-plist +++ b/net/kdenetwork3/pkg-plist @@ -21,12 +21,6 @@ include/rss/image.h include/rss/librss.h include/rss/loader.h include/rss/textinput.h -lib/kde3/fileshare_propsdlgplugin.a -lib/kde3/fileshare_propsdlgplugin.la -lib/kde3/fileshare_propsdlgplugin.so -lib/kde3/kcm_fileshare.a -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_krfb.a lib/kde3/kcm_krfb.la lib/kde3/kcm_krfb.so @@ -66,9 +60,6 @@ lib/kde3/kpfpropertiesdialog.so lib/kde3/ksirc.a lib/kde3/ksirc.la lib/kde3/ksirc.so -lib/kde3/libkcm_kcmsambaconf.a -lib/kde3/libkcm_kcmsambaconf.la -lib/kde3/libkcm_kcmsambaconf.so lib/kde3/libkntsrcfilepropsdlg.a lib/kde3/libkntsrcfilepropsdlg.la lib/kde3/libkntsrcfilepropsdlg.so @@ -83,10 +74,8 @@ lib/librss.la lib/librss.so lib/librss.so.1 share/applications/kde/Kppp.desktop -share/applications/kde/fileshare.desktop share/applications/kde/kcmkrfb.desktop share/applications/kde/kcmktalkd.desktop -share/applications/kde/kcmsambaconf.desktop share/applications/kde/kdict.desktop share/applications/kde/kget.desktop share/applications/kde/knewsticker-standalone.desktop @@ -786,6 +775,7 @@ share/doc/HTML/en/knewsticker/newarticle-icon.png share/doc/HTML/en/knewsticker/newssite-icon.png share/doc/HTML/en/knewsticker/oldarticle-icon.png share/doc/HTML/en/knewsticker/preferences-icon.png +share/doc/HTML/en/kopete/chatstyle.docbook share/doc/HTML/en/kopete/common share/doc/HTML/en/kopete/index.cache.bz2 share/doc/HTML/en/kopete/index.docbook @@ -901,7 +891,6 @@ share/icons/crystalsvg/48x48/apps/ktalkd.png share/icons/crystalsvg/48x48/mimetypes/kget_list.png share/icons/hicolor/128x128/apps/kdict.png share/icons/hicolor/128x128/apps/kppp.png -share/icons/hicolor/16x16/apps/kcmsambaconf.png share/icons/hicolor/16x16/apps/kdict.png share/icons/hicolor/16x16/apps/knewsticker.png share/icons/hicolor/16x16/apps/kppp.png @@ -923,7 +912,6 @@ share/icons/hicolor/scalable/apps/kdict.svgz share/icons/locolor/16x16/apps/krfb.png share/icons/locolor/32x32/apps/krfb.png share/mimelnk/application/x-kgetlist.desktop -share/services/fileshare_propsdlgplugin.desktop share/services/invitation.protocol share/services/kded/dnssdwatcher.desktop share/services/kded/kinetd.desktop diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index ffc7dfa837d8..e66369c90626 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -31,7 +31,7 @@ USE_OPENSSL= yes USE_AUTOTOOLS= libtool:15 INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 -DO_NOT_COMPILE+=kopete lanbrowsing +DO_NOT_COMPILE+=kopete lanbrowsing filesharing CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE} @@ -46,6 +46,10 @@ pre-configure: @${REINPLACE_CMD} \ -E -e '/^SUBDIRS/s/lisa//g' \ ${WRKSRC}/doc/Makefile.in + @${REINPLACE_CMD} \ + -e 's|/etc/security/|${LOCALBASE}/etc/|g' \ + ${WRKSRC}/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp \ + ${WRKSRC}/filesharing/simple/fileshare.cpp ## # OPTIONS handling diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index ac4de7a39c3c..7615aba07796 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.4.tar.bz2) = 81660b1a73e81b6c01a55861c154dd3b -SHA256 (KDE/kdenetwork-3.5.4.tar.bz2) = fc6841b1dbe6747dcce6b23406bb2d29793f9029a1084c2372fad44952e82569 -SIZE (KDE/kdenetwork-3.5.4.tar.bz2) = 7526158 +MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 +SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f +SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist index c8005d46f240..f2f5c3a2b284 100644 --- a/net/kdenetwork4/pkg-plist +++ b/net/kdenetwork4/pkg-plist @@ -21,12 +21,6 @@ include/rss/image.h include/rss/librss.h include/rss/loader.h include/rss/textinput.h -lib/kde3/fileshare_propsdlgplugin.a -lib/kde3/fileshare_propsdlgplugin.la -lib/kde3/fileshare_propsdlgplugin.so -lib/kde3/kcm_fileshare.a -lib/kde3/kcm_fileshare.la -lib/kde3/kcm_fileshare.so lib/kde3/kcm_krfb.a lib/kde3/kcm_krfb.la lib/kde3/kcm_krfb.so @@ -66,9 +60,6 @@ lib/kde3/kpfpropertiesdialog.so lib/kde3/ksirc.a lib/kde3/ksirc.la lib/kde3/ksirc.so -lib/kde3/libkcm_kcmsambaconf.a -lib/kde3/libkcm_kcmsambaconf.la -lib/kde3/libkcm_kcmsambaconf.so lib/kde3/libkntsrcfilepropsdlg.a lib/kde3/libkntsrcfilepropsdlg.la lib/kde3/libkntsrcfilepropsdlg.so @@ -83,10 +74,8 @@ lib/librss.la lib/librss.so lib/librss.so.1 share/applications/kde/Kppp.desktop -share/applications/kde/fileshare.desktop share/applications/kde/kcmkrfb.desktop share/applications/kde/kcmktalkd.desktop -share/applications/kde/kcmsambaconf.desktop share/applications/kde/kdict.desktop share/applications/kde/kget.desktop share/applications/kde/knewsticker-standalone.desktop @@ -786,6 +775,7 @@ share/doc/HTML/en/knewsticker/newarticle-icon.png share/doc/HTML/en/knewsticker/newssite-icon.png share/doc/HTML/en/knewsticker/oldarticle-icon.png share/doc/HTML/en/knewsticker/preferences-icon.png +share/doc/HTML/en/kopete/chatstyle.docbook share/doc/HTML/en/kopete/common share/doc/HTML/en/kopete/index.cache.bz2 share/doc/HTML/en/kopete/index.docbook @@ -901,7 +891,6 @@ share/icons/crystalsvg/48x48/apps/ktalkd.png share/icons/crystalsvg/48x48/mimetypes/kget_list.png share/icons/hicolor/128x128/apps/kdict.png share/icons/hicolor/128x128/apps/kppp.png -share/icons/hicolor/16x16/apps/kcmsambaconf.png share/icons/hicolor/16x16/apps/kdict.png share/icons/hicolor/16x16/apps/knewsticker.png share/icons/hicolor/16x16/apps/kppp.png @@ -923,7 +912,6 @@ share/icons/hicolor/scalable/apps/kdict.svgz share/icons/locolor/16x16/apps/krfb.png share/icons/locolor/32x32/apps/krfb.png share/mimelnk/application/x-kgetlist.desktop -share/services/fileshare_propsdlgplugin.desktop share/services/invitation.protocol share/services/kded/dnssdwatcher.desktop share/services/kded/kinetd.desktop diff --git a/net/lanbrowsing/distinfo b/net/lanbrowsing/distinfo index ac4de7a39c3c..7615aba07796 100644 --- a/net/lanbrowsing/distinfo +++ b/net/lanbrowsing/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.4.tar.bz2) = 81660b1a73e81b6c01a55861c154dd3b -SHA256 (KDE/kdenetwork-3.5.4.tar.bz2) = fc6841b1dbe6747dcce6b23406bb2d29793f9029a1084c2372fad44952e82569 -SIZE (KDE/kdenetwork-3.5.4.tar.bz2) = 7526158 +MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46 +SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f +SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564 diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile index f5413624c8c6..40e0deeb333d 100644 --- a/polish/calligra-l10n/Makefile +++ b/polish/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/calligra-l10n/distinfo b/polish/calligra-l10n/distinfo index 25544ebdff6b..a7b92caa358d 100644 --- a/polish/calligra-l10n/distinfo +++ b/polish/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 193d09145eea9136067676b6d74ab5f9 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 495cd1fa8fb9e0d3877987b7b4114d3cf6eee1dae78286d3114fff9b762bb74b -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 377813 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 diff --git a/polish/calligra-l10n/pkg-plist b/polish/calligra-l10n/pkg-plist index a9161205f0d6..4b4534d94bbe 100644 --- a/polish/calligra-l10n/pkg-plist +++ b/polish/calligra-l10n/pkg-plist @@ -2,6 +2,7 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo +share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/polish/kde3-i18n/distinfo b/polish/kde3-i18n/distinfo index 85980a3ecbc6..b423346e5332 100644 --- a/polish/kde3-i18n/distinfo +++ b/polish/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = 47787ef2ad8516f4e0ca21b5daec64cc -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = b2988f5891c04b831ee663f76b242040df100618755ba36555874eb94eea871e -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = 8491922 +MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 7444560d7d6cb3221e8f0907218157de +SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 41f798c489a72f1c47237ff3e5be9dc6bc7bdc092fa8995ec89ae9f17de68e4d +SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 9671038 diff --git a/polish/kde3-i18n/pkg-plist b/polish/kde3-i18n/pkg-plist index 0b2a16221cd5..55d7102fc2f6 100644 --- a/polish/kde3-i18n/pkg-plist +++ b/polish/kde3-i18n/pkg-plist @@ -49,6 +49,25 @@ share/doc/HTML/pl/kalzium/screenshot1.png share/doc/HTML/pl/kanagram/common share/doc/HTML/pl/kanagram/index.cache.bz2 share/doc/HTML/pl/kanagram/index.docbook +share/doc/HTML/pl/kate/advanced.docbook +share/doc/HTML/pl/kate/common +share/doc/HTML/pl/kate/configdialog01.png +share/doc/HTML/pl/kate/configdialog02.png +share/doc/HTML/pl/kate/configuring.docbook +share/doc/HTML/pl/kate/fundamentals.docbook +share/doc/HTML/pl/kate/highlighted.png +share/doc/HTML/pl/kate/highlighting.docbook +share/doc/HTML/pl/kate/index.cache.bz2 +share/doc/HTML/pl/kate/index.docbook +share/doc/HTML/pl/kate/kate.png +share/doc/HTML/pl/kate/man-kate.1.docbook +share/doc/HTML/pl/kate/mdi.docbook +share/doc/HTML/pl/kate/menus.docbook +share/doc/HTML/pl/kate/mimetypechooser.png +share/doc/HTML/pl/kate/part.docbook +share/doc/HTML/pl/kate/plugins.docbook +share/doc/HTML/pl/kate/regular-expressions.docbook +share/doc/HTML/pl/kate/unhighlighted.png share/doc/HTML/pl/kbattleship/common share/doc/HTML/pl/kbattleship/index.cache.bz2 share/doc/HTML/pl/kbattleship/index.docbook @@ -66,6 +85,146 @@ share/doc/HTML/pl/kcalc/commands.docbook share/doc/HTML/pl/kcalc/common share/doc/HTML/pl/kcalc/index.cache.bz2 share/doc/HTML/pl/kcalc/index.docbook +share/doc/HTML/pl/kcontrol/arts/common +share/doc/HTML/pl/kcontrol/arts/index.cache.bz2 +share/doc/HTML/pl/kcontrol/arts/index.docbook +share/doc/HTML/pl/kcontrol/arts/midi.docbook +share/doc/HTML/pl/kcontrol/background/common +share/doc/HTML/pl/kcontrol/background/index.cache.bz2 +share/doc/HTML/pl/kcontrol/background/index.docbook +share/doc/HTML/pl/kcontrol/bell/common +share/doc/HTML/pl/kcontrol/bell/index.cache.bz2 +share/doc/HTML/pl/kcontrol/bell/index.docbook +share/doc/HTML/pl/kcontrol/cache/common +share/doc/HTML/pl/kcontrol/cache/index.cache.bz2 +share/doc/HTML/pl/kcontrol/cache/index.docbook +share/doc/HTML/pl/kcontrol/clock/common +share/doc/HTML/pl/kcontrol/clock/index.cache.bz2 +share/doc/HTML/pl/kcontrol/clock/index.docbook +share/doc/HTML/pl/kcontrol/colors/common +share/doc/HTML/pl/kcontrol/colors/index.cache.bz2 +share/doc/HTML/pl/kcontrol/colors/index.docbook +share/doc/HTML/pl/kcontrol/common +share/doc/HTML/pl/kcontrol/cookies/common +share/doc/HTML/pl/kcontrol/cookies/index.cache.bz2 +share/doc/HTML/pl/kcontrol/cookies/index.docbook +share/doc/HTML/pl/kcontrol/crypto/common +share/doc/HTML/pl/kcontrol/crypto/index.cache.bz2 +share/doc/HTML/pl/kcontrol/crypto/index.docbook +share/doc/HTML/pl/kcontrol/desktop/common +share/doc/HTML/pl/kcontrol/desktop/index.cache.bz2 +share/doc/HTML/pl/kcontrol/desktop/index.docbook +share/doc/HTML/pl/kcontrol/desktopbehavior/common +share/doc/HTML/pl/kcontrol/desktopbehavior/index.cache.bz2 +share/doc/HTML/pl/kcontrol/desktopbehavior/index.docbook +share/doc/HTML/pl/kcontrol/ebrowsing/common +share/doc/HTML/pl/kcontrol/ebrowsing/index.cache.bz2 +share/doc/HTML/pl/kcontrol/ebrowsing/index.docbook +share/doc/HTML/pl/kcontrol/email/common +share/doc/HTML/pl/kcontrol/email/index.cache.bz2 +share/doc/HTML/pl/kcontrol/email/index.docbook +share/doc/HTML/pl/kcontrol/energy/common +share/doc/HTML/pl/kcontrol/energy/index.cache.bz2 +share/doc/HTML/pl/kcontrol/energy/index.docbook +share/doc/HTML/pl/kcontrol/filemanager/common +share/doc/HTML/pl/kcontrol/filemanager/index.cache.bz2 +share/doc/HTML/pl/kcontrol/filemanager/index.docbook +share/doc/HTML/pl/kcontrol/filetypes/common +share/doc/HTML/pl/kcontrol/filetypes/index.cache.bz2 +share/doc/HTML/pl/kcontrol/filetypes/index.docbook +share/doc/HTML/pl/kcontrol/fonts/common +share/doc/HTML/pl/kcontrol/fonts/index.cache.bz2 +share/doc/HTML/pl/kcontrol/fonts/index.docbook +share/doc/HTML/pl/kcontrol/helpindex/common +share/doc/HTML/pl/kcontrol/helpindex/index.cache.bz2 +share/doc/HTML/pl/kcontrol/helpindex/index.docbook +share/doc/HTML/pl/kcontrol/index.cache.bz2 +share/doc/HTML/pl/kcontrol/index.docbook +share/doc/HTML/pl/kcontrol/kcmaccess/common +share/doc/HTML/pl/kcontrol/kcmaccess/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmaccess/index.docbook +share/doc/HTML/pl/kcontrol/kcmcss/common +share/doc/HTML/pl/kcontrol/kcmcss/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmcss/index.docbook +share/doc/HTML/pl/kcontrol/kcmfontinst/common +share/doc/HTML/pl/kcontrol/kcmfontinst/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmfontinst/index.docbook +share/doc/HTML/pl/kcontrol/kcmkonsole/common +share/doc/HTML/pl/kcontrol/kcmkonsole/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmkonsole/index.docbook +share/doc/HTML/pl/kcontrol/kcmlaunch/common +share/doc/HTML/pl/kcontrol/kcmlaunch/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmlaunch/index.docbook +share/doc/HTML/pl/kcontrol/kcmnotify/common +share/doc/HTML/pl/kcontrol/kcmnotify/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmnotify/index.docbook +share/doc/HTML/pl/kcontrol/kcmsmserver/common +share/doc/HTML/pl/kcontrol/kcmsmserver/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmsmserver/index.docbook +share/doc/HTML/pl/kcontrol/kcmstyle/common +share/doc/HTML/pl/kcontrol/kcmstyle/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmstyle/index.docbook +share/doc/HTML/pl/kcontrol/kcmtaskbar/common +share/doc/HTML/pl/kcontrol/kcmtaskbar/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmtaskbar/index.docbook +share/doc/HTML/pl/kcontrol/kdm/common +share/doc/HTML/pl/kcontrol/kdm/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kdm/index.docbook +share/doc/HTML/pl/kcontrol/keyboard/common +share/doc/HTML/pl/kcontrol/keyboard/index.cache.bz2 +share/doc/HTML/pl/kcontrol/keyboard/index.docbook +share/doc/HTML/pl/kcontrol/keys/common +share/doc/HTML/pl/kcontrol/keys/index.cache.bz2 +share/doc/HTML/pl/kcontrol/keys/index.docbook +share/doc/HTML/pl/kcontrol/kfileman2.png +share/doc/HTML/pl/kcontrol/khtml/common +share/doc/HTML/pl/kcontrol/khtml/index.cache.bz2 +share/doc/HTML/pl/kcontrol/khtml/index.docbook +share/doc/HTML/pl/kcontrol/khtml/nsplugin.docbook +share/doc/HTML/pl/kcontrol/kwindecoration/common +share/doc/HTML/pl/kcontrol/kwindecoration/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kwindecoration/index.docbook +share/doc/HTML/pl/kcontrol/language/common +share/doc/HTML/pl/kcontrol/language/index.cache.bz2 +share/doc/HTML/pl/kcontrol/language/index.docbook +share/doc/HTML/pl/kcontrol/mouse/common +share/doc/HTML/pl/kcontrol/mouse/index.cache.bz2 +share/doc/HTML/pl/kcontrol/mouse/index.docbook +share/doc/HTML/pl/kcontrol/netpref/common +share/doc/HTML/pl/kcontrol/netpref/index.cache.bz2 +share/doc/HTML/pl/kcontrol/netpref/index.docbook +share/doc/HTML/pl/kcontrol/panel/common +share/doc/HTML/pl/kcontrol/panel/index.cache.bz2 +share/doc/HTML/pl/kcontrol/panel/index.docbook +share/doc/HTML/pl/kcontrol/panelappearance/common +share/doc/HTML/pl/kcontrol/panelappearance/index.cache.bz2 +share/doc/HTML/pl/kcontrol/panelappearance/index.docbook +share/doc/HTML/pl/kcontrol/passwords/common +share/doc/HTML/pl/kcontrol/passwords/index.cache.bz2 +share/doc/HTML/pl/kcontrol/passwords/index.docbook +share/doc/HTML/pl/kcontrol/performance/common +share/doc/HTML/pl/kcontrol/performance/index.cache.bz2 +share/doc/HTML/pl/kcontrol/performance/index.docbook +share/doc/HTML/pl/kcontrol/proxy/common +share/doc/HTML/pl/kcontrol/proxy/index.cache.bz2 +share/doc/HTML/pl/kcontrol/proxy/index.docbook +share/doc/HTML/pl/kcontrol/proxy/socks.docbook +share/doc/HTML/pl/kcontrol/screensaver/common +share/doc/HTML/pl/kcontrol/screensaver/index.cache.bz2 +share/doc/HTML/pl/kcontrol/screensaver/index.docbook +share/doc/HTML/pl/kcontrol/screenshot.png +share/doc/HTML/pl/kcontrol/smb/common +share/doc/HTML/pl/kcontrol/smb/index.cache.bz2 +share/doc/HTML/pl/kcontrol/smb/index.docbook +share/doc/HTML/pl/kcontrol/spellchecking/common +share/doc/HTML/pl/kcontrol/spellchecking/index.cache.bz2 +share/doc/HTML/pl/kcontrol/spellchecking/index.docbook +share/doc/HTML/pl/kcontrol/useragent/common +share/doc/HTML/pl/kcontrol/useragent/index.cache.bz2 +share/doc/HTML/pl/kcontrol/useragent/index.docbook +share/doc/HTML/pl/kcontrol/windowmanagement/common +share/doc/HTML/pl/kcontrol/windowmanagement/index.cache.bz2 +share/doc/HTML/pl/kcontrol/windowmanagement/index.docbook share/doc/HTML/pl/kdeprint/add-printer-wiz.docbook share/doc/HTML/pl/kdeprint/common share/doc/HTML/pl/kdeprint/cups-config.docbook @@ -90,6 +249,10 @@ share/doc/HTML/pl/kdevelop/tip.database share/doc/HTML/pl/kdf/common share/doc/HTML/pl/kdf/index.cache.bz2 share/doc/HTML/pl/kdf/index.docbook +share/doc/HTML/pl/kdm/common +share/doc/HTML/pl/kdm/index.cache.bz2 +share/doc/HTML/pl/kdm/index.docbook +share/doc/HTML/pl/kdm/kdmrc-ref.docbook share/doc/HTML/pl/keduca/common share/doc/HTML/pl/keduca/index.cache.bz2 share/doc/HTML/pl/keduca/index.docbook @@ -391,6 +554,11 @@ share/doc/HTML/pl/konsole/index.docbook share/doc/HTML/pl/kontact/common share/doc/HTML/pl/kontact/index.cache.bz2 share/doc/HTML/pl/kontact/index.docbook +share/doc/HTML/pl/kopete/chatstyle.docbook +share/doc/HTML/pl/kopete/common +share/doc/HTML/pl/kopete/index.cache.bz2 +share/doc/HTML/pl/kopete/index.docbook +share/doc/HTML/pl/kopete/menus.docbook share/doc/HTML/pl/korganizer/common share/doc/HTML/pl/korganizer/index.cache.bz2 share/doc/HTML/pl/korganizer/index.docbook @@ -448,6 +616,27 @@ share/doc/HTML/pl/kppp/kppp-wizard-tab.png share/doc/HTML/pl/kppp/security.docbook share/doc/HTML/pl/kppp/tricks.docbook share/doc/HTML/pl/kppp/wizard.docbook +share/doc/HTML/pl/krdc/authentication.png +share/doc/HTML/pl/krdc/common +share/doc/HTML/pl/krdc/index.cache.bz2 +share/doc/HTML/pl/krdc/index.docbook +share/doc/HTML/pl/krdc/preferences_profilestab.png +share/doc/HTML/pl/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/pl/krdc/preferences_vncdefaultstab.png +share/doc/HTML/pl/krdc/snapshot_connectionspeed.png +share/doc/HTML/pl/krdc/snapshot_nobrowse.png +share/doc/HTML/pl/krdc/snapshot_vncentry.png +share/doc/HTML/pl/krfb/common +share/doc/HTML/pl/krfb/configuration_access.png +share/doc/HTML/pl/krfb/configuration_network.png +share/doc/HTML/pl/krfb/configuration_session.png +share/doc/HTML/pl/krfb/connection.png +share/doc/HTML/pl/krfb/email_invitation.png +share/doc/HTML/pl/krfb/index.cache.bz2 +share/doc/HTML/pl/krfb/index.docbook +share/doc/HTML/pl/krfb/invitation_management.png +share/doc/HTML/pl/krfb/personal_invitation.png +share/doc/HTML/pl/krfb/screenshot.png share/doc/HTML/pl/ksame/common share/doc/HTML/pl/ksame/index.cache.bz2 share/doc/HTML/pl/ksame/index.docbook @@ -557,6 +746,9 @@ share/doc/HTML/pl/kwallet/kwalletmanager.png share/doc/HTML/pl/kwordquiz/common share/doc/HTML/pl/kwordquiz/index.cache.bz2 share/doc/HTML/pl/kwordquiz/index.docbook +share/doc/HTML/pl/kwrite/common +share/doc/HTML/pl/kwrite/index.cache.bz2 +share/doc/HTML/pl/kwrite/index.docbook share/doc/HTML/pl/kxkb/common share/doc/HTML/pl/kxkb/index.cache.bz2 share/doc/HTML/pl/kxkb/index.docbook @@ -1129,6 +1321,7 @@ share/locale/pl/entry.desktop share/locale/pl/flag.png @dirrm share/doc/HTML/pl/noatun @dirrm share/doc/HTML/pl/kxkb +@dirrm share/doc/HTML/pl/kwrite @dirrm share/doc/HTML/pl/kwordquiz @dirrm share/doc/HTML/pl/kwallet @dirrm share/doc/HTML/pl/ktuberling @@ -1140,12 +1333,15 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/ksirc @dirrm share/doc/HTML/pl/kscd @dirrm share/doc/HTML/pl/ksame +@dirrm share/doc/HTML/pl/krfb +@dirrm share/doc/HTML/pl/krdc @dirrm share/doc/HTML/pl/kppp @dirrm share/doc/HTML/pl/kpercentage @dirrm share/doc/HTML/pl/kpdf @dirrm share/doc/HTML/pl/kpat @dirrm share/doc/HTML/pl/kpager @dirrm share/doc/HTML/pl/korganizer +@dirrm share/doc/HTML/pl/kopete @dirrm share/doc/HTML/pl/kontact @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @@ -1190,13 +1386,60 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kgeography @dirrm share/doc/HTML/pl/kfind @dirrm share/doc/HTML/pl/keduca +@dirrm share/doc/HTML/pl/kdm @dirrm share/doc/HTML/pl/kdf @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint +@dirrm share/doc/HTML/pl/kcontrol/windowmanagement +@dirrm share/doc/HTML/pl/kcontrol/useragent +@dirrm share/doc/HTML/pl/kcontrol/spellchecking +@dirrm share/doc/HTML/pl/kcontrol/smb +@dirrm share/doc/HTML/pl/kcontrol/screensaver +@dirrm share/doc/HTML/pl/kcontrol/proxy +@dirrm share/doc/HTML/pl/kcontrol/performance +@dirrm share/doc/HTML/pl/kcontrol/passwords +@dirrm share/doc/HTML/pl/kcontrol/panelappearance +@dirrm share/doc/HTML/pl/kcontrol/panel +@dirrm share/doc/HTML/pl/kcontrol/netpref +@dirrm share/doc/HTML/pl/kcontrol/mouse +@dirrm share/doc/HTML/pl/kcontrol/language +@dirrm share/doc/HTML/pl/kcontrol/kwindecoration +@dirrm share/doc/HTML/pl/kcontrol/khtml +@dirrm share/doc/HTML/pl/kcontrol/keys +@dirrm share/doc/HTML/pl/kcontrol/keyboard +@dirrm share/doc/HTML/pl/kcontrol/kdm +@dirrm share/doc/HTML/pl/kcontrol/kcmtaskbar +@dirrm share/doc/HTML/pl/kcontrol/kcmstyle +@dirrm share/doc/HTML/pl/kcontrol/kcmsmserver +@dirrm share/doc/HTML/pl/kcontrol/kcmnotify +@dirrm share/doc/HTML/pl/kcontrol/kcmlaunch +@dirrm share/doc/HTML/pl/kcontrol/kcmkonsole +@dirrm share/doc/HTML/pl/kcontrol/kcmfontinst +@dirrm share/doc/HTML/pl/kcontrol/kcmcss +@dirrm share/doc/HTML/pl/kcontrol/kcmaccess +@dirrm share/doc/HTML/pl/kcontrol/helpindex +@dirrm share/doc/HTML/pl/kcontrol/fonts +@dirrm share/doc/HTML/pl/kcontrol/filetypes +@dirrm share/doc/HTML/pl/kcontrol/filemanager +@dirrm share/doc/HTML/pl/kcontrol/energy +@dirrm share/doc/HTML/pl/kcontrol/email +@dirrm share/doc/HTML/pl/kcontrol/ebrowsing +@dirrm share/doc/HTML/pl/kcontrol/desktopbehavior +@dirrm share/doc/HTML/pl/kcontrol/desktop +@dirrm share/doc/HTML/pl/kcontrol/crypto +@dirrm share/doc/HTML/pl/kcontrol/cookies +@dirrm share/doc/HTML/pl/kcontrol/colors +@dirrm share/doc/HTML/pl/kcontrol/clock +@dirrm share/doc/HTML/pl/kcontrol/cache +@dirrm share/doc/HTML/pl/kcontrol/bell +@dirrm share/doc/HTML/pl/kcontrol/background +@dirrm share/doc/HTML/pl/kcontrol/arts +@dirrm share/doc/HTML/pl/kcontrol @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch @dirrm share/doc/HTML/pl/kbattleship +@dirrm share/doc/HTML/pl/kate @dirrm share/doc/HTML/pl/kanagram @dirrm share/doc/HTML/pl/kalzium @dirrm share/doc/HTML/pl/kaddressbook diff --git a/polish/kde4-l10n/distinfo b/polish/kde4-l10n/distinfo index 85980a3ecbc6..b423346e5332 100644 --- a/polish/kde4-l10n/distinfo +++ b/polish/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = 47787ef2ad8516f4e0ca21b5daec64cc -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = b2988f5891c04b831ee663f76b242040df100618755ba36555874eb94eea871e -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.4.tar.bz2) = 8491922 +MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 7444560d7d6cb3221e8f0907218157de +SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 41f798c489a72f1c47237ff3e5be9dc6bc7bdc092fa8995ec89ae9f17de68e4d +SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.5.tar.bz2) = 9671038 diff --git a/polish/kde4-l10n/pkg-plist b/polish/kde4-l10n/pkg-plist index 0b2a16221cd5..55d7102fc2f6 100644 --- a/polish/kde4-l10n/pkg-plist +++ b/polish/kde4-l10n/pkg-plist @@ -49,6 +49,25 @@ share/doc/HTML/pl/kalzium/screenshot1.png share/doc/HTML/pl/kanagram/common share/doc/HTML/pl/kanagram/index.cache.bz2 share/doc/HTML/pl/kanagram/index.docbook +share/doc/HTML/pl/kate/advanced.docbook +share/doc/HTML/pl/kate/common +share/doc/HTML/pl/kate/configdialog01.png +share/doc/HTML/pl/kate/configdialog02.png +share/doc/HTML/pl/kate/configuring.docbook +share/doc/HTML/pl/kate/fundamentals.docbook +share/doc/HTML/pl/kate/highlighted.png +share/doc/HTML/pl/kate/highlighting.docbook +share/doc/HTML/pl/kate/index.cache.bz2 +share/doc/HTML/pl/kate/index.docbook +share/doc/HTML/pl/kate/kate.png +share/doc/HTML/pl/kate/man-kate.1.docbook +share/doc/HTML/pl/kate/mdi.docbook +share/doc/HTML/pl/kate/menus.docbook +share/doc/HTML/pl/kate/mimetypechooser.png +share/doc/HTML/pl/kate/part.docbook +share/doc/HTML/pl/kate/plugins.docbook +share/doc/HTML/pl/kate/regular-expressions.docbook +share/doc/HTML/pl/kate/unhighlighted.png share/doc/HTML/pl/kbattleship/common share/doc/HTML/pl/kbattleship/index.cache.bz2 share/doc/HTML/pl/kbattleship/index.docbook @@ -66,6 +85,146 @@ share/doc/HTML/pl/kcalc/commands.docbook share/doc/HTML/pl/kcalc/common share/doc/HTML/pl/kcalc/index.cache.bz2 share/doc/HTML/pl/kcalc/index.docbook +share/doc/HTML/pl/kcontrol/arts/common +share/doc/HTML/pl/kcontrol/arts/index.cache.bz2 +share/doc/HTML/pl/kcontrol/arts/index.docbook +share/doc/HTML/pl/kcontrol/arts/midi.docbook +share/doc/HTML/pl/kcontrol/background/common +share/doc/HTML/pl/kcontrol/background/index.cache.bz2 +share/doc/HTML/pl/kcontrol/background/index.docbook +share/doc/HTML/pl/kcontrol/bell/common +share/doc/HTML/pl/kcontrol/bell/index.cache.bz2 +share/doc/HTML/pl/kcontrol/bell/index.docbook +share/doc/HTML/pl/kcontrol/cache/common +share/doc/HTML/pl/kcontrol/cache/index.cache.bz2 +share/doc/HTML/pl/kcontrol/cache/index.docbook +share/doc/HTML/pl/kcontrol/clock/common +share/doc/HTML/pl/kcontrol/clock/index.cache.bz2 +share/doc/HTML/pl/kcontrol/clock/index.docbook +share/doc/HTML/pl/kcontrol/colors/common +share/doc/HTML/pl/kcontrol/colors/index.cache.bz2 +share/doc/HTML/pl/kcontrol/colors/index.docbook +share/doc/HTML/pl/kcontrol/common +share/doc/HTML/pl/kcontrol/cookies/common +share/doc/HTML/pl/kcontrol/cookies/index.cache.bz2 +share/doc/HTML/pl/kcontrol/cookies/index.docbook +share/doc/HTML/pl/kcontrol/crypto/common +share/doc/HTML/pl/kcontrol/crypto/index.cache.bz2 +share/doc/HTML/pl/kcontrol/crypto/index.docbook +share/doc/HTML/pl/kcontrol/desktop/common +share/doc/HTML/pl/kcontrol/desktop/index.cache.bz2 +share/doc/HTML/pl/kcontrol/desktop/index.docbook +share/doc/HTML/pl/kcontrol/desktopbehavior/common +share/doc/HTML/pl/kcontrol/desktopbehavior/index.cache.bz2 +share/doc/HTML/pl/kcontrol/desktopbehavior/index.docbook +share/doc/HTML/pl/kcontrol/ebrowsing/common +share/doc/HTML/pl/kcontrol/ebrowsing/index.cache.bz2 +share/doc/HTML/pl/kcontrol/ebrowsing/index.docbook +share/doc/HTML/pl/kcontrol/email/common +share/doc/HTML/pl/kcontrol/email/index.cache.bz2 +share/doc/HTML/pl/kcontrol/email/index.docbook +share/doc/HTML/pl/kcontrol/energy/common +share/doc/HTML/pl/kcontrol/energy/index.cache.bz2 +share/doc/HTML/pl/kcontrol/energy/index.docbook +share/doc/HTML/pl/kcontrol/filemanager/common +share/doc/HTML/pl/kcontrol/filemanager/index.cache.bz2 +share/doc/HTML/pl/kcontrol/filemanager/index.docbook +share/doc/HTML/pl/kcontrol/filetypes/common +share/doc/HTML/pl/kcontrol/filetypes/index.cache.bz2 +share/doc/HTML/pl/kcontrol/filetypes/index.docbook +share/doc/HTML/pl/kcontrol/fonts/common +share/doc/HTML/pl/kcontrol/fonts/index.cache.bz2 +share/doc/HTML/pl/kcontrol/fonts/index.docbook +share/doc/HTML/pl/kcontrol/helpindex/common +share/doc/HTML/pl/kcontrol/helpindex/index.cache.bz2 +share/doc/HTML/pl/kcontrol/helpindex/index.docbook +share/doc/HTML/pl/kcontrol/index.cache.bz2 +share/doc/HTML/pl/kcontrol/index.docbook +share/doc/HTML/pl/kcontrol/kcmaccess/common +share/doc/HTML/pl/kcontrol/kcmaccess/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmaccess/index.docbook +share/doc/HTML/pl/kcontrol/kcmcss/common +share/doc/HTML/pl/kcontrol/kcmcss/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmcss/index.docbook +share/doc/HTML/pl/kcontrol/kcmfontinst/common +share/doc/HTML/pl/kcontrol/kcmfontinst/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmfontinst/index.docbook +share/doc/HTML/pl/kcontrol/kcmkonsole/common +share/doc/HTML/pl/kcontrol/kcmkonsole/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmkonsole/index.docbook +share/doc/HTML/pl/kcontrol/kcmlaunch/common +share/doc/HTML/pl/kcontrol/kcmlaunch/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmlaunch/index.docbook +share/doc/HTML/pl/kcontrol/kcmnotify/common +share/doc/HTML/pl/kcontrol/kcmnotify/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmnotify/index.docbook +share/doc/HTML/pl/kcontrol/kcmsmserver/common +share/doc/HTML/pl/kcontrol/kcmsmserver/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmsmserver/index.docbook +share/doc/HTML/pl/kcontrol/kcmstyle/common +share/doc/HTML/pl/kcontrol/kcmstyle/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmstyle/index.docbook +share/doc/HTML/pl/kcontrol/kcmtaskbar/common +share/doc/HTML/pl/kcontrol/kcmtaskbar/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kcmtaskbar/index.docbook +share/doc/HTML/pl/kcontrol/kdm/common +share/doc/HTML/pl/kcontrol/kdm/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kdm/index.docbook +share/doc/HTML/pl/kcontrol/keyboard/common +share/doc/HTML/pl/kcontrol/keyboard/index.cache.bz2 +share/doc/HTML/pl/kcontrol/keyboard/index.docbook +share/doc/HTML/pl/kcontrol/keys/common +share/doc/HTML/pl/kcontrol/keys/index.cache.bz2 +share/doc/HTML/pl/kcontrol/keys/index.docbook +share/doc/HTML/pl/kcontrol/kfileman2.png +share/doc/HTML/pl/kcontrol/khtml/common +share/doc/HTML/pl/kcontrol/khtml/index.cache.bz2 +share/doc/HTML/pl/kcontrol/khtml/index.docbook +share/doc/HTML/pl/kcontrol/khtml/nsplugin.docbook +share/doc/HTML/pl/kcontrol/kwindecoration/common +share/doc/HTML/pl/kcontrol/kwindecoration/index.cache.bz2 +share/doc/HTML/pl/kcontrol/kwindecoration/index.docbook +share/doc/HTML/pl/kcontrol/language/common +share/doc/HTML/pl/kcontrol/language/index.cache.bz2 +share/doc/HTML/pl/kcontrol/language/index.docbook +share/doc/HTML/pl/kcontrol/mouse/common +share/doc/HTML/pl/kcontrol/mouse/index.cache.bz2 +share/doc/HTML/pl/kcontrol/mouse/index.docbook +share/doc/HTML/pl/kcontrol/netpref/common +share/doc/HTML/pl/kcontrol/netpref/index.cache.bz2 +share/doc/HTML/pl/kcontrol/netpref/index.docbook +share/doc/HTML/pl/kcontrol/panel/common +share/doc/HTML/pl/kcontrol/panel/index.cache.bz2 +share/doc/HTML/pl/kcontrol/panel/index.docbook +share/doc/HTML/pl/kcontrol/panelappearance/common +share/doc/HTML/pl/kcontrol/panelappearance/index.cache.bz2 +share/doc/HTML/pl/kcontrol/panelappearance/index.docbook +share/doc/HTML/pl/kcontrol/passwords/common +share/doc/HTML/pl/kcontrol/passwords/index.cache.bz2 +share/doc/HTML/pl/kcontrol/passwords/index.docbook +share/doc/HTML/pl/kcontrol/performance/common +share/doc/HTML/pl/kcontrol/performance/index.cache.bz2 +share/doc/HTML/pl/kcontrol/performance/index.docbook +share/doc/HTML/pl/kcontrol/proxy/common +share/doc/HTML/pl/kcontrol/proxy/index.cache.bz2 +share/doc/HTML/pl/kcontrol/proxy/index.docbook +share/doc/HTML/pl/kcontrol/proxy/socks.docbook +share/doc/HTML/pl/kcontrol/screensaver/common +share/doc/HTML/pl/kcontrol/screensaver/index.cache.bz2 +share/doc/HTML/pl/kcontrol/screensaver/index.docbook +share/doc/HTML/pl/kcontrol/screenshot.png +share/doc/HTML/pl/kcontrol/smb/common +share/doc/HTML/pl/kcontrol/smb/index.cache.bz2 +share/doc/HTML/pl/kcontrol/smb/index.docbook +share/doc/HTML/pl/kcontrol/spellchecking/common +share/doc/HTML/pl/kcontrol/spellchecking/index.cache.bz2 +share/doc/HTML/pl/kcontrol/spellchecking/index.docbook +share/doc/HTML/pl/kcontrol/useragent/common +share/doc/HTML/pl/kcontrol/useragent/index.cache.bz2 +share/doc/HTML/pl/kcontrol/useragent/index.docbook +share/doc/HTML/pl/kcontrol/windowmanagement/common +share/doc/HTML/pl/kcontrol/windowmanagement/index.cache.bz2 +share/doc/HTML/pl/kcontrol/windowmanagement/index.docbook share/doc/HTML/pl/kdeprint/add-printer-wiz.docbook share/doc/HTML/pl/kdeprint/common share/doc/HTML/pl/kdeprint/cups-config.docbook @@ -90,6 +249,10 @@ share/doc/HTML/pl/kdevelop/tip.database share/doc/HTML/pl/kdf/common share/doc/HTML/pl/kdf/index.cache.bz2 share/doc/HTML/pl/kdf/index.docbook +share/doc/HTML/pl/kdm/common +share/doc/HTML/pl/kdm/index.cache.bz2 +share/doc/HTML/pl/kdm/index.docbook +share/doc/HTML/pl/kdm/kdmrc-ref.docbook share/doc/HTML/pl/keduca/common share/doc/HTML/pl/keduca/index.cache.bz2 share/doc/HTML/pl/keduca/index.docbook @@ -391,6 +554,11 @@ share/doc/HTML/pl/konsole/index.docbook share/doc/HTML/pl/kontact/common share/doc/HTML/pl/kontact/index.cache.bz2 share/doc/HTML/pl/kontact/index.docbook +share/doc/HTML/pl/kopete/chatstyle.docbook +share/doc/HTML/pl/kopete/common +share/doc/HTML/pl/kopete/index.cache.bz2 +share/doc/HTML/pl/kopete/index.docbook +share/doc/HTML/pl/kopete/menus.docbook share/doc/HTML/pl/korganizer/common share/doc/HTML/pl/korganizer/index.cache.bz2 share/doc/HTML/pl/korganizer/index.docbook @@ -448,6 +616,27 @@ share/doc/HTML/pl/kppp/kppp-wizard-tab.png share/doc/HTML/pl/kppp/security.docbook share/doc/HTML/pl/kppp/tricks.docbook share/doc/HTML/pl/kppp/wizard.docbook +share/doc/HTML/pl/krdc/authentication.png +share/doc/HTML/pl/krdc/common +share/doc/HTML/pl/krdc/index.cache.bz2 +share/doc/HTML/pl/krdc/index.docbook +share/doc/HTML/pl/krdc/preferences_profilestab.png +share/doc/HTML/pl/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/pl/krdc/preferences_vncdefaultstab.png +share/doc/HTML/pl/krdc/snapshot_connectionspeed.png +share/doc/HTML/pl/krdc/snapshot_nobrowse.png +share/doc/HTML/pl/krdc/snapshot_vncentry.png +share/doc/HTML/pl/krfb/common +share/doc/HTML/pl/krfb/configuration_access.png +share/doc/HTML/pl/krfb/configuration_network.png +share/doc/HTML/pl/krfb/configuration_session.png +share/doc/HTML/pl/krfb/connection.png +share/doc/HTML/pl/krfb/email_invitation.png +share/doc/HTML/pl/krfb/index.cache.bz2 +share/doc/HTML/pl/krfb/index.docbook +share/doc/HTML/pl/krfb/invitation_management.png +share/doc/HTML/pl/krfb/personal_invitation.png +share/doc/HTML/pl/krfb/screenshot.png share/doc/HTML/pl/ksame/common share/doc/HTML/pl/ksame/index.cache.bz2 share/doc/HTML/pl/ksame/index.docbook @@ -557,6 +746,9 @@ share/doc/HTML/pl/kwallet/kwalletmanager.png share/doc/HTML/pl/kwordquiz/common share/doc/HTML/pl/kwordquiz/index.cache.bz2 share/doc/HTML/pl/kwordquiz/index.docbook +share/doc/HTML/pl/kwrite/common +share/doc/HTML/pl/kwrite/index.cache.bz2 +share/doc/HTML/pl/kwrite/index.docbook share/doc/HTML/pl/kxkb/common share/doc/HTML/pl/kxkb/index.cache.bz2 share/doc/HTML/pl/kxkb/index.docbook @@ -1129,6 +1321,7 @@ share/locale/pl/entry.desktop share/locale/pl/flag.png @dirrm share/doc/HTML/pl/noatun @dirrm share/doc/HTML/pl/kxkb +@dirrm share/doc/HTML/pl/kwrite @dirrm share/doc/HTML/pl/kwordquiz @dirrm share/doc/HTML/pl/kwallet @dirrm share/doc/HTML/pl/ktuberling @@ -1140,12 +1333,15 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/ksirc @dirrm share/doc/HTML/pl/kscd @dirrm share/doc/HTML/pl/ksame +@dirrm share/doc/HTML/pl/krfb +@dirrm share/doc/HTML/pl/krdc @dirrm share/doc/HTML/pl/kppp @dirrm share/doc/HTML/pl/kpercentage @dirrm share/doc/HTML/pl/kpdf @dirrm share/doc/HTML/pl/kpat @dirrm share/doc/HTML/pl/kpager @dirrm share/doc/HTML/pl/korganizer +@dirrm share/doc/HTML/pl/kopete @dirrm share/doc/HTML/pl/kontact @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @@ -1190,13 +1386,60 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/kgeography @dirrm share/doc/HTML/pl/kfind @dirrm share/doc/HTML/pl/keduca +@dirrm share/doc/HTML/pl/kdm @dirrm share/doc/HTML/pl/kdf @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint +@dirrm share/doc/HTML/pl/kcontrol/windowmanagement +@dirrm share/doc/HTML/pl/kcontrol/useragent +@dirrm share/doc/HTML/pl/kcontrol/spellchecking +@dirrm share/doc/HTML/pl/kcontrol/smb +@dirrm share/doc/HTML/pl/kcontrol/screensaver +@dirrm share/doc/HTML/pl/kcontrol/proxy +@dirrm share/doc/HTML/pl/kcontrol/performance +@dirrm share/doc/HTML/pl/kcontrol/passwords +@dirrm share/doc/HTML/pl/kcontrol/panelappearance +@dirrm share/doc/HTML/pl/kcontrol/panel +@dirrm share/doc/HTML/pl/kcontrol/netpref +@dirrm share/doc/HTML/pl/kcontrol/mouse +@dirrm share/doc/HTML/pl/kcontrol/language +@dirrm share/doc/HTML/pl/kcontrol/kwindecoration +@dirrm share/doc/HTML/pl/kcontrol/khtml +@dirrm share/doc/HTML/pl/kcontrol/keys +@dirrm share/doc/HTML/pl/kcontrol/keyboard +@dirrm share/doc/HTML/pl/kcontrol/kdm +@dirrm share/doc/HTML/pl/kcontrol/kcmtaskbar +@dirrm share/doc/HTML/pl/kcontrol/kcmstyle +@dirrm share/doc/HTML/pl/kcontrol/kcmsmserver +@dirrm share/doc/HTML/pl/kcontrol/kcmnotify +@dirrm share/doc/HTML/pl/kcontrol/kcmlaunch +@dirrm share/doc/HTML/pl/kcontrol/kcmkonsole +@dirrm share/doc/HTML/pl/kcontrol/kcmfontinst +@dirrm share/doc/HTML/pl/kcontrol/kcmcss +@dirrm share/doc/HTML/pl/kcontrol/kcmaccess +@dirrm share/doc/HTML/pl/kcontrol/helpindex +@dirrm share/doc/HTML/pl/kcontrol/fonts +@dirrm share/doc/HTML/pl/kcontrol/filetypes +@dirrm share/doc/HTML/pl/kcontrol/filemanager +@dirrm share/doc/HTML/pl/kcontrol/energy +@dirrm share/doc/HTML/pl/kcontrol/email +@dirrm share/doc/HTML/pl/kcontrol/ebrowsing +@dirrm share/doc/HTML/pl/kcontrol/desktopbehavior +@dirrm share/doc/HTML/pl/kcontrol/desktop +@dirrm share/doc/HTML/pl/kcontrol/crypto +@dirrm share/doc/HTML/pl/kcontrol/cookies +@dirrm share/doc/HTML/pl/kcontrol/colors +@dirrm share/doc/HTML/pl/kcontrol/clock +@dirrm share/doc/HTML/pl/kcontrol/cache +@dirrm share/doc/HTML/pl/kcontrol/bell +@dirrm share/doc/HTML/pl/kcontrol/background +@dirrm share/doc/HTML/pl/kcontrol/arts +@dirrm share/doc/HTML/pl/kcontrol @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch @dirrm share/doc/HTML/pl/kbattleship +@dirrm share/doc/HTML/pl/kate @dirrm share/doc/HTML/pl/kanagram @dirrm share/doc/HTML/pl/kalzium @dirrm share/doc/HTML/pl/kaddressbook diff --git a/polish/koffice-i18n/Makefile b/polish/koffice-i18n/Makefile index f5413624c8c6..40e0deeb333d 100644 --- a/polish/koffice-i18n/Makefile +++ b/polish/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/koffice-i18n/distinfo b/polish/koffice-i18n/distinfo index 25544ebdff6b..a7b92caa358d 100644 --- a/polish/koffice-i18n/distinfo +++ b/polish/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 193d09145eea9136067676b6d74ab5f9 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 495cd1fa8fb9e0d3877987b7b4114d3cf6eee1dae78286d3114fff9b762bb74b -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 377813 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 diff --git a/polish/koffice-i18n/pkg-plist b/polish/koffice-i18n/pkg-plist index a9161205f0d6..4b4534d94bbe 100644 --- a/polish/koffice-i18n/pkg-plist +++ b/polish/koffice-i18n/pkg-plist @@ -2,6 +2,7 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo +share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile index f5413624c8c6..40e0deeb333d 100644 --- a/polish/koffice-kde4-l10n/Makefile +++ b/polish/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= polish kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/polish/koffice-kde4-l10n/distinfo b/polish/koffice-kde4-l10n/distinfo index 25544ebdff6b..a7b92caa358d 100644 --- a/polish/koffice-kde4-l10n/distinfo +++ b/polish/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 193d09145eea9136067676b6d74ab5f9 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 495cd1fa8fb9e0d3877987b7b4114d3cf6eee1dae78286d3114fff9b762bb74b -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.2.tar.bz2) = 377813 +MD5 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = ca6e0bd7de872e51f342cd153598981b +SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 64d43efeb10eadaac320a412948a8e397f838aff73d5ee8c5eb88650dcae6412 +SIZE (KDE/kde-i18n/koffice-l10n-pl-1.6.1.tar.bz2) = 386344 diff --git a/polish/koffice-kde4-l10n/pkg-plist b/polish/koffice-kde4-l10n/pkg-plist index a9161205f0d6..4b4534d94bbe 100644 --- a/polish/koffice-kde4-l10n/pkg-plist +++ b/polish/koffice-kde4-l10n/pkg-plist @@ -2,6 +2,7 @@ share/locale/pl/LC_MESSAGES/desktop_koffice.mo share/locale/pl/LC_MESSAGES/example.mo share/locale/pl/LC_MESSAGES/karbon.mo share/locale/pl/LC_MESSAGES/kchart.mo +share/locale/pl/LC_MESSAGES/kdgantt.mo share/locale/pl/LC_MESSAGES/kexi.mo share/locale/pl/LC_MESSAGES/kfile_abiword.mo share/locale/pl/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile index f69f7dd8331b..3f06ce477d89 100644 --- a/portuguese/calligra-l10n-pt_BR/Makefile +++ b/portuguese/calligra-l10n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/calligra-l10n-pt_BR/distinfo b/portuguese/calligra-l10n-pt_BR/distinfo index f14b00651338..a04a8005a1a2 100644 --- a/portuguese/calligra-l10n-pt_BR/distinfo +++ b/portuguese/calligra-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = bba591e0460c4a0169c07c3d5ae5b118 -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 8630ee37c378e2b27ffd29bdabcd3968c3857fd03d954c7b811ad6242f493a65 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 2002410 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 diff --git a/portuguese/calligra-l10n-pt_BR/pkg-plist b/portuguese/calligra-l10n-pt_BR/pkg-plist index b54dc6ddf7a2..0a9b3432a18e 100644 --- a/portuguese/calligra-l10n-pt_BR/pkg-plist +++ b/portuguese/calligra-l10n-pt_BR/pkg-plist @@ -1,16 +1,68 @@ +share/doc/HTML/pt_BR/karbon/common +share/doc/HTML/pt_BR/karbon/index.cache.bz2 +share/doc/HTML/pt_BR/karbon/index.docbook share/doc/HTML/pt_BR/kchart/common -share/doc/HTML/pt_BR/kchart/file-toolbar.png -share/doc/HTML/pt_BR/kchart/file-toolbar2.png -share/doc/HTML/pt_BR/kchart/frame_chart.png share/doc/HTML/pt_BR/kchart/index.cache.bz2 share/doc/HTML/pt_BR/kchart/index.docbook -share/doc/HTML/pt_BR/kchart/kchart-kspread-bar.png -share/doc/HTML/pt_BR/kchart/kchart-kspread.png +share/doc/HTML/pt_BR/kchart/kchart-config1.png +share/doc/HTML/pt_BR/kchart/kchart-config2.png +share/doc/HTML/pt_BR/kchart/kchart-config3.png +share/doc/HTML/pt_BR/kchart/kchart-config4.png +share/doc/HTML/pt_BR/kchart/kchart-config5.png +share/doc/HTML/pt_BR/kchart/kchart-config6.png +share/doc/HTML/pt_BR/kchart/kchart-config7.png +share/doc/HTML/pt_BR/kchart/kchart-config8.png +share/doc/HTML/pt_BR/kchart/kchart-dataeditor.png +share/doc/HTML/pt_BR/kchart/kchart-default.png +share/doc/HTML/pt_BR/kchart/kchart-example1-1.png +share/doc/HTML/pt_BR/kchart/kchart-example1-2.png +share/doc/HTML/pt_BR/kchart/kchart-example1-5.png +share/doc/HTML/pt_BR/kchart/kchart-example1-6.png +share/doc/HTML/pt_BR/kchart/kchart-example1-7.png +share/doc/HTML/pt_BR/kchart/kchart-example1-8.png +share/doc/HTML/pt_BR/kchart/kchart-startupdialog.png +share/doc/HTML/pt_BR/kchart/kchart-wizard0.png +share/doc/HTML/pt_BR/kchart/kchart-wizard1.png +share/doc/HTML/pt_BR/kchart/kchart-wizard2.png +share/doc/HTML/pt_BR/kchart/kchart-wizard3.png +share/doc/HTML/pt_BR/kchart/kchart-wizard4.png share/doc/HTML/pt_BR/kchart/shortcut.png share/doc/HTML/pt_BR/kchart/toolbars.png +share/doc/HTML/pt_BR/kexi/basics.docbook +share/doc/HTML/pt_BR/kexi/building.docbook +share/doc/HTML/pt_BR/kexi/common +share/doc/HTML/pt_BR/kexi/comparing.docbook +share/doc/HTML/pt_BR/kexi/configuration.docbook +share/doc/HTML/pt_BR/kexi/contact-example.png +share/doc/HTML/pt_BR/kexi/credits.docbook +share/doc/HTML/pt_BR/kexi/database.docbook +share/doc/HTML/pt_BR/kexi/designingforms.docbook +share/doc/HTML/pt_BR/kexi/enteringdataintotables.docbook +share/doc/HTML/pt_BR/kexi/enteringdatausingforms.docbook +share/doc/HTML/pt_BR/kexi/index.cache.bz2 +share/doc/HTML/pt_BR/kexi/index.docbook +share/doc/HTML/pt_BR/kexi/intro.docbook +share/doc/HTML/pt_BR/kexi/menus.docbook +share/doc/HTML/pt_BR/kexi/querydesigning.docbook +share/doc/HTML/pt_BR/kformula/ambiguous-string.png share/doc/HTML/pt_BR/kformula/common +share/doc/HTML/pt_BR/kformula/green1.png +share/doc/HTML/pt_BR/kformula/green2.png share/doc/HTML/pt_BR/kformula/index.cache.bz2 share/doc/HTML/pt_BR/kformula/index.docbook +share/doc/HTML/pt_BR/kformula/kfontinst1.png +share/doc/HTML/pt_BR/kformula/kfontinst2.png +share/doc/HTML/pt_BR/kformula/kfontinst3.png +share/doc/HTML/pt_BR/kformula/kfontinst4.png +share/doc/HTML/pt_BR/kformula/kfontinst5.png +share/doc/HTML/pt_BR/kformula/kfontinst6.png +share/doc/HTML/pt_BR/kformula/rk-edit0.png +share/doc/HTML/pt_BR/kformula/rk-edit1.png +share/doc/HTML/pt_BR/kformula/rk-edit2.png +share/doc/HTML/pt_BR/kformula/scilab-edit.png +share/doc/HTML/pt_BR/kformula/shortcut0.png +share/doc/HTML/pt_BR/kformula/shortcut1.png +share/doc/HTML/pt_BR/kformula/toolbars.png share/doc/HTML/pt_BR/kivio/common share/doc/HTML/pt_BR/kivio/credits.docbook share/doc/HTML/pt_BR/kivio/index.cache.bz2 @@ -25,33 +77,219 @@ share/doc/HTML/pt_BR/koffice/index.docbook share/doc/HTML/pt_BR/koshell/common share/doc/HTML/pt_BR/koshell/index.cache.bz2 share/doc/HTML/pt_BR/koshell/index.docbook +share/doc/HTML/pt_BR/koshell/koshell1.png +share/doc/HTML/pt_BR/koshell/main-view.png +share/doc/HTML/pt_BR/koshell/new-dialog.png +share/doc/HTML/pt_BR/koshell/side-pane.png +share/doc/HTML/pt_BR/kplato/commands.docbook +share/doc/HTML/pt_BR/kplato/common +share/doc/HTML/pt_BR/kplato/configure-wbs.png +share/doc/HTML/pt_BR/kplato/configure1.png +share/doc/HTML/pt_BR/kplato/configure2.1.png +share/doc/HTML/pt_BR/kplato/configure2.png +share/doc/HTML/pt_BR/kplato/definitions.docbook +share/doc/HTML/pt_BR/kplato/edit-accounts.png +share/doc/HTML/pt_BR/kplato/edit-accounts1.png +share/doc/HTML/pt_BR/kplato/edit-calendar.png +share/doc/HTML/pt_BR/kplato/edit-calendar1.png +share/doc/HTML/pt_BR/kplato/edit-calendar2.png +share/doc/HTML/pt_BR/kplato/edit-resources.png +share/doc/HTML/pt_BR/kplato/edit-resources1.png +share/doc/HTML/pt_BR/kplato/edit-worktime.png +share/doc/HTML/pt_BR/kplato/index.cache.bz2 +share/doc/HTML/pt_BR/kplato/index.docbook +share/doc/HTML/pt_BR/kplato/mainwindow.docbook +share/doc/HTML/pt_BR/kplato/mainwindow1.png +share/doc/HTML/pt_BR/kplato/options.docbook +share/doc/HTML/pt_BR/kplato/project-settings.png +share/doc/HTML/pt_BR/kplato/wbs.docbook +share/doc/HTML/pt_BR/kplato/wbs.png +share/doc/HTML/pt_BR/kplato/wbs1.png +share/doc/HTML/pt_BR/kplato/wbs2.png +share/doc/HTML/pt_BR/kplato/wbs3.png +share/doc/HTML/pt_BR/kpresenter/a11y.docbook +share/doc/HTML/pt_BR/kpresenter/autocorrection1.png +share/doc/HTML/pt_BR/kpresenter/autocorrection2.png +share/doc/HTML/pt_BR/kpresenter/autocorrection3.png +share/doc/HTML/pt_BR/kpresenter/autocorrection4.png +share/doc/HTML/pt_BR/kpresenter/barstyle1.png +share/doc/HTML/pt_BR/kpresenter/barstyle3.png +share/doc/HTML/pt_BR/kpresenter/barstyle4.png +share/doc/HTML/pt_BR/kpresenter/barstyle5.png +share/doc/HTML/pt_BR/kpresenter/barstyle6.png +share/doc/HTML/pt_BR/kpresenter/barstyle7.png +share/doc/HTML/pt_BR/kpresenter/changeformat.png share/doc/HTML/pt_BR/kpresenter/common +share/doc/HTML/pt_BR/kpresenter/completion.png +share/doc/HTML/pt_BR/kpresenter/configure1.png +share/doc/HTML/pt_BR/kpresenter/configure2.png +share/doc/HTML/pt_BR/kpresenter/configure3.png +share/doc/HTML/pt_BR/kpresenter/configure4.png +share/doc/HTML/pt_BR/kpresenter/configure4c.png +share/doc/HTML/pt_BR/kpresenter/configure5.png +share/doc/HTML/pt_BR/kpresenter/configure6.png +share/doc/HTML/pt_BR/kpresenter/configure6b.png +share/doc/HTML/pt_BR/kpresenter/configure6c.png +share/doc/HTML/pt_BR/kpresenter/configure6d.png +share/doc/HTML/pt_BR/kpresenter/configure6e.png +share/doc/HTML/pt_BR/kpresenter/configure7.png share/doc/HTML/pt_BR/kpresenter/faq.docbook share/doc/HTML/pt_BR/kpresenter/great-presentations.docbook share/doc/HTML/pt_BR/kpresenter/guides.docbook +share/doc/HTML/pt_BR/kpresenter/htmlshow1.png +share/doc/HTML/pt_BR/kpresenter/htmlshow2.png +share/doc/HTML/pt_BR/kpresenter/htmlshow3.png +share/doc/HTML/pt_BR/kpresenter/htmlshow4.png +share/doc/HTML/pt_BR/kpresenter/htmlshow5.png +share/doc/HTML/pt_BR/kpresenter/htmlshow6.png +share/doc/HTML/pt_BR/kpresenter/htmlshow7.png +share/doc/HTML/pt_BR/kpresenter/htmlshow8.png share/doc/HTML/pt_BR/kpresenter/index.cache.bz2 share/doc/HTML/pt_BR/kpresenter/index.docbook +share/doc/HTML/pt_BR/kpresenter/kbd-focus-ext.png share/doc/HTML/pt_BR/kpresenter/menus.docbook +share/doc/HTML/pt_BR/kpresenter/mousenav.png +share/doc/HTML/pt_BR/kpresenter/msexport1.png +share/doc/HTML/pt_BR/kpresenter/msexport2.png +share/doc/HTML/pt_BR/kpresenter/msexport2b.png +share/doc/HTML/pt_BR/kpresenter/msexport3.png +share/doc/HTML/pt_BR/kpresenter/msexport4.png share/doc/HTML/pt_BR/kpresenter/options.docbook +share/doc/HTML/pt_BR/kpresenter/properties.png share/doc/HTML/pt_BR/kpresenter/screen.docbook +share/doc/HTML/pt_BR/kpresenter/settings01.png +share/doc/HTML/pt_BR/kpresenter/settings03.png +share/doc/HTML/pt_BR/kpresenter/settings04.png +share/doc/HTML/pt_BR/kpresenter/template02.png +share/doc/HTML/pt_BR/kpresenter/template03.png +share/doc/HTML/pt_BR/kpresenter/template04.png +share/doc/HTML/pt_BR/kpresenter/template05.png +share/doc/HTML/pt_BR/kpresenter/template06.png +share/doc/HTML/pt_BR/kpresenter/template07.png +share/doc/HTML/pt_BR/kpresenter/textmenu1.png +share/doc/HTML/pt_BR/kpresenter/textmenu2.png +share/doc/HTML/pt_BR/kpresenter/tts.png +share/doc/HTML/pt_BR/kpresenter/tut01.png +share/doc/HTML/pt_BR/kpresenter/tut02.png +share/doc/HTML/pt_BR/kpresenter/tut03.png +share/doc/HTML/pt_BR/kpresenter/tut04.png +share/doc/HTML/pt_BR/kpresenter/tut05.png +share/doc/HTML/pt_BR/kpresenter/tut06.png +share/doc/HTML/pt_BR/kpresenter/tut07.png +share/doc/HTML/pt_BR/kpresenter/tut08.png +share/doc/HTML/pt_BR/kpresenter/tut09.png +share/doc/HTML/pt_BR/kpresenter/tut10.png +share/doc/HTML/pt_BR/kpresenter/tut11.png +share/doc/HTML/pt_BR/kpresenter/tut12.png +share/doc/HTML/pt_BR/kpresenter/tut13.png +share/doc/HTML/pt_BR/kpresenter/tut14.png +share/doc/HTML/pt_BR/kpresenter/tut15.png +share/doc/HTML/pt_BR/kpresenter/tut16.png +share/doc/HTML/pt_BR/kpresenter/tut17.png +share/doc/HTML/pt_BR/kpresenter/tut18.png +share/doc/HTML/pt_BR/kpresenter/tut19.png +share/doc/HTML/pt_BR/kpresenter/tut20.png +share/doc/HTML/pt_BR/kpresenter/tut21.png +share/doc/HTML/pt_BR/kpresenter/tut22.png +share/doc/HTML/pt_BR/kpresenter/tut23.png +share/doc/HTML/pt_BR/kpresenter/tut24.png +share/doc/HTML/pt_BR/kpresenter/tut26.png share/doc/HTML/pt_BR/kpresenter/tutorial.docbook +share/doc/HTML/pt_BR/krita/commands-dialogs.docbook +share/doc/HTML/pt_BR/krita/commands-menus.docbook +share/doc/HTML/pt_BR/krita/commands-palettes.docbook +share/doc/HTML/pt_BR/krita/commands-toolbars.docbook +share/doc/HTML/pt_BR/krita/commands.docbook +share/doc/HTML/pt_BR/krita/common +share/doc/HTML/pt_BR/krita/createdocument.png +share/doc/HTML/pt_BR/krita/credits.docbook +share/doc/HTML/pt_BR/krita/developers-plugins.docbook +share/doc/HTML/pt_BR/krita/developers-scripting.docbook +share/doc/HTML/pt_BR/krita/developers.docbook +share/doc/HTML/pt_BR/krita/dialogs-addpalette.png +share/doc/HTML/pt_BR/krita/dialogs-blur.png +share/doc/HTML/pt_BR/krita/dialogs-brightnesscontrast.png +share/doc/HTML/pt_BR/krita/dialogs-bumpmap.png +share/doc/HTML/pt_BR/krita/dialogs-coloradjustment.png +share/doc/HTML/pt_BR/krita/dialogs-colortoalpha.png +share/doc/HTML/pt_BR/krita/dialogs-colortransfer.png +share/doc/HTML/pt_BR/krita/dialogs-convertimagetype.png +share/doc/HTML/pt_BR/krita/dialogs-convertlayertype.png +share/doc/HTML/pt_BR/krita/dialogs-customconvolution.png +share/doc/HTML/pt_BR/krita/dialogs-emboss.png +share/doc/HTML/pt_BR/krita/dialogs-histogram.png +share/doc/HTML/pt_BR/krita/dialogs-imageproperties.png +share/doc/HTML/pt_BR/krita/dialogs-imagerestoration.png +share/doc/HTML/pt_BR/krita/dialogs-imagesize.png +share/doc/HTML/pt_BR/krita/dialogs-layerproperties.png +share/doc/HTML/pt_BR/krita/dialogs-layersize.png +share/doc/HTML/pt_BR/krita/dialogs-newlayer.png +share/doc/HTML/pt_BR/krita/dialogs-oilpaint.png +share/doc/HTML/pt_BR/krita/dialogs-pixelize.png +share/doc/HTML/pt_BR/krita/dialogs-raindrops.png +share/doc/HTML/pt_BR/krita/dialogs-separateimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearlayer.png +share/doc/HTML/pt_BR/krita/dialogs-smalltiles.png +share/doc/HTML/pt_BR/krita/dialogs-sobel.png +share/doc/HTML/pt_BR/krita/dialogs-unsharpmask.png +share/doc/HTML/pt_BR/krita/faq.docbook +share/doc/HTML/pt_BR/krita/index.cache.bz2 +share/doc/HTML/pt_BR/krita/index.docbook +share/doc/HTML/pt_BR/krita/installation.docbook +share/doc/HTML/pt_BR/krita/introduction.docbook +share/doc/HTML/pt_BR/krita/mainscreen.png +share/doc/HTML/pt_BR/krita/scripting.docbook +share/doc/HTML/pt_BR/krita/settings.docbook +share/doc/HTML/pt_BR/krita/tutorial-quick-starts.docbook +share/doc/HTML/pt_BR/krita/tutorial-select-layer.docbook +share/doc/HTML/pt_BR/krita/tutorial-starting.docbook +share/doc/HTML/pt_BR/krita/tutorial-tablet.docbook +share/doc/HTML/pt_BR/krita/tutorial.docbook +share/doc/HTML/pt_BR/krita/using-colorspaces.docbook +share/doc/HTML/pt_BR/krita/using-filters.docbook +share/doc/HTML/pt_BR/krita/using-images.docbook +share/doc/HTML/pt_BR/krita/using-layers.docbook +share/doc/HTML/pt_BR/krita/using-selections.docbook +share/doc/HTML/pt_BR/krita/using-views.docbook +share/doc/HTML/pt_BR/kspread/a11y.docbook share/doc/HTML/pt_BR/kspread/advanced.docbook share/doc/HTML/pt_BR/kspread/basics.docbook -share/doc/HTML/pt_BR/kspread/chart1.png +share/doc/HTML/pt_BR/kspread/cellformat0.png +share/doc/HTML/pt_BR/kspread/cellformat1.png +share/doc/HTML/pt_BR/kspread/cellformat2.png +share/doc/HTML/pt_BR/kspread/cellformat3.png +share/doc/HTML/pt_BR/kspread/cellformat4.png +share/doc/HTML/pt_BR/kspread/cellformat5.png +share/doc/HTML/pt_BR/kspread/cellformat6.png +share/doc/HTML/pt_BR/kspread/cellformat7.png +share/doc/HTML/pt_BR/kspread/cellprotection1.png +share/doc/HTML/pt_BR/kspread/cellprotection2.png share/doc/HTML/pt_BR/kspread/commands.docbook share/doc/HTML/pt_BR/kspread/common share/doc/HTML/pt_BR/kspread/config.docbook share/doc/HTML/pt_BR/kspread/configdialog.docbook +share/doc/HTML/pt_BR/kspread/configure1.png +share/doc/HTML/pt_BR/kspread/configure2.png +share/doc/HTML/pt_BR/kspread/configure3.png +share/doc/HTML/pt_BR/kspread/configure4.png +share/doc/HTML/pt_BR/kspread/configure5.png +share/doc/HTML/pt_BR/kspread/configure6.png share/doc/HTML/pt_BR/kspread/copy1.png share/doc/HTML/pt_BR/kspread/faq.docbook share/doc/HTML/pt_BR/kspread/format.docbook share/doc/HTML/pt_BR/kspread/importexport.docbook share/doc/HTML/pt_BR/kspread/index.cache.bz2 share/doc/HTML/pt_BR/kspread/index.docbook +share/doc/HTML/pt_BR/kspread/mousenav.png +share/doc/HTML/pt_BR/kspread/newdocument.png +share/doc/HTML/pt_BR/kspread/sheetproperties.png share/doc/HTML/pt_BR/kspread/shortcut1.png share/doc/HTML/pt_BR/kspread/shortcut2.png +share/doc/HTML/pt_BR/kspread/shortcut3.png share/doc/HTML/pt_BR/kspread/sort1.png share/doc/HTML/pt_BR/kspread/starting1.png +share/doc/HTML/pt_BR/kspread/tts.png share/doc/HTML/pt_BR/kugar/common share/doc/HTML/pt_BR/kugar/datadtd.docbook share/doc/HTML/pt_BR/kugar/dataref.docbook @@ -69,6 +307,7 @@ share/doc/HTML/pt_BR/kword/Tut1.png share/doc/HTML/pt_BR/kword/Tut11a.png share/doc/HTML/pt_BR/kword/Tut11b.png share/doc/HTML/pt_BR/kword/Tut13.png +share/doc/HTML/pt_BR/kword/Tut13a.png share/doc/HTML/pt_BR/kword/Tut14.png share/doc/HTML/pt_BR/kword/Tut14a.png share/doc/HTML/pt_BR/kword/Tut14b.png @@ -84,10 +323,7 @@ share/doc/HTML/pt_BR/kword/Tut3.png share/doc/HTML/pt_BR/kword/Tut4.png share/doc/HTML/pt_BR/kword/Tut7.png share/doc/HTML/pt_BR/kword/Tut8.png -share/doc/HTML/pt_BR/kword/alignBlock.png -share/doc/HTML/pt_BR/kword/alignCenter.png -share/doc/HTML/pt_BR/kword/alignLeft.png -share/doc/HTML/pt_BR/kword/alignRight.png +share/doc/HTML/pt_BR/kword/a11y.docbook share/doc/HTML/pt_BR/kword/auto1.png share/doc/HTML/pt_BR/kword/auto2.png share/doc/HTML/pt_BR/kword/auto3.png @@ -95,42 +331,40 @@ share/doc/HTML/pt_BR/kword/auto4.png share/doc/HTML/pt_BR/kword/autocompdlg.png share/doc/HTML/pt_BR/kword/basic.png share/doc/HTML/pt_BR/kword/basics.docbook -share/doc/HTML/pt_BR/kword/bdcolorbut.png share/doc/HTML/pt_BR/kword/bdselbut.png share/doc/HTML/pt_BR/kword/bdsizebut.png -share/doc/HTML/pt_BR/kword/bold.png share/doc/HTML/pt_BR/kword/bookmarks.docbook -share/doc/HTML/pt_BR/kword/bord.png share/doc/HTML/pt_BR/kword/bordtb.png -share/doc/HTML/pt_BR/kword/bullist.png share/doc/HTML/pt_BR/kword/cftb.png share/doc/HTML/pt_BR/kword/chapnumb.docbook -share/doc/HTML/pt_BR/kword/chcolorbut.png +share/doc/HTML/pt_BR/kword/chcase.png share/doc/HTML/pt_BR/kword/chfontbut.png share/doc/HTML/pt_BR/kword/chsizebut.png share/doc/HTML/pt_BR/kword/chstylebut.png share/doc/HTML/pt_BR/kword/colorseldlg.png share/doc/HTML/pt_BR/kword/columns.docbook share/doc/HTML/pt_BR/kword/common -share/doc/HTML/pt_BR/kword/decindbut.png +share/doc/HTML/pt_BR/kword/ctab2.png share/doc/HTML/pt_BR/kword/doccomments.docbook share/doc/HTML/pt_BR/kword/doclinks.docbook share/doc/HTML/pt_BR/kword/docstruct.docbook share/doc/HTML/pt_BR/kword/docstruct.png share/doc/HTML/pt_BR/kword/docvariables.docbook +share/doc/HTML/pt_BR/kword/dtab2.png share/doc/HTML/pt_BR/kword/dtpfmtpg1.png -share/doc/HTML/pt_BR/kword/editcopy.png share/doc/HTML/pt_BR/kword/editing.docbook share/doc/HTML/pt_BR/kword/edittb.png -share/doc/HTML/pt_BR/kword/enumlist.png +share/doc/HTML/pt_BR/kword/error +share/doc/HTML/pt_BR/kword/exoffset.png share/doc/HTML/pt_BR/kword/expression.png share/doc/HTML/pt_BR/kword/expressions.docbook +share/doc/HTML/pt_BR/kword/exst.png share/doc/HTML/pt_BR/kword/exul.png share/doc/HTML/pt_BR/kword/fchardlg.png share/doc/HTML/pt_BR/kword/fchardlg2.png -share/doc/HTML/pt_BR/kword/filefloppy.png -share/doc/HTML/pt_BR/kword/fileprint.png -share/doc/HTML/pt_BR/kword/fileprint2.png +share/doc/HTML/pt_BR/kword/fchardlg3.png +share/doc/HTML/pt_BR/kword/fchardlg4.png +share/doc/HTML/pt_BR/kword/fchardlg5.png share/doc/HTML/pt_BR/kword/filetb.png share/doc/HTML/pt_BR/kword/finddlg.png share/doc/HTML/pt_BR/kword/finddlg2.png @@ -147,6 +381,7 @@ share/doc/HTML/pt_BR/kword/formframe2.png share/doc/HTML/pt_BR/kword/formframe3.png share/doc/HTML/pt_BR/kword/formframe4.png share/doc/HTML/pt_BR/kword/formframe5.png +share/doc/HTML/pt_BR/kword/formframe6.png share/doc/HTML/pt_BR/kword/formspecchar.png share/doc/HTML/pt_BR/kword/formtb.png share/doc/HTML/pt_BR/kword/formulas.docbook @@ -155,14 +390,13 @@ share/doc/HTML/pt_BR/kword/fpara2.png share/doc/HTML/pt_BR/kword/fpara3.png share/doc/HTML/pt_BR/kword/fpara4.png share/doc/HTML/pt_BR/kword/fpara5.png -share/doc/HTML/pt_BR/kword/fpara6.png +share/doc/HTML/pt_BR/kword/framers.png share/doc/HTML/pt_BR/kword/frames.docbook share/doc/HTML/pt_BR/kword/framestylist.png share/doc/HTML/pt_BR/kword/fundimentals.docbook share/doc/HTML/pt_BR/kword/graphics.docbook share/doc/HTML/pt_BR/kword/headerfooter.docbook share/doc/HTML/pt_BR/kword/horizline.docbook -share/doc/HTML/pt_BR/kword/incindbut.png share/doc/HTML/pt_BR/kword/index.cache.bz2 share/doc/HTML/pt_BR/kword/index.docbook share/doc/HTML/pt_BR/kword/inscoldlg.png @@ -172,21 +406,28 @@ share/doc/HTML/pt_BR/kword/insgrph1.png share/doc/HTML/pt_BR/kword/insgrph2.png share/doc/HTML/pt_BR/kword/insrowdlg.png share/doc/HTML/pt_BR/kword/instab1.png -share/doc/HTML/pt_BR/kword/instb.png share/doc/HTML/pt_BR/kword/instime.png -share/doc/HTML/pt_BR/kword/ital.png -share/doc/HTML/pt_BR/kword/joincell.png +share/doc/HTML/pt_BR/kword/intro1.png +share/doc/HTML/pt_BR/kword/intro2.png +share/doc/HTML/pt_BR/kword/intro3.png share/doc/HTML/pt_BR/kword/kparts.docbook -share/doc/HTML/pt_BR/kword/larrow.png share/doc/HTML/pt_BR/kword/linkdlg.png +share/doc/HTML/pt_BR/kword/listdepth1.png +share/doc/HTML/pt_BR/kword/listdepth2.png +share/doc/HTML/pt_BR/kword/listdepth3.png share/doc/HTML/pt_BR/kword/lists.docbook +share/doc/HTML/pt_BR/kword/ltab2.png share/doc/HTML/pt_BR/kword/mailmerge.docbook share/doc/HTML/pt_BR/kword/mbtb.docbook share/doc/HTML/pt_BR/kword/migrating.docbook share/doc/HTML/pt_BR/kword/mmerge1.png +share/doc/HTML/pt_BR/kword/mmerge1a.png +share/doc/HTML/pt_BR/kword/mmerge2.png +share/doc/HTML/pt_BR/kword/mmergeab1.png +share/doc/HTML/pt_BR/kword/mmergekspread1.png share/doc/HTML/pt_BR/kword/mmergesql1.png share/doc/HTML/pt_BR/kword/mmergesql2.png -share/doc/HTML/pt_BR/kword/numtxtbut.png +share/doc/HTML/pt_BR/kword/mousenav.png share/doc/HTML/pt_BR/kword/opendlg.png share/doc/HTML/pt_BR/kword/opt.docbook share/doc/HTML/pt_BR/kword/opt1.png @@ -194,6 +435,7 @@ share/doc/HTML/pt_BR/kword/opt2.png share/doc/HTML/pt_BR/kword/opt3.png share/doc/HTML/pt_BR/kword/opt4.png share/doc/HTML/pt_BR/kword/opt5.png +share/doc/HTML/pt_BR/kword/opt6.png share/doc/HTML/pt_BR/kword/optkb.png share/doc/HTML/pt_BR/kword/optkb2.png share/doc/HTML/pt_BR/kword/opttb.png @@ -201,24 +443,21 @@ share/doc/HTML/pt_BR/kword/pageformat.docbook share/doc/HTML/pt_BR/kword/paratb.png share/doc/HTML/pt_BR/kword/pntdlg.png share/doc/HTML/pt_BR/kword/pntdlg1.png -share/doc/HTML/pt_BR/kword/rarrow.png -share/doc/HTML/pt_BR/kword/redo.png share/doc/HTML/pt_BR/kword/repldlg.png +share/doc/HTML/pt_BR/kword/rtab2.png share/doc/HTML/pt_BR/kword/ruler.png share/doc/HTML/pt_BR/kword/saved1.png share/doc/HTML/pt_BR/kword/saved2.png share/doc/HTML/pt_BR/kword/savedlg.png share/doc/HTML/pt_BR/kword/savetmpl1.png +share/doc/HTML/pt_BR/kword/scan2.png share/doc/HTML/pt_BR/kword/screen.png share/doc/HTML/pt_BR/kword/select1.png -share/doc/HTML/pt_BR/kword/spell.png share/doc/HTML/pt_BR/kword/spelldlg.png -share/doc/HTML/pt_BR/kword/stkout.png share/doc/HTML/pt_BR/kword/storeprint.docbook share/doc/HTML/pt_BR/kword/styldlg1.png +share/doc/HTML/pt_BR/kword/styleimport.png share/doc/HTML/pt_BR/kword/styles.docbook -share/doc/HTML/pt_BR/kword/subscbut.png -share/doc/HTML/pt_BR/kword/supscbut.png share/doc/HTML/pt_BR/kword/table.docbook share/doc/HTML/pt_BR/kword/tableprop1.png share/doc/HTML/pt_BR/kword/tableprop2.png @@ -234,9 +473,11 @@ share/doc/HTML/pt_BR/kword/tedittb.png share/doc/HTML/pt_BR/kword/templatecreation.docbook share/doc/HTML/pt_BR/kword/thesaurus.png share/doc/HTML/pt_BR/kword/toc.docbook +share/doc/HTML/pt_BR/kword/tts.png share/doc/HTML/pt_BR/kword/tutorial.docbook -share/doc/HTML/pt_BR/kword/undl.png -share/doc/HTML/pt_BR/kword/undo.png +share/doc/HTML/pt_BR/kword/viewsize.png +share/doc/HTML/pt_BR/kword/wbw.png +share/doc/HTML/pt_BR/kword/word share/doc/HTML/pt_BR/kword/wpfmtpg1.png share/doc/HTML/pt_BR/kword/wpfmtpg2.png share/doc/HTML/pt_BR/kword/wpfmtpg3.png @@ -248,6 +489,7 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo +share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo @@ -278,9 +520,13 @@ share/locale/pt_BR/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/pt_BR/kword @dirrm share/doc/HTML/pt_BR/kugar @dirrm share/doc/HTML/pt_BR/kspread +@dirrm share/doc/HTML/pt_BR/krita @dirrm share/doc/HTML/pt_BR/kpresenter +@dirrm share/doc/HTML/pt_BR/kplato @dirrm share/doc/HTML/pt_BR/koshell @dirrm share/doc/HTML/pt_BR/koffice @dirrm share/doc/HTML/pt_BR/kivio @dirrm share/doc/HTML/pt_BR/kformula +@dirrm share/doc/HTML/pt_BR/kexi @dirrm share/doc/HTML/pt_BR/kchart +@dirrm share/doc/HTML/pt_BR/karbon diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile index 69dcf6a80b7d..d280a0b87342 100644 --- a/portuguese/calligra-l10n/Makefile +++ b/portuguese/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/calligra-l10n/distinfo b/portuguese/calligra-l10n/distinfo index 5c71fbe9ab87..5137782d8475 100644 --- a/portuguese/calligra-l10n/distinfo +++ b/portuguese/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = f8d4e8990e1f24ef6076de1c9698458f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 8d4ce9c30c5b7585b126ba36da16034b489b4349034c5241dd23777f07ffb1b8 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 1041430 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 diff --git a/portuguese/calligra-l10n/pkg-plist b/portuguese/calligra-l10n/pkg-plist index 0524e0ce3087..b474302403e1 100644 --- a/portuguese/calligra-l10n/pkg-plist +++ b/portuguese/calligra-l10n/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/pt/kchart/index.docbook share/doc/HTML/pt/kexi/basics.docbook share/doc/HTML/pt/kexi/building.docbook share/doc/HTML/pt/kexi/common +share/doc/HTML/pt/kexi/comparing.docbook share/doc/HTML/pt/kexi/configuration.docbook share/doc/HTML/pt/kexi/credits.docbook share/doc/HTML/pt/kexi/database.docbook +share/doc/HTML/pt/kexi/designingforms.docbook +share/doc/HTML/pt/kexi/enteringdataintotables.docbook +share/doc/HTML/pt/kexi/enteringdatausingforms.docbook share/doc/HTML/pt/kexi/index.cache.bz2 share/doc/HTML/pt/kexi/index.docbook share/doc/HTML/pt/kexi/intro.docbook share/doc/HTML/pt/kexi/menus.docbook +share/doc/HTML/pt/kexi/querydesigning.docbook share/doc/HTML/pt/kformula/common share/doc/HTML/pt/kformula/index.cache.bz2 share/doc/HTML/pt/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/pt/krita/commands-toolbars.docbook share/doc/HTML/pt/krita/commands.docbook share/doc/HTML/pt/krita/common share/doc/HTML/pt/krita/credits.docbook +share/doc/HTML/pt/krita/developers-plugins.docbook +share/doc/HTML/pt/krita/developers-scripting.docbook share/doc/HTML/pt/krita/developers.docbook share/doc/HTML/pt/krita/faq.docbook share/doc/HTML/pt/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/pt/krita/settings.docbook share/doc/HTML/pt/krita/tutorial-quick-starts.docbook share/doc/HTML/pt/krita/tutorial-select-layer.docbook share/doc/HTML/pt/krita/tutorial-starting.docbook +share/doc/HTML/pt/krita/tutorial-tablet.docbook share/doc/HTML/pt/krita/tutorial.docbook share/doc/HTML/pt/krita/using-colorspaces.docbook share/doc/HTML/pt/krita/using-filters.docbook +share/doc/HTML/pt/krita/using-images.docbook share/doc/HTML/pt/krita/using-layers.docbook share/doc/HTML/pt/krita/using-selections.docbook +share/doc/HTML/pt/krita/using-views.docbook share/doc/HTML/pt/kspread/a11y.docbook share/doc/HTML/pt/kspread/advanced.docbook share/doc/HTML/pt/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo +share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/kde3-i18n-pt_BR/distinfo b/portuguese/kde3-i18n-pt_BR/distinfo index cafc623d4982..72ed6ca79a7c 100644 --- a/portuguese/kde3-i18n-pt_BR/distinfo +++ b/portuguese/kde3-i18n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 42e5ed51573df1415f245d201a13095d -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 1bf62ab3ec4618e486fbdba4fd12c58cdae74ecd915ae662695ba912cc1e4678 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 11734073 +MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = d9359ccc0040a5c6ac88d5cad12d4fcf +SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = a63454be61be1fd2ce845f2fa6e219c4eb1a10b254fed684703c39dd4746ffd5 +SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = 11880457 diff --git a/portuguese/kde3-i18n-pt_BR/pkg-plist b/portuguese/kde3-i18n-pt_BR/pkg-plist index 39e770a1805b..db0cf0501eb1 100644 --- a/portuguese/kde3-i18n-pt_BR/pkg-plist +++ b/portuguese/kde3-i18n-pt_BR/pkg-plist @@ -109,6 +109,7 @@ share/doc/HTML/pt_BR/kate/fundamentals.docbook share/doc/HTML/pt_BR/kate/highlighting.docbook share/doc/HTML/pt_BR/kate/index.cache.bz2 share/doc/HTML/pt_BR/kate/index.docbook +share/doc/HTML/pt_BR/kate/man-kate.1.docbook share/doc/HTML/pt_BR/kate/mdi.docbook share/doc/HTML/pt_BR/kate/menus.docbook share/doc/HTML/pt_BR/kate/part.docbook @@ -159,6 +160,9 @@ share/doc/HTML/pt_BR/kcharselect/index.docbook share/doc/HTML/pt_BR/kcoloredit/common share/doc/HTML/pt_BR/kcoloredit/index.cache.bz2 share/doc/HTML/pt_BR/kcoloredit/index.docbook +share/doc/HTML/pt_BR/kcontrol/arts/common +share/doc/HTML/pt_BR/kcontrol/arts/index.cache.bz2 +share/doc/HTML/pt_BR/kcontrol/arts/index.docbook share/doc/HTML/pt_BR/kcontrol/arts/midi.docbook share/doc/HTML/pt_BR/kcontrol/background/common share/doc/HTML/pt_BR/kcontrol/background/index.cache.bz2 @@ -293,6 +297,9 @@ share/doc/HTML/pt_BR/kcontrol/panelappearance/index.docbook share/doc/HTML/pt_BR/kcontrol/passwords/common share/doc/HTML/pt_BR/kcontrol/passwords/index.cache.bz2 share/doc/HTML/pt_BR/kcontrol/passwords/index.docbook +share/doc/HTML/pt_BR/kcontrol/performance/common +share/doc/HTML/pt_BR/kcontrol/performance/index.cache.bz2 +share/doc/HTML/pt_BR/kcontrol/performance/index.docbook share/doc/HTML/pt_BR/kcontrol/powerctrl/common share/doc/HTML/pt_BR/kcontrol/powerctrl/index.cache.bz2 share/doc/HTML/pt_BR/kcontrol/powerctrl/index.docbook @@ -359,6 +366,10 @@ share/doc/HTML/pt_BR/kdeprint/theory.docbook share/doc/HTML/pt_BR/kdesu/common share/doc/HTML/pt_BR/kdesu/index.cache.bz2 share/doc/HTML/pt_BR/kdesu/index.docbook +share/doc/HTML/pt_BR/kdesu/man-kdesu.1.docbook +share/doc/HTML/pt_BR/kdesvn-build/common +share/doc/HTML/pt_BR/kdesvn-build/index.cache.bz2 +share/doc/HTML/pt_BR/kdesvn-build/index.docbook share/doc/HTML/pt_BR/kdf/common share/doc/HTML/pt_BR/kdf/index.cache.bz2 share/doc/HTML/pt_BR/kdf/index.docbook @@ -392,6 +403,7 @@ share/doc/HTML/pt_BR/kfilereplace/index.docbook share/doc/HTML/pt_BR/kfind/common share/doc/HTML/pt_BR/kfind/index.cache.bz2 share/doc/HTML/pt_BR/kfind/index.docbook +share/doc/HTML/pt_BR/kfind/man-kfind.1.docbook share/doc/HTML/pt_BR/kfloppy/common share/doc/HTML/pt_BR/kfloppy/index.cache.bz2 share/doc/HTML/pt_BR/kfloppy/index.docbook @@ -451,6 +463,7 @@ share/doc/HTML/pt_BR/khelpcenter/faq/moreinfo.docbook share/doc/HTML/pt_BR/khelpcenter/faq/nonkdeapps.docbook share/doc/HTML/pt_BR/khelpcenter/faq/notrelated.docbook share/doc/HTML/pt_BR/khelpcenter/faq/panel.docbook +share/doc/HTML/pt_BR/khelpcenter/faq/qt.docbook share/doc/HTML/pt_BR/khelpcenter/faq/questions.docbook share/doc/HTML/pt_BR/khelpcenter/faq/sound.docbook share/doc/HTML/pt_BR/khelpcenter/faq/tips.docbook @@ -476,6 +489,7 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/control-center.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/credits-and-license.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/email.docbook +share/doc/HTML/pt_BR/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/file-sharing.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/font-installation.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/getting-help.docbook @@ -490,6 +504,7 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/kde-office.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/messaging-intro.docbook +share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/networking-with-windows.docbook @@ -545,6 +560,8 @@ share/doc/HTML/pt_BR/kicker-applets/ktimemon.docbook share/doc/HTML/pt_BR/kicker/common share/doc/HTML/pt_BR/kicker/index.cache.bz2 share/doc/HTML/pt_BR/kicker/index.docbook +share/doc/HTML/pt_BR/kicker/man-appletproxy.1.docbook +share/doc/HTML/pt_BR/kicker/man-kicker.1.docbook share/doc/HTML/pt_BR/kiconedit/common share/doc/HTML/pt_BR/kiconedit/index.cache.bz2 share/doc/HTML/pt_BR/kiconedit/index.docbook @@ -555,6 +572,9 @@ share/doc/HTML/pt_BR/kig/scripting-api/Doxyfile.scripting-api.in share/doc/HTML/pt_BR/kinfocenter/blockdevices/common share/doc/HTML/pt_BR/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/pt_BR/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pt_BR/kinfocenter/cdinfo/common +share/doc/HTML/pt_BR/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pt_BR/kinfocenter/cdinfo/index.docbook share/doc/HTML/pt_BR/kinfocenter/common share/doc/HTML/pt_BR/kinfocenter/devices/common share/doc/HTML/pt_BR/kinfocenter/devices/index.cache.bz2 @@ -758,6 +778,9 @@ share/doc/HTML/pt_BR/kmplot/introduction.docbook share/doc/HTML/pt_BR/kmplot/menu.docbook share/doc/HTML/pt_BR/kmplot/reference.docbook share/doc/HTML/pt_BR/kmplot/using.docbook +share/doc/HTML/pt_BR/knetattach/common +share/doc/HTML/pt_BR/knetattach/index.cache.bz2 +share/doc/HTML/pt_BR/knetattach/index.docbook share/doc/HTML/pt_BR/knewsticker/common share/doc/HTML/pt_BR/knewsticker/index.cache.bz2 share/doc/HTML/pt_BR/knewsticker/index.docbook @@ -805,6 +828,9 @@ share/doc/HTML/pt_BR/kommander/widgets.docbook share/doc/HTML/pt_BR/kompare/common share/doc/HTML/pt_BR/kompare/index.cache.bz2 share/doc/HTML/pt_BR/kompare/index.docbook +share/doc/HTML/pt_BR/kompmgr/common +share/doc/HTML/pt_BR/kompmgr/index.cache.bz2 +share/doc/HTML/pt_BR/kompmgr/index.docbook share/doc/HTML/pt_BR/konq-plugins/babel/common share/doc/HTML/pt_BR/konq-plugins/babel/index.cache.bz2 share/doc/HTML/pt_BR/konq-plugins/babel/index.docbook @@ -1654,6 +1680,7 @@ share/locale/pt_BR/LC_MESSAGES/kmathapplet.mo share/locale/pt_BR/LC_MESSAGES/kmcop.mo share/locale/pt_BR/LC_MESSAGES/kmenuapplet.mo share/locale/pt_BR/LC_MESSAGES/kmenuedit.mo +share/locale/pt_BR/LC_MESSAGES/kmessedwords.mo share/locale/pt_BR/LC_MESSAGES/kmid.mo share/locale/pt_BR/LC_MESSAGES/kmilo_delli8k.mo share/locale/pt_BR/LC_MESSAGES/kmilo_generic.mo @@ -1965,6 +1992,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/konq-plugins/crashes @dirrm share/doc/HTML/pt_BR/konq-plugins/babel @dirrm share/doc/HTML/pt_BR/konq-plugins +@dirrm share/doc/HTML/pt_BR/kompmgr @dirrm share/doc/HTML/pt_BR/kompare @dirrm share/doc/HTML/pt_BR/kommander @dirrm share/doc/HTML/pt_BR/kolourpaint @@ -1973,6 +2001,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/knotes @dirrm share/doc/HTML/pt_BR/knode @dirrm share/doc/HTML/pt_BR/knewsticker +@dirrm share/doc/HTML/pt_BR/knetattach @dirrm share/doc/HTML/pt_BR/kmplot @dirrm share/doc/HTML/pt_BR/kmouth @dirrm share/doc/HTML/pt_BR/kmousetool @@ -2015,6 +2044,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kinfocenter/interrupts @dirrm share/doc/HTML/pt_BR/kinfocenter/dma @dirrm share/doc/HTML/pt_BR/kinfocenter/devices +@dirrm share/doc/HTML/pt_BR/kinfocenter/cdinfo @dirrm share/doc/HTML/pt_BR/kinfocenter/blockdevices @dirrm share/doc/HTML/pt_BR/kinfocenter @dirrm share/doc/HTML/pt_BR/kig/scripting-api @@ -2046,6 +2076,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kdm @dirrm share/doc/HTML/pt_BR/kdict @dirrm share/doc/HTML/pt_BR/kdf +@dirrm share/doc/HTML/pt_BR/kdesvn-build @dirrm share/doc/HTML/pt_BR/kdesu @dirrm share/doc/HTML/pt_BR/kdeprint @dirrm share/doc/HTML/pt_BR/kdelirc/kcmlirc @@ -2063,6 +2094,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kcontrol/screensaver @dirrm share/doc/HTML/pt_BR/kcontrol/proxy @dirrm share/doc/HTML/pt_BR/kcontrol/powerctrl +@dirrm share/doc/HTML/pt_BR/kcontrol/performance @dirrm share/doc/HTML/pt_BR/kcontrol/passwords @dirrm share/doc/HTML/pt_BR/kcontrol/panelappearance @dirrm share/doc/HTML/pt_BR/kcontrol/panel diff --git a/portuguese/kde3-i18n/distinfo b/portuguese/kde3-i18n/distinfo index a9179112802c..1d1d2bae854a 100644 --- a/portuguese/kde3-i18n/distinfo +++ b/portuguese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 7ccc83aacaaa1609a66378661ee0b10b -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 5074aeaa07d1e0aedf58f6299e3450021b820d81a6194bfb6a84f6e8dd35ddf9 -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 7749316 +MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = af8b477236f98e0fa7fcae21db3df5cc +SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 76b69d67cabbcb75de0f63a181602b8b6d083d63b47052bbcdd3bf79e1802b2d +SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 12417602 diff --git a/portuguese/kde3-i18n/pkg-plist b/portuguese/kde3-i18n/pkg-plist index 8c6de2f13d7f..b53ccde9a249 100644 --- a/portuguese/kde3-i18n/pkg-plist +++ b/portuguese/kde3-i18n/pkg-plist @@ -119,11 +119,14 @@ share/doc/HTML/pt/kate-plugins/xmlcheck.docbook share/doc/HTML/pt/kate-plugins/xmltools.docbook share/doc/HTML/pt/kate/advanced.docbook share/doc/HTML/pt/kate/common +share/doc/HTML/pt/kate/configdialog01.png +share/doc/HTML/pt/kate/configdialog02.png share/doc/HTML/pt/kate/configuring.docbook share/doc/HTML/pt/kate/fundamentals.docbook share/doc/HTML/pt/kate/highlighting.docbook share/doc/HTML/pt/kate/index.cache.bz2 share/doc/HTML/pt/kate/index.docbook +share/doc/HTML/pt/kate/kate.png share/doc/HTML/pt/kate/man-kate.1.docbook share/doc/HTML/pt/kate/mdi.docbook share/doc/HTML/pt/kate/menus.docbook @@ -133,9 +136,27 @@ share/doc/HTML/pt/kate/regular-expressions.docbook share/doc/HTML/pt/katomic/common share/doc/HTML/pt/katomic/index.cache.bz2 share/doc/HTML/pt/katomic/index.docbook +share/doc/HTML/pt/kaudiocreator/cdconfiguration.png +share/doc/HTML/pt/kaudiocreator/cddbconfigurationlookup.png +share/doc/HTML/pt/kaudiocreator/cddbconfigurationsubmit.png +share/doc/HTML/pt/kaudiocreator/cdinserted.png share/doc/HTML/pt/kaudiocreator/common +share/doc/HTML/pt/kaudiocreator/encoderconfiguration.png +share/doc/HTML/pt/kaudiocreator/encodernotfound.png +share/doc/HTML/pt/kaudiocreator/entersong1.png +share/doc/HTML/pt/kaudiocreator/generalconfiguration.png share/doc/HTML/pt/kaudiocreator/index.cache.bz2 share/doc/HTML/pt/kaudiocreator/index.docbook +share/doc/HTML/pt/kaudiocreator/jobcontrol.png +share/doc/HTML/pt/kaudiocreator/jobshavestarted.png +share/doc/HTML/pt/kaudiocreator/kaudiocreatormainwindow800.png +share/doc/HTML/pt/kaudiocreator/lameconfiguration.png +share/doc/HTML/pt/kaudiocreator/readytorip.png +share/doc/HTML/pt/kaudiocreator/ripperconfiguration.png +share/doc/HTML/pt/kaudiocreator/rippingandencoding.png +share/doc/HTML/pt/kaudiocreator/rippingandencoding2.png +share/doc/HTML/pt/kaudiocreator/setalbumcategory.png +share/doc/HTML/pt/kaudiocreator/startalbumeditor.png share/doc/HTML/pt/kbabel/catman.docbook share/doc/HTML/pt/kbabel/common share/doc/HTML/pt/kbabel/dictionaries.docbook @@ -464,9 +485,17 @@ share/doc/HTML/pt/kenolaba/common share/doc/HTML/pt/kenolaba/index.cache.bz2 share/doc/HTML/pt/kenolaba/index.docbook share/doc/HTML/pt/kenolaba/man-kenolaba.6.docbook +share/doc/HTML/pt/kfilereplace/addstringsdialog_window.png share/doc/HTML/pt/kfilereplace/common share/doc/HTML/pt/kfilereplace/index.cache.bz2 share/doc/HTML/pt/kfilereplace/index.docbook +share/doc/HTML/pt/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/pt/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/pt/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/pt/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/pt/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/pt/kfilereplace/report_example.png +share/doc/HTML/pt/kfilereplace/results_view.png share/doc/HTML/pt/kfind/common share/doc/HTML/pt/kfind/index.cache.bz2 share/doc/HTML/pt/kfind/index.docbook @@ -486,6 +515,11 @@ share/doc/HTML/pt/kgeography/index.docbook share/doc/HTML/pt/kget/common share/doc/HTML/pt/kget/index.cache.bz2 share/doc/HTML/pt/kget/index.docbook +share/doc/HTML/pt/kget/kget1.png +share/doc/HTML/pt/kget/kget2.png +share/doc/HTML/pt/kget/kget3.png +share/doc/HTML/pt/kget/kget4.png +share/doc/HTML/pt/kget/kget5.png share/doc/HTML/pt/kghostview/common share/doc/HTML/pt/kghostview/index.cache.bz2 share/doc/HTML/pt/kghostview/index.docbook @@ -493,8 +527,14 @@ share/doc/HTML/pt/kgoldrunner/common share/doc/HTML/pt/kgoldrunner/index.cache.bz2 share/doc/HTML/pt/kgoldrunner/index.docbook share/doc/HTML/pt/kgpg/common +share/doc/HTML/pt/kgpg/editor.png share/doc/HTML/pt/kgpg/index.cache.bz2 share/doc/HTML/pt/kgpg/index.docbook +share/doc/HTML/pt/kgpg/keygen.png +share/doc/HTML/pt/kgpg/keymanage.png +share/doc/HTML/pt/kgpg/keys.png +share/doc/HTML/pt/kgpg/kicker.png +share/doc/HTML/pt/kgpg/options.png share/doc/HTML/pt/khangman/common share/doc/HTML/pt/khangman/index.cache.bz2 share/doc/HTML/pt/khangman/index.docbook @@ -636,6 +676,9 @@ share/doc/HTML/pt/kig/man-kig.1.docbook share/doc/HTML/pt/kinfocenter/blockdevices/common share/doc/HTML/pt/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/pt/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pt/kinfocenter/cdinfo/common +share/doc/HTML/pt/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pt/kinfocenter/cdinfo/index.docbook share/doc/HTML/pt/kinfocenter/common share/doc/HTML/pt/kinfocenter/devices/common share/doc/HTML/pt/kinfocenter/devices/index.cache.bz2 @@ -766,6 +809,7 @@ share/doc/HTML/pt/klines/index.docbook share/doc/HTML/pt/klinkstatus/common share/doc/HTML/pt/klinkstatus/index.cache.bz2 share/doc/HTML/pt/klinkstatus/index.docbook +share/doc/HTML/pt/klinkstatus/screenshot.png share/doc/HTML/pt/klipper/common share/doc/HTML/pt/klipper/index.cache.bz2 share/doc/HTML/pt/klipper/index.docbook @@ -802,9 +846,14 @@ share/doc/HTML/pt/kmid/index.docbook share/doc/HTML/pt/kmines/common share/doc/HTML/pt/kmines/index.cache.bz2 share/doc/HTML/pt/kmines/index.docbook +share/doc/HTML/pt/kmines/kmines1.png +share/doc/HTML/pt/kmines/kmines2.png share/doc/HTML/pt/kmix/common share/doc/HTML/pt/kmix/index.cache.bz2 share/doc/HTML/pt/kmix/index.docbook +share/doc/HTML/pt/kmix/kmix-channel-playback.png +share/doc/HTML/pt/kmix/kmix-channel-record.png +share/doc/HTML/pt/kmix/kmix-window.png share/doc/HTML/pt/kmoon/common share/doc/HTML/pt/kmoon/index.cache.bz2 share/doc/HTML/pt/kmoon/index.docbook @@ -834,12 +883,25 @@ share/doc/HTML/pt/kmplot/using.docbook share/doc/HTML/pt/knetattach/common share/doc/HTML/pt/knetattach/index.cache.bz2 share/doc/HTML/pt/knetattach/index.docbook +share/doc/HTML/pt/knetattach/screenshot.png +share/doc/HTML/pt/knetattach/screenshot2.png +share/doc/HTML/pt/knetattach/screenshot3.png +share/doc/HTML/pt/knetattach/screenshot4.png share/doc/HTML/pt/knetworkconf/common share/doc/HTML/pt/knetworkconf/index.cache.bz2 share/doc/HTML/pt/knetworkconf/index.docbook share/doc/HTML/pt/knewsticker/common +share/doc/HTML/pt/knewsticker/contextmenu.png share/doc/HTML/pt/knewsticker/index.cache.bz2 share/doc/HTML/pt/knewsticker/index.docbook +share/doc/HTML/pt/knewsticker/kcmnewsticker-filters.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-general.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-newssitedialog.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-newssources.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-scrollerprefs.png +share/doc/HTML/pt/knewsticker/knewsticker-childpanel.png +share/doc/HTML/pt/knewsticker/knewsticker-kicker.png +share/doc/HTML/pt/knewsticker/knewsticker-ownwindow.png share/doc/HTML/pt/knode/commands.docbook share/doc/HTML/pt/knode/common share/doc/HTML/pt/knode/credits.docbook @@ -850,6 +912,19 @@ share/doc/HTML/pt/knode/index.docbook share/doc/HTML/pt/knode/install.docbook share/doc/HTML/pt/knode/introduction.docbook share/doc/HTML/pt/knode/journey.docbook +share/doc/HTML/pt/knode/knode-composer-attachments.png +share/doc/HTML/pt/knode/knode-edit-filter.png +share/doc/HTML/pt/knode/knode-edit-header1.png +share/doc/HTML/pt/knode/knode-edit-header2.png +share/doc/HTML/pt/knode/knode-followup.png +share/doc/HTML/pt/knode/knode-new-article.png +share/doc/HTML/pt/knode/knode-news-account.png +share/doc/HTML/pt/knode/knode-reply.png +share/doc/HTML/pt/knode/knode-rule-editor.png +share/doc/HTML/pt/knode/knode-search.png +share/doc/HTML/pt/knode/knode-start.png +share/doc/HTML/pt/knode/knode-subscribe.png +share/doc/HTML/pt/knode/knode-views.png share/doc/HTML/pt/knode/more.docbook share/doc/HTML/pt/knode/using-firststart.docbook share/doc/HTML/pt/knode/using-morefeatures.docbook @@ -933,19 +1008,26 @@ share/doc/HTML/pt/konq-plugins/webarchiver/index.docbook share/doc/HTML/pt/konqueror/basics.docbook share/doc/HTML/pt/konqueror/bookmarks.docbook share/doc/HTML/pt/konqueror/browser.docbook +share/doc/HTML/pt/konqueror/cmndline.png share/doc/HTML/pt/konqueror/commands.docbook share/doc/HTML/pt/konqueror/common share/doc/HTML/pt/konqueror/config.docbook share/doc/HTML/pt/konqueror/credits.docbook +share/doc/HTML/pt/konqueror/dirtree.png +share/doc/HTML/pt/konqueror/dragdrop.png share/doc/HTML/pt/konqueror/faq.docbook share/doc/HTML/pt/konqueror/filemanager.docbook share/doc/HTML/pt/konqueror/index.cache.bz2 share/doc/HTML/pt/konqueror/index.docbook share/doc/HTML/pt/konqueror/introduction.docbook +share/doc/HTML/pt/konqueror/konqorg.png share/doc/HTML/pt/konqueror/man-kbookmarkmerger.1.docbook +share/doc/HTML/pt/konqueror/parts.png share/doc/HTML/pt/konqueror/path-complete.docbook share/doc/HTML/pt/konqueror/plugins.docbook share/doc/HTML/pt/konqueror/save-settings.docbook +share/doc/HTML/pt/konqueror/shortcut1.png +share/doc/HTML/pt/konqueror/shortcut2.png share/doc/HTML/pt/konqueror/sidebar.docbook share/doc/HTML/pt/konquest/common share/doc/HTML/pt/konquest/index.cache.bz2 @@ -953,6 +1035,8 @@ share/doc/HTML/pt/konquest/index.docbook share/doc/HTML/pt/konsole/common share/doc/HTML/pt/konsole/index.cache.bz2 share/doc/HTML/pt/konsole/index.docbook +share/doc/HTML/pt/konsole/konsole.png +share/doc/HTML/pt/konsole/tabbar.png share/doc/HTML/pt/konsolekalendar/common share/doc/HTML/pt/konsolekalendar/index.cache.bz2 share/doc/HTML/pt/konsolekalendar/index.docbook @@ -962,6 +1046,7 @@ share/doc/HTML/pt/kontact/index.docbook share/doc/HTML/pt/kooka/common share/doc/HTML/pt/kooka/index.cache.bz2 share/doc/HTML/pt/kooka/index.docbook +share/doc/HTML/pt/kopete/chatstyle.docbook share/doc/HTML/pt/kopete/common share/doc/HTML/pt/kopete/index.cache.bz2 share/doc/HTML/pt/kopete/index.docbook @@ -982,6 +1067,8 @@ share/doc/HTML/pt/kpackage/index.docbook share/doc/HTML/pt/kpager/common share/doc/HTML/pt/kpager/index.cache.bz2 share/doc/HTML/pt/kpager/index.docbook +share/doc/HTML/pt/kpager/screenshot.png +share/doc/HTML/pt/kpager/settings.png share/doc/HTML/pt/kpat/common share/doc/HTML/pt/kpat/index.cache.bz2 share/doc/HTML/pt/kpat/index.docbook @@ -1026,13 +1113,35 @@ share/doc/HTML/pt/kppp/global-settings.docbook share/doc/HTML/pt/kppp/hayes.docbook share/doc/HTML/pt/kppp/index.cache.bz2 share/doc/HTML/pt/kppp/index.docbook +share/doc/HTML/pt/kppp/kppp-account-accounting-tab.png +share/doc/HTML/pt/kppp/kppp-account-dial-tab.png +share/doc/HTML/pt/kppp/kppp-account-dns-tab.png +share/doc/HTML/pt/kppp/kppp-account-execute-tab.png +share/doc/HTML/pt/kppp/kppp-account-gateway-tab.png +share/doc/HTML/pt/kppp/kppp-account-ip-tab.png +share/doc/HTML/pt/kppp/kppp-account-login-script-tab.png +share/doc/HTML/pt/kppp/kppp-config.png +share/doc/HTML/pt/kppp/kppp-device-tab.png +share/doc/HTML/pt/kppp/kppp-dialler-tab.png share/doc/HTML/pt/kppp/kppp-faq.docbook +share/doc/HTML/pt/kppp/kppp-graph-tab.png +share/doc/HTML/pt/kppp/kppp-misc-tab.png +share/doc/HTML/pt/kppp/kppp-modem-tab.png +share/doc/HTML/pt/kppp/kppp-wizard.png share/doc/HTML/pt/kppp/security.docbook share/doc/HTML/pt/kppp/tricks.docbook share/doc/HTML/pt/kppp/wizard.docbook +share/doc/HTML/pt/krdc/authentication.png share/doc/HTML/pt/krdc/common share/doc/HTML/pt/krdc/index.cache.bz2 share/doc/HTML/pt/krdc/index.docbook +share/doc/HTML/pt/krdc/preferences_profilestab.png +share/doc/HTML/pt/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/pt/krdc/preferences_vncdefaultstab.png +share/doc/HTML/pt/krdc/snapshot.png +share/doc/HTML/pt/krdc/snapshot_connectionspeed.png +share/doc/HTML/pt/krdc/snapshot_nobrowse.png +share/doc/HTML/pt/krdc/snapshot_vncentry.png share/doc/HTML/pt/krec/common share/doc/HTML/pt/krec/index.cache.bz2 share/doc/HTML/pt/krec/index.docbook @@ -1040,8 +1149,16 @@ share/doc/HTML/pt/kreversi/common share/doc/HTML/pt/kreversi/index.cache.bz2 share/doc/HTML/pt/kreversi/index.docbook share/doc/HTML/pt/krfb/common +share/doc/HTML/pt/krfb/configuration_access.png +share/doc/HTML/pt/krfb/configuration_network.png +share/doc/HTML/pt/krfb/configuration_session.png +share/doc/HTML/pt/krfb/connection.png +share/doc/HTML/pt/krfb/email_invitation.png share/doc/HTML/pt/krfb/index.cache.bz2 share/doc/HTML/pt/krfb/index.docbook +share/doc/HTML/pt/krfb/invitation_management.png +share/doc/HTML/pt/krfb/personal_invitation.png +share/doc/HTML/pt/krfb/screenshot.png share/doc/HTML/pt/kruler/common share/doc/HTML/pt/kruler/index.cache.bz2 share/doc/HTML/pt/kruler/index.docbook @@ -1051,6 +1168,20 @@ share/doc/HTML/pt/ksame/index.docbook share/doc/HTML/pt/kscd/common share/doc/HTML/pt/kscd/index.cache.bz2 share/doc/HTML/pt/kscd/index.docbook +share/doc/HTML/pt/kscd/kscd.png +share/doc/HTML/pt/kscd/kscd11.png +share/doc/HTML/pt/kscd/kscd12.png +share/doc/HTML/pt/kscd/kscd13.png +share/doc/HTML/pt/kscd/kscd14.png +share/doc/HTML/pt/kscd/kscd16.png +share/doc/HTML/pt/kscd/kscd18.png +share/doc/HTML/pt/kscd/kscd19.png +share/doc/HTML/pt/kscd/kscd2.png +share/doc/HTML/pt/kscd/kscd3.png +share/doc/HTML/pt/kscd/kscd5.png +share/doc/HTML/pt/kscd/kscd6.png +share/doc/HTML/pt/kscd/kscd9.png +share/doc/HTML/pt/kscd/kscdannounc.png share/doc/HTML/pt/kshisen/common share/doc/HTML/pt/kshisen/index.cache.bz2 share/doc/HTML/pt/kshisen/index.docbook @@ -1072,6 +1203,8 @@ share/doc/HTML/pt/ksnake/index.docbook share/doc/HTML/pt/ksnapshot/common share/doc/HTML/pt/ksnapshot/index.cache.bz2 share/doc/HTML/pt/ksnapshot/index.docbook +share/doc/HTML/pt/ksnapshot/preview.png +share/doc/HTML/pt/ksnapshot/window.png share/doc/HTML/pt/ksokoban/common share/doc/HTML/pt/ksokoban/index.cache.bz2 share/doc/HTML/pt/ksokoban/index.docbook @@ -1217,8 +1350,14 @@ share/doc/HTML/pt/kvoctrain/index.cache.bz2 share/doc/HTML/pt/kvoctrain/index.docbook share/doc/HTML/pt/kvoctrain/man-spotlight2kvtml.1.docbook share/doc/HTML/pt/kwallet/common +share/doc/HTML/pt/kwallet/edit1.png +share/doc/HTML/pt/kwallet/edit2.png +share/doc/HTML/pt/kwallet/edit3.png share/doc/HTML/pt/kwallet/index.cache.bz2 share/doc/HTML/pt/kwallet/index.docbook +share/doc/HTML/pt/kwallet/kwalletmanager.png +share/doc/HTML/pt/kwallet/password1.png +share/doc/HTML/pt/kwallet/password2.png share/doc/HTML/pt/kwatchgnupg/common share/doc/HTML/pt/kwatchgnupg/index.cache.bz2 share/doc/HTML/pt/kwatchgnupg/index.docbook @@ -1274,9 +1413,19 @@ share/doc/HTML/pt/lskat/common share/doc/HTML/pt/lskat/index.cache.bz2 share/doc/HTML/pt/lskat/index.docbook share/doc/HTML/pt/multisynk/common +share/doc/HTML/pt/multisynk/editdialog-conflicts.png +share/doc/HTML/pt/multisynk/editdialog.png share/doc/HTML/pt/multisynk/index.cache.bz2 share/doc/HTML/pt/multisynk/index.docbook +share/doc/HTML/pt/multisynk/konnector-addressbook.png +share/doc/HTML/pt/multisynk/konnector-calendar.png +share/doc/HTML/pt/multisynk/konnector-local.png +share/doc/HTML/pt/multisynk/konnector-qtopia.png +share/doc/HTML/pt/multisynk/konnector-remote.png share/doc/HTML/pt/multisynk/konnectors-chapter.docbook +share/doc/HTML/pt/multisynk/logdialog.png +share/doc/HTML/pt/multisynk/mainwin-filled.png +share/doc/HTML/pt/multisynk/mainwin.png share/doc/HTML/pt/noatun/common share/doc/HTML/pt/noatun/index.cache.bz2 share/doc/HTML/pt/noatun/index.docbook @@ -2047,6 +2196,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kinfocenter/interrupts @dirrm share/doc/HTML/pt/kinfocenter/dma @dirrm share/doc/HTML/pt/kinfocenter/devices +@dirrm share/doc/HTML/pt/kinfocenter/cdinfo @dirrm share/doc/HTML/pt/kinfocenter/blockdevices @dirrm share/doc/HTML/pt/kinfocenter @dirrm share/doc/HTML/pt/kig diff --git a/portuguese/kde4-l10n-pt_BR/distinfo b/portuguese/kde4-l10n-pt_BR/distinfo index cafc623d4982..72ed6ca79a7c 100644 --- a/portuguese/kde4-l10n-pt_BR/distinfo +++ b/portuguese/kde4-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 42e5ed51573df1415f245d201a13095d -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 1bf62ab3ec4618e486fbdba4fd12c58cdae74ecd915ae662695ba912cc1e4678 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.4.tar.bz2) = 11734073 +MD5 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = d9359ccc0040a5c6ac88d5cad12d4fcf +SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = a63454be61be1fd2ce845f2fa6e219c4eb1a10b254fed684703c39dd4746ffd5 +SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.5.tar.bz2) = 11880457 diff --git a/portuguese/kde4-l10n-pt_BR/pkg-plist b/portuguese/kde4-l10n-pt_BR/pkg-plist index 39e770a1805b..db0cf0501eb1 100644 --- a/portuguese/kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/kde4-l10n-pt_BR/pkg-plist @@ -109,6 +109,7 @@ share/doc/HTML/pt_BR/kate/fundamentals.docbook share/doc/HTML/pt_BR/kate/highlighting.docbook share/doc/HTML/pt_BR/kate/index.cache.bz2 share/doc/HTML/pt_BR/kate/index.docbook +share/doc/HTML/pt_BR/kate/man-kate.1.docbook share/doc/HTML/pt_BR/kate/mdi.docbook share/doc/HTML/pt_BR/kate/menus.docbook share/doc/HTML/pt_BR/kate/part.docbook @@ -159,6 +160,9 @@ share/doc/HTML/pt_BR/kcharselect/index.docbook share/doc/HTML/pt_BR/kcoloredit/common share/doc/HTML/pt_BR/kcoloredit/index.cache.bz2 share/doc/HTML/pt_BR/kcoloredit/index.docbook +share/doc/HTML/pt_BR/kcontrol/arts/common +share/doc/HTML/pt_BR/kcontrol/arts/index.cache.bz2 +share/doc/HTML/pt_BR/kcontrol/arts/index.docbook share/doc/HTML/pt_BR/kcontrol/arts/midi.docbook share/doc/HTML/pt_BR/kcontrol/background/common share/doc/HTML/pt_BR/kcontrol/background/index.cache.bz2 @@ -293,6 +297,9 @@ share/doc/HTML/pt_BR/kcontrol/panelappearance/index.docbook share/doc/HTML/pt_BR/kcontrol/passwords/common share/doc/HTML/pt_BR/kcontrol/passwords/index.cache.bz2 share/doc/HTML/pt_BR/kcontrol/passwords/index.docbook +share/doc/HTML/pt_BR/kcontrol/performance/common +share/doc/HTML/pt_BR/kcontrol/performance/index.cache.bz2 +share/doc/HTML/pt_BR/kcontrol/performance/index.docbook share/doc/HTML/pt_BR/kcontrol/powerctrl/common share/doc/HTML/pt_BR/kcontrol/powerctrl/index.cache.bz2 share/doc/HTML/pt_BR/kcontrol/powerctrl/index.docbook @@ -359,6 +366,10 @@ share/doc/HTML/pt_BR/kdeprint/theory.docbook share/doc/HTML/pt_BR/kdesu/common share/doc/HTML/pt_BR/kdesu/index.cache.bz2 share/doc/HTML/pt_BR/kdesu/index.docbook +share/doc/HTML/pt_BR/kdesu/man-kdesu.1.docbook +share/doc/HTML/pt_BR/kdesvn-build/common +share/doc/HTML/pt_BR/kdesvn-build/index.cache.bz2 +share/doc/HTML/pt_BR/kdesvn-build/index.docbook share/doc/HTML/pt_BR/kdf/common share/doc/HTML/pt_BR/kdf/index.cache.bz2 share/doc/HTML/pt_BR/kdf/index.docbook @@ -392,6 +403,7 @@ share/doc/HTML/pt_BR/kfilereplace/index.docbook share/doc/HTML/pt_BR/kfind/common share/doc/HTML/pt_BR/kfind/index.cache.bz2 share/doc/HTML/pt_BR/kfind/index.docbook +share/doc/HTML/pt_BR/kfind/man-kfind.1.docbook share/doc/HTML/pt_BR/kfloppy/common share/doc/HTML/pt_BR/kfloppy/index.cache.bz2 share/doc/HTML/pt_BR/kfloppy/index.docbook @@ -451,6 +463,7 @@ share/doc/HTML/pt_BR/khelpcenter/faq/moreinfo.docbook share/doc/HTML/pt_BR/khelpcenter/faq/nonkdeapps.docbook share/doc/HTML/pt_BR/khelpcenter/faq/notrelated.docbook share/doc/HTML/pt_BR/khelpcenter/faq/panel.docbook +share/doc/HTML/pt_BR/khelpcenter/faq/qt.docbook share/doc/HTML/pt_BR/khelpcenter/faq/questions.docbook share/doc/HTML/pt_BR/khelpcenter/faq/sound.docbook share/doc/HTML/pt_BR/khelpcenter/faq/tips.docbook @@ -476,6 +489,7 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/control-center.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/creating-graphics.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/credits-and-license.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/email.docbook +share/doc/HTML/pt_BR/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/file-sharing.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/font-installation.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/getting-help.docbook @@ -490,6 +504,7 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/kde-office.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/messaging-intro.docbook +share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/pt_BR/khelpcenter/userguide/networking-with-windows.docbook @@ -545,6 +560,8 @@ share/doc/HTML/pt_BR/kicker-applets/ktimemon.docbook share/doc/HTML/pt_BR/kicker/common share/doc/HTML/pt_BR/kicker/index.cache.bz2 share/doc/HTML/pt_BR/kicker/index.docbook +share/doc/HTML/pt_BR/kicker/man-appletproxy.1.docbook +share/doc/HTML/pt_BR/kicker/man-kicker.1.docbook share/doc/HTML/pt_BR/kiconedit/common share/doc/HTML/pt_BR/kiconedit/index.cache.bz2 share/doc/HTML/pt_BR/kiconedit/index.docbook @@ -555,6 +572,9 @@ share/doc/HTML/pt_BR/kig/scripting-api/Doxyfile.scripting-api.in share/doc/HTML/pt_BR/kinfocenter/blockdevices/common share/doc/HTML/pt_BR/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/pt_BR/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pt_BR/kinfocenter/cdinfo/common +share/doc/HTML/pt_BR/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pt_BR/kinfocenter/cdinfo/index.docbook share/doc/HTML/pt_BR/kinfocenter/common share/doc/HTML/pt_BR/kinfocenter/devices/common share/doc/HTML/pt_BR/kinfocenter/devices/index.cache.bz2 @@ -758,6 +778,9 @@ share/doc/HTML/pt_BR/kmplot/introduction.docbook share/doc/HTML/pt_BR/kmplot/menu.docbook share/doc/HTML/pt_BR/kmplot/reference.docbook share/doc/HTML/pt_BR/kmplot/using.docbook +share/doc/HTML/pt_BR/knetattach/common +share/doc/HTML/pt_BR/knetattach/index.cache.bz2 +share/doc/HTML/pt_BR/knetattach/index.docbook share/doc/HTML/pt_BR/knewsticker/common share/doc/HTML/pt_BR/knewsticker/index.cache.bz2 share/doc/HTML/pt_BR/knewsticker/index.docbook @@ -805,6 +828,9 @@ share/doc/HTML/pt_BR/kommander/widgets.docbook share/doc/HTML/pt_BR/kompare/common share/doc/HTML/pt_BR/kompare/index.cache.bz2 share/doc/HTML/pt_BR/kompare/index.docbook +share/doc/HTML/pt_BR/kompmgr/common +share/doc/HTML/pt_BR/kompmgr/index.cache.bz2 +share/doc/HTML/pt_BR/kompmgr/index.docbook share/doc/HTML/pt_BR/konq-plugins/babel/common share/doc/HTML/pt_BR/konq-plugins/babel/index.cache.bz2 share/doc/HTML/pt_BR/konq-plugins/babel/index.docbook @@ -1654,6 +1680,7 @@ share/locale/pt_BR/LC_MESSAGES/kmathapplet.mo share/locale/pt_BR/LC_MESSAGES/kmcop.mo share/locale/pt_BR/LC_MESSAGES/kmenuapplet.mo share/locale/pt_BR/LC_MESSAGES/kmenuedit.mo +share/locale/pt_BR/LC_MESSAGES/kmessedwords.mo share/locale/pt_BR/LC_MESSAGES/kmid.mo share/locale/pt_BR/LC_MESSAGES/kmilo_delli8k.mo share/locale/pt_BR/LC_MESSAGES/kmilo_generic.mo @@ -1965,6 +1992,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/konq-plugins/crashes @dirrm share/doc/HTML/pt_BR/konq-plugins/babel @dirrm share/doc/HTML/pt_BR/konq-plugins +@dirrm share/doc/HTML/pt_BR/kompmgr @dirrm share/doc/HTML/pt_BR/kompare @dirrm share/doc/HTML/pt_BR/kommander @dirrm share/doc/HTML/pt_BR/kolourpaint @@ -1973,6 +2001,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/knotes @dirrm share/doc/HTML/pt_BR/knode @dirrm share/doc/HTML/pt_BR/knewsticker +@dirrm share/doc/HTML/pt_BR/knetattach @dirrm share/doc/HTML/pt_BR/kmplot @dirrm share/doc/HTML/pt_BR/kmouth @dirrm share/doc/HTML/pt_BR/kmousetool @@ -2015,6 +2044,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kinfocenter/interrupts @dirrm share/doc/HTML/pt_BR/kinfocenter/dma @dirrm share/doc/HTML/pt_BR/kinfocenter/devices +@dirrm share/doc/HTML/pt_BR/kinfocenter/cdinfo @dirrm share/doc/HTML/pt_BR/kinfocenter/blockdevices @dirrm share/doc/HTML/pt_BR/kinfocenter @dirrm share/doc/HTML/pt_BR/kig/scripting-api @@ -2046,6 +2076,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kdm @dirrm share/doc/HTML/pt_BR/kdict @dirrm share/doc/HTML/pt_BR/kdf +@dirrm share/doc/HTML/pt_BR/kdesvn-build @dirrm share/doc/HTML/pt_BR/kdesu @dirrm share/doc/HTML/pt_BR/kdeprint @dirrm share/doc/HTML/pt_BR/kdelirc/kcmlirc @@ -2063,6 +2094,7 @@ share/locale/pt_BR/flag.png @dirrm share/doc/HTML/pt_BR/kcontrol/screensaver @dirrm share/doc/HTML/pt_BR/kcontrol/proxy @dirrm share/doc/HTML/pt_BR/kcontrol/powerctrl +@dirrm share/doc/HTML/pt_BR/kcontrol/performance @dirrm share/doc/HTML/pt_BR/kcontrol/passwords @dirrm share/doc/HTML/pt_BR/kcontrol/panelappearance @dirrm share/doc/HTML/pt_BR/kcontrol/panel diff --git a/portuguese/kde4-l10n/distinfo b/portuguese/kde4-l10n/distinfo index a9179112802c..1d1d2bae854a 100644 --- a/portuguese/kde4-l10n/distinfo +++ b/portuguese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 7ccc83aacaaa1609a66378661ee0b10b -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 5074aeaa07d1e0aedf58f6299e3450021b820d81a6194bfb6a84f6e8dd35ddf9 -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.4.tar.bz2) = 7749316 +MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = af8b477236f98e0fa7fcae21db3df5cc +SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 76b69d67cabbcb75de0f63a181602b8b6d083d63b47052bbcdd3bf79e1802b2d +SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.5.tar.bz2) = 12417602 diff --git a/portuguese/kde4-l10n/pkg-plist b/portuguese/kde4-l10n/pkg-plist index 8c6de2f13d7f..b53ccde9a249 100644 --- a/portuguese/kde4-l10n/pkg-plist +++ b/portuguese/kde4-l10n/pkg-plist @@ -119,11 +119,14 @@ share/doc/HTML/pt/kate-plugins/xmlcheck.docbook share/doc/HTML/pt/kate-plugins/xmltools.docbook share/doc/HTML/pt/kate/advanced.docbook share/doc/HTML/pt/kate/common +share/doc/HTML/pt/kate/configdialog01.png +share/doc/HTML/pt/kate/configdialog02.png share/doc/HTML/pt/kate/configuring.docbook share/doc/HTML/pt/kate/fundamentals.docbook share/doc/HTML/pt/kate/highlighting.docbook share/doc/HTML/pt/kate/index.cache.bz2 share/doc/HTML/pt/kate/index.docbook +share/doc/HTML/pt/kate/kate.png share/doc/HTML/pt/kate/man-kate.1.docbook share/doc/HTML/pt/kate/mdi.docbook share/doc/HTML/pt/kate/menus.docbook @@ -133,9 +136,27 @@ share/doc/HTML/pt/kate/regular-expressions.docbook share/doc/HTML/pt/katomic/common share/doc/HTML/pt/katomic/index.cache.bz2 share/doc/HTML/pt/katomic/index.docbook +share/doc/HTML/pt/kaudiocreator/cdconfiguration.png +share/doc/HTML/pt/kaudiocreator/cddbconfigurationlookup.png +share/doc/HTML/pt/kaudiocreator/cddbconfigurationsubmit.png +share/doc/HTML/pt/kaudiocreator/cdinserted.png share/doc/HTML/pt/kaudiocreator/common +share/doc/HTML/pt/kaudiocreator/encoderconfiguration.png +share/doc/HTML/pt/kaudiocreator/encodernotfound.png +share/doc/HTML/pt/kaudiocreator/entersong1.png +share/doc/HTML/pt/kaudiocreator/generalconfiguration.png share/doc/HTML/pt/kaudiocreator/index.cache.bz2 share/doc/HTML/pt/kaudiocreator/index.docbook +share/doc/HTML/pt/kaudiocreator/jobcontrol.png +share/doc/HTML/pt/kaudiocreator/jobshavestarted.png +share/doc/HTML/pt/kaudiocreator/kaudiocreatormainwindow800.png +share/doc/HTML/pt/kaudiocreator/lameconfiguration.png +share/doc/HTML/pt/kaudiocreator/readytorip.png +share/doc/HTML/pt/kaudiocreator/ripperconfiguration.png +share/doc/HTML/pt/kaudiocreator/rippingandencoding.png +share/doc/HTML/pt/kaudiocreator/rippingandencoding2.png +share/doc/HTML/pt/kaudiocreator/setalbumcategory.png +share/doc/HTML/pt/kaudiocreator/startalbumeditor.png share/doc/HTML/pt/kbabel/catman.docbook share/doc/HTML/pt/kbabel/common share/doc/HTML/pt/kbabel/dictionaries.docbook @@ -464,9 +485,17 @@ share/doc/HTML/pt/kenolaba/common share/doc/HTML/pt/kenolaba/index.cache.bz2 share/doc/HTML/pt/kenolaba/index.docbook share/doc/HTML/pt/kenolaba/man-kenolaba.6.docbook +share/doc/HTML/pt/kfilereplace/addstringsdialog_window.png share/doc/HTML/pt/kfilereplace/common share/doc/HTML/pt/kfilereplace/index.cache.bz2 share/doc/HTML/pt/kfilereplace/index.docbook +share/doc/HTML/pt/kfilereplace/kfr_standalone_main_window_1.png +share/doc/HTML/pt/kfilereplace/optionsdialog_main_window_1.png +share/doc/HTML/pt/kfilereplace/optionsdialog_main_window_2.png +share/doc/HTML/pt/kfilereplace/projectdialog_main_window_1.png +share/doc/HTML/pt/kfilereplace/projectdialog_main_window_2.png +share/doc/HTML/pt/kfilereplace/report_example.png +share/doc/HTML/pt/kfilereplace/results_view.png share/doc/HTML/pt/kfind/common share/doc/HTML/pt/kfind/index.cache.bz2 share/doc/HTML/pt/kfind/index.docbook @@ -486,6 +515,11 @@ share/doc/HTML/pt/kgeography/index.docbook share/doc/HTML/pt/kget/common share/doc/HTML/pt/kget/index.cache.bz2 share/doc/HTML/pt/kget/index.docbook +share/doc/HTML/pt/kget/kget1.png +share/doc/HTML/pt/kget/kget2.png +share/doc/HTML/pt/kget/kget3.png +share/doc/HTML/pt/kget/kget4.png +share/doc/HTML/pt/kget/kget5.png share/doc/HTML/pt/kghostview/common share/doc/HTML/pt/kghostview/index.cache.bz2 share/doc/HTML/pt/kghostview/index.docbook @@ -493,8 +527,14 @@ share/doc/HTML/pt/kgoldrunner/common share/doc/HTML/pt/kgoldrunner/index.cache.bz2 share/doc/HTML/pt/kgoldrunner/index.docbook share/doc/HTML/pt/kgpg/common +share/doc/HTML/pt/kgpg/editor.png share/doc/HTML/pt/kgpg/index.cache.bz2 share/doc/HTML/pt/kgpg/index.docbook +share/doc/HTML/pt/kgpg/keygen.png +share/doc/HTML/pt/kgpg/keymanage.png +share/doc/HTML/pt/kgpg/keys.png +share/doc/HTML/pt/kgpg/kicker.png +share/doc/HTML/pt/kgpg/options.png share/doc/HTML/pt/khangman/common share/doc/HTML/pt/khangman/index.cache.bz2 share/doc/HTML/pt/khangman/index.docbook @@ -636,6 +676,9 @@ share/doc/HTML/pt/kig/man-kig.1.docbook share/doc/HTML/pt/kinfocenter/blockdevices/common share/doc/HTML/pt/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/pt/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pt/kinfocenter/cdinfo/common +share/doc/HTML/pt/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pt/kinfocenter/cdinfo/index.docbook share/doc/HTML/pt/kinfocenter/common share/doc/HTML/pt/kinfocenter/devices/common share/doc/HTML/pt/kinfocenter/devices/index.cache.bz2 @@ -766,6 +809,7 @@ share/doc/HTML/pt/klines/index.docbook share/doc/HTML/pt/klinkstatus/common share/doc/HTML/pt/klinkstatus/index.cache.bz2 share/doc/HTML/pt/klinkstatus/index.docbook +share/doc/HTML/pt/klinkstatus/screenshot.png share/doc/HTML/pt/klipper/common share/doc/HTML/pt/klipper/index.cache.bz2 share/doc/HTML/pt/klipper/index.docbook @@ -802,9 +846,14 @@ share/doc/HTML/pt/kmid/index.docbook share/doc/HTML/pt/kmines/common share/doc/HTML/pt/kmines/index.cache.bz2 share/doc/HTML/pt/kmines/index.docbook +share/doc/HTML/pt/kmines/kmines1.png +share/doc/HTML/pt/kmines/kmines2.png share/doc/HTML/pt/kmix/common share/doc/HTML/pt/kmix/index.cache.bz2 share/doc/HTML/pt/kmix/index.docbook +share/doc/HTML/pt/kmix/kmix-channel-playback.png +share/doc/HTML/pt/kmix/kmix-channel-record.png +share/doc/HTML/pt/kmix/kmix-window.png share/doc/HTML/pt/kmoon/common share/doc/HTML/pt/kmoon/index.cache.bz2 share/doc/HTML/pt/kmoon/index.docbook @@ -834,12 +883,25 @@ share/doc/HTML/pt/kmplot/using.docbook share/doc/HTML/pt/knetattach/common share/doc/HTML/pt/knetattach/index.cache.bz2 share/doc/HTML/pt/knetattach/index.docbook +share/doc/HTML/pt/knetattach/screenshot.png +share/doc/HTML/pt/knetattach/screenshot2.png +share/doc/HTML/pt/knetattach/screenshot3.png +share/doc/HTML/pt/knetattach/screenshot4.png share/doc/HTML/pt/knetworkconf/common share/doc/HTML/pt/knetworkconf/index.cache.bz2 share/doc/HTML/pt/knetworkconf/index.docbook share/doc/HTML/pt/knewsticker/common +share/doc/HTML/pt/knewsticker/contextmenu.png share/doc/HTML/pt/knewsticker/index.cache.bz2 share/doc/HTML/pt/knewsticker/index.docbook +share/doc/HTML/pt/knewsticker/kcmnewsticker-filters.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-general.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-newssitedialog.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-newssources.png +share/doc/HTML/pt/knewsticker/kcmnewsticker-scrollerprefs.png +share/doc/HTML/pt/knewsticker/knewsticker-childpanel.png +share/doc/HTML/pt/knewsticker/knewsticker-kicker.png +share/doc/HTML/pt/knewsticker/knewsticker-ownwindow.png share/doc/HTML/pt/knode/commands.docbook share/doc/HTML/pt/knode/common share/doc/HTML/pt/knode/credits.docbook @@ -850,6 +912,19 @@ share/doc/HTML/pt/knode/index.docbook share/doc/HTML/pt/knode/install.docbook share/doc/HTML/pt/knode/introduction.docbook share/doc/HTML/pt/knode/journey.docbook +share/doc/HTML/pt/knode/knode-composer-attachments.png +share/doc/HTML/pt/knode/knode-edit-filter.png +share/doc/HTML/pt/knode/knode-edit-header1.png +share/doc/HTML/pt/knode/knode-edit-header2.png +share/doc/HTML/pt/knode/knode-followup.png +share/doc/HTML/pt/knode/knode-new-article.png +share/doc/HTML/pt/knode/knode-news-account.png +share/doc/HTML/pt/knode/knode-reply.png +share/doc/HTML/pt/knode/knode-rule-editor.png +share/doc/HTML/pt/knode/knode-search.png +share/doc/HTML/pt/knode/knode-start.png +share/doc/HTML/pt/knode/knode-subscribe.png +share/doc/HTML/pt/knode/knode-views.png share/doc/HTML/pt/knode/more.docbook share/doc/HTML/pt/knode/using-firststart.docbook share/doc/HTML/pt/knode/using-morefeatures.docbook @@ -933,19 +1008,26 @@ share/doc/HTML/pt/konq-plugins/webarchiver/index.docbook share/doc/HTML/pt/konqueror/basics.docbook share/doc/HTML/pt/konqueror/bookmarks.docbook share/doc/HTML/pt/konqueror/browser.docbook +share/doc/HTML/pt/konqueror/cmndline.png share/doc/HTML/pt/konqueror/commands.docbook share/doc/HTML/pt/konqueror/common share/doc/HTML/pt/konqueror/config.docbook share/doc/HTML/pt/konqueror/credits.docbook +share/doc/HTML/pt/konqueror/dirtree.png +share/doc/HTML/pt/konqueror/dragdrop.png share/doc/HTML/pt/konqueror/faq.docbook share/doc/HTML/pt/konqueror/filemanager.docbook share/doc/HTML/pt/konqueror/index.cache.bz2 share/doc/HTML/pt/konqueror/index.docbook share/doc/HTML/pt/konqueror/introduction.docbook +share/doc/HTML/pt/konqueror/konqorg.png share/doc/HTML/pt/konqueror/man-kbookmarkmerger.1.docbook +share/doc/HTML/pt/konqueror/parts.png share/doc/HTML/pt/konqueror/path-complete.docbook share/doc/HTML/pt/konqueror/plugins.docbook share/doc/HTML/pt/konqueror/save-settings.docbook +share/doc/HTML/pt/konqueror/shortcut1.png +share/doc/HTML/pt/konqueror/shortcut2.png share/doc/HTML/pt/konqueror/sidebar.docbook share/doc/HTML/pt/konquest/common share/doc/HTML/pt/konquest/index.cache.bz2 @@ -953,6 +1035,8 @@ share/doc/HTML/pt/konquest/index.docbook share/doc/HTML/pt/konsole/common share/doc/HTML/pt/konsole/index.cache.bz2 share/doc/HTML/pt/konsole/index.docbook +share/doc/HTML/pt/konsole/konsole.png +share/doc/HTML/pt/konsole/tabbar.png share/doc/HTML/pt/konsolekalendar/common share/doc/HTML/pt/konsolekalendar/index.cache.bz2 share/doc/HTML/pt/konsolekalendar/index.docbook @@ -962,6 +1046,7 @@ share/doc/HTML/pt/kontact/index.docbook share/doc/HTML/pt/kooka/common share/doc/HTML/pt/kooka/index.cache.bz2 share/doc/HTML/pt/kooka/index.docbook +share/doc/HTML/pt/kopete/chatstyle.docbook share/doc/HTML/pt/kopete/common share/doc/HTML/pt/kopete/index.cache.bz2 share/doc/HTML/pt/kopete/index.docbook @@ -982,6 +1067,8 @@ share/doc/HTML/pt/kpackage/index.docbook share/doc/HTML/pt/kpager/common share/doc/HTML/pt/kpager/index.cache.bz2 share/doc/HTML/pt/kpager/index.docbook +share/doc/HTML/pt/kpager/screenshot.png +share/doc/HTML/pt/kpager/settings.png share/doc/HTML/pt/kpat/common share/doc/HTML/pt/kpat/index.cache.bz2 share/doc/HTML/pt/kpat/index.docbook @@ -1026,13 +1113,35 @@ share/doc/HTML/pt/kppp/global-settings.docbook share/doc/HTML/pt/kppp/hayes.docbook share/doc/HTML/pt/kppp/index.cache.bz2 share/doc/HTML/pt/kppp/index.docbook +share/doc/HTML/pt/kppp/kppp-account-accounting-tab.png +share/doc/HTML/pt/kppp/kppp-account-dial-tab.png +share/doc/HTML/pt/kppp/kppp-account-dns-tab.png +share/doc/HTML/pt/kppp/kppp-account-execute-tab.png +share/doc/HTML/pt/kppp/kppp-account-gateway-tab.png +share/doc/HTML/pt/kppp/kppp-account-ip-tab.png +share/doc/HTML/pt/kppp/kppp-account-login-script-tab.png +share/doc/HTML/pt/kppp/kppp-config.png +share/doc/HTML/pt/kppp/kppp-device-tab.png +share/doc/HTML/pt/kppp/kppp-dialler-tab.png share/doc/HTML/pt/kppp/kppp-faq.docbook +share/doc/HTML/pt/kppp/kppp-graph-tab.png +share/doc/HTML/pt/kppp/kppp-misc-tab.png +share/doc/HTML/pt/kppp/kppp-modem-tab.png +share/doc/HTML/pt/kppp/kppp-wizard.png share/doc/HTML/pt/kppp/security.docbook share/doc/HTML/pt/kppp/tricks.docbook share/doc/HTML/pt/kppp/wizard.docbook +share/doc/HTML/pt/krdc/authentication.png share/doc/HTML/pt/krdc/common share/doc/HTML/pt/krdc/index.cache.bz2 share/doc/HTML/pt/krdc/index.docbook +share/doc/HTML/pt/krdc/preferences_profilestab.png +share/doc/HTML/pt/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/pt/krdc/preferences_vncdefaultstab.png +share/doc/HTML/pt/krdc/snapshot.png +share/doc/HTML/pt/krdc/snapshot_connectionspeed.png +share/doc/HTML/pt/krdc/snapshot_nobrowse.png +share/doc/HTML/pt/krdc/snapshot_vncentry.png share/doc/HTML/pt/krec/common share/doc/HTML/pt/krec/index.cache.bz2 share/doc/HTML/pt/krec/index.docbook @@ -1040,8 +1149,16 @@ share/doc/HTML/pt/kreversi/common share/doc/HTML/pt/kreversi/index.cache.bz2 share/doc/HTML/pt/kreversi/index.docbook share/doc/HTML/pt/krfb/common +share/doc/HTML/pt/krfb/configuration_access.png +share/doc/HTML/pt/krfb/configuration_network.png +share/doc/HTML/pt/krfb/configuration_session.png +share/doc/HTML/pt/krfb/connection.png +share/doc/HTML/pt/krfb/email_invitation.png share/doc/HTML/pt/krfb/index.cache.bz2 share/doc/HTML/pt/krfb/index.docbook +share/doc/HTML/pt/krfb/invitation_management.png +share/doc/HTML/pt/krfb/personal_invitation.png +share/doc/HTML/pt/krfb/screenshot.png share/doc/HTML/pt/kruler/common share/doc/HTML/pt/kruler/index.cache.bz2 share/doc/HTML/pt/kruler/index.docbook @@ -1051,6 +1168,20 @@ share/doc/HTML/pt/ksame/index.docbook share/doc/HTML/pt/kscd/common share/doc/HTML/pt/kscd/index.cache.bz2 share/doc/HTML/pt/kscd/index.docbook +share/doc/HTML/pt/kscd/kscd.png +share/doc/HTML/pt/kscd/kscd11.png +share/doc/HTML/pt/kscd/kscd12.png +share/doc/HTML/pt/kscd/kscd13.png +share/doc/HTML/pt/kscd/kscd14.png +share/doc/HTML/pt/kscd/kscd16.png +share/doc/HTML/pt/kscd/kscd18.png +share/doc/HTML/pt/kscd/kscd19.png +share/doc/HTML/pt/kscd/kscd2.png +share/doc/HTML/pt/kscd/kscd3.png +share/doc/HTML/pt/kscd/kscd5.png +share/doc/HTML/pt/kscd/kscd6.png +share/doc/HTML/pt/kscd/kscd9.png +share/doc/HTML/pt/kscd/kscdannounc.png share/doc/HTML/pt/kshisen/common share/doc/HTML/pt/kshisen/index.cache.bz2 share/doc/HTML/pt/kshisen/index.docbook @@ -1072,6 +1203,8 @@ share/doc/HTML/pt/ksnake/index.docbook share/doc/HTML/pt/ksnapshot/common share/doc/HTML/pt/ksnapshot/index.cache.bz2 share/doc/HTML/pt/ksnapshot/index.docbook +share/doc/HTML/pt/ksnapshot/preview.png +share/doc/HTML/pt/ksnapshot/window.png share/doc/HTML/pt/ksokoban/common share/doc/HTML/pt/ksokoban/index.cache.bz2 share/doc/HTML/pt/ksokoban/index.docbook @@ -1217,8 +1350,14 @@ share/doc/HTML/pt/kvoctrain/index.cache.bz2 share/doc/HTML/pt/kvoctrain/index.docbook share/doc/HTML/pt/kvoctrain/man-spotlight2kvtml.1.docbook share/doc/HTML/pt/kwallet/common +share/doc/HTML/pt/kwallet/edit1.png +share/doc/HTML/pt/kwallet/edit2.png +share/doc/HTML/pt/kwallet/edit3.png share/doc/HTML/pt/kwallet/index.cache.bz2 share/doc/HTML/pt/kwallet/index.docbook +share/doc/HTML/pt/kwallet/kwalletmanager.png +share/doc/HTML/pt/kwallet/password1.png +share/doc/HTML/pt/kwallet/password2.png share/doc/HTML/pt/kwatchgnupg/common share/doc/HTML/pt/kwatchgnupg/index.cache.bz2 share/doc/HTML/pt/kwatchgnupg/index.docbook @@ -1274,9 +1413,19 @@ share/doc/HTML/pt/lskat/common share/doc/HTML/pt/lskat/index.cache.bz2 share/doc/HTML/pt/lskat/index.docbook share/doc/HTML/pt/multisynk/common +share/doc/HTML/pt/multisynk/editdialog-conflicts.png +share/doc/HTML/pt/multisynk/editdialog.png share/doc/HTML/pt/multisynk/index.cache.bz2 share/doc/HTML/pt/multisynk/index.docbook +share/doc/HTML/pt/multisynk/konnector-addressbook.png +share/doc/HTML/pt/multisynk/konnector-calendar.png +share/doc/HTML/pt/multisynk/konnector-local.png +share/doc/HTML/pt/multisynk/konnector-qtopia.png +share/doc/HTML/pt/multisynk/konnector-remote.png share/doc/HTML/pt/multisynk/konnectors-chapter.docbook +share/doc/HTML/pt/multisynk/logdialog.png +share/doc/HTML/pt/multisynk/mainwin-filled.png +share/doc/HTML/pt/multisynk/mainwin.png share/doc/HTML/pt/noatun/common share/doc/HTML/pt/noatun/index.cache.bz2 share/doc/HTML/pt/noatun/index.docbook @@ -2047,6 +2196,7 @@ share/locale/pt/flag.png @dirrm share/doc/HTML/pt/kinfocenter/interrupts @dirrm share/doc/HTML/pt/kinfocenter/dma @dirrm share/doc/HTML/pt/kinfocenter/devices +@dirrm share/doc/HTML/pt/kinfocenter/cdinfo @dirrm share/doc/HTML/pt/kinfocenter/blockdevices @dirrm share/doc/HTML/pt/kinfocenter @dirrm share/doc/HTML/pt/kig diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile index f69f7dd8331b..3f06ce477d89 100644 --- a/portuguese/koffice-i18n-pt_BR/Makefile +++ b/portuguese/koffice-i18n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-i18n-pt_BR/distinfo b/portuguese/koffice-i18n-pt_BR/distinfo index f14b00651338..a04a8005a1a2 100644 --- a/portuguese/koffice-i18n-pt_BR/distinfo +++ b/portuguese/koffice-i18n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = bba591e0460c4a0169c07c3d5ae5b118 -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 8630ee37c378e2b27ffd29bdabcd3968c3857fd03d954c7b811ad6242f493a65 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 2002410 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 diff --git a/portuguese/koffice-i18n-pt_BR/pkg-plist b/portuguese/koffice-i18n-pt_BR/pkg-plist index b54dc6ddf7a2..0a9b3432a18e 100644 --- a/portuguese/koffice-i18n-pt_BR/pkg-plist +++ b/portuguese/koffice-i18n-pt_BR/pkg-plist @@ -1,16 +1,68 @@ +share/doc/HTML/pt_BR/karbon/common +share/doc/HTML/pt_BR/karbon/index.cache.bz2 +share/doc/HTML/pt_BR/karbon/index.docbook share/doc/HTML/pt_BR/kchart/common -share/doc/HTML/pt_BR/kchart/file-toolbar.png -share/doc/HTML/pt_BR/kchart/file-toolbar2.png -share/doc/HTML/pt_BR/kchart/frame_chart.png share/doc/HTML/pt_BR/kchart/index.cache.bz2 share/doc/HTML/pt_BR/kchart/index.docbook -share/doc/HTML/pt_BR/kchart/kchart-kspread-bar.png -share/doc/HTML/pt_BR/kchart/kchart-kspread.png +share/doc/HTML/pt_BR/kchart/kchart-config1.png +share/doc/HTML/pt_BR/kchart/kchart-config2.png +share/doc/HTML/pt_BR/kchart/kchart-config3.png +share/doc/HTML/pt_BR/kchart/kchart-config4.png +share/doc/HTML/pt_BR/kchart/kchart-config5.png +share/doc/HTML/pt_BR/kchart/kchart-config6.png +share/doc/HTML/pt_BR/kchart/kchart-config7.png +share/doc/HTML/pt_BR/kchart/kchart-config8.png +share/doc/HTML/pt_BR/kchart/kchart-dataeditor.png +share/doc/HTML/pt_BR/kchart/kchart-default.png +share/doc/HTML/pt_BR/kchart/kchart-example1-1.png +share/doc/HTML/pt_BR/kchart/kchart-example1-2.png +share/doc/HTML/pt_BR/kchart/kchart-example1-5.png +share/doc/HTML/pt_BR/kchart/kchart-example1-6.png +share/doc/HTML/pt_BR/kchart/kchart-example1-7.png +share/doc/HTML/pt_BR/kchart/kchart-example1-8.png +share/doc/HTML/pt_BR/kchart/kchart-startupdialog.png +share/doc/HTML/pt_BR/kchart/kchart-wizard0.png +share/doc/HTML/pt_BR/kchart/kchart-wizard1.png +share/doc/HTML/pt_BR/kchart/kchart-wizard2.png +share/doc/HTML/pt_BR/kchart/kchart-wizard3.png +share/doc/HTML/pt_BR/kchart/kchart-wizard4.png share/doc/HTML/pt_BR/kchart/shortcut.png share/doc/HTML/pt_BR/kchart/toolbars.png +share/doc/HTML/pt_BR/kexi/basics.docbook +share/doc/HTML/pt_BR/kexi/building.docbook +share/doc/HTML/pt_BR/kexi/common +share/doc/HTML/pt_BR/kexi/comparing.docbook +share/doc/HTML/pt_BR/kexi/configuration.docbook +share/doc/HTML/pt_BR/kexi/contact-example.png +share/doc/HTML/pt_BR/kexi/credits.docbook +share/doc/HTML/pt_BR/kexi/database.docbook +share/doc/HTML/pt_BR/kexi/designingforms.docbook +share/doc/HTML/pt_BR/kexi/enteringdataintotables.docbook +share/doc/HTML/pt_BR/kexi/enteringdatausingforms.docbook +share/doc/HTML/pt_BR/kexi/index.cache.bz2 +share/doc/HTML/pt_BR/kexi/index.docbook +share/doc/HTML/pt_BR/kexi/intro.docbook +share/doc/HTML/pt_BR/kexi/menus.docbook +share/doc/HTML/pt_BR/kexi/querydesigning.docbook +share/doc/HTML/pt_BR/kformula/ambiguous-string.png share/doc/HTML/pt_BR/kformula/common +share/doc/HTML/pt_BR/kformula/green1.png +share/doc/HTML/pt_BR/kformula/green2.png share/doc/HTML/pt_BR/kformula/index.cache.bz2 share/doc/HTML/pt_BR/kformula/index.docbook +share/doc/HTML/pt_BR/kformula/kfontinst1.png +share/doc/HTML/pt_BR/kformula/kfontinst2.png +share/doc/HTML/pt_BR/kformula/kfontinst3.png +share/doc/HTML/pt_BR/kformula/kfontinst4.png +share/doc/HTML/pt_BR/kformula/kfontinst5.png +share/doc/HTML/pt_BR/kformula/kfontinst6.png +share/doc/HTML/pt_BR/kformula/rk-edit0.png +share/doc/HTML/pt_BR/kformula/rk-edit1.png +share/doc/HTML/pt_BR/kformula/rk-edit2.png +share/doc/HTML/pt_BR/kformula/scilab-edit.png +share/doc/HTML/pt_BR/kformula/shortcut0.png +share/doc/HTML/pt_BR/kformula/shortcut1.png +share/doc/HTML/pt_BR/kformula/toolbars.png share/doc/HTML/pt_BR/kivio/common share/doc/HTML/pt_BR/kivio/credits.docbook share/doc/HTML/pt_BR/kivio/index.cache.bz2 @@ -25,33 +77,219 @@ share/doc/HTML/pt_BR/koffice/index.docbook share/doc/HTML/pt_BR/koshell/common share/doc/HTML/pt_BR/koshell/index.cache.bz2 share/doc/HTML/pt_BR/koshell/index.docbook +share/doc/HTML/pt_BR/koshell/koshell1.png +share/doc/HTML/pt_BR/koshell/main-view.png +share/doc/HTML/pt_BR/koshell/new-dialog.png +share/doc/HTML/pt_BR/koshell/side-pane.png +share/doc/HTML/pt_BR/kplato/commands.docbook +share/doc/HTML/pt_BR/kplato/common +share/doc/HTML/pt_BR/kplato/configure-wbs.png +share/doc/HTML/pt_BR/kplato/configure1.png +share/doc/HTML/pt_BR/kplato/configure2.1.png +share/doc/HTML/pt_BR/kplato/configure2.png +share/doc/HTML/pt_BR/kplato/definitions.docbook +share/doc/HTML/pt_BR/kplato/edit-accounts.png +share/doc/HTML/pt_BR/kplato/edit-accounts1.png +share/doc/HTML/pt_BR/kplato/edit-calendar.png +share/doc/HTML/pt_BR/kplato/edit-calendar1.png +share/doc/HTML/pt_BR/kplato/edit-calendar2.png +share/doc/HTML/pt_BR/kplato/edit-resources.png +share/doc/HTML/pt_BR/kplato/edit-resources1.png +share/doc/HTML/pt_BR/kplato/edit-worktime.png +share/doc/HTML/pt_BR/kplato/index.cache.bz2 +share/doc/HTML/pt_BR/kplato/index.docbook +share/doc/HTML/pt_BR/kplato/mainwindow.docbook +share/doc/HTML/pt_BR/kplato/mainwindow1.png +share/doc/HTML/pt_BR/kplato/options.docbook +share/doc/HTML/pt_BR/kplato/project-settings.png +share/doc/HTML/pt_BR/kplato/wbs.docbook +share/doc/HTML/pt_BR/kplato/wbs.png +share/doc/HTML/pt_BR/kplato/wbs1.png +share/doc/HTML/pt_BR/kplato/wbs2.png +share/doc/HTML/pt_BR/kplato/wbs3.png +share/doc/HTML/pt_BR/kpresenter/a11y.docbook +share/doc/HTML/pt_BR/kpresenter/autocorrection1.png +share/doc/HTML/pt_BR/kpresenter/autocorrection2.png +share/doc/HTML/pt_BR/kpresenter/autocorrection3.png +share/doc/HTML/pt_BR/kpresenter/autocorrection4.png +share/doc/HTML/pt_BR/kpresenter/barstyle1.png +share/doc/HTML/pt_BR/kpresenter/barstyle3.png +share/doc/HTML/pt_BR/kpresenter/barstyle4.png +share/doc/HTML/pt_BR/kpresenter/barstyle5.png +share/doc/HTML/pt_BR/kpresenter/barstyle6.png +share/doc/HTML/pt_BR/kpresenter/barstyle7.png +share/doc/HTML/pt_BR/kpresenter/changeformat.png share/doc/HTML/pt_BR/kpresenter/common +share/doc/HTML/pt_BR/kpresenter/completion.png +share/doc/HTML/pt_BR/kpresenter/configure1.png +share/doc/HTML/pt_BR/kpresenter/configure2.png +share/doc/HTML/pt_BR/kpresenter/configure3.png +share/doc/HTML/pt_BR/kpresenter/configure4.png +share/doc/HTML/pt_BR/kpresenter/configure4c.png +share/doc/HTML/pt_BR/kpresenter/configure5.png +share/doc/HTML/pt_BR/kpresenter/configure6.png +share/doc/HTML/pt_BR/kpresenter/configure6b.png +share/doc/HTML/pt_BR/kpresenter/configure6c.png +share/doc/HTML/pt_BR/kpresenter/configure6d.png +share/doc/HTML/pt_BR/kpresenter/configure6e.png +share/doc/HTML/pt_BR/kpresenter/configure7.png share/doc/HTML/pt_BR/kpresenter/faq.docbook share/doc/HTML/pt_BR/kpresenter/great-presentations.docbook share/doc/HTML/pt_BR/kpresenter/guides.docbook +share/doc/HTML/pt_BR/kpresenter/htmlshow1.png +share/doc/HTML/pt_BR/kpresenter/htmlshow2.png +share/doc/HTML/pt_BR/kpresenter/htmlshow3.png +share/doc/HTML/pt_BR/kpresenter/htmlshow4.png +share/doc/HTML/pt_BR/kpresenter/htmlshow5.png +share/doc/HTML/pt_BR/kpresenter/htmlshow6.png +share/doc/HTML/pt_BR/kpresenter/htmlshow7.png +share/doc/HTML/pt_BR/kpresenter/htmlshow8.png share/doc/HTML/pt_BR/kpresenter/index.cache.bz2 share/doc/HTML/pt_BR/kpresenter/index.docbook +share/doc/HTML/pt_BR/kpresenter/kbd-focus-ext.png share/doc/HTML/pt_BR/kpresenter/menus.docbook +share/doc/HTML/pt_BR/kpresenter/mousenav.png +share/doc/HTML/pt_BR/kpresenter/msexport1.png +share/doc/HTML/pt_BR/kpresenter/msexport2.png +share/doc/HTML/pt_BR/kpresenter/msexport2b.png +share/doc/HTML/pt_BR/kpresenter/msexport3.png +share/doc/HTML/pt_BR/kpresenter/msexport4.png share/doc/HTML/pt_BR/kpresenter/options.docbook +share/doc/HTML/pt_BR/kpresenter/properties.png share/doc/HTML/pt_BR/kpresenter/screen.docbook +share/doc/HTML/pt_BR/kpresenter/settings01.png +share/doc/HTML/pt_BR/kpresenter/settings03.png +share/doc/HTML/pt_BR/kpresenter/settings04.png +share/doc/HTML/pt_BR/kpresenter/template02.png +share/doc/HTML/pt_BR/kpresenter/template03.png +share/doc/HTML/pt_BR/kpresenter/template04.png +share/doc/HTML/pt_BR/kpresenter/template05.png +share/doc/HTML/pt_BR/kpresenter/template06.png +share/doc/HTML/pt_BR/kpresenter/template07.png +share/doc/HTML/pt_BR/kpresenter/textmenu1.png +share/doc/HTML/pt_BR/kpresenter/textmenu2.png +share/doc/HTML/pt_BR/kpresenter/tts.png +share/doc/HTML/pt_BR/kpresenter/tut01.png +share/doc/HTML/pt_BR/kpresenter/tut02.png +share/doc/HTML/pt_BR/kpresenter/tut03.png +share/doc/HTML/pt_BR/kpresenter/tut04.png +share/doc/HTML/pt_BR/kpresenter/tut05.png +share/doc/HTML/pt_BR/kpresenter/tut06.png +share/doc/HTML/pt_BR/kpresenter/tut07.png +share/doc/HTML/pt_BR/kpresenter/tut08.png +share/doc/HTML/pt_BR/kpresenter/tut09.png +share/doc/HTML/pt_BR/kpresenter/tut10.png +share/doc/HTML/pt_BR/kpresenter/tut11.png +share/doc/HTML/pt_BR/kpresenter/tut12.png +share/doc/HTML/pt_BR/kpresenter/tut13.png +share/doc/HTML/pt_BR/kpresenter/tut14.png +share/doc/HTML/pt_BR/kpresenter/tut15.png +share/doc/HTML/pt_BR/kpresenter/tut16.png +share/doc/HTML/pt_BR/kpresenter/tut17.png +share/doc/HTML/pt_BR/kpresenter/tut18.png +share/doc/HTML/pt_BR/kpresenter/tut19.png +share/doc/HTML/pt_BR/kpresenter/tut20.png +share/doc/HTML/pt_BR/kpresenter/tut21.png +share/doc/HTML/pt_BR/kpresenter/tut22.png +share/doc/HTML/pt_BR/kpresenter/tut23.png +share/doc/HTML/pt_BR/kpresenter/tut24.png +share/doc/HTML/pt_BR/kpresenter/tut26.png share/doc/HTML/pt_BR/kpresenter/tutorial.docbook +share/doc/HTML/pt_BR/krita/commands-dialogs.docbook +share/doc/HTML/pt_BR/krita/commands-menus.docbook +share/doc/HTML/pt_BR/krita/commands-palettes.docbook +share/doc/HTML/pt_BR/krita/commands-toolbars.docbook +share/doc/HTML/pt_BR/krita/commands.docbook +share/doc/HTML/pt_BR/krita/common +share/doc/HTML/pt_BR/krita/createdocument.png +share/doc/HTML/pt_BR/krita/credits.docbook +share/doc/HTML/pt_BR/krita/developers-plugins.docbook +share/doc/HTML/pt_BR/krita/developers-scripting.docbook +share/doc/HTML/pt_BR/krita/developers.docbook +share/doc/HTML/pt_BR/krita/dialogs-addpalette.png +share/doc/HTML/pt_BR/krita/dialogs-blur.png +share/doc/HTML/pt_BR/krita/dialogs-brightnesscontrast.png +share/doc/HTML/pt_BR/krita/dialogs-bumpmap.png +share/doc/HTML/pt_BR/krita/dialogs-coloradjustment.png +share/doc/HTML/pt_BR/krita/dialogs-colortoalpha.png +share/doc/HTML/pt_BR/krita/dialogs-colortransfer.png +share/doc/HTML/pt_BR/krita/dialogs-convertimagetype.png +share/doc/HTML/pt_BR/krita/dialogs-convertlayertype.png +share/doc/HTML/pt_BR/krita/dialogs-customconvolution.png +share/doc/HTML/pt_BR/krita/dialogs-emboss.png +share/doc/HTML/pt_BR/krita/dialogs-histogram.png +share/doc/HTML/pt_BR/krita/dialogs-imageproperties.png +share/doc/HTML/pt_BR/krita/dialogs-imagerestoration.png +share/doc/HTML/pt_BR/krita/dialogs-imagesize.png +share/doc/HTML/pt_BR/krita/dialogs-layerproperties.png +share/doc/HTML/pt_BR/krita/dialogs-layersize.png +share/doc/HTML/pt_BR/krita/dialogs-newlayer.png +share/doc/HTML/pt_BR/krita/dialogs-oilpaint.png +share/doc/HTML/pt_BR/krita/dialogs-pixelize.png +share/doc/HTML/pt_BR/krita/dialogs-raindrops.png +share/doc/HTML/pt_BR/krita/dialogs-separateimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearlayer.png +share/doc/HTML/pt_BR/krita/dialogs-smalltiles.png +share/doc/HTML/pt_BR/krita/dialogs-sobel.png +share/doc/HTML/pt_BR/krita/dialogs-unsharpmask.png +share/doc/HTML/pt_BR/krita/faq.docbook +share/doc/HTML/pt_BR/krita/index.cache.bz2 +share/doc/HTML/pt_BR/krita/index.docbook +share/doc/HTML/pt_BR/krita/installation.docbook +share/doc/HTML/pt_BR/krita/introduction.docbook +share/doc/HTML/pt_BR/krita/mainscreen.png +share/doc/HTML/pt_BR/krita/scripting.docbook +share/doc/HTML/pt_BR/krita/settings.docbook +share/doc/HTML/pt_BR/krita/tutorial-quick-starts.docbook +share/doc/HTML/pt_BR/krita/tutorial-select-layer.docbook +share/doc/HTML/pt_BR/krita/tutorial-starting.docbook +share/doc/HTML/pt_BR/krita/tutorial-tablet.docbook +share/doc/HTML/pt_BR/krita/tutorial.docbook +share/doc/HTML/pt_BR/krita/using-colorspaces.docbook +share/doc/HTML/pt_BR/krita/using-filters.docbook +share/doc/HTML/pt_BR/krita/using-images.docbook +share/doc/HTML/pt_BR/krita/using-layers.docbook +share/doc/HTML/pt_BR/krita/using-selections.docbook +share/doc/HTML/pt_BR/krita/using-views.docbook +share/doc/HTML/pt_BR/kspread/a11y.docbook share/doc/HTML/pt_BR/kspread/advanced.docbook share/doc/HTML/pt_BR/kspread/basics.docbook -share/doc/HTML/pt_BR/kspread/chart1.png +share/doc/HTML/pt_BR/kspread/cellformat0.png +share/doc/HTML/pt_BR/kspread/cellformat1.png +share/doc/HTML/pt_BR/kspread/cellformat2.png +share/doc/HTML/pt_BR/kspread/cellformat3.png +share/doc/HTML/pt_BR/kspread/cellformat4.png +share/doc/HTML/pt_BR/kspread/cellformat5.png +share/doc/HTML/pt_BR/kspread/cellformat6.png +share/doc/HTML/pt_BR/kspread/cellformat7.png +share/doc/HTML/pt_BR/kspread/cellprotection1.png +share/doc/HTML/pt_BR/kspread/cellprotection2.png share/doc/HTML/pt_BR/kspread/commands.docbook share/doc/HTML/pt_BR/kspread/common share/doc/HTML/pt_BR/kspread/config.docbook share/doc/HTML/pt_BR/kspread/configdialog.docbook +share/doc/HTML/pt_BR/kspread/configure1.png +share/doc/HTML/pt_BR/kspread/configure2.png +share/doc/HTML/pt_BR/kspread/configure3.png +share/doc/HTML/pt_BR/kspread/configure4.png +share/doc/HTML/pt_BR/kspread/configure5.png +share/doc/HTML/pt_BR/kspread/configure6.png share/doc/HTML/pt_BR/kspread/copy1.png share/doc/HTML/pt_BR/kspread/faq.docbook share/doc/HTML/pt_BR/kspread/format.docbook share/doc/HTML/pt_BR/kspread/importexport.docbook share/doc/HTML/pt_BR/kspread/index.cache.bz2 share/doc/HTML/pt_BR/kspread/index.docbook +share/doc/HTML/pt_BR/kspread/mousenav.png +share/doc/HTML/pt_BR/kspread/newdocument.png +share/doc/HTML/pt_BR/kspread/sheetproperties.png share/doc/HTML/pt_BR/kspread/shortcut1.png share/doc/HTML/pt_BR/kspread/shortcut2.png +share/doc/HTML/pt_BR/kspread/shortcut3.png share/doc/HTML/pt_BR/kspread/sort1.png share/doc/HTML/pt_BR/kspread/starting1.png +share/doc/HTML/pt_BR/kspread/tts.png share/doc/HTML/pt_BR/kugar/common share/doc/HTML/pt_BR/kugar/datadtd.docbook share/doc/HTML/pt_BR/kugar/dataref.docbook @@ -69,6 +307,7 @@ share/doc/HTML/pt_BR/kword/Tut1.png share/doc/HTML/pt_BR/kword/Tut11a.png share/doc/HTML/pt_BR/kword/Tut11b.png share/doc/HTML/pt_BR/kword/Tut13.png +share/doc/HTML/pt_BR/kword/Tut13a.png share/doc/HTML/pt_BR/kword/Tut14.png share/doc/HTML/pt_BR/kword/Tut14a.png share/doc/HTML/pt_BR/kword/Tut14b.png @@ -84,10 +323,7 @@ share/doc/HTML/pt_BR/kword/Tut3.png share/doc/HTML/pt_BR/kword/Tut4.png share/doc/HTML/pt_BR/kword/Tut7.png share/doc/HTML/pt_BR/kword/Tut8.png -share/doc/HTML/pt_BR/kword/alignBlock.png -share/doc/HTML/pt_BR/kword/alignCenter.png -share/doc/HTML/pt_BR/kword/alignLeft.png -share/doc/HTML/pt_BR/kword/alignRight.png +share/doc/HTML/pt_BR/kword/a11y.docbook share/doc/HTML/pt_BR/kword/auto1.png share/doc/HTML/pt_BR/kword/auto2.png share/doc/HTML/pt_BR/kword/auto3.png @@ -95,42 +331,40 @@ share/doc/HTML/pt_BR/kword/auto4.png share/doc/HTML/pt_BR/kword/autocompdlg.png share/doc/HTML/pt_BR/kword/basic.png share/doc/HTML/pt_BR/kword/basics.docbook -share/doc/HTML/pt_BR/kword/bdcolorbut.png share/doc/HTML/pt_BR/kword/bdselbut.png share/doc/HTML/pt_BR/kword/bdsizebut.png -share/doc/HTML/pt_BR/kword/bold.png share/doc/HTML/pt_BR/kword/bookmarks.docbook -share/doc/HTML/pt_BR/kword/bord.png share/doc/HTML/pt_BR/kword/bordtb.png -share/doc/HTML/pt_BR/kword/bullist.png share/doc/HTML/pt_BR/kword/cftb.png share/doc/HTML/pt_BR/kword/chapnumb.docbook -share/doc/HTML/pt_BR/kword/chcolorbut.png +share/doc/HTML/pt_BR/kword/chcase.png share/doc/HTML/pt_BR/kword/chfontbut.png share/doc/HTML/pt_BR/kword/chsizebut.png share/doc/HTML/pt_BR/kword/chstylebut.png share/doc/HTML/pt_BR/kword/colorseldlg.png share/doc/HTML/pt_BR/kword/columns.docbook share/doc/HTML/pt_BR/kword/common -share/doc/HTML/pt_BR/kword/decindbut.png +share/doc/HTML/pt_BR/kword/ctab2.png share/doc/HTML/pt_BR/kword/doccomments.docbook share/doc/HTML/pt_BR/kword/doclinks.docbook share/doc/HTML/pt_BR/kword/docstruct.docbook share/doc/HTML/pt_BR/kword/docstruct.png share/doc/HTML/pt_BR/kword/docvariables.docbook +share/doc/HTML/pt_BR/kword/dtab2.png share/doc/HTML/pt_BR/kword/dtpfmtpg1.png -share/doc/HTML/pt_BR/kword/editcopy.png share/doc/HTML/pt_BR/kword/editing.docbook share/doc/HTML/pt_BR/kword/edittb.png -share/doc/HTML/pt_BR/kword/enumlist.png +share/doc/HTML/pt_BR/kword/error +share/doc/HTML/pt_BR/kword/exoffset.png share/doc/HTML/pt_BR/kword/expression.png share/doc/HTML/pt_BR/kword/expressions.docbook +share/doc/HTML/pt_BR/kword/exst.png share/doc/HTML/pt_BR/kword/exul.png share/doc/HTML/pt_BR/kword/fchardlg.png share/doc/HTML/pt_BR/kword/fchardlg2.png -share/doc/HTML/pt_BR/kword/filefloppy.png -share/doc/HTML/pt_BR/kword/fileprint.png -share/doc/HTML/pt_BR/kword/fileprint2.png +share/doc/HTML/pt_BR/kword/fchardlg3.png +share/doc/HTML/pt_BR/kword/fchardlg4.png +share/doc/HTML/pt_BR/kword/fchardlg5.png share/doc/HTML/pt_BR/kword/filetb.png share/doc/HTML/pt_BR/kword/finddlg.png share/doc/HTML/pt_BR/kword/finddlg2.png @@ -147,6 +381,7 @@ share/doc/HTML/pt_BR/kword/formframe2.png share/doc/HTML/pt_BR/kword/formframe3.png share/doc/HTML/pt_BR/kword/formframe4.png share/doc/HTML/pt_BR/kword/formframe5.png +share/doc/HTML/pt_BR/kword/formframe6.png share/doc/HTML/pt_BR/kword/formspecchar.png share/doc/HTML/pt_BR/kword/formtb.png share/doc/HTML/pt_BR/kword/formulas.docbook @@ -155,14 +390,13 @@ share/doc/HTML/pt_BR/kword/fpara2.png share/doc/HTML/pt_BR/kword/fpara3.png share/doc/HTML/pt_BR/kword/fpara4.png share/doc/HTML/pt_BR/kword/fpara5.png -share/doc/HTML/pt_BR/kword/fpara6.png +share/doc/HTML/pt_BR/kword/framers.png share/doc/HTML/pt_BR/kword/frames.docbook share/doc/HTML/pt_BR/kword/framestylist.png share/doc/HTML/pt_BR/kword/fundimentals.docbook share/doc/HTML/pt_BR/kword/graphics.docbook share/doc/HTML/pt_BR/kword/headerfooter.docbook share/doc/HTML/pt_BR/kword/horizline.docbook -share/doc/HTML/pt_BR/kword/incindbut.png share/doc/HTML/pt_BR/kword/index.cache.bz2 share/doc/HTML/pt_BR/kword/index.docbook share/doc/HTML/pt_BR/kword/inscoldlg.png @@ -172,21 +406,28 @@ share/doc/HTML/pt_BR/kword/insgrph1.png share/doc/HTML/pt_BR/kword/insgrph2.png share/doc/HTML/pt_BR/kword/insrowdlg.png share/doc/HTML/pt_BR/kword/instab1.png -share/doc/HTML/pt_BR/kword/instb.png share/doc/HTML/pt_BR/kword/instime.png -share/doc/HTML/pt_BR/kword/ital.png -share/doc/HTML/pt_BR/kword/joincell.png +share/doc/HTML/pt_BR/kword/intro1.png +share/doc/HTML/pt_BR/kword/intro2.png +share/doc/HTML/pt_BR/kword/intro3.png share/doc/HTML/pt_BR/kword/kparts.docbook -share/doc/HTML/pt_BR/kword/larrow.png share/doc/HTML/pt_BR/kword/linkdlg.png +share/doc/HTML/pt_BR/kword/listdepth1.png +share/doc/HTML/pt_BR/kword/listdepth2.png +share/doc/HTML/pt_BR/kword/listdepth3.png share/doc/HTML/pt_BR/kword/lists.docbook +share/doc/HTML/pt_BR/kword/ltab2.png share/doc/HTML/pt_BR/kword/mailmerge.docbook share/doc/HTML/pt_BR/kword/mbtb.docbook share/doc/HTML/pt_BR/kword/migrating.docbook share/doc/HTML/pt_BR/kword/mmerge1.png +share/doc/HTML/pt_BR/kword/mmerge1a.png +share/doc/HTML/pt_BR/kword/mmerge2.png +share/doc/HTML/pt_BR/kword/mmergeab1.png +share/doc/HTML/pt_BR/kword/mmergekspread1.png share/doc/HTML/pt_BR/kword/mmergesql1.png share/doc/HTML/pt_BR/kword/mmergesql2.png -share/doc/HTML/pt_BR/kword/numtxtbut.png +share/doc/HTML/pt_BR/kword/mousenav.png share/doc/HTML/pt_BR/kword/opendlg.png share/doc/HTML/pt_BR/kword/opt.docbook share/doc/HTML/pt_BR/kword/opt1.png @@ -194,6 +435,7 @@ share/doc/HTML/pt_BR/kword/opt2.png share/doc/HTML/pt_BR/kword/opt3.png share/doc/HTML/pt_BR/kword/opt4.png share/doc/HTML/pt_BR/kword/opt5.png +share/doc/HTML/pt_BR/kword/opt6.png share/doc/HTML/pt_BR/kword/optkb.png share/doc/HTML/pt_BR/kword/optkb2.png share/doc/HTML/pt_BR/kword/opttb.png @@ -201,24 +443,21 @@ share/doc/HTML/pt_BR/kword/pageformat.docbook share/doc/HTML/pt_BR/kword/paratb.png share/doc/HTML/pt_BR/kword/pntdlg.png share/doc/HTML/pt_BR/kword/pntdlg1.png -share/doc/HTML/pt_BR/kword/rarrow.png -share/doc/HTML/pt_BR/kword/redo.png share/doc/HTML/pt_BR/kword/repldlg.png +share/doc/HTML/pt_BR/kword/rtab2.png share/doc/HTML/pt_BR/kword/ruler.png share/doc/HTML/pt_BR/kword/saved1.png share/doc/HTML/pt_BR/kword/saved2.png share/doc/HTML/pt_BR/kword/savedlg.png share/doc/HTML/pt_BR/kword/savetmpl1.png +share/doc/HTML/pt_BR/kword/scan2.png share/doc/HTML/pt_BR/kword/screen.png share/doc/HTML/pt_BR/kword/select1.png -share/doc/HTML/pt_BR/kword/spell.png share/doc/HTML/pt_BR/kword/spelldlg.png -share/doc/HTML/pt_BR/kword/stkout.png share/doc/HTML/pt_BR/kword/storeprint.docbook share/doc/HTML/pt_BR/kword/styldlg1.png +share/doc/HTML/pt_BR/kword/styleimport.png share/doc/HTML/pt_BR/kword/styles.docbook -share/doc/HTML/pt_BR/kword/subscbut.png -share/doc/HTML/pt_BR/kword/supscbut.png share/doc/HTML/pt_BR/kword/table.docbook share/doc/HTML/pt_BR/kword/tableprop1.png share/doc/HTML/pt_BR/kword/tableprop2.png @@ -234,9 +473,11 @@ share/doc/HTML/pt_BR/kword/tedittb.png share/doc/HTML/pt_BR/kword/templatecreation.docbook share/doc/HTML/pt_BR/kword/thesaurus.png share/doc/HTML/pt_BR/kword/toc.docbook +share/doc/HTML/pt_BR/kword/tts.png share/doc/HTML/pt_BR/kword/tutorial.docbook -share/doc/HTML/pt_BR/kword/undl.png -share/doc/HTML/pt_BR/kword/undo.png +share/doc/HTML/pt_BR/kword/viewsize.png +share/doc/HTML/pt_BR/kword/wbw.png +share/doc/HTML/pt_BR/kword/word share/doc/HTML/pt_BR/kword/wpfmtpg1.png share/doc/HTML/pt_BR/kword/wpfmtpg2.png share/doc/HTML/pt_BR/kword/wpfmtpg3.png @@ -248,6 +489,7 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo +share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo @@ -278,9 +520,13 @@ share/locale/pt_BR/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/pt_BR/kword @dirrm share/doc/HTML/pt_BR/kugar @dirrm share/doc/HTML/pt_BR/kspread +@dirrm share/doc/HTML/pt_BR/krita @dirrm share/doc/HTML/pt_BR/kpresenter +@dirrm share/doc/HTML/pt_BR/kplato @dirrm share/doc/HTML/pt_BR/koshell @dirrm share/doc/HTML/pt_BR/koffice @dirrm share/doc/HTML/pt_BR/kivio @dirrm share/doc/HTML/pt_BR/kformula +@dirrm share/doc/HTML/pt_BR/kexi @dirrm share/doc/HTML/pt_BR/kchart +@dirrm share/doc/HTML/pt_BR/karbon diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile index 69dcf6a80b7d..d280a0b87342 100644 --- a/portuguese/koffice-i18n/Makefile +++ b/portuguese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-i18n/distinfo b/portuguese/koffice-i18n/distinfo index 5c71fbe9ab87..5137782d8475 100644 --- a/portuguese/koffice-i18n/distinfo +++ b/portuguese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = f8d4e8990e1f24ef6076de1c9698458f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 8d4ce9c30c5b7585b126ba36da16034b489b4349034c5241dd23777f07ffb1b8 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 1041430 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 diff --git a/portuguese/koffice-i18n/pkg-plist b/portuguese/koffice-i18n/pkg-plist index 0524e0ce3087..b474302403e1 100644 --- a/portuguese/koffice-i18n/pkg-plist +++ b/portuguese/koffice-i18n/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/pt/kchart/index.docbook share/doc/HTML/pt/kexi/basics.docbook share/doc/HTML/pt/kexi/building.docbook share/doc/HTML/pt/kexi/common +share/doc/HTML/pt/kexi/comparing.docbook share/doc/HTML/pt/kexi/configuration.docbook share/doc/HTML/pt/kexi/credits.docbook share/doc/HTML/pt/kexi/database.docbook +share/doc/HTML/pt/kexi/designingforms.docbook +share/doc/HTML/pt/kexi/enteringdataintotables.docbook +share/doc/HTML/pt/kexi/enteringdatausingforms.docbook share/doc/HTML/pt/kexi/index.cache.bz2 share/doc/HTML/pt/kexi/index.docbook share/doc/HTML/pt/kexi/intro.docbook share/doc/HTML/pt/kexi/menus.docbook +share/doc/HTML/pt/kexi/querydesigning.docbook share/doc/HTML/pt/kformula/common share/doc/HTML/pt/kformula/index.cache.bz2 share/doc/HTML/pt/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/pt/krita/commands-toolbars.docbook share/doc/HTML/pt/krita/commands.docbook share/doc/HTML/pt/krita/common share/doc/HTML/pt/krita/credits.docbook +share/doc/HTML/pt/krita/developers-plugins.docbook +share/doc/HTML/pt/krita/developers-scripting.docbook share/doc/HTML/pt/krita/developers.docbook share/doc/HTML/pt/krita/faq.docbook share/doc/HTML/pt/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/pt/krita/settings.docbook share/doc/HTML/pt/krita/tutorial-quick-starts.docbook share/doc/HTML/pt/krita/tutorial-select-layer.docbook share/doc/HTML/pt/krita/tutorial-starting.docbook +share/doc/HTML/pt/krita/tutorial-tablet.docbook share/doc/HTML/pt/krita/tutorial.docbook share/doc/HTML/pt/krita/using-colorspaces.docbook share/doc/HTML/pt/krita/using-filters.docbook +share/doc/HTML/pt/krita/using-images.docbook share/doc/HTML/pt/krita/using-layers.docbook share/doc/HTML/pt/krita/using-selections.docbook +share/doc/HTML/pt/krita/using-views.docbook share/doc/HTML/pt/kspread/a11y.docbook share/doc/HTML/pt/kspread/advanced.docbook share/doc/HTML/pt/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo +share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile index f69f7dd8331b..3f06ce477d89 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/Makefile +++ b/portuguese/koffice-kde4-l10n-pt_BR/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-kde4-l10n-pt_BR/distinfo b/portuguese/koffice-kde4-l10n-pt_BR/distinfo index f14b00651338..a04a8005a1a2 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/distinfo +++ b/portuguese/koffice-kde4-l10n-pt_BR/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = bba591e0460c4a0169c07c3d5ae5b118 -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 8630ee37c378e2b27ffd29bdabcd3968c3857fd03d954c7b811ad6242f493a65 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.2.tar.bz2) = 2002410 +MD5 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 71efdf80a256b20baece5e58f2d4527a +SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 2699b82bd9322e73060a1daf99d6898a10fc675ea55a0f26df5b8e8bb75692c3 +SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.6.1.tar.bz2) = 5924672 diff --git a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist index b54dc6ddf7a2..0a9b3432a18e 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist @@ -1,16 +1,68 @@ +share/doc/HTML/pt_BR/karbon/common +share/doc/HTML/pt_BR/karbon/index.cache.bz2 +share/doc/HTML/pt_BR/karbon/index.docbook share/doc/HTML/pt_BR/kchart/common -share/doc/HTML/pt_BR/kchart/file-toolbar.png -share/doc/HTML/pt_BR/kchart/file-toolbar2.png -share/doc/HTML/pt_BR/kchart/frame_chart.png share/doc/HTML/pt_BR/kchart/index.cache.bz2 share/doc/HTML/pt_BR/kchart/index.docbook -share/doc/HTML/pt_BR/kchart/kchart-kspread-bar.png -share/doc/HTML/pt_BR/kchart/kchart-kspread.png +share/doc/HTML/pt_BR/kchart/kchart-config1.png +share/doc/HTML/pt_BR/kchart/kchart-config2.png +share/doc/HTML/pt_BR/kchart/kchart-config3.png +share/doc/HTML/pt_BR/kchart/kchart-config4.png +share/doc/HTML/pt_BR/kchart/kchart-config5.png +share/doc/HTML/pt_BR/kchart/kchart-config6.png +share/doc/HTML/pt_BR/kchart/kchart-config7.png +share/doc/HTML/pt_BR/kchart/kchart-config8.png +share/doc/HTML/pt_BR/kchart/kchart-dataeditor.png +share/doc/HTML/pt_BR/kchart/kchart-default.png +share/doc/HTML/pt_BR/kchart/kchart-example1-1.png +share/doc/HTML/pt_BR/kchart/kchart-example1-2.png +share/doc/HTML/pt_BR/kchart/kchart-example1-5.png +share/doc/HTML/pt_BR/kchart/kchart-example1-6.png +share/doc/HTML/pt_BR/kchart/kchart-example1-7.png +share/doc/HTML/pt_BR/kchart/kchart-example1-8.png +share/doc/HTML/pt_BR/kchart/kchart-startupdialog.png +share/doc/HTML/pt_BR/kchart/kchart-wizard0.png +share/doc/HTML/pt_BR/kchart/kchart-wizard1.png +share/doc/HTML/pt_BR/kchart/kchart-wizard2.png +share/doc/HTML/pt_BR/kchart/kchart-wizard3.png +share/doc/HTML/pt_BR/kchart/kchart-wizard4.png share/doc/HTML/pt_BR/kchart/shortcut.png share/doc/HTML/pt_BR/kchart/toolbars.png +share/doc/HTML/pt_BR/kexi/basics.docbook +share/doc/HTML/pt_BR/kexi/building.docbook +share/doc/HTML/pt_BR/kexi/common +share/doc/HTML/pt_BR/kexi/comparing.docbook +share/doc/HTML/pt_BR/kexi/configuration.docbook +share/doc/HTML/pt_BR/kexi/contact-example.png +share/doc/HTML/pt_BR/kexi/credits.docbook +share/doc/HTML/pt_BR/kexi/database.docbook +share/doc/HTML/pt_BR/kexi/designingforms.docbook +share/doc/HTML/pt_BR/kexi/enteringdataintotables.docbook +share/doc/HTML/pt_BR/kexi/enteringdatausingforms.docbook +share/doc/HTML/pt_BR/kexi/index.cache.bz2 +share/doc/HTML/pt_BR/kexi/index.docbook +share/doc/HTML/pt_BR/kexi/intro.docbook +share/doc/HTML/pt_BR/kexi/menus.docbook +share/doc/HTML/pt_BR/kexi/querydesigning.docbook +share/doc/HTML/pt_BR/kformula/ambiguous-string.png share/doc/HTML/pt_BR/kformula/common +share/doc/HTML/pt_BR/kformula/green1.png +share/doc/HTML/pt_BR/kformula/green2.png share/doc/HTML/pt_BR/kformula/index.cache.bz2 share/doc/HTML/pt_BR/kformula/index.docbook +share/doc/HTML/pt_BR/kformula/kfontinst1.png +share/doc/HTML/pt_BR/kformula/kfontinst2.png +share/doc/HTML/pt_BR/kformula/kfontinst3.png +share/doc/HTML/pt_BR/kformula/kfontinst4.png +share/doc/HTML/pt_BR/kformula/kfontinst5.png +share/doc/HTML/pt_BR/kformula/kfontinst6.png +share/doc/HTML/pt_BR/kformula/rk-edit0.png +share/doc/HTML/pt_BR/kformula/rk-edit1.png +share/doc/HTML/pt_BR/kformula/rk-edit2.png +share/doc/HTML/pt_BR/kformula/scilab-edit.png +share/doc/HTML/pt_BR/kformula/shortcut0.png +share/doc/HTML/pt_BR/kformula/shortcut1.png +share/doc/HTML/pt_BR/kformula/toolbars.png share/doc/HTML/pt_BR/kivio/common share/doc/HTML/pt_BR/kivio/credits.docbook share/doc/HTML/pt_BR/kivio/index.cache.bz2 @@ -25,33 +77,219 @@ share/doc/HTML/pt_BR/koffice/index.docbook share/doc/HTML/pt_BR/koshell/common share/doc/HTML/pt_BR/koshell/index.cache.bz2 share/doc/HTML/pt_BR/koshell/index.docbook +share/doc/HTML/pt_BR/koshell/koshell1.png +share/doc/HTML/pt_BR/koshell/main-view.png +share/doc/HTML/pt_BR/koshell/new-dialog.png +share/doc/HTML/pt_BR/koshell/side-pane.png +share/doc/HTML/pt_BR/kplato/commands.docbook +share/doc/HTML/pt_BR/kplato/common +share/doc/HTML/pt_BR/kplato/configure-wbs.png +share/doc/HTML/pt_BR/kplato/configure1.png +share/doc/HTML/pt_BR/kplato/configure2.1.png +share/doc/HTML/pt_BR/kplato/configure2.png +share/doc/HTML/pt_BR/kplato/definitions.docbook +share/doc/HTML/pt_BR/kplato/edit-accounts.png +share/doc/HTML/pt_BR/kplato/edit-accounts1.png +share/doc/HTML/pt_BR/kplato/edit-calendar.png +share/doc/HTML/pt_BR/kplato/edit-calendar1.png +share/doc/HTML/pt_BR/kplato/edit-calendar2.png +share/doc/HTML/pt_BR/kplato/edit-resources.png +share/doc/HTML/pt_BR/kplato/edit-resources1.png +share/doc/HTML/pt_BR/kplato/edit-worktime.png +share/doc/HTML/pt_BR/kplato/index.cache.bz2 +share/doc/HTML/pt_BR/kplato/index.docbook +share/doc/HTML/pt_BR/kplato/mainwindow.docbook +share/doc/HTML/pt_BR/kplato/mainwindow1.png +share/doc/HTML/pt_BR/kplato/options.docbook +share/doc/HTML/pt_BR/kplato/project-settings.png +share/doc/HTML/pt_BR/kplato/wbs.docbook +share/doc/HTML/pt_BR/kplato/wbs.png +share/doc/HTML/pt_BR/kplato/wbs1.png +share/doc/HTML/pt_BR/kplato/wbs2.png +share/doc/HTML/pt_BR/kplato/wbs3.png +share/doc/HTML/pt_BR/kpresenter/a11y.docbook +share/doc/HTML/pt_BR/kpresenter/autocorrection1.png +share/doc/HTML/pt_BR/kpresenter/autocorrection2.png +share/doc/HTML/pt_BR/kpresenter/autocorrection3.png +share/doc/HTML/pt_BR/kpresenter/autocorrection4.png +share/doc/HTML/pt_BR/kpresenter/barstyle1.png +share/doc/HTML/pt_BR/kpresenter/barstyle3.png +share/doc/HTML/pt_BR/kpresenter/barstyle4.png +share/doc/HTML/pt_BR/kpresenter/barstyle5.png +share/doc/HTML/pt_BR/kpresenter/barstyle6.png +share/doc/HTML/pt_BR/kpresenter/barstyle7.png +share/doc/HTML/pt_BR/kpresenter/changeformat.png share/doc/HTML/pt_BR/kpresenter/common +share/doc/HTML/pt_BR/kpresenter/completion.png +share/doc/HTML/pt_BR/kpresenter/configure1.png +share/doc/HTML/pt_BR/kpresenter/configure2.png +share/doc/HTML/pt_BR/kpresenter/configure3.png +share/doc/HTML/pt_BR/kpresenter/configure4.png +share/doc/HTML/pt_BR/kpresenter/configure4c.png +share/doc/HTML/pt_BR/kpresenter/configure5.png +share/doc/HTML/pt_BR/kpresenter/configure6.png +share/doc/HTML/pt_BR/kpresenter/configure6b.png +share/doc/HTML/pt_BR/kpresenter/configure6c.png +share/doc/HTML/pt_BR/kpresenter/configure6d.png +share/doc/HTML/pt_BR/kpresenter/configure6e.png +share/doc/HTML/pt_BR/kpresenter/configure7.png share/doc/HTML/pt_BR/kpresenter/faq.docbook share/doc/HTML/pt_BR/kpresenter/great-presentations.docbook share/doc/HTML/pt_BR/kpresenter/guides.docbook +share/doc/HTML/pt_BR/kpresenter/htmlshow1.png +share/doc/HTML/pt_BR/kpresenter/htmlshow2.png +share/doc/HTML/pt_BR/kpresenter/htmlshow3.png +share/doc/HTML/pt_BR/kpresenter/htmlshow4.png +share/doc/HTML/pt_BR/kpresenter/htmlshow5.png +share/doc/HTML/pt_BR/kpresenter/htmlshow6.png +share/doc/HTML/pt_BR/kpresenter/htmlshow7.png +share/doc/HTML/pt_BR/kpresenter/htmlshow8.png share/doc/HTML/pt_BR/kpresenter/index.cache.bz2 share/doc/HTML/pt_BR/kpresenter/index.docbook +share/doc/HTML/pt_BR/kpresenter/kbd-focus-ext.png share/doc/HTML/pt_BR/kpresenter/menus.docbook +share/doc/HTML/pt_BR/kpresenter/mousenav.png +share/doc/HTML/pt_BR/kpresenter/msexport1.png +share/doc/HTML/pt_BR/kpresenter/msexport2.png +share/doc/HTML/pt_BR/kpresenter/msexport2b.png +share/doc/HTML/pt_BR/kpresenter/msexport3.png +share/doc/HTML/pt_BR/kpresenter/msexport4.png share/doc/HTML/pt_BR/kpresenter/options.docbook +share/doc/HTML/pt_BR/kpresenter/properties.png share/doc/HTML/pt_BR/kpresenter/screen.docbook +share/doc/HTML/pt_BR/kpresenter/settings01.png +share/doc/HTML/pt_BR/kpresenter/settings03.png +share/doc/HTML/pt_BR/kpresenter/settings04.png +share/doc/HTML/pt_BR/kpresenter/template02.png +share/doc/HTML/pt_BR/kpresenter/template03.png +share/doc/HTML/pt_BR/kpresenter/template04.png +share/doc/HTML/pt_BR/kpresenter/template05.png +share/doc/HTML/pt_BR/kpresenter/template06.png +share/doc/HTML/pt_BR/kpresenter/template07.png +share/doc/HTML/pt_BR/kpresenter/textmenu1.png +share/doc/HTML/pt_BR/kpresenter/textmenu2.png +share/doc/HTML/pt_BR/kpresenter/tts.png +share/doc/HTML/pt_BR/kpresenter/tut01.png +share/doc/HTML/pt_BR/kpresenter/tut02.png +share/doc/HTML/pt_BR/kpresenter/tut03.png +share/doc/HTML/pt_BR/kpresenter/tut04.png +share/doc/HTML/pt_BR/kpresenter/tut05.png +share/doc/HTML/pt_BR/kpresenter/tut06.png +share/doc/HTML/pt_BR/kpresenter/tut07.png +share/doc/HTML/pt_BR/kpresenter/tut08.png +share/doc/HTML/pt_BR/kpresenter/tut09.png +share/doc/HTML/pt_BR/kpresenter/tut10.png +share/doc/HTML/pt_BR/kpresenter/tut11.png +share/doc/HTML/pt_BR/kpresenter/tut12.png +share/doc/HTML/pt_BR/kpresenter/tut13.png +share/doc/HTML/pt_BR/kpresenter/tut14.png +share/doc/HTML/pt_BR/kpresenter/tut15.png +share/doc/HTML/pt_BR/kpresenter/tut16.png +share/doc/HTML/pt_BR/kpresenter/tut17.png +share/doc/HTML/pt_BR/kpresenter/tut18.png +share/doc/HTML/pt_BR/kpresenter/tut19.png +share/doc/HTML/pt_BR/kpresenter/tut20.png +share/doc/HTML/pt_BR/kpresenter/tut21.png +share/doc/HTML/pt_BR/kpresenter/tut22.png +share/doc/HTML/pt_BR/kpresenter/tut23.png +share/doc/HTML/pt_BR/kpresenter/tut24.png +share/doc/HTML/pt_BR/kpresenter/tut26.png share/doc/HTML/pt_BR/kpresenter/tutorial.docbook +share/doc/HTML/pt_BR/krita/commands-dialogs.docbook +share/doc/HTML/pt_BR/krita/commands-menus.docbook +share/doc/HTML/pt_BR/krita/commands-palettes.docbook +share/doc/HTML/pt_BR/krita/commands-toolbars.docbook +share/doc/HTML/pt_BR/krita/commands.docbook +share/doc/HTML/pt_BR/krita/common +share/doc/HTML/pt_BR/krita/createdocument.png +share/doc/HTML/pt_BR/krita/credits.docbook +share/doc/HTML/pt_BR/krita/developers-plugins.docbook +share/doc/HTML/pt_BR/krita/developers-scripting.docbook +share/doc/HTML/pt_BR/krita/developers.docbook +share/doc/HTML/pt_BR/krita/dialogs-addpalette.png +share/doc/HTML/pt_BR/krita/dialogs-blur.png +share/doc/HTML/pt_BR/krita/dialogs-brightnesscontrast.png +share/doc/HTML/pt_BR/krita/dialogs-bumpmap.png +share/doc/HTML/pt_BR/krita/dialogs-coloradjustment.png +share/doc/HTML/pt_BR/krita/dialogs-colortoalpha.png +share/doc/HTML/pt_BR/krita/dialogs-colortransfer.png +share/doc/HTML/pt_BR/krita/dialogs-convertimagetype.png +share/doc/HTML/pt_BR/krita/dialogs-convertlayertype.png +share/doc/HTML/pt_BR/krita/dialogs-customconvolution.png +share/doc/HTML/pt_BR/krita/dialogs-emboss.png +share/doc/HTML/pt_BR/krita/dialogs-histogram.png +share/doc/HTML/pt_BR/krita/dialogs-imageproperties.png +share/doc/HTML/pt_BR/krita/dialogs-imagerestoration.png +share/doc/HTML/pt_BR/krita/dialogs-imagesize.png +share/doc/HTML/pt_BR/krita/dialogs-layerproperties.png +share/doc/HTML/pt_BR/krita/dialogs-layersize.png +share/doc/HTML/pt_BR/krita/dialogs-newlayer.png +share/doc/HTML/pt_BR/krita/dialogs-oilpaint.png +share/doc/HTML/pt_BR/krita/dialogs-pixelize.png +share/doc/HTML/pt_BR/krita/dialogs-raindrops.png +share/doc/HTML/pt_BR/krita/dialogs-separateimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearimage.png +share/doc/HTML/pt_BR/krita/dialogs-shearlayer.png +share/doc/HTML/pt_BR/krita/dialogs-smalltiles.png +share/doc/HTML/pt_BR/krita/dialogs-sobel.png +share/doc/HTML/pt_BR/krita/dialogs-unsharpmask.png +share/doc/HTML/pt_BR/krita/faq.docbook +share/doc/HTML/pt_BR/krita/index.cache.bz2 +share/doc/HTML/pt_BR/krita/index.docbook +share/doc/HTML/pt_BR/krita/installation.docbook +share/doc/HTML/pt_BR/krita/introduction.docbook +share/doc/HTML/pt_BR/krita/mainscreen.png +share/doc/HTML/pt_BR/krita/scripting.docbook +share/doc/HTML/pt_BR/krita/settings.docbook +share/doc/HTML/pt_BR/krita/tutorial-quick-starts.docbook +share/doc/HTML/pt_BR/krita/tutorial-select-layer.docbook +share/doc/HTML/pt_BR/krita/tutorial-starting.docbook +share/doc/HTML/pt_BR/krita/tutorial-tablet.docbook +share/doc/HTML/pt_BR/krita/tutorial.docbook +share/doc/HTML/pt_BR/krita/using-colorspaces.docbook +share/doc/HTML/pt_BR/krita/using-filters.docbook +share/doc/HTML/pt_BR/krita/using-images.docbook +share/doc/HTML/pt_BR/krita/using-layers.docbook +share/doc/HTML/pt_BR/krita/using-selections.docbook +share/doc/HTML/pt_BR/krita/using-views.docbook +share/doc/HTML/pt_BR/kspread/a11y.docbook share/doc/HTML/pt_BR/kspread/advanced.docbook share/doc/HTML/pt_BR/kspread/basics.docbook -share/doc/HTML/pt_BR/kspread/chart1.png +share/doc/HTML/pt_BR/kspread/cellformat0.png +share/doc/HTML/pt_BR/kspread/cellformat1.png +share/doc/HTML/pt_BR/kspread/cellformat2.png +share/doc/HTML/pt_BR/kspread/cellformat3.png +share/doc/HTML/pt_BR/kspread/cellformat4.png +share/doc/HTML/pt_BR/kspread/cellformat5.png +share/doc/HTML/pt_BR/kspread/cellformat6.png +share/doc/HTML/pt_BR/kspread/cellformat7.png +share/doc/HTML/pt_BR/kspread/cellprotection1.png +share/doc/HTML/pt_BR/kspread/cellprotection2.png share/doc/HTML/pt_BR/kspread/commands.docbook share/doc/HTML/pt_BR/kspread/common share/doc/HTML/pt_BR/kspread/config.docbook share/doc/HTML/pt_BR/kspread/configdialog.docbook +share/doc/HTML/pt_BR/kspread/configure1.png +share/doc/HTML/pt_BR/kspread/configure2.png +share/doc/HTML/pt_BR/kspread/configure3.png +share/doc/HTML/pt_BR/kspread/configure4.png +share/doc/HTML/pt_BR/kspread/configure5.png +share/doc/HTML/pt_BR/kspread/configure6.png share/doc/HTML/pt_BR/kspread/copy1.png share/doc/HTML/pt_BR/kspread/faq.docbook share/doc/HTML/pt_BR/kspread/format.docbook share/doc/HTML/pt_BR/kspread/importexport.docbook share/doc/HTML/pt_BR/kspread/index.cache.bz2 share/doc/HTML/pt_BR/kspread/index.docbook +share/doc/HTML/pt_BR/kspread/mousenav.png +share/doc/HTML/pt_BR/kspread/newdocument.png +share/doc/HTML/pt_BR/kspread/sheetproperties.png share/doc/HTML/pt_BR/kspread/shortcut1.png share/doc/HTML/pt_BR/kspread/shortcut2.png +share/doc/HTML/pt_BR/kspread/shortcut3.png share/doc/HTML/pt_BR/kspread/sort1.png share/doc/HTML/pt_BR/kspread/starting1.png +share/doc/HTML/pt_BR/kspread/tts.png share/doc/HTML/pt_BR/kugar/common share/doc/HTML/pt_BR/kugar/datadtd.docbook share/doc/HTML/pt_BR/kugar/dataref.docbook @@ -69,6 +307,7 @@ share/doc/HTML/pt_BR/kword/Tut1.png share/doc/HTML/pt_BR/kword/Tut11a.png share/doc/HTML/pt_BR/kword/Tut11b.png share/doc/HTML/pt_BR/kword/Tut13.png +share/doc/HTML/pt_BR/kword/Tut13a.png share/doc/HTML/pt_BR/kword/Tut14.png share/doc/HTML/pt_BR/kword/Tut14a.png share/doc/HTML/pt_BR/kword/Tut14b.png @@ -84,10 +323,7 @@ share/doc/HTML/pt_BR/kword/Tut3.png share/doc/HTML/pt_BR/kword/Tut4.png share/doc/HTML/pt_BR/kword/Tut7.png share/doc/HTML/pt_BR/kword/Tut8.png -share/doc/HTML/pt_BR/kword/alignBlock.png -share/doc/HTML/pt_BR/kword/alignCenter.png -share/doc/HTML/pt_BR/kword/alignLeft.png -share/doc/HTML/pt_BR/kword/alignRight.png +share/doc/HTML/pt_BR/kword/a11y.docbook share/doc/HTML/pt_BR/kword/auto1.png share/doc/HTML/pt_BR/kword/auto2.png share/doc/HTML/pt_BR/kword/auto3.png @@ -95,42 +331,40 @@ share/doc/HTML/pt_BR/kword/auto4.png share/doc/HTML/pt_BR/kword/autocompdlg.png share/doc/HTML/pt_BR/kword/basic.png share/doc/HTML/pt_BR/kword/basics.docbook -share/doc/HTML/pt_BR/kword/bdcolorbut.png share/doc/HTML/pt_BR/kword/bdselbut.png share/doc/HTML/pt_BR/kword/bdsizebut.png -share/doc/HTML/pt_BR/kword/bold.png share/doc/HTML/pt_BR/kword/bookmarks.docbook -share/doc/HTML/pt_BR/kword/bord.png share/doc/HTML/pt_BR/kword/bordtb.png -share/doc/HTML/pt_BR/kword/bullist.png share/doc/HTML/pt_BR/kword/cftb.png share/doc/HTML/pt_BR/kword/chapnumb.docbook -share/doc/HTML/pt_BR/kword/chcolorbut.png +share/doc/HTML/pt_BR/kword/chcase.png share/doc/HTML/pt_BR/kword/chfontbut.png share/doc/HTML/pt_BR/kword/chsizebut.png share/doc/HTML/pt_BR/kword/chstylebut.png share/doc/HTML/pt_BR/kword/colorseldlg.png share/doc/HTML/pt_BR/kword/columns.docbook share/doc/HTML/pt_BR/kword/common -share/doc/HTML/pt_BR/kword/decindbut.png +share/doc/HTML/pt_BR/kword/ctab2.png share/doc/HTML/pt_BR/kword/doccomments.docbook share/doc/HTML/pt_BR/kword/doclinks.docbook share/doc/HTML/pt_BR/kword/docstruct.docbook share/doc/HTML/pt_BR/kword/docstruct.png share/doc/HTML/pt_BR/kword/docvariables.docbook +share/doc/HTML/pt_BR/kword/dtab2.png share/doc/HTML/pt_BR/kword/dtpfmtpg1.png -share/doc/HTML/pt_BR/kword/editcopy.png share/doc/HTML/pt_BR/kword/editing.docbook share/doc/HTML/pt_BR/kword/edittb.png -share/doc/HTML/pt_BR/kword/enumlist.png +share/doc/HTML/pt_BR/kword/error +share/doc/HTML/pt_BR/kword/exoffset.png share/doc/HTML/pt_BR/kword/expression.png share/doc/HTML/pt_BR/kword/expressions.docbook +share/doc/HTML/pt_BR/kword/exst.png share/doc/HTML/pt_BR/kword/exul.png share/doc/HTML/pt_BR/kword/fchardlg.png share/doc/HTML/pt_BR/kword/fchardlg2.png -share/doc/HTML/pt_BR/kword/filefloppy.png -share/doc/HTML/pt_BR/kword/fileprint.png -share/doc/HTML/pt_BR/kword/fileprint2.png +share/doc/HTML/pt_BR/kword/fchardlg3.png +share/doc/HTML/pt_BR/kword/fchardlg4.png +share/doc/HTML/pt_BR/kword/fchardlg5.png share/doc/HTML/pt_BR/kword/filetb.png share/doc/HTML/pt_BR/kword/finddlg.png share/doc/HTML/pt_BR/kword/finddlg2.png @@ -147,6 +381,7 @@ share/doc/HTML/pt_BR/kword/formframe2.png share/doc/HTML/pt_BR/kword/formframe3.png share/doc/HTML/pt_BR/kword/formframe4.png share/doc/HTML/pt_BR/kword/formframe5.png +share/doc/HTML/pt_BR/kword/formframe6.png share/doc/HTML/pt_BR/kword/formspecchar.png share/doc/HTML/pt_BR/kword/formtb.png share/doc/HTML/pt_BR/kword/formulas.docbook @@ -155,14 +390,13 @@ share/doc/HTML/pt_BR/kword/fpara2.png share/doc/HTML/pt_BR/kword/fpara3.png share/doc/HTML/pt_BR/kword/fpara4.png share/doc/HTML/pt_BR/kword/fpara5.png -share/doc/HTML/pt_BR/kword/fpara6.png +share/doc/HTML/pt_BR/kword/framers.png share/doc/HTML/pt_BR/kword/frames.docbook share/doc/HTML/pt_BR/kword/framestylist.png share/doc/HTML/pt_BR/kword/fundimentals.docbook share/doc/HTML/pt_BR/kword/graphics.docbook share/doc/HTML/pt_BR/kword/headerfooter.docbook share/doc/HTML/pt_BR/kword/horizline.docbook -share/doc/HTML/pt_BR/kword/incindbut.png share/doc/HTML/pt_BR/kword/index.cache.bz2 share/doc/HTML/pt_BR/kword/index.docbook share/doc/HTML/pt_BR/kword/inscoldlg.png @@ -172,21 +406,28 @@ share/doc/HTML/pt_BR/kword/insgrph1.png share/doc/HTML/pt_BR/kword/insgrph2.png share/doc/HTML/pt_BR/kword/insrowdlg.png share/doc/HTML/pt_BR/kword/instab1.png -share/doc/HTML/pt_BR/kword/instb.png share/doc/HTML/pt_BR/kword/instime.png -share/doc/HTML/pt_BR/kword/ital.png -share/doc/HTML/pt_BR/kword/joincell.png +share/doc/HTML/pt_BR/kword/intro1.png +share/doc/HTML/pt_BR/kword/intro2.png +share/doc/HTML/pt_BR/kword/intro3.png share/doc/HTML/pt_BR/kword/kparts.docbook -share/doc/HTML/pt_BR/kword/larrow.png share/doc/HTML/pt_BR/kword/linkdlg.png +share/doc/HTML/pt_BR/kword/listdepth1.png +share/doc/HTML/pt_BR/kword/listdepth2.png +share/doc/HTML/pt_BR/kword/listdepth3.png share/doc/HTML/pt_BR/kword/lists.docbook +share/doc/HTML/pt_BR/kword/ltab2.png share/doc/HTML/pt_BR/kword/mailmerge.docbook share/doc/HTML/pt_BR/kword/mbtb.docbook share/doc/HTML/pt_BR/kword/migrating.docbook share/doc/HTML/pt_BR/kword/mmerge1.png +share/doc/HTML/pt_BR/kword/mmerge1a.png +share/doc/HTML/pt_BR/kword/mmerge2.png +share/doc/HTML/pt_BR/kword/mmergeab1.png +share/doc/HTML/pt_BR/kword/mmergekspread1.png share/doc/HTML/pt_BR/kword/mmergesql1.png share/doc/HTML/pt_BR/kword/mmergesql2.png -share/doc/HTML/pt_BR/kword/numtxtbut.png +share/doc/HTML/pt_BR/kword/mousenav.png share/doc/HTML/pt_BR/kword/opendlg.png share/doc/HTML/pt_BR/kword/opt.docbook share/doc/HTML/pt_BR/kword/opt1.png @@ -194,6 +435,7 @@ share/doc/HTML/pt_BR/kword/opt2.png share/doc/HTML/pt_BR/kword/opt3.png share/doc/HTML/pt_BR/kword/opt4.png share/doc/HTML/pt_BR/kword/opt5.png +share/doc/HTML/pt_BR/kword/opt6.png share/doc/HTML/pt_BR/kword/optkb.png share/doc/HTML/pt_BR/kword/optkb2.png share/doc/HTML/pt_BR/kword/opttb.png @@ -201,24 +443,21 @@ share/doc/HTML/pt_BR/kword/pageformat.docbook share/doc/HTML/pt_BR/kword/paratb.png share/doc/HTML/pt_BR/kword/pntdlg.png share/doc/HTML/pt_BR/kword/pntdlg1.png -share/doc/HTML/pt_BR/kword/rarrow.png -share/doc/HTML/pt_BR/kword/redo.png share/doc/HTML/pt_BR/kword/repldlg.png +share/doc/HTML/pt_BR/kword/rtab2.png share/doc/HTML/pt_BR/kword/ruler.png share/doc/HTML/pt_BR/kword/saved1.png share/doc/HTML/pt_BR/kword/saved2.png share/doc/HTML/pt_BR/kword/savedlg.png share/doc/HTML/pt_BR/kword/savetmpl1.png +share/doc/HTML/pt_BR/kword/scan2.png share/doc/HTML/pt_BR/kword/screen.png share/doc/HTML/pt_BR/kword/select1.png -share/doc/HTML/pt_BR/kword/spell.png share/doc/HTML/pt_BR/kword/spelldlg.png -share/doc/HTML/pt_BR/kword/stkout.png share/doc/HTML/pt_BR/kword/storeprint.docbook share/doc/HTML/pt_BR/kword/styldlg1.png +share/doc/HTML/pt_BR/kword/styleimport.png share/doc/HTML/pt_BR/kword/styles.docbook -share/doc/HTML/pt_BR/kword/subscbut.png -share/doc/HTML/pt_BR/kword/supscbut.png share/doc/HTML/pt_BR/kword/table.docbook share/doc/HTML/pt_BR/kword/tableprop1.png share/doc/HTML/pt_BR/kword/tableprop2.png @@ -234,9 +473,11 @@ share/doc/HTML/pt_BR/kword/tedittb.png share/doc/HTML/pt_BR/kword/templatecreation.docbook share/doc/HTML/pt_BR/kword/thesaurus.png share/doc/HTML/pt_BR/kword/toc.docbook +share/doc/HTML/pt_BR/kword/tts.png share/doc/HTML/pt_BR/kword/tutorial.docbook -share/doc/HTML/pt_BR/kword/undl.png -share/doc/HTML/pt_BR/kword/undo.png +share/doc/HTML/pt_BR/kword/viewsize.png +share/doc/HTML/pt_BR/kword/wbw.png +share/doc/HTML/pt_BR/kword/word share/doc/HTML/pt_BR/kword/wpfmtpg1.png share/doc/HTML/pt_BR/kword/wpfmtpg2.png share/doc/HTML/pt_BR/kword/wpfmtpg3.png @@ -248,6 +489,7 @@ share/locale/pt_BR/LC_MESSAGES/desktop_koffice.mo share/locale/pt_BR/LC_MESSAGES/example.mo share/locale/pt_BR/LC_MESSAGES/karbon.mo share/locale/pt_BR/LC_MESSAGES/kchart.mo +share/locale/pt_BR/LC_MESSAGES/kdgantt.mo share/locale/pt_BR/LC_MESSAGES/kexi.mo share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo @@ -278,9 +520,13 @@ share/locale/pt_BR/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/pt_BR/kword @dirrm share/doc/HTML/pt_BR/kugar @dirrm share/doc/HTML/pt_BR/kspread +@dirrm share/doc/HTML/pt_BR/krita @dirrm share/doc/HTML/pt_BR/kpresenter +@dirrm share/doc/HTML/pt_BR/kplato @dirrm share/doc/HTML/pt_BR/koshell @dirrm share/doc/HTML/pt_BR/koffice @dirrm share/doc/HTML/pt_BR/kivio @dirrm share/doc/HTML/pt_BR/kformula +@dirrm share/doc/HTML/pt_BR/kexi @dirrm share/doc/HTML/pt_BR/kchart +@dirrm share/doc/HTML/pt_BR/karbon diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile index 69dcf6a80b7d..d280a0b87342 100644 --- a/portuguese/koffice-kde4-l10n/Makefile +++ b/portuguese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= portuguese kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/portuguese/koffice-kde4-l10n/distinfo b/portuguese/koffice-kde4-l10n/distinfo index 5c71fbe9ab87..5137782d8475 100644 --- a/portuguese/koffice-kde4-l10n/distinfo +++ b/portuguese/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = f8d4e8990e1f24ef6076de1c9698458f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 8d4ce9c30c5b7585b126ba36da16034b489b4349034c5241dd23777f07ffb1b8 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.2.tar.bz2) = 1041430 +MD5 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = c4e59783b4b93a50c7e5e9b53c864caa +SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 4a7d1108074d9ff678c1eff8a8a28faa91b9362efb6af725a7e91d8ef940ec31 +SIZE (KDE/kde-i18n/koffice-l10n-pt-1.6.1.tar.bz2) = 1130883 diff --git a/portuguese/koffice-kde4-l10n/pkg-plist b/portuguese/koffice-kde4-l10n/pkg-plist index 0524e0ce3087..b474302403e1 100644 --- a/portuguese/koffice-kde4-l10n/pkg-plist +++ b/portuguese/koffice-kde4-l10n/pkg-plist @@ -7,13 +7,18 @@ share/doc/HTML/pt/kchart/index.docbook share/doc/HTML/pt/kexi/basics.docbook share/doc/HTML/pt/kexi/building.docbook share/doc/HTML/pt/kexi/common +share/doc/HTML/pt/kexi/comparing.docbook share/doc/HTML/pt/kexi/configuration.docbook share/doc/HTML/pt/kexi/credits.docbook share/doc/HTML/pt/kexi/database.docbook +share/doc/HTML/pt/kexi/designingforms.docbook +share/doc/HTML/pt/kexi/enteringdataintotables.docbook +share/doc/HTML/pt/kexi/enteringdatausingforms.docbook share/doc/HTML/pt/kexi/index.cache.bz2 share/doc/HTML/pt/kexi/index.docbook share/doc/HTML/pt/kexi/intro.docbook share/doc/HTML/pt/kexi/menus.docbook +share/doc/HTML/pt/kexi/querydesigning.docbook share/doc/HTML/pt/kformula/common share/doc/HTML/pt/kformula/index.cache.bz2 share/doc/HTML/pt/kformula/index.docbook @@ -56,6 +61,8 @@ share/doc/HTML/pt/krita/commands-toolbars.docbook share/doc/HTML/pt/krita/commands.docbook share/doc/HTML/pt/krita/common share/doc/HTML/pt/krita/credits.docbook +share/doc/HTML/pt/krita/developers-plugins.docbook +share/doc/HTML/pt/krita/developers-scripting.docbook share/doc/HTML/pt/krita/developers.docbook share/doc/HTML/pt/krita/faq.docbook share/doc/HTML/pt/krita/index.cache.bz2 @@ -67,11 +74,14 @@ share/doc/HTML/pt/krita/settings.docbook share/doc/HTML/pt/krita/tutorial-quick-starts.docbook share/doc/HTML/pt/krita/tutorial-select-layer.docbook share/doc/HTML/pt/krita/tutorial-starting.docbook +share/doc/HTML/pt/krita/tutorial-tablet.docbook share/doc/HTML/pt/krita/tutorial.docbook share/doc/HTML/pt/krita/using-colorspaces.docbook share/doc/HTML/pt/krita/using-filters.docbook +share/doc/HTML/pt/krita/using-images.docbook share/doc/HTML/pt/krita/using-layers.docbook share/doc/HTML/pt/krita/using-selections.docbook +share/doc/HTML/pt/krita/using-views.docbook share/doc/HTML/pt/kspread/a11y.docbook share/doc/HTML/pt/kspread/advanced.docbook share/doc/HTML/pt/kspread/basics.docbook @@ -142,6 +152,7 @@ share/locale/pt/LC_MESSAGES/desktop_koffice.mo share/locale/pt/LC_MESSAGES/example.mo share/locale/pt/LC_MESSAGES/karbon.mo share/locale/pt/LC_MESSAGES/kchart.mo +share/locale/pt/LC_MESSAGES/kdgantt.mo share/locale/pt/LC_MESSAGES/kexi.mo share/locale/pt/LC_MESSAGES/kfile_abiword.mo share/locale/pt/LC_MESSAGES/kfile_gnumeric.mo diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile index cdaaa1a80fc6..05b8141341a5 100644 --- a/russian/calligra-l10n/Makefile +++ b/russian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/calligra-l10n/distinfo b/russian/calligra-l10n/distinfo index 92187c97d3f7..af141522176e 100644 --- a/russian/calligra-l10n/distinfo +++ b/russian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = e0a809bf7c9202cf5eebaaa93999f4f3 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 9c34882f2614a3059921aa527827ca45994caace6449970a33eab8ba91738445 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 826269 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 diff --git a/russian/calligra-l10n/pkg-plist b/russian/calligra-l10n/pkg-plist index b6a81fd1cb4e..64cd1d7bb284 100644 --- a/russian/calligra-l10n/pkg-plist +++ b/russian/calligra-l10n/pkg-plist @@ -96,6 +96,7 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo +share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo diff --git a/russian/kde3-i18n/distinfo b/russian/kde3-i18n/distinfo index db40267fbafc..f59016da115e 100644 --- a/russian/kde3-i18n/distinfo +++ b/russian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = b916c3eb4af74da0a620fa006defcd8a -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = 1a789966fbd4a8c6c261cb41da6f1bd79f6c24ea4299c8786215a0d47f4a9a02 -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = 7297528 +MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 4bfa140a22122446fd8ab356d32fee40 +SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 833a1816092bb66faf553663c388a5e8e613652533c420482bd052861d3dc88d +SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 7374178 diff --git a/russian/kde3-i18n/pkg-plist b/russian/kde3-i18n/pkg-plist index 99b00da939df..bcd97644b907 100644 --- a/russian/kde3-i18n/pkg-plist +++ b/russian/kde3-i18n/pkg-plist @@ -64,6 +64,9 @@ share/doc/HTML/ru/kalzium/index.docbook share/doc/HTML/ru/kamera/common share/doc/HTML/ru/kamera/index.cache.bz2 share/doc/HTML/ru/kamera/index.docbook +share/doc/HTML/ru/kanagram/common +share/doc/HTML/ru/kanagram/index.cache.bz2 +share/doc/HTML/ru/kanagram/index.docbook share/doc/HTML/ru/kandy/common share/doc/HTML/ru/kandy/index.cache.bz2 share/doc/HTML/ru/kandy/index.docbook @@ -120,6 +123,9 @@ share/doc/HTML/ru/kbabel/using.docbook share/doc/HTML/ru/kbattleship/common share/doc/HTML/ru/kbattleship/index.cache.bz2 share/doc/HTML/ru/kbattleship/index.docbook +share/doc/HTML/ru/kblackbox/common +share/doc/HTML/ru/kblackbox/index.cache.bz2 +share/doc/HTML/ru/kblackbox/index.docbook share/doc/HTML/ru/kbounce/common share/doc/HTML/ru/kbounce/index.cache.bz2 share/doc/HTML/ru/kbounce/index.docbook @@ -437,6 +443,9 @@ share/doc/HTML/ru/kfloppy/index.docbook share/doc/HTML/ru/kgamma/common share/doc/HTML/ru/kgamma/index.cache.bz2 share/doc/HTML/ru/kgamma/index.docbook +share/doc/HTML/ru/kgeography/common +share/doc/HTML/ru/kgeography/index.cache.bz2 +share/doc/HTML/ru/kgeography/index.docbook share/doc/HTML/ru/kget/common share/doc/HTML/ru/kget/index.cache.bz2 share/doc/HTML/ru/kget/index.docbook @@ -1931,6 +1940,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kgpg @dirrm share/doc/HTML/ru/kghostview @dirrm share/doc/HTML/ru/kget +@dirrm share/doc/HTML/ru/kgeography @dirrm share/doc/HTML/ru/kgamma @dirrm share/doc/HTML/ru/kfloppy @dirrm share/doc/HTML/ru/kfind @@ -2015,6 +2025,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kbugbuster @dirrm share/doc/HTML/ru/kbruch @dirrm share/doc/HTML/ru/kbounce +@dirrm share/doc/HTML/ru/kblackbox @dirrm share/doc/HTML/ru/kbattleship @dirrm share/doc/HTML/ru/kbabel @dirrm share/doc/HTML/ru/katomic @@ -2024,6 +2035,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/karm @dirrm share/doc/HTML/ru/kappfinder @dirrm share/doc/HTML/ru/kandy +@dirrm share/doc/HTML/ru/kanagram @dirrm share/doc/HTML/ru/kamera @dirrm share/doc/HTML/ru/kalzium @dirrm share/doc/HTML/ru/kaddressbook diff --git a/russian/kde4-l10n/distinfo b/russian/kde4-l10n/distinfo index db40267fbafc..f59016da115e 100644 --- a/russian/kde4-l10n/distinfo +++ b/russian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = b916c3eb4af74da0a620fa006defcd8a -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = 1a789966fbd4a8c6c261cb41da6f1bd79f6c24ea4299c8786215a0d47f4a9a02 -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.4.tar.bz2) = 7297528 +MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 4bfa140a22122446fd8ab356d32fee40 +SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 833a1816092bb66faf553663c388a5e8e613652533c420482bd052861d3dc88d +SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.5.tar.bz2) = 7374178 diff --git a/russian/kde4-l10n/pkg-plist b/russian/kde4-l10n/pkg-plist index 99b00da939df..bcd97644b907 100644 --- a/russian/kde4-l10n/pkg-plist +++ b/russian/kde4-l10n/pkg-plist @@ -64,6 +64,9 @@ share/doc/HTML/ru/kalzium/index.docbook share/doc/HTML/ru/kamera/common share/doc/HTML/ru/kamera/index.cache.bz2 share/doc/HTML/ru/kamera/index.docbook +share/doc/HTML/ru/kanagram/common +share/doc/HTML/ru/kanagram/index.cache.bz2 +share/doc/HTML/ru/kanagram/index.docbook share/doc/HTML/ru/kandy/common share/doc/HTML/ru/kandy/index.cache.bz2 share/doc/HTML/ru/kandy/index.docbook @@ -120,6 +123,9 @@ share/doc/HTML/ru/kbabel/using.docbook share/doc/HTML/ru/kbattleship/common share/doc/HTML/ru/kbattleship/index.cache.bz2 share/doc/HTML/ru/kbattleship/index.docbook +share/doc/HTML/ru/kblackbox/common +share/doc/HTML/ru/kblackbox/index.cache.bz2 +share/doc/HTML/ru/kblackbox/index.docbook share/doc/HTML/ru/kbounce/common share/doc/HTML/ru/kbounce/index.cache.bz2 share/doc/HTML/ru/kbounce/index.docbook @@ -437,6 +443,9 @@ share/doc/HTML/ru/kfloppy/index.docbook share/doc/HTML/ru/kgamma/common share/doc/HTML/ru/kgamma/index.cache.bz2 share/doc/HTML/ru/kgamma/index.docbook +share/doc/HTML/ru/kgeography/common +share/doc/HTML/ru/kgeography/index.cache.bz2 +share/doc/HTML/ru/kgeography/index.docbook share/doc/HTML/ru/kget/common share/doc/HTML/ru/kget/index.cache.bz2 share/doc/HTML/ru/kget/index.docbook @@ -1931,6 +1940,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kgpg @dirrm share/doc/HTML/ru/kghostview @dirrm share/doc/HTML/ru/kget +@dirrm share/doc/HTML/ru/kgeography @dirrm share/doc/HTML/ru/kgamma @dirrm share/doc/HTML/ru/kfloppy @dirrm share/doc/HTML/ru/kfind @@ -2015,6 +2025,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/kbugbuster @dirrm share/doc/HTML/ru/kbruch @dirrm share/doc/HTML/ru/kbounce +@dirrm share/doc/HTML/ru/kblackbox @dirrm share/doc/HTML/ru/kbattleship @dirrm share/doc/HTML/ru/kbabel @dirrm share/doc/HTML/ru/katomic @@ -2024,6 +2035,7 @@ share/locale/ru/flag.png @dirrm share/doc/HTML/ru/karm @dirrm share/doc/HTML/ru/kappfinder @dirrm share/doc/HTML/ru/kandy +@dirrm share/doc/HTML/ru/kanagram @dirrm share/doc/HTML/ru/kamera @dirrm share/doc/HTML/ru/kalzium @dirrm share/doc/HTML/ru/kaddressbook diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile index cdaaa1a80fc6..05b8141341a5 100644 --- a/russian/koffice-i18n/Makefile +++ b/russian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/koffice-i18n/distinfo b/russian/koffice-i18n/distinfo index 92187c97d3f7..af141522176e 100644 --- a/russian/koffice-i18n/distinfo +++ b/russian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = e0a809bf7c9202cf5eebaaa93999f4f3 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 9c34882f2614a3059921aa527827ca45994caace6449970a33eab8ba91738445 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 826269 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 diff --git a/russian/koffice-i18n/pkg-plist b/russian/koffice-i18n/pkg-plist index b6a81fd1cb4e..64cd1d7bb284 100644 --- a/russian/koffice-i18n/pkg-plist +++ b/russian/koffice-i18n/pkg-plist @@ -96,6 +96,7 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo +share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile index cdaaa1a80fc6..05b8141341a5 100644 --- a/russian/koffice-kde4-l10n/Makefile +++ b/russian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= russian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/russian/koffice-kde4-l10n/distinfo b/russian/koffice-kde4-l10n/distinfo index 92187c97d3f7..af141522176e 100644 --- a/russian/koffice-kde4-l10n/distinfo +++ b/russian/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = e0a809bf7c9202cf5eebaaa93999f4f3 -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 9c34882f2614a3059921aa527827ca45994caace6449970a33eab8ba91738445 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.2.tar.bz2) = 826269 +MD5 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = d72bb7ce7fe685c4c92940dca4cf4bf8 +SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 1a2ab577da6662b8df86174373623614a9c4ac2d1ad6835a783cca7d67ebac58 +SIZE (KDE/kde-i18n/koffice-l10n-ru-1.6.1.tar.bz2) = 855651 diff --git a/russian/koffice-kde4-l10n/pkg-plist b/russian/koffice-kde4-l10n/pkg-plist index b6a81fd1cb4e..64cd1d7bb284 100644 --- a/russian/koffice-kde4-l10n/pkg-plist +++ b/russian/koffice-kde4-l10n/pkg-plist @@ -96,6 +96,7 @@ share/locale/ru/LC_MESSAGES/desktop_koffice.mo share/locale/ru/LC_MESSAGES/example.mo share/locale/ru/LC_MESSAGES/karbon.mo share/locale/ru/LC_MESSAGES/kchart.mo +share/locale/ru/LC_MESSAGES/kdgantt.mo share/locale/ru/LC_MESSAGES/kexi.mo share/locale/ru/LC_MESSAGES/kfile_koffice.mo share/locale/ru/LC_MESSAGES/kfile_ooo.mo diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/security/kgpg-kde4/distinfo +++ b/security/kgpg-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/security/kwallet/distinfo +++ b/security/kwallet/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo index cdb6f26f6448..870d5335b496 100644 --- a/sysutils/kdeadmin3/distinfo +++ b/sysutils/kdeadmin3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.4.tar.bz2) = 579a2e3e8e05cf0851a88def57fcc0a3 -SHA256 (KDE/kdeadmin-3.5.4.tar.bz2) = 0d64dea158fb2061d091e0b68f4559f2737e626f206365812491bf804454d264 -SIZE (KDE/kdeadmin-3.5.4.tar.bz2) = 2114589 +MD5 (KDE/kdeadmin-3.5.5.tar.bz2) = 4af595f5d5506521e8b29a1d92ba3409 +SHA256 (KDE/kdeadmin-3.5.5.tar.bz2) = 007281182a1216064e21596f66dc99fe3436ab1a2affa3d46d6c915256a93a93 +SIZE (KDE/kdeadmin-3.5.5.tar.bz2) = 2119865 diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist index 1967e5b102a0..0b731e586329 100644 --- a/sysutils/kdeadmin3/pkg-plist +++ b/sysutils/kdeadmin3/pkg-plist @@ -38,7 +38,7 @@ share/apps/knetworkconf/pixmaps/fedora.png share/apps/knetworkconf/pixmaps/freebsd.png share/apps/knetworkconf/pixmaps/gentoo.png share/apps/knetworkconf/pixmaps/kubuntu.png -share/apps/knetworkconf/pixmaps/mandrake.png +share/apps/knetworkconf/pixmaps/mandriva.png share/apps/knetworkconf/pixmaps/openna.png share/apps/knetworkconf/pixmaps/pld.png share/apps/knetworkconf/pixmaps/redhat.png diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo index cdb6f26f6448..870d5335b496 100644 --- a/sysutils/kdeadmin4/distinfo +++ b/sysutils/kdeadmin4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.4.tar.bz2) = 579a2e3e8e05cf0851a88def57fcc0a3 -SHA256 (KDE/kdeadmin-3.5.4.tar.bz2) = 0d64dea158fb2061d091e0b68f4559f2737e626f206365812491bf804454d264 -SIZE (KDE/kdeadmin-3.5.4.tar.bz2) = 2114589 +MD5 (KDE/kdeadmin-3.5.5.tar.bz2) = 4af595f5d5506521e8b29a1d92ba3409 +SHA256 (KDE/kdeadmin-3.5.5.tar.bz2) = 007281182a1216064e21596f66dc99fe3436ab1a2affa3d46d6c915256a93a93 +SIZE (KDE/kdeadmin-3.5.5.tar.bz2) = 2119865 diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist index 1967e5b102a0..0b731e586329 100644 --- a/sysutils/kdeadmin4/pkg-plist +++ b/sysutils/kdeadmin4/pkg-plist @@ -38,7 +38,7 @@ share/apps/knetworkconf/pixmaps/fedora.png share/apps/knetworkconf/pixmaps/freebsd.png share/apps/knetworkconf/pixmaps/gentoo.png share/apps/knetworkconf/pixmaps/kubuntu.png -share/apps/knetworkconf/pixmaps/mandrake.png +share/apps/knetworkconf/pixmaps/mandriva.png share/apps/knetworkconf/pixmaps/openna.png share/apps/knetworkconf/pixmaps/pld.png share/apps/knetworkconf/pixmaps/redhat.png diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/sysutils/kfloppy/distinfo +++ b/sysutils/kfloppy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/sysutils/klaptopdaemon/distinfo b/sysutils/klaptopdaemon/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/sysutils/klaptopdaemon/distinfo +++ b/sysutils/klaptopdaemon/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/sysutils/kmilo/distinfo b/sysutils/kmilo/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/sysutils/kmilo/distinfo +++ b/sysutils/kmilo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo index fd884f93e5aa..cdaf81b48169 100644 --- a/sysutils/sweeper/distinfo +++ b/sysutils/sweeper/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.4.tar.bz2) = e24cd91576db3d2414fb30cab47e44e5 -SHA256 (KDE/kdeutils-3.5.4.tar.bz2) = 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da -SIZE (KDE/kdeutils-3.5.4.tar.bz2) = 2981597 +MD5 (KDE/kdeutils-3.5.5.tar.bz2) = a20a732284a3dcb735665e45f5be532e +SHA256 (KDE/kdeutils-3.5.5.tar.bz2) = 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457 +SIZE (KDE/kdeutils-3.5.5.tar.bz2) = 2988542 diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile index b5ef85937841..7bb84ec0fb8c 100644 --- a/ukrainian/calligra-l10n/Makefile +++ b/ukrainian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/calligra-l10n/distinfo b/ukrainian/calligra-l10n/distinfo index cb01393d41bc..1f4b8ea018a8 100644 --- a/ukrainian/calligra-l10n/distinfo +++ b/ukrainian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = a31dc3319a452ae7d2d689ac50a73bb0 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = e334bf34f8ec3730d7c998e1462ce79ba0a97d12378ce92504c3c202028520fe -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = 351685 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 diff --git a/ukrainian/calligra-l10n/pkg-plist b/ukrainian/calligra-l10n/pkg-plist index 9e7a5cb201d0..d5a4f47594c7 100644 --- a/ukrainian/calligra-l10n/pkg-plist +++ b/ukrainian/calligra-l10n/pkg-plist @@ -2,6 +2,7 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo +share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/ukrainian/kde3-i18n/distinfo b/ukrainian/kde3-i18n/distinfo index b88a76181f16..e1127258b339 100644 --- a/ukrainian/kde3-i18n/distinfo +++ b/ukrainian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 5ee00967f1e91474f1aa462e1bf0fac3 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 4872dc67948fcc73d164b78ace6c2f21d07ba489e9aa2fce6a81921234d96d8e -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 1831381 +MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = fc18b699825837e49e3062e5acc0a3f5 +SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = adf4ad603cd213750abebf11e406c657d549988b9207dcd45416f8a383beac40 +SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = 1846683 diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo index b88a76181f16..e1127258b339 100644 --- a/ukrainian/kde4-l10n/distinfo +++ b/ukrainian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 5ee00967f1e91474f1aa462e1bf0fac3 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 4872dc67948fcc73d164b78ace6c2f21d07ba489e9aa2fce6a81921234d96d8e -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.4.tar.bz2) = 1831381 +MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = fc18b699825837e49e3062e5acc0a3f5 +SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = adf4ad603cd213750abebf11e406c657d549988b9207dcd45416f8a383beac40 +SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.5.tar.bz2) = 1846683 diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile index b5ef85937841..7bb84ec0fb8c 100644 --- a/ukrainian/koffice-i18n/Makefile +++ b/ukrainian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/koffice-i18n/distinfo b/ukrainian/koffice-i18n/distinfo index cb01393d41bc..1f4b8ea018a8 100644 --- a/ukrainian/koffice-i18n/distinfo +++ b/ukrainian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = a31dc3319a452ae7d2d689ac50a73bb0 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = e334bf34f8ec3730d7c998e1462ce79ba0a97d12378ce92504c3c202028520fe -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = 351685 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 diff --git a/ukrainian/koffice-i18n/pkg-plist b/ukrainian/koffice-i18n/pkg-plist index 9e7a5cb201d0..d5a4f47594c7 100644 --- a/ukrainian/koffice-i18n/pkg-plist +++ b/ukrainian/koffice-i18n/pkg-plist @@ -2,6 +2,7 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo +share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile index b5ef85937841..7bb84ec0fb8c 100644 --- a/ukrainian/koffice-kde4-l10n/Makefile +++ b/ukrainian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.2 +PORTVERSION= 1.6.1 CATEGORIES?= ukrainian kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/ukrainian/koffice-kde4-l10n/distinfo b/ukrainian/koffice-kde4-l10n/distinfo index cb01393d41bc..1f4b8ea018a8 100644 --- a/ukrainian/koffice-kde4-l10n/distinfo +++ b/ukrainian/koffice-kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = a31dc3319a452ae7d2d689ac50a73bb0 -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = e334bf34f8ec3730d7c998e1462ce79ba0a97d12378ce92504c3c202028520fe -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.2.tar.bz2) = 351685 +MD5 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = dcab018c147831f47543b082f1beb5a5 +SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 72dfc1f6e60ffb62d81f390e19850dfee6a51ab5b133be00bca823d5354f3355 +SIZE (KDE/kde-i18n/koffice-l10n-uk-1.6.1.tar.bz2) = 369593 diff --git a/ukrainian/koffice-kde4-l10n/pkg-plist b/ukrainian/koffice-kde4-l10n/pkg-plist index 9e7a5cb201d0..d5a4f47594c7 100644 --- a/ukrainian/koffice-kde4-l10n/pkg-plist +++ b/ukrainian/koffice-kde4-l10n/pkg-plist @@ -2,6 +2,7 @@ share/locale/uk/LC_MESSAGES/desktop_koffice.mo share/locale/uk/LC_MESSAGES/example.mo share/locale/uk/LC_MESSAGES/karbon.mo share/locale/uk/LC_MESSAGES/kchart.mo +share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kexi.mo share/locale/uk/LC_MESSAGES/kfile_abiword.mo share/locale/uk/LC_MESSAGES/kfile_gnumeric.mo diff --git a/vietnamese/kde3-i18n/distinfo b/vietnamese/kde3-i18n/distinfo index 0672667a1410..596075765206 100644 --- a/vietnamese/kde3-i18n/distinfo +++ b/vietnamese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-vi-3.5.4.tar.bz2) = 82e439fb5962cf39673a0ed35a06ab45 -SHA256 (KDE/kde-i18n/kde-i18n-vi-3.5.4.tar.bz2) = aa6b018b2b6e50bed2314fe3ba928cc16050b6a5c8f72efb6fac58702ec46866 -SIZE (KDE/kde-i18n/kde-i18n-vi-3.5.4.tar.bz2) = 901641 +MD5 (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = d7356301309e566eff3fb036c994ca5a +SHA256 (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = 18b19da93c4a855acfaa7c123365bf8d2c59be54622b8b9260ddc95decd67145 +SIZE (KDE/kde-i18n/kde-i18n-vi-3.5.5.tar.bz2) = 913961 diff --git a/www/kdewebdev/distinfo b/www/kdewebdev/distinfo index b412b28f2598..3cea54b05355 100644 --- a/www/kdewebdev/distinfo +++ b/www/kdewebdev/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.4.tar.bz2) = 310a40555c089e88cc5ff7620a89b444 -SHA256 (KDE/kdewebdev-3.5.4.tar.bz2) = cb09dfde99b37ae3a31a318f41106aa2f048476ca497b7fa8e0e962a04bb6465 -SIZE (KDE/kdewebdev-3.5.4.tar.bz2) = 6015859 +MD5 (KDE/kdewebdev-3.5.5.tar.bz2) = d0655fd0286607f4726a82db96f00da3 +SHA256 (KDE/kdewebdev-3.5.5.tar.bz2) = 3dcb8be41a1499532ef3e60fd292638e147b91882bf3d9cf48b83ed0b8bc36b3 +SIZE (KDE/kdewebdev-3.5.5.tar.bz2) = 6046994 diff --git a/www/kdewebdev/pkg-plist b/www/kdewebdev/pkg-plist index a4eb44fd8ec6..197cb398e559 100644 --- a/www/kdewebdev/pkg-plist +++ b/www/kdewebdev/pkg-plist @@ -51,6 +51,7 @@ share/applnk/.hidden/kmdr-executor.desktop share/apps/kafkapart/entities share/apps/kafkapart/pics/comment.png share/apps/kafkapart/pics/php.png +share/apps/katepart/syntax/kommander.xml share/apps/kfilereplace/kfilereplaceui.rc share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/back.png share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/backup_option.png diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index b412b28f2598..3cea54b05355 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.4.tar.bz2) = 310a40555c089e88cc5ff7620a89b444 -SHA256 (KDE/kdewebdev-3.5.4.tar.bz2) = cb09dfde99b37ae3a31a318f41106aa2f048476ca497b7fa8e0e962a04bb6465 -SIZE (KDE/kdewebdev-3.5.4.tar.bz2) = 6015859 +MD5 (KDE/kdewebdev-3.5.5.tar.bz2) = d0655fd0286607f4726a82db96f00da3 +SHA256 (KDE/kdewebdev-3.5.5.tar.bz2) = 3dcb8be41a1499532ef3e60fd292638e147b91882bf3d9cf48b83ed0b8bc36b3 +SIZE (KDE/kdewebdev-3.5.5.tar.bz2) = 6046994 diff --git a/www/kdewebdev4/pkg-plist b/www/kdewebdev4/pkg-plist index a4eb44fd8ec6..197cb398e559 100644 --- a/www/kdewebdev4/pkg-plist +++ b/www/kdewebdev4/pkg-plist @@ -51,6 +51,7 @@ share/applnk/.hidden/kmdr-executor.desktop share/apps/kafkapart/entities share/apps/kafkapart/pics/comment.png share/apps/kafkapart/pics/php.png +share/apps/katepart/syntax/kommander.xml share/apps/kfilereplace/kfilereplaceui.rc share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/back.png share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/backup_option.png diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index 810dc3cc14dc..ce986c982809 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.4.tar.bz2) = f959e936d05697ac6b1a0b066632b2fd -SHA256 (KDE/kdetoys-3.5.4.tar.bz2) = bac3cfd2cf51d625f4df19d83ceb3a0cf25641fb0941a5c983d0b47659fe183b -SIZE (KDE/kdetoys-3.5.4.tar.bz2) = 3169543 +MD5 (KDE/kdetoys-3.5.5.tar.bz2) = 2b03fd068209cf324396b75334f39aba +SHA256 (KDE/kdetoys-3.5.5.tar.bz2) = eedd713a6478509cd0583fcbb27921de21f7af5ecab7f2141479421a9577411c +SIZE (KDE/kdetoys-3.5.5.tar.bz2) = 3178385 diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index 810dc3cc14dc..ce986c982809 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.4.tar.bz2) = f959e936d05697ac6b1a0b066632b2fd -SHA256 (KDE/kdetoys-3.5.4.tar.bz2) = bac3cfd2cf51d625f4df19d83ceb3a0cf25641fb0941a5c983d0b47659fe183b -SIZE (KDE/kdetoys-3.5.4.tar.bz2) = 3169543 +MD5 (KDE/kdetoys-3.5.5.tar.bz2) = 2b03fd068209cf324396b75334f39aba +SHA256 (KDE/kdetoys-3.5.5.tar.bz2) = eedd713a6478509cd0583fcbb27921de21f7af5ecab7f2141479421a9577411c +SIZE (KDE/kdetoys-3.5.5.tar.bz2) = 3178385 diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index 438c8d98fed1..4532be6a936e 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdeartwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11-themes kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -33,13 +32,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/xscreensaver) +.if exists(${X11BASE}/bin/xscreensaver) WITH_XS= yes -.endif # exists(${LOCALBASE}/bin/xscreensaver) +.endif # exists(${X11BASE}/bin/xscreensaver) -.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop) +.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop) WITH_XSGNOME= yes -.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet) +.endif # exists(${X11BASE}/bin/screensaver-properties-capplet) .if defined(WITH_XS) && !defined(WITH_XSGNOME) RUN_DEPENDS+= kxsconfig:${PORTSDIR}/x11/xscreensaver-kde diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo index 02d405956dc0..b32d6fb7c8d5 100644 --- a/x11-themes/kdeartwork3/distinfo +++ b/x11-themes/kdeartwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40 -SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d -SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390 +MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c +SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 +SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist index e881e5595d07..6d17b879cca0 100644 --- a/x11-themes/kdeartwork3/pkg-plist +++ b/x11-themes/kdeartwork3/pkg-plist @@ -2219,6 +2219,7 @@ share/icons/kdeclassic/16x16/actions/series.png share/icons/kdeclassic/16x16/actions/servicenew_kdevelop.png share/icons/kdeclassic/16x16/actions/share.png share/icons/kdeclassic/16x16/actions/shear.png +share/icons/kdeclassic/16x16/actions/show_side_panel.png share/icons/kdeclassic/16x16/actions/show_table_column.png share/icons/kdeclassic/16x16/actions/show_table_row.png share/icons/kdeclassic/16x16/actions/signature.png @@ -2246,6 +2247,7 @@ share/icons/kdeclassic/16x16/actions/tab_left.png share/icons/kdeclassic/16x16/actions/tab_new.png share/icons/kdeclassic/16x16/actions/tab_new_bg.png share/icons/kdeclassic/16x16/actions/tab_remove.png +share/icons/kdeclassic/16x16/actions/tab_remove_other.png share/icons/kdeclassic/16x16/actions/tab_right.png share/icons/kdeclassic/16x16/actions/targetnew_kdevelop.png share/icons/kdeclassic/16x16/actions/tcenteralign.png @@ -2287,6 +2289,9 @@ share/icons/kdeclassic/16x16/actions/vertical_text.png share/icons/kdeclassic/16x16/actions/view_bottom.png share/icons/kdeclassic/16x16/actions/view_choose.png share/icons/kdeclassic/16x16/actions/view_detailed.png +share/icons/kdeclassic/16x16/actions/view_fit_height.png +share/icons/kdeclassic/16x16/actions/view_fit_width.png +share/icons/kdeclassic/16x16/actions/view_fit_window.png share/icons/kdeclassic/16x16/actions/view_icon.png share/icons/kdeclassic/16x16/actions/view_left_right.png share/icons/kdeclassic/16x16/actions/view_multicolumn.png @@ -2576,6 +2581,7 @@ share/icons/kdeclassic/16x16/apps/panel_settings.png share/icons/kdeclassic/16x16/apps/password.png share/icons/kdeclassic/16x16/apps/penguin.png share/icons/kdeclassic/16x16/apps/personal.png +share/icons/kdeclassic/16x16/apps/photobook.png share/icons/kdeclassic/16x16/apps/plan.png share/icons/kdeclassic/16x16/apps/printmgr.png share/icons/kdeclassic/16x16/apps/proxy.png @@ -3344,6 +3350,7 @@ share/icons/kdeclassic/22x22/actions/shadowR.png share/icons/kdeclassic/22x22/actions/shadowRB.png share/icons/kdeclassic/22x22/actions/shadowRU.png share/icons/kdeclassic/22x22/actions/shadowU.png +share/icons/kdeclassic/22x22/actions/show_side_panel.png share/icons/kdeclassic/22x22/actions/show_table_column.png share/icons/kdeclassic/22x22/actions/show_table_row.png share/icons/kdeclassic/22x22/actions/showmenu.png @@ -3371,6 +3378,7 @@ share/icons/kdeclassic/22x22/actions/tab_duplicate.png share/icons/kdeclassic/22x22/actions/tab_new.png share/icons/kdeclassic/22x22/actions/tab_new_bg.png share/icons/kdeclassic/22x22/actions/tab_remove.png +share/icons/kdeclassic/22x22/actions/tab_remove_other.png share/icons/kdeclassic/22x22/actions/text.png share/icons/kdeclassic/22x22/actions/text_block.png share/icons/kdeclassic/22x22/actions/text_bold.png @@ -3424,6 +3432,9 @@ share/icons/kdeclassic/22x22/actions/vertical_text.png share/icons/kdeclassic/22x22/actions/view_bottom.png share/icons/kdeclassic/22x22/actions/view_choose.png share/icons/kdeclassic/22x22/actions/view_detailed.png +share/icons/kdeclassic/22x22/actions/view_fit_height.png +share/icons/kdeclassic/22x22/actions/view_fit_width.png +share/icons/kdeclassic/22x22/actions/view_fit_window.png share/icons/kdeclassic/22x22/actions/view_icon.png share/icons/kdeclassic/22x22/actions/view_left_right.png share/icons/kdeclassic/22x22/actions/view_multicolumn.png @@ -3452,7 +3463,9 @@ share/icons/kdeclassic/22x22/apps/kivio.png share/icons/kdeclassic/22x22/apps/konqsidebar_mediaplayer.png share/icons/kdeclassic/22x22/apps/kpilot.png share/icons/kdeclassic/22x22/apps/kugar.png +share/icons/kdeclassic/22x22/apps/kview.png share/icons/kdeclassic/22x22/apps/noatun.png +share/icons/kdeclassic/22x22/apps/photobook.png share/icons/kdeclassic/22x22/mimetypes/empty.png share/icons/kdeclassic/22x22/mimetypes/karbon_karbon.png share/icons/kdeclassic/22x22/mimetypes/kchart_chrt.png @@ -3674,6 +3687,7 @@ share/icons/kdeclassic/32x32/actions/rsub.png share/icons/kdeclassic/32x32/actions/rsup.png share/icons/kdeclassic/32x32/actions/run.png share/icons/kdeclassic/32x32/actions/share.png +share/icons/kdeclassic/32x32/actions/show_side_panel.png share/icons/kdeclassic/32x32/actions/signature.png share/icons/kdeclassic/32x32/actions/sort_az.png share/icons/kdeclassic/32x32/actions/spellcheck.png @@ -3689,6 +3703,7 @@ share/icons/kdeclassic/32x32/actions/tab_duplicate.png share/icons/kdeclassic/32x32/actions/tab_new.png share/icons/kdeclassic/32x32/actions/tab_new_bg.png share/icons/kdeclassic/32x32/actions/tab_remove.png +share/icons/kdeclassic/32x32/actions/tab_remove_other.png share/icons/kdeclassic/32x32/actions/text_block.png share/icons/kdeclassic/32x32/actions/text_bold.png share/icons/kdeclassic/32x32/actions/text_center.png @@ -3708,6 +3723,9 @@ share/icons/kdeclassic/32x32/actions/up.png share/icons/kdeclassic/32x32/actions/view_bottom.png share/icons/kdeclassic/32x32/actions/view_choose.png share/icons/kdeclassic/32x32/actions/view_detailed.png +share/icons/kdeclassic/32x32/actions/view_fit_height.png +share/icons/kdeclassic/32x32/actions/view_fit_width.png +share/icons/kdeclassic/32x32/actions/view_fit_window.png share/icons/kdeclassic/32x32/actions/view_icon.png share/icons/kdeclassic/32x32/actions/view_left_right.png share/icons/kdeclassic/32x32/actions/view_multicolumn.png @@ -3972,6 +3990,7 @@ share/icons/kdeclassic/32x32/apps/package_wordprocessing.png share/icons/kdeclassic/32x32/apps/password.png share/icons/kdeclassic/32x32/apps/penguin.png share/icons/kdeclassic/32x32/apps/personal.png +share/icons/kdeclassic/32x32/apps/photobook.png share/icons/kdeclassic/32x32/apps/plan.png share/icons/kdeclassic/32x32/apps/printmgr.png share/icons/kdeclassic/32x32/apps/proxy.png diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile index 438c8d98fed1..4532be6a936e 100644 --- a/x11-themes/kdeartwork4/Makefile +++ b/x11-themes/kdeartwork4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdeartwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11-themes kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -33,13 +32,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/xscreensaver) +.if exists(${X11BASE}/bin/xscreensaver) WITH_XS= yes -.endif # exists(${LOCALBASE}/bin/xscreensaver) +.endif # exists(${X11BASE}/bin/xscreensaver) -.if exists(${LOCALBASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop) +.if exists(${X11BASE}/share/gnome/control-center-2.0/capplets/screensaver-properties.desktop) WITH_XSGNOME= yes -.endif # exists(${LOCALBASE}/bin/screensaver-properties-capplet) +.endif # exists(${X11BASE}/bin/screensaver-properties-capplet) .if defined(WITH_XS) && !defined(WITH_XSGNOME) RUN_DEPENDS+= kxsconfig:${PORTSDIR}/x11/xscreensaver-kde diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo index 02d405956dc0..b32d6fb7c8d5 100644 --- a/x11-themes/kdeartwork4/distinfo +++ b/x11-themes/kdeartwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40 -SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d -SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390 +MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c +SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 +SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist index e881e5595d07..6d17b879cca0 100644 --- a/x11-themes/kdeartwork4/pkg-plist +++ b/x11-themes/kdeartwork4/pkg-plist @@ -2219,6 +2219,7 @@ share/icons/kdeclassic/16x16/actions/series.png share/icons/kdeclassic/16x16/actions/servicenew_kdevelop.png share/icons/kdeclassic/16x16/actions/share.png share/icons/kdeclassic/16x16/actions/shear.png +share/icons/kdeclassic/16x16/actions/show_side_panel.png share/icons/kdeclassic/16x16/actions/show_table_column.png share/icons/kdeclassic/16x16/actions/show_table_row.png share/icons/kdeclassic/16x16/actions/signature.png @@ -2246,6 +2247,7 @@ share/icons/kdeclassic/16x16/actions/tab_left.png share/icons/kdeclassic/16x16/actions/tab_new.png share/icons/kdeclassic/16x16/actions/tab_new_bg.png share/icons/kdeclassic/16x16/actions/tab_remove.png +share/icons/kdeclassic/16x16/actions/tab_remove_other.png share/icons/kdeclassic/16x16/actions/tab_right.png share/icons/kdeclassic/16x16/actions/targetnew_kdevelop.png share/icons/kdeclassic/16x16/actions/tcenteralign.png @@ -2287,6 +2289,9 @@ share/icons/kdeclassic/16x16/actions/vertical_text.png share/icons/kdeclassic/16x16/actions/view_bottom.png share/icons/kdeclassic/16x16/actions/view_choose.png share/icons/kdeclassic/16x16/actions/view_detailed.png +share/icons/kdeclassic/16x16/actions/view_fit_height.png +share/icons/kdeclassic/16x16/actions/view_fit_width.png +share/icons/kdeclassic/16x16/actions/view_fit_window.png share/icons/kdeclassic/16x16/actions/view_icon.png share/icons/kdeclassic/16x16/actions/view_left_right.png share/icons/kdeclassic/16x16/actions/view_multicolumn.png @@ -2576,6 +2581,7 @@ share/icons/kdeclassic/16x16/apps/panel_settings.png share/icons/kdeclassic/16x16/apps/password.png share/icons/kdeclassic/16x16/apps/penguin.png share/icons/kdeclassic/16x16/apps/personal.png +share/icons/kdeclassic/16x16/apps/photobook.png share/icons/kdeclassic/16x16/apps/plan.png share/icons/kdeclassic/16x16/apps/printmgr.png share/icons/kdeclassic/16x16/apps/proxy.png @@ -3344,6 +3350,7 @@ share/icons/kdeclassic/22x22/actions/shadowR.png share/icons/kdeclassic/22x22/actions/shadowRB.png share/icons/kdeclassic/22x22/actions/shadowRU.png share/icons/kdeclassic/22x22/actions/shadowU.png +share/icons/kdeclassic/22x22/actions/show_side_panel.png share/icons/kdeclassic/22x22/actions/show_table_column.png share/icons/kdeclassic/22x22/actions/show_table_row.png share/icons/kdeclassic/22x22/actions/showmenu.png @@ -3371,6 +3378,7 @@ share/icons/kdeclassic/22x22/actions/tab_duplicate.png share/icons/kdeclassic/22x22/actions/tab_new.png share/icons/kdeclassic/22x22/actions/tab_new_bg.png share/icons/kdeclassic/22x22/actions/tab_remove.png +share/icons/kdeclassic/22x22/actions/tab_remove_other.png share/icons/kdeclassic/22x22/actions/text.png share/icons/kdeclassic/22x22/actions/text_block.png share/icons/kdeclassic/22x22/actions/text_bold.png @@ -3424,6 +3432,9 @@ share/icons/kdeclassic/22x22/actions/vertical_text.png share/icons/kdeclassic/22x22/actions/view_bottom.png share/icons/kdeclassic/22x22/actions/view_choose.png share/icons/kdeclassic/22x22/actions/view_detailed.png +share/icons/kdeclassic/22x22/actions/view_fit_height.png +share/icons/kdeclassic/22x22/actions/view_fit_width.png +share/icons/kdeclassic/22x22/actions/view_fit_window.png share/icons/kdeclassic/22x22/actions/view_icon.png share/icons/kdeclassic/22x22/actions/view_left_right.png share/icons/kdeclassic/22x22/actions/view_multicolumn.png @@ -3452,7 +3463,9 @@ share/icons/kdeclassic/22x22/apps/kivio.png share/icons/kdeclassic/22x22/apps/konqsidebar_mediaplayer.png share/icons/kdeclassic/22x22/apps/kpilot.png share/icons/kdeclassic/22x22/apps/kugar.png +share/icons/kdeclassic/22x22/apps/kview.png share/icons/kdeclassic/22x22/apps/noatun.png +share/icons/kdeclassic/22x22/apps/photobook.png share/icons/kdeclassic/22x22/mimetypes/empty.png share/icons/kdeclassic/22x22/mimetypes/karbon_karbon.png share/icons/kdeclassic/22x22/mimetypes/kchart_chrt.png @@ -3674,6 +3687,7 @@ share/icons/kdeclassic/32x32/actions/rsub.png share/icons/kdeclassic/32x32/actions/rsup.png share/icons/kdeclassic/32x32/actions/run.png share/icons/kdeclassic/32x32/actions/share.png +share/icons/kdeclassic/32x32/actions/show_side_panel.png share/icons/kdeclassic/32x32/actions/signature.png share/icons/kdeclassic/32x32/actions/sort_az.png share/icons/kdeclassic/32x32/actions/spellcheck.png @@ -3689,6 +3703,7 @@ share/icons/kdeclassic/32x32/actions/tab_duplicate.png share/icons/kdeclassic/32x32/actions/tab_new.png share/icons/kdeclassic/32x32/actions/tab_new_bg.png share/icons/kdeclassic/32x32/actions/tab_remove.png +share/icons/kdeclassic/32x32/actions/tab_remove_other.png share/icons/kdeclassic/32x32/actions/text_block.png share/icons/kdeclassic/32x32/actions/text_bold.png share/icons/kdeclassic/32x32/actions/text_center.png @@ -3708,6 +3723,9 @@ share/icons/kdeclassic/32x32/actions/up.png share/icons/kdeclassic/32x32/actions/view_bottom.png share/icons/kdeclassic/32x32/actions/view_choose.png share/icons/kdeclassic/32x32/actions/view_detailed.png +share/icons/kdeclassic/32x32/actions/view_fit_height.png +share/icons/kdeclassic/32x32/actions/view_fit_width.png +share/icons/kdeclassic/32x32/actions/view_fit_window.png share/icons/kdeclassic/32x32/actions/view_icon.png share/icons/kdeclassic/32x32/actions/view_left_right.png share/icons/kdeclassic/32x32/actions/view_multicolumn.png @@ -3972,6 +3990,7 @@ share/icons/kdeclassic/32x32/apps/package_wordprocessing.png share/icons/kdeclassic/32x32/apps/password.png share/icons/kdeclassic/32x32/apps/penguin.png share/icons/kdeclassic/32x32/apps/personal.png +share/icons/kdeclassic/32x32/apps/photobook.png share/icons/kdeclassic/32x32/apps/plan.png share/icons/kdeclassic/32x32/apps/printmgr.png share/icons/kdeclassic/32x32/apps/proxy.png diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 6ada997112de..580171ab6db5 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.3.6 -PORTREVISION= 3 +PORTREVISION= 2 CATEGORIES?= x11-toolkits ipv6 MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} diff --git a/x11-wm/kompmgr/distinfo b/x11-wm/kompmgr/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11-wm/kompmgr/distinfo +++ b/x11-wm/kompmgr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kde4-baseapps/files/patch-kio_media b/x11/kde4-baseapps/files/extrapatch-kio_media index 144c7914a0e5..ab1a03b094cb 100644 --- a/x11/kde4-baseapps/files/patch-kio_media +++ b/x11/kde4-baseapps/files/extrapatch-kio_media @@ -1,6 +1,6 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 @@ -122,8 +122,7 @@ DATA = $(kde_services_DATA) ETAGS = etags @@ -41,8 +41,8 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 @@ -253,6 +253,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -73,25 +73,26 @@ diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/mana load(); } diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ Name[he]=×”×ª×§× ×™× Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz Name[is]=Geymslumiðlar Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ Name[mk]=Медиуми за податоци Name[ms]=Media Storan Name[nb]=Lagringsenheter @@ -100,7 +101,7 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[nl]=Opslagapparaten Name[nn]=Lagringsmedium Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ +@@ -54,7 +53,6 @@ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… Name[rw]=Uburyo bwo Kubika Name[se]=Vurkenmedia @@ -108,33 +109,21 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[sl]=Nosilci za shranjevanje Name[sr]=Складишни медијуми Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage Comment[fy]=Opslachmedia ynstelle Comment[ga]=Cumraigh Meáin Stórála Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu Comment[hu]=A tárolóeszközök beállÃtása Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក +@@ -98,16 +94,15 @@ Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius Comment[mk]=Конфигурирајте ги медиумите за податоци Comment[nb]=Sett opp lagringsmedier @@ -143,7 +132,9 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[nl]=Opslagmedia instellen Comment[nn]=Set opp lagringsmedium Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento Comment[pt_BR]=Configura as mÃdias de armazenamento Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Comment[se]=Heivet vurkenmediaid @@ -151,45 +142,32 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[sl]=Nastavitve nosilcev za shranjevanje Comment[sr]=Подешавање медијума за Ñкладиштење Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo -Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp --- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 @@ -174,8 +174,8 @@ ActionListBoxItem *action_item = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); @@ -197,7 +175,7 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not - NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) + NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) { ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); @@ -207,13 +185,13 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not NotifierServiceAction *action; - action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) { m_settings.deleteAction( action ); updateListBox(); diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 @@ -248,6 +248,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -223,30 +201,17 @@ diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе Name[rw]=Amakuru y'igitangazamakuru Name[se]=MediumdieÄ‘ut @@ -254,19 +219,11 @@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-p Name[sl]=Informacije o mediju Name[sr]=Информације о медијуму Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ +@@ -63,4 +61,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 @@ -300,8 +257,8 @@ diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile- if ( !reply.isValid() ) { diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 @@ -250,6 +250,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -443,8 +400,8 @@ diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp mp_mounting = 0L; diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 @@ -284,6 +284,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -454,9 +411,46 @@ diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ if ( mount->mountType() == "swap" || mount->mountType() == "tmpfs" || mount->mountType() == "sysfs" @@ -464,19 +458,35 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.contains(mtabEntry)) { - new_mtabIds += m_mtabEntries[mtabEntry]; - continue; - } -- ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + QString id = generateId(dev, mp); new_mtabIds+=id; - m_mtabEntries[mtabEntry] = id; @@ -489,20 +499,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag m_mediaList.changeMediumState(id, true, false, mime, icon, label); } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); +@@ -237,10 +211,6 @@ QString mp = medium->mountPoint(); QString fs = medium->fsType(); -- + - - QString mtabEntry = dev + "*" + mp + "*" + fs; - m_mtabEntries.remove(mtabEntry); - +- QString mime, icon, label; guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 @@ -23,7 +23,6 @@ #include <qobject.h> @@ -511,16 +529,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager #ifdef Q_OS_FREEBSD #include <qtimer.h> -@@ -54,7 +53,6 @@ +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ bool m_networkSharesOnly; QStringList m_mtabIds; - QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; QStringList m_fstabIds; #ifdef Q_OS_FREEBSD QTimer m_mtabTimer; diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 @@ -21,16 +21,9 @@ @@ -539,7 +569,7 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ +@@ -39,1177 +32,615 @@ static HALBackend* s_HALBackend; /* A macro function to convert HAL string properties to QString */ @@ -654,6 +684,14 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager - DBusError error; - dbus_error_init(&error); - dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- - dbus_bus_register(dbus_connection, &error); - - if (dbus_error_is_set(&error)) { @@ -2365,10 +2403,80 @@ diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/h }; #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ +@@ -43,287 +43,201 @@ MediaManager::MediaManager(const QCString &obj) : KDEDModule(obj), m_dirNotify(m_mediaList) { @@ -2417,15 +2525,17 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - m_backends.remove( b ); - delete b; - } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; + while ( !m_backends.isEmpty() ) + { + BackendBase *b = m_backends.first(); + m_backends.remove( b ); + delete b; + } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; ++ + mp_removableBackend = 0L; #ifdef COMPILE_HALBACKEND @@ -2435,7 +2545,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - if (m_halbackend->InitHal()) - { - m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); - // No need to load something else... - m_mediaList.blockSignals(false); - return; @@ -2480,7 +2591,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag + } #endif //COMPILE_LINUXCDPOLLING -- m_backends.append( new FstabBackend(m_mediaList) ); +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); - m_mediaList.blockSignals(false); + m_backends.append( new FstabBackend(m_mediaList) ); + m_mediaList.blockSignals(false); @@ -2517,8 +2629,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag QStringList MediaManager::properties(const QString &name) { - const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - +- - if (!m) - { - KURL u(name); @@ -2561,7 +2672,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - else - return QStringList(); -} -- ++ const Medium *m = m_mediaList.findByName(name); + -QStringList MediaManager::mountoptions(const QString &name) -{ -#ifdef COMPILE_HALBACKEND @@ -2591,7 +2703,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->mount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); -#endif -} - @@ -2602,7 +2716,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->unmount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); -#endif + if (m!=0L) + { @@ -2764,36 +2880,23 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ + Name[et]=KDED andmekandjate haldur Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED Name[fi]=KDED-tallennusmedianhallinta Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder + Name[fy]=KDEDED-mediabehearder Name[ga]=Bainisteoir Meán KDED Name[gl]=Xestor de Meios de KDED -Name[he]=×ž× ×”×œ המדיה של KDED Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija + Name[hr]=KDED upravitelj medija Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ +@@ -45,7 +43,6 @@ Name[ru]=Управление подключаемыми уÑтройÑтвами Name[rw]=Mugenga Igihuza KDED Name[se]=KDED-mediagieÄ‘ahalli @@ -2801,28 +2904,18 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Name[sl]=Upravitelj medijev KDED Name[sr]=Менаџер медијума, KDED Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) -Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) @@ -2831,12 +2924,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ +@@ -103,7 +98,6 @@ Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) @@ -2844,31 +2932,24 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ +@@ -122,4 +116,3 @@ X-KDE-FactoryName=mediamanager X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true -X-KDE-Kded-phase=1 diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ +@@ -28,8 +28,6 @@ #include "removablebackend.h" #include "mediadirnotify.h" -class HALBackend; +-class FstabBackend; class MediaManager : public KDEDModule { -@@ -41,12 +40,6 @@ +@@ -42,12 +40,6 @@ k_dcop: QStringList fullList(); QStringList properties(const QString &name); @@ -2881,17 +2962,19 @@ diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); -@@ -81,7 +74,6 @@ +@@ -82,9 +74,7 @@ MediaList m_mediaList; QValueList<BackendBase*> m_backends; RemovableBackend *mp_removableBackend; - HALBackend *m_halbackend; MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; }; + #endif diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 @@ -254,6 +254,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -2901,9 +2984,20 @@ diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/ LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 +++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " << allowNotification << ")" << endl; @@ -2915,7 +3009,7 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot // Update user activity timestamp, otherwise the notification dialog will be shown // in the background due to focus stealing prevention. Entering a new media can // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ +@@ -103,11 +95,11 @@ { QString mimetype = medium.mimetype(); @@ -2930,31 +3024,27 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot { return false; diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه Name[fi]=Mediahuomautin Name[fr]=Démon de notifications des média Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima Name[hu]=LemezfigyelÅ‘ szolgáltatás Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba +@@ -34,12 +32,10 @@ Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach Name[pt]=Servidor de Notificação de Dispositivos Name[pt_BR]=Servidor de Notificação de Dispositivos Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв @@ -2962,33 +3052,32 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Name[sl]=Demon za obveÅ¡Äanje o nosilcih Name[sr]=Демон за обавештења о медијумима Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser +@@ -47,7 +43,6 @@ Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº -Name[zh_TW]=媒體通知伺æœç¨‹å¼ Comment=A media plugged notifier Comment[af]='n Inpropbare media inkennissteller Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin Comment[fr]=Notification de connexion de média Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima +@@ -70,7 +64,7 @@ Comment[hu]=LemezérzékelÅ‘ Comment[is]=Tilkynnari um tengda miðla Comment[it]=Notifiche dei dispositivi attaccati -Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas Comment[mk]=ИзвеÑтување за приклучен медиум Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ +@@ -82,7 +76,6 @@ Comment[pt]=Um notificador ligado aos dispositivos Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв @@ -2996,16 +3085,29 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih Comment[sr]=Обавештавач о укљученим медијима Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -3015,15 +3117,17 @@ diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ Comment[it]=CD audio Comment[ja]=オーディオ CD Comment[km]=ស៊ីឌី​អូឌីយ៉ូ @@ -3031,34 +3135,27 @@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audi Comment[ms]=CD Audio Comment[nb]=Lyd-CD Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ Comment[km]=ស៊ីឌី​ទទ០Comment[lt]=TuÅ¡Äias CD Comment[lv]=TukÅ¡s CD @@ -3066,7 +3163,7 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[ms]=CD Kosong Comment[nb]=Tom CD Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый CD Comment[rw]=CD Itanditseho Comment[se]=Guorus CD @@ -3074,34 +3171,18 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[sl]=Prazen CD Comment[sr]=Празан CD Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ Comment[km]=ឌីវីឌី​ទទ០Comment[lt]=TuÅ¡Äias DVD Comment[lv]=TukÅ¡s DVD @@ -3109,7 +3190,7 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[ms]=DVD Kosong Comment[nb]=Tom DVD Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый DVD Comment[rw]=DVD Itanditseho Comment[se]=Guorus DVD @@ -3117,35 +3198,18 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[sl]=Prazen DVD Comment[sr]=Празан DVD Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera montada Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=ÄŒatnon govvenapperáhtta @@ -3153,35 +3217,18 @@ diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetyp Comment[sl]=Priklopljen fotoaparat Comment[sr]=Монтирана камера Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera desmontada Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=Gálgajuvvon govvenapperáhtta @@ -3189,168 +3236,90 @@ diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimet Comment[sl]=Odklopljen fotoaparat Comment[sr]=Демонтирана камера Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី Comment[lt]=DVD video diskas Comment[lv]=DVD Video Disks @@ -3358,7 +3327,14 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[ms]=Cakera Video DVD Comment[nb]=DVD-videoplate Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ Comment[rw]=Disiki Videwo DVD Comment[se]=DVD-videoskearru @@ -3366,140 +3342,73 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[sl]=DVD Video disk Comment[sr]=DVD видео диÑк Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto Comment[ru]=Камера Comment[rw]=Kamera Comment[se]=Govvanaperáhtta @@ -3507,34 +3416,25 @@ diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetype Comment[sl]=Fotoaparat Comment[sr]=Камера Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat Comment[ru]=Смонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwashyizwemo Comment[se]=ÄŒatnon garraskearrooassi @@ -3542,34 +3442,25 @@ diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen pogon trdega diska Comment[sr]=Монтирана партиција хард диÑка Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat Comment[ru]=Отмонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwakuwemo Comment[se]=Gálgajuvvon garraskearrooassi @@ -3577,48 +3468,25 @@ diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen pogon trdega diska Comment[sr]=Демонтирана партиција хард диÑка Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Montert delt NFS-ressurs Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Washyizwemo Comment[se]=ÄŒatnon NFS-resursa @@ -3626,48 +3494,25 @@ diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen vir NFS Comment[sr]=Монтирано NFS дељење Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Umontert delt NFS-ressurs Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Wakuwemo Comment[se]=Gálgajuvvon NFS-resursa @@ -3675,34 +3520,25 @@ diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen vir NFS Comment[sr]=Демонтирано NFS дељење Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat Comment[ru]=Смонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo Comment[se]=Čátnon sirdehahtti medium @@ -3710,34 +3546,25 @@ diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mime Comment[sl]=Priklopljen odstranljiv medij Comment[sr]=Монтиран уклоњиви медијум Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat Comment[ru]=Отмонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo Comment[se]=Gálgaduvvon sirdehahtti medium @@ -3745,78 +3572,42 @@ diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mi Comment[sl]=Odklopljen odstranljiv medij Comment[sr]=Демонтиран уклоњиви медијум Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ Comment[it]=Super video CD Comment[ja]=スーパービデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ @@ -3824,18 +3615,18 @@ diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.de Comment[ms]=CD Supervideo Comment[nb]=Super video CD Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ Comment[is]=VÃdeó CD Comment[ja]=ビデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ @@ -3843,51 +3634,31 @@ diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desk Comment[ms]=CD Video Comment[nds]=Video-CD Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ Comment[hu]=Leválasztott Zip-lemez Comment[is]=Aftengdur Zip diskur Comment[it]=Disco Zip non montato @@ -3896,23 +3667,9 @@ diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetype Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ Comment[lo]= ຫັງàºàº²àº¥àºµ Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 @@ -57,8 +57,8 @@ #>+ 1 kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) @@ -4027,7 +3784,7 @@ diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mo #include "kio_media_mounthelper.moc" diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 +++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,1063 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. @@ -5094,9 +4851,9 @@ diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugi -propertiespagegui.moc: propertiespagegui.h - $(MOC) propertiespagegui.h -o propertiespagegui.moc diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 +++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ +@@ -1,73 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service @@ -5108,16 +4865,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Name[el]=Σελίδα ιδιοτήτων μÎσων -Name[es]=Página de propiedades de medios -Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه -Name[fi]=Mediaominaisuudet -Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija -Name[hu]=MédiajellemzÅ‘k lap -Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione -Name[ja]=メディア属性ページ -Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling -Name[nds]=Medienegenschappen-Siet -Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika -Name[pt]=Página de Propriedades de Suportes FÃsicos -Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ -Name[sk]=Strana vlastnostà média -Name[sl]=Stran z lastnostmi nosilca -Name[sr]=Страна Ñа ÑвојÑтвима медијума @@ -5134,16 +4899,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης -Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje -Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن -Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä -Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja -Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához -Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio -Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン -Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror -Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen -Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania -Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem -Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем -Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia -Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev -Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању @@ -5995,8 +5768,8 @@ diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/pro - - diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -6006,71 +5779,32 @@ diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.i LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن Name[fi]=Poista turvallisesti Name[fr]=Enlever en toute sécurité -Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje Name[ga]=Bain Amach go Sábháilte Name[gl]=Eliminar de Maneira Segura Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ +@@ -46,7 +44,6 @@ Name[ru]=БезопаÑно извлечь Name[rw]=Gukuramo Neza Name[se]=DorvvoÅ¡laÅ¡ eretváldin @@ -6078,41 +5812,3 @@ diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/serv Name[sl]=Varno odstrani Name[sr]=Безбедно уклони Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kde4-baseapps/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kde4-baseapps/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde4-baseapps/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff b/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kde4-baseapps/files/patch-konsole_konsole-TECommon.h b/x11/kde4-baseapps/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kde4-baseapps/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff b/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kde4-runtime/files/patch-kio_media b/x11/kde4-runtime/files/extrapatch-kio_media index 144c7914a0e5..ab1a03b094cb 100644 --- a/x11/kde4-runtime/files/patch-kio_media +++ b/x11/kde4-runtime/files/extrapatch-kio_media @@ -1,6 +1,6 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 @@ -122,8 +122,7 @@ DATA = $(kde_services_DATA) ETAGS = etags @@ -41,8 +41,8 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 @@ -253,6 +253,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -73,25 +73,26 @@ diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/mana load(); } diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ Name[he]=×”×ª×§× ×™× Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz Name[is]=Geymslumiðlar Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ Name[mk]=Медиуми за податоци Name[ms]=Media Storan Name[nb]=Lagringsenheter @@ -100,7 +101,7 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[nl]=Opslagapparaten Name[nn]=Lagringsmedium Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ +@@ -54,7 +53,6 @@ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… Name[rw]=Uburyo bwo Kubika Name[se]=Vurkenmedia @@ -108,33 +109,21 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[sl]=Nosilci za shranjevanje Name[sr]=Складишни медијуми Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage Comment[fy]=Opslachmedia ynstelle Comment[ga]=Cumraigh Meáin Stórála Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu Comment[hu]=A tárolóeszközök beállÃtása Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក +@@ -98,16 +94,15 @@ Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius Comment[mk]=Конфигурирајте ги медиумите за податоци Comment[nb]=Sett opp lagringsmedier @@ -143,7 +132,9 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[nl]=Opslagmedia instellen Comment[nn]=Set opp lagringsmedium Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento Comment[pt_BR]=Configura as mÃdias de armazenamento Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Comment[se]=Heivet vurkenmediaid @@ -151,45 +142,32 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[sl]=Nastavitve nosilcev za shranjevanje Comment[sr]=Подешавање медијума за Ñкладиштење Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo -Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp --- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 @@ -174,8 +174,8 @@ ActionListBoxItem *action_item = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); @@ -197,7 +175,7 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not - NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) + NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) { ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); @@ -207,13 +185,13 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not NotifierServiceAction *action; - action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) { m_settings.deleteAction( action ); updateListBox(); diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 @@ -248,6 +248,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -223,30 +201,17 @@ diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе Name[rw]=Amakuru y'igitangazamakuru Name[se]=MediumdieÄ‘ut @@ -254,19 +219,11 @@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-p Name[sl]=Informacije o mediju Name[sr]=Информације о медијуму Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ +@@ -63,4 +61,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 @@ -300,8 +257,8 @@ diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile- if ( !reply.isValid() ) { diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 @@ -250,6 +250,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -443,8 +400,8 @@ diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp mp_mounting = 0L; diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 @@ -284,6 +284,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -454,9 +411,46 @@ diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ if ( mount->mountType() == "swap" || mount->mountType() == "tmpfs" || mount->mountType() == "sysfs" @@ -464,19 +458,35 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.contains(mtabEntry)) { - new_mtabIds += m_mtabEntries[mtabEntry]; - continue; - } -- ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + QString id = generateId(dev, mp); new_mtabIds+=id; - m_mtabEntries[mtabEntry] = id; @@ -489,20 +499,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag m_mediaList.changeMediumState(id, true, false, mime, icon, label); } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); +@@ -237,10 +211,6 @@ QString mp = medium->mountPoint(); QString fs = medium->fsType(); -- + - - QString mtabEntry = dev + "*" + mp + "*" + fs; - m_mtabEntries.remove(mtabEntry); - +- QString mime, icon, label; guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 @@ -23,7 +23,6 @@ #include <qobject.h> @@ -511,16 +529,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager #ifdef Q_OS_FREEBSD #include <qtimer.h> -@@ -54,7 +53,6 @@ +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ bool m_networkSharesOnly; QStringList m_mtabIds; - QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; QStringList m_fstabIds; #ifdef Q_OS_FREEBSD QTimer m_mtabTimer; diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 @@ -21,16 +21,9 @@ @@ -539,7 +569,7 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ +@@ -39,1177 +32,615 @@ static HALBackend* s_HALBackend; /* A macro function to convert HAL string properties to QString */ @@ -654,6 +684,14 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager - DBusError error; - dbus_error_init(&error); - dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- - dbus_bus_register(dbus_connection, &error); - - if (dbus_error_is_set(&error)) { @@ -2365,10 +2403,80 @@ diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/h }; #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ +@@ -43,287 +43,201 @@ MediaManager::MediaManager(const QCString &obj) : KDEDModule(obj), m_dirNotify(m_mediaList) { @@ -2417,15 +2525,17 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - m_backends.remove( b ); - delete b; - } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; + while ( !m_backends.isEmpty() ) + { + BackendBase *b = m_backends.first(); + m_backends.remove( b ); + delete b; + } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; ++ + mp_removableBackend = 0L; #ifdef COMPILE_HALBACKEND @@ -2435,7 +2545,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - if (m_halbackend->InitHal()) - { - m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); - // No need to load something else... - m_mediaList.blockSignals(false); - return; @@ -2480,7 +2591,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag + } #endif //COMPILE_LINUXCDPOLLING -- m_backends.append( new FstabBackend(m_mediaList) ); +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); - m_mediaList.blockSignals(false); + m_backends.append( new FstabBackend(m_mediaList) ); + m_mediaList.blockSignals(false); @@ -2517,8 +2629,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag QStringList MediaManager::properties(const QString &name) { - const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - +- - if (!m) - { - KURL u(name); @@ -2561,7 +2672,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - else - return QStringList(); -} -- ++ const Medium *m = m_mediaList.findByName(name); + -QStringList MediaManager::mountoptions(const QString &name) -{ -#ifdef COMPILE_HALBACKEND @@ -2591,7 +2703,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->mount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); -#endif -} - @@ -2602,7 +2716,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->unmount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); -#endif + if (m!=0L) + { @@ -2764,36 +2880,23 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ + Name[et]=KDED andmekandjate haldur Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED Name[fi]=KDED-tallennusmedianhallinta Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder + Name[fy]=KDEDED-mediabehearder Name[ga]=Bainisteoir Meán KDED Name[gl]=Xestor de Meios de KDED -Name[he]=×ž× ×”×œ המדיה של KDED Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija + Name[hr]=KDED upravitelj medija Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ +@@ -45,7 +43,6 @@ Name[ru]=Управление подключаемыми уÑтройÑтвами Name[rw]=Mugenga Igihuza KDED Name[se]=KDED-mediagieÄ‘ahalli @@ -2801,28 +2904,18 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Name[sl]=Upravitelj medijev KDED Name[sr]=Менаџер медијума, KDED Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) -Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) @@ -2831,12 +2924,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ +@@ -103,7 +98,6 @@ Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) @@ -2844,31 +2932,24 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ +@@ -122,4 +116,3 @@ X-KDE-FactoryName=mediamanager X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true -X-KDE-Kded-phase=1 diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ +@@ -28,8 +28,6 @@ #include "removablebackend.h" #include "mediadirnotify.h" -class HALBackend; +-class FstabBackend; class MediaManager : public KDEDModule { -@@ -41,12 +40,6 @@ +@@ -42,12 +40,6 @@ k_dcop: QStringList fullList(); QStringList properties(const QString &name); @@ -2881,17 +2962,19 @@ diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); -@@ -81,7 +74,6 @@ +@@ -82,9 +74,7 @@ MediaList m_mediaList; QValueList<BackendBase*> m_backends; RemovableBackend *mp_removableBackend; - HALBackend *m_halbackend; MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; }; + #endif diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 @@ -254,6 +254,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -2901,9 +2984,20 @@ diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/ LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 +++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " << allowNotification << ")" << endl; @@ -2915,7 +3009,7 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot // Update user activity timestamp, otherwise the notification dialog will be shown // in the background due to focus stealing prevention. Entering a new media can // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ +@@ -103,11 +95,11 @@ { QString mimetype = medium.mimetype(); @@ -2930,31 +3024,27 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot { return false; diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه Name[fi]=Mediahuomautin Name[fr]=Démon de notifications des média Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima Name[hu]=LemezfigyelÅ‘ szolgáltatás Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba +@@ -34,12 +32,10 @@ Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach Name[pt]=Servidor de Notificação de Dispositivos Name[pt_BR]=Servidor de Notificação de Dispositivos Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв @@ -2962,33 +3052,32 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Name[sl]=Demon za obveÅ¡Äanje o nosilcih Name[sr]=Демон за обавештења о медијумима Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser +@@ -47,7 +43,6 @@ Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº -Name[zh_TW]=媒體通知伺æœç¨‹å¼ Comment=A media plugged notifier Comment[af]='n Inpropbare media inkennissteller Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin Comment[fr]=Notification de connexion de média Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima +@@ -70,7 +64,7 @@ Comment[hu]=LemezérzékelÅ‘ Comment[is]=Tilkynnari um tengda miðla Comment[it]=Notifiche dei dispositivi attaccati -Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas Comment[mk]=ИзвеÑтување за приклучен медиум Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ +@@ -82,7 +76,6 @@ Comment[pt]=Um notificador ligado aos dispositivos Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв @@ -2996,16 +3085,29 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih Comment[sr]=Обавештавач о укљученим медијима Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -3015,15 +3117,17 @@ diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ Comment[it]=CD audio Comment[ja]=オーディオ CD Comment[km]=ស៊ីឌី​អូឌីយ៉ូ @@ -3031,34 +3135,27 @@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audi Comment[ms]=CD Audio Comment[nb]=Lyd-CD Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ Comment[km]=ស៊ីឌី​ទទ០Comment[lt]=TuÅ¡Äias CD Comment[lv]=TukÅ¡s CD @@ -3066,7 +3163,7 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[ms]=CD Kosong Comment[nb]=Tom CD Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый CD Comment[rw]=CD Itanditseho Comment[se]=Guorus CD @@ -3074,34 +3171,18 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[sl]=Prazen CD Comment[sr]=Празан CD Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ Comment[km]=ឌីវីឌី​ទទ០Comment[lt]=TuÅ¡Äias DVD Comment[lv]=TukÅ¡s DVD @@ -3109,7 +3190,7 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[ms]=DVD Kosong Comment[nb]=Tom DVD Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый DVD Comment[rw]=DVD Itanditseho Comment[se]=Guorus DVD @@ -3117,35 +3198,18 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[sl]=Prazen DVD Comment[sr]=Празан DVD Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera montada Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=ÄŒatnon govvenapperáhtta @@ -3153,35 +3217,18 @@ diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetyp Comment[sl]=Priklopljen fotoaparat Comment[sr]=Монтирана камера Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera desmontada Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=Gálgajuvvon govvenapperáhtta @@ -3189,168 +3236,90 @@ diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimet Comment[sl]=Odklopljen fotoaparat Comment[sr]=Демонтирана камера Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី Comment[lt]=DVD video diskas Comment[lv]=DVD Video Disks @@ -3358,7 +3327,14 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[ms]=Cakera Video DVD Comment[nb]=DVD-videoplate Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ Comment[rw]=Disiki Videwo DVD Comment[se]=DVD-videoskearru @@ -3366,140 +3342,73 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[sl]=DVD Video disk Comment[sr]=DVD видео диÑк Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto Comment[ru]=Камера Comment[rw]=Kamera Comment[se]=Govvanaperáhtta @@ -3507,34 +3416,25 @@ diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetype Comment[sl]=Fotoaparat Comment[sr]=Камера Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat Comment[ru]=Смонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwashyizwemo Comment[se]=ÄŒatnon garraskearrooassi @@ -3542,34 +3442,25 @@ diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen pogon trdega diska Comment[sr]=Монтирана партиција хард диÑка Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat Comment[ru]=Отмонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwakuwemo Comment[se]=Gálgajuvvon garraskearrooassi @@ -3577,48 +3468,25 @@ diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen pogon trdega diska Comment[sr]=Демонтирана партиција хард диÑка Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Montert delt NFS-ressurs Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Washyizwemo Comment[se]=ÄŒatnon NFS-resursa @@ -3626,48 +3494,25 @@ diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen vir NFS Comment[sr]=Монтирано NFS дељење Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Umontert delt NFS-ressurs Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Wakuwemo Comment[se]=Gálgajuvvon NFS-resursa @@ -3675,34 +3520,25 @@ diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen vir NFS Comment[sr]=Демонтирано NFS дељење Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat Comment[ru]=Смонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo Comment[se]=Čátnon sirdehahtti medium @@ -3710,34 +3546,25 @@ diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mime Comment[sl]=Priklopljen odstranljiv medij Comment[sr]=Монтиран уклоњиви медијум Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat Comment[ru]=Отмонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo Comment[se]=Gálgaduvvon sirdehahtti medium @@ -3745,78 +3572,42 @@ diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mi Comment[sl]=Odklopljen odstranljiv medij Comment[sr]=Демонтиран уклоњиви медијум Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ Comment[it]=Super video CD Comment[ja]=スーパービデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ @@ -3824,18 +3615,18 @@ diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.de Comment[ms]=CD Supervideo Comment[nb]=Super video CD Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ Comment[is]=VÃdeó CD Comment[ja]=ビデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ @@ -3843,51 +3634,31 @@ diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desk Comment[ms]=CD Video Comment[nds]=Video-CD Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ Comment[hu]=Leválasztott Zip-lemez Comment[is]=Aftengdur Zip diskur Comment[it]=Disco Zip non montato @@ -3896,23 +3667,9 @@ diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetype Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ Comment[lo]= ຫັງàºàº²àº¥àºµ Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 @@ -57,8 +57,8 @@ #>+ 1 kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) @@ -4027,7 +3784,7 @@ diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mo #include "kio_media_mounthelper.moc" diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 +++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,1063 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. @@ -5094,9 +4851,9 @@ diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugi -propertiespagegui.moc: propertiespagegui.h - $(MOC) propertiespagegui.h -o propertiespagegui.moc diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 +++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ +@@ -1,73 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service @@ -5108,16 +4865,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Name[el]=Σελίδα ιδιοτήτων μÎσων -Name[es]=Página de propiedades de medios -Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه -Name[fi]=Mediaominaisuudet -Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija -Name[hu]=MédiajellemzÅ‘k lap -Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione -Name[ja]=メディア属性ページ -Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling -Name[nds]=Medienegenschappen-Siet -Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika -Name[pt]=Página de Propriedades de Suportes FÃsicos -Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ -Name[sk]=Strana vlastnostà média -Name[sl]=Stran z lastnostmi nosilca -Name[sr]=Страна Ñа ÑвојÑтвима медијума @@ -5134,16 +4899,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης -Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje -Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن -Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä -Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja -Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához -Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio -Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン -Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror -Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen -Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania -Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem -Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем -Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia -Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev -Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању @@ -5995,8 +5768,8 @@ diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/pro - - diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -6006,71 +5779,32 @@ diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.i LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن Name[fi]=Poista turvallisesti Name[fr]=Enlever en toute sécurité -Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje Name[ga]=Bain Amach go Sábháilte Name[gl]=Eliminar de Maneira Segura Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ +@@ -46,7 +44,6 @@ Name[ru]=БезопаÑно извлечь Name[rw]=Gukuramo Neza Name[se]=DorvvoÅ¡laÅ¡ eretváldin @@ -6078,41 +5812,3 @@ diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/serv Name[sl]=Varno odstrani Name[sr]=Безбедно уклони Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kde4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kde4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff b/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kde4-runtime/files/patch-konsole_konsole-TECommon.h b/x11/kde4-runtime/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kde4-runtime/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff b/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kde4-workspace/files/patch-kio_media b/x11/kde4-workspace/files/extrapatch-kio_media index 144c7914a0e5..ab1a03b094cb 100644 --- a/x11/kde4-workspace/files/patch-kio_media +++ b/x11/kde4-workspace/files/extrapatch-kio_media @@ -1,6 +1,6 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 @@ -122,8 +122,7 @@ DATA = $(kde_services_DATA) ETAGS = etags @@ -41,8 +41,8 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 @@ -253,6 +253,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -73,25 +73,26 @@ diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/mana load(); } diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ Name[he]=×”×ª×§× ×™× Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz Name[is]=Geymslumiðlar Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ Name[mk]=Медиуми за податоци Name[ms]=Media Storan Name[nb]=Lagringsenheter @@ -100,7 +101,7 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[nl]=Opslagapparaten Name[nn]=Lagringsmedium Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ +@@ -54,7 +53,6 @@ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… Name[rw]=Uburyo bwo Kubika Name[se]=Vurkenmedia @@ -108,33 +109,21 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[sl]=Nosilci za shranjevanje Name[sr]=Складишни медијуми Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage Comment[fy]=Opslachmedia ynstelle Comment[ga]=Cumraigh Meáin Stórála Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu Comment[hu]=A tárolóeszközök beállÃtása Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក +@@ -98,16 +94,15 @@ Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius Comment[mk]=Конфигурирајте ги медиумите за податоци Comment[nb]=Sett opp lagringsmedier @@ -143,7 +132,9 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[nl]=Opslagmedia instellen Comment[nn]=Set opp lagringsmedium Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento Comment[pt_BR]=Configura as mÃdias de armazenamento Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Comment[se]=Heivet vurkenmediaid @@ -151,45 +142,32 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[sl]=Nastavitve nosilcev za shranjevanje Comment[sr]=Подешавање медијума за Ñкладиштење Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo -Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp --- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 @@ -174,8 +174,8 @@ ActionListBoxItem *action_item = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); @@ -197,7 +175,7 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not - NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) + NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) { ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); @@ -207,13 +185,13 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not NotifierServiceAction *action; - action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) { m_settings.deleteAction( action ); updateListBox(); diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 @@ -248,6 +248,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -223,30 +201,17 @@ diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе Name[rw]=Amakuru y'igitangazamakuru Name[se]=MediumdieÄ‘ut @@ -254,19 +219,11 @@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-p Name[sl]=Informacije o mediju Name[sr]=Информације о медијуму Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ +@@ -63,4 +61,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 @@ -300,8 +257,8 @@ diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile- if ( !reply.isValid() ) { diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 @@ -250,6 +250,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -443,8 +400,8 @@ diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp mp_mounting = 0L; diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 @@ -284,6 +284,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -454,9 +411,46 @@ diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ if ( mount->mountType() == "swap" || mount->mountType() == "tmpfs" || mount->mountType() == "sysfs" @@ -464,19 +458,35 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.contains(mtabEntry)) { - new_mtabIds += m_mtabEntries[mtabEntry]; - continue; - } -- ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + QString id = generateId(dev, mp); new_mtabIds+=id; - m_mtabEntries[mtabEntry] = id; @@ -489,20 +499,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag m_mediaList.changeMediumState(id, true, false, mime, icon, label); } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); +@@ -237,10 +211,6 @@ QString mp = medium->mountPoint(); QString fs = medium->fsType(); -- + - - QString mtabEntry = dev + "*" + mp + "*" + fs; - m_mtabEntries.remove(mtabEntry); - +- QString mime, icon, label; guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 @@ -23,7 +23,6 @@ #include <qobject.h> @@ -511,16 +529,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager #ifdef Q_OS_FREEBSD #include <qtimer.h> -@@ -54,7 +53,6 @@ +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ bool m_networkSharesOnly; QStringList m_mtabIds; - QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; QStringList m_fstabIds; #ifdef Q_OS_FREEBSD QTimer m_mtabTimer; diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 @@ -21,16 +21,9 @@ @@ -539,7 +569,7 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ +@@ -39,1177 +32,615 @@ static HALBackend* s_HALBackend; /* A macro function to convert HAL string properties to QString */ @@ -654,6 +684,14 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager - DBusError error; - dbus_error_init(&error); - dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- - dbus_bus_register(dbus_connection, &error); - - if (dbus_error_is_set(&error)) { @@ -2365,10 +2403,80 @@ diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/h }; #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ +@@ -43,287 +43,201 @@ MediaManager::MediaManager(const QCString &obj) : KDEDModule(obj), m_dirNotify(m_mediaList) { @@ -2417,15 +2525,17 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - m_backends.remove( b ); - delete b; - } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; + while ( !m_backends.isEmpty() ) + { + BackendBase *b = m_backends.first(); + m_backends.remove( b ); + delete b; + } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; ++ + mp_removableBackend = 0L; #ifdef COMPILE_HALBACKEND @@ -2435,7 +2545,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - if (m_halbackend->InitHal()) - { - m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); - // No need to load something else... - m_mediaList.blockSignals(false); - return; @@ -2480,7 +2591,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag + } #endif //COMPILE_LINUXCDPOLLING -- m_backends.append( new FstabBackend(m_mediaList) ); +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); - m_mediaList.blockSignals(false); + m_backends.append( new FstabBackend(m_mediaList) ); + m_mediaList.blockSignals(false); @@ -2517,8 +2629,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag QStringList MediaManager::properties(const QString &name) { - const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - +- - if (!m) - { - KURL u(name); @@ -2561,7 +2672,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - else - return QStringList(); -} -- ++ const Medium *m = m_mediaList.findByName(name); + -QStringList MediaManager::mountoptions(const QString &name) -{ -#ifdef COMPILE_HALBACKEND @@ -2591,7 +2703,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->mount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); -#endif -} - @@ -2602,7 +2716,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->unmount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); -#endif + if (m!=0L) + { @@ -2764,36 +2880,23 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ + Name[et]=KDED andmekandjate haldur Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED Name[fi]=KDED-tallennusmedianhallinta Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder + Name[fy]=KDEDED-mediabehearder Name[ga]=Bainisteoir Meán KDED Name[gl]=Xestor de Meios de KDED -Name[he]=×ž× ×”×œ המדיה של KDED Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija + Name[hr]=KDED upravitelj medija Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ +@@ -45,7 +43,6 @@ Name[ru]=Управление подключаемыми уÑтройÑтвами Name[rw]=Mugenga Igihuza KDED Name[se]=KDED-mediagieÄ‘ahalli @@ -2801,28 +2904,18 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Name[sl]=Upravitelj medijev KDED Name[sr]=Менаџер медијума, KDED Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) -Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) @@ -2831,12 +2924,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ +@@ -103,7 +98,6 @@ Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) @@ -2844,31 +2932,24 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ +@@ -122,4 +116,3 @@ X-KDE-FactoryName=mediamanager X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true -X-KDE-Kded-phase=1 diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ +@@ -28,8 +28,6 @@ #include "removablebackend.h" #include "mediadirnotify.h" -class HALBackend; +-class FstabBackend; class MediaManager : public KDEDModule { -@@ -41,12 +40,6 @@ +@@ -42,12 +40,6 @@ k_dcop: QStringList fullList(); QStringList properties(const QString &name); @@ -2881,17 +2962,19 @@ diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); -@@ -81,7 +74,6 @@ +@@ -82,9 +74,7 @@ MediaList m_mediaList; QValueList<BackendBase*> m_backends; RemovableBackend *mp_removableBackend; - HALBackend *m_halbackend; MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; }; + #endif diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 @@ -254,6 +254,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -2901,9 +2984,20 @@ diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/ LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 +++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " << allowNotification << ")" << endl; @@ -2915,7 +3009,7 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot // Update user activity timestamp, otherwise the notification dialog will be shown // in the background due to focus stealing prevention. Entering a new media can // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ +@@ -103,11 +95,11 @@ { QString mimetype = medium.mimetype(); @@ -2930,31 +3024,27 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot { return false; diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه Name[fi]=Mediahuomautin Name[fr]=Démon de notifications des média Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima Name[hu]=LemezfigyelÅ‘ szolgáltatás Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba +@@ -34,12 +32,10 @@ Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach Name[pt]=Servidor de Notificação de Dispositivos Name[pt_BR]=Servidor de Notificação de Dispositivos Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв @@ -2962,33 +3052,32 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Name[sl]=Demon za obveÅ¡Äanje o nosilcih Name[sr]=Демон за обавештења о медијумима Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser +@@ -47,7 +43,6 @@ Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº -Name[zh_TW]=媒體通知伺æœç¨‹å¼ Comment=A media plugged notifier Comment[af]='n Inpropbare media inkennissteller Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin Comment[fr]=Notification de connexion de média Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima +@@ -70,7 +64,7 @@ Comment[hu]=LemezérzékelÅ‘ Comment[is]=Tilkynnari um tengda miðla Comment[it]=Notifiche dei dispositivi attaccati -Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas Comment[mk]=ИзвеÑтување за приклучен медиум Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ +@@ -82,7 +76,6 @@ Comment[pt]=Um notificador ligado aos dispositivos Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв @@ -2996,16 +3085,29 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih Comment[sr]=Обавештавач о укљученим медијима Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -3015,15 +3117,17 @@ diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ Comment[it]=CD audio Comment[ja]=オーディオ CD Comment[km]=ស៊ីឌី​អូឌីយ៉ូ @@ -3031,34 +3135,27 @@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audi Comment[ms]=CD Audio Comment[nb]=Lyd-CD Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ Comment[km]=ស៊ីឌី​ទទ០Comment[lt]=TuÅ¡Äias CD Comment[lv]=TukÅ¡s CD @@ -3066,7 +3163,7 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[ms]=CD Kosong Comment[nb]=Tom CD Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый CD Comment[rw]=CD Itanditseho Comment[se]=Guorus CD @@ -3074,34 +3171,18 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[sl]=Prazen CD Comment[sr]=Празан CD Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ Comment[km]=ឌីវីឌី​ទទ០Comment[lt]=TuÅ¡Äias DVD Comment[lv]=TukÅ¡s DVD @@ -3109,7 +3190,7 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[ms]=DVD Kosong Comment[nb]=Tom DVD Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый DVD Comment[rw]=DVD Itanditseho Comment[se]=Guorus DVD @@ -3117,35 +3198,18 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[sl]=Prazen DVD Comment[sr]=Празан DVD Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera montada Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=ÄŒatnon govvenapperáhtta @@ -3153,35 +3217,18 @@ diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetyp Comment[sl]=Priklopljen fotoaparat Comment[sr]=Монтирана камера Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera desmontada Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=Gálgajuvvon govvenapperáhtta @@ -3189,168 +3236,90 @@ diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimet Comment[sl]=Odklopljen fotoaparat Comment[sr]=Демонтирана камера Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី Comment[lt]=DVD video diskas Comment[lv]=DVD Video Disks @@ -3358,7 +3327,14 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[ms]=Cakera Video DVD Comment[nb]=DVD-videoplate Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ Comment[rw]=Disiki Videwo DVD Comment[se]=DVD-videoskearru @@ -3366,140 +3342,73 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[sl]=DVD Video disk Comment[sr]=DVD видео диÑк Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto Comment[ru]=Камера Comment[rw]=Kamera Comment[se]=Govvanaperáhtta @@ -3507,34 +3416,25 @@ diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetype Comment[sl]=Fotoaparat Comment[sr]=Камера Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat Comment[ru]=Смонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwashyizwemo Comment[se]=ÄŒatnon garraskearrooassi @@ -3542,34 +3442,25 @@ diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen pogon trdega diska Comment[sr]=Монтирана партиција хард диÑка Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat Comment[ru]=Отмонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwakuwemo Comment[se]=Gálgajuvvon garraskearrooassi @@ -3577,48 +3468,25 @@ diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen pogon trdega diska Comment[sr]=Демонтирана партиција хард диÑка Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Montert delt NFS-ressurs Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Washyizwemo Comment[se]=ÄŒatnon NFS-resursa @@ -3626,48 +3494,25 @@ diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen vir NFS Comment[sr]=Монтирано NFS дељење Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Umontert delt NFS-ressurs Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Wakuwemo Comment[se]=Gálgajuvvon NFS-resursa @@ -3675,34 +3520,25 @@ diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen vir NFS Comment[sr]=Демонтирано NFS дељење Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat Comment[ru]=Смонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo Comment[se]=Čátnon sirdehahtti medium @@ -3710,34 +3546,25 @@ diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mime Comment[sl]=Priklopljen odstranljiv medij Comment[sr]=Монтиран уклоњиви медијум Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat Comment[ru]=Отмонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo Comment[se]=Gálgaduvvon sirdehahtti medium @@ -3745,78 +3572,42 @@ diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mi Comment[sl]=Odklopljen odstranljiv medij Comment[sr]=Демонтиран уклоњиви медијум Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ Comment[it]=Super video CD Comment[ja]=スーパービデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ @@ -3824,18 +3615,18 @@ diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.de Comment[ms]=CD Supervideo Comment[nb]=Super video CD Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ Comment[is]=VÃdeó CD Comment[ja]=ビデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ @@ -3843,51 +3634,31 @@ diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desk Comment[ms]=CD Video Comment[nds]=Video-CD Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ Comment[hu]=Leválasztott Zip-lemez Comment[is]=Aftengdur Zip diskur Comment[it]=Disco Zip non montato @@ -3896,23 +3667,9 @@ diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetype Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ Comment[lo]= ຫັງàºàº²àº¥àºµ Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 @@ -57,8 +57,8 @@ #>+ 1 kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) @@ -4027,7 +3784,7 @@ diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mo #include "kio_media_mounthelper.moc" diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 +++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,1063 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. @@ -5094,9 +4851,9 @@ diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugi -propertiespagegui.moc: propertiespagegui.h - $(MOC) propertiespagegui.h -o propertiespagegui.moc diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 +++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ +@@ -1,73 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service @@ -5108,16 +4865,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Name[el]=Σελίδα ιδιοτήτων μÎσων -Name[es]=Página de propiedades de medios -Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه -Name[fi]=Mediaominaisuudet -Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija -Name[hu]=MédiajellemzÅ‘k lap -Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione -Name[ja]=メディア属性ページ -Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling -Name[nds]=Medienegenschappen-Siet -Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika -Name[pt]=Página de Propriedades de Suportes FÃsicos -Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ -Name[sk]=Strana vlastnostà média -Name[sl]=Stran z lastnostmi nosilca -Name[sr]=Страна Ñа ÑвојÑтвима медијума @@ -5134,16 +4899,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης -Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje -Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن -Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä -Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja -Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához -Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio -Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン -Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror -Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen -Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania -Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem -Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем -Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia -Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev -Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању @@ -5995,8 +5768,8 @@ diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/pro - - diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -6006,71 +5779,32 @@ diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.i LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن Name[fi]=Poista turvallisesti Name[fr]=Enlever en toute sécurité -Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje Name[ga]=Bain Amach go Sábháilte Name[gl]=Eliminar de Maneira Segura Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ +@@ -46,7 +44,6 @@ Name[ru]=БезопаÑно извлечь Name[rw]=Gukuramo Neza Name[se]=DorvvoÅ¡laÅ¡ eretváldin @@ -6078,41 +5812,3 @@ diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/serv Name[sl]=Varno odstrani Name[sr]=Безбедно уклони Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kde4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in b/x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kde4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kde4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kde4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff b/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kde4-workspace/files/patch-konsole_konsole-TECommon.h b/x11/kde4-workspace/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kde4-workspace/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff b/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kdebase3/files/patch-kio_media b/x11/kdebase3/files/extrapatch-kio_media index 144c7914a0e5..ab1a03b094cb 100644 --- a/x11/kdebase3/files/patch-kio_media +++ b/x11/kdebase3/files/extrapatch-kio_media @@ -1,6 +1,6 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 @@ -122,8 +122,7 @@ DATA = $(kde_services_DATA) ETAGS = etags @@ -41,8 +41,8 @@ diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 @@ -253,6 +253,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -73,25 +73,26 @@ diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/mana load(); } diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ Name[he]=×”×ª×§× ×™× Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz Name[is]=Geymslumiðlar Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ Name[mk]=Медиуми за податоци Name[ms]=Media Storan Name[nb]=Lagringsenheter @@ -100,7 +101,7 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[nl]=Opslagapparaten Name[nn]=Lagringsmedium Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ +@@ -54,7 +53,6 @@ Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… Name[rw]=Uburyo bwo Kubika Name[se]=Vurkenmedia @@ -108,33 +109,21 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Name[sl]=Nosilci za shranjevanje Name[sr]=Складишни медијуми Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage Comment[fy]=Opslachmedia ynstelle Comment[ga]=Cumraigh Meáin Stórála Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu Comment[hu]=A tárolóeszközök beállÃtása Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក +@@ -98,16 +94,15 @@ Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius Comment[mk]=Конфигурирајте ги медиумите за податоци Comment[nb]=Sett opp lagringsmedier @@ -143,7 +132,9 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[nl]=Opslagmedia instellen Comment[nn]=Set opp lagringsmedium Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento Comment[pt_BR]=Configura as mÃdias de armazenamento Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Comment[se]=Heivet vurkenmediaid @@ -151,45 +142,32 @@ diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.de Comment[sl]=Nastavitve nosilcev za shranjevanje Comment[sr]=Подешавање медијума за Ñкладиштење Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo -Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp --- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 @@ -174,8 +174,8 @@ ActionListBoxItem *action_item = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); @@ -197,7 +175,7 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not - NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) + NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) { ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); @@ -207,13 +185,13 @@ diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/not NotifierServiceAction *action; - action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); - if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) { m_settings.deleteAction( action ); updateListBox(); diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 @@ -248,6 +248,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -223,30 +201,17 @@ diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе Name[rw]=Amakuru y'igitangazamakuru Name[se]=MediumdieÄ‘ut @@ -254,19 +219,11 @@ diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-p Name[sl]=Informacije o mediju Name[sr]=Информације о медијуму Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ +@@ -63,4 +61,4 @@ Name[zh_TW]=媒體資訊 ServiceTypes=KFilePlugin X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp --- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 @@ -300,8 +257,8 @@ diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile- if ( !reply.isValid() ) { diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 @@ -250,6 +250,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -443,8 +400,8 @@ diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp mp_mounting = 0L; diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 @@ -284,6 +284,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -454,9 +411,46 @@ diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Ma LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ if ( mount->mountType() == "swap" || mount->mountType() == "tmpfs" || mount->mountType() == "sysfs" @@ -464,19 +458,35 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.contains(mtabEntry)) { - new_mtabIds += m_mtabEntries[mtabEntry]; - continue; - } -- ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + QString id = generateId(dev, mp); new_mtabIds+=id; - m_mtabEntries[mtabEntry] = id; @@ -489,20 +499,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanag m_mediaList.changeMediumState(id, true, false, mime, icon, label); } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); +@@ -237,10 +211,6 @@ QString mp = medium->mountPoint(); QString fs = medium->fsType(); -- + - - QString mtabEntry = dev + "*" + mp + "*" + fs; - m_mtabEntries.remove(mtabEntry); - +- QString mime, icon, label; guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 @@ -23,7 +23,6 @@ #include <qobject.h> @@ -511,16 +529,28 @@ diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager #ifdef Q_OS_FREEBSD #include <qtimer.h> -@@ -54,7 +53,6 @@ +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ bool m_networkSharesOnly; QStringList m_mtabIds; - QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; QStringList m_fstabIds; #ifdef Q_OS_FREEBSD QTimer m_mtabTimer; diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 @@ -21,16 +21,9 @@ @@ -539,7 +569,7 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ +@@ -39,1177 +32,615 @@ static HALBackend* s_HALBackend; /* A macro function to convert HAL string properties to QString */ @@ -654,6 +684,14 @@ diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager - DBusError error; - dbus_error_init(&error); - dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- - dbus_bus_register(dbus_connection, &error); - - if (dbus_error_is_set(&error)) { @@ -2365,10 +2403,80 @@ diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/h }; #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ +@@ -43,287 +43,201 @@ MediaManager::MediaManager(const QCString &obj) : KDEDModule(obj), m_dirNotify(m_mediaList) { @@ -2417,15 +2525,17 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - m_backends.remove( b ); - delete b; - } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; + while ( !m_backends.isEmpty() ) + { + BackendBase *b = m_backends.first(); + m_backends.remove( b ); + delete b; + } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; ++ + mp_removableBackend = 0L; #ifdef COMPILE_HALBACKEND @@ -2435,7 +2545,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - if (m_halbackend->InitHal()) - { - m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); - // No need to load something else... - m_mediaList.blockSignals(false); - return; @@ -2480,7 +2591,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag + } #endif //COMPILE_LINUXCDPOLLING -- m_backends.append( new FstabBackend(m_mediaList) ); +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); - m_mediaList.blockSignals(false); + m_backends.append( new FstabBackend(m_mediaList) ); + m_mediaList.blockSignals(false); @@ -2517,8 +2629,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag QStringList MediaManager::properties(const QString &name) { - const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - +- - if (!m) - { - KURL u(name); @@ -2561,7 +2672,8 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - else - return QStringList(); -} -- ++ const Medium *m = m_mediaList.findByName(name); + -QStringList MediaManager::mountoptions(const QString &name) -{ -#ifdef COMPILE_HALBACKEND @@ -2591,7 +2703,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->mount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); -#endif -} - @@ -2602,7 +2716,9 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag - return i18n("Feature only available with HAL"); - return m_halbackend->unmount(name); -#else -- return i18n("Feature only available with HAL"); +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); -#endif + if (m!=0L) + { @@ -2764,36 +2880,23 @@ diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanag diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ + Name[et]=KDED andmekandjate haldur Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED Name[fi]=KDED-tallennusmedianhallinta Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder + Name[fy]=KDEDED-mediabehearder Name[ga]=Bainisteoir Meán KDED Name[gl]=Xestor de Meios de KDED -Name[he]=×ž× ×”×œ המדיה של KDED Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija + Name[hr]=KDED upravitelj medija Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ +@@ -45,7 +43,6 @@ Name[ru]=Управление подключаемыми уÑтройÑтвами Name[rw]=Mugenga Igihuza KDED Name[se]=KDED-mediagieÄ‘ahalli @@ -2801,28 +2904,18 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Name[sl]=Upravitelj medijev KDED Name[sr]=Менаџер медијума, KDED Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) -Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) @@ -2831,12 +2924,7 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ +@@ -103,7 +98,6 @@ Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) @@ -2844,31 +2932,24 @@ diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediam Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ +@@ -122,4 +116,3 @@ X-KDE-FactoryName=mediamanager X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=true -X-KDE-Kded-phase=1 diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 +++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ +@@ -28,8 +28,6 @@ #include "removablebackend.h" #include "mediadirnotify.h" -class HALBackend; +-class FstabBackend; class MediaManager : public KDEDModule { -@@ -41,12 +40,6 @@ +@@ -42,12 +40,6 @@ k_dcop: QStringList fullList(); QStringList properties(const QString &name); @@ -2881,17 +2962,19 @@ diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager QString nameForLabel(const QString &label); ASYNC setUserLabel(const QString &name, const QString &label); -@@ -81,7 +74,6 @@ +@@ -82,9 +74,7 @@ MediaList m_mediaList; QValueList<BackendBase*> m_backends; RemovableBackend *mp_removableBackend; - HALBackend *m_halbackend; MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; }; + #endif diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 @@ -254,6 +254,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -2901,9 +2984,20 @@ diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/ LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 +++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) { kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " << allowNotification << ")" << endl; @@ -2915,7 +3009,7 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot // Update user activity timestamp, otherwise the notification dialog will be shown // in the background due to focus stealing prevention. Entering a new media can // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ +@@ -103,11 +95,11 @@ { QString mimetype = medium.mimetype(); @@ -2930,31 +3024,27 @@ diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianot { return false; diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه Name[fi]=Mediahuomautin Name[fr]=Démon de notifications des média Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima Name[hu]=LemezfigyelÅ‘ szolgáltatás Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba +@@ -34,12 +32,10 @@ Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach Name[pt]=Servidor de Notificação de Dispositivos Name[pt_BR]=Servidor de Notificação de Dispositivos Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв @@ -2962,33 +3052,32 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Name[sl]=Demon za obveÅ¡Äanje o nosilcih Name[sr]=Демон за обавештења о медијумима Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser +@@ -47,7 +43,6 @@ Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº -Name[zh_TW]=媒體通知伺æœç¨‹å¼ Comment=A media plugged notifier Comment[af]='n Inpropbare media inkennissteller Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin Comment[fr]=Notification de connexion de média Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima +@@ -70,7 +64,7 @@ Comment[hu]=LemezérzékelÅ‘ Comment[is]=Tilkynnari um tengda miðla Comment[it]=Notifiche dei dispositivi attaccati -Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas Comment[mk]=ИзвеÑтување за приклучен медиум Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ +@@ -82,7 +76,6 @@ Comment[pt]=Um notificador ligado aos dispositivos Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв @@ -2996,16 +3085,29 @@ diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medi Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih Comment[sr]=Обавештавач о укљученим медијима Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -3015,15 +3117,17 @@ diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ Comment[it]=CD audio Comment[ja]=オーディオ CD Comment[km]=ស៊ីឌី​អូឌីយ៉ូ @@ -3031,34 +3135,27 @@ diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audi Comment[ms]=CD Audio Comment[nb]=Lyd-CD Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ Comment[km]=ស៊ីឌី​ទទ០Comment[lt]=TuÅ¡Äias CD Comment[lv]=TukÅ¡s CD @@ -3066,7 +3163,7 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[ms]=CD Kosong Comment[nb]=Tom CD Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый CD Comment[rw]=CD Itanditseho Comment[se]=Guorus CD @@ -3074,34 +3171,18 @@ diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blan Comment[sl]=Prazen CD Comment[sr]=Празан CD Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ Comment[km]=ឌីវីឌី​ទទ០Comment[lt]=TuÅ¡Äias DVD Comment[lv]=TukÅ¡s DVD @@ -3109,7 +3190,7 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[ms]=DVD Kosong Comment[nb]=Tom DVD Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ +@@ -46,7 +44,6 @@ Comment[ru]=ЧиÑтый DVD Comment[rw]=DVD Itanditseho Comment[se]=Guorus DVD @@ -3117,35 +3198,18 @@ diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/bla Comment[sl]=Prazen DVD Comment[sr]=Празан DVD Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera montada Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=ÄŒatnon govvenapperáhtta @@ -3153,35 +3217,18 @@ diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetyp Comment[sl]=Priklopljen fotoaparat Comment[sr]=Монтирана камера Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ +@@ -41,7 +40,6 @@ Comment[pt_BR]=Câmera desmontada Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° Comment[se]=Gálgajuvvon govvenapperáhtta @@ -3189,168 +3236,90 @@ diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimet Comment[sl]=Odklopljen fotoaparat Comment[sr]=Демонтирана камера Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី Comment[lt]=DVD video diskas Comment[lv]=DVD Video Disks @@ -3358,7 +3327,14 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[ms]=Cakera Video DVD Comment[nb]=DVD-videoplate Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ Comment[rw]=Disiki Videwo DVD Comment[se]=DVD-videoskearru @@ -3366,140 +3342,73 @@ diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvd Comment[sl]=DVD Video disk Comment[sr]=DVD видео диÑк Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto Comment[ru]=Камера Comment[rw]=Kamera Comment[se]=Govvanaperáhtta @@ -3507,34 +3416,25 @@ diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetype Comment[sl]=Fotoaparat Comment[sr]=Камера Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat Comment[ru]=Смонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwashyizwemo Comment[se]=ÄŒatnon garraskearrooassi @@ -3542,34 +3442,25 @@ diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen pogon trdega diska Comment[sr]=Монтирана партиција хард диÑка Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat Comment[ru]=Отмонтированный раздел жёÑткого диÑка Comment[rw]=Ububiko Disiki Bwakuwemo Comment[se]=Gálgajuvvon garraskearrooassi @@ -3577,48 +3468,25 @@ diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen pogon trdega diska Comment[sr]=Демонтирана партиција хард диÑка Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Montert delt NFS-ressurs Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Washyizwemo Comment[se]=ÄŒatnon NFS-resursa @@ -3626,48 +3494,25 @@ diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/ Comment[sl]=Priklopljen vir NFS Comment[sr]=Монтирано NFS дељење Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ Comment[nn]=Umontert delt NFS-ressurs Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ + Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS Comment[rw]=Umugabane NFS Wakuwemo Comment[se]=Gálgajuvvon NFS-resursa @@ -3675,34 +3520,25 @@ diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetype Comment[sl]=Odklopljen vir NFS Comment[sr]=Демонтирано NFS дељење Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat Comment[ru]=Смонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo Comment[se]=Čátnon sirdehahtti medium @@ -3710,34 +3546,25 @@ diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mime Comment[sl]=Priklopljen odstranljiv medij Comment[sr]=Монтиран уклоњиви медијум Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat Comment[ru]=Отмонтированный внешний диÑк Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo Comment[se]=Gálgaduvvon sirdehahtti medium @@ -3745,78 +3572,42 @@ diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mi Comment[sl]=Odklopljen odstranljiv medij Comment[sr]=Демонтиран уклоњиви медијум Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ Comment[it]=Super video CD Comment[ja]=スーパービデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ @@ -3824,18 +3615,18 @@ diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.de Comment[ms]=CD Supervideo Comment[nb]=Super video CD Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ Comment[is]=VÃdeó CD Comment[ja]=ビデオ CD Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ @@ -3843,51 +3634,31 @@ diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desk Comment[ms]=CD Video Comment[nds]=Video-CD Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ Comment[hu]=Leválasztott Zip-lemez Comment[is]=Aftengdur Zip diskur Comment[it]=Disco Zip non montato @@ -3896,23 +3667,9 @@ diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetype Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ Comment[lo]= ຫັງàºàº²àº¥àºµ Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 @@ -57,8 +57,8 @@ #>+ 1 kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) @@ -4027,7 +3784,7 @@ diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mo #include "kio_media_mounthelper.moc" diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 +++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 @@ -1,1063 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. @@ -5094,9 +4851,9 @@ diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugi -propertiespagegui.moc: propertiespagegui.h - $(MOC) propertiespagegui.h -o propertiespagegui.moc diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 +++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ +@@ -1,73 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Service @@ -5108,16 +4865,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Name[el]=Σελίδα ιδιοτήτων μÎσων -Name[es]=Página de propiedades de medios -Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه -Name[fi]=Mediaominaisuudet -Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija -Name[hu]=MédiajellemzÅ‘k lap -Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione -Name[ja]=メディア属性ページ -Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling -Name[nds]=Medienegenschappen-Siet -Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika -Name[pt]=Página de Propriedades de Suportes FÃsicos -Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ -Name[sk]=Strana vlastnostà média -Name[sl]=Stran z lastnostmi nosilca -Name[sr]=Страна Ñа ÑвојÑтвима медијума @@ -5134,16 +4899,24 @@ diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/me -Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης -Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje -Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن -Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä -Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja -Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához -Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio -Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン -Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror -Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen -Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania -Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem -Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем -Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia -Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev -Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању @@ -5995,8 +5768,8 @@ diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/pro - - diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 @@ -211,6 +211,7 @@ LIBTOOL = @LIBTOOL@ LIBUCB = @LIBUCB@ @@ -6006,71 +5779,32 @@ diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.i LIBXDMCP = @LIBXDMCP@ LIBXFT_LIB = @LIBXFT_LIB@ diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن Name[fi]=Poista turvallisesti Name[fr]=Enlever en toute sécurité -Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje Name[ga]=Bain Amach go Sábháilte Name[gl]=Eliminar de Maneira Segura Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ +@@ -46,7 +44,6 @@ Name[ru]=БезопаÑно извлечь Name[rw]=Gukuramo Neza Name[se]=DorvvoÅ¡laÅ¡ eretváldin @@ -6078,41 +5812,3 @@ diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/serv Name[sl]=Varno odstrani Name[sr]=Безбедно уклони Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kdebase3/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kdebase3/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kdebase3/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase3/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kdebase3/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kdebase3/files/patch-kicker-taskbar-resize.diff b/x11/kdebase3/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kdebase3/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kdebase3/files/patch-konsole_konsole-TECommon.h b/x11/kdebase3/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kdebase3/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kdebase3/files/patch-ksystraycmd-quoting.diff b/x11/kdebase3/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kdebase3/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kdebase4-runtime/files/extrapatch-kio_media b/x11/kdebase4-runtime/files/extrapatch-kio_media new file mode 100644 index 000000000000..ab1a03b094cb --- /dev/null +++ b/x11/kdebase4-runtime/files/extrapatch-kio_media @@ -0,0 +1,5814 @@ +diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 +@@ -122,8 +122,7 @@ + DATA = $(kde_services_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services propsdlgplugin ++DIST_SUBDIRS = $(SUBDIRS) + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 1 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -276,6 +275,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -611,9 +611,8 @@ + xdg_appsdir = @xdg_appsdir@ + xdg_directorydir = @xdg_directorydir@ + xdg_menudir = @xdg_menudir@ +-@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin + SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) ++ kfile-plugin kcmodule mimetypes services + + INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) + #>- METASOURCES = AUTO +@@ -1092,8 +1091,7 @@ + ./testmedia + + messages: rc.cpp +- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp +- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot ++ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 +@@ -253,6 +253,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp +--- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 +@@ -39,15 +39,15 @@ + QString hal_text = view->kcfg_HalBackendEnabled->text(); + hal_text += " ("+i18n("No support for HAL on this system")+")"; + view->kcfg_HalBackendEnabled->setText( hal_text ); +-#endif + view->kcfg_HalBackendEnabled->setEnabled( false ); ++#endif + + #ifndef COMPILE_LINUXCDPOLLING + QString poll_text = view->kcfg_CdPollingEnabled->text(); + poll_text += " ("+i18n("No support for CD polling on this system")+")"; + view->kcfg_CdPollingEnabled->setText( poll_text ); +-#endif + view->kcfg_CdPollingEnabled->setEnabled( false ); ++#endif + + load(); + } +diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ + Name[he]=×”×ª×§× ×™× + Name[hi]=à¤à¤‚डार मीडिया + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz + Name[is]=Geymslumiðlar + Name[it]=Dispositivi di archiviazione + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ + Name[mk]=Медиуми за податоци + Name[ms]=Media Storan + Name[nb]=Lagringsenheter +-Name[nds]=Spiekermedien ++Name[nds]=Spiekerreedschappen + Name[nl]=Opslagapparaten + Name[nn]=Lagringsmedium + Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ +@@ -54,7 +53,6 @@ + Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… + Name[rw]=Uburyo bwo Kubika + Name[se]=Vurkenmedia +-Name[sk]=Zálohovacie médiá + Name[sl]=Nosilci za shranjevanje + Name[sr]=Складишни медијуми + Name[sr@Latn]=SkladiÅ¡ni medijumi +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage + Comment[fy]=Opslachmedia ynstelle + Comment[ga]=Cumraigh Meáin Stórála + Comment[gl]=Configurar Medios de Armacenaxe +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu + Comment[hu]=A tárolóeszközök beállÃtása + Comment[is]=Stillingar geymslumiðla +@@ -98,16 +94,15 @@ + Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius + Comment[mk]=Конфигурирајте ги медиумите за податоци + Comment[nb]=Sett opp lagringsmedier +-Comment[nds]=Spiekermedien instellen ++Comment[nds]=Spiekerreedschappen instellen + Comment[nl]=Opslagmedia instellen + Comment[nn]=Set opp lagringsmedium + Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento + Comment[pt_BR]=Configura as mÃdias de armazenamento + Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Comment[se]=Heivet vurkenmediaid +-Comment[sk]=Nastavenie zálohovacÃch médià + Comment[sl]=Nastavitve nosilcev za shranjevanje + Comment[sr]=Подешавање медијума за Ñкладиштење + Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique + Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart + Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas + Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo +-Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz + Keywords[is]=geymsla,miðill,usb,cdrom,tæki +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava +diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp +--- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 +@@ -174,8 +174,8 @@ + ActionListBoxItem *action_item + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + +- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ NotifierServiceAction * action; ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) + { + ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); + +@@ -195,8 +195,7 @@ + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + + NotifierServiceAction *action; +- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) + { + m_settings.deleteAction( action ); + updateListBox(); +diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 +@@ -248,6 +248,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Name[es]=Información de recursos + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ + Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе + Name[rw]=Amakuru y'igitangazamakuru + Name[se]=MediumdieÄ‘ut +-Name[sk]=Informácie o médiu + Name[sl]=Informacije o mediju + Name[sr]=Информације о медијуму + Name[sr@Latn]=Informacije o medijumu +@@ -63,4 +61,4 @@ + Name[zh_TW]=媒體資訊 + ServiceTypes=KFilePlugin + X-KDE-Library=kfile_media +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted ++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera +diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp +--- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 +@@ -64,16 +64,12 @@ + addMimeType( "media/floppy_unmounted" ); + addMimeType( "media/zip_unmounted" ); + addMimeType( "media/gphoto2camera" ); +- addMimeType( "media/camera_mounted" ); +- addMimeType( "media/camera_unmounted" ); + } + + bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) + { +- const Medium medium = askMedium(info); ++ const Medium medium = askMedium(info); + +- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; +- + if (medium.id().isNull()) return false; + + QString mount_point = medium.mountPoint(); +@@ -165,8 +161,7 @@ + const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) + { + DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << info.url() << endl; +- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); ++ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); + + if ( !reply.isValid() ) + { +diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 +@@ -250,6 +250,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp +--- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 +@@ -40,8 +40,6 @@ + m_properties+= QString::null; /* ICON_NAME */ + + loadUserLabel(); +- +- m_halmounted = false; + } + + Medium::Medium() +@@ -59,8 +57,6 @@ + m_properties+= QString::null; /* BASE_URL */ + m_properties+= QString::null; /* MIME_TYPE */ + m_properties+= QString::null; /* ICON_NAME */ +- +- m_halmounted = false; + } + + const Medium Medium::create(const QStringList &properties) +@@ -163,7 +159,7 @@ + bool Medium::mountableState(bool mounted) + { + if ( m_properties[DEVICE_NODE].isEmpty() +- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) ++ || m_properties[MOUNT_POINT].isEmpty() ) + { + return false; + } +@@ -208,10 +204,14 @@ + + KURL Medium::prettyBaseURL() const + { +- if ( !baseURL().isEmpty() ) +- return baseURL(); +- ++ if ( isMountable() ) ++ { + return KURL( mountPoint() ); ++ } ++ else ++ { ++ return KURL( baseURL() ); ++ } + } + + QString Medium::prettyLabel() const +diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h +--- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 +@@ -22,7 +22,6 @@ + #include <qstring.h> + #include <qstringlist.h> + #include <kurl.h> +-#include <qmap.h> + + class Medium + { +@@ -79,32 +78,14 @@ + + void setMimeType(const QString &mimeType); + void setIconName(const QString &iconName); +- void setHalMounted(bool flag) const { m_halmounted = flag; } +- bool halMounted() const { return m_halmounted; } + + private: + Medium(); + void loadUserLabel(); + + QStringList m_properties; +- mutable bool m_halmounted; +- ++ + friend class QValueListNode<const Medium>; + }; +- +-namespace MediaManagerUtils { +- static inline QMap<QString,QString> splitOptions(const QStringList & options) +- { +- QMap<QString,QString> valids; +- +- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- valids[key] = value; +- } +- return valids; +- } +-} + + #endif +diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp +--- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 +@@ -226,8 +226,6 @@ + + mp_mounting = &medium; + +- +- /* + KIO::Job* job = KIO::mount(false, 0, + medium.deviceNode(), + medium.mountPoint()); +@@ -236,7 +234,6 @@ + this, SLOT( slotMountResult( KIO::Job * ) ) ); + connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), + this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); +- */ + kapp->dcopClient() + ->connectDCOPSignal("kded", "mediamanager", + "mediumChanged(QString, bool)", +@@ -244,17 +241,7 @@ + "slotMediumChanged(QString)", + false); + +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_lastErrorMessage); +- else +- m_lastErrorMessage = i18n("Internal Error"); +- if (!m_lastErrorMessage.isEmpty()) +- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; +- else { +- qApp->eventLoop()->enterLoop(); +- } ++ qApp->eventLoop()->enterLoop(); + + mp_mounting = 0L; + +diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 +@@ -284,6 +284,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ + if ( mount->mountType() == "swap" + || mount->mountType() == "tmpfs" + || mount->mountType() == "sysfs" +- || mount->mountType() == "fdescfs" + || mount->mountType() == "kernfs" + || mount->mountType() == "usbfs" + || mount->mountType().contains( "proc" ) +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 + + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ + + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; +- if(m_mtabEntries.contains(mtabEntry)) { +- new_mtabIds += m_mtabEntries[mtabEntry]; +- continue; +- } ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + + QString id = generateId(dev, mp); + new_mtabIds+=id; +- m_mtabEntries[mtabEntry] = id; + + if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) + { + QString mime, icon, label; + guess(dev, mp, fs, true, mime, icon, label); ++ + m_mediaList.changeMediumState(id, true, false, + mime, icon, label); + } +@@ -237,10 +211,6 @@ + QString mp = medium->mountPoint(); + QString fs = medium->fsType(); + +- +- QString mtabEntry = dev + "*" + mp + "*" + fs; +- m_mtabEntries.remove(mtabEntry); +- + QString mime, icon, label; + guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) +diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 +@@ -23,7 +23,6 @@ + + #include <qobject.h> + #include <qstringlist.h> +-#include <qmap.h> + + #ifdef Q_OS_FREEBSD + #include <qtimer.h> +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ + + bool m_networkSharesOnly; + QStringList m_mtabIds; +- QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; + QStringList m_fstabIds; + #ifdef Q_OS_FREEBSD + QTimer m_mtabTimer; +diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 +@@ -21,16 +21,9 @@ + + #include <stdlib.h> + +-#include <qfile.h> + #include <klocale.h> + #include <kurl.h> + #include <kdebug.h> +-#include <kprocess.h> +-#include <kconfig.h> +-#include <qstylesheet.h> +-#include <kmountpoint.h> +-#include <kmessagebox.h> +-#include <kio/job.h> + + #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) + #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) +@@ -39,1177 +32,615 @@ + static HALBackend* s_HALBackend; + + /* A macro function to convert HAL string properties to QString */ +-QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) ++QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) + { +- char* _ppt_string; +- QString _ppt_QString; +- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); +- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); +- libhal_free_string(_ppt_string); +- return _ppt_QString; ++ char* _ppt_string; ++ QString _ppt_QString; ++ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); ++ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); ++ libhal_free_string(_ppt_string); ++ return _ppt_QString; + } + + /* Constructor */ + HALBackend::HALBackend(MediaList &list, QObject* parent) +- : QObject() +- , BackendBase(list) +- , m_halContext(NULL) +- , m_halStoragePolicy(NULL) +- , m_parent(parent) ++ : QObject() ++ , BackendBase(list) ++ , m_halContext(NULL) ++ , m_halStoragePolicy(NULL) ++ , m_parent(parent) + { +- s_HALBackend = this; ++ s_HALBackend = this; + } + + /* Destructor */ + HALBackend::~HALBackend() + { +- /* Close HAL connection */ +- if (m_halContext) +- { +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- unmount(current_medium->id()); +- +- +- /* Remove all the registered media first */ +- int numDevices; +- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); +- +- if ( halDeviceList ) +- { +- for ( int i = 0; i < numDevices; i++ ) +- { +- m_mediaList.removeMedium( halDeviceList[i], false ); +- } +- } +- +- libhal_free_string_array( halDeviceList ); +- +- DBusError error; +- dbus_error_init(&error); +- libhal_ctx_shutdown(m_halContext, &error); +- libhal_ctx_free(m_halContext); +- } +- +- if (m_halStoragePolicy) +- libhal_storage_policy_free(m_halStoragePolicy); ++ /* Close HAL connection */ ++ if (m_halContext) ++ { ++ /* Remove all the registered media first */ ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); ++ ++ if ( halDeviceList ) ++ { ++ for ( int i = 0; i < numDevices; i++ ) ++ { ++ m_mediaList.removeMedium( halDeviceList[i], false ); ++ } ++ } ++ ++ #ifdef HAL_0_4 ++ hal_shutdown(m_halContext); ++ #else ++ libhal_ctx_shutdown(m_halContext, NULL); ++ libhal_ctx_free(m_halContext); ++ #endif ++ } ++ ++ if (m_halStoragePolicy) ++ libhal_storage_policy_free(m_halStoragePolicy); + } + + /* Connect to the HAL */ + bool HALBackend::InitHal() + { +- kdDebug(1219) << "Context new" << endl; +- m_halContext = libhal_ctx_new(); +- if (!m_halContext) +- { +- kdDebug(1219) << "Failed to initialize HAL!" << endl; +- return false; +- } +- +- // Main loop integration +- kdDebug(1219) << "Main loop integration" << endl; +- DBusError error; +- dbus_error_init(&error); +- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- +- dbus_bus_register(dbus_connection, &error); +- +- if (dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- MainLoopIntegration(dbus_connection); +- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); +- +- // HAL callback functions +- kdDebug(1219) << "Callback functions" << endl; +- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); +- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); +- libhal_ctx_set_device_new_capability (m_halContext, NULL); +- libhal_ctx_set_device_lost_capability (m_halContext, NULL); +- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); +- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); +- +- kdDebug(1219) << "Context Init" << endl; +- if (!libhal_ctx_init(m_halContext, &error)) +- { +- if (dbus_error_is_set(&error)) +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- kdDebug(1219) << "Failed to init HAL context!" << endl; +- return false; +- } +- +- /** @todo customize watch policy */ +- kdDebug(1219) << "Watch properties" << endl; +- if (!libhal_device_property_watch_all(m_halContext, &error)) +- { +- kdDebug(1219) << "Failed to watch HAL properties!" << endl; +- return false; +- } +- +- /* libhal-storage initialization */ +- kdDebug(1219) << "Storage Policy" << endl; +- m_halStoragePolicy = libhal_storage_policy_new(); +- /** @todo define libhal-storage icon policy */ ++#ifdef HAL_0_4 /* HAL API 0.4 */ ++ /* libhal initialization */ ++ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; ++ m_halFunctions.device_added = HALBackend::hal_device_added; ++ m_halFunctions.device_removed = HALBackend::hal_device_removed; ++ m_halFunctions.device_new_capability = NULL; ++ m_halFunctions.device_lost_capability = NULL; ++ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; ++ m_halFunctions.device_condition = HALBackend::hal_device_condition; ++ ++ m_halContext = hal_initialize(&m_halFunctions, false); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (libhal_device_property_watch_all(m_halContext, NULL)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#else /* HAL API >= 0.5 */ ++ kdDebug(1219) << "Context new" << endl; ++ m_halContext = libhal_ctx_new(); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ // Main loop integration ++ kdDebug(1219) << "Main loop integration" << endl; ++ DBusError error; ++ dbus_error_init(&error); ++ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); ++ if (dbus_error_is_set(&error)) { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ return false; ++ } ++ MainLoopIntegration(dbus_connection); ++ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); ++ ++ // HAL callback functions ++ kdDebug(1219) << "Callback functions" << endl; ++ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); ++ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); ++ libhal_ctx_set_device_new_capability (m_halContext, NULL); ++ libhal_ctx_set_device_lost_capability (m_halContext, NULL); ++ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); ++ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); + +- /* List devices at startup */ +- return ListDevices(); ++ kdDebug(1219) << "Context Init" << endl; ++ if (!libhal_ctx_init(m_halContext, &error)) ++ { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ kdDebug(1219) << "Failed to init HAL context!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (!libhal_device_property_watch_all(m_halContext, &error)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#endif ++ ++ /* libhal-storage initialization */ ++ kdDebug(1219) << "Storage Policy" << endl; ++ m_halStoragePolicy = libhal_storage_policy_new(); ++ /** @todo define libhal-storage icon policy */ ++ ++ /* List devices at startup */ ++ return ListDevices(); + } + + /* List devices (at startup)*/ + bool HALBackend::ListDevices() + { +- kdDebug(1219) << "ListDevices" << endl; ++ kdDebug(1219) << "ListDevices" << endl; + +- int numDevices; +- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); + +- if (!halDeviceList) +- return false; ++ if (!halDeviceList) ++ return false; + +- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; +- for (int i = 0; i < numDevices; i++) +- AddDevice(halDeviceList[i], false); ++ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; ++ for (int i = 0; i < numDevices; i++) ++ AddDevice(halDeviceList[i], false); + +- libhal_free_string_array( halDeviceList ); +- +- return true; ++ return true; + } + + /* Create a media instance for the HAL device "udi". +- This functions checks whether the device is worth listing */ ++This functions checks whether the device is worth listing */ + void HALBackend::AddDevice(const char *udi, bool allowNotification) + { +- /* We don't deal with devices that do not expose their capabilities. +- If we don't check this, we will get a lot of warning messages from libhal */ +- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- return; +- +- /* If the device is already listed, do not process. +- This should not happen, but who knows... */ +- /** @todo : refresh properties instead ? */ +- if (m_mediaList.findById(udi)) +- return; +- +- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) +- allowNotification=false; +- +- /* Add volume block devices */ +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- /* We only list volume that have a filesystem or volume that have an audio track*/ +- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) +- return; +- +- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && +- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) +- return; +- +- /* Query drive udi */ +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- /* We don't list floppy volumes because we list floppy drives */ +- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) +- return; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) +- allowNotification=false; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) +- allowNotification=false; +- +- /** @todo check exclusion list **/ +- +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- +- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); +- kdDebug() << "automount " << options["automount"] << endl; +- if (options["automount"] == "true" && allowNotification ) { +- QString error = mount(medium); +- if (!error.isEmpty()) +- kdDebug() << "error " << error << endl; +- } +- setVolumeProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- +- return; +- } +- +- /* Floppy & zip drives */ +- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) +- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setFloppyProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } +- +- /* Camera handled by gphoto2*/ +- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && +- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || +- +- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && +- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) +- ) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setCameraProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } ++ /* We don't deal with devices that do not expose their capabilities. ++ If we don't check this, we will get a lot of warning messages from libhal */ ++ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ return; ++ ++ /* If the device is already listed, do not process. ++ This should not happen, but who knows... */ ++ /** @todo : refresh properties instead ? */ ++ if (m_mediaList.findById(udi)) ++ return; ++ ++ /* Add volume block devices */ ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ /* We only list volume that have a filesystem or volume that have an audio track*/ ++ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) ++ return; ++ /* Query drive udi */ ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ /* We don't list floppy volumes because we list floppy drives */ ++ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) ++ return; ++ ++ /** @todo check exclusion list **/ ++ ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setVolumeProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ ++ return; ++ } ++ ++ /* Floppy & zip drives */ ++ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) ++ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setFloppyProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } ++ ++ /* Camera handled by gphoto2*/ ++ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && ++#ifdef HAL_0_4 ++ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) ++#else ++ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || ++ ++ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) ++#endif ++ ) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setCameraProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } + } + + void HALBackend::RemoveDevice(const char *udi) + { +- m_mediaList.removeMedium(udi, true); ++ m_mediaList.removeMedium(udi, true); + } + + void HALBackend::ModifyDevice(const char *udi, const char* key) + { +- Q_UNUSED(key); +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- if (!mediumUdi) +- return; +- ResetProperties(mediumUdi); ++ Q_UNUSED(key); ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ResetProperties(mediumUdi); + } + + void HALBackend::DeviceCondition(const char* udi, const char* condition) + { +- QString conditionName = QString(condition); +- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; +- +- if (conditionName == "EjectPressed") { +- const Medium* medium = m_mediaList.findById(udi); +- if (!medium) { +- /* the ejectpressed appears on the drive and we need to find the volume */ +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); +- if (driveUdi == udi) +- { +- medium = current_medium; +- break; +- } +- } +- } +- if (medium) { +- KProcess p; +- p << "kio_media_mounthelper" << "-e" << medium->name(); +- p.start(KProcess::DontCare); +- } +- } +- +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; +- if (!mediumUdi) +- return; +- +- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ +- if (conditionName == "VolumeUnmountForced") +- ResetProperties(mediumUdi); +- +- /* Reset properties after mounting */ +- if (conditionName == "VolumeMount") +- ResetProperties(mediumUdi); +- +- /* Reset properties after unmounting */ +- if (conditionName == "VolumeUnmount") +- ResetProperties(mediumUdi); +- ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ++ QString conditionName = QString(condition); ++ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; ++ ++ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ ++ if (conditionName == "VolumeUnmountForced") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after mounting */ ++ if (conditionName == "VolumeMount") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after unmounting */ ++ if (conditionName == "VolumeUnmount") ++ ResetProperties(mediumUdi); + } + + void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) + { +- m_dBusQtConnection = new DBusQt::Connection(m_parent); +- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); ++ m_dBusQtConnection = new DBusQt::Connection(m_parent); ++ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); + } + + /****************************************** +- ** Properties attribution ** +- ******************************************/ ++** Properties attribution ** ++******************************************/ + + /* Return the medium udi that should be updated when recieving a call for +- device udi */ ++device udi */ + const char* HALBackend::findMediumUdiFromUdi(const char* udi) + { +- /* Easy part : this Udi is already registered as a device */ +- const Medium* medium = m_mediaList.findById(udi); +- if (medium) +- return medium->id().ascii(); +- +- /* Hard part : this is a volume whose drive is registered */ +- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- return findMediumUdiFromUdi(driveUdi.ascii()); +- } ++ /* Easy part : this Udi is already registered as a device */ ++ const Medium* medium = m_mediaList.findById(udi); ++ if (medium) ++ return medium->id().ascii(); ++ ++ /* Hard part : this is a volume whose drive is registered */ ++ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ return findMediumUdiFromUdi(driveUdi.ascii()); ++ } + +- return NULL; ++ return NULL; + } + + void HALBackend::ResetProperties(const char* mediumUdi) + { +- kdDebug(1219) << "HALBackend::setProperties" << endl; +- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) +- { +- const Medium *cmedium = m_mediaList.findById(mediumUdi); +- if ( cmedium ) +- { +- Medium m( *cmedium ); +- if ( setFstabProperties( &m ) ) { +- kdDebug() << "setFstabProperties worked" << endl; +- m_mediaList.changeMediumState(m, false); +- } +- return; +- } +- } +- +- Medium* m = new Medium(mediumUdi, ""); +- +- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) +- setVolumeProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) +- setFloppyProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) +- setCameraProperties(m); ++ kdDebug(1219) << "HALBackend::setProperties" << endl; + +- m_mediaList.changeMediumState(*m, false); ++ Medium* m = new Medium(mediumUdi, ""); ++ ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) ++ setVolumeProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) ++ setFloppyProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) ++ setCameraProperties(m); + +- delete m; +-} ++ m_mediaList.changeMediumState(*m, false); + +-void HALBackend::setVolumeProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /* Get device information from libhal-storage */ +- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); +- if (!halVolume) +- return; +- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); +- if (!halDrive) { +- // at times HAL sends an UnmountForced event before the device is removed +- libhal_volume_free(halVolume); +- return; +- } +- +- medium->setName( +- generateName(libhal_volume_get_device_file(halVolume)) ); +- +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- +- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- QString volume_name = QString::fromUtf8(name); +- QString media_name = volume_name; +- medium->setLabel(media_name); +- free(name); +- +- QString mimeType; +- if (libhal_volume_is_disc(halVolume)) +- { +- mimeType = "media/cdrom" + MOUNT_SUFFIX; +- +- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankcd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/cdwriter" + MOUNT_SUFFIX; +- +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankdvd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/dvd" + MOUNT_SUFFIX; +- +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- +- /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) +- { +- case DiscType::VCD: +- mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: +- mimeType = "media/svcd"; +- break; +- case DiscType::DVD: +- mimeType = "media/dvdvideo"; +- break; +- } +- } +- else +- { +- mimeType = "media/hdd" + MOUNT_SUFFIX; +- if (libhal_drive_is_hotpluggable(halDrive)) +- { +- mimeType = "media/removable" + MOUNT_SUFFIX; +- medium->needMounting(); +- switch (libhal_drive_get_type(halDrive)) { +- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: +- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: +- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: +- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SD_MMC: +- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: +- { +- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); +- break; +- } +- case LIBHAL_DRIVE_TYPE_CAMERA: +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); +- // get model from camera +- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) +- { +- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); +- } +- break; +- } +- case LIBHAL_DRIVE_TYPE_TAPE: +- medium->setIconName(QString::null); //FIXME need icon +- break; +- default: +- medium->setIconName(QString::null); +- } +- +- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- } +- } +- } +- medium->setMimeType(mimeType); +- +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); ++ delete m; + } + +-bool HALBackend::setFstabProperties( Medium *medium ) ++void HALBackend::setVolumeProperties(Medium* medium) + { +- QString mp = isInFstab(medium); ++ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; + +- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) +- { +- // now that we know it's in fstab, we have to find out if it's mounted +- KMountPoint::List mtab = KMountPoint::currentMountPoints(); +- +- KMountPoint::List::iterator it = mtab.begin(); +- KMountPoint::List::iterator end = mtab.end(); +- +- bool mounted = false; +- +- for (; it!=end; ++it) +- { +- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) +- { +- mounted = true; +- break; +- } +- } +- +- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; +- QString fstype = medium->fsType(); +- if ( fstype.isNull() ) +- fstype = "auto"; +- +- medium->mountableState( +- medium->deviceNode(), +- mp, /* Mount point */ +- fstype, /* Filesystem type */ +- mounted ); /* Mounted ? */ ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /* Get device information from libhal-storage */ ++ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); ++ if (!halVolume) ++ return; ++ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); ++ ++ medium->setName( ++ generateName(libhal_volume_get_device_file(halVolume)) ); ++ ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ ++ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ QString media_name = volume_name; ++ medium->setLabel(media_name); ++ free(name); + +- return true; +- } ++ QString mimeType; ++ if (libhal_volume_is_disc(halVolume)) ++ { ++ mimeType = "media/cdrom" + MOUNT_SUFFIX; + +- return false; ++ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankcd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/cdwriter" + MOUNT_SUFFIX; ++ ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankdvd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/dvd" + MOUNT_SUFFIX; ++ ++ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); ++ ++ /* check if the disc id a vcd or a video dvd */ ++ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); ++ switch (type) ++ { ++ case DiscType::VCD: ++ mimeType = "media/vcd"; ++ break; ++ case DiscType::SVCD: ++ mimeType = "media/svcd"; ++ break; ++ case DiscType::DVD: ++ mimeType = "media/dvdvideo"; ++ break; ++ } ++ } ++ else ++ { ++ mimeType = "media/hdd" + MOUNT_SUFFIX; ++ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); ++ if (libhal_drive_is_hotpluggable(halDrive)) ++ { ++ mimeType = "media/removable" + MOUNT_SUFFIX; ++ medium->needMounting(); ++ switch (libhal_drive_get_type(halDrive)) { ++ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: ++ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: ++ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: ++ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SD_MMC: ++ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: ++ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_CAMERA: ++ mimeType = "media/camera" + MOUNT_SUFFIX; ++ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); ++ // get model from camera ++ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) ++ { ++ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); ++ } ++ break; ++ case LIBHAL_DRIVE_TYPE_TAPE: ++ medium->setIconName(QString::null); //FIXME need icon ++ break; ++ default: ++ medium->setIconName(QString::null); ++ }; ++ }; ++ } ++ medium->setMimeType(mimeType); + ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + + // Handle floppies and zip drives + void HALBackend::setFloppyProperties(Medium* medium) + { +- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; ++ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; + +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); +- if (!halDrive) +- return; +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- LibHalVolume* halVolume = NULL; +- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; +- if (numVolumes) +- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); +- +- medium->setName( +- generateName(libhal_drive_get_device_file(halDrive)) ); +- +- if (halVolume) +- { +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- } +- else +- { +- // HAL hates floppies - so we have to do it twice ;( +- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); +- setFstabProperties( medium ); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") +- { +- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume +- medium->setMimeType("media/floppy_mounted" ); +- else +- medium->setMimeType("media/floppy_unmounted"); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") +- { +- if (medium->isMounted()) +- medium->setMimeType("media/zip_mounted" ); +- else +- medium->setMimeType("media/zip_unmounted"); +- } +- +- /** @todo And mimtype for JAZ drives ? */ +- +- medium->setIconName(QString::null); +- +- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- +- if (name) { +- medium->setLabel( QString::fromUtf8(name) ); +- free(name); +- } +- +- free(volumes); +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); +-} ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); ++ if (!halDrive) ++ return; ++ int numVolumes; ++ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); ++ LibHalVolume* halVolume = NULL; ++ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; ++ if (numVolumes) ++ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); + +-void HALBackend::setCameraProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /** @todo find name */ +- medium->setName("camera"); +- +- QString device = "camera:/"; +- +- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); +- DBusError error; +- dbus_error_init(&error); +- if (cam && +- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && +- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) +- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, +- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), +- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); +- +- libhal_free_string(cam); +- +- /** @todo find the rest of this URL */ +- medium->unmountableState(device); +- medium->setMimeType("media/gphoto2camera"); +- medium->setIconName(QString::null); +- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); +- else +- medium->setLabel(i18n("Camera")); +-} ++ medium->setName( ++ generateName(libhal_drive_get_device_file(halDrive)) ); + +-QString HALBackend::generateName(const QString &devNode) +-{ +- return KURL(devNode).fileName(); +-} ++ if (halVolume) ++ { ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ } ++ else ++ { ++ medium->mountableState( ++ libhal_drive_get_device_file(halDrive), /* Device node */ ++ "", /* Mount point */ ++ "", /* Filesystem type */ ++ false ); /* Mounted ? */ ++ } + +-/****************************************** +- ** HAL CALL-BACKS ** +- ******************************************/ ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ++ { ++ if (halVolume) ++ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/floppy_unmounted"); ++ } + +-void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->AddDevice(udi); +-} ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ++ { ++ if (halVolume) ++ medium->setMimeType("media/zip" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/zip_unmounted"); ++ } + +-void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->RemoveDevice(udi); +-} ++ /** @todo And mimtype for JAZ drives ? */ + +-void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, +- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) +-{ +- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(is_removed); +- Q_UNUSED(is_added); +- s_HALBackend->ModifyDevice(udi, key); +-} ++ medium->setIconName(QString::null); + +-void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, +- const char *condition_name, +- const char* message +- ) +-{ +- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(message); +- s_HALBackend->DeviceCondition(udi, condition_name); ++ QString media_name; ++ if (halVolume) ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ media_name = volume_name; ++ free(name); ++ } ++ else ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString drive_name = QString::fromUtf8(name); ++ media_name = drive_name; ++ free(name); ++ } ++ medium->setLabel(media_name); ++ ++ free(volumes); ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + +-QStringList HALBackend::mountoptions(const QString &name) ++void HALBackend::setCameraProperties(Medium* medium) + { +- const Medium* medium = m_mediaList.findById(name); +- if (medium && !isInFstab(medium).isNull()) +- return QStringList(); // not handled by HAL - fstab entry +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); +- QMap<QString,bool> valids; +- +- for (int index = 0; array && array[index]; ++index) { +- QString t = array[index]; +- if (t.endsWith("=")) +- t = t.left(t.length() - 1); +- valids[t] = true; +- kdDebug() << "valid " << t << endl; +- } +- libhal_free_string_array(array); +- QStringList result; +- QString tmp; +- +- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); +- if (fstype.isNull()) +- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); +- +- +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- +- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) +- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); +- +- config.setGroup(drive_udi); +- bool value = config.readBoolEntry("automount", false); +- config.setGroup(name); +- +- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) +- value = false; +- +- result << QString("automount=%1").arg(value ? "true" : "false"); +- +- if (valids.contains("ro")) +- { +- value = config.readBoolEntry("ro", false); +- tmp = QString("ro=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("quiet")) +- { +- value = config.readBoolEntry("quiet", false); +- tmp = QString("quiet=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("flush")) +- { +- value = config.readBoolEntry("flush", fstype.endsWith("fat")); +- tmp = QString("flush=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("uid")) +- { +- value = config.readBoolEntry("uid", true); +- tmp = QString("uid=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("utf8")) +- { +- value = config.readBoolEntry("utf8", true); +- tmp = QString("utf8=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("shortname")) +- { +- QString svalue = config.readEntry("shortname", "lower").lower(); +- if (svalue == "winnt") +- result << "shortname=winnt"; +- else if (svalue == "win95") +- result << "shortname=win95"; +- else if (svalue == "mixed") +- result << "shortname=mixed"; +- else +- result << "shortname=lower"; +- } +- +- if (valids.contains("sync")) +- { +- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); +- tmp = QString("sync=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("noatime")) +- { +- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); +- tmp = QString("atime=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); +- if (mount_point.isEmpty()) +- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); +- +- mount_point = config.readEntry("mountpoint", mount_point); +- +- if (!mount_point.startsWith("/")) +- mount_point = "/media/" + mount_point; +- +- result << QString("mountpoint=%1").arg(mount_point); +- result << QString("filesystem=%1").arg(fstype); +- +- if (valids.contains("data")) +- { +- QString svalue = config.readEntry("journaling").lower(); +- if (svalue == "ordered") +- result << "journaling=ordered"; +- else if (svalue == "writeback") +- result << "journaling=writeback"; +- else if (svalue == "data") +- result << "journaling=data"; +- else +- result << "journaling=ordered"; +- } ++ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; + +- return result; ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /** @todo find name */ ++ medium->setName("camera"); ++ /** @todo find the rest of this URL */ ++ medium->unmountableState("camera:/"); ++ medium->setMimeType("media/gphoto2camera"); ++ medium->setIconName(QString::null); ++ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); ++ else ++ medium->setLabel(i18n("Camera")); + } + +-bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) ++QString HALBackend::generateName(const QString &devNode) + { +- kdDebug() << "setMountoptions " << name << " " << options << endl; +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); +- +- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; +- for (int index = 0; names[index]; ++index) +- if (valids.contains(names[index])) +- config.writeEntry(names[index], valids[names[index]] == "true"); +- +- if (valids.contains("shortname")) +- config.writeEntry("shortname", valids["shortname"]); +- +- if (valids.contains("journaling")) +- config.writeEntry("journaling", valids["journaling"]); +- +- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) +- config.writeEntry("mountpoint", valids["mountpoint"]); +- +- if (valids.contains("automount")) { +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- config.setGroup(drive_udi); +- config.writeEntry("automount", valids["automount"]); +- } +- +- return true; ++ return KURL(devNode).fileName(); + } + +-static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, +- DBusConnection *dbus_connection) +-{ +- DBusMessage *dmesg, *reply; +- DBusError error; +- +- const char *fstype = ""; +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Mount"))) { +- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, +- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- QString qerror; +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- QString qerror = error.message; +- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; +- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) +- qerror = i18n("Invalid filesystem type"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) +- qerror = i18n("Permissions denied"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) +- qerror = i18n("Device is already mounted."); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return mount_priv(udi, "", poptions, noptions, dbus_connection); +- } +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "mount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- return qerror; ++/****************************************** ++** HAL CALL-BACKS ** ++******************************************/ + ++#ifdef HAL_0_4 ++void HALBackend::hal_main_loop_integration(LibHalContext *ctx, ++ DBusConnection *dbus_connection) ++{ ++ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->MainLoopIntegration(dbus_connection); + } ++#endif + +-void HALBackend::slotResult(KIO::Job *job) ++void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) + { +- kdDebug() << "slotResult " << mount_jobs[job] << endl; +- if (job->error()) +- { +- KMessageBox::error(0, job->errorText()); +- } +- ResetProperties( mount_jobs[job].latin1() ); +- mount_jobs.remove(job); ++ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->AddDevice(udi); + } + +-QString HALBackend::isInFstab(const Medium *medium) ++void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) + { +- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); +- +- KMountPoint::List::iterator it = fstab.begin(); +- KMountPoint::List::iterator end = fstab.end(); +- +- for (; it!=end; ++it) +- { +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; +- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +- { +- QStringList opts = (*it)->mountOptions(); +- if (opts.contains("user") || opts.contains("users")) +- return (*it)->mountPoint(); +- } +- } +- +- return QString::null; ++ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->RemoveDevice(udi); + } + +-QString HALBackend::mount(const Medium *medium) +-{ +- if (medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; +- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } else if (medium->id().startsWith("/org/kde/") ) +- return i18n("Permissions denied"); +- +- QStringList soptions; +- +- kdDebug() << "mounting " << medium->id() << "..." << endl; +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); +- if (valids["flush"] == "true") +- soptions << "flush"; +- +- if (valids["uid"] == "true") +- { +- soptions << QString("uid=%1").arg(getuid()); +- } +- +- if (valids["ro"] == "true") +- soptions << "ro"; +- +- if (valids["atime"] != "true") +- soptions << "noatime"; +- +- if (valids["quiet"] == "true") +- soptions << "quiet"; +- +- if (valids["utf8"] == "true") +- soptions << "utf8"; +- +- if (valids["sync"] == "true") +- soptions << "sync"; +- +- QString mount_point = valids["mountpoint"]; +- if (mount_point.startsWith("/media/")) +- mount_point = mount_point.mid(7); +- +- if (valids.contains("shortname")) +- { +- soptions << QString("shortname=%1").arg(valids["shortname"]); +- } +- +- if (valids.contains("journaling")) +- { +- QString option = valids["journaling"]; +- if (option == "data") +- soptions << QString("data=journal"); +- else if (option == "writeback") +- soptions << QString("data=writeback"); +- else +- soptions << QString("data=ordered"); +- } +- +- const char **options = new const char*[soptions.size() + 1]; +- uint noptions = 0; +- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) +- options[noptions] = (*it).latin1(); +- options[noptions] = NULL; +- +- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); +- if (!qerror.isEmpty()) { +- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; +- return qerror; +- } +- +- medium->setHalMounted(true); +- ResetProperties(medium->id().latin1()); +- +- return QString(); +-} +- +-QString HALBackend::mount(const QString &_udi) ++void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, ++ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) + { +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- +- return mount(medium); ++ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(is_removed); ++ Q_UNUSED(is_added); ++ s_HALBackend->ModifyDevice(udi, key); + } + +-QString HALBackend::unmount(const QString &_udi) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one +- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); +- if (halDrive) +- { +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- if (numVolumes == 1) +- medium = m_mediaList.findById( volumes[0] ); +- } +- } +- +- if ( !medium ) +- return i18n("No such medium: %1").arg(_udi); +- +- if (!medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; +- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } +- +- DBusMessage *dmesg, *reply; +- DBusError error; +- const char *options[2]; +- +- const char *udi = medium->id().latin1(); +- kdDebug() << "unmounting " << udi << "..." << endl; +- +- dbus_error_init(&error); +- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); +- if (dbus_error_is_set(&error)) +- { +- dbus_error_free(&error); +- return false; +- } +- +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Unmount"))) { +- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- options[0] = "force"; +- options[1] = 0; +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; +- QString qerror = error.message; +- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { +- qerror = QString("<qt>") + i18n("Device is Busy:"); +- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); +- FILE *fuser = popen(cmdline.latin1(), "r"); +- uint counter = 0; +- if (fuser) { +- qerror += "<pre>"; +- QTextIStream is(fuser); +- QString tmp; +- while (!is.atEnd()) { +- tmp = is.readLine(); +- tmp = QStyleSheet::escape(tmp) + "\n"; +- +- qerror += tmp; +- if (counter++ > 20) +- { +- qerror += "..."; +- break; +- } +- } +- qerror += "</pre>"; +- (void)pclose( fuser ); +- } +- qerror += "</qt>"; +- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { +- // this is faking. The error is that the device wasn't mounted by hal (but by the system) +- qerror = i18n("Permissions denied"); +- } +- +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "unmount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- medium->setHalMounted(false); +- ResetProperties(udi); +- +- return QString(); ++void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, ++ const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else ++ const char* message ++ #endif ++ ) ++{ ++ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(message); ++ s_HALBackend->DeviceCondition(udi, condition_name); + } + + #include "halbackend.moc" +diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h +--- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 +@@ -45,9 +45,65 @@ + #include <libhal.h> + #include <libhal-storage.h> + +-namespace KIO { +- class Job; +-} ++/* The HAL API changed between 0.4 and 0.5 series. ++These defines enable backward compatibility */ ++#ifdef HAL_0_4 ++ // libhal-storage 0.4 API ++ #define LibHalStoragePolicy HalStoragePolicy ++ #define LibHalDrive HalDrive ++ #define LibHalVolume HalVolume ++ #define LibHalVolumeDiscType HalVolumeDiscType ++ #define libhal_storage_policy_free hal_storage_policy_free ++ #define libhal_storage_policy_new hal_storage_policy_new ++ #define libhal_drive_from_udi hal_drive_from_udi ++ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes ++ #define libhal_drive_get_type hal_drive_get_type ++ #define libhal_drive_get_device_file hal_drive_get_device_file ++ #define libhal_drive_free hal_drive_free ++ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name ++ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable ++ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi ++ #define libhal_volume_from_udi hal_volume_from_udi ++ #define libhal_volume_get_device_file hal_volume_get_device_file ++ #define libhal_volume_get_mount_point hal_volume_get_mount_point ++ #define libhal_volume_get_fstype hal_volume_get_fstype ++ #define libhal_volume_is_mounted hal_volume_is_mounted ++ #define libhal_volume_get_disc_type hal_volume_get_disc_type ++ #define libhal_volume_free hal_volume_free ++ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name ++ #define libhal_volume_disc_has_data hal_volume_disc_has_data ++ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio ++ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank ++ #define libhal_volume_is_disc hal_volume_is_disc ++ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi ++ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR ++ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW ++ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH ++ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK ++ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA ++ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC ++ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER ++ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA ++ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE ++ ++ // libhal 0.4 API ++ #define libhal_free_string hal_free_string ++ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) ++ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) ++ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) ++ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) ++ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) ++ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) ++ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) ++#endif ++ + + /** + * A handy function to query a hal string +@@ -88,14 +144,6 @@ + */ + bool ListDevices(); + +- QStringList mountoptions(const QString &id); +- +- bool setMountoptions(const QString &id, const QStringList &options); +- +- QString mount(const QString &id); +- QString mount(const Medium *medium); +- QString unmount(const QString &id); +- + private: + /** + * Append a device in the media list. This function will check if the device +@@ -147,16 +195,20 @@ + + void setVolumeProperties(Medium* medium); + void setFloppyProperties(Medium* medium); +- bool setFstabProperties(Medium* medium); + void setCameraProperties(Medium* medium); + QString generateName(const QString &devNode); +- static QString isInFstab(const Medium *medium); +- +-private slots: +- void slotResult(KIO::Job *job); + + /* Hal call-backs -- from gvm*/ + public: ++#ifdef HAL_0_4 ++ /** Invoked by libhal for integration with our mainloop. ++ * ++ * @param ctx LibHal context ++ * @param dbus_connection D-BUS connection to integrate ++ */ ++ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); ++#endif ++ + /** Invoked when a device is added to the Global Device List. + * + * @param ctx LibHal context +@@ -189,7 +241,11 @@ + */ + static void hal_device_condition(LibHalContext *ctx, const char *udi, + const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else + const char* message ++ #endif + ); + + /* HAL and DBus structures */ +@@ -199,6 +255,13 @@ + */ + LibHalContext* m_halContext; + ++#ifdef HAL_0_4 ++ /** ++ * Structure defining the hal callback function for devices events ++ */ ++ LibHalFunctions m_halFunctions; ++#endif ++ + /** + * libhal-storage HAL policy, e.g. for icon names + */ +@@ -213,10 +276,6 @@ + * Object for the kded module + */ + QObject* m_parent; +- +- DBusConnection *dbus_connection; +- +- QMap<KIO::Job *, QString> mount_jobs; + }; + + #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif +diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 +@@ -43,287 +43,201 @@ + MediaManager::MediaManager(const QCString &obj) + : KDEDModule(obj), m_dirNotify(m_mediaList) + { +- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), +- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), +- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, +- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), +- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), ++ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), ++ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, ++ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), ++ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); + +- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); ++ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); + } + + MediaManager::~MediaManager() + { +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } + } + + void MediaManager::loadBackends() + { + m_mediaList.blockSignals(true); + +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } ++ ++ mp_removableBackend = 0L; + + #ifdef COMPILE_HALBACKEND +- if ( MediaManagerSettings::self()->halBackendEnabled() ) +- { +- m_halbackend = new HALBackend(m_mediaList, this); +- if (m_halbackend->InitHal()) +- { +- m_backends.append( m_halbackend ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); +- // No need to load something else... +- m_mediaList.blockSignals(false); +- return; +- } +- else +- { +- delete m_halbackend; +- m_halbackend = 0; +- } +- } ++ if ( MediaManagerSettings::self()->halBackendEnabled() ) ++ { ++ HALBackend* hal_backend = new HALBackend(m_mediaList, this); ++ if (hal_backend->InitHal()) ++ { ++ m_backends.append( hal_backend ); ++ m_backends.append( new FstabBackend(m_mediaList, true) ); ++ // No need to load something else... ++ m_mediaList.blockSignals(false); ++ return; ++ } ++ else ++ { ++ delete hal_backend; ++ } ++ } + #endif // COMPILE_HALBACKEND + +- mp_removableBackend = new RemovableBackend(m_mediaList); +- m_backends.append( mp_removableBackend ); ++ mp_removableBackend = new RemovableBackend(m_mediaList); ++ m_backends.append( mp_removableBackend ); + + #ifdef COMPILE_LINUXCDPOLLING +- if ( MediaManagerSettings::self()->cdPollingEnabled() ) +- { +- m_backends.append( new LinuxCDPolling(m_mediaList) ); +- } ++ if ( MediaManagerSettings::self()->cdPollingEnabled() ) ++ { ++ m_backends.append( new LinuxCDPolling(m_mediaList) ); ++ } + #endif //COMPILE_LINUXCDPOLLING + +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); +- m_mediaList.blockSignals(false); ++ m_backends.append( new FstabBackend(m_mediaList) ); ++ m_mediaList.blockSignals(false); + } + + + QStringList MediaManager::fullList() + { +- QPtrList<Medium> list = m_mediaList.list(); ++ QPtrList<Medium> list = m_mediaList.list(); + +- QStringList result; ++ QStringList result; + +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- result+= (*it)->properties(); +- result+= Medium::SEPARATOR; +- } ++ QPtrList<Medium>::const_iterator it = list.begin(); ++ QPtrList<Medium>::const_iterator end = list.end(); ++ for (; it!=end; ++it) ++ { ++ result+= (*it)->properties(); ++ result+= Medium::SEPARATOR; ++ } + +- return result; ++ return result; + } + + QStringList MediaManager::properties(const QString &name) + { +- const Medium *m = m_mediaList.findByName(name); +- +- if (!m) +- { +- KURL u(name); +- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; +- if (u.isValid()) +- { +- if (u.protocol() == "system") +- { +- QString path = u.path(); +- if (path.startsWith("/media/")) +- path = path.mid(strlen("/media/")); +- m = m_mediaList.findByName(path); +- kdDebug() << "findByName " << path << m << endl; +- } +- else if (u.protocol() == "media") +- { +- m = m_mediaList.findByName(u.filename()); +- kdDebug() << "findByName " << u.filename() << m << endl; +- } +- else if (u.protocol() == "file") +- { +- // look for the mount point +- QPtrList<Medium> list = m_mediaList.list(); +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; +- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { +- m = *it; +- break; +- } +- } +- } +- } +- } +- +- if (m) +- return m->properties(); +- else +- return QStringList(); +-} ++ const Medium *m = m_mediaList.findByName(name); + +-QStringList MediaManager::mountoptions(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return QStringList(); +- return m_halbackend->mountoptions(name); +-#else +- return QStringList(); +-#endif +-} +- +-bool MediaManager::setMountoptions(const QString &name, const QStringList &options) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return false; +- return m_halbackend->setMountoptions(name, options); +-#else +- return false; +-#endif +-} +- +-QString MediaManager::mount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->mount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); +-#endif +-} +- +-QString MediaManager::unmount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->unmount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); +-#endif ++ if (m!=0L) ++ { ++ return m->properties(); ++ } ++ else ++ { ++ return QStringList(); ++ } + } + + QString MediaManager::nameForLabel(const QString &label) + { +- const QPtrList<Medium> media = m_mediaList.list(); ++ const QPtrList<Medium> media = m_mediaList.list(); + +- QPtrList<Medium>::const_iterator it = media.begin(); +- QPtrList<Medium>::const_iterator end = media.end(); +- for (; it!=end; ++it) +- { +- const Medium *m = *it; +- +- if (m->prettyLabel()==label) +- { +- return m->name(); +- } +- } ++ QPtrList<Medium>::const_iterator it = media.begin(); ++ QPtrList<Medium>::const_iterator end = media.end(); ++ for (; it!=end; ++it) ++ { ++ const Medium *m = *it; ++ ++ if (m->prettyLabel()==label) ++ { ++ return m->name(); ++ } ++ } + +- return QString::null; ++ return QString::null; + } + + ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) + { +- m_mediaList.setUserLabel(name, label); ++ m_mediaList.setUserLabel(name, label); + } + + ASYNC MediaManager::reloadBackends() + { +- MediaManagerSettings::self()->readConfig(); +- loadBackends(); ++ MediaManagerSettings::self()->readConfig(); ++ loadBackends(); + } + + bool MediaManager::removablePlug(const QString &devNode, const QString &label) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->plug(devNode, label); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->plug(devNode, label); ++ } ++ return false; + } + + bool MediaManager::removableUnplug(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->unplug(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->unplug(devNode); ++ } ++ return false; + } + + bool MediaManager::removableCamera(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->camera(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->camera(devNode); ++ } ++ return false; + } + + + void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesAdded( KURL("media:/") ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesAdded( KURL("media:/") ); + +- emit mediumAdded(name, allowNotification); +- emit mediumAdded(name); ++ emit mediumAdded(name, allowNotification); ++ emit mediumAdded(name); + } + + void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesRemoved( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesRemoved( KURL("media:/"+name) ); + +- emit mediumRemoved(name, allowNotification); +- emit mediumRemoved(name); ++ emit mediumRemoved(name, allowNotification); ++ emit mediumRemoved(name); + } + + void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, + bool mounted, bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- if (!mounted) +- { +- notifier.FilesRemoved( KURL("media:/"+name) ); +- } +- notifier.FilesChanged( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ if (!mounted) ++ { ++ notifier.FilesRemoved( KURL("media:/"+name) ); ++ } ++ notifier.FilesChanged( KURL("media:/"+name) ); + +- emit mediumChanged(name, allowNotification); +- emit mediumChanged(name); ++ emit mediumChanged(name, allowNotification); ++ emit mediumChanged(name); + } + + +diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ + Name[es]=Administrador de recursos KDED + Name[et]=KDED andmekandjate haldur + Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED + Name[fi]=KDED-tallennusmedianhallinta + Name[fr]=Gestionnaire de médias KDED + Name[fy]=KDEDED-mediabehearder + Name[ga]=Bainisteoir Meán KDED + Name[gl]=Xestor de Meios de KDED +-Name[he]=×ž× ×”×œ המדיה של KDED + Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक + Name[hr]=KDED upravitelj medija + Name[hu]=KDED médiakezelÅ‘ +@@ -45,7 +43,6 @@ + Name[ru]=Управление подключаемыми уÑтройÑтвами + Name[rw]=Mugenga Igihuza KDED + Name[se]=KDED-mediagieÄ‘ahalli +-Name[sk]=KDED správca médià + Name[sl]=Upravitelj medijev KDED + Name[sr]=Менаџер медијума, KDED + Name[sr@Latn]=Menadžer medijuma, KDED +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) + Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) + Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) + Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) +-Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) + Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) + Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) + Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) +-Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ ++Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) + Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) + Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) + Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) +@@ -103,7 +98,6 @@ + Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) + Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) + Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) +-Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) + Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) + Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) + Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) +@@ -122,4 +116,3 @@ + X-KDE-FactoryName=mediamanager + X-KDE-Kded-autoload=true + X-KDE-Kded-load-on-demand=true +-X-KDE-Kded-phase=1 +diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 +@@ -28,8 +28,6 @@ + #include "removablebackend.h" + #include "mediadirnotify.h" + +-class HALBackend; +-class FstabBackend; + + class MediaManager : public KDEDModule + { +@@ -42,12 +40,6 @@ + k_dcop: + QStringList fullList(); + QStringList properties(const QString &name); +- QStringList mountoptions(const QString &name); +- bool setMountoptions(const QString &name, const QStringList &options); +- +- QString mount(const QString &uid); +- QString unmount(const QString &uid); +- + QString nameForLabel(const QString &label); + ASYNC setUserLabel(const QString &name, const QString &label); + +@@ -82,9 +74,7 @@ + MediaList m_mediaList; + QValueList<BackendBase*> m_backends; + RemovableBackend *mp_removableBackend; +- HALBackend *m_halbackend; + MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; + }; + + #endif +diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 +@@ -254,6 +254,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) + { + kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " + << allowNotification << ")" << endl; +- +- if ( !allowNotification ) +- return; +- ++ + // Update user activity timestamp, otherwise the notification dialog will be shown + // in the background due to focus stealing prevention. Entering a new media can + // be seen as a kind of user activity after all. It'd be better to update the timestamp +@@ -103,11 +95,11 @@ + { + QString mimetype = medium.mimetype(); + +- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); ++ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); + bool is_mounted = mimetype.endsWith( "_mounted" ); + + // We autorun only on CD/DVD or removable disks (USB, Firewire) +- if ( !( is_cdrom || is_mounted ) ++ if ( !( is_cdrom && is_mounted ) + && mimetype!="media/removable_mounted" ) + { + return false; +diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه + Name[fi]=Mediahuomautin + Name[fr]=Démon de notifications des média + Name[fy]=Medianotifikaasje-daemon + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima + Name[hu]=LemezfigyelÅ‘ szolgáltatás + Name[is]=Miðils tilkynningarpúki +@@ -34,12 +32,10 @@ + Name[nb]=Medievarslingsnisse + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach + Name[pt]=Servidor de Notificação de Dispositivos + Name[pt_BR]=Servidor de Notificação de Dispositivos + Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв +-Name[sk]=Notifikátor medià + Name[sl]=Demon za obveÅ¡Äanje o nosilcih + Name[sr]=Демон за обавештења о медијумима + Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima +@@ -47,7 +43,6 @@ + Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº +-Name[zh_TW]=媒體通知伺æœç¨‹å¼ + Comment=A media plugged notifier + Comment[af]='n Inpropbare media inkennissteller + Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin + Comment[fr]=Notification de connexion de média + Comment[fy]=Meidieling fan oankeppele media +@@ -70,7 +64,7 @@ + Comment[hu]=LemezérzékelÅ‘ + Comment[is]=Tilkynnari um tengda miðla + Comment[it]=Notifiche dei dispositivi attaccati +-Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ + Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas + Comment[mk]=ИзвеÑтување за приклучен медиум + Comment[nb]=En medievarsler som programtillegg +@@ -82,7 +76,6 @@ + Comment[pt]=Um notificador ligado aos dispositivos + Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) + Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв +-Comment[sk]=Notifikátor pripojených médià + Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih + Comment[sr]=Обавештавач о укљученим медијима + Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() +diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ + Comment[it]=CD audio + Comment[ja]=オーディオ CD + Comment[km]=ស៊ីឌី​អូឌីយ៉ូ +-Comment[mk]=Ðудио ЦД + Comment[ms]=CD Audio + Comment[nb]=Lyd-CD + Comment[nds]=Audio-CD +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD +diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ + Comment[km]=ស៊ីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias CD + Comment[lv]=TukÅ¡s CD +-Comment[mk]=Празно ЦД + Comment[ms]=CD Kosong + Comment[nb]=Tom CD + Comment[nds]=Leddige CD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый CD + Comment[rw]=CD Itanditseho + Comment[se]=Guorus CD +-Comment[sk]=ÄŒisté CD + Comment[sl]=Prazen CD + Comment[sr]=Празан CD + Comment[sr@Latn]=Prazan CD +diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ + Comment[km]=ឌីវីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias DVD + Comment[lv]=TukÅ¡s DVD +-Comment[mk]=Празно DVD + Comment[ms]=DVD Kosong + Comment[nb]=Tom DVD + Comment[nds]=Leddige DVD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый DVD + Comment[rw]=DVD Itanditseho + Comment[se]=Guorus DVD +-Comment[sk]=ÄŒisté DVD + Comment[sl]=Prazen DVD + Comment[sr]=Празан DVD + Comment[sr@Latn]=Prazan DVD +diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté + Comment[fy]=Oankeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera montada + Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=ÄŒatnon govvenapperáhtta +-Comment[sk]=Pripojený digitálny fotoaparát + Comment[sl]=Priklopljen fotoaparat + Comment[sr]=Монтирана камера + Comment[sr@Latn]=Montirana kamera +diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté + Comment[fy]=Ofkeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera desmontada + Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=Gálgajuvvon govvenapperáhtta +-Comment[sk]=Odpojený digitálny fotoaparát + Comment[sl]=Odklopljen fotoaparat + Comment[sr]=Демонтирана камера + Comment[sr@Latn]=Demontirana kamera +diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ + Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី + Comment[lt]=DVD video diskas + Comment[lv]=DVD Video Disks +-Comment[mk]=DVD ВидеодиÑк + Comment[ms]=Cakera Video DVD + Comment[nb]=DVD-videoplate + Comment[nds]=DVD-Videodisk +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD + Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ + Comment[rw]=Disiki Videwo DVD + Comment[se]=DVD-videoskearru +-Comment[sk]=DVD Video disk + Comment[sl]=DVD Video disk + Comment[sr]=DVD видео диÑк + Comment[sr@Latn]=DVD video disk +diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif +diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif +diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto + Comment[ru]=Камера + Comment[rw]=Kamera + Comment[se]=Govvanaperáhtta +-Comment[sk]=Digitálny fotoaparát + Comment[sl]=Fotoaparat + Comment[sr]=Камера + Comment[sr@Latn]=Kamera +diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat + Comment[ru]=Смонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwashyizwemo + Comment[se]=ÄŒatnon garraskearrooassi +-Comment[sk]=Pripojený oddiel pevného disku + Comment[sl]=Priklopljen pogon trdega diska + Comment[sr]=Монтирана партиција хард диÑка + Comment[sr@Latn]=Montirana particija hard diska +diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat + Comment[ru]=Отмонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwakuwemo + Comment[se]=Gálgajuvvon garraskearrooassi +-Comment[sk]=Odpojený oddiel pevného disku + Comment[sl]=Odklopljen pogon trdega diska + Comment[sr]=Демонтирана партиција хард диÑка + Comment[sr@Latn]=Demontirana particija hard diska +diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Montert delt NFS-ressurs + Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată + Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Washyizwemo + Comment[se]=ÄŒatnon NFS-resursa +-Comment[sk]=Pripojený zdroj NFS + Comment[sl]=Priklopljen vir NFS + Comment[sr]=Монтирано NFS дељење + Comment[sr@Latn]=Montirano NFS deljenje +diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert delt NFS-ressurs + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată + Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Wakuwemo + Comment[se]=Gálgajuvvon NFS-resursa +-Comment[sk]=Odpojený zdroj NFS + Comment[sl]=Odklopljen vir NFS + Comment[sr]=Демонтирано NFS дељење + Comment[sr@Latn]=Demontirano NFS deljenje +diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat + Comment[ru]=Смонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo + Comment[se]=Čátnon sirdehahtti medium +-Comment[sk]=Pripojené vyberateľné médium + Comment[sl]=Priklopljen odstranljiv medij + Comment[sr]=Монтиран уклоњиви медијум + Comment[sr@Latn]=Montiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat + Comment[ru]=Отмонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo + Comment[se]=Gálgaduvvon sirdehahtti medium +-Comment[sk]=Odpojené vyberateľné médium + Comment[sl]=Odklopljen odstranljiv medij + Comment[sr]=Демонтиран уклоњиви медијум + Comment[sr@Latn]=Demontiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ + Comment[it]=Super video CD + Comment[ja]=スーパービデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ +-Comment[mk]=Супер видео ЦД + Comment[ms]=CD Supervideo + Comment[nb]=Super video CD + Comment[nds]=Super-Video-CD +diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ + Comment[is]=VÃdeó CD + Comment[ja]=ビデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ +-Comment[mk]=Видео ЦД + Comment[ms]=CD Video + Comment[nds]=Video-CD + Comment[nl]=Video-cd +diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif +diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ + Comment[hu]=Leválasztott Zip-lemez + Comment[is]=Aftengdur Zip diskur + Comment[it]=Disco Zip non montato +-Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク ++Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク + Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ + Comment[lo]= ຫັງàºàº²àº¥àºµ + Comment[lt]=IÅ¡montuotas Zip diskas +diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 +@@ -57,8 +57,8 @@ + #>+ 1 + kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) + am__DEPENDENCIES_1 = +-kio_media_mounthelper_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) ++kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ ../libmediacommon/libmediacommon.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +@@ -236,6 +236,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -575,7 +576,7 @@ + AM_LDFLAGS = $(all_libraries) + kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp + kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) ++kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la + #>- METASOURCES = AUTO + #>- all: all-am + #>+ 1 +diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 +@@ -27,7 +27,6 @@ + #include <dcopclient.h> + #include <dcopref.h> + #include <qtimer.h> +-#include <stdlib.h> + #include <kdebug.h> + #include <kglobal.h> + #include <kprocess.h> +@@ -79,30 +78,31 @@ + + if (args->isSet("u")) + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- kdDebug() << "medium unmount " << m_errorStr << endl; +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + else if (args->isSet("s") || args->isSet("e")) + { +- invokeEject(device, true); ++ if (medium.isMounted()) ++ { ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ m_device = device; ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResultSafe( KIO::Job * ) ) ); ++ } ++ else ++ { ++ invokeEject(device, true); ++ } + } + else + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job* job = KIO::mount( false, 0, device, mount_point); ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + } + +@@ -173,12 +173,12 @@ + void MountHelper::error() + { + KMessageBox::error(0, m_errorStr); +- ::exit(1); ++ kapp->exit(1); + } + + void MountHelper::finished() + { +- ::exit(0); ++ kapp->quit(); + } + + static KCmdLineOptions options[] = +@@ -207,7 +207,7 @@ + + KStartupInfo::appStarted(); + app->dcopClient()->attach(); +- return app->exec(); ++ app->exec(); + } + + #include "kio_media_mounthelper.moc" +diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 +@@ -1,1063 +0,0 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. +-# KDE tags expanded automatically by am_edit - $Revision: 483858 $ +-# @configure_input@ +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-target_triplet = @target@ +-subdir = kioslave/media/propsdlgplugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ +- "$(DESTDIR)$(kde_servicesdir)" +-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(kde_module_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-media_propsdlgplugin_la_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) +-am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo +-#>- media_propsdlgplugin_la_OBJECTS = \ +-#>- $(am_media_propsdlgplugin_la_OBJECTS) +-#>+ 5 +-media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo +-media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo propertiespagegui.lo +-@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-am__depfiles_maybe = depfiles +-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 2 +-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +-#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +-#>- $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 3 +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-CXXLD = $(CXX) +-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-#>+ 2 +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(media_propsdlgplugin_la_SOURCES) +-DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) +-kde_servicesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(kde_services_DATA) +-ETAGS = etags +-CTAGS = ctags +-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-#>+ 1 +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-ARTSCCONFIG = @ARTSCCONFIG@ +-ARTS_CFLAGS = @ARTS_CFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTODIRS = @AUTODIRS@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ +-COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ +-CONF_FILES = @CONF_FILES@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DBUSQT_INCS = @DBUSQT_INCS@ +-DBUSQT_LIBS = @DBUSQT_LIBS@ +-DBUS_CFLAGS = @DBUS_CFLAGS@ +-DBUS_INCS = @DBUS_INCS@ +-DBUS_LIBS = @DBUS_LIBS@ +-DCOPIDL = @DCOPIDL@ +-DCOPIDL2CPP = @DCOPIDL2CPP@ +-DCOPIDLNG = @DCOPIDLNG@ +-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DOXYGEN = @DOXYGEN@ +-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ +-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +-DPMSINC = @DPMSINC@ +-DPMSLIB = @DPMSLIB@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ +-EXEEXT = @EXEEXT@ +-EXR_FLAGS = @EXR_FLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ +-GLINC = @GLINC@ +-GLLIB = @GLLIB@ +-GMSGFMT = @GMSGFMT@ +-HALBACKEND = @HALBACKEND@ +-HAL_CFLAGS = @HAL_CFLAGS@ +-HAL_INCS = @HAL_INCS@ +-HAL_LIBS = @HAL_LIBS@ +-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ +-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ +-HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-JAR = @JAR@ +-JAVAC = @JAVAC@ +-JAVAH = @JAVAH@ +-JVMLIBS = @JVMLIBS@ +-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ +-KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ +-KCONFIG_COMPILER = @KCONFIG_COMPILER@ +-KDECONFIG = @KDECONFIG@ +-KDE_BINDIR = @KDE_BINDIR@ +-KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ +-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ +-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ +-KDE_HAVE_DOT = @KDE_HAVE_DOT@ +-KDE_INCLUDES = @KDE_INCLUDES@ +-KDE_LDFLAGS = @KDE_LDFLAGS@ +-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ +-KDE_MT_LIBS = @KDE_MT_LIBS@ +-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ +-KDE_PLUGIN = @KDE_PLUGIN@ +-KDE_RPATH = @KDE_RPATH@ +-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ +-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ +-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ +-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ +-KDE_USE_FPIE = @KDE_USE_FPIE@ +-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ +-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ +-KDE_USE_PIE = @KDE_USE_PIE@ +-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ +-KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ +-KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ +-KRB4_INCS = @KRB4_INCS@ +-KRB4_LIBS = @KRB4_LIBS@ +-KRB4_RPATH = @KRB4_RPATH@ +-KRB5_INCS = @KRB5_INCS@ +-KRB5_LIBS = @KRB5_LIBS@ +-KRB5_RPATH = @KRB5_RPATH@ +-KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ +-LDAP_INCS = @LDAP_INCS@ +-LDAP_LIBS = @LDAP_LIBS@ +-LDAP_RPATH = @LDAP_RPATH@ +-LDFLAGS = @LDFLAGS@ +-LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ +-LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ +-LIBALIB = @LIBALIB@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ +-LIBART_RPATH = @LIBART_RPATH@ +-LIBBZ2 = @LIBBZ2@ +-LIBCFG = @LIBCFG@ +-LIBCOMPAT = @LIBCOMPAT@ +-LIBCRYPT = @LIBCRYPT@ +-LIBCURSES = @LIBCURSES@ +-LIBDEVINFO = @LIBDEVINFO@ +-LIBDL = @LIBDL@ +-LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ +-LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ +-LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ +-LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ +-LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ +-LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ +-LIBGEN = @LIBGEN@ +-LIBHOSTS = @LIBHOSTS@ +-LIBJPEG = @LIBJPEG@ +-LIBKSTAT = @LIBKSTAT@ +-LIBMALLOC = @LIBMALLOC@ +-LIBOBJS = @LIBOBJS@ +-LIBODM = @LIBODM@ +-LIBOSSAUDIO = @LIBOSSAUDIO@ +-LIBPNG = @LIBPNG@ +-LIBPOSIX4 = @LIBPOSIX4@ +-LIBPTHREAD = @LIBPTHREAD@ +-LIBRESOLV = @LIBRESOLV@ +-LIBRPC = @LIBRPC@ +-LIBS = @LIBS@ +-LIBSENSORS = @LIBSENSORS@ +-LIBSHADOW = @LIBSHADOW@ +-LIBSM = @LIBSM@ +-LIBSOCKET = @LIBSOCKET@ +-LIBSSL = @LIBSSL@ +-LIBTOOL = @LIBTOOL@ +-LIBUCB = @LIBUCB@ +-LIBUSBCONFIG = @LIBUSBCONFIG@ +-LIBUTIL = @LIBUTIL@ +-LIBXDMCP = @LIBXDMCP@ +-LIBXFT_LIB = @LIBXFT_LIB@ +-LIBZ = @LIBZ@ +-LIB_ARTS = @LIB_ARTS@ +-LIB_DNSSD = @LIB_DNSSD@ +-LIB_EXR = @LIB_EXR@ +-LIB_FONT_ENC = @LIB_FONT_ENC@ +-LIB_KAB = @LIB_KAB@ +-LIB_KABC = @LIB_KABC@ +-LIB_KDECORE = @LIB_KDECORE@ +-LIB_KDED = @LIB_KDED@ +-LIB_KDEPIM = @LIB_KDEPIM@ +-LIB_KDEPRINT = @LIB_KDEPRINT@ +-LIB_KDEUI = @LIB_KDEUI@ +-LIB_KDNSSD = @LIB_KDNSSD@ +-LIB_KFILE = @LIB_KFILE@ +-LIB_KFM = @LIB_KFM@ +-LIB_KHTML = @LIB_KHTML@ +-LIB_KIMPROXY = @LIB_KIMPROXY@ +-LIB_KIO = @LIB_KIO@ +-LIB_KJS = @LIB_KJS@ +-LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ +-LIB_KPARTS = @LIB_KPARTS@ +-LIB_KSPELL = @LIB_KSPELL@ +-LIB_KSYCOCA = @LIB_KSYCOCA@ +-LIB_KUNITTEST = @LIB_KUNITTEST@ +-LIB_KUTILS = @LIB_KUTILS@ +-LIB_KVM = @LIB_KVM@ +-LIB_LBER = @LIB_LBER@ +-LIB_LIBS = @LIB_LIBS@ +-LIB_POLL = @LIB_POLL@ +-LIB_QPE = @LIB_QPE@ +-LIB_QT = @LIB_QT@ +-LIB_SMB = @LIB_SMB@ +-LIB_TRU64_MACH = @LIB_TRU64_MACH@ +-LIB_X11 = @LIB_X11@ +-LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ +-LIB_XCURSOR = @LIB_XCURSOR@ +-LIB_XEXT = @LIB_XEXT@ +-LIB_XF86MISC = @LIB_XF86MISC@ +-LIB_XFIXES = @LIB_XFIXES@ +-LIB_XINERAMA = @LIB_XINERAMA@ +-LIB_XRANDR = @LIB_XRANDR@ +-LIB_XRENDER = @LIB_XRENDER@ +-LIB_XSS = @LIB_XSS@ +-LINUXCDPOLLING = @LINUXCDPOLLING@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +-MCOPIDL = @MCOPIDL@ +-MD5SUM = @MD5SUM@ +-MD5SUM_CUT = @MD5SUM_CUT@ +-MEINPROC = @MEINPROC@ +-MOC = @MOC@ +-MSGFMT = @MSGFMT@ +-NOOPT_CFLAGS = @NOOPT_CFLAGS@ +-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PAMLIBS = @PAMLIBS@ +-PASSWDLIBS = @PASSWDLIBS@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-QTDOCDIR = @QTDOCDIR@ +-QTE_NORTTI = @QTE_NORTTI@ +-QT_INCLUDES = @QT_INCLUDES@ +-QT_LDFLAGS = @QT_LDFLAGS@ +-RANLIB = @RANLIB@ +-RUN_KAPPFINDER = @RUN_KAPPFINDER@ +-SASL2_LIBS = @SASL2_LIBS@ +-SETUIDFLAGS = @SETUIDFLAGS@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ +-SSL_INCLUDES = @SSL_INCLUDES@ +-SSL_LDFLAGS = @SSL_LDFLAGS@ +-STRIP = @STRIP@ +-TOPSUBDIRS = @TOPSUBDIRS@ +-UIC = @UIC@ +-UIC_TR = @UIC_TR@ +-UNAME = @UNAME@ +-USB_CFLAGS = @USB_CFLAGS@ +-USB_LIBS = @USB_LIBS@ +-USER_INCLUDES = @USER_INCLUDES@ +-USER_LDFLAGS = @USER_LDFLAGS@ +-USE_EXCEPTIONS = @USE_EXCEPTIONS@ +-USE_RTTI = @USE_RTTI@ +-USE_THREADS = @USE_THREADS@ +-VERSION = @VERSION@ +-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ +-XGETTEXT = @XGETTEXT@ +-XMLLINT = @XMLLINT@ +-XTESTLIB = @XTESTLIB@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_INCLUDES = @X_INCLUDES@ +-X_LDFLAGS = @X_LDFLAGS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-X_RPATH = @X_RPATH@ +-ac_ct_AR = @ac_ct_AR@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-all_includes = @all_includes@ +-all_libraries = @all_libraries@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ +-applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ +-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +-drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ +-drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +-exec_prefix = @exec_prefix@ +-have_xcursor_FALSE = @have_xcursor_FALSE@ +-have_xcursor_TRUE = @have_xcursor_TRUE@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-include_ARTS_FALSE = @include_ARTS_FALSE@ +-include_ARTS_TRUE = @include_ARTS_TRUE@ +-include_BZIP2_FALSE = @include_BZIP2_FALSE@ +-include_BZIP2_TRUE = @include_BZIP2_TRUE@ +-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ +-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ +-include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ +-include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ +-include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ +-include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ +-include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ +-include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ +-include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ +-include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ +-include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ +-include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ +-include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ +-include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ +-include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ +-include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ +-include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ +-include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ +-include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ +-include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ +-include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ +-include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ +-include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ +-include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ +-include_kompmgr_FALSE = @include_kompmgr_FALSE@ +-include_kompmgr_TRUE = @include_kompmgr_TRUE@ +-include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ +-include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ +-include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ +-include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ +-include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ +-include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ +-include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ +-include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ +-include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ +-include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ +-include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ +-include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ +-include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ +-include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ +-include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ +-include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ +-include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ +-include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ +-include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ +-include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ +-include_x11_FALSE = @include_x11_FALSE@ +-include_x11_TRUE = @include_x11_TRUE@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-install_usbids_FALSE = @install_usbids_FALSE@ +-install_usbids_TRUE = @install_usbids_TRUE@ +-jni_includes = @jni_includes@ +-kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ +-kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ +-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ +-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ +-kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ +-kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ +-kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ +-kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ +-kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ +-kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ +-kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ +-kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ +-kde_appsdir = @kde_appsdir@ +-kde_bindir = @kde_bindir@ +-kde_confdir = @kde_confdir@ +-kde_datadir = @kde_datadir@ +-kde_htmldir = @kde_htmldir@ +-kde_icondir = @kde_icondir@ +-kde_includes = @kde_includes@ +-kde_kcfgdir = @kde_kcfgdir@ +-kde_libraries = @kde_libraries@ +-kde_libs_htmldir = @kde_libs_htmldir@ +-kde_libs_prefix = @kde_libs_prefix@ +-kde_locale = @kde_locale@ +-kde_mimedir = @kde_mimedir@ +-kde_moduledir = @kde_moduledir@ +-kde_qtver = @kde_qtver@ +-kde_servicesdir = @kde_servicesdir@ +-kde_servicetypesdir = @kde_servicetypesdir@ +-kde_sounddir = @kde_sounddir@ +-kde_styledir = @kde_styledir@ +-kde_templatesdir = @kde_templatesdir@ +-kde_wallpaperdir = @kde_wallpaperdir@ +-kde_widgetdir = @kde_widgetdir@ +-kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ +-kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ +-kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ +-kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ +-kdeinitdir = @kdeinitdir@ +-kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ +-kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ +-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ +-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ +-kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ +-kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ +-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ +-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ +-kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ +-kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ +-kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ +-kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ +-kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ +-kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ +-kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ +-kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ +-khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ +-khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ +-khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ +-khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ +-kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ +-kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ +-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ +-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ +-klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ +-klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ +-kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ +-kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ +-knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ +-knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ +-konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ +-konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ +-konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ +-konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ +-kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ +-kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ +-kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ +-kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ +-kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ +-kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ +-kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ +-kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ +-ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ +-ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ +-ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ +-ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ +-kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ +-kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ +-ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ +-ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ +-ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ +-ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ +-ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ +-ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ +-kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ +-kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ +-kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ +-kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ +-l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ +-l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ +-libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-nogroup = @nogroup@ +-nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ +-nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ +-oldincludedir = @oldincludedir@ +-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ +-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-qt_includes = @qt_includes@ +-qt_libraries = @qt_libraries@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-supports_i8k_FALSE = @supports_i8k_FALSE@ +-supports_i8k_TRUE = @supports_i8k_TRUE@ +-sysconfdir = @sysconfdir@ +-target = @target@ +-target_alias = @target_alias@ +-target_cpu = @target_cpu@ +-target_os = @target_os@ +-target_vendor = @target_vendor@ +-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ +-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +-x_includes = @x_includes@ +-x_libraries = @x_libraries@ +-xdg_appsdir = @xdg_appsdir@ +-xdg_directorydir = @xdg_directorydir@ +-xdg_menudir = @xdg_menudir@ +-#>- METASOURCES = AUTO +-kde_module_LTLIBRARIES = media_propsdlgplugin.la +-media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) +-media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +-AM_CPPFLAGS = $(all_includes) +-kde_services_DATA = media_propsdlgplugin.desktop +-#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp +-#>+ 1 +-media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp +-#>- all: all-am +-#>+ 1 +-all: docs-am all-am +- +-.SUFFIXES: +-.SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +-#>- @for dep in $?; do \ +-#>- case '$(am__configure_deps)' in \ +-#>- *$$dep*) \ +-#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +-#>- && exit 0; \ +-#>- exit 1;; \ +-#>- esac; \ +-#>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +-#>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +-#>+ 12 +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-kde_moduleLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ +- done +- +-clean-kde_moduleLTLIBRARIES: +- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done +-#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-#>+ 2 +-@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- +-mostlyclean-compile: +- -rm -f *.$(OBJEXT) +- +-distclean-compile: +- -rm -f *.tab.c +- +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ +- +-.cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +- +-.cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +- +-.cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +- +-mostlyclean-libtool: +- -rm -f *.lo +- +-clean-libtool: +- -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-kde_servicesDATA: $(kde_services_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-uninstall-kde_servicesDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(LTLIBRARIES) $(DATA) +-installdirs: +- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-#>- clean: clean-am +-#>+ 1 +-clean: kde-rpo-clean clean-am +- +-#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +-#>- mostlyclean-am +-#>+ 2 +-clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +- mostlyclean-am +- +-distclean: distclean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-#>- install-data-am: install-kde_moduleLTLIBRARIES \ +-#>- install-kde_servicesDATA +-#>+ 2 +-install-data-am: \ +- install-kde_servicesDATA +- +-#>- install-exec-am: +-#>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES +- +-install-info: install-info-am +- +-install-man: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +- +-#>+ 8 +-media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp +- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp +- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure +- @echo "timestamp" > media_propsdlgplugin.la.closure +- +- +-#>+ 3 +-propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h +- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc +- +-#>+ 2 +-mocs: propsdlgshareplugin.moc +- +-#>+ 3 +-propertiespage.moc: $(srcdir)/propertiespage.h +- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc +- +-#>+ 2 +-mocs: propertiespage.moc +- +-#>+ 3 +-clean-metasources: +- -rm -f propsdlgshareplugin.moc propertiespage.moc +- +-#>+ 2 +-KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am +- +-#>+ 4 +-clean-ui: +- -rm -f \ +- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc +- +-#>+ 3 +-clean-closures: +- -rm -f media_propsdlgplugin.la.closure +- +-#>+ 2 +-docs-am: +- +-#>+ 15 +-force-reedit: +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +- +- +-#>+ 21 +-clean-bcheck: +- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out +- +-bcheck: bcheck-am +- +-bcheck-am: +- @for i in ; do \ +- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ +- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ +- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ +- echo "$$i"; \ +- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ +- rm -f $$i.bchecktest.cc; exit 1; \ +- fi ; \ +- echo "" >> $$i.bchecktest.cc.class; \ +- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ +- rm -f a.out; \ +- fi ; \ +- done +- +- +-#>+ 11 +-media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc +- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ +- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ +- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ +- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ +- done; \ +- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ +- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files +- +-#>+ 3 +-clean-final: +- -rm -f media_propsdlgplugin_la.all_cpp.cpp +- +-#>+ 3 +-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am +- +-#>+ 3 +-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am +- +-#>+ 3 +-no-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am +- +-#>+ 3 +-no-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am +- +-#>+ 3 +-kde-rpo-clean: +- -rm -f *.rpo +- +-#>+ 9 +-nmcheck: +-propsdlgshareplugin.o: propsdlgshareplugin.moc +-nmcheck-am: nmcheck +-propsdlgshareplugin.lo: propsdlgshareplugin.moc +-propertiespage.lo: propertiespage.moc +-$(srcdir)/propertiespage.cpp: propertiespagegui.h +-$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h +-propertiespage.o: propertiespage.moc +- +-#>+ 15 +-propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc +- rm -f propertiespagegui.cpp +- echo '#include <kdialog.h>' > propertiespagegui.cpp +- echo '#include <klocale.h>' >> propertiespagegui.cpp +- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ +- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ +- rm -f propertiespagegui.cpp.temp ;\ +- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi +- +-propertiespagegui.h: $(srcdir)/propertiespagegui.ui +- rm -rf propertiespagegui.h; +- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; +-propertiespagegui.moc: propertiespagegui.h +- $(MOC) propertiespagegui.h -o propertiespagegui.moc +diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 +@@ -1,73 +0,0 @@ +-[Desktop Entry] +-Encoding=UTF-8 +-Type=Service +-Name=Media Properties Page +-Name[ca]=Pà gina de propietats de suport +-Name[cs]=Stránka vlastnostà média +-Name[da]=Medieegenskabsside +-Name[de]=Eigenschaften von Medien +-Name[el]=Σελίδα ιδιοτήτων μÎσων +-Name[es]=Página de propiedades de medios +-Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه +-Name[fi]=Mediaominaisuudet +-Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija +-Name[hu]=MédiajellemzÅ‘k lap +-Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione +-Name[ja]=メディア属性ページ +-Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling +-Name[nds]=Medienegenschappen-Siet +-Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika +-Name[pt]=Página de Propriedades de Suportes FÃsicos +-Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ +-Name[sk]=Strana vlastnostà média +-Name[sl]=Stran z lastnostmi nosilca +-Name[sr]=Страна Ñа ÑвојÑтвима медијума +-Name[sr@Latn]=Strana sa svojstvima medijuma +-Name[sv]=Sida för mediaegenskaper +-Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації +-Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện +-Name[zh_TW]=媒體內容é +-Comment=Konqueror properties dialog plugin to configure mount behaviour +-Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge +-Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror +-Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel +-Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden +-Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης +-Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje +-Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن +-Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä +-Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja +-Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához +-Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio +-Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン +-Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror +-Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen +-Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania +-Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем +-Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia +-Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev +-Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању +-Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju +-Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende +-Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ +-Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết +-Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 +-X-KDE-Library=media_propsdlgplugin +-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted +diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp +--- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 +@@ -1,217 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#include <qcheckbox.h> +-#include <qtooltip.h> +-#include <qbuttongroup.h> +-#include <qlineedit.h> +-#include <qfileinfo.h> +-#include <qlabel.h> +-#include <qregexp.h> +-#include <kpushbutton.h> +-#include <kmessagebox.h> +-#include <klocale.h> +-#include <qcombobox.h> +-#include <qtimer.h> +-#include <kdebug.h> +-#include "propertiespage.h" +-#include <dcopref.h> +- +-// keep in sync with .ui and kded module +-const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; +-const char *journales[] = {"data", "ordered", "writeback", 0 }; +- +-PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) +- : PropertiesPageGUI(parent), id(_id) +-{ +- kdDebug() << "props page " << id << endl; +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mountoptions", id); +- +- QStringList list; +- +- if (reply.isValid()) +- list = reply; +- +- if (list.size()) { +- kdDebug() << "list " << list << endl; +- +- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- kdDebug() << "key '" << key << "' value '" << value << "'\n"; +- options[key] = value; +- } +- +- if (!options.contains("ro")) +- option_ro->hide(); +- else +- option_ro->setChecked(options["ro"] == "true"); +- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("quiet")) +- option_quiet->hide(); +- else +- option_quiet->setChecked(options["quiet"] == "true"); +- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("sync")) +- option_sync->hide(); +- else +- option_sync->setChecked(options["sync"] == "true"); +- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("atime")) +- option_atime->hide(); +- else +- option_atime->setChecked(options["atime"] == "true"); +- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("flush")) +- option_flush->hide(); +- else +- option_flush->setChecked(options["flush"] == "true"); +- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("utf8")) +- option_utf8->hide(); +- else +- option_utf8->setChecked(options["utf8"] == "true"); +- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("uid")) +- option_uid->hide(); +- else +- option_uid->setChecked(options["uid"] == "true"); +- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("shortname")) +- { +- option_shortname->hide(); +- text_shortname->hide(); +- } +- else +- { +- for (int index = 0; short_names[index]; ++index) +- if (options["shortname"] == short_names[index]) +- { +- option_shortname->setCurrentItem(index); +- break; +- } +- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- if (!options.contains("journaling")) +- { +- text_journaling->hide(); +- option_journaling->hide(); +- } +- else +- { +- for (int index = 0; journales[index]; ++index) +- if (options["journaling"] == journales[index]) +- { +- option_journaling->setCurrentItem(index); +- break; +- } +- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); +- option_mountpoint->setText(options["mountpoint"]); +- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); +- option_automount->setChecked(options["automount"] == "true"); +- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("journaling") && +- !options.contains("shortname") && +- !options.contains("uid") && +- !options.contains("utf8") && +- !options.contains("flush")) +- groupbox_specific->hide(); +- +- } else { +- +- groupbox_generic->setEnabled(false); +- groupbox_specific->setEnabled(false); +- label_filesystem->hide(); +- } +-} +- +-PropertiesPage::~PropertiesPage() +-{ +-} +- +-bool PropertiesPage::save() +-{ +- QStringList result; +- +- if (options.contains("ro")) +- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); +- +- if (options.contains("quiet")) +- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); +- +- if (options.contains("sync")) +- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); +- +- if (options.contains("atime")) +- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); +- +- if (options.contains("flush")) +- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); +- +- if (options.contains("utf8")) +- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); +- +- if (options.contains("uid")) +- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); +- +- if (options.contains("shortname")) +- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); +- +- if (options.contains("journaling")) +- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); +- +- QString mp = option_mountpoint->text(); +- if (!mp.startsWith("/media/")) +- { +- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); +- return false; +- } +- result << QString("mountpoint=%1").arg(mp); +- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); +- +- kdDebug() << result << endl; +- +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); +- +- if (reply.isValid()) +- return (bool)reply; +- else { +- KMessageBox::sorry(this, +- i18n("Saving the changes failed")); +- +- return false; +- } +-} +- +-#include "propertiespage.moc" +diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h +--- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 +@@ -1,46 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef PROPERTIESPAGE_H +-#define PROPERTIESPAGE_H +- +-#include "propertiespagegui.h" +-#include <qmap.h> +- +-class QCheckBox; +-class Medium; +- +-class PropertiesPage : public PropertiesPageGUI +-{ +- Q_OBJECT +- +-public: +- PropertiesPage(QWidget* parent, const QString &_id); +- virtual ~PropertiesPage(); +- +- bool save(); +- +-protected: +- +- QMap<QString,QString> options; +- QString id; +- +-}; +- +-#endif +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui +--- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 +@@ -1,387 +0,0 @@ +-<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +-<class>PropertiesPageGUI</class> +-<widget class="QWidget"> +- <property name="name"> +- <cstring>PropertiesPageGUI</cstring> +- </property> +- <property name="geometry"> +- <rect> +- <x>0</x> +- <y>0</y> +- <width>527</width> +- <height>476</height> +- </rect> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <property name="margin"> +- <number>0</number> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout17</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_generic</cstring> +- </property> +- <property name="title"> +- <string>Generic Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout15</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_ro</cstring> +- </property> +- <property name="text"> +- <string>Read only</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount the file system read-only.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_quiet</cstring> +- </property> +- <property name="text"> +- <string>Quiet</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_sync</cstring> +- </property> +- <property name="text"> +- <string>Synchronous</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>All I/O to the file system should be done synchronously.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_atime</cstring> +- </property> +- <property name="text"> +- <string>Access time updates</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Update inode access time for each access.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>textLabel3</cstring> +- </property> +- <property name="text"> +- <string>Mountpoint:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> +- </property> +- </widget> +- <widget class="QLineEdit"> +- <property name="name"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="text"> +- <string></string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_automount</cstring> +- </property> +- <property name="text"> +- <string>Mount automatically</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system automatically.</string> +- </property> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_specific</cstring> +- </property> +- <property name="title"> +- <string>Filesystem Specific Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout11</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_flush</cstring> +- </property> +- <property name="text"> +- <string>Flushed IO</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_utf8</cstring> +- </property> +- <property name="text"> +- <string>UTF-8 charset</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_uid</cstring> +- </property> +- <property name="text"> +- <string>Mount as user</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system as user.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout7</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_journaling</cstring> +- </property> +- <property name="text"> +- <string>Journaling:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>All Data</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Ordered</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Write Back</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_shortname</cstring> +- </property> +- <property name="text"> +- <string>Short names:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>Lower</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows 95</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows NT</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Mixed</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>label_filesystem</cstring> +- </property> +- <property name="text"> +- <string>Filesystem: iso9660</string> +- </property> +- </widget> +- <spacer> +- <property name="name"> +- <cstring>spacer1</cstring> +- </property> +- <property name="orientation"> +- <enum>Vertical</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </vbox> +- </widget> +- </hbox> +-</widget> +-<connections> +- <connection> +- <sender>option_ro</sender> +- <signal>stateChanged(int)</signal> +- <receiver>PropertiesPageGUI</receiver> +- <slot>changedSlot()</slot> +- </connection> +-</connections> +-<variables> +- <variable>bool m_hasChanged;</variable> +-</variables> +-<signals> +- <signal>changed()</signal> +-</signals> +-<slots> +- <slot access="protected">changedSlot()</slot> +-</slots> +-<functions> +- <function returnType="bool">hasChanged()</function> +-</functions> +-<layoutdefaults spacing="6" margin="11"/> +-</UI> +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h +--- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 +@@ -1,22 +0,0 @@ +-/**************************************************************************** +-** ui.h extension file, included from the uic-generated form implementation. +-** +-** If you wish to add, delete or rename functions or slots use +-** Qt Designer which will update this file, preserving your code. Create an +-** init() function in place of a constructor, and a destroy() function in +-** place of a destructor. +-*****************************************************************************/ +- +- +-void PropertiesPageGUI::changedSlot() +-{ +- m_hasChanged = true; +- emit changed(); +-} +- +-bool PropertiesPageGUI::hasChanged() +-{ +- return m_hasChanged; +-} +- +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 +@@ -1,100 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +-#include <qstring.h> +-#include <qvbox.h> +-#include <qlayout.h> +-#include <qlabel.h> +-#include <qtimer.h> +- +-#include <kgenericfactory.h> +-#include <kdebug.h> +-#include <kpushbutton.h> +-#include <kfileshare.h> +-#include <kmessagebox.h> +-#include <kprocess.h> +-#include <kstandarddirs.h> +-#include <kdialog.h> +-#include <kglobal.h> +-#include <dcopref.h> +- +-#include "propertiespage.h" +-#include "propsdlgshareplugin.h" +-#include "../libmediacommon/medium.h" +- +-typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; +- +-K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, +- PropsDlgSharePluginFactory("media_propsdlgplugin") ) +- +-class PropsDlgSharePlugin::Private +-{ +- public: +- PropertiesPage* page; +-}; +- +-PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, +- const char *, const QStringList & ) +- : KPropsDlgPlugin(dlg), d(0) +-{ +- if (properties->items().count() != 1) +- return; +- +- KFileItem *item = properties->items().first(); +- +- DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << item->url() << endl; +- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); +- +- if ( !reply.isValid() ) +- return; +- +- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); +- +- d = new Private(); +- +- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); +- connect(d->page, SIGNAL(changed()), +- SLOT(slotChanged())); +- +- // QTimer::singleShot(100, this, SLOT(slotChanged())); +- +-} +- +-void PropsDlgSharePlugin::slotChanged() +-{ +- kdDebug() << "slotChanged()\n"; +- setDirty(true); +-} +- +-PropsDlgSharePlugin::~PropsDlgSharePlugin() +-{ +- delete d; +-} +- +-void PropsDlgSharePlugin::applyChanges() +-{ +- kdDebug() << "applychanges\n"; +- if (!d->page->save()) { +- properties->abortApplying(); +- } +-} +- +- +-#include "propsdlgshareplugin.moc" +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 +@@ -1,44 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef KONQFILESHAREPLUGIN_H +-#define KONQFILESHAREPLUGIN_H +- +-#include <kpropertiesdialog.h> +- +-class PropsDlgSharePlugin : public KPropsDlgPlugin +-{ +-Q_OBJECT +-public: +- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); +- virtual ~PropsDlgSharePlugin(); +- virtual void applyChanges(); +- +-public slots: +- void slotChanged(); +- +-private: +- class Private; +- Private *d; +- +-}; +- +-#endif +- +- +diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop +diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt + Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن + Name[fi]=Poista turvallisesti + Name[fr]=Enlever en toute sécurité +-Name[fy]=Feilich verwiderje + Name[ga]=Bain Amach go Sábháilte + Name[gl]=Eliminar de Maneira Segura + Name[he]=שליפה בבטחה +@@ -46,7 +44,6 @@ + Name[ru]=БезопаÑно извлечь + Name[rw]=Gukuramo Neza + Name[se]=DorvvoÅ¡laÅ¡ eretváldin +-Name[sk]=BezpeÄne odpojiÅ¥ + Name[sl]=Varno odstrani + Name[sr]=Безбедно уклони + Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kdebase4-runtime/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kdebase4-runtime/files/patch-kio_media b/x11/kdebase4-runtime/files/patch-kio_media deleted file mode 100644 index 144c7914a0e5..000000000000 --- a/x11/kdebase4-runtime/files/patch-kio_media +++ /dev/null @@ -1,6118 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe - Name[he]=×”×ª×§× ×™× - Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ - Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállÃtása - Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក - Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ - Comment[pt_BR]=Configura as mÃdias de armazenamento - Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacÃch médià - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за Ñкладиштење - Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj - Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ - Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=MediumdieÄ‘ut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ - - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; - -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -- - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); -- -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); - - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -54,7 +53,6 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_backends.append( new FstabBackend(m_mediaList) ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -- --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- return i18n("Feature only available with HAL"); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- return i18n("Feature only available with HAL"); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo - Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ - Name[eu]=KDED media kudeatzailea - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=×ž× ×”×œ המדיה של KDED - Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ - Name[ru]=Управление подключаемыми уÑтройÑтвами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieÄ‘ahalli --Name[sk]=KDED správca médià - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) - Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ -+Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) - Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) - Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ - Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; - - class MediaManager : public KDEDModule - { -@@ -41,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -81,7 +74,6 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; - }; - -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima - Name[hu]=LemezfigyelÅ‘ szolgáltatás - Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba - Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв --Name[sk]=Notifikátor medià - Name[sl]=Demon za obveÅ¡Äanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser - Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº --Name[zh_TW]=媒體通知伺æœç¨‹å¼ - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima - Comment[hu]=LemezérzékelÅ‘ - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier - Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas - Comment[mk]=ИзвеÑтување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) - Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв --Comment[sk]=Notifikátor pripojených médià - Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌី​អូឌីយ៉ូ --Comment[mk]=Ðудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ស៊ីឌី​ទទ០- Comment[lt]=TuÅ¡Äias CD - Comment[lv]=TukÅ¡s CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=ÄŒisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ឌីវីឌី​ទទ០- Comment[lt]=TuÅ¡Äias DVD - Comment[lv]=TukÅ¡s DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=ÄŒisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=ÄŒatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ - Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD ВидеодиÑк - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ - Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диÑк - Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=ÄŒatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диÑка - Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диÑка - Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=ÄŒatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ - Comment[is]=VÃdeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク -+Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク - Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ - Comment[lo]= ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pà gina de propietats de suport --Name[cs]=Stránka vlastnostà média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μÎσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[hu]=MédiajellemzÅ‘k lap --Name[is]=Eiginleikar miðils --Name[ja]=メディア属性ページ --Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[pt]=Página de Propriedades de Suportes FÃsicos --Name[pt_BR]=Página de Propriedades de Suportes FÃsicos --Name[sk]=Strana vlastnostà média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна Ñа ÑвојÑтвима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації --Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện --Name[zh_TW]=媒體內容é --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン --Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev --Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ --Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết --Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ - Name[eu]=Atera arriskurik gabe - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ - Name[ru]=БезопаÑно извлечь - Name[rw]=Gukuramo Neza - Name[se]=DorvvoÅ¡laÅ¡ eretváldin --Name[sk]=BezpeÄne odpojiÅ¥ - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kdebase4-runtime/files/patch-konsole_konsole-TECommon.h b/x11/kdebase4-runtime/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kdebase4-runtime/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kdebase4-workspace/files/extrapatch-kio_media b/x11/kdebase4-workspace/files/extrapatch-kio_media new file mode 100644 index 000000000000..ab1a03b094cb --- /dev/null +++ b/x11/kdebase4-workspace/files/extrapatch-kio_media @@ -0,0 +1,5814 @@ +diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 +@@ -122,8 +122,7 @@ + DATA = $(kde_services_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services propsdlgplugin ++DIST_SUBDIRS = $(SUBDIRS) + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 1 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -276,6 +275,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -611,9 +611,8 @@ + xdg_appsdir = @xdg_appsdir@ + xdg_directorydir = @xdg_directorydir@ + xdg_menudir = @xdg_menudir@ +-@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin + SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) ++ kfile-plugin kcmodule mimetypes services + + INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) + #>- METASOURCES = AUTO +@@ -1092,8 +1091,7 @@ + ./testmedia + + messages: rc.cpp +- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp +- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot ++ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 +@@ -253,6 +253,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp +--- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 +@@ -39,15 +39,15 @@ + QString hal_text = view->kcfg_HalBackendEnabled->text(); + hal_text += " ("+i18n("No support for HAL on this system")+")"; + view->kcfg_HalBackendEnabled->setText( hal_text ); +-#endif + view->kcfg_HalBackendEnabled->setEnabled( false ); ++#endif + + #ifndef COMPILE_LINUXCDPOLLING + QString poll_text = view->kcfg_CdPollingEnabled->text(); + poll_text += " ("+i18n("No support for CD polling on this system")+")"; + view->kcfg_CdPollingEnabled->setText( poll_text ); +-#endif + view->kcfg_CdPollingEnabled->setEnabled( false ); ++#endif + + load(); + } +diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ + Name[he]=×”×ª×§× ×™× + Name[hi]=à¤à¤‚डार मीडिया + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz + Name[is]=Geymslumiðlar + Name[it]=Dispositivi di archiviazione + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ + Name[mk]=Медиуми за податоци + Name[ms]=Media Storan + Name[nb]=Lagringsenheter +-Name[nds]=Spiekermedien ++Name[nds]=Spiekerreedschappen + Name[nl]=Opslagapparaten + Name[nn]=Lagringsmedium + Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ +@@ -54,7 +53,6 @@ + Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… + Name[rw]=Uburyo bwo Kubika + Name[se]=Vurkenmedia +-Name[sk]=Zálohovacie médiá + Name[sl]=Nosilci za shranjevanje + Name[sr]=Складишни медијуми + Name[sr@Latn]=SkladiÅ¡ni medijumi +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage + Comment[fy]=Opslachmedia ynstelle + Comment[ga]=Cumraigh Meáin Stórála + Comment[gl]=Configurar Medios de Armacenaxe +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu + Comment[hu]=A tárolóeszközök beállÃtása + Comment[is]=Stillingar geymslumiðla +@@ -98,16 +94,15 @@ + Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius + Comment[mk]=Конфигурирајте ги медиумите за податоци + Comment[nb]=Sett opp lagringsmedier +-Comment[nds]=Spiekermedien instellen ++Comment[nds]=Spiekerreedschappen instellen + Comment[nl]=Opslagmedia instellen + Comment[nn]=Set opp lagringsmedium + Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento + Comment[pt_BR]=Configura as mÃdias de armazenamento + Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Comment[se]=Heivet vurkenmediaid +-Comment[sk]=Nastavenie zálohovacÃch médià + Comment[sl]=Nastavitve nosilcev za shranjevanje + Comment[sr]=Подешавање медијума за Ñкладиштење + Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique + Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart + Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas + Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo +-Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz + Keywords[is]=geymsla,miðill,usb,cdrom,tæki +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava +diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp +--- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 +@@ -174,8 +174,8 @@ + ActionListBoxItem *action_item + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + +- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ NotifierServiceAction * action; ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) + { + ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); + +@@ -195,8 +195,7 @@ + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + + NotifierServiceAction *action; +- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) + { + m_settings.deleteAction( action ); + updateListBox(); +diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 +@@ -248,6 +248,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Name[es]=Información de recursos + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ + Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе + Name[rw]=Amakuru y'igitangazamakuru + Name[se]=MediumdieÄ‘ut +-Name[sk]=Informácie o médiu + Name[sl]=Informacije o mediju + Name[sr]=Информације о медијуму + Name[sr@Latn]=Informacije o medijumu +@@ -63,4 +61,4 @@ + Name[zh_TW]=媒體資訊 + ServiceTypes=KFilePlugin + X-KDE-Library=kfile_media +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted ++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera +diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp +--- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 +@@ -64,16 +64,12 @@ + addMimeType( "media/floppy_unmounted" ); + addMimeType( "media/zip_unmounted" ); + addMimeType( "media/gphoto2camera" ); +- addMimeType( "media/camera_mounted" ); +- addMimeType( "media/camera_unmounted" ); + } + + bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) + { +- const Medium medium = askMedium(info); ++ const Medium medium = askMedium(info); + +- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; +- + if (medium.id().isNull()) return false; + + QString mount_point = medium.mountPoint(); +@@ -165,8 +161,7 @@ + const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) + { + DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << info.url() << endl; +- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); ++ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); + + if ( !reply.isValid() ) + { +diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 +@@ -250,6 +250,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp +--- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 +@@ -40,8 +40,6 @@ + m_properties+= QString::null; /* ICON_NAME */ + + loadUserLabel(); +- +- m_halmounted = false; + } + + Medium::Medium() +@@ -59,8 +57,6 @@ + m_properties+= QString::null; /* BASE_URL */ + m_properties+= QString::null; /* MIME_TYPE */ + m_properties+= QString::null; /* ICON_NAME */ +- +- m_halmounted = false; + } + + const Medium Medium::create(const QStringList &properties) +@@ -163,7 +159,7 @@ + bool Medium::mountableState(bool mounted) + { + if ( m_properties[DEVICE_NODE].isEmpty() +- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) ++ || m_properties[MOUNT_POINT].isEmpty() ) + { + return false; + } +@@ -208,10 +204,14 @@ + + KURL Medium::prettyBaseURL() const + { +- if ( !baseURL().isEmpty() ) +- return baseURL(); +- ++ if ( isMountable() ) ++ { + return KURL( mountPoint() ); ++ } ++ else ++ { ++ return KURL( baseURL() ); ++ } + } + + QString Medium::prettyLabel() const +diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h +--- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 +@@ -22,7 +22,6 @@ + #include <qstring.h> + #include <qstringlist.h> + #include <kurl.h> +-#include <qmap.h> + + class Medium + { +@@ -79,32 +78,14 @@ + + void setMimeType(const QString &mimeType); + void setIconName(const QString &iconName); +- void setHalMounted(bool flag) const { m_halmounted = flag; } +- bool halMounted() const { return m_halmounted; } + + private: + Medium(); + void loadUserLabel(); + + QStringList m_properties; +- mutable bool m_halmounted; +- ++ + friend class QValueListNode<const Medium>; + }; +- +-namespace MediaManagerUtils { +- static inline QMap<QString,QString> splitOptions(const QStringList & options) +- { +- QMap<QString,QString> valids; +- +- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- valids[key] = value; +- } +- return valids; +- } +-} + + #endif +diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp +--- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 +@@ -226,8 +226,6 @@ + + mp_mounting = &medium; + +- +- /* + KIO::Job* job = KIO::mount(false, 0, + medium.deviceNode(), + medium.mountPoint()); +@@ -236,7 +234,6 @@ + this, SLOT( slotMountResult( KIO::Job * ) ) ); + connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), + this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); +- */ + kapp->dcopClient() + ->connectDCOPSignal("kded", "mediamanager", + "mediumChanged(QString, bool)", +@@ -244,17 +241,7 @@ + "slotMediumChanged(QString)", + false); + +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_lastErrorMessage); +- else +- m_lastErrorMessage = i18n("Internal Error"); +- if (!m_lastErrorMessage.isEmpty()) +- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; +- else { +- qApp->eventLoop()->enterLoop(); +- } ++ qApp->eventLoop()->enterLoop(); + + mp_mounting = 0L; + +diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 +@@ -284,6 +284,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ + if ( mount->mountType() == "swap" + || mount->mountType() == "tmpfs" + || mount->mountType() == "sysfs" +- || mount->mountType() == "fdescfs" + || mount->mountType() == "kernfs" + || mount->mountType() == "usbfs" + || mount->mountType().contains( "proc" ) +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 + + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ + + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; +- if(m_mtabEntries.contains(mtabEntry)) { +- new_mtabIds += m_mtabEntries[mtabEntry]; +- continue; +- } ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + + QString id = generateId(dev, mp); + new_mtabIds+=id; +- m_mtabEntries[mtabEntry] = id; + + if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) + { + QString mime, icon, label; + guess(dev, mp, fs, true, mime, icon, label); ++ + m_mediaList.changeMediumState(id, true, false, + mime, icon, label); + } +@@ -237,10 +211,6 @@ + QString mp = medium->mountPoint(); + QString fs = medium->fsType(); + +- +- QString mtabEntry = dev + "*" + mp + "*" + fs; +- m_mtabEntries.remove(mtabEntry); +- + QString mime, icon, label; + guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) +diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 +@@ -23,7 +23,6 @@ + + #include <qobject.h> + #include <qstringlist.h> +-#include <qmap.h> + + #ifdef Q_OS_FREEBSD + #include <qtimer.h> +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ + + bool m_networkSharesOnly; + QStringList m_mtabIds; +- QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; + QStringList m_fstabIds; + #ifdef Q_OS_FREEBSD + QTimer m_mtabTimer; +diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 +@@ -21,16 +21,9 @@ + + #include <stdlib.h> + +-#include <qfile.h> + #include <klocale.h> + #include <kurl.h> + #include <kdebug.h> +-#include <kprocess.h> +-#include <kconfig.h> +-#include <qstylesheet.h> +-#include <kmountpoint.h> +-#include <kmessagebox.h> +-#include <kio/job.h> + + #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) + #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) +@@ -39,1177 +32,615 @@ + static HALBackend* s_HALBackend; + + /* A macro function to convert HAL string properties to QString */ +-QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) ++QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) + { +- char* _ppt_string; +- QString _ppt_QString; +- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); +- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); +- libhal_free_string(_ppt_string); +- return _ppt_QString; ++ char* _ppt_string; ++ QString _ppt_QString; ++ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); ++ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); ++ libhal_free_string(_ppt_string); ++ return _ppt_QString; + } + + /* Constructor */ + HALBackend::HALBackend(MediaList &list, QObject* parent) +- : QObject() +- , BackendBase(list) +- , m_halContext(NULL) +- , m_halStoragePolicy(NULL) +- , m_parent(parent) ++ : QObject() ++ , BackendBase(list) ++ , m_halContext(NULL) ++ , m_halStoragePolicy(NULL) ++ , m_parent(parent) + { +- s_HALBackend = this; ++ s_HALBackend = this; + } + + /* Destructor */ + HALBackend::~HALBackend() + { +- /* Close HAL connection */ +- if (m_halContext) +- { +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- unmount(current_medium->id()); +- +- +- /* Remove all the registered media first */ +- int numDevices; +- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); +- +- if ( halDeviceList ) +- { +- for ( int i = 0; i < numDevices; i++ ) +- { +- m_mediaList.removeMedium( halDeviceList[i], false ); +- } +- } +- +- libhal_free_string_array( halDeviceList ); +- +- DBusError error; +- dbus_error_init(&error); +- libhal_ctx_shutdown(m_halContext, &error); +- libhal_ctx_free(m_halContext); +- } +- +- if (m_halStoragePolicy) +- libhal_storage_policy_free(m_halStoragePolicy); ++ /* Close HAL connection */ ++ if (m_halContext) ++ { ++ /* Remove all the registered media first */ ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); ++ ++ if ( halDeviceList ) ++ { ++ for ( int i = 0; i < numDevices; i++ ) ++ { ++ m_mediaList.removeMedium( halDeviceList[i], false ); ++ } ++ } ++ ++ #ifdef HAL_0_4 ++ hal_shutdown(m_halContext); ++ #else ++ libhal_ctx_shutdown(m_halContext, NULL); ++ libhal_ctx_free(m_halContext); ++ #endif ++ } ++ ++ if (m_halStoragePolicy) ++ libhal_storage_policy_free(m_halStoragePolicy); + } + + /* Connect to the HAL */ + bool HALBackend::InitHal() + { +- kdDebug(1219) << "Context new" << endl; +- m_halContext = libhal_ctx_new(); +- if (!m_halContext) +- { +- kdDebug(1219) << "Failed to initialize HAL!" << endl; +- return false; +- } +- +- // Main loop integration +- kdDebug(1219) << "Main loop integration" << endl; +- DBusError error; +- dbus_error_init(&error); +- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- +- dbus_bus_register(dbus_connection, &error); +- +- if (dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- MainLoopIntegration(dbus_connection); +- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); +- +- // HAL callback functions +- kdDebug(1219) << "Callback functions" << endl; +- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); +- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); +- libhal_ctx_set_device_new_capability (m_halContext, NULL); +- libhal_ctx_set_device_lost_capability (m_halContext, NULL); +- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); +- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); +- +- kdDebug(1219) << "Context Init" << endl; +- if (!libhal_ctx_init(m_halContext, &error)) +- { +- if (dbus_error_is_set(&error)) +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- kdDebug(1219) << "Failed to init HAL context!" << endl; +- return false; +- } +- +- /** @todo customize watch policy */ +- kdDebug(1219) << "Watch properties" << endl; +- if (!libhal_device_property_watch_all(m_halContext, &error)) +- { +- kdDebug(1219) << "Failed to watch HAL properties!" << endl; +- return false; +- } +- +- /* libhal-storage initialization */ +- kdDebug(1219) << "Storage Policy" << endl; +- m_halStoragePolicy = libhal_storage_policy_new(); +- /** @todo define libhal-storage icon policy */ ++#ifdef HAL_0_4 /* HAL API 0.4 */ ++ /* libhal initialization */ ++ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; ++ m_halFunctions.device_added = HALBackend::hal_device_added; ++ m_halFunctions.device_removed = HALBackend::hal_device_removed; ++ m_halFunctions.device_new_capability = NULL; ++ m_halFunctions.device_lost_capability = NULL; ++ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; ++ m_halFunctions.device_condition = HALBackend::hal_device_condition; ++ ++ m_halContext = hal_initialize(&m_halFunctions, false); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (libhal_device_property_watch_all(m_halContext, NULL)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#else /* HAL API >= 0.5 */ ++ kdDebug(1219) << "Context new" << endl; ++ m_halContext = libhal_ctx_new(); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ // Main loop integration ++ kdDebug(1219) << "Main loop integration" << endl; ++ DBusError error; ++ dbus_error_init(&error); ++ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); ++ if (dbus_error_is_set(&error)) { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ return false; ++ } ++ MainLoopIntegration(dbus_connection); ++ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); ++ ++ // HAL callback functions ++ kdDebug(1219) << "Callback functions" << endl; ++ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); ++ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); ++ libhal_ctx_set_device_new_capability (m_halContext, NULL); ++ libhal_ctx_set_device_lost_capability (m_halContext, NULL); ++ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); ++ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); + +- /* List devices at startup */ +- return ListDevices(); ++ kdDebug(1219) << "Context Init" << endl; ++ if (!libhal_ctx_init(m_halContext, &error)) ++ { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ kdDebug(1219) << "Failed to init HAL context!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (!libhal_device_property_watch_all(m_halContext, &error)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#endif ++ ++ /* libhal-storage initialization */ ++ kdDebug(1219) << "Storage Policy" << endl; ++ m_halStoragePolicy = libhal_storage_policy_new(); ++ /** @todo define libhal-storage icon policy */ ++ ++ /* List devices at startup */ ++ return ListDevices(); + } + + /* List devices (at startup)*/ + bool HALBackend::ListDevices() + { +- kdDebug(1219) << "ListDevices" << endl; ++ kdDebug(1219) << "ListDevices" << endl; + +- int numDevices; +- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); + +- if (!halDeviceList) +- return false; ++ if (!halDeviceList) ++ return false; + +- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; +- for (int i = 0; i < numDevices; i++) +- AddDevice(halDeviceList[i], false); ++ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; ++ for (int i = 0; i < numDevices; i++) ++ AddDevice(halDeviceList[i], false); + +- libhal_free_string_array( halDeviceList ); +- +- return true; ++ return true; + } + + /* Create a media instance for the HAL device "udi". +- This functions checks whether the device is worth listing */ ++This functions checks whether the device is worth listing */ + void HALBackend::AddDevice(const char *udi, bool allowNotification) + { +- /* We don't deal with devices that do not expose their capabilities. +- If we don't check this, we will get a lot of warning messages from libhal */ +- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- return; +- +- /* If the device is already listed, do not process. +- This should not happen, but who knows... */ +- /** @todo : refresh properties instead ? */ +- if (m_mediaList.findById(udi)) +- return; +- +- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) +- allowNotification=false; +- +- /* Add volume block devices */ +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- /* We only list volume that have a filesystem or volume that have an audio track*/ +- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) +- return; +- +- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && +- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) +- return; +- +- /* Query drive udi */ +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- /* We don't list floppy volumes because we list floppy drives */ +- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) +- return; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) +- allowNotification=false; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) +- allowNotification=false; +- +- /** @todo check exclusion list **/ +- +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- +- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); +- kdDebug() << "automount " << options["automount"] << endl; +- if (options["automount"] == "true" && allowNotification ) { +- QString error = mount(medium); +- if (!error.isEmpty()) +- kdDebug() << "error " << error << endl; +- } +- setVolumeProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- +- return; +- } +- +- /* Floppy & zip drives */ +- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) +- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setFloppyProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } +- +- /* Camera handled by gphoto2*/ +- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && +- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || +- +- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && +- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) +- ) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setCameraProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } ++ /* We don't deal with devices that do not expose their capabilities. ++ If we don't check this, we will get a lot of warning messages from libhal */ ++ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ return; ++ ++ /* If the device is already listed, do not process. ++ This should not happen, but who knows... */ ++ /** @todo : refresh properties instead ? */ ++ if (m_mediaList.findById(udi)) ++ return; ++ ++ /* Add volume block devices */ ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ /* We only list volume that have a filesystem or volume that have an audio track*/ ++ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) ++ return; ++ /* Query drive udi */ ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ /* We don't list floppy volumes because we list floppy drives */ ++ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) ++ return; ++ ++ /** @todo check exclusion list **/ ++ ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setVolumeProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ ++ return; ++ } ++ ++ /* Floppy & zip drives */ ++ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) ++ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setFloppyProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } ++ ++ /* Camera handled by gphoto2*/ ++ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && ++#ifdef HAL_0_4 ++ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) ++#else ++ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || ++ ++ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) ++#endif ++ ) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setCameraProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } + } + + void HALBackend::RemoveDevice(const char *udi) + { +- m_mediaList.removeMedium(udi, true); ++ m_mediaList.removeMedium(udi, true); + } + + void HALBackend::ModifyDevice(const char *udi, const char* key) + { +- Q_UNUSED(key); +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- if (!mediumUdi) +- return; +- ResetProperties(mediumUdi); ++ Q_UNUSED(key); ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ResetProperties(mediumUdi); + } + + void HALBackend::DeviceCondition(const char* udi, const char* condition) + { +- QString conditionName = QString(condition); +- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; +- +- if (conditionName == "EjectPressed") { +- const Medium* medium = m_mediaList.findById(udi); +- if (!medium) { +- /* the ejectpressed appears on the drive and we need to find the volume */ +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); +- if (driveUdi == udi) +- { +- medium = current_medium; +- break; +- } +- } +- } +- if (medium) { +- KProcess p; +- p << "kio_media_mounthelper" << "-e" << medium->name(); +- p.start(KProcess::DontCare); +- } +- } +- +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; +- if (!mediumUdi) +- return; +- +- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ +- if (conditionName == "VolumeUnmountForced") +- ResetProperties(mediumUdi); +- +- /* Reset properties after mounting */ +- if (conditionName == "VolumeMount") +- ResetProperties(mediumUdi); +- +- /* Reset properties after unmounting */ +- if (conditionName == "VolumeUnmount") +- ResetProperties(mediumUdi); +- ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ++ QString conditionName = QString(condition); ++ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; ++ ++ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ ++ if (conditionName == "VolumeUnmountForced") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after mounting */ ++ if (conditionName == "VolumeMount") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after unmounting */ ++ if (conditionName == "VolumeUnmount") ++ ResetProperties(mediumUdi); + } + + void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) + { +- m_dBusQtConnection = new DBusQt::Connection(m_parent); +- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); ++ m_dBusQtConnection = new DBusQt::Connection(m_parent); ++ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); + } + + /****************************************** +- ** Properties attribution ** +- ******************************************/ ++** Properties attribution ** ++******************************************/ + + /* Return the medium udi that should be updated when recieving a call for +- device udi */ ++device udi */ + const char* HALBackend::findMediumUdiFromUdi(const char* udi) + { +- /* Easy part : this Udi is already registered as a device */ +- const Medium* medium = m_mediaList.findById(udi); +- if (medium) +- return medium->id().ascii(); +- +- /* Hard part : this is a volume whose drive is registered */ +- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- return findMediumUdiFromUdi(driveUdi.ascii()); +- } ++ /* Easy part : this Udi is already registered as a device */ ++ const Medium* medium = m_mediaList.findById(udi); ++ if (medium) ++ return medium->id().ascii(); ++ ++ /* Hard part : this is a volume whose drive is registered */ ++ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ return findMediumUdiFromUdi(driveUdi.ascii()); ++ } + +- return NULL; ++ return NULL; + } + + void HALBackend::ResetProperties(const char* mediumUdi) + { +- kdDebug(1219) << "HALBackend::setProperties" << endl; +- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) +- { +- const Medium *cmedium = m_mediaList.findById(mediumUdi); +- if ( cmedium ) +- { +- Medium m( *cmedium ); +- if ( setFstabProperties( &m ) ) { +- kdDebug() << "setFstabProperties worked" << endl; +- m_mediaList.changeMediumState(m, false); +- } +- return; +- } +- } +- +- Medium* m = new Medium(mediumUdi, ""); +- +- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) +- setVolumeProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) +- setFloppyProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) +- setCameraProperties(m); ++ kdDebug(1219) << "HALBackend::setProperties" << endl; + +- m_mediaList.changeMediumState(*m, false); ++ Medium* m = new Medium(mediumUdi, ""); ++ ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) ++ setVolumeProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) ++ setFloppyProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) ++ setCameraProperties(m); + +- delete m; +-} ++ m_mediaList.changeMediumState(*m, false); + +-void HALBackend::setVolumeProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /* Get device information from libhal-storage */ +- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); +- if (!halVolume) +- return; +- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); +- if (!halDrive) { +- // at times HAL sends an UnmountForced event before the device is removed +- libhal_volume_free(halVolume); +- return; +- } +- +- medium->setName( +- generateName(libhal_volume_get_device_file(halVolume)) ); +- +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- +- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- QString volume_name = QString::fromUtf8(name); +- QString media_name = volume_name; +- medium->setLabel(media_name); +- free(name); +- +- QString mimeType; +- if (libhal_volume_is_disc(halVolume)) +- { +- mimeType = "media/cdrom" + MOUNT_SUFFIX; +- +- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankcd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/cdwriter" + MOUNT_SUFFIX; +- +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankdvd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/dvd" + MOUNT_SUFFIX; +- +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- +- /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) +- { +- case DiscType::VCD: +- mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: +- mimeType = "media/svcd"; +- break; +- case DiscType::DVD: +- mimeType = "media/dvdvideo"; +- break; +- } +- } +- else +- { +- mimeType = "media/hdd" + MOUNT_SUFFIX; +- if (libhal_drive_is_hotpluggable(halDrive)) +- { +- mimeType = "media/removable" + MOUNT_SUFFIX; +- medium->needMounting(); +- switch (libhal_drive_get_type(halDrive)) { +- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: +- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: +- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: +- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SD_MMC: +- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: +- { +- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); +- break; +- } +- case LIBHAL_DRIVE_TYPE_CAMERA: +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); +- // get model from camera +- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) +- { +- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); +- } +- break; +- } +- case LIBHAL_DRIVE_TYPE_TAPE: +- medium->setIconName(QString::null); //FIXME need icon +- break; +- default: +- medium->setIconName(QString::null); +- } +- +- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- } +- } +- } +- medium->setMimeType(mimeType); +- +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); ++ delete m; + } + +-bool HALBackend::setFstabProperties( Medium *medium ) ++void HALBackend::setVolumeProperties(Medium* medium) + { +- QString mp = isInFstab(medium); ++ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; + +- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) +- { +- // now that we know it's in fstab, we have to find out if it's mounted +- KMountPoint::List mtab = KMountPoint::currentMountPoints(); +- +- KMountPoint::List::iterator it = mtab.begin(); +- KMountPoint::List::iterator end = mtab.end(); +- +- bool mounted = false; +- +- for (; it!=end; ++it) +- { +- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) +- { +- mounted = true; +- break; +- } +- } +- +- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; +- QString fstype = medium->fsType(); +- if ( fstype.isNull() ) +- fstype = "auto"; +- +- medium->mountableState( +- medium->deviceNode(), +- mp, /* Mount point */ +- fstype, /* Filesystem type */ +- mounted ); /* Mounted ? */ ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /* Get device information from libhal-storage */ ++ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); ++ if (!halVolume) ++ return; ++ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); ++ ++ medium->setName( ++ generateName(libhal_volume_get_device_file(halVolume)) ); ++ ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ ++ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ QString media_name = volume_name; ++ medium->setLabel(media_name); ++ free(name); + +- return true; +- } ++ QString mimeType; ++ if (libhal_volume_is_disc(halVolume)) ++ { ++ mimeType = "media/cdrom" + MOUNT_SUFFIX; + +- return false; ++ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankcd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/cdwriter" + MOUNT_SUFFIX; ++ ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankdvd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/dvd" + MOUNT_SUFFIX; ++ ++ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); ++ ++ /* check if the disc id a vcd or a video dvd */ ++ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); ++ switch (type) ++ { ++ case DiscType::VCD: ++ mimeType = "media/vcd"; ++ break; ++ case DiscType::SVCD: ++ mimeType = "media/svcd"; ++ break; ++ case DiscType::DVD: ++ mimeType = "media/dvdvideo"; ++ break; ++ } ++ } ++ else ++ { ++ mimeType = "media/hdd" + MOUNT_SUFFIX; ++ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); ++ if (libhal_drive_is_hotpluggable(halDrive)) ++ { ++ mimeType = "media/removable" + MOUNT_SUFFIX; ++ medium->needMounting(); ++ switch (libhal_drive_get_type(halDrive)) { ++ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: ++ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: ++ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: ++ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SD_MMC: ++ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: ++ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_CAMERA: ++ mimeType = "media/camera" + MOUNT_SUFFIX; ++ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); ++ // get model from camera ++ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) ++ { ++ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); ++ } ++ break; ++ case LIBHAL_DRIVE_TYPE_TAPE: ++ medium->setIconName(QString::null); //FIXME need icon ++ break; ++ default: ++ medium->setIconName(QString::null); ++ }; ++ }; ++ } ++ medium->setMimeType(mimeType); + ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + + // Handle floppies and zip drives + void HALBackend::setFloppyProperties(Medium* medium) + { +- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; ++ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; + +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); +- if (!halDrive) +- return; +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- LibHalVolume* halVolume = NULL; +- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; +- if (numVolumes) +- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); +- +- medium->setName( +- generateName(libhal_drive_get_device_file(halDrive)) ); +- +- if (halVolume) +- { +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- } +- else +- { +- // HAL hates floppies - so we have to do it twice ;( +- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); +- setFstabProperties( medium ); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") +- { +- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume +- medium->setMimeType("media/floppy_mounted" ); +- else +- medium->setMimeType("media/floppy_unmounted"); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") +- { +- if (medium->isMounted()) +- medium->setMimeType("media/zip_mounted" ); +- else +- medium->setMimeType("media/zip_unmounted"); +- } +- +- /** @todo And mimtype for JAZ drives ? */ +- +- medium->setIconName(QString::null); +- +- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- +- if (name) { +- medium->setLabel( QString::fromUtf8(name) ); +- free(name); +- } +- +- free(volumes); +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); +-} ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); ++ if (!halDrive) ++ return; ++ int numVolumes; ++ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); ++ LibHalVolume* halVolume = NULL; ++ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; ++ if (numVolumes) ++ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); + +-void HALBackend::setCameraProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /** @todo find name */ +- medium->setName("camera"); +- +- QString device = "camera:/"; +- +- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); +- DBusError error; +- dbus_error_init(&error); +- if (cam && +- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && +- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) +- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, +- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), +- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); +- +- libhal_free_string(cam); +- +- /** @todo find the rest of this URL */ +- medium->unmountableState(device); +- medium->setMimeType("media/gphoto2camera"); +- medium->setIconName(QString::null); +- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); +- else +- medium->setLabel(i18n("Camera")); +-} ++ medium->setName( ++ generateName(libhal_drive_get_device_file(halDrive)) ); + +-QString HALBackend::generateName(const QString &devNode) +-{ +- return KURL(devNode).fileName(); +-} ++ if (halVolume) ++ { ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ } ++ else ++ { ++ medium->mountableState( ++ libhal_drive_get_device_file(halDrive), /* Device node */ ++ "", /* Mount point */ ++ "", /* Filesystem type */ ++ false ); /* Mounted ? */ ++ } + +-/****************************************** +- ** HAL CALL-BACKS ** +- ******************************************/ ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ++ { ++ if (halVolume) ++ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/floppy_unmounted"); ++ } + +-void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->AddDevice(udi); +-} ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ++ { ++ if (halVolume) ++ medium->setMimeType("media/zip" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/zip_unmounted"); ++ } + +-void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->RemoveDevice(udi); +-} ++ /** @todo And mimtype for JAZ drives ? */ + +-void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, +- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) +-{ +- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(is_removed); +- Q_UNUSED(is_added); +- s_HALBackend->ModifyDevice(udi, key); +-} ++ medium->setIconName(QString::null); + +-void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, +- const char *condition_name, +- const char* message +- ) +-{ +- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(message); +- s_HALBackend->DeviceCondition(udi, condition_name); ++ QString media_name; ++ if (halVolume) ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ media_name = volume_name; ++ free(name); ++ } ++ else ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString drive_name = QString::fromUtf8(name); ++ media_name = drive_name; ++ free(name); ++ } ++ medium->setLabel(media_name); ++ ++ free(volumes); ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + +-QStringList HALBackend::mountoptions(const QString &name) ++void HALBackend::setCameraProperties(Medium* medium) + { +- const Medium* medium = m_mediaList.findById(name); +- if (medium && !isInFstab(medium).isNull()) +- return QStringList(); // not handled by HAL - fstab entry +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); +- QMap<QString,bool> valids; +- +- for (int index = 0; array && array[index]; ++index) { +- QString t = array[index]; +- if (t.endsWith("=")) +- t = t.left(t.length() - 1); +- valids[t] = true; +- kdDebug() << "valid " << t << endl; +- } +- libhal_free_string_array(array); +- QStringList result; +- QString tmp; +- +- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); +- if (fstype.isNull()) +- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); +- +- +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- +- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) +- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); +- +- config.setGroup(drive_udi); +- bool value = config.readBoolEntry("automount", false); +- config.setGroup(name); +- +- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) +- value = false; +- +- result << QString("automount=%1").arg(value ? "true" : "false"); +- +- if (valids.contains("ro")) +- { +- value = config.readBoolEntry("ro", false); +- tmp = QString("ro=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("quiet")) +- { +- value = config.readBoolEntry("quiet", false); +- tmp = QString("quiet=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("flush")) +- { +- value = config.readBoolEntry("flush", fstype.endsWith("fat")); +- tmp = QString("flush=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("uid")) +- { +- value = config.readBoolEntry("uid", true); +- tmp = QString("uid=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("utf8")) +- { +- value = config.readBoolEntry("utf8", true); +- tmp = QString("utf8=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("shortname")) +- { +- QString svalue = config.readEntry("shortname", "lower").lower(); +- if (svalue == "winnt") +- result << "shortname=winnt"; +- else if (svalue == "win95") +- result << "shortname=win95"; +- else if (svalue == "mixed") +- result << "shortname=mixed"; +- else +- result << "shortname=lower"; +- } +- +- if (valids.contains("sync")) +- { +- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); +- tmp = QString("sync=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("noatime")) +- { +- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); +- tmp = QString("atime=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); +- if (mount_point.isEmpty()) +- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); +- +- mount_point = config.readEntry("mountpoint", mount_point); +- +- if (!mount_point.startsWith("/")) +- mount_point = "/media/" + mount_point; +- +- result << QString("mountpoint=%1").arg(mount_point); +- result << QString("filesystem=%1").arg(fstype); +- +- if (valids.contains("data")) +- { +- QString svalue = config.readEntry("journaling").lower(); +- if (svalue == "ordered") +- result << "journaling=ordered"; +- else if (svalue == "writeback") +- result << "journaling=writeback"; +- else if (svalue == "data") +- result << "journaling=data"; +- else +- result << "journaling=ordered"; +- } ++ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; + +- return result; ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /** @todo find name */ ++ medium->setName("camera"); ++ /** @todo find the rest of this URL */ ++ medium->unmountableState("camera:/"); ++ medium->setMimeType("media/gphoto2camera"); ++ medium->setIconName(QString::null); ++ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); ++ else ++ medium->setLabel(i18n("Camera")); + } + +-bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) ++QString HALBackend::generateName(const QString &devNode) + { +- kdDebug() << "setMountoptions " << name << " " << options << endl; +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); +- +- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; +- for (int index = 0; names[index]; ++index) +- if (valids.contains(names[index])) +- config.writeEntry(names[index], valids[names[index]] == "true"); +- +- if (valids.contains("shortname")) +- config.writeEntry("shortname", valids["shortname"]); +- +- if (valids.contains("journaling")) +- config.writeEntry("journaling", valids["journaling"]); +- +- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) +- config.writeEntry("mountpoint", valids["mountpoint"]); +- +- if (valids.contains("automount")) { +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- config.setGroup(drive_udi); +- config.writeEntry("automount", valids["automount"]); +- } +- +- return true; ++ return KURL(devNode).fileName(); + } + +-static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, +- DBusConnection *dbus_connection) +-{ +- DBusMessage *dmesg, *reply; +- DBusError error; +- +- const char *fstype = ""; +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Mount"))) { +- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, +- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- QString qerror; +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- QString qerror = error.message; +- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; +- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) +- qerror = i18n("Invalid filesystem type"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) +- qerror = i18n("Permissions denied"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) +- qerror = i18n("Device is already mounted."); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return mount_priv(udi, "", poptions, noptions, dbus_connection); +- } +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "mount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- return qerror; ++/****************************************** ++** HAL CALL-BACKS ** ++******************************************/ + ++#ifdef HAL_0_4 ++void HALBackend::hal_main_loop_integration(LibHalContext *ctx, ++ DBusConnection *dbus_connection) ++{ ++ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->MainLoopIntegration(dbus_connection); + } ++#endif + +-void HALBackend::slotResult(KIO::Job *job) ++void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) + { +- kdDebug() << "slotResult " << mount_jobs[job] << endl; +- if (job->error()) +- { +- KMessageBox::error(0, job->errorText()); +- } +- ResetProperties( mount_jobs[job].latin1() ); +- mount_jobs.remove(job); ++ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->AddDevice(udi); + } + +-QString HALBackend::isInFstab(const Medium *medium) ++void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) + { +- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); +- +- KMountPoint::List::iterator it = fstab.begin(); +- KMountPoint::List::iterator end = fstab.end(); +- +- for (; it!=end; ++it) +- { +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; +- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +- { +- QStringList opts = (*it)->mountOptions(); +- if (opts.contains("user") || opts.contains("users")) +- return (*it)->mountPoint(); +- } +- } +- +- return QString::null; ++ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->RemoveDevice(udi); + } + +-QString HALBackend::mount(const Medium *medium) +-{ +- if (medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; +- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } else if (medium->id().startsWith("/org/kde/") ) +- return i18n("Permissions denied"); +- +- QStringList soptions; +- +- kdDebug() << "mounting " << medium->id() << "..." << endl; +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); +- if (valids["flush"] == "true") +- soptions << "flush"; +- +- if (valids["uid"] == "true") +- { +- soptions << QString("uid=%1").arg(getuid()); +- } +- +- if (valids["ro"] == "true") +- soptions << "ro"; +- +- if (valids["atime"] != "true") +- soptions << "noatime"; +- +- if (valids["quiet"] == "true") +- soptions << "quiet"; +- +- if (valids["utf8"] == "true") +- soptions << "utf8"; +- +- if (valids["sync"] == "true") +- soptions << "sync"; +- +- QString mount_point = valids["mountpoint"]; +- if (mount_point.startsWith("/media/")) +- mount_point = mount_point.mid(7); +- +- if (valids.contains("shortname")) +- { +- soptions << QString("shortname=%1").arg(valids["shortname"]); +- } +- +- if (valids.contains("journaling")) +- { +- QString option = valids["journaling"]; +- if (option == "data") +- soptions << QString("data=journal"); +- else if (option == "writeback") +- soptions << QString("data=writeback"); +- else +- soptions << QString("data=ordered"); +- } +- +- const char **options = new const char*[soptions.size() + 1]; +- uint noptions = 0; +- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) +- options[noptions] = (*it).latin1(); +- options[noptions] = NULL; +- +- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); +- if (!qerror.isEmpty()) { +- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; +- return qerror; +- } +- +- medium->setHalMounted(true); +- ResetProperties(medium->id().latin1()); +- +- return QString(); +-} +- +-QString HALBackend::mount(const QString &_udi) ++void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, ++ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) + { +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- +- return mount(medium); ++ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(is_removed); ++ Q_UNUSED(is_added); ++ s_HALBackend->ModifyDevice(udi, key); + } + +-QString HALBackend::unmount(const QString &_udi) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one +- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); +- if (halDrive) +- { +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- if (numVolumes == 1) +- medium = m_mediaList.findById( volumes[0] ); +- } +- } +- +- if ( !medium ) +- return i18n("No such medium: %1").arg(_udi); +- +- if (!medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; +- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } +- +- DBusMessage *dmesg, *reply; +- DBusError error; +- const char *options[2]; +- +- const char *udi = medium->id().latin1(); +- kdDebug() << "unmounting " << udi << "..." << endl; +- +- dbus_error_init(&error); +- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); +- if (dbus_error_is_set(&error)) +- { +- dbus_error_free(&error); +- return false; +- } +- +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Unmount"))) { +- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- options[0] = "force"; +- options[1] = 0; +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; +- QString qerror = error.message; +- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { +- qerror = QString("<qt>") + i18n("Device is Busy:"); +- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); +- FILE *fuser = popen(cmdline.latin1(), "r"); +- uint counter = 0; +- if (fuser) { +- qerror += "<pre>"; +- QTextIStream is(fuser); +- QString tmp; +- while (!is.atEnd()) { +- tmp = is.readLine(); +- tmp = QStyleSheet::escape(tmp) + "\n"; +- +- qerror += tmp; +- if (counter++ > 20) +- { +- qerror += "..."; +- break; +- } +- } +- qerror += "</pre>"; +- (void)pclose( fuser ); +- } +- qerror += "</qt>"; +- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { +- // this is faking. The error is that the device wasn't mounted by hal (but by the system) +- qerror = i18n("Permissions denied"); +- } +- +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "unmount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- medium->setHalMounted(false); +- ResetProperties(udi); +- +- return QString(); ++void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, ++ const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else ++ const char* message ++ #endif ++ ) ++{ ++ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(message); ++ s_HALBackend->DeviceCondition(udi, condition_name); + } + + #include "halbackend.moc" +diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h +--- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 +@@ -45,9 +45,65 @@ + #include <libhal.h> + #include <libhal-storage.h> + +-namespace KIO { +- class Job; +-} ++/* The HAL API changed between 0.4 and 0.5 series. ++These defines enable backward compatibility */ ++#ifdef HAL_0_4 ++ // libhal-storage 0.4 API ++ #define LibHalStoragePolicy HalStoragePolicy ++ #define LibHalDrive HalDrive ++ #define LibHalVolume HalVolume ++ #define LibHalVolumeDiscType HalVolumeDiscType ++ #define libhal_storage_policy_free hal_storage_policy_free ++ #define libhal_storage_policy_new hal_storage_policy_new ++ #define libhal_drive_from_udi hal_drive_from_udi ++ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes ++ #define libhal_drive_get_type hal_drive_get_type ++ #define libhal_drive_get_device_file hal_drive_get_device_file ++ #define libhal_drive_free hal_drive_free ++ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name ++ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable ++ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi ++ #define libhal_volume_from_udi hal_volume_from_udi ++ #define libhal_volume_get_device_file hal_volume_get_device_file ++ #define libhal_volume_get_mount_point hal_volume_get_mount_point ++ #define libhal_volume_get_fstype hal_volume_get_fstype ++ #define libhal_volume_is_mounted hal_volume_is_mounted ++ #define libhal_volume_get_disc_type hal_volume_get_disc_type ++ #define libhal_volume_free hal_volume_free ++ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name ++ #define libhal_volume_disc_has_data hal_volume_disc_has_data ++ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio ++ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank ++ #define libhal_volume_is_disc hal_volume_is_disc ++ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi ++ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR ++ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW ++ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH ++ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK ++ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA ++ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC ++ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER ++ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA ++ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE ++ ++ // libhal 0.4 API ++ #define libhal_free_string hal_free_string ++ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) ++ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) ++ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) ++ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) ++ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) ++ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) ++ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) ++#endif ++ + + /** + * A handy function to query a hal string +@@ -88,14 +144,6 @@ + */ + bool ListDevices(); + +- QStringList mountoptions(const QString &id); +- +- bool setMountoptions(const QString &id, const QStringList &options); +- +- QString mount(const QString &id); +- QString mount(const Medium *medium); +- QString unmount(const QString &id); +- + private: + /** + * Append a device in the media list. This function will check if the device +@@ -147,16 +195,20 @@ + + void setVolumeProperties(Medium* medium); + void setFloppyProperties(Medium* medium); +- bool setFstabProperties(Medium* medium); + void setCameraProperties(Medium* medium); + QString generateName(const QString &devNode); +- static QString isInFstab(const Medium *medium); +- +-private slots: +- void slotResult(KIO::Job *job); + + /* Hal call-backs -- from gvm*/ + public: ++#ifdef HAL_0_4 ++ /** Invoked by libhal for integration with our mainloop. ++ * ++ * @param ctx LibHal context ++ * @param dbus_connection D-BUS connection to integrate ++ */ ++ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); ++#endif ++ + /** Invoked when a device is added to the Global Device List. + * + * @param ctx LibHal context +@@ -189,7 +241,11 @@ + */ + static void hal_device_condition(LibHalContext *ctx, const char *udi, + const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else + const char* message ++ #endif + ); + + /* HAL and DBus structures */ +@@ -199,6 +255,13 @@ + */ + LibHalContext* m_halContext; + ++#ifdef HAL_0_4 ++ /** ++ * Structure defining the hal callback function for devices events ++ */ ++ LibHalFunctions m_halFunctions; ++#endif ++ + /** + * libhal-storage HAL policy, e.g. for icon names + */ +@@ -213,10 +276,6 @@ + * Object for the kded module + */ + QObject* m_parent; +- +- DBusConnection *dbus_connection; +- +- QMap<KIO::Job *, QString> mount_jobs; + }; + + #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif +diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 +@@ -43,287 +43,201 @@ + MediaManager::MediaManager(const QCString &obj) + : KDEDModule(obj), m_dirNotify(m_mediaList) + { +- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), +- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), +- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, +- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), +- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), ++ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), ++ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, ++ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), ++ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); + +- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); ++ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); + } + + MediaManager::~MediaManager() + { +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } + } + + void MediaManager::loadBackends() + { + m_mediaList.blockSignals(true); + +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } ++ ++ mp_removableBackend = 0L; + + #ifdef COMPILE_HALBACKEND +- if ( MediaManagerSettings::self()->halBackendEnabled() ) +- { +- m_halbackend = new HALBackend(m_mediaList, this); +- if (m_halbackend->InitHal()) +- { +- m_backends.append( m_halbackend ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); +- // No need to load something else... +- m_mediaList.blockSignals(false); +- return; +- } +- else +- { +- delete m_halbackend; +- m_halbackend = 0; +- } +- } ++ if ( MediaManagerSettings::self()->halBackendEnabled() ) ++ { ++ HALBackend* hal_backend = new HALBackend(m_mediaList, this); ++ if (hal_backend->InitHal()) ++ { ++ m_backends.append( hal_backend ); ++ m_backends.append( new FstabBackend(m_mediaList, true) ); ++ // No need to load something else... ++ m_mediaList.blockSignals(false); ++ return; ++ } ++ else ++ { ++ delete hal_backend; ++ } ++ } + #endif // COMPILE_HALBACKEND + +- mp_removableBackend = new RemovableBackend(m_mediaList); +- m_backends.append( mp_removableBackend ); ++ mp_removableBackend = new RemovableBackend(m_mediaList); ++ m_backends.append( mp_removableBackend ); + + #ifdef COMPILE_LINUXCDPOLLING +- if ( MediaManagerSettings::self()->cdPollingEnabled() ) +- { +- m_backends.append( new LinuxCDPolling(m_mediaList) ); +- } ++ if ( MediaManagerSettings::self()->cdPollingEnabled() ) ++ { ++ m_backends.append( new LinuxCDPolling(m_mediaList) ); ++ } + #endif //COMPILE_LINUXCDPOLLING + +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); +- m_mediaList.blockSignals(false); ++ m_backends.append( new FstabBackend(m_mediaList) ); ++ m_mediaList.blockSignals(false); + } + + + QStringList MediaManager::fullList() + { +- QPtrList<Medium> list = m_mediaList.list(); ++ QPtrList<Medium> list = m_mediaList.list(); + +- QStringList result; ++ QStringList result; + +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- result+= (*it)->properties(); +- result+= Medium::SEPARATOR; +- } ++ QPtrList<Medium>::const_iterator it = list.begin(); ++ QPtrList<Medium>::const_iterator end = list.end(); ++ for (; it!=end; ++it) ++ { ++ result+= (*it)->properties(); ++ result+= Medium::SEPARATOR; ++ } + +- return result; ++ return result; + } + + QStringList MediaManager::properties(const QString &name) + { +- const Medium *m = m_mediaList.findByName(name); +- +- if (!m) +- { +- KURL u(name); +- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; +- if (u.isValid()) +- { +- if (u.protocol() == "system") +- { +- QString path = u.path(); +- if (path.startsWith("/media/")) +- path = path.mid(strlen("/media/")); +- m = m_mediaList.findByName(path); +- kdDebug() << "findByName " << path << m << endl; +- } +- else if (u.protocol() == "media") +- { +- m = m_mediaList.findByName(u.filename()); +- kdDebug() << "findByName " << u.filename() << m << endl; +- } +- else if (u.protocol() == "file") +- { +- // look for the mount point +- QPtrList<Medium> list = m_mediaList.list(); +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; +- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { +- m = *it; +- break; +- } +- } +- } +- } +- } +- +- if (m) +- return m->properties(); +- else +- return QStringList(); +-} ++ const Medium *m = m_mediaList.findByName(name); + +-QStringList MediaManager::mountoptions(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return QStringList(); +- return m_halbackend->mountoptions(name); +-#else +- return QStringList(); +-#endif +-} +- +-bool MediaManager::setMountoptions(const QString &name, const QStringList &options) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return false; +- return m_halbackend->setMountoptions(name, options); +-#else +- return false; +-#endif +-} +- +-QString MediaManager::mount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->mount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); +-#endif +-} +- +-QString MediaManager::unmount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->unmount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); +-#endif ++ if (m!=0L) ++ { ++ return m->properties(); ++ } ++ else ++ { ++ return QStringList(); ++ } + } + + QString MediaManager::nameForLabel(const QString &label) + { +- const QPtrList<Medium> media = m_mediaList.list(); ++ const QPtrList<Medium> media = m_mediaList.list(); + +- QPtrList<Medium>::const_iterator it = media.begin(); +- QPtrList<Medium>::const_iterator end = media.end(); +- for (; it!=end; ++it) +- { +- const Medium *m = *it; +- +- if (m->prettyLabel()==label) +- { +- return m->name(); +- } +- } ++ QPtrList<Medium>::const_iterator it = media.begin(); ++ QPtrList<Medium>::const_iterator end = media.end(); ++ for (; it!=end; ++it) ++ { ++ const Medium *m = *it; ++ ++ if (m->prettyLabel()==label) ++ { ++ return m->name(); ++ } ++ } + +- return QString::null; ++ return QString::null; + } + + ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) + { +- m_mediaList.setUserLabel(name, label); ++ m_mediaList.setUserLabel(name, label); + } + + ASYNC MediaManager::reloadBackends() + { +- MediaManagerSettings::self()->readConfig(); +- loadBackends(); ++ MediaManagerSettings::self()->readConfig(); ++ loadBackends(); + } + + bool MediaManager::removablePlug(const QString &devNode, const QString &label) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->plug(devNode, label); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->plug(devNode, label); ++ } ++ return false; + } + + bool MediaManager::removableUnplug(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->unplug(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->unplug(devNode); ++ } ++ return false; + } + + bool MediaManager::removableCamera(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->camera(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->camera(devNode); ++ } ++ return false; + } + + + void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesAdded( KURL("media:/") ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesAdded( KURL("media:/") ); + +- emit mediumAdded(name, allowNotification); +- emit mediumAdded(name); ++ emit mediumAdded(name, allowNotification); ++ emit mediumAdded(name); + } + + void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesRemoved( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesRemoved( KURL("media:/"+name) ); + +- emit mediumRemoved(name, allowNotification); +- emit mediumRemoved(name); ++ emit mediumRemoved(name, allowNotification); ++ emit mediumRemoved(name); + } + + void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, + bool mounted, bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- if (!mounted) +- { +- notifier.FilesRemoved( KURL("media:/"+name) ); +- } +- notifier.FilesChanged( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ if (!mounted) ++ { ++ notifier.FilesRemoved( KURL("media:/"+name) ); ++ } ++ notifier.FilesChanged( KURL("media:/"+name) ); + +- emit mediumChanged(name, allowNotification); +- emit mediumChanged(name); ++ emit mediumChanged(name, allowNotification); ++ emit mediumChanged(name); + } + + +diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ + Name[es]=Administrador de recursos KDED + Name[et]=KDED andmekandjate haldur + Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED + Name[fi]=KDED-tallennusmedianhallinta + Name[fr]=Gestionnaire de médias KDED + Name[fy]=KDEDED-mediabehearder + Name[ga]=Bainisteoir Meán KDED + Name[gl]=Xestor de Meios de KDED +-Name[he]=×ž× ×”×œ המדיה של KDED + Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक + Name[hr]=KDED upravitelj medija + Name[hu]=KDED médiakezelÅ‘ +@@ -45,7 +43,6 @@ + Name[ru]=Управление подключаемыми уÑтройÑтвами + Name[rw]=Mugenga Igihuza KDED + Name[se]=KDED-mediagieÄ‘ahalli +-Name[sk]=KDED správca médià + Name[sl]=Upravitelj medijev KDED + Name[sr]=Менаџер медијума, KDED + Name[sr@Latn]=Menadžer medijuma, KDED +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) + Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) + Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) + Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) +-Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) + Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) + Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) + Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) +-Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ ++Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) + Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) + Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) + Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) +@@ -103,7 +98,6 @@ + Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) + Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) + Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) +-Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) + Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) + Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) + Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) +@@ -122,4 +116,3 @@ + X-KDE-FactoryName=mediamanager + X-KDE-Kded-autoload=true + X-KDE-Kded-load-on-demand=true +-X-KDE-Kded-phase=1 +diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 +@@ -28,8 +28,6 @@ + #include "removablebackend.h" + #include "mediadirnotify.h" + +-class HALBackend; +-class FstabBackend; + + class MediaManager : public KDEDModule + { +@@ -42,12 +40,6 @@ + k_dcop: + QStringList fullList(); + QStringList properties(const QString &name); +- QStringList mountoptions(const QString &name); +- bool setMountoptions(const QString &name, const QStringList &options); +- +- QString mount(const QString &uid); +- QString unmount(const QString &uid); +- + QString nameForLabel(const QString &label); + ASYNC setUserLabel(const QString &name, const QString &label); + +@@ -82,9 +74,7 @@ + MediaList m_mediaList; + QValueList<BackendBase*> m_backends; + RemovableBackend *mp_removableBackend; +- HALBackend *m_halbackend; + MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; + }; + + #endif +diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 +@@ -254,6 +254,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) + { + kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " + << allowNotification << ")" << endl; +- +- if ( !allowNotification ) +- return; +- ++ + // Update user activity timestamp, otherwise the notification dialog will be shown + // in the background due to focus stealing prevention. Entering a new media can + // be seen as a kind of user activity after all. It'd be better to update the timestamp +@@ -103,11 +95,11 @@ + { + QString mimetype = medium.mimetype(); + +- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); ++ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); + bool is_mounted = mimetype.endsWith( "_mounted" ); + + // We autorun only on CD/DVD or removable disks (USB, Firewire) +- if ( !( is_cdrom || is_mounted ) ++ if ( !( is_cdrom && is_mounted ) + && mimetype!="media/removable_mounted" ) + { + return false; +diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه + Name[fi]=Mediahuomautin + Name[fr]=Démon de notifications des média + Name[fy]=Medianotifikaasje-daemon + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima + Name[hu]=LemezfigyelÅ‘ szolgáltatás + Name[is]=Miðils tilkynningarpúki +@@ -34,12 +32,10 @@ + Name[nb]=Medievarslingsnisse + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach + Name[pt]=Servidor de Notificação de Dispositivos + Name[pt_BR]=Servidor de Notificação de Dispositivos + Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв +-Name[sk]=Notifikátor medià + Name[sl]=Demon za obveÅ¡Äanje o nosilcih + Name[sr]=Демон за обавештења о медијумима + Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima +@@ -47,7 +43,6 @@ + Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº +-Name[zh_TW]=媒體通知伺æœç¨‹å¼ + Comment=A media plugged notifier + Comment[af]='n Inpropbare media inkennissteller + Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin + Comment[fr]=Notification de connexion de média + Comment[fy]=Meidieling fan oankeppele media +@@ -70,7 +64,7 @@ + Comment[hu]=LemezérzékelÅ‘ + Comment[is]=Tilkynnari um tengda miðla + Comment[it]=Notifiche dei dispositivi attaccati +-Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ + Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas + Comment[mk]=ИзвеÑтување за приклучен медиум + Comment[nb]=En medievarsler som programtillegg +@@ -82,7 +76,6 @@ + Comment[pt]=Um notificador ligado aos dispositivos + Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) + Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв +-Comment[sk]=Notifikátor pripojených médià + Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih + Comment[sr]=Обавештавач о укљученим медијима + Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() +diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ + Comment[it]=CD audio + Comment[ja]=オーディオ CD + Comment[km]=ស៊ីឌី​អូឌីយ៉ូ +-Comment[mk]=Ðудио ЦД + Comment[ms]=CD Audio + Comment[nb]=Lyd-CD + Comment[nds]=Audio-CD +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD +diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ + Comment[km]=ស៊ីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias CD + Comment[lv]=TukÅ¡s CD +-Comment[mk]=Празно ЦД + Comment[ms]=CD Kosong + Comment[nb]=Tom CD + Comment[nds]=Leddige CD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый CD + Comment[rw]=CD Itanditseho + Comment[se]=Guorus CD +-Comment[sk]=ÄŒisté CD + Comment[sl]=Prazen CD + Comment[sr]=Празан CD + Comment[sr@Latn]=Prazan CD +diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ + Comment[km]=ឌីវីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias DVD + Comment[lv]=TukÅ¡s DVD +-Comment[mk]=Празно DVD + Comment[ms]=DVD Kosong + Comment[nb]=Tom DVD + Comment[nds]=Leddige DVD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый DVD + Comment[rw]=DVD Itanditseho + Comment[se]=Guorus DVD +-Comment[sk]=ÄŒisté DVD + Comment[sl]=Prazen DVD + Comment[sr]=Празан DVD + Comment[sr@Latn]=Prazan DVD +diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté + Comment[fy]=Oankeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera montada + Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=ÄŒatnon govvenapperáhtta +-Comment[sk]=Pripojený digitálny fotoaparát + Comment[sl]=Priklopljen fotoaparat + Comment[sr]=Монтирана камера + Comment[sr@Latn]=Montirana kamera +diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté + Comment[fy]=Ofkeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera desmontada + Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=Gálgajuvvon govvenapperáhtta +-Comment[sk]=Odpojený digitálny fotoaparát + Comment[sl]=Odklopljen fotoaparat + Comment[sr]=Демонтирана камера + Comment[sr@Latn]=Demontirana kamera +diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ + Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី + Comment[lt]=DVD video diskas + Comment[lv]=DVD Video Disks +-Comment[mk]=DVD ВидеодиÑк + Comment[ms]=Cakera Video DVD + Comment[nb]=DVD-videoplate + Comment[nds]=DVD-Videodisk +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD + Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ + Comment[rw]=Disiki Videwo DVD + Comment[se]=DVD-videoskearru +-Comment[sk]=DVD Video disk + Comment[sl]=DVD Video disk + Comment[sr]=DVD видео диÑк + Comment[sr@Latn]=DVD video disk +diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif +diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif +diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto + Comment[ru]=Камера + Comment[rw]=Kamera + Comment[se]=Govvanaperáhtta +-Comment[sk]=Digitálny fotoaparát + Comment[sl]=Fotoaparat + Comment[sr]=Камера + Comment[sr@Latn]=Kamera +diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat + Comment[ru]=Смонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwashyizwemo + Comment[se]=ÄŒatnon garraskearrooassi +-Comment[sk]=Pripojený oddiel pevného disku + Comment[sl]=Priklopljen pogon trdega diska + Comment[sr]=Монтирана партиција хард диÑка + Comment[sr@Latn]=Montirana particija hard diska +diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat + Comment[ru]=Отмонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwakuwemo + Comment[se]=Gálgajuvvon garraskearrooassi +-Comment[sk]=Odpojený oddiel pevného disku + Comment[sl]=Odklopljen pogon trdega diska + Comment[sr]=Демонтирана партиција хард диÑка + Comment[sr@Latn]=Demontirana particija hard diska +diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Montert delt NFS-ressurs + Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată + Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Washyizwemo + Comment[se]=ÄŒatnon NFS-resursa +-Comment[sk]=Pripojený zdroj NFS + Comment[sl]=Priklopljen vir NFS + Comment[sr]=Монтирано NFS дељење + Comment[sr@Latn]=Montirano NFS deljenje +diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert delt NFS-ressurs + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată + Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Wakuwemo + Comment[se]=Gálgajuvvon NFS-resursa +-Comment[sk]=Odpojený zdroj NFS + Comment[sl]=Odklopljen vir NFS + Comment[sr]=Демонтирано NFS дељење + Comment[sr@Latn]=Demontirano NFS deljenje +diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat + Comment[ru]=Смонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo + Comment[se]=Čátnon sirdehahtti medium +-Comment[sk]=Pripojené vyberateľné médium + Comment[sl]=Priklopljen odstranljiv medij + Comment[sr]=Монтиран уклоњиви медијум + Comment[sr@Latn]=Montiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat + Comment[ru]=Отмонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo + Comment[se]=Gálgaduvvon sirdehahtti medium +-Comment[sk]=Odpojené vyberateľné médium + Comment[sl]=Odklopljen odstranljiv medij + Comment[sr]=Демонтиран уклоњиви медијум + Comment[sr@Latn]=Demontiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ + Comment[it]=Super video CD + Comment[ja]=スーパービデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ +-Comment[mk]=Супер видео ЦД + Comment[ms]=CD Supervideo + Comment[nb]=Super video CD + Comment[nds]=Super-Video-CD +diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ + Comment[is]=VÃdeó CD + Comment[ja]=ビデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ +-Comment[mk]=Видео ЦД + Comment[ms]=CD Video + Comment[nds]=Video-CD + Comment[nl]=Video-cd +diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif +diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ + Comment[hu]=Leválasztott Zip-lemez + Comment[is]=Aftengdur Zip diskur + Comment[it]=Disco Zip non montato +-Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク ++Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク + Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ + Comment[lo]= ຫັງàºàº²àº¥àºµ + Comment[lt]=IÅ¡montuotas Zip diskas +diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 +@@ -57,8 +57,8 @@ + #>+ 1 + kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) + am__DEPENDENCIES_1 = +-kio_media_mounthelper_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) ++kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ ../libmediacommon/libmediacommon.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +@@ -236,6 +236,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -575,7 +576,7 @@ + AM_LDFLAGS = $(all_libraries) + kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp + kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) ++kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la + #>- METASOURCES = AUTO + #>- all: all-am + #>+ 1 +diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 +@@ -27,7 +27,6 @@ + #include <dcopclient.h> + #include <dcopref.h> + #include <qtimer.h> +-#include <stdlib.h> + #include <kdebug.h> + #include <kglobal.h> + #include <kprocess.h> +@@ -79,30 +78,31 @@ + + if (args->isSet("u")) + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- kdDebug() << "medium unmount " << m_errorStr << endl; +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + else if (args->isSet("s") || args->isSet("e")) + { +- invokeEject(device, true); ++ if (medium.isMounted()) ++ { ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ m_device = device; ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResultSafe( KIO::Job * ) ) ); ++ } ++ else ++ { ++ invokeEject(device, true); ++ } + } + else + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job* job = KIO::mount( false, 0, device, mount_point); ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + } + +@@ -173,12 +173,12 @@ + void MountHelper::error() + { + KMessageBox::error(0, m_errorStr); +- ::exit(1); ++ kapp->exit(1); + } + + void MountHelper::finished() + { +- ::exit(0); ++ kapp->quit(); + } + + static KCmdLineOptions options[] = +@@ -207,7 +207,7 @@ + + KStartupInfo::appStarted(); + app->dcopClient()->attach(); +- return app->exec(); ++ app->exec(); + } + + #include "kio_media_mounthelper.moc" +diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 +@@ -1,1063 +0,0 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. +-# KDE tags expanded automatically by am_edit - $Revision: 483858 $ +-# @configure_input@ +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-target_triplet = @target@ +-subdir = kioslave/media/propsdlgplugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ +- "$(DESTDIR)$(kde_servicesdir)" +-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(kde_module_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-media_propsdlgplugin_la_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) +-am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo +-#>- media_propsdlgplugin_la_OBJECTS = \ +-#>- $(am_media_propsdlgplugin_la_OBJECTS) +-#>+ 5 +-media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo +-media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo propertiespagegui.lo +-@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-am__depfiles_maybe = depfiles +-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 2 +-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +-#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +-#>- $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 3 +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-CXXLD = $(CXX) +-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-#>+ 2 +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(media_propsdlgplugin_la_SOURCES) +-DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) +-kde_servicesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(kde_services_DATA) +-ETAGS = etags +-CTAGS = ctags +-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-#>+ 1 +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-ARTSCCONFIG = @ARTSCCONFIG@ +-ARTS_CFLAGS = @ARTS_CFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTODIRS = @AUTODIRS@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ +-COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ +-CONF_FILES = @CONF_FILES@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DBUSQT_INCS = @DBUSQT_INCS@ +-DBUSQT_LIBS = @DBUSQT_LIBS@ +-DBUS_CFLAGS = @DBUS_CFLAGS@ +-DBUS_INCS = @DBUS_INCS@ +-DBUS_LIBS = @DBUS_LIBS@ +-DCOPIDL = @DCOPIDL@ +-DCOPIDL2CPP = @DCOPIDL2CPP@ +-DCOPIDLNG = @DCOPIDLNG@ +-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DOXYGEN = @DOXYGEN@ +-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ +-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +-DPMSINC = @DPMSINC@ +-DPMSLIB = @DPMSLIB@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ +-EXEEXT = @EXEEXT@ +-EXR_FLAGS = @EXR_FLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ +-GLINC = @GLINC@ +-GLLIB = @GLLIB@ +-GMSGFMT = @GMSGFMT@ +-HALBACKEND = @HALBACKEND@ +-HAL_CFLAGS = @HAL_CFLAGS@ +-HAL_INCS = @HAL_INCS@ +-HAL_LIBS = @HAL_LIBS@ +-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ +-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ +-HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-JAR = @JAR@ +-JAVAC = @JAVAC@ +-JAVAH = @JAVAH@ +-JVMLIBS = @JVMLIBS@ +-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ +-KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ +-KCONFIG_COMPILER = @KCONFIG_COMPILER@ +-KDECONFIG = @KDECONFIG@ +-KDE_BINDIR = @KDE_BINDIR@ +-KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ +-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ +-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ +-KDE_HAVE_DOT = @KDE_HAVE_DOT@ +-KDE_INCLUDES = @KDE_INCLUDES@ +-KDE_LDFLAGS = @KDE_LDFLAGS@ +-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ +-KDE_MT_LIBS = @KDE_MT_LIBS@ +-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ +-KDE_PLUGIN = @KDE_PLUGIN@ +-KDE_RPATH = @KDE_RPATH@ +-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ +-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ +-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ +-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ +-KDE_USE_FPIE = @KDE_USE_FPIE@ +-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ +-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ +-KDE_USE_PIE = @KDE_USE_PIE@ +-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ +-KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ +-KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ +-KRB4_INCS = @KRB4_INCS@ +-KRB4_LIBS = @KRB4_LIBS@ +-KRB4_RPATH = @KRB4_RPATH@ +-KRB5_INCS = @KRB5_INCS@ +-KRB5_LIBS = @KRB5_LIBS@ +-KRB5_RPATH = @KRB5_RPATH@ +-KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ +-LDAP_INCS = @LDAP_INCS@ +-LDAP_LIBS = @LDAP_LIBS@ +-LDAP_RPATH = @LDAP_RPATH@ +-LDFLAGS = @LDFLAGS@ +-LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ +-LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ +-LIBALIB = @LIBALIB@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ +-LIBART_RPATH = @LIBART_RPATH@ +-LIBBZ2 = @LIBBZ2@ +-LIBCFG = @LIBCFG@ +-LIBCOMPAT = @LIBCOMPAT@ +-LIBCRYPT = @LIBCRYPT@ +-LIBCURSES = @LIBCURSES@ +-LIBDEVINFO = @LIBDEVINFO@ +-LIBDL = @LIBDL@ +-LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ +-LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ +-LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ +-LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ +-LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ +-LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ +-LIBGEN = @LIBGEN@ +-LIBHOSTS = @LIBHOSTS@ +-LIBJPEG = @LIBJPEG@ +-LIBKSTAT = @LIBKSTAT@ +-LIBMALLOC = @LIBMALLOC@ +-LIBOBJS = @LIBOBJS@ +-LIBODM = @LIBODM@ +-LIBOSSAUDIO = @LIBOSSAUDIO@ +-LIBPNG = @LIBPNG@ +-LIBPOSIX4 = @LIBPOSIX4@ +-LIBPTHREAD = @LIBPTHREAD@ +-LIBRESOLV = @LIBRESOLV@ +-LIBRPC = @LIBRPC@ +-LIBS = @LIBS@ +-LIBSENSORS = @LIBSENSORS@ +-LIBSHADOW = @LIBSHADOW@ +-LIBSM = @LIBSM@ +-LIBSOCKET = @LIBSOCKET@ +-LIBSSL = @LIBSSL@ +-LIBTOOL = @LIBTOOL@ +-LIBUCB = @LIBUCB@ +-LIBUSBCONFIG = @LIBUSBCONFIG@ +-LIBUTIL = @LIBUTIL@ +-LIBXDMCP = @LIBXDMCP@ +-LIBXFT_LIB = @LIBXFT_LIB@ +-LIBZ = @LIBZ@ +-LIB_ARTS = @LIB_ARTS@ +-LIB_DNSSD = @LIB_DNSSD@ +-LIB_EXR = @LIB_EXR@ +-LIB_FONT_ENC = @LIB_FONT_ENC@ +-LIB_KAB = @LIB_KAB@ +-LIB_KABC = @LIB_KABC@ +-LIB_KDECORE = @LIB_KDECORE@ +-LIB_KDED = @LIB_KDED@ +-LIB_KDEPIM = @LIB_KDEPIM@ +-LIB_KDEPRINT = @LIB_KDEPRINT@ +-LIB_KDEUI = @LIB_KDEUI@ +-LIB_KDNSSD = @LIB_KDNSSD@ +-LIB_KFILE = @LIB_KFILE@ +-LIB_KFM = @LIB_KFM@ +-LIB_KHTML = @LIB_KHTML@ +-LIB_KIMPROXY = @LIB_KIMPROXY@ +-LIB_KIO = @LIB_KIO@ +-LIB_KJS = @LIB_KJS@ +-LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ +-LIB_KPARTS = @LIB_KPARTS@ +-LIB_KSPELL = @LIB_KSPELL@ +-LIB_KSYCOCA = @LIB_KSYCOCA@ +-LIB_KUNITTEST = @LIB_KUNITTEST@ +-LIB_KUTILS = @LIB_KUTILS@ +-LIB_KVM = @LIB_KVM@ +-LIB_LBER = @LIB_LBER@ +-LIB_LIBS = @LIB_LIBS@ +-LIB_POLL = @LIB_POLL@ +-LIB_QPE = @LIB_QPE@ +-LIB_QT = @LIB_QT@ +-LIB_SMB = @LIB_SMB@ +-LIB_TRU64_MACH = @LIB_TRU64_MACH@ +-LIB_X11 = @LIB_X11@ +-LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ +-LIB_XCURSOR = @LIB_XCURSOR@ +-LIB_XEXT = @LIB_XEXT@ +-LIB_XF86MISC = @LIB_XF86MISC@ +-LIB_XFIXES = @LIB_XFIXES@ +-LIB_XINERAMA = @LIB_XINERAMA@ +-LIB_XRANDR = @LIB_XRANDR@ +-LIB_XRENDER = @LIB_XRENDER@ +-LIB_XSS = @LIB_XSS@ +-LINUXCDPOLLING = @LINUXCDPOLLING@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +-MCOPIDL = @MCOPIDL@ +-MD5SUM = @MD5SUM@ +-MD5SUM_CUT = @MD5SUM_CUT@ +-MEINPROC = @MEINPROC@ +-MOC = @MOC@ +-MSGFMT = @MSGFMT@ +-NOOPT_CFLAGS = @NOOPT_CFLAGS@ +-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PAMLIBS = @PAMLIBS@ +-PASSWDLIBS = @PASSWDLIBS@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-QTDOCDIR = @QTDOCDIR@ +-QTE_NORTTI = @QTE_NORTTI@ +-QT_INCLUDES = @QT_INCLUDES@ +-QT_LDFLAGS = @QT_LDFLAGS@ +-RANLIB = @RANLIB@ +-RUN_KAPPFINDER = @RUN_KAPPFINDER@ +-SASL2_LIBS = @SASL2_LIBS@ +-SETUIDFLAGS = @SETUIDFLAGS@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ +-SSL_INCLUDES = @SSL_INCLUDES@ +-SSL_LDFLAGS = @SSL_LDFLAGS@ +-STRIP = @STRIP@ +-TOPSUBDIRS = @TOPSUBDIRS@ +-UIC = @UIC@ +-UIC_TR = @UIC_TR@ +-UNAME = @UNAME@ +-USB_CFLAGS = @USB_CFLAGS@ +-USB_LIBS = @USB_LIBS@ +-USER_INCLUDES = @USER_INCLUDES@ +-USER_LDFLAGS = @USER_LDFLAGS@ +-USE_EXCEPTIONS = @USE_EXCEPTIONS@ +-USE_RTTI = @USE_RTTI@ +-USE_THREADS = @USE_THREADS@ +-VERSION = @VERSION@ +-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ +-XGETTEXT = @XGETTEXT@ +-XMLLINT = @XMLLINT@ +-XTESTLIB = @XTESTLIB@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_INCLUDES = @X_INCLUDES@ +-X_LDFLAGS = @X_LDFLAGS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-X_RPATH = @X_RPATH@ +-ac_ct_AR = @ac_ct_AR@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-all_includes = @all_includes@ +-all_libraries = @all_libraries@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ +-applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ +-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +-drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ +-drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +-exec_prefix = @exec_prefix@ +-have_xcursor_FALSE = @have_xcursor_FALSE@ +-have_xcursor_TRUE = @have_xcursor_TRUE@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-include_ARTS_FALSE = @include_ARTS_FALSE@ +-include_ARTS_TRUE = @include_ARTS_TRUE@ +-include_BZIP2_FALSE = @include_BZIP2_FALSE@ +-include_BZIP2_TRUE = @include_BZIP2_TRUE@ +-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ +-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ +-include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ +-include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ +-include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ +-include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ +-include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ +-include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ +-include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ +-include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ +-include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ +-include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ +-include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ +-include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ +-include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ +-include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ +-include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ +-include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ +-include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ +-include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ +-include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ +-include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ +-include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ +-include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ +-include_kompmgr_FALSE = @include_kompmgr_FALSE@ +-include_kompmgr_TRUE = @include_kompmgr_TRUE@ +-include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ +-include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ +-include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ +-include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ +-include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ +-include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ +-include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ +-include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ +-include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ +-include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ +-include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ +-include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ +-include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ +-include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ +-include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ +-include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ +-include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ +-include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ +-include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ +-include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ +-include_x11_FALSE = @include_x11_FALSE@ +-include_x11_TRUE = @include_x11_TRUE@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-install_usbids_FALSE = @install_usbids_FALSE@ +-install_usbids_TRUE = @install_usbids_TRUE@ +-jni_includes = @jni_includes@ +-kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ +-kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ +-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ +-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ +-kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ +-kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ +-kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ +-kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ +-kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ +-kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ +-kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ +-kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ +-kde_appsdir = @kde_appsdir@ +-kde_bindir = @kde_bindir@ +-kde_confdir = @kde_confdir@ +-kde_datadir = @kde_datadir@ +-kde_htmldir = @kde_htmldir@ +-kde_icondir = @kde_icondir@ +-kde_includes = @kde_includes@ +-kde_kcfgdir = @kde_kcfgdir@ +-kde_libraries = @kde_libraries@ +-kde_libs_htmldir = @kde_libs_htmldir@ +-kde_libs_prefix = @kde_libs_prefix@ +-kde_locale = @kde_locale@ +-kde_mimedir = @kde_mimedir@ +-kde_moduledir = @kde_moduledir@ +-kde_qtver = @kde_qtver@ +-kde_servicesdir = @kde_servicesdir@ +-kde_servicetypesdir = @kde_servicetypesdir@ +-kde_sounddir = @kde_sounddir@ +-kde_styledir = @kde_styledir@ +-kde_templatesdir = @kde_templatesdir@ +-kde_wallpaperdir = @kde_wallpaperdir@ +-kde_widgetdir = @kde_widgetdir@ +-kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ +-kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ +-kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ +-kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ +-kdeinitdir = @kdeinitdir@ +-kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ +-kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ +-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ +-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ +-kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ +-kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ +-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ +-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ +-kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ +-kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ +-kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ +-kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ +-kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ +-kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ +-kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ +-kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ +-khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ +-khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ +-khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ +-khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ +-kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ +-kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ +-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ +-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ +-klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ +-klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ +-kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ +-kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ +-knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ +-knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ +-konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ +-konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ +-konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ +-konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ +-kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ +-kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ +-kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ +-kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ +-kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ +-kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ +-kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ +-kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ +-ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ +-ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ +-ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ +-ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ +-kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ +-kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ +-ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ +-ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ +-ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ +-ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ +-ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ +-ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ +-kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ +-kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ +-kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ +-kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ +-l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ +-l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ +-libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-nogroup = @nogroup@ +-nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ +-nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ +-oldincludedir = @oldincludedir@ +-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ +-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-qt_includes = @qt_includes@ +-qt_libraries = @qt_libraries@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-supports_i8k_FALSE = @supports_i8k_FALSE@ +-supports_i8k_TRUE = @supports_i8k_TRUE@ +-sysconfdir = @sysconfdir@ +-target = @target@ +-target_alias = @target_alias@ +-target_cpu = @target_cpu@ +-target_os = @target_os@ +-target_vendor = @target_vendor@ +-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ +-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +-x_includes = @x_includes@ +-x_libraries = @x_libraries@ +-xdg_appsdir = @xdg_appsdir@ +-xdg_directorydir = @xdg_directorydir@ +-xdg_menudir = @xdg_menudir@ +-#>- METASOURCES = AUTO +-kde_module_LTLIBRARIES = media_propsdlgplugin.la +-media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) +-media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +-AM_CPPFLAGS = $(all_includes) +-kde_services_DATA = media_propsdlgplugin.desktop +-#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp +-#>+ 1 +-media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp +-#>- all: all-am +-#>+ 1 +-all: docs-am all-am +- +-.SUFFIXES: +-.SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +-#>- @for dep in $?; do \ +-#>- case '$(am__configure_deps)' in \ +-#>- *$$dep*) \ +-#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +-#>- && exit 0; \ +-#>- exit 1;; \ +-#>- esac; \ +-#>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +-#>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +-#>+ 12 +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-kde_moduleLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ +- done +- +-clean-kde_moduleLTLIBRARIES: +- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done +-#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-#>+ 2 +-@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- +-mostlyclean-compile: +- -rm -f *.$(OBJEXT) +- +-distclean-compile: +- -rm -f *.tab.c +- +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ +- +-.cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +- +-.cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +- +-.cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +- +-mostlyclean-libtool: +- -rm -f *.lo +- +-clean-libtool: +- -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-kde_servicesDATA: $(kde_services_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-uninstall-kde_servicesDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(LTLIBRARIES) $(DATA) +-installdirs: +- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-#>- clean: clean-am +-#>+ 1 +-clean: kde-rpo-clean clean-am +- +-#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +-#>- mostlyclean-am +-#>+ 2 +-clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +- mostlyclean-am +- +-distclean: distclean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-#>- install-data-am: install-kde_moduleLTLIBRARIES \ +-#>- install-kde_servicesDATA +-#>+ 2 +-install-data-am: \ +- install-kde_servicesDATA +- +-#>- install-exec-am: +-#>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES +- +-install-info: install-info-am +- +-install-man: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +- +-#>+ 8 +-media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp +- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp +- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure +- @echo "timestamp" > media_propsdlgplugin.la.closure +- +- +-#>+ 3 +-propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h +- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc +- +-#>+ 2 +-mocs: propsdlgshareplugin.moc +- +-#>+ 3 +-propertiespage.moc: $(srcdir)/propertiespage.h +- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc +- +-#>+ 2 +-mocs: propertiespage.moc +- +-#>+ 3 +-clean-metasources: +- -rm -f propsdlgshareplugin.moc propertiespage.moc +- +-#>+ 2 +-KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am +- +-#>+ 4 +-clean-ui: +- -rm -f \ +- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc +- +-#>+ 3 +-clean-closures: +- -rm -f media_propsdlgplugin.la.closure +- +-#>+ 2 +-docs-am: +- +-#>+ 15 +-force-reedit: +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +- +- +-#>+ 21 +-clean-bcheck: +- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out +- +-bcheck: bcheck-am +- +-bcheck-am: +- @for i in ; do \ +- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ +- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ +- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ +- echo "$$i"; \ +- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ +- rm -f $$i.bchecktest.cc; exit 1; \ +- fi ; \ +- echo "" >> $$i.bchecktest.cc.class; \ +- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ +- rm -f a.out; \ +- fi ; \ +- done +- +- +-#>+ 11 +-media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc +- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ +- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ +- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ +- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ +- done; \ +- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ +- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files +- +-#>+ 3 +-clean-final: +- -rm -f media_propsdlgplugin_la.all_cpp.cpp +- +-#>+ 3 +-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am +- +-#>+ 3 +-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am +- +-#>+ 3 +-no-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am +- +-#>+ 3 +-no-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am +- +-#>+ 3 +-kde-rpo-clean: +- -rm -f *.rpo +- +-#>+ 9 +-nmcheck: +-propsdlgshareplugin.o: propsdlgshareplugin.moc +-nmcheck-am: nmcheck +-propsdlgshareplugin.lo: propsdlgshareplugin.moc +-propertiespage.lo: propertiespage.moc +-$(srcdir)/propertiespage.cpp: propertiespagegui.h +-$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h +-propertiespage.o: propertiespage.moc +- +-#>+ 15 +-propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc +- rm -f propertiespagegui.cpp +- echo '#include <kdialog.h>' > propertiespagegui.cpp +- echo '#include <klocale.h>' >> propertiespagegui.cpp +- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ +- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ +- rm -f propertiespagegui.cpp.temp ;\ +- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi +- +-propertiespagegui.h: $(srcdir)/propertiespagegui.ui +- rm -rf propertiespagegui.h; +- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; +-propertiespagegui.moc: propertiespagegui.h +- $(MOC) propertiespagegui.h -o propertiespagegui.moc +diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 +@@ -1,73 +0,0 @@ +-[Desktop Entry] +-Encoding=UTF-8 +-Type=Service +-Name=Media Properties Page +-Name[ca]=Pà gina de propietats de suport +-Name[cs]=Stránka vlastnostà média +-Name[da]=Medieegenskabsside +-Name[de]=Eigenschaften von Medien +-Name[el]=Σελίδα ιδιοτήτων μÎσων +-Name[es]=Página de propiedades de medios +-Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه +-Name[fi]=Mediaominaisuudet +-Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija +-Name[hu]=MédiajellemzÅ‘k lap +-Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione +-Name[ja]=メディア属性ページ +-Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling +-Name[nds]=Medienegenschappen-Siet +-Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika +-Name[pt]=Página de Propriedades de Suportes FÃsicos +-Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ +-Name[sk]=Strana vlastnostà média +-Name[sl]=Stran z lastnostmi nosilca +-Name[sr]=Страна Ñа ÑвојÑтвима медијума +-Name[sr@Latn]=Strana sa svojstvima medijuma +-Name[sv]=Sida för mediaegenskaper +-Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації +-Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện +-Name[zh_TW]=媒體內容é +-Comment=Konqueror properties dialog plugin to configure mount behaviour +-Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge +-Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror +-Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel +-Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden +-Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης +-Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje +-Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن +-Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä +-Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja +-Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához +-Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio +-Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン +-Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror +-Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen +-Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania +-Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем +-Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia +-Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev +-Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању +-Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju +-Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende +-Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ +-Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết +-Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 +-X-KDE-Library=media_propsdlgplugin +-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted +diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp +--- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 +@@ -1,217 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#include <qcheckbox.h> +-#include <qtooltip.h> +-#include <qbuttongroup.h> +-#include <qlineedit.h> +-#include <qfileinfo.h> +-#include <qlabel.h> +-#include <qregexp.h> +-#include <kpushbutton.h> +-#include <kmessagebox.h> +-#include <klocale.h> +-#include <qcombobox.h> +-#include <qtimer.h> +-#include <kdebug.h> +-#include "propertiespage.h" +-#include <dcopref.h> +- +-// keep in sync with .ui and kded module +-const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; +-const char *journales[] = {"data", "ordered", "writeback", 0 }; +- +-PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) +- : PropertiesPageGUI(parent), id(_id) +-{ +- kdDebug() << "props page " << id << endl; +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mountoptions", id); +- +- QStringList list; +- +- if (reply.isValid()) +- list = reply; +- +- if (list.size()) { +- kdDebug() << "list " << list << endl; +- +- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- kdDebug() << "key '" << key << "' value '" << value << "'\n"; +- options[key] = value; +- } +- +- if (!options.contains("ro")) +- option_ro->hide(); +- else +- option_ro->setChecked(options["ro"] == "true"); +- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("quiet")) +- option_quiet->hide(); +- else +- option_quiet->setChecked(options["quiet"] == "true"); +- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("sync")) +- option_sync->hide(); +- else +- option_sync->setChecked(options["sync"] == "true"); +- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("atime")) +- option_atime->hide(); +- else +- option_atime->setChecked(options["atime"] == "true"); +- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("flush")) +- option_flush->hide(); +- else +- option_flush->setChecked(options["flush"] == "true"); +- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("utf8")) +- option_utf8->hide(); +- else +- option_utf8->setChecked(options["utf8"] == "true"); +- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("uid")) +- option_uid->hide(); +- else +- option_uid->setChecked(options["uid"] == "true"); +- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("shortname")) +- { +- option_shortname->hide(); +- text_shortname->hide(); +- } +- else +- { +- for (int index = 0; short_names[index]; ++index) +- if (options["shortname"] == short_names[index]) +- { +- option_shortname->setCurrentItem(index); +- break; +- } +- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- if (!options.contains("journaling")) +- { +- text_journaling->hide(); +- option_journaling->hide(); +- } +- else +- { +- for (int index = 0; journales[index]; ++index) +- if (options["journaling"] == journales[index]) +- { +- option_journaling->setCurrentItem(index); +- break; +- } +- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); +- option_mountpoint->setText(options["mountpoint"]); +- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); +- option_automount->setChecked(options["automount"] == "true"); +- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("journaling") && +- !options.contains("shortname") && +- !options.contains("uid") && +- !options.contains("utf8") && +- !options.contains("flush")) +- groupbox_specific->hide(); +- +- } else { +- +- groupbox_generic->setEnabled(false); +- groupbox_specific->setEnabled(false); +- label_filesystem->hide(); +- } +-} +- +-PropertiesPage::~PropertiesPage() +-{ +-} +- +-bool PropertiesPage::save() +-{ +- QStringList result; +- +- if (options.contains("ro")) +- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); +- +- if (options.contains("quiet")) +- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); +- +- if (options.contains("sync")) +- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); +- +- if (options.contains("atime")) +- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); +- +- if (options.contains("flush")) +- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); +- +- if (options.contains("utf8")) +- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); +- +- if (options.contains("uid")) +- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); +- +- if (options.contains("shortname")) +- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); +- +- if (options.contains("journaling")) +- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); +- +- QString mp = option_mountpoint->text(); +- if (!mp.startsWith("/media/")) +- { +- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); +- return false; +- } +- result << QString("mountpoint=%1").arg(mp); +- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); +- +- kdDebug() << result << endl; +- +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); +- +- if (reply.isValid()) +- return (bool)reply; +- else { +- KMessageBox::sorry(this, +- i18n("Saving the changes failed")); +- +- return false; +- } +-} +- +-#include "propertiespage.moc" +diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h +--- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 +@@ -1,46 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef PROPERTIESPAGE_H +-#define PROPERTIESPAGE_H +- +-#include "propertiespagegui.h" +-#include <qmap.h> +- +-class QCheckBox; +-class Medium; +- +-class PropertiesPage : public PropertiesPageGUI +-{ +- Q_OBJECT +- +-public: +- PropertiesPage(QWidget* parent, const QString &_id); +- virtual ~PropertiesPage(); +- +- bool save(); +- +-protected: +- +- QMap<QString,QString> options; +- QString id; +- +-}; +- +-#endif +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui +--- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 +@@ -1,387 +0,0 @@ +-<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +-<class>PropertiesPageGUI</class> +-<widget class="QWidget"> +- <property name="name"> +- <cstring>PropertiesPageGUI</cstring> +- </property> +- <property name="geometry"> +- <rect> +- <x>0</x> +- <y>0</y> +- <width>527</width> +- <height>476</height> +- </rect> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <property name="margin"> +- <number>0</number> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout17</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_generic</cstring> +- </property> +- <property name="title"> +- <string>Generic Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout15</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_ro</cstring> +- </property> +- <property name="text"> +- <string>Read only</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount the file system read-only.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_quiet</cstring> +- </property> +- <property name="text"> +- <string>Quiet</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_sync</cstring> +- </property> +- <property name="text"> +- <string>Synchronous</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>All I/O to the file system should be done synchronously.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_atime</cstring> +- </property> +- <property name="text"> +- <string>Access time updates</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Update inode access time for each access.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>textLabel3</cstring> +- </property> +- <property name="text"> +- <string>Mountpoint:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> +- </property> +- </widget> +- <widget class="QLineEdit"> +- <property name="name"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="text"> +- <string></string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_automount</cstring> +- </property> +- <property name="text"> +- <string>Mount automatically</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system automatically.</string> +- </property> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_specific</cstring> +- </property> +- <property name="title"> +- <string>Filesystem Specific Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout11</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_flush</cstring> +- </property> +- <property name="text"> +- <string>Flushed IO</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_utf8</cstring> +- </property> +- <property name="text"> +- <string>UTF-8 charset</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_uid</cstring> +- </property> +- <property name="text"> +- <string>Mount as user</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system as user.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout7</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_journaling</cstring> +- </property> +- <property name="text"> +- <string>Journaling:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>All Data</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Ordered</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Write Back</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_shortname</cstring> +- </property> +- <property name="text"> +- <string>Short names:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>Lower</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows 95</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows NT</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Mixed</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>label_filesystem</cstring> +- </property> +- <property name="text"> +- <string>Filesystem: iso9660</string> +- </property> +- </widget> +- <spacer> +- <property name="name"> +- <cstring>spacer1</cstring> +- </property> +- <property name="orientation"> +- <enum>Vertical</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </vbox> +- </widget> +- </hbox> +-</widget> +-<connections> +- <connection> +- <sender>option_ro</sender> +- <signal>stateChanged(int)</signal> +- <receiver>PropertiesPageGUI</receiver> +- <slot>changedSlot()</slot> +- </connection> +-</connections> +-<variables> +- <variable>bool m_hasChanged;</variable> +-</variables> +-<signals> +- <signal>changed()</signal> +-</signals> +-<slots> +- <slot access="protected">changedSlot()</slot> +-</slots> +-<functions> +- <function returnType="bool">hasChanged()</function> +-</functions> +-<layoutdefaults spacing="6" margin="11"/> +-</UI> +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h +--- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 +@@ -1,22 +0,0 @@ +-/**************************************************************************** +-** ui.h extension file, included from the uic-generated form implementation. +-** +-** If you wish to add, delete or rename functions or slots use +-** Qt Designer which will update this file, preserving your code. Create an +-** init() function in place of a constructor, and a destroy() function in +-** place of a destructor. +-*****************************************************************************/ +- +- +-void PropertiesPageGUI::changedSlot() +-{ +- m_hasChanged = true; +- emit changed(); +-} +- +-bool PropertiesPageGUI::hasChanged() +-{ +- return m_hasChanged; +-} +- +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 +@@ -1,100 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +-#include <qstring.h> +-#include <qvbox.h> +-#include <qlayout.h> +-#include <qlabel.h> +-#include <qtimer.h> +- +-#include <kgenericfactory.h> +-#include <kdebug.h> +-#include <kpushbutton.h> +-#include <kfileshare.h> +-#include <kmessagebox.h> +-#include <kprocess.h> +-#include <kstandarddirs.h> +-#include <kdialog.h> +-#include <kglobal.h> +-#include <dcopref.h> +- +-#include "propertiespage.h" +-#include "propsdlgshareplugin.h" +-#include "../libmediacommon/medium.h" +- +-typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; +- +-K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, +- PropsDlgSharePluginFactory("media_propsdlgplugin") ) +- +-class PropsDlgSharePlugin::Private +-{ +- public: +- PropertiesPage* page; +-}; +- +-PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, +- const char *, const QStringList & ) +- : KPropsDlgPlugin(dlg), d(0) +-{ +- if (properties->items().count() != 1) +- return; +- +- KFileItem *item = properties->items().first(); +- +- DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << item->url() << endl; +- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); +- +- if ( !reply.isValid() ) +- return; +- +- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); +- +- d = new Private(); +- +- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); +- connect(d->page, SIGNAL(changed()), +- SLOT(slotChanged())); +- +- // QTimer::singleShot(100, this, SLOT(slotChanged())); +- +-} +- +-void PropsDlgSharePlugin::slotChanged() +-{ +- kdDebug() << "slotChanged()\n"; +- setDirty(true); +-} +- +-PropsDlgSharePlugin::~PropsDlgSharePlugin() +-{ +- delete d; +-} +- +-void PropsDlgSharePlugin::applyChanges() +-{ +- kdDebug() << "applychanges\n"; +- if (!d->page->save()) { +- properties->abortApplying(); +- } +-} +- +- +-#include "propsdlgshareplugin.moc" +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 +@@ -1,44 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef KONQFILESHAREPLUGIN_H +-#define KONQFILESHAREPLUGIN_H +- +-#include <kpropertiesdialog.h> +- +-class PropsDlgSharePlugin : public KPropsDlgPlugin +-{ +-Q_OBJECT +-public: +- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); +- virtual ~PropsDlgSharePlugin(); +- virtual void applyChanges(); +- +-public slots: +- void slotChanged(); +- +-private: +- class Private; +- Private *d; +- +-}; +- +-#endif +- +- +diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop +diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt + Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن + Name[fi]=Poista turvallisesti + Name[fr]=Enlever en toute sécurité +-Name[fy]=Feilich verwiderje + Name[ga]=Bain Amach go Sábháilte + Name[gl]=Eliminar de Maneira Segura + Name[he]=שליפה בבטחה +@@ -46,7 +44,6 @@ + Name[ru]=БезопаÑно извлечь + Name[rw]=Gukuramo Neza + Name[se]=DorvvoÅ¡laÅ¡ eretváldin +-Name[sk]=BezpeÄne odpojiÅ¥ + Name[sl]=Varno odstrani + Name[sr]=Безбедно уклони + Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kdebase4-workspace/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kdebase4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kdebase4-workspace/files/patch-kio_media b/x11/kdebase4-workspace/files/patch-kio_media deleted file mode 100644 index 144c7914a0e5..000000000000 --- a/x11/kdebase4-workspace/files/patch-kio_media +++ /dev/null @@ -1,6118 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe - Name[he]=×”×ª×§× ×™× - Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ - Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállÃtása - Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក - Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ - Comment[pt_BR]=Configura as mÃdias de armazenamento - Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacÃch médià - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за Ñкладиштење - Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj - Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ - Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=MediumdieÄ‘ut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ - - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; - -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -- - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); -- -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); - - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -54,7 +53,6 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_backends.append( new FstabBackend(m_mediaList) ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -- --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- return i18n("Feature only available with HAL"); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- return i18n("Feature only available with HAL"); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo - Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ - Name[eu]=KDED media kudeatzailea - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=×ž× ×”×œ המדיה של KDED - Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ - Name[ru]=Управление подключаемыми уÑтройÑтвами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieÄ‘ahalli --Name[sk]=KDED správca médià - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) - Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ -+Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) - Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) - Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ - Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; - - class MediaManager : public KDEDModule - { -@@ -41,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -81,7 +74,6 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; - }; - -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima - Name[hu]=LemezfigyelÅ‘ szolgáltatás - Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba - Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв --Name[sk]=Notifikátor medià - Name[sl]=Demon za obveÅ¡Äanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser - Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº --Name[zh_TW]=媒體通知伺æœç¨‹å¼ - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima - Comment[hu]=LemezérzékelÅ‘ - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier - Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas - Comment[mk]=ИзвеÑтување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) - Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв --Comment[sk]=Notifikátor pripojených médià - Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌី​អូឌីយ៉ូ --Comment[mk]=Ðудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ស៊ីឌី​ទទ០- Comment[lt]=TuÅ¡Äias CD - Comment[lv]=TukÅ¡s CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=ÄŒisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ឌីវីឌី​ទទ០- Comment[lt]=TuÅ¡Äias DVD - Comment[lv]=TukÅ¡s DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=ÄŒisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=ÄŒatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ - Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD ВидеодиÑк - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ - Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диÑк - Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=ÄŒatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диÑка - Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диÑка - Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=ÄŒatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ - Comment[is]=VÃdeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク -+Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク - Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ - Comment[lo]= ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pà gina de propietats de suport --Name[cs]=Stránka vlastnostà média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μÎσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[hu]=MédiajellemzÅ‘k lap --Name[is]=Eiginleikar miðils --Name[ja]=メディア属性ページ --Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[pt]=Página de Propriedades de Suportes FÃsicos --Name[pt_BR]=Página de Propriedades de Suportes FÃsicos --Name[sk]=Strana vlastnostà média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна Ñа ÑвојÑтвима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації --Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện --Name[zh_TW]=媒體內容é --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン --Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev --Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ --Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết --Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ - Name[eu]=Atera arriskurik gabe - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ - Name[ru]=БезопаÑно извлечь - Name[rw]=Gukuramo Neza - Name[se]=DorvvoÅ¡laÅ¡ eretváldin --Name[sk]=BezpeÄne odpojiÅ¥ - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kdebase4-workspace/files/patch-konsole_konsole-TECommon.h b/x11/kdebase4-workspace/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kdebase4-workspace/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 46b98442ee8c..d4de86a32d61 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} -PORTREVISION= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -46,13 +45,14 @@ INSTALLS_SHLIB= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 CONFIGURE_ENV+= RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp -CONFIGURE_ARGS+=--without-hal \ - --without-java \ +CONFIGURE_ARGS+=--without-java \ --with-qt-dir=${X11BASE} \ --with-xdmdir=${X11BASE}/lib/X11/xdm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on +OPTIONS= ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \ + HAL "Use HAL backend for media:/ (FreeBSD 5 and newer only)" off \ + HTDIG "Depend on htdig, used to build manual indices" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> @@ -65,6 +65,23 @@ RUN_DEPENDS+= kompmgr:${PORTSDIR}/x11-wm/kompmgr RUN_DEPENDS+= artswrapper:${PORTSDIR}/audio/artswrapper .endif +.if defined(WITH_HTDIG) +RUN_DEPENDS+= htdig:${PORTSDIR}/textproc/htdig +.endif + +.if defined(WITH_HAL) && ${OSVERSION} > 500035 +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp +LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \ + hal.1:${PORTSDIR}/sysutils/hal +PLIST_SUB+= MEDIA="" +.else +CONFIGURE_ARGS+=--without-hal +EXTRA_PATCHES= ${FILESDIR}/extrapatch-kio_media \ + ${FILESDIR}/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp +PLIST_SUB+= MEDIA="@comment " +.endif + + post-extract: @${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv @${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv @@ -74,6 +91,17 @@ pre-configure: ${WRKSRC}/kdeprint/descriptions/Makefile.in ${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \ ${WRKSRC}/applnk/Makefile.in + ${REINPLACE_CMD} \ + -E -e '/XftAntialias/s/false/true/g' \ + ${WRKSRC}/kcontrol/krdb/krdb.cpp + ${REINPLACE_CMD} \ + -E -e '/htdigbin/s|/usr/bin|${LOCALBASE}/bin|g' \ + -e '/htdigdata/s|/srv/www/htdig|${LOCALBASE}/share/htdig|g' \ + -e '/htsearchpath/s|/srv/www|${LOCALBASE}/www|g' \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_docbookdig.pl.in \ + ${WRKSRC}/khelpcenter/searchhandlers/khc_htsearch.pl + post-configure: ${REINPLACE_CMD} -e "s@^\s*Exec=.*\$$@Exec=ElectricEyes@" \ diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 656400d81aed..6f53a73368ff 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.4.tar.bz2) = 882a9729c08b197caef2c8712c980d9c -SHA256 (KDE/kdebase-3.5.4.tar.bz2) = 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 -SIZE (KDE/kdebase-3.5.4.tar.bz2) = 23636847 +MD5 (KDE/kdebase-3.5.5.tar.bz2) = 0c685af1cbca75f9c77b3ed231ba0468 +SHA256 (KDE/kdebase-3.5.5.tar.bz2) = f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 +SIZE (KDE/kdebase-3.5.5.tar.bz2) = 23851886 diff --git a/x11/kdebase4/files/extrapatch-kio_media b/x11/kdebase4/files/extrapatch-kio_media new file mode 100644 index 000000000000..ab1a03b094cb --- /dev/null +++ b/x11/kdebase4/files/extrapatch-kio_media @@ -0,0 +1,5814 @@ +diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in +--- kioslave/media/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/Makefile.in Fri May 26 09:54:31 2006 +@@ -122,8 +122,7 @@ + DATA = $(kde_services_DATA) + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services propsdlgplugin ++DIST_SUBDIRS = $(SUBDIRS) + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 1 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +@@ -276,6 +275,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -611,9 +611,8 @@ + xdg_appsdir = @xdg_appsdir@ + xdg_directorydir = @xdg_directorydir@ + xdg_menudir = @xdg_menudir@ +-@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin + SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ +- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) ++ kfile-plugin kcmodule mimetypes services + + INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) + #>- METASOURCES = AUTO +@@ -1092,8 +1091,7 @@ + ./testmedia + + messages: rc.cpp +- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp +- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot ++ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in +--- kioslave/media/kcmodule/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kcmodule/Makefile.in Fri May 26 09:54:31 2006 +@@ -253,6 +253,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp +--- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 +@@ -39,15 +39,15 @@ + QString hal_text = view->kcfg_HalBackendEnabled->text(); + hal_text += " ("+i18n("No support for HAL on this system")+")"; + view->kcfg_HalBackendEnabled->setText( hal_text ); +-#endif + view->kcfg_HalBackendEnabled->setEnabled( false ); ++#endif + + #ifndef COMPILE_LINUXCDPOLLING + QString poll_text = view->kcfg_CdPollingEnabled->text(); + poll_text += " ("+i18n("No support for CD polling on this system")+")"; + view->kcfg_CdPollingEnabled->setText( poll_text ); +-#endif + view->kcfg_CdPollingEnabled->setEnabled( false ); ++#endif + + load(); + } +diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop +--- kioslave/media/kcmodule/media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kcmodule/media.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,6 @@ + Name[es]=Dispositivos de almacenamiento + Name[et]=Andmekandjad + Name[eu]=Biltegiratze-euskarria +-Name[fa]=رسانه ذخیره‌گاه + Name[fi]=Tallennusmedia + Name[fr]=Support de stockage + Name[fy]=Opslachapparaten +@@ -33,7 +32,7 @@ + Name[he]=×”×ª×§× ×™× + Name[hi]=à¤à¤‚डार मीडिया + Name[hr]=Mediji za pohranjivanje +-Name[hu]=Tárolóeszközök ++Name[hu]=Tárolóeszköz + Name[is]=Geymslumiðlar + Name[it]=Dispositivi di archiviazione + Name[ja]=記憶メディア +@@ -43,7 +42,7 @@ + Name[mk]=Медиуми за податоци + Name[ms]=Media Storan + Name[nb]=Lagringsenheter +-Name[nds]=Spiekermedien ++Name[nds]=Spiekerreedschappen + Name[nl]=Opslagapparaten + Name[nn]=Lagringsmedium + Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ +@@ -54,7 +53,6 @@ + Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… + Name[rw]=Uburyo bwo Kubika + Name[se]=Vurkenmedia +-Name[sk]=Zálohovacie médiá + Name[sl]=Nosilci za shranjevanje + Name[sr]=Складишни медијуми + Name[sr@Latn]=SkladiÅ¡ni medijumi +@@ -82,13 +80,11 @@ + Comment[es]=Configuración de las medios de almacenamiento + Comment[et]=Salvestusandmekandjate seadistused + Comment[eu]=Konfiguratu biltegiratze-euskarria +-Comment[fa]=پیکربندی رسانه ذخیره‌گاه + Comment[fi]=Aseta tallennusmedia + Comment[fr]=Configurer le média de stockage + Comment[fy]=Opslachmedia ynstelle + Comment[ga]=Cumraigh Meáin Stórála + Comment[gl]=Configurar Medios de Armacenaxe +-Comment[he]=×©×™× ×•×™ הגדרות מדיות ×חסון + Comment[hr]=Konfiguriranje medija za pohranu + Comment[hu]=A tárolóeszközök beállÃtása + Comment[is]=Stillingar geymslumiðla +@@ -98,16 +94,15 @@ + Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius + Comment[mk]=Конфигурирајте ги медиумите за податоци + Comment[nb]=Sett opp lagringsmedier +-Comment[nds]=Spiekermedien instellen ++Comment[nds]=Spiekerreedschappen instellen + Comment[nl]=Opslagmedia instellen + Comment[nn]=Set opp lagringsmedium + Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ + Comment[pl]=Konfiguracja noÅ›ników danych +-Comment[pt]=Configurar os Suportes de Armazenamento ++Comment[pt]=Configurar os Meios de Armazenamento + Comment[pt_BR]=Configura as mÃdias de armazenamento + Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Comment[se]=Heivet vurkenmediaid +-Comment[sk]=Nastavenie zálohovacÃch médià + Comment[sl]=Nastavitve nosilcev za shranjevanje + Comment[sr]=Подешавање медијума за Ñкладиштење + Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje +@@ -132,13 +127,11 @@ + Keywords[es]=almacenamiento,medios,usb,cdrom,dispositivo + Keywords[et]=salvestamine,andmekandja,usb,cd,seade + Keywords[eu]=biltegiratzea,euskarriak,usb,cdrom,gailua +-Keywords[fa]=ذخیره گاه، رسانه، گذرگاه سریال جهانی، دیسک Ùشرده، دستگاه + Keywords[fi]=varasto,media,usb,cdrom,laite + Keywords[fr]=stockage,media,medium,usb,cdrom,périphérique + Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart + Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas + Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo +-Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור + Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj + Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz + Keywords[is]=geymsla,miðill,usb,cdrom,tæki +@@ -153,7 +146,7 @@ + Keywords[nn]=lagring,media,usb,CD-spiller,CD-ROM,einingar,minnepinnar,harddiskar,HD,eksterne harddiskar,zip-diskar + Keywords[pa]=ਸਟੋਰੇਜ਼,ਮੀਡਿਆ,ਜੰਤਰ,usb,cdrom + Keywords[pl]=dane,przechowywanie danych,noÅ›nik danych,noÅ›niki danych,usb,cdrom,urzÄ…dzenie +-Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo ++Keywords[pt]=armazenamento,meio,usb,cdrom,dispositivo + Keywords[pt_BR]=armazenamento,mÃdia,usb,cd-rom,device,dispositivo + Keywords[ru]=storage,media,usb,cdrom,device,уÑтройÑтво Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ + Keywords[sl]=shranjevanje,nosilec,usb,cdrom,naprava +diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp +--- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/kcmodule/notifiermodule.cpp Mon May 22 20:12:42 2006 +@@ -174,8 +174,8 @@ + ActionListBoxItem *action_item + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + +- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ NotifierServiceAction * action; ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) ) + { + ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); + +@@ -195,8 +195,7 @@ + = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); + + NotifierServiceAction *action; +- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); +- if ( action ) ++ if ( (action = dynamic_cast<NotifierServiceAction*>( action_item->action() )) ) + { + m_settings.deleteAction( action ); + updateListBox(); +diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in +--- kioslave/media/kfile-plugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/kfile-plugin/Makefile.in Fri May 26 09:54:31 2006 +@@ -248,6 +248,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop +--- kioslave/media/kfile-plugin/kfile_media.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/kfile-plugin/kfile_media.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Name[es]=Información de recursos + Name[et]=Andmekandja info + Name[eu]=Media informazioa +-Name[fa]=اطلاعات رسانه + Name[fi]=Tallenteiden tiedot + Name[fr]=Informations sur le média + Name[fy]=Mediumynformaasje +@@ -47,7 +46,6 @@ + Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе + Name[rw]=Amakuru y'igitangazamakuru + Name[se]=MediumdieÄ‘ut +-Name[sk]=Informácie o médiu + Name[sl]=Informacije o mediju + Name[sr]=Информације о медијуму + Name[sr@Latn]=Informacije o medijumu +@@ -63,4 +61,4 @@ + Name[zh_TW]=媒體資訊 + ServiceTypes=KFilePlugin + X-KDE-Library=kfile_media +-MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted ++MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera +diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp +--- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 +@@ -64,16 +64,12 @@ + addMimeType( "media/floppy_unmounted" ); + addMimeType( "media/zip_unmounted" ); + addMimeType( "media/gphoto2camera" ); +- addMimeType( "media/camera_mounted" ); +- addMimeType( "media/camera_unmounted" ); + } + + bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) + { +- const Medium medium = askMedium(info); ++ const Medium medium = askMedium(info); + +- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; +- + if (medium.id().isNull()) return false; + + QString mount_point = medium.mountPoint(); +@@ -165,8 +161,7 @@ + const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) + { + DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << info.url() << endl; +- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); ++ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); + + if ( !reply.isValid() ) + { +diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in +--- kioslave/media/libmediacommon/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/libmediacommon/Makefile.in Fri May 26 09:54:31 2006 +@@ -250,6 +250,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp +--- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 +@@ -40,8 +40,6 @@ + m_properties+= QString::null; /* ICON_NAME */ + + loadUserLabel(); +- +- m_halmounted = false; + } + + Medium::Medium() +@@ -59,8 +57,6 @@ + m_properties+= QString::null; /* BASE_URL */ + m_properties+= QString::null; /* MIME_TYPE */ + m_properties+= QString::null; /* ICON_NAME */ +- +- m_halmounted = false; + } + + const Medium Medium::create(const QStringList &properties) +@@ -163,7 +159,7 @@ + bool Medium::mountableState(bool mounted) + { + if ( m_properties[DEVICE_NODE].isEmpty() +- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) ++ || m_properties[MOUNT_POINT].isEmpty() ) + { + return false; + } +@@ -208,10 +204,14 @@ + + KURL Medium::prettyBaseURL() const + { +- if ( !baseURL().isEmpty() ) +- return baseURL(); +- ++ if ( isMountable() ) ++ { + return KURL( mountPoint() ); ++ } ++ else ++ { ++ return KURL( baseURL() ); ++ } + } + + QString Medium::prettyLabel() const +diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h +--- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 ++++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 +@@ -22,7 +22,6 @@ + #include <qstring.h> + #include <qstringlist.h> + #include <kurl.h> +-#include <qmap.h> + + class Medium + { +@@ -79,32 +78,14 @@ + + void setMimeType(const QString &mimeType); + void setIconName(const QString &iconName); +- void setHalMounted(bool flag) const { m_halmounted = flag; } +- bool halMounted() const { return m_halmounted; } + + private: + Medium(); + void loadUserLabel(); + + QStringList m_properties; +- mutable bool m_halmounted; +- ++ + friend class QValueListNode<const Medium>; + }; +- +-namespace MediaManagerUtils { +- static inline QMap<QString,QString> splitOptions(const QStringList & options) +- { +- QMap<QString,QString> valids; +- +- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- valids[key] = value; +- } +- return valids; +- } +-} + + #endif +diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp +--- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 +@@ -226,8 +226,6 @@ + + mp_mounting = &medium; + +- +- /* + KIO::Job* job = KIO::mount(false, 0, + medium.deviceNode(), + medium.mountPoint()); +@@ -236,7 +234,6 @@ + this, SLOT( slotMountResult( KIO::Job * ) ) ); + connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), + this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); +- */ + kapp->dcopClient() + ->connectDCOPSignal("kded", "mediamanager", + "mediumChanged(QString, bool)", +@@ -244,17 +241,7 @@ + "slotMediumChanged(QString)", + false); + +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_lastErrorMessage); +- else +- m_lastErrorMessage = i18n("Internal Error"); +- if (!m_lastErrorMessage.isEmpty()) +- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; +- else { +- qApp->eventLoop()->enterLoop(); +- } ++ qApp->eventLoop()->enterLoop(); + + mp_mounting = 0L; + +diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in +--- kioslave/media/mediamanager/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mediamanager/Makefile.in Fri May 26 09:54:31 2006 +@@ -284,6 +284,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp +--- kioslave/media/mediamanager/fstabbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 +@@ -37,9 +37,6 @@ + #endif + + #include <klocale.h> +-#include <kio/job.h> +-#include <kio/netaccess.h> +-#include <kdebug.h> + #include <kdirwatch.h> + #include <kurl.h> + #include <kmountpoint.h> +@@ -97,26 +94,6 @@ + KDirWatch::self()->removeFile(MTAB); + } + +-QString FstabBackend::mount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::mount( false, 0, medium->deviceNode(), medium->mountPoint()); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- +-QString FstabBackend::unmount( const QString &_udi ) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- KIO::Job* job = KIO::unmount( medium->mountPoint(), false); +- KIO::NetAccess::synchronousRun( job, 0 ); +- return QString::null; +-} +- + void FstabBackend::slotDirty(const QString &path) + { + if (path==MTAB) +@@ -134,7 +111,6 @@ + if ( mount->mountType() == "swap" + || mount->mountType() == "tmpfs" + || mount->mountType() == "sysfs" +- || mount->mountType() == "fdescfs" + || mount->mountType() == "kernfs" + || mount->mountType() == "usbfs" + || mount->mountType().contains( "proc" ) +@@ -147,7 +123,6 @@ + || mount->mountPoint() == "/dev/swap" + || mount->mountPoint() == "/dev/pts" + || mount->mountPoint().find("/proc") == 0 +- || mount->mountPoint().find("/sys") == 0 + + // We might want to display only network shares + // since HAL doesn't handle them +@@ -169,7 +144,7 @@ + + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds; ++ QStringList new_mtabIds, new_mtabEntries; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -187,19 +162,18 @@ + nothing has changed, do not stat the mount point. Avoids + hang if network shares are stalling */ + QString mtabEntry = dev + "*" + mp + "*" + fs; +- if(m_mtabEntries.contains(mtabEntry)) { +- new_mtabIds += m_mtabEntries[mtabEntry]; +- continue; +- } ++ bool isOldEntry = m_mtabEntries.contains(mtabEntry); ++ new_mtabEntries+=mtabEntry; ++ if (isOldEntry) continue; + + QString id = generateId(dev, mp); + new_mtabIds+=id; +- m_mtabEntries[mtabEntry] = id; + + if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) + { + QString mime, icon, label; + guess(dev, mp, fs, true, mime, icon, label); ++ + m_mediaList.changeMediumState(id, true, false, + mime, icon, label); + } +@@ -237,10 +211,6 @@ + QString mp = medium->mountPoint(); + QString fs = medium->fsType(); + +- +- QString mtabEntry = dev + "*" + mp + "*" + fs; +- m_mtabEntries.remove(mtabEntry); +- + QString mime, icon, label; + guess(dev, mp, fs, false, mime, icon, label); + +@@ -256,6 +226,7 @@ + } + + m_mtabIds = new_mtabIds; ++ m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification) +diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h +--- kioslave/media/mediamanager/fstabbackend.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/fstabbackend.h Mon May 22 20:12:42 2006 +@@ -23,7 +23,6 @@ + + #include <qobject.h> + #include <qstringlist.h> +-#include <qmap.h> + + #ifdef Q_OS_FREEBSD + #include <qtimer.h> +@@ -41,10 +40,6 @@ + const QString &fsType, bool mounted, + QString &mimeType, QString &iconName, + QString &label); +- +- QString mount(const QString &id); +- QString unmount(const QString &id); +- + private slots: + void slotDirty(const QString &path); + void handleFstabChange(bool allowNotification = true); +@@ -58,7 +53,7 @@ + + bool m_networkSharesOnly; + QStringList m_mtabIds; +- QMap<QString, QString> m_mtabEntries; ++ QStringList m_mtabEntries; + QStringList m_fstabIds; + #ifdef Q_OS_FREEBSD + QTimer m_mtabTimer; +diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp +--- kioslave/media/mediamanager/halbackend.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 +@@ -21,16 +21,9 @@ + + #include <stdlib.h> + +-#include <qfile.h> + #include <klocale.h> + #include <kurl.h> + #include <kdebug.h> +-#include <kprocess.h> +-#include <kconfig.h> +-#include <qstylesheet.h> +-#include <kmountpoint.h> +-#include <kmessagebox.h> +-#include <kio/job.h> + + #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) + #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) +@@ -39,1177 +32,615 @@ + static HALBackend* s_HALBackend; + + /* A macro function to convert HAL string properties to QString */ +-QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) ++QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) + { +- char* _ppt_string; +- QString _ppt_QString; +- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); +- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); +- libhal_free_string(_ppt_string); +- return _ppt_QString; ++ char* _ppt_string; ++ QString _ppt_QString; ++ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); ++ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); ++ libhal_free_string(_ppt_string); ++ return _ppt_QString; + } + + /* Constructor */ + HALBackend::HALBackend(MediaList &list, QObject* parent) +- : QObject() +- , BackendBase(list) +- , m_halContext(NULL) +- , m_halStoragePolicy(NULL) +- , m_parent(parent) ++ : QObject() ++ , BackendBase(list) ++ , m_halContext(NULL) ++ , m_halStoragePolicy(NULL) ++ , m_parent(parent) + { +- s_HALBackend = this; ++ s_HALBackend = this; + } + + /* Destructor */ + HALBackend::~HALBackend() + { +- /* Close HAL connection */ +- if (m_halContext) +- { +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- unmount(current_medium->id()); +- +- +- /* Remove all the registered media first */ +- int numDevices; +- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); +- +- if ( halDeviceList ) +- { +- for ( int i = 0; i < numDevices; i++ ) +- { +- m_mediaList.removeMedium( halDeviceList[i], false ); +- } +- } +- +- libhal_free_string_array( halDeviceList ); +- +- DBusError error; +- dbus_error_init(&error); +- libhal_ctx_shutdown(m_halContext, &error); +- libhal_ctx_free(m_halContext); +- } +- +- if (m_halStoragePolicy) +- libhal_storage_policy_free(m_halStoragePolicy); ++ /* Close HAL connection */ ++ if (m_halContext) ++ { ++ /* Remove all the registered media first */ ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); ++ ++ if ( halDeviceList ) ++ { ++ for ( int i = 0; i < numDevices; i++ ) ++ { ++ m_mediaList.removeMedium( halDeviceList[i], false ); ++ } ++ } ++ ++ #ifdef HAL_0_4 ++ hal_shutdown(m_halContext); ++ #else ++ libhal_ctx_shutdown(m_halContext, NULL); ++ libhal_ctx_free(m_halContext); ++ #endif ++ } ++ ++ if (m_halStoragePolicy) ++ libhal_storage_policy_free(m_halStoragePolicy); + } + + /* Connect to the HAL */ + bool HALBackend::InitHal() + { +- kdDebug(1219) << "Context new" << endl; +- m_halContext = libhal_ctx_new(); +- if (!m_halContext) +- { +- kdDebug(1219) << "Failed to initialize HAL!" << endl; +- return false; +- } +- +- // Main loop integration +- kdDebug(1219) << "Main loop integration" << endl; +- DBusError error; +- dbus_error_init(&error); +- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); +- +- if (!dbus_connection || dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- +- dbus_bus_register(dbus_connection, &error); +- +- if (dbus_error_is_set(&error)) { +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- return false; +- } +- MainLoopIntegration(dbus_connection); +- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); +- +- // HAL callback functions +- kdDebug(1219) << "Callback functions" << endl; +- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); +- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); +- libhal_ctx_set_device_new_capability (m_halContext, NULL); +- libhal_ctx_set_device_lost_capability (m_halContext, NULL); +- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); +- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); +- +- kdDebug(1219) << "Context Init" << endl; +- if (!libhal_ctx_init(m_halContext, &error)) +- { +- if (dbus_error_is_set(&error)) +- dbus_error_free(&error); +- libhal_ctx_free(m_halContext); +- m_halContext = NULL; +- kdDebug(1219) << "Failed to init HAL context!" << endl; +- return false; +- } +- +- /** @todo customize watch policy */ +- kdDebug(1219) << "Watch properties" << endl; +- if (!libhal_device_property_watch_all(m_halContext, &error)) +- { +- kdDebug(1219) << "Failed to watch HAL properties!" << endl; +- return false; +- } +- +- /* libhal-storage initialization */ +- kdDebug(1219) << "Storage Policy" << endl; +- m_halStoragePolicy = libhal_storage_policy_new(); +- /** @todo define libhal-storage icon policy */ ++#ifdef HAL_0_4 /* HAL API 0.4 */ ++ /* libhal initialization */ ++ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; ++ m_halFunctions.device_added = HALBackend::hal_device_added; ++ m_halFunctions.device_removed = HALBackend::hal_device_removed; ++ m_halFunctions.device_new_capability = NULL; ++ m_halFunctions.device_lost_capability = NULL; ++ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; ++ m_halFunctions.device_condition = HALBackend::hal_device_condition; ++ ++ m_halContext = hal_initialize(&m_halFunctions, false); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (libhal_device_property_watch_all(m_halContext, NULL)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#else /* HAL API >= 0.5 */ ++ kdDebug(1219) << "Context new" << endl; ++ m_halContext = libhal_ctx_new(); ++ if (!m_halContext) ++ { ++ kdDebug(1219) << "Failed to initialize HAL!" << endl; ++ return false; ++ } ++ ++ // Main loop integration ++ kdDebug(1219) << "Main loop integration" << endl; ++ DBusError error; ++ dbus_error_init(&error); ++ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); ++ if (dbus_error_is_set(&error)) { ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ return false; ++ } ++ MainLoopIntegration(dbus_connection); ++ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); ++ ++ // HAL callback functions ++ kdDebug(1219) << "Callback functions" << endl; ++ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); ++ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); ++ libhal_ctx_set_device_new_capability (m_halContext, NULL); ++ libhal_ctx_set_device_lost_capability (m_halContext, NULL); ++ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); ++ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); + +- /* List devices at startup */ +- return ListDevices(); ++ kdDebug(1219) << "Context Init" << endl; ++ if (!libhal_ctx_init(m_halContext, &error)) ++ { ++ if (dbus_error_is_set(&error)) ++ dbus_error_free(&error); ++ libhal_ctx_free(m_halContext); ++ m_halContext = NULL; ++ kdDebug(1219) << "Failed to init HAL context!" << endl; ++ return false; ++ } ++ ++ /** @todo customize watch policy */ ++ kdDebug(1219) << "Watch properties" << endl; ++ if (!libhal_device_property_watch_all(m_halContext, &error)) ++ { ++ kdDebug(1219) << "Failed to watch HAL properties!" << endl; ++ return false; ++ } ++#endif ++ ++ /* libhal-storage initialization */ ++ kdDebug(1219) << "Storage Policy" << endl; ++ m_halStoragePolicy = libhal_storage_policy_new(); ++ /** @todo define libhal-storage icon policy */ ++ ++ /* List devices at startup */ ++ return ListDevices(); + } + + /* List devices (at startup)*/ + bool HALBackend::ListDevices() + { +- kdDebug(1219) << "ListDevices" << endl; ++ kdDebug(1219) << "ListDevices" << endl; + +- int numDevices; +- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); ++ int numDevices; ++ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); + +- if (!halDeviceList) +- return false; ++ if (!halDeviceList) ++ return false; + +- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; +- for (int i = 0; i < numDevices; i++) +- AddDevice(halDeviceList[i], false); ++ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; ++ for (int i = 0; i < numDevices; i++) ++ AddDevice(halDeviceList[i], false); + +- libhal_free_string_array( halDeviceList ); +- +- return true; ++ return true; + } + + /* Create a media instance for the HAL device "udi". +- This functions checks whether the device is worth listing */ ++This functions checks whether the device is worth listing */ + void HALBackend::AddDevice(const char *udi, bool allowNotification) + { +- /* We don't deal with devices that do not expose their capabilities. +- If we don't check this, we will get a lot of warning messages from libhal */ +- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- return; +- +- /* If the device is already listed, do not process. +- This should not happen, but who knows... */ +- /** @todo : refresh properties instead ? */ +- if (m_mediaList.findById(udi)) +- return; +- +- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) +- allowNotification=false; +- +- /* Add volume block devices */ +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- /* We only list volume that have a filesystem or volume that have an audio track*/ +- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) +- return; +- +- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && +- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && +- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) +- return; +- +- /* Query drive udi */ +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- /* We don't list floppy volumes because we list floppy drives */ +- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) +- return; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) +- allowNotification=false; +- +- // if the device is locked do not act upon it +- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) +- allowNotification=false; +- +- /** @todo check exclusion list **/ +- +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- +- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); +- kdDebug() << "automount " << options["automount"] << endl; +- if (options["automount"] == "true" && allowNotification ) { +- QString error = mount(medium); +- if (!error.isEmpty()) +- kdDebug() << "error " << error << endl; +- } +- setVolumeProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- +- return; +- } +- +- /* Floppy & zip drives */ +- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) +- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || +- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setFloppyProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } +- +- /* Camera handled by gphoto2*/ +- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && +- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || +- +- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && +- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) +- ) +- { +- /* Create medium */ +- Medium* medium = new Medium(udi, ""); +- setCameraProperties(medium); +- m_mediaList.addMedium(medium, allowNotification); +- return; +- } ++ /* We don't deal with devices that do not expose their capabilities. ++ If we don't check this, we will get a lot of warning messages from libhal */ ++ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ return; ++ ++ /* If the device is already listed, do not process. ++ This should not happen, but who knows... */ ++ /** @todo : refresh properties instead ? */ ++ if (m_mediaList.findById(udi)) ++ return; ++ ++ /* Add volume block devices */ ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ /* We only list volume that have a filesystem or volume that have an audio track*/ ++ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && ++ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) ++ return; ++ /* Query drive udi */ ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ /* We don't list floppy volumes because we list floppy drives */ ++ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) ++ return; ++ ++ /** @todo check exclusion list **/ ++ ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setVolumeProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ ++ return; ++ } ++ ++ /* Floppy & zip drives */ ++ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) ++ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || ++ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setFloppyProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } ++ ++ /* Camera handled by gphoto2*/ ++ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && ++#ifdef HAL_0_4 ++ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) ++#else ++ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || ++ ++ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && ++ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) ++#endif ++ ) ++ { ++ /* Create medium */ ++ Medium* medium = new Medium(udi, ""); ++ setCameraProperties(medium); ++ m_mediaList.addMedium(medium, allowNotification); ++ return; ++ } + } + + void HALBackend::RemoveDevice(const char *udi) + { +- m_mediaList.removeMedium(udi, true); ++ m_mediaList.removeMedium(udi, true); + } + + void HALBackend::ModifyDevice(const char *udi, const char* key) + { +- Q_UNUSED(key); +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- if (!mediumUdi) +- return; +- ResetProperties(mediumUdi); ++ Q_UNUSED(key); ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ResetProperties(mediumUdi); + } + + void HALBackend::DeviceCondition(const char* udi, const char* condition) + { +- QString conditionName = QString(condition); +- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; +- +- if (conditionName == "EjectPressed") { +- const Medium* medium = m_mediaList.findById(udi); +- if (!medium) { +- /* the ejectpressed appears on the drive and we need to find the volume */ +- const QPtrList<Medium> medlist = m_mediaList.list(); +- QPtrListIterator<Medium> it (medlist); +- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); +- if (driveUdi == udi) +- { +- medium = current_medium; +- break; +- } +- } +- } +- if (medium) { +- KProcess p; +- p << "kio_media_mounthelper" << "-e" << medium->name(); +- p.start(KProcess::DontCare); +- } +- } +- +- const char* mediumUdi = findMediumUdiFromUdi(udi); +- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; +- if (!mediumUdi) +- return; +- +- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ +- if (conditionName == "VolumeUnmountForced") +- ResetProperties(mediumUdi); +- +- /* Reset properties after mounting */ +- if (conditionName == "VolumeMount") +- ResetProperties(mediumUdi); +- +- /* Reset properties after unmounting */ +- if (conditionName == "VolumeUnmount") +- ResetProperties(mediumUdi); +- ++ const char* mediumUdi = findMediumUdiFromUdi(udi); ++ if (!mediumUdi) ++ return; ++ ++ QString conditionName = QString(condition); ++ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; ++ ++ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ ++ if (conditionName == "VolumeUnmountForced") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after mounting */ ++ if (conditionName == "VolumeMount") ++ ResetProperties(mediumUdi); ++ ++ /* Reset properties after unmounting */ ++ if (conditionName == "VolumeUnmount") ++ ResetProperties(mediumUdi); + } + + void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) + { +- m_dBusQtConnection = new DBusQt::Connection(m_parent); +- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); ++ m_dBusQtConnection = new DBusQt::Connection(m_parent); ++ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); + } + + /****************************************** +- ** Properties attribution ** +- ******************************************/ ++** Properties attribution ** ++******************************************/ + + /* Return the medium udi that should be updated when recieving a call for +- device udi */ ++device udi */ + const char* HALBackend::findMediumUdiFromUdi(const char* udi) + { +- /* Easy part : this Udi is already registered as a device */ +- const Medium* medium = m_mediaList.findById(udi); +- if (medium) +- return medium->id().ascii(); +- +- /* Hard part : this is a volume whose drive is registered */ +- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) +- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) +- { +- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); +- return findMediumUdiFromUdi(driveUdi.ascii()); +- } ++ /* Easy part : this Udi is already registered as a device */ ++ const Medium* medium = m_mediaList.findById(udi); ++ if (medium) ++ return medium->id().ascii(); ++ ++ /* Hard part : this is a volume whose drive is registered */ ++ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) ++ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) ++ { ++ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); ++ return findMediumUdiFromUdi(driveUdi.ascii()); ++ } + +- return NULL; ++ return NULL; + } + + void HALBackend::ResetProperties(const char* mediumUdi) + { +- kdDebug(1219) << "HALBackend::setProperties" << endl; +- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) +- { +- const Medium *cmedium = m_mediaList.findById(mediumUdi); +- if ( cmedium ) +- { +- Medium m( *cmedium ); +- if ( setFstabProperties( &m ) ) { +- kdDebug() << "setFstabProperties worked" << endl; +- m_mediaList.changeMediumState(m, false); +- } +- return; +- } +- } +- +- Medium* m = new Medium(mediumUdi, ""); +- +- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) +- setVolumeProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) +- setFloppyProperties(m); +- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) +- setCameraProperties(m); ++ kdDebug(1219) << "HALBackend::setProperties" << endl; + +- m_mediaList.changeMediumState(*m, false); ++ Medium* m = new Medium(mediumUdi, ""); ++ ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) ++ setVolumeProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) ++ setFloppyProperties(m); ++ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) ++ setCameraProperties(m); + +- delete m; +-} ++ m_mediaList.changeMediumState(*m, false); + +-void HALBackend::setVolumeProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /* Get device information from libhal-storage */ +- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); +- if (!halVolume) +- return; +- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); +- if (!halDrive) { +- // at times HAL sends an UnmountForced event before the device is removed +- libhal_volume_free(halVolume); +- return; +- } +- +- medium->setName( +- generateName(libhal_volume_get_device_file(halVolume)) ); +- +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- +- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- QString volume_name = QString::fromUtf8(name); +- QString media_name = volume_name; +- medium->setLabel(media_name); +- free(name); +- +- QString mimeType; +- if (libhal_volume_is_disc(halVolume)) +- { +- mimeType = "media/cdrom" + MOUNT_SUFFIX; +- +- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankcd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/cdwriter" + MOUNT_SUFFIX; +- +- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || +- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) +- if (libhal_volume_disc_is_blank(halVolume)) +- { +- mimeType = "media/blankdvd"; +- medium->unmountableState(""); +- } +- else +- mimeType = "media/dvd" + MOUNT_SUFFIX; +- +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- +- /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) +- { +- case DiscType::VCD: +- mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: +- mimeType = "media/svcd"; +- break; +- case DiscType::DVD: +- mimeType = "media/dvdvideo"; +- break; +- } +- } +- else +- { +- mimeType = "media/hdd" + MOUNT_SUFFIX; +- if (libhal_drive_is_hotpluggable(halDrive)) +- { +- mimeType = "media/removable" + MOUNT_SUFFIX; +- medium->needMounting(); +- switch (libhal_drive_get_type(halDrive)) { +- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: +- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: +- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: +- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_SD_MMC: +- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); +- break; +- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: +- { +- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); +- break; +- } +- case LIBHAL_DRIVE_TYPE_CAMERA: +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); +- // get model from camera +- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) +- { +- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); +- } +- break; +- } +- case LIBHAL_DRIVE_TYPE_TAPE: +- medium->setIconName(QString::null); //FIXME need icon +- break; +- default: +- medium->setIconName(QString::null); +- } +- +- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) +- { +- mimeType = "media/camera" + MOUNT_SUFFIX; +- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); +- } +- } +- } +- medium->setMimeType(mimeType); +- +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); ++ delete m; + } + +-bool HALBackend::setFstabProperties( Medium *medium ) ++void HALBackend::setVolumeProperties(Medium* medium) + { +- QString mp = isInFstab(medium); ++ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; + +- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) +- { +- // now that we know it's in fstab, we have to find out if it's mounted +- KMountPoint::List mtab = KMountPoint::currentMountPoints(); +- +- KMountPoint::List::iterator it = mtab.begin(); +- KMountPoint::List::iterator end = mtab.end(); +- +- bool mounted = false; +- +- for (; it!=end; ++it) +- { +- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) +- { +- mounted = true; +- break; +- } +- } +- +- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; +- QString fstype = medium->fsType(); +- if ( fstype.isNull() ) +- fstype = "auto"; +- +- medium->mountableState( +- medium->deviceNode(), +- mp, /* Mount point */ +- fstype, /* Filesystem type */ +- mounted ); /* Mounted ? */ ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /* Get device information from libhal-storage */ ++ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); ++ if (!halVolume) ++ return; ++ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); ++ ++ medium->setName( ++ generateName(libhal_volume_get_device_file(halVolume)) ); ++ ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ ++ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ QString media_name = volume_name; ++ medium->setLabel(media_name); ++ free(name); + +- return true; +- } ++ QString mimeType; ++ if (libhal_volume_is_disc(halVolume)) ++ { ++ mimeType = "media/cdrom" + MOUNT_SUFFIX; + +- return false; ++ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankcd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/cdwriter" + MOUNT_SUFFIX; ++ ++ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || ++ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) ++ if (libhal_volume_disc_is_blank(halVolume)) ++ { ++ mimeType = "media/blankdvd"; ++ medium->unmountableState(""); ++ } ++ else ++ mimeType = "media/dvd" + MOUNT_SUFFIX; ++ ++ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); ++ ++ /* check if the disc id a vcd or a video dvd */ ++ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); ++ switch (type) ++ { ++ case DiscType::VCD: ++ mimeType = "media/vcd"; ++ break; ++ case DiscType::SVCD: ++ mimeType = "media/svcd"; ++ break; ++ case DiscType::DVD: ++ mimeType = "media/dvdvideo"; ++ break; ++ } ++ } ++ else ++ { ++ mimeType = "media/hdd" + MOUNT_SUFFIX; ++ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); ++ if (libhal_drive_is_hotpluggable(halDrive)) ++ { ++ mimeType = "media/removable" + MOUNT_SUFFIX; ++ medium->needMounting(); ++ switch (libhal_drive_get_type(halDrive)) { ++ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: ++ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: ++ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: ++ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_SD_MMC: ++ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: ++ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); ++ break; ++ case LIBHAL_DRIVE_TYPE_CAMERA: ++ mimeType = "media/camera" + MOUNT_SUFFIX; ++ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); ++ // get model from camera ++ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) ++ { ++ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); ++ } ++ break; ++ case LIBHAL_DRIVE_TYPE_TAPE: ++ medium->setIconName(QString::null); //FIXME need icon ++ break; ++ default: ++ medium->setIconName(QString::null); ++ }; ++ }; ++ } ++ medium->setMimeType(mimeType); + ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + + // Handle floppies and zip drives + void HALBackend::setFloppyProperties(Medium* medium) + { +- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; ++ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; + +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); +- if (!halDrive) +- return; +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- LibHalVolume* halVolume = NULL; +- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; +- if (numVolumes) +- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); +- +- medium->setName( +- generateName(libhal_drive_get_device_file(halDrive)) ); +- +- if (halVolume) +- { +- medium->mountableState( +- libhal_volume_get_device_file(halVolume), /* Device node */ +- libhal_volume_get_mount_point(halVolume), /* Mount point */ +- libhal_volume_get_fstype(halVolume), /* Filesystem type */ +- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ +- } +- else +- { +- // HAL hates floppies - so we have to do it twice ;( +- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); +- setFstabProperties( medium ); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") +- { +- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume +- medium->setMimeType("media/floppy_mounted" ); +- else +- medium->setMimeType("media/floppy_unmounted"); +- } +- +- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") +- { +- if (medium->isMounted()) +- medium->setMimeType("media/zip_mounted" ); +- else +- medium->setMimeType("media/zip_unmounted"); +- } +- +- /** @todo And mimtype for JAZ drives ? */ +- +- medium->setIconName(QString::null); +- +- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); +- +- if (name) { +- medium->setLabel( QString::fromUtf8(name) ); +- free(name); +- } +- +- free(volumes); +- libhal_drive_free(halDrive); +- libhal_volume_free(halVolume); +-} ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); ++ if (!halDrive) ++ return; ++ int numVolumes; ++ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); ++ LibHalVolume* halVolume = NULL; ++ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; ++ if (numVolumes) ++ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); + +-void HALBackend::setCameraProperties(Medium* medium) +-{ +- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; +- +- const char* udi = medium->id().ascii(); +- /* Check if the device still exists */ +- if (!libhal_device_exists(m_halContext, udi, NULL)) +- return; +- +- /** @todo find name */ +- medium->setName("camera"); +- +- QString device = "camera:/"; +- +- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); +- DBusError error; +- dbus_error_init(&error); +- if (cam && +- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && +- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) +- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, +- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), +- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); +- +- libhal_free_string(cam); +- +- /** @todo find the rest of this URL */ +- medium->unmountableState(device); +- medium->setMimeType("media/gphoto2camera"); +- medium->setIconName(QString::null); +- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); +- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) +- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); +- else +- medium->setLabel(i18n("Camera")); +-} ++ medium->setName( ++ generateName(libhal_drive_get_device_file(halDrive)) ); + +-QString HALBackend::generateName(const QString &devNode) +-{ +- return KURL(devNode).fileName(); +-} ++ if (halVolume) ++ { ++ medium->mountableState( ++ libhal_volume_get_device_file(halVolume), /* Device node */ ++ libhal_volume_get_mount_point(halVolume), /* Mount point */ ++ libhal_volume_get_fstype(halVolume), /* Filesystem type */ ++ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ ++ } ++ else ++ { ++ medium->mountableState( ++ libhal_drive_get_device_file(halDrive), /* Device node */ ++ "", /* Mount point */ ++ "", /* Filesystem type */ ++ false ); /* Mounted ? */ ++ } + +-/****************************************** +- ** HAL CALL-BACKS ** +- ******************************************/ ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") ++ { ++ if (halVolume) ++ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/floppy_unmounted"); ++ } + +-void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->AddDevice(udi); +-} ++ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") ++ { ++ if (halVolume) ++ medium->setMimeType("media/zip" + MOUNT_SUFFIX); ++ else ++ medium->setMimeType("media/zip_unmounted"); ++ } + +-void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) +-{ +- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; +- Q_UNUSED(ctx); +- s_HALBackend->RemoveDevice(udi); +-} ++ /** @todo And mimtype for JAZ drives ? */ + +-void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, +- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) +-{ +- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(is_removed); +- Q_UNUSED(is_added); +- s_HALBackend->ModifyDevice(udi, key); +-} ++ medium->setIconName(QString::null); + +-void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, +- const char *condition_name, +- const char* message +- ) +-{ +- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; +- Q_UNUSED(ctx); +- Q_UNUSED(message); +- s_HALBackend->DeviceCondition(udi, condition_name); ++ QString media_name; ++ if (halVolume) ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString volume_name = QString::fromUtf8(name); ++ media_name = volume_name; ++ free(name); ++ } ++ else ++ { ++ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); ++ QString drive_name = QString::fromUtf8(name); ++ media_name = drive_name; ++ free(name); ++ } ++ medium->setLabel(media_name); ++ ++ free(volumes); ++ libhal_drive_free(halDrive); ++ libhal_volume_free(halVolume); + } + +-QStringList HALBackend::mountoptions(const QString &name) ++void HALBackend::setCameraProperties(Medium* medium) + { +- const Medium* medium = m_mediaList.findById(name); +- if (medium && !isInFstab(medium).isNull()) +- return QStringList(); // not handled by HAL - fstab entry +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); +- QMap<QString,bool> valids; +- +- for (int index = 0; array && array[index]; ++index) { +- QString t = array[index]; +- if (t.endsWith("=")) +- t = t.left(t.length() - 1); +- valids[t] = true; +- kdDebug() << "valid " << t << endl; +- } +- libhal_free_string_array(array); +- QStringList result; +- QString tmp; +- +- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); +- if (fstype.isNull()) +- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); +- +- +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- +- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) +- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); +- +- config.setGroup(drive_udi); +- bool value = config.readBoolEntry("automount", false); +- config.setGroup(name); +- +- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) +- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) +- value = false; +- +- result << QString("automount=%1").arg(value ? "true" : "false"); +- +- if (valids.contains("ro")) +- { +- value = config.readBoolEntry("ro", false); +- tmp = QString("ro=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("quiet")) +- { +- value = config.readBoolEntry("quiet", false); +- tmp = QString("quiet=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("flush")) +- { +- value = config.readBoolEntry("flush", fstype.endsWith("fat")); +- tmp = QString("flush=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("uid")) +- { +- value = config.readBoolEntry("uid", true); +- tmp = QString("uid=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("utf8")) +- { +- value = config.readBoolEntry("utf8", true); +- tmp = QString("utf8=%1").arg(value ? "true" : "false"); +- result << tmp; +- } +- +- if (valids.contains("shortname")) +- { +- QString svalue = config.readEntry("shortname", "lower").lower(); +- if (svalue == "winnt") +- result << "shortname=winnt"; +- else if (svalue == "win95") +- result << "shortname=win95"; +- else if (svalue == "mixed") +- result << "shortname=mixed"; +- else +- result << "shortname=lower"; +- } +- +- if (valids.contains("sync")) +- { +- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); +- tmp = QString("sync=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- if (valids.contains("noatime")) +- { +- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); +- tmp = QString("atime=%1").arg(value ? "true" : "false"); +- if (fstype != "iso9660") // makes no sense +- result << tmp; +- } +- +- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); +- if (mount_point.isEmpty()) +- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); +- +- mount_point = config.readEntry("mountpoint", mount_point); +- +- if (!mount_point.startsWith("/")) +- mount_point = "/media/" + mount_point; +- +- result << QString("mountpoint=%1").arg(mount_point); +- result << QString("filesystem=%1").arg(fstype); +- +- if (valids.contains("data")) +- { +- QString svalue = config.readEntry("journaling").lower(); +- if (svalue == "ordered") +- result << "journaling=ordered"; +- else if (svalue == "writeback") +- result << "journaling=writeback"; +- else if (svalue == "data") +- result << "journaling=data"; +- else +- result << "journaling=ordered"; +- } ++ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; + +- return result; ++ const char* udi = medium->id().ascii(); ++ /* Check if the device still exists */ ++ if (!libhal_device_exists(m_halContext, udi, NULL)) ++ return; ++ ++ /** @todo find name */ ++ medium->setName("camera"); ++ /** @todo find the rest of this URL */ ++ medium->unmountableState("camera:/"); ++ medium->setMimeType("media/gphoto2camera"); ++ medium->setIconName(QString::null); ++ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); ++ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) ++ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); ++ else ++ medium->setLabel(i18n("Camera")); + } + +-bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) ++QString HALBackend::generateName(const QString &devNode) + { +- kdDebug() << "setMountoptions " << name << " " << options << endl; +- +- KConfig config("mediamanagerrc"); +- config.setGroup(name); +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); +- +- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; +- for (int index = 0; names[index]; ++index) +- if (valids.contains(names[index])) +- config.writeEntry(names[index], valids[names[index]] == "true"); +- +- if (valids.contains("shortname")) +- config.writeEntry("shortname", valids["shortname"]); +- +- if (valids.contains("journaling")) +- config.writeEntry("journaling", valids["journaling"]); +- +- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) +- config.writeEntry("mountpoint", valids["mountpoint"]); +- +- if (valids.contains("automount")) { +- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); +- config.setGroup(drive_udi); +- config.writeEntry("automount", valids["automount"]); +- } +- +- return true; ++ return KURL(devNode).fileName(); + } + +-static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, +- DBusConnection *dbus_connection) +-{ +- DBusMessage *dmesg, *reply; +- DBusError error; +- +- const char *fstype = ""; +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Mount"))) { +- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, +- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- QString qerror; +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- QString qerror = error.message; +- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; +- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) +- qerror = i18n("Invalid filesystem type"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) +- qerror = i18n("Permissions denied"); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) +- qerror = i18n("Device is already mounted."); +- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return mount_priv(udi, "", poptions, noptions, dbus_connection); +- } +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "mount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- return qerror; ++/****************************************** ++** HAL CALL-BACKS ** ++******************************************/ + ++#ifdef HAL_0_4 ++void HALBackend::hal_main_loop_integration(LibHalContext *ctx, ++ DBusConnection *dbus_connection) ++{ ++ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->MainLoopIntegration(dbus_connection); + } ++#endif + +-void HALBackend::slotResult(KIO::Job *job) ++void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) + { +- kdDebug() << "slotResult " << mount_jobs[job] << endl; +- if (job->error()) +- { +- KMessageBox::error(0, job->errorText()); +- } +- ResetProperties( mount_jobs[job].latin1() ); +- mount_jobs.remove(job); ++ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->AddDevice(udi); + } + +-QString HALBackend::isInFstab(const Medium *medium) ++void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) + { +- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); +- +- KMountPoint::List::iterator it = fstab.begin(); +- KMountPoint::List::iterator end = fstab.end(); +- +- for (; it!=end; ++it) +- { +- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; +- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) +- { +- QStringList opts = (*it)->mountOptions(); +- if (opts.contains("user") || opts.contains("users")) +- return (*it)->mountPoint(); +- } +- } +- +- return QString::null; ++ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; ++ Q_UNUSED(ctx); ++ s_HALBackend->RemoveDevice(udi); + } + +-QString HALBackend::mount(const Medium *medium) +-{ +- if (medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; +- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } else if (medium->id().startsWith("/org/kde/") ) +- return i18n("Permissions denied"); +- +- QStringList soptions; +- +- kdDebug() << "mounting " << medium->id() << "..." << endl; +- +- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); +- if (valids["flush"] == "true") +- soptions << "flush"; +- +- if (valids["uid"] == "true") +- { +- soptions << QString("uid=%1").arg(getuid()); +- } +- +- if (valids["ro"] == "true") +- soptions << "ro"; +- +- if (valids["atime"] != "true") +- soptions << "noatime"; +- +- if (valids["quiet"] == "true") +- soptions << "quiet"; +- +- if (valids["utf8"] == "true") +- soptions << "utf8"; +- +- if (valids["sync"] == "true") +- soptions << "sync"; +- +- QString mount_point = valids["mountpoint"]; +- if (mount_point.startsWith("/media/")) +- mount_point = mount_point.mid(7); +- +- if (valids.contains("shortname")) +- { +- soptions << QString("shortname=%1").arg(valids["shortname"]); +- } +- +- if (valids.contains("journaling")) +- { +- QString option = valids["journaling"]; +- if (option == "data") +- soptions << QString("data=journal"); +- else if (option == "writeback") +- soptions << QString("data=writeback"); +- else +- soptions << QString("data=ordered"); +- } +- +- const char **options = new const char*[soptions.size() + 1]; +- uint noptions = 0; +- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) +- options[noptions] = (*it).latin1(); +- options[noptions] = NULL; +- +- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); +- if (!qerror.isEmpty()) { +- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; +- return qerror; +- } +- +- medium->setHalMounted(true); +- ResetProperties(medium->id().latin1()); +- +- return QString(); +-} +- +-QString HALBackend::mount(const QString &_udi) ++void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, ++ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) + { +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- return i18n("No such medium: %1").arg(_udi); +- +- return mount(medium); ++ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(is_removed); ++ Q_UNUSED(is_added); ++ s_HALBackend->ModifyDevice(udi, key); + } + +-QString HALBackend::unmount(const QString &_udi) +-{ +- const Medium* medium = m_mediaList.findById(_udi); +- if (!medium) +- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one +- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume +- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); +- if (halDrive) +- { +- int numVolumes; +- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); +- if (numVolumes == 1) +- medium = m_mediaList.findById( volumes[0] ); +- } +- } +- +- if ( !medium ) +- return i18n("No such medium: %1").arg(_udi); +- +- if (!medium->isMounted()) +- return QString(); // that was easy +- +- QString mountPoint = isInFstab(medium); +- if (!mountPoint.isNull()) +- { +- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; +- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); +- connect(job, SIGNAL( result (KIO::Job *)), +- SLOT( slotResult( KIO::Job *))); +- mount_jobs[job] = medium->id(); +- return QString(); // we won't report an error here +- } +- +- DBusMessage *dmesg, *reply; +- DBusError error; +- const char *options[2]; +- +- const char *udi = medium->id().latin1(); +- kdDebug() << "unmounting " << udi << "..." << endl; +- +- dbus_error_init(&error); +- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); +- if (dbus_error_is_set(&error)) +- { +- dbus_error_free(&error); +- return false; +- } +- +- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, +- "org.freedesktop.Hal.Device.Volume", +- "Unmount"))) { +- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; +- return i18n("Internal Error"); +- } +- +- options[0] = "force"; +- options[1] = 0; +- +- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, +- DBUS_TYPE_INVALID)) +- { +- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; +- dbus_message_unref (dmesg); +- return i18n("Internal Error"); +- } +- +- dbus_error_init (&error); +- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) +- { +- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; +- QString qerror = error.message; +- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { +- qerror = QString("<qt>") + i18n("Device is Busy:"); +- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); +- FILE *fuser = popen(cmdline.latin1(), "r"); +- uint counter = 0; +- if (fuser) { +- qerror += "<pre>"; +- QTextIStream is(fuser); +- QString tmp; +- while (!is.atEnd()) { +- tmp = is.readLine(); +- tmp = QStyleSheet::escape(tmp) + "\n"; +- +- qerror += tmp; +- if (counter++ > 20) +- { +- qerror += "..."; +- break; +- } +- } +- qerror += "</pre>"; +- (void)pclose( fuser ); +- } +- qerror += "</qt>"; +- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { +- // this is faking. The error is that the device wasn't mounted by hal (but by the system) +- qerror = i18n("Permissions denied"); +- } +- +- dbus_message_unref (dmesg); +- dbus_error_free (&error); +- return qerror; +- } +- +- kdDebug() << "unmount queued for " << udi << endl; +- +- dbus_message_unref (dmesg); +- dbus_message_unref (reply); +- +- medium->setHalMounted(false); +- ResetProperties(udi); +- +- return QString(); ++void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, ++ const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else ++ const char* message ++ #endif ++ ) ++{ ++ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; ++ Q_UNUSED(ctx); ++ Q_UNUSED(message); ++ s_HALBackend->DeviceCondition(udi, condition_name); + } + + #include "halbackend.moc" +diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h +--- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 ++++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 +@@ -45,9 +45,65 @@ + #include <libhal.h> + #include <libhal-storage.h> + +-namespace KIO { +- class Job; +-} ++/* The HAL API changed between 0.4 and 0.5 series. ++These defines enable backward compatibility */ ++#ifdef HAL_0_4 ++ // libhal-storage 0.4 API ++ #define LibHalStoragePolicy HalStoragePolicy ++ #define LibHalDrive HalDrive ++ #define LibHalVolume HalVolume ++ #define LibHalVolumeDiscType HalVolumeDiscType ++ #define libhal_storage_policy_free hal_storage_policy_free ++ #define libhal_storage_policy_new hal_storage_policy_new ++ #define libhal_drive_from_udi hal_drive_from_udi ++ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes ++ #define libhal_drive_get_type hal_drive_get_type ++ #define libhal_drive_get_device_file hal_drive_get_device_file ++ #define libhal_drive_free hal_drive_free ++ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name ++ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable ++ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi ++ #define libhal_volume_from_udi hal_volume_from_udi ++ #define libhal_volume_get_device_file hal_volume_get_device_file ++ #define libhal_volume_get_mount_point hal_volume_get_mount_point ++ #define libhal_volume_get_fstype hal_volume_get_fstype ++ #define libhal_volume_is_mounted hal_volume_is_mounted ++ #define libhal_volume_get_disc_type hal_volume_get_disc_type ++ #define libhal_volume_free hal_volume_free ++ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name ++ #define libhal_volume_disc_has_data hal_volume_disc_has_data ++ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio ++ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank ++ #define libhal_volume_is_disc hal_volume_is_disc ++ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi ++ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR ++ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR ++ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW ++ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH ++ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK ++ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA ++ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC ++ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER ++ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA ++ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE ++ ++ // libhal 0.4 API ++ #define libhal_free_string hal_free_string ++ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) ++ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) ++ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) ++ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) ++ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) ++ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) ++ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) ++#endif ++ + + /** + * A handy function to query a hal string +@@ -88,14 +144,6 @@ + */ + bool ListDevices(); + +- QStringList mountoptions(const QString &id); +- +- bool setMountoptions(const QString &id, const QStringList &options); +- +- QString mount(const QString &id); +- QString mount(const Medium *medium); +- QString unmount(const QString &id); +- + private: + /** + * Append a device in the media list. This function will check if the device +@@ -147,16 +195,20 @@ + + void setVolumeProperties(Medium* medium); + void setFloppyProperties(Medium* medium); +- bool setFstabProperties(Medium* medium); + void setCameraProperties(Medium* medium); + QString generateName(const QString &devNode); +- static QString isInFstab(const Medium *medium); +- +-private slots: +- void slotResult(KIO::Job *job); + + /* Hal call-backs -- from gvm*/ + public: ++#ifdef HAL_0_4 ++ /** Invoked by libhal for integration with our mainloop. ++ * ++ * @param ctx LibHal context ++ * @param dbus_connection D-BUS connection to integrate ++ */ ++ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); ++#endif ++ + /** Invoked when a device is added to the Global Device List. + * + * @param ctx LibHal context +@@ -189,7 +241,11 @@ + */ + static void hal_device_condition(LibHalContext *ctx, const char *udi, + const char *condition_name, ++ #ifdef HAL_0_4 ++ DBusMessage *message ++ #else + const char* message ++ #endif + ); + + /* HAL and DBus structures */ +@@ -199,6 +255,13 @@ + */ + LibHalContext* m_halContext; + ++#ifdef HAL_0_4 ++ /** ++ * Structure defining the hal callback function for devices events ++ */ ++ LibHalFunctions m_halFunctions; ++#endif ++ + /** + * libhal-storage HAL policy, e.g. for icon names + */ +@@ -213,10 +276,6 @@ + * Object for the kded module + */ + QObject* m_parent; +- +- DBusConnection *dbus_connection; +- +- QMap<KIO::Job *, QString> mount_jobs; + }; + + #endif /* _HALBACKEND_H_ */ +diff -urN kioslave/media/mediamanager/linuxcdpolling.cpp kioslave/media/mediamanager/linuxcdpolling.cpp +--- kioslave/media/mediamanager/linuxcdpolling.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.cpp Mon Oct 10 17:04:01 2005 +@@ -23,6 +23,7 @@ + + #include <qthread.h> + #include <qmutex.h> ++#include <qtimer.h> + #include <qfile.h> + + #include <kdebug.h> +@@ -188,7 +189,9 @@ + const QString &, bool, bool)), + this, SLOT(slotMediumStateChanged(const QString &)) ); + +- connect(&m_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ QTimer *timer = new QTimer(this); ++ connect(timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); ++ timer->start(500); + } + + LinuxCDPolling::~LinuxCDPolling() +@@ -226,7 +229,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + } + +@@ -266,7 +268,6 @@ + PollingThread *thread = new PollingThread(dev); + m_threads[id] = thread; + thread->start(); +- m_timer.start(500); + } + else if (m_threads.contains(id) && medium->isMounted()) + { +@@ -281,12 +282,6 @@ + void LinuxCDPolling::slotTimeout() + { + //kdDebug(1219) << "LinuxCDPolling::slotTimeout()" << endl; +- +- if (m_threads.isEmpty()) +- { +- m_timer.stop(); +- return; +- } + + QMap<QString, PollingThread*>::iterator it = m_threads.begin(); + QMap<QString, PollingThread*>::iterator end = m_threads.end(); +diff -urN kioslave/media/mediamanager/linuxcdpolling.h kioslave/media/mediamanager/linuxcdpolling.h +--- kioslave/media/mediamanager/linuxcdpolling.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/linuxcdpolling.h Mon Oct 10 17:04:01 2005 +@@ -24,7 +24,6 @@ + #include <qobject.h> + #include <qcstring.h> + #include <qmap.h> +-#include <qtimer.h> + + class DiscType + { +@@ -80,7 +79,6 @@ + + QMap<QString, PollingThread*> m_threads; + QStringList m_excludeNotification; +- QTimer m_timer; + }; + + #endif +diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp +--- kioslave/media/mediamanager/mediamanager.cpp Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 +@@ -43,287 +43,201 @@ + MediaManager::MediaManager(const QCString &obj) + : KDEDModule(obj), m_dirNotify(m_mediaList) + { +- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), +- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), +- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); +- connect( &m_mediaList, +- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), +- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), ++ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), ++ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); ++ connect( &m_mediaList, ++ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), ++ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); + +- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); ++ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); + } + + MediaManager::~MediaManager() + { +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } + } + + void MediaManager::loadBackends() + { + m_mediaList.blockSignals(true); + +- while ( !m_backends.isEmpty() ) +- { +- BackendBase *b = m_backends.first(); +- m_backends.remove( b ); +- delete b; +- } +- +- mp_removableBackend = 0L; +- m_halbackend = 0L; +- m_fstabbackend = 0L; ++ while ( !m_backends.isEmpty() ) ++ { ++ BackendBase *b = m_backends.first(); ++ m_backends.remove( b ); ++ delete b; ++ } ++ ++ mp_removableBackend = 0L; + + #ifdef COMPILE_HALBACKEND +- if ( MediaManagerSettings::self()->halBackendEnabled() ) +- { +- m_halbackend = new HALBackend(m_mediaList, this); +- if (m_halbackend->InitHal()) +- { +- m_backends.append( m_halbackend ); +- m_fstabbackend = new FstabBackend(m_mediaList, true); +- m_backends.append( m_fstabbackend ); +- // No need to load something else... +- m_mediaList.blockSignals(false); +- return; +- } +- else +- { +- delete m_halbackend; +- m_halbackend = 0; +- } +- } ++ if ( MediaManagerSettings::self()->halBackendEnabled() ) ++ { ++ HALBackend* hal_backend = new HALBackend(m_mediaList, this); ++ if (hal_backend->InitHal()) ++ { ++ m_backends.append( hal_backend ); ++ m_backends.append( new FstabBackend(m_mediaList, true) ); ++ // No need to load something else... ++ m_mediaList.blockSignals(false); ++ return; ++ } ++ else ++ { ++ delete hal_backend; ++ } ++ } + #endif // COMPILE_HALBACKEND + +- mp_removableBackend = new RemovableBackend(m_mediaList); +- m_backends.append( mp_removableBackend ); ++ mp_removableBackend = new RemovableBackend(m_mediaList); ++ m_backends.append( mp_removableBackend ); + + #ifdef COMPILE_LINUXCDPOLLING +- if ( MediaManagerSettings::self()->cdPollingEnabled() ) +- { +- m_backends.append( new LinuxCDPolling(m_mediaList) ); +- } ++ if ( MediaManagerSettings::self()->cdPollingEnabled() ) ++ { ++ m_backends.append( new LinuxCDPolling(m_mediaList) ); ++ } + #endif //COMPILE_LINUXCDPOLLING + +- m_fstabbackend = new FstabBackend(m_mediaList); +- m_backends.append( m_fstabbackend ); +- m_mediaList.blockSignals(false); ++ m_backends.append( new FstabBackend(m_mediaList) ); ++ m_mediaList.blockSignals(false); + } + + + QStringList MediaManager::fullList() + { +- QPtrList<Medium> list = m_mediaList.list(); ++ QPtrList<Medium> list = m_mediaList.list(); + +- QStringList result; ++ QStringList result; + +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- result+= (*it)->properties(); +- result+= Medium::SEPARATOR; +- } ++ QPtrList<Medium>::const_iterator it = list.begin(); ++ QPtrList<Medium>::const_iterator end = list.end(); ++ for (; it!=end; ++it) ++ { ++ result+= (*it)->properties(); ++ result+= Medium::SEPARATOR; ++ } + +- return result; ++ return result; + } + + QStringList MediaManager::properties(const QString &name) + { +- const Medium *m = m_mediaList.findByName(name); +- +- if (!m) +- { +- KURL u(name); +- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; +- if (u.isValid()) +- { +- if (u.protocol() == "system") +- { +- QString path = u.path(); +- if (path.startsWith("/media/")) +- path = path.mid(strlen("/media/")); +- m = m_mediaList.findByName(path); +- kdDebug() << "findByName " << path << m << endl; +- } +- else if (u.protocol() == "media") +- { +- m = m_mediaList.findByName(u.filename()); +- kdDebug() << "findByName " << u.filename() << m << endl; +- } +- else if (u.protocol() == "file") +- { +- // look for the mount point +- QPtrList<Medium> list = m_mediaList.list(); +- QPtrList<Medium>::const_iterator it = list.begin(); +- QPtrList<Medium>::const_iterator end = list.end(); +- for (; it!=end; ++it) +- { +- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; +- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { +- m = *it; +- break; +- } +- } +- } +- } +- } +- +- if (m) +- return m->properties(); +- else +- return QStringList(); +-} ++ const Medium *m = m_mediaList.findByName(name); + +-QStringList MediaManager::mountoptions(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return QStringList(); +- return m_halbackend->mountoptions(name); +-#else +- return QStringList(); +-#endif +-} +- +-bool MediaManager::setMountoptions(const QString &name, const QStringList &options) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return false; +- return m_halbackend->setMountoptions(name, options); +-#else +- return false; +-#endif +-} +- +-QString MediaManager::mount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->mount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->mount( name ); +-#endif +-} +- +-QString MediaManager::unmount(const QString &name) +-{ +-#ifdef COMPILE_HALBACKEND +- if (!m_halbackend) +- return i18n("Feature only available with HAL"); +- return m_halbackend->unmount(name); +-#else +- if ( !m_fstabbackend ) // lying :) +- return i18n("Feature only available with HAL"); +- return m_fstabbackend->unmount( name ); +-#endif ++ if (m!=0L) ++ { ++ return m->properties(); ++ } ++ else ++ { ++ return QStringList(); ++ } + } + + QString MediaManager::nameForLabel(const QString &label) + { +- const QPtrList<Medium> media = m_mediaList.list(); ++ const QPtrList<Medium> media = m_mediaList.list(); + +- QPtrList<Medium>::const_iterator it = media.begin(); +- QPtrList<Medium>::const_iterator end = media.end(); +- for (; it!=end; ++it) +- { +- const Medium *m = *it; +- +- if (m->prettyLabel()==label) +- { +- return m->name(); +- } +- } ++ QPtrList<Medium>::const_iterator it = media.begin(); ++ QPtrList<Medium>::const_iterator end = media.end(); ++ for (; it!=end; ++it) ++ { ++ const Medium *m = *it; ++ ++ if (m->prettyLabel()==label) ++ { ++ return m->name(); ++ } ++ } + +- return QString::null; ++ return QString::null; + } + + ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) + { +- m_mediaList.setUserLabel(name, label); ++ m_mediaList.setUserLabel(name, label); + } + + ASYNC MediaManager::reloadBackends() + { +- MediaManagerSettings::self()->readConfig(); +- loadBackends(); ++ MediaManagerSettings::self()->readConfig(); ++ loadBackends(); + } + + bool MediaManager::removablePlug(const QString &devNode, const QString &label) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->plug(devNode, label); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->plug(devNode, label); ++ } ++ return false; + } + + bool MediaManager::removableUnplug(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->unplug(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->unplug(devNode); ++ } ++ return false; + } + + bool MediaManager::removableCamera(const QString &devNode) + { +- if (mp_removableBackend) +- { +- return mp_removableBackend->camera(devNode); +- } +- return false; ++ if (mp_removableBackend) ++ { ++ return mp_removableBackend->camera(devNode); ++ } ++ return false; + } + + + void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesAdded( KURL("media:/") ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesAdded( KURL("media:/") ); + +- emit mediumAdded(name, allowNotification); +- emit mediumAdded(name); ++ emit mediumAdded(name, allowNotification); ++ emit mediumAdded(name); + } + + void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, + bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- notifier.FilesRemoved( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ notifier.FilesRemoved( KURL("media:/"+name) ); + +- emit mediumRemoved(name, allowNotification); +- emit mediumRemoved(name); ++ emit mediumRemoved(name, allowNotification); ++ emit mediumRemoved(name); + } + + void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, + bool mounted, bool allowNotification) + { +- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; ++ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; + +- KDirNotify_stub notifier("*", "*"); +- if (!mounted) +- { +- notifier.FilesRemoved( KURL("media:/"+name) ); +- } +- notifier.FilesChanged( KURL("media:/"+name) ); ++ KDirNotify_stub notifier("*", "*"); ++ if (!mounted) ++ { ++ notifier.FilesRemoved( KURL("media:/"+name) ); ++ } ++ notifier.FilesChanged( KURL("media:/"+name) ); + +- emit mediumChanged(name, allowNotification); +- emit mediumChanged(name); ++ emit mediumChanged(name, allowNotification); ++ emit mediumChanged(name); + } + + +diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop +--- kioslave/media/mediamanager/mediamanager.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.desktop Tue May 23 13:33:34 2006 +@@ -16,13 +16,11 @@ + Name[es]=Administrador de recursos KDED + Name[et]=KDED andmekandjate haldur + Name[eu]=KDED media kudeatzailea +-Name[fa]=مدیر رسانه KDED + Name[fi]=KDED-tallennusmedianhallinta + Name[fr]=Gestionnaire de médias KDED + Name[fy]=KDEDED-mediabehearder + Name[ga]=Bainisteoir Meán KDED + Name[gl]=Xestor de Meios de KDED +-Name[he]=×ž× ×”×œ המדיה של KDED + Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक + Name[hr]=KDED upravitelj medija + Name[hu]=KDED médiakezelÅ‘ +@@ -45,7 +43,6 @@ + Name[ru]=Управление подключаемыми уÑтройÑтвами + Name[rw]=Mugenga Igihuza KDED + Name[se]=KDED-mediagieÄ‘ahalli +-Name[sk]=KDED správca médià + Name[sl]=Upravitelj medijev KDED + Name[sr]=Менаџер медијума, KDED + Name[sr@Latn]=Menadžer medijuma, KDED +@@ -73,18 +70,16 @@ + Comment[es]=Monitoriza las actividades de los recursos y permite (des)montarlos (media:/) + Comment[et]=Hoiab silma peal andmekandjate aktiivsusel ja võimaldab neid ühendada/lahutada (media:/) + Comment[eu]=Montatzeak begiztatzen ditu (media:/) eta desmontatzen uzten du +-Comment[fa]=ØÙظ رد Ùعالیتهای رسانه Ùˆ اجازه سو ار(پیاده) کردن (media:/) + Comment[fi]=Pidä kirjaa tallennustapahtumista ja salli tallennusvälineen liittäminen/irrotus (devices:/) + Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) + Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) + Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) +-Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) + Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) + Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja + Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) + Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) + Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) +-Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ ++Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) + Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) + Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) + Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) +@@ -103,7 +98,6 @@ + Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) + Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) + Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) +-Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) + Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) + Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) + Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) +@@ -122,4 +116,3 @@ + X-KDE-FactoryName=mediamanager + X-KDE-Kded-autoload=true + X-KDE-Kded-load-on-demand=true +-X-KDE-Kded-phase=1 +diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h +--- kioslave/media/mediamanager/mediamanager.h Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 +@@ -28,8 +28,6 @@ + #include "removablebackend.h" + #include "mediadirnotify.h" + +-class HALBackend; +-class FstabBackend; + + class MediaManager : public KDEDModule + { +@@ -42,12 +40,6 @@ + k_dcop: + QStringList fullList(); + QStringList properties(const QString &name); +- QStringList mountoptions(const QString &name); +- bool setMountoptions(const QString &name, const QStringList &options); +- +- QString mount(const QString &uid); +- QString unmount(const QString &uid); +- + QString nameForLabel(const QString &label); + ASYNC setUserLabel(const QString &name, const QString &label); + +@@ -82,9 +74,7 @@ + MediaList m_mediaList; + QValueList<BackendBase*> m_backends; + RemovableBackend *mp_removableBackend; +- HALBackend *m_halbackend; + MediaDirNotify m_dirNotify; +- FstabBackend *m_fstabbackend; + }; + + #endif +diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in +--- kioslave/media/medianotifier/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/medianotifier/Makefile.in Fri May 26 09:54:31 2006 +@@ -254,6 +254,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp +--- kioslave/media/medianotifier/medianotifier.cpp Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 +@@ -48,21 +48,13 @@ + + MediaNotifier::~MediaNotifier() + { +- disconnectDCOPSignal( "kded", "mediamanager", "mediumAdded(QString, bool)", +- "onMediumChange(QString, bool)" ); +- +- disconnectDCOPSignal( "kded", "mediamanager", "mediumChanged(QString, bool)", +- "onMediumChange(QString, bool)" ); + } + + void MediaNotifier::onMediumChange( const QString &name, bool allowNotification ) + { + kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " + << allowNotification << ")" << endl; +- +- if ( !allowNotification ) +- return; +- ++ + // Update user activity timestamp, otherwise the notification dialog will be shown + // in the background due to focus stealing prevention. Entering a new media can + // be seen as a kind of user activity after all. It'd be better to update the timestamp +@@ -103,11 +95,11 @@ + { + QString mimetype = medium.mimetype(); + +- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); ++ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); + bool is_mounted = mimetype.endsWith( "_mounted" ); + + // We autorun only on CD/DVD or removable disks (USB, Firewire) +- if ( !( is_cdrom || is_mounted ) ++ if ( !( is_cdrom && is_mounted ) + && mimetype!="media/removable_mounted" ) + { + return false; +diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop +--- kioslave/media/medianotifier/medianotifier.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/medianotifier/medianotifier.desktop Mon May 22 20:12:42 2006 +@@ -18,12 +18,10 @@ + Name[es]=Demonio de notificaciones de medios + Name[et]=Andmekandjate märguannete deemon + Name[eu]=Euskarrien jakinarazpen daemon-a +-Name[fa]=Ø´Ø¨Ø Ø§Ø®Ø·Ø§Ø±Ø¯Ù‡Ù†Ø¯Ù‡ رسانه + Name[fi]=Mediahuomautin + Name[fr]=Démon de notifications des média + Name[fy]=Medianotifikaasje-daemon + Name[gl]=Daemon Notificador de Medios +-Name[he]=שירות הודעות מערכת + Name[hr]=Demon obavijesti o medijima + Name[hu]=LemezfigyelÅ‘ szolgáltatás + Name[is]=Miðils tilkynningarpúki +@@ -34,12 +32,10 @@ + Name[nb]=Medievarslingsnisse + Name[nds]=Medien-Narichtendämoon + Name[nl]=Medianotificatie-daemon +-Name[nn]=MediepÃ¥minningsnisse + Name[pl]=UsÅ‚uga powiadamiania o noÅ›nikach + Name[pt]=Servidor de Notificação de Dispositivos + Name[pt_BR]=Servidor de Notificação de Dispositivos + Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв +-Name[sk]=Notifikátor medià + Name[sl]=Demon za obveÅ¡Äanje o nosilcih + Name[sr]=Демон за обавештења о медијумима + Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima +@@ -47,7 +43,6 @@ + Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації + Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ + Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº +-Name[zh_TW]=媒體通知伺æœç¨‹å¼ + Comment=A media plugged notifier + Comment[af]='n Inpropbare media inkennissteller + Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво +@@ -61,7 +56,6 @@ + Comment[es]=Un notificador de medios empotrable + Comment[et]=Andmekandja ühendamisest märkuandev deemon + Comment[eu]=Euskarri konektatze jakinarazlea +-Comment[fa]=یک اخطاردهنده وصل‌شده رسانه + Comment[fi]=Liitetyn median huomautin + Comment[fr]=Notification de connexion de média + Comment[fy]=Meidieling fan oankeppele media +@@ -70,7 +64,7 @@ + Comment[hu]=LemezérzékelÅ‘ + Comment[is]=Tilkynnari um tengda miðla + Comment[it]=Notifiche dei dispositivi attaccati +-Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ ++Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã™ã‚‹ + Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas + Comment[mk]=ИзвеÑтување за приклучен медиум + Comment[nb]=En medievarsler som programtillegg +@@ -82,7 +76,6 @@ + Comment[pt]=Um notificador ligado aos dispositivos + Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) + Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв +-Comment[sk]=Notifikátor pripojených médià + Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih + Comment[sr]=Обавештавач о укљученим медијима + Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima +diff -urN kioslave/media/medianotifier/notificationdialog.cpp kioslave/media/medianotifier/notificationdialog.cpp +--- kioslave/media/medianotifier/notificationdialog.cpp Sat Oct 7 16:23:12 2006 ++++ kioslave/media/medianotifier/notificationdialog.cpp Mon Oct 10 17:04:00 2005 +@@ -26,7 +26,6 @@ + #include <klistbox.h> + #include <qlabel.h> + #include <qcheckbox.h> +-#include <qpushbutton.h> + + #include "actionlistboxitem.h" + #include "notificationdialogview.h" +@@ -71,8 +70,6 @@ + this, SLOT( delayedDestruct() ) ); + + m_actionWatcher->startScan(); +- QPushButton * btn = actionButton( Ok ); +- btn->setFocus(); + } + + NotificationDialog::~NotificationDialog() +diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in +--- kioslave/media/mimetypes/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mimetypes/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop +--- kioslave/media/mimetypes/audiocd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/audiocd.desktop Mon May 22 20:12:42 2006 +@@ -11,7 +11,6 @@ + Comment[cs]=Zvukové CD + Comment[da]=Lyd-cd + Comment[el]=CD ήχου +-Comment[fa]=دیسک Ùشرده صوتی + Comment[fi]=CD-äänilevy + Comment[fr]=CD audio + Comment[fy]=Audio-Kompaktskiif +@@ -25,7 +24,6 @@ + Comment[it]=CD audio + Comment[ja]=オーディオ CD + Comment[km]=ស៊ីឌី​អូឌីយ៉ូ +-Comment[mk]=Ðудио ЦД + Comment[ms]=CD Audio + Comment[nb]=Lyd-CD + Comment[nds]=Audio-CD +@@ -33,7 +31,7 @@ + Comment[nn]=Lyd-CD + Comment[pa]=ਆਡੀਓ CD + Comment[pl]=PÅ‚yta CD Audio +-Comment[pt]=CD de áudio ++Comment[pt]=CD áudio + Comment[pt_BR]=CD de Ãudio + Comment[ro]=CD Audio + Comment[ru]=Ðудио CD +diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop +--- kioslave/media/mimetypes/blankcd.desktop Mon Oct 2 12:44:33 2006 ++++ kioslave/media/mimetypes/blankcd.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=CD vacÃo + Comment[et]=Tühi CD + Comment[eu]=CD hutsik +-Comment[fa]=دیسک Ùشرده خام + Comment[fi]=Tyhjä CD + Comment[fr]=CD vierge + Comment[fy]=Blanke Kompaktskiif +@@ -32,7 +31,6 @@ + Comment[km]=ស៊ីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias CD + Comment[lv]=TukÅ¡s CD +-Comment[mk]=Празно ЦД + Comment[ms]=CD Kosong + Comment[nb]=Tom CD + Comment[nds]=Leddige CD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый CD + Comment[rw]=CD Itanditseho + Comment[se]=Guorus CD +-Comment[sk]=ÄŒisté CD + Comment[sl]=Prazen CD + Comment[sr]=Празан CD + Comment[sr@Latn]=Prazan CD +diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop +--- kioslave/media/mimetypes/blankdvd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/blankdvd.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=DVD vacÃo + Comment[et]=Tühi DVD + Comment[eu]=DVD hutsik +-Comment[fa]=DVD خام + Comment[fi]=Tyhjä DVD-levy + Comment[fr]=DVD vierge + Comment[fy]=Blanke Dûbelskiif +@@ -32,7 +31,6 @@ + Comment[km]=ឌីវីឌី​ទទ០+ Comment[lt]=TuÅ¡Äias DVD + Comment[lv]=TukÅ¡s DVD +-Comment[mk]=Празно DVD + Comment[ms]=DVD Kosong + Comment[nb]=Tom DVD + Comment[nds]=Leddige DVD +@@ -46,7 +44,6 @@ + Comment[ru]=ЧиÑтый DVD + Comment[rw]=DVD Itanditseho + Comment[se]=Guorus DVD +-Comment[sk]=ÄŒisté DVD + Comment[sl]=Prazen DVD + Comment[sr]=Празан DVD + Comment[sr@Latn]=Prazan DVD +diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop +--- kioslave/media/mimetypes/camera_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_mounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara montada + Comment[et]=Ãœhendatud kaamera + Comment[eu]=Kamara muntatuta +-Comment[fa]=دوربین سوارشده + Comment[fi]=Liitetty kamera + Comment[fr]=Appareil photo monté + Comment[fy]=Oankeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera montada + Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=ÄŒatnon govvenapperáhtta +-Comment[sk]=Pripojený digitálny fotoaparát + Comment[sl]=Priklopljen fotoaparat + Comment[sr]=Монтирана камера + Comment[sr@Latn]=Montirana kamera +diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop +--- kioslave/media/mimetypes/camera_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/camera_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Cámara desmontada + Comment[et]=Lahutatud kaamera + Comment[eu]=Kamara desmuntatua +-Comment[fa]=دوربین پیاده‌شده + Comment[fi]=Irrotettu kamera + Comment[fr]=Appareil photo non monté + Comment[fy]=Ofkeppele kamera +@@ -41,7 +40,6 @@ + Comment[pt_BR]=Câmera desmontada + Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° + Comment[se]=Gálgajuvvon govvenapperáhtta +-Comment[sk]=Odpojený digitálny fotoaparát + Comment[sl]=Odklopljen fotoaparat + Comment[sr]=Демонтирана камера + Comment[sr@Latn]=Demontirana kamera +diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop +--- kioslave/media/mimetypes/cdrom_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM montado + Comment[et]=Ãœhendatud CD-ROM + Comment[eu]=CD-ROM muntatua +-Comment[fa]=CD-ROM سوارشده ++Comment[fa]=CD سوار شده + Comment[fi]=Liitetty CD-ROM + Comment[fr]=CD-ROM monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop +--- kioslave/media/mimetypes/cdrom_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=CD-ROM desmontado + Comment[et]=Lahutatud CD-ROM + Comment[eu]=CD-ROM desmuntatua +-Comment[fa]=CD-ROM پیاده‌شده ++Comment[fa]= CD پیاده شده + Comment[fi]=Irrotettu CD-ROM + Comment[fr]=CD-ROM non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop +--- kioslave/media/mimetypes/cdwriter_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs montado + Comment[et]=Ãœhendatud CD kirjutaja + Comment[eu]=CD erretzaile muntatua +-Comment[fa]=CD Writer سوارشده ++Comment[fa]=CD Writer سوار شده + Comment[fi]=Liitetty CD-kirjoitin + Comment[fr]=Graveur de CD monté + Comment[fy]=Oankeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop +--- kioslave/media/mimetypes/cdwriter_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Escritor de CDs desmontado + Comment[et]=Lahutatud CD kirjutaja + Comment[eu]=CD erretzaile desmuntatua +-Comment[fa]=CD Writer پیاده‌شده ++Comment[fa]=CD Writer پیاده شده + Comment[fi]=Irrotettu CD-kirjoitin + Comment[fr]=Graveur de CD non monté + Comment[fy]=Ofkeppele Kompaktskiif +diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop +--- kioslave/media/mimetypes/dvd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD montado + Comment[et]=Ãœhendatud DVD + Comment[eu]=DVD muntatua +-Comment[fa]=DVD سوارشده ++Comment[fa]=DVD سوار شده + Comment[fi]=Liitetty DVD-levy + Comment[fr]=DVD-ROM monté(s) + Comment[fy]=Oankeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop +--- kioslave/media/mimetypes/dvd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=DVD desmontado + Comment[et]=Lahutatud DVD + Comment[eu]=DVD desmuntatua +-Comment[fa]=DVD پیاده‌شده ++Comment[fa]=DVD پیاده شده + Comment[fi]=Irrotettu DVD-levy + Comment[fr]=DVD-ROM non monté(s) + Comment[fy]=Ofkeppele Dûbelskiif +diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop +--- kioslave/media/mimetypes/dvdvideo.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/dvdvideo.desktop Mon May 22 20:12:43 2006 +@@ -16,7 +16,6 @@ + Comment[es]=Disco de video DVD + Comment[et]=DVD videoplaat + Comment[eu]=DVD bideo diska +-Comment[fa]=دیسک ویدئویی DVD + Comment[fi]=DVD-videolevy + Comment[fr]=DVD vidéo + Comment[fy]=Dûbelskiif Fideoskiif +@@ -32,7 +31,6 @@ + Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី + Comment[lt]=DVD video diskas + Comment[lv]=DVD Video Disks +-Comment[mk]=DVD ВидеодиÑк + Comment[ms]=Cakera Video DVD + Comment[nb]=DVD-videoplate + Comment[nds]=DVD-Videodisk +@@ -40,13 +38,12 @@ + Comment[nn]=DVD-videoplate + Comment[pa]=DVD ਵੀਡਿਓ ਡਿਸਕ + Comment[pl]=PÅ‚yta DVD Video +-Comment[pt]=Disco DVD de VÃdeo ++Comment[pt]=Disco DVD VÃdeo + Comment[pt_BR]=DVD de vÃdeo + Comment[ro]=Disc video DVD + Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ + Comment[rw]=Disiki Videwo DVD + Comment[se]=DVD-videoskearru +-Comment[sk]=DVD Video disk + Comment[sl]=DVD Video disk + Comment[sr]=DVD видео диÑк + Comment[sr@Latn]=DVD video disk +diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop +--- kioslave/media/mimetypes/floppy5_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" montado + Comment[et]=Ãœhendatud 5¼" flopi + Comment[eu]=5¼"ko diskete muntatua +-Comment[fa]=Ùلاپی 5¼" سوارشده ++Comment[fa]=Ùلاپی 5¼"سوار شده + Comment[fi]=Liitetty 5¼"-levyke + Comment[fr]=Disquette 5¼" montée + Comment[fy]=Oankeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop +--- kioslave/media/mimetypes/floppy5_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete 5¼" desmontado + Comment[et]=Lahutatud 5¼" flopi + Comment[eu]=5¼"ko diskete desmuntatua +-Comment[fa]=Ùلاپی 5¼" پیاده‌شده ++Comment[fa]=Ùلاپی 5¼" پیاده شده + Comment[fi]=Irrotettu 5¼"-levyke + Comment[fr]=Disquette 5¼" non montée + Comment[fy]=Ofkeppele 5¼" Skiif +diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop +--- kioslave/media/mimetypes/floppy_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete montado + Comment[et]=Ãœhendatud flopi + Comment[eu]=Diskete muntatua +-Comment[fa]=Ùلاپی سوارشده ++Comment[fa]=Ùلاپی سوار شده + Comment[fi]=Liitetty levyke + Comment[fr]=Disquette montée + Comment[fy]=Oankeppele Skiif +diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop +--- kioslave/media/mimetypes/floppy_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disquete desmontado + Comment[et]=Lahutatud flopi + Comment[eu]=Diskete desmuntatua +-Comment[fa]=Ùلاپی پیاده‌شده ++Comment[fa]=Ùلاپی پیاده شده + Comment[fi]=Irrotettu levyke + Comment[fr]=Disquette non montée + Comment[fy]=Ofkeppele Skiif +diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop +--- kioslave/media/mimetypes/gphoto2camera.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/gphoto2camera.desktop Mon May 22 20:12:43 2006 +@@ -18,7 +18,6 @@ + Comment[es]=Cámara + Comment[et]=Kaamera + Comment[eu]=Kamara +-Comment[fa]=دوربین + Comment[fi]=Kamera + Comment[fr]=Nouvel appareil photo + Comment[fy]=Kamera +@@ -41,13 +40,12 @@ + Comment[nn]=Kamera + Comment[pa]=ਕੈਮਰਾ + Comment[pl]=Aparat fotograficzny +-Comment[pt]=Máquina fotográfica ++Comment[pt]=Máquina Fotográfica + Comment[pt_BR]=Câmera + Comment[ro]=Aparat foto + Comment[ru]=Камера + Comment[rw]=Kamera + Comment[se]=Govvanaperáhtta +-Comment[sk]=Digitálny fotoaparát + Comment[sl]=Fotoaparat + Comment[sr]=Камера + Comment[sr@Latn]=Kamera +diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop +--- kioslave/media/mimetypes/hdd_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_mounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro montado + Comment[et]=Ãœhendatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa muntatua +-Comment[fa]=Øجم دیسک سخت سوارشده + Comment[fi]=Liitetty kiintoleyosio + Comment[fr]=Partition de disque dur montée + Comment[fy]=Oankeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Montert harddiskvolum + Comment[pa]=ਮਾਊਟ ਕੀਤਾ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Zamontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido montado ++Comment[pt]=Volume de Disco RÃgido Montado + Comment[pt_BR]=Volume do HD Montado + Comment[ro]=Volum de hard disc montat + Comment[ru]=Смонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwashyizwemo + Comment[se]=ÄŒatnon garraskearrooassi +-Comment[sk]=Pripojený oddiel pevného disku + Comment[sl]=Priklopljen pogon trdega diska + Comment[sr]=Монтирана партиција хард диÑка + Comment[sr@Latn]=Montirana particija hard diska +diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop +--- kioslave/media/mimetypes/hdd_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/hdd_unmounted.desktop Mon May 22 20:12:43 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Volumen de disco duro desmontado + Comment[et]=Lahutatud kõvaketta partitsioon + Comment[eu]=Diska gogorraren zatiketa desmuntatua +-Comment[fa]=Øجم دیسک سخت پیاده شده + Comment[fi]=Irrotettu kiintolevyosio + Comment[fr]=Partition de disque dur non montée + Comment[fy]=Ofkeppele Fêsteskiif folume +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert harddiskvolum + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਾਰਡ ਡਿਸਕ à¨à¨¾à¨— + Comment[pl]=Odmontowana partycja dysku twardego +-Comment[pt]=Volume de disco rÃgido desmontado ++Comment[pt]=Volume de Disco RÃgido Desmontado + Comment[pt_BR]=Volume do HD Desmontado + Comment[ro]=Volum de hard disc nemontat + Comment[ru]=Отмонтированный раздел жёÑткого диÑка + Comment[rw]=Ububiko Disiki Bwakuwemo + Comment[se]=Gálgajuvvon garraskearrooassi +-Comment[sk]=Odpojený oddiel pevného disku + Comment[sl]=Odklopljen pogon trdega diska + Comment[sr]=Демонтирана партиција хард диÑка + Comment[sr@Latn]=Demontirana particija hard diska +diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop +--- kioslave/media/mimetypes/nfs_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_mounted.desktop Tue May 23 13:33:34 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS montado + Comment[et]=Ãœhendatud NFS ressurss + Comment[eu]=NFS baliabide muntatua +-Comment[fa]=مشترک NFS سوارشده + Comment[fi]=Liitetty NFS-jako + Comment[fr]=Ressource NFS montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Montert delt NFS-ressurs + Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Zamontowany system plików NFS +-Comment[pt]=Partilha de NFS montada ++Comment[pt]=Partilha de NFS Montada + Comment[pt_BR]=Volume NFS Montado + Comment[ro]=Partajare NFS montată + Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Washyizwemo + Comment[se]=ÄŒatnon NFS-resursa +-Comment[sk]=Pripojený zdroj NFS + Comment[sl]=Priklopljen vir NFS + Comment[sr]=Монтирано NFS дељење + Comment[sr@Latn]=Montirano NFS deljenje +diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop +--- kioslave/media/mimetypes/nfs_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/nfs_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso NFS desmontado + Comment[et]=Lahutatud NFS ressurss + Comment[eu]=NFS baliabide desmuntatua +-Comment[fa]=مشترک NFS پیاده شده + Comment[fi]=Irrotettu NFS-jako + Comment[fr]=Ressource NFS non montée + Comment[fy]=Oankeppele NFS-boarne +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert delt NFS-ressurs + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ+ Comment[pl]=Odmontowany system plików NFS +-Comment[pt]=Partilha de NFS desmontada ++Comment[pt]=Partilha de NFS Desmontada + Comment[pt_BR]=Volume NFS Desmontado + Comment[ro]=Partajare NFS nemontată + Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS + Comment[rw]=Umugabane NFS Wakuwemo + Comment[se]=Gálgajuvvon NFS-resursa +-Comment[sk]=Odpojený zdroj NFS + Comment[sl]=Odklopljen vir NFS + Comment[sr]=Демонтирано NFS дељење + Comment[sr@Latn]=Demontirano NFS deljenje +diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop +--- kioslave/media/mimetypes/removable_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_mounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble montado + Comment[et]=Ãœhendatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria muntatua +-Comment[fa]=رسانه برداشتنی سوارشده + Comment[fi]=Liitetty irrotettava resurssi + Comment[fr]=Média amovible monté + Comment[fy]=Oankeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Montert flyttbart medium + Comment[pa]=ਮਾਊਟ ਕੀਤੇ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Zamontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel montado ++Comment[pt]=Dispositivo AmovÃvel Montado + Comment[pt_BR]=MÃdia RemovÃvel Montada + Comment[ro]=Mediu amovibil montat + Comment[ru]=Смонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo + Comment[se]=Čátnon sirdehahtti medium +-Comment[sk]=Pripojené vyberateľné médium + Comment[sl]=Priklopljen odstranljiv medij + Comment[sr]=Монтиран уклоњиви медијум + Comment[sr@Latn]=Montiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop +--- kioslave/media/mimetypes/removable_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/removable_unmounted.desktop Mon May 22 20:12:42 2006 +@@ -19,7 +19,6 @@ + Comment[es]=Recurso extraÃble desmontado + Comment[et]=Lahutatud eemaldatav andmekandja + Comment[eu]=Euskarri aldagarria desmuntatua +-Comment[fa]=رسانه برداشتنی پیاده شده + Comment[fi]=Irrotettu irrotettava resurssi + Comment[fr]=Média amovible non monté + Comment[fy]=Ofkeppele ferwiderber medium +@@ -44,13 +43,12 @@ + Comment[nn]=Umontert flyttbart medium + Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ + Comment[pl]=Odmontowany noÅ›nik wymienny +-Comment[pt]=Dispositivo amovÃvel desmontado ++Comment[pt]=Dispositivo AmovÃvel Desmontado + Comment[pt_BR]=MÃdia RemovÃvel Desmontada + Comment[ro]=Mediu amovibil nemontat + Comment[ru]=Отмонтированный внешний диÑк + Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo + Comment[se]=Gálgaduvvon sirdehahtti medium +-Comment[sk]=Odpojené vyberateľné médium + Comment[sl]=Odklopljen odstranljiv medij + Comment[sr]=Демонтиран уклоњиви медијум + Comment[sr@Latn]=Demontiran uklonjivi medijum +diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop +--- kioslave/media/mimetypes/smb_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba montado (Red de Microsoft) + Comment[et]=Ãœhendatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa muntatua +-Comment[fa]=مشترک Samba (Microsoft Network) سوار شده ++Comment[fa]=اشتراک سامبای ویندوز سوار شده + Comment[fi]=Liitetty Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) monté + Comment[fy]=Oankeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop +--- kioslave/media/mimetypes/smb_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Recurso de Samba desmontado (Red de Microsoft) + Comment[et]=Lahutatud Samba (Microsoft Network) ressurss + Comment[eu]=Samba (Microsoft sarea) partekaketa desmuntatua +-Comment[fa]=مشترک Samba (Microsoft Network) پیاده شده ++Comment[fa]=اشتراک سامبای ویندوز پیاده شده + Comment[fi]=Irrotettu Samba-jako (Microsoft-verkko) + Comment[fr]=Partage Samba (réseau Microsoft) non monté + Comment[fy]=Ofkeppele Samba-netwurkboarne (Microsoft-netwurken) +diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop +--- kioslave/media/mimetypes/svcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/svcd.desktop Mon May 22 20:12:43 2006 +@@ -7,7 +7,6 @@ + Comment[bn]=সà§à¦ªà¦¾à¦° à¦à¦¿à¦¡à¦¿à¦“ সিডি + Comment[ca]=CD Súper VÃdeo + Comment[da]=Super Video-cd +-Comment[fa]=دیسک Ùشرده ابرویدئو + Comment[fr]=Super CD vidéo + Comment[fy]=Super Fideo-kompaktskiif + Comment[gl]=Super VÃdeo CD +@@ -17,7 +16,6 @@ + Comment[it]=Super video CD + Comment[ja]=スーパービデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ +-Comment[mk]=Супер видео ЦД + Comment[ms]=CD Supervideo + Comment[nb]=Super video CD + Comment[nds]=Super-Video-CD +diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop +--- kioslave/media/mimetypes/vcd.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/vcd.desktop Mon May 22 20:12:42 2006 +@@ -9,7 +9,6 @@ + Comment[ca]=CD VÃdeo + Comment[da]=Video-cd + Comment[el]=Βίντεο CD +-Comment[fa]=دیسک Ùشرده ویدئویی + Comment[fr]=CD vidéo + Comment[fy]=Fideo-kompaktskiif + Comment[ga]=Dlúthdhiosca FÃse +@@ -19,7 +18,6 @@ + Comment[is]=VÃdeó CD + Comment[ja]=ビデオ CD + Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ +-Comment[mk]=Видео ЦД + Comment[ms]=CD Video + Comment[nds]=Video-CD + Comment[nl]=Video-cd +diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop +--- kioslave/media/mimetypes/zip_mounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip montado + Comment[et]=Ãœhendatud Zip-ketas + Comment[eu]=Zip diska muntatua +-Comment[fa]=دیسک Ùشرده سوارشده ++Comment[fa]=دیسک زیپ سوار شده + Comment[fi]=Liitetty Zip-levy + Comment[fr]=Disque Zip monté + Comment[fy]=Oankeppelee Zip-skiif +diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop +--- kioslave/media/mimetypes/zip_unmounted.desktop Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mimetypes/zip_unmounted.desktop Tue May 23 13:33:35 2006 +@@ -21,7 +21,7 @@ + Comment[es]=Disco Zip desmontado + Comment[et]=Lahutatud Zip-ketas + Comment[eu]=Zip diska desmuntatua +-Comment[fa]=دیسک Ùشرده پیاده شده ++Comment[fa]= دیسک زیپ پیاده شده + Comment[fi]=Irrotettu Zip-levy + Comment[fr]=Disque Zip non monté + Comment[fy]=Ofkeppele Zip-skiif +@@ -33,7 +33,7 @@ + Comment[hu]=Leválasztott Zip-lemez + Comment[is]=Aftengdur Zip diskur + Comment[it]=Disco Zip non montato +-Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク ++Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク + Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ + Comment[lo]= ຫັງàºàº²àº¥àºµ + Comment[lt]=IÅ¡montuotas Zip diskas +diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in +--- kioslave/media/mounthelper/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/mounthelper/Makefile.in Fri May 26 09:54:31 2006 +@@ -57,8 +57,8 @@ + #>+ 1 + kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) + am__DEPENDENCIES_1 = +-kio_media_mounthelper_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) ++kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ ../libmediacommon/libmediacommon.la + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + am__depfiles_maybe = depfiles +@@ -236,6 +236,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +@@ -575,7 +576,7 @@ + AM_LDFLAGS = $(all_libraries) + kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp + kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) +-kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) ++kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la + #>- METASOURCES = AUTO + #>- all: all-am + #>+ 1 +diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp +--- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 ++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 +@@ -27,7 +27,6 @@ + #include <dcopclient.h> + #include <dcopref.h> + #include <qtimer.h> +-#include <stdlib.h> + #include <kdebug.h> + #include <kglobal.h> + #include <kprocess.h> +@@ -79,30 +78,31 @@ + + if (args->isSet("u")) + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "unmount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- kdDebug() << "medium unmount " << m_errorStr << endl; +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + else if (args->isSet("s") || args->isSet("e")) + { +- invokeEject(device, true); ++ if (medium.isMounted()) ++ { ++ KIO::Job * job = KIO::unmount( mount_point ); ++ ++ m_device = device; ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResultSafe( KIO::Job * ) ) ); ++ } ++ else ++ { ++ invokeEject(device, true); ++ } + } + else + { +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mount", medium.id()); +- if (reply.isValid()) +- reply.get(m_errorStr); +- if (m_errorStr.isNull()) +- ::exit(0); +- else +- error(); ++ KIO::Job* job = KIO::mount( false, 0, device, mount_point); ++ connect( job, SIGNAL( result( KIO::Job * ) ), ++ this, SLOT( slotResult( KIO::Job * ) ) ); + } + } + +@@ -173,12 +173,12 @@ + void MountHelper::error() + { + KMessageBox::error(0, m_errorStr); +- ::exit(1); ++ kapp->exit(1); + } + + void MountHelper::finished() + { +- ::exit(0); ++ kapp->quit(); + } + + static KCmdLineOptions options[] = +@@ -207,7 +207,7 @@ + + KStartupInfo::appStarted(); + app->dcopClient()->attach(); +- return app->exec(); ++ app->exec(); + } + + #include "kio_media_mounthelper.moc" +diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in +--- kioslave/media/propsdlgplugin/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 +@@ -1,1063 +0,0 @@ +-# Makefile.in generated by automake 1.9.6 from Makefile.am. +-# KDE tags expanded automatically by am_edit - $Revision: 483858 $ +-# @configure_input@ +- +-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005 Free Software Foundation, Inc. +-# This Makefile.in is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# This program is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +-# PARTICULAR PURPOSE. +- +-@SET_MAKE@ +- +- +-srcdir = @srcdir@ +-top_srcdir = @top_srcdir@ +-VPATH = @srcdir@ +-pkgdatadir = $(datadir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ +-top_builddir = ../../.. +-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +-INSTALL = @INSTALL@ +-install_sh_DATA = $(install_sh) -c -m 644 +-install_sh_PROGRAM = $(install_sh) -c +-install_sh_SCRIPT = $(install_sh) -c +-INSTALL_HEADER = $(INSTALL_DATA) +-transform = $(program_transform_name) +-NORMAL_INSTALL = : +-PRE_INSTALL = : +-POST_INSTALL = : +-NORMAL_UNINSTALL = : +-PRE_UNINSTALL = : +-POST_UNINSTALL = : +-build_triplet = @build@ +-host_triplet = @host@ +-target_triplet = @target@ +-subdir = kioslave/media/propsdlgplugin +-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ +- $(top_srcdir)/configure.in +-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ +- $(ACLOCAL_M4) +-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs +-CONFIG_HEADER = $(top_builddir)/config.h +-CONFIG_CLEAN_FILES = +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +-am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ +- "$(DESTDIR)$(kde_servicesdir)" +-kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) +-LTLIBRARIES = $(kde_module_LTLIBRARIES) +-am__DEPENDENCIES_1 = +-media_propsdlgplugin_la_DEPENDENCIES = \ +- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) +-am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo +-#>- media_propsdlgplugin_la_OBJECTS = \ +-#>- $(am_media_propsdlgplugin_la_OBJECTS) +-#>+ 5 +-media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo +-media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ +- propsdlgshareplugin.lo propertiespagegui.lo +-@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) +-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp +-am__depfiles_maybe = depfiles +-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +-#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 2 +-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +-#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +-#>- $(AM_CXXFLAGS) $(CXXFLAGS) +-#>+ 3 +-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ +- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ +- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) +-CXXLD = $(CXX) +-#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +-#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-#>+ 2 +-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ +- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-SOURCES = $(media_propsdlgplugin_la_SOURCES) +-DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) +-kde_servicesDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(kde_services_DATA) +-ETAGS = etags +-CTAGS = ctags +-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-#>+ 1 +-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) +-ACLOCAL = @ACLOCAL@ +-AMDEP_FALSE = @AMDEP_FALSE@ +-AMDEP_TRUE = @AMDEP_TRUE@ +-AMTAR = @AMTAR@ +-AR = @AR@ +-ARTSCCONFIG = @ARTSCCONFIG@ +-ARTS_CFLAGS = @ARTS_CFLAGS@ +-AUTOCONF = @AUTOCONF@ +-AUTODIRS = @AUTODIRS@ +-AUTOHEADER = @AUTOHEADER@ +-AUTOMAKE = @AUTOMAKE@ +-AWK = @AWK@ +-CC = @CC@ +-CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ +-COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ +-COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ +-CONF_FILES = @CONF_FILES@ +-CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ +-CXX = @CXX@ +-CXXCPP = @CXXCPP@ +-CXXDEPMODE = @CXXDEPMODE@ +-CXXFLAGS = @CXXFLAGS@ +-CYGPATH_W = @CYGPATH_W@ +-DBUSQT_INCS = @DBUSQT_INCS@ +-DBUSQT_LIBS = @DBUSQT_LIBS@ +-DBUS_CFLAGS = @DBUS_CFLAGS@ +-DBUS_INCS = @DBUS_INCS@ +-DBUS_LIBS = @DBUS_LIBS@ +-DCOPIDL = @DCOPIDL@ +-DCOPIDL2CPP = @DCOPIDL2CPP@ +-DCOPIDLNG = @DCOPIDLNG@ +-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ +-DEFS = @DEFS@ +-DEPDIR = @DEPDIR@ +-DOXYGEN = @DOXYGEN@ +-DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ +-DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ +-DPMSINC = @DPMSINC@ +-DPMSLIB = @DPMSLIB@ +-ECHO = @ECHO@ +-ECHO_C = @ECHO_C@ +-ECHO_N = @ECHO_N@ +-ECHO_T = @ECHO_T@ +-EGREP = @EGREP@ +-ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ +-EXEEXT = @EXEEXT@ +-EXR_FLAGS = @EXR_FLAGS@ +-F77 = @F77@ +-FFLAGS = @FFLAGS@ +-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ +-GLINC = @GLINC@ +-GLLIB = @GLLIB@ +-GMSGFMT = @GMSGFMT@ +-HALBACKEND = @HALBACKEND@ +-HAL_CFLAGS = @HAL_CFLAGS@ +-HAL_INCS = @HAL_INCS@ +-HAL_LIBS = @HAL_LIBS@ +-HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ +-HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ +-HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ +-INSTALL_DATA = @INSTALL_DATA@ +-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-INSTALL_SCRIPT = @INSTALL_SCRIPT@ +-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +-JAR = @JAR@ +-JAVAC = @JAVAC@ +-JAVAH = @JAVAH@ +-JVMLIBS = @JVMLIBS@ +-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ +-KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ +-KCONFIG_COMPILER = @KCONFIG_COMPILER@ +-KDECONFIG = @KDECONFIG@ +-KDE_BINDIR = @KDE_BINDIR@ +-KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ +-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ +-KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ +-KDE_HAVE_DOT = @KDE_HAVE_DOT@ +-KDE_INCLUDES = @KDE_INCLUDES@ +-KDE_LDFLAGS = @KDE_LDFLAGS@ +-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ +-KDE_MT_LIBS = @KDE_MT_LIBS@ +-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ +-KDE_PLUGIN = @KDE_PLUGIN@ +-KDE_RPATH = @KDE_RPATH@ +-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ +-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ +-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ +-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ +-KDE_USE_FPIE = @KDE_USE_FPIE@ +-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ +-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ +-KDE_USE_PIE = @KDE_USE_PIE@ +-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ +-KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ +-KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ +-KRB4_INCS = @KRB4_INCS@ +-KRB4_LIBS = @KRB4_LIBS@ +-KRB4_RPATH = @KRB4_RPATH@ +-KRB5_INCS = @KRB5_INCS@ +-KRB5_LIBS = @KRB5_LIBS@ +-KRB5_RPATH = @KRB5_RPATH@ +-KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ +-LDAP_INCS = @LDAP_INCS@ +-LDAP_LIBS = @LDAP_LIBS@ +-LDAP_RPATH = @LDAP_RPATH@ +-LDFLAGS = @LDFLAGS@ +-LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ +-LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ +-LIBALIB = @LIBALIB@ +-LIBART_CFLAGS = @LIBART_CFLAGS@ +-LIBART_LIBS = @LIBART_LIBS@ +-LIBART_RPATH = @LIBART_RPATH@ +-LIBBZ2 = @LIBBZ2@ +-LIBCFG = @LIBCFG@ +-LIBCOMPAT = @LIBCOMPAT@ +-LIBCRYPT = @LIBCRYPT@ +-LIBCURSES = @LIBCURSES@ +-LIBDEVINFO = @LIBDEVINFO@ +-LIBDL = @LIBDL@ +-LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ +-LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ +-LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ +-LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ +-LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ +-LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ +-LIBGEN = @LIBGEN@ +-LIBHOSTS = @LIBHOSTS@ +-LIBJPEG = @LIBJPEG@ +-LIBKSTAT = @LIBKSTAT@ +-LIBMALLOC = @LIBMALLOC@ +-LIBOBJS = @LIBOBJS@ +-LIBODM = @LIBODM@ +-LIBOSSAUDIO = @LIBOSSAUDIO@ +-LIBPNG = @LIBPNG@ +-LIBPOSIX4 = @LIBPOSIX4@ +-LIBPTHREAD = @LIBPTHREAD@ +-LIBRESOLV = @LIBRESOLV@ +-LIBRPC = @LIBRPC@ +-LIBS = @LIBS@ +-LIBSENSORS = @LIBSENSORS@ +-LIBSHADOW = @LIBSHADOW@ +-LIBSM = @LIBSM@ +-LIBSOCKET = @LIBSOCKET@ +-LIBSSL = @LIBSSL@ +-LIBTOOL = @LIBTOOL@ +-LIBUCB = @LIBUCB@ +-LIBUSBCONFIG = @LIBUSBCONFIG@ +-LIBUTIL = @LIBUTIL@ +-LIBXDMCP = @LIBXDMCP@ +-LIBXFT_LIB = @LIBXFT_LIB@ +-LIBZ = @LIBZ@ +-LIB_ARTS = @LIB_ARTS@ +-LIB_DNSSD = @LIB_DNSSD@ +-LIB_EXR = @LIB_EXR@ +-LIB_FONT_ENC = @LIB_FONT_ENC@ +-LIB_KAB = @LIB_KAB@ +-LIB_KABC = @LIB_KABC@ +-LIB_KDECORE = @LIB_KDECORE@ +-LIB_KDED = @LIB_KDED@ +-LIB_KDEPIM = @LIB_KDEPIM@ +-LIB_KDEPRINT = @LIB_KDEPRINT@ +-LIB_KDEUI = @LIB_KDEUI@ +-LIB_KDNSSD = @LIB_KDNSSD@ +-LIB_KFILE = @LIB_KFILE@ +-LIB_KFM = @LIB_KFM@ +-LIB_KHTML = @LIB_KHTML@ +-LIB_KIMPROXY = @LIB_KIMPROXY@ +-LIB_KIO = @LIB_KIO@ +-LIB_KJS = @LIB_KJS@ +-LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ +-LIB_KPARTS = @LIB_KPARTS@ +-LIB_KSPELL = @LIB_KSPELL@ +-LIB_KSYCOCA = @LIB_KSYCOCA@ +-LIB_KUNITTEST = @LIB_KUNITTEST@ +-LIB_KUTILS = @LIB_KUTILS@ +-LIB_KVM = @LIB_KVM@ +-LIB_LBER = @LIB_LBER@ +-LIB_LIBS = @LIB_LIBS@ +-LIB_POLL = @LIB_POLL@ +-LIB_QPE = @LIB_QPE@ +-LIB_QT = @LIB_QT@ +-LIB_SMB = @LIB_SMB@ +-LIB_TRU64_MACH = @LIB_TRU64_MACH@ +-LIB_X11 = @LIB_X11@ +-LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ +-LIB_XCURSOR = @LIB_XCURSOR@ +-LIB_XEXT = @LIB_XEXT@ +-LIB_XF86MISC = @LIB_XF86MISC@ +-LIB_XFIXES = @LIB_XFIXES@ +-LIB_XINERAMA = @LIB_XINERAMA@ +-LIB_XRANDR = @LIB_XRANDR@ +-LIB_XRENDER = @LIB_XRENDER@ +-LIB_XSS = @LIB_XSS@ +-LINUXCDPOLLING = @LINUXCDPOLLING@ +-LN_S = @LN_S@ +-LTLIBOBJS = @LTLIBOBJS@ +-MAKEINFO = @MAKEINFO@ +-MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ +-MCOPIDL = @MCOPIDL@ +-MD5SUM = @MD5SUM@ +-MD5SUM_CUT = @MD5SUM_CUT@ +-MEINPROC = @MEINPROC@ +-MOC = @MOC@ +-MSGFMT = @MSGFMT@ +-NOOPT_CFLAGS = @NOOPT_CFLAGS@ +-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ +-OBJEXT = @OBJEXT@ +-PACKAGE = @PACKAGE@ +-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +-PACKAGE_NAME = @PACKAGE_NAME@ +-PACKAGE_STRING = @PACKAGE_STRING@ +-PACKAGE_TARNAME = @PACKAGE_TARNAME@ +-PACKAGE_VERSION = @PACKAGE_VERSION@ +-PAMLIBS = @PAMLIBS@ +-PASSWDLIBS = @PASSWDLIBS@ +-PATH_SEPARATOR = @PATH_SEPARATOR@ +-PERL = @PERL@ +-PKG_CONFIG = @PKG_CONFIG@ +-QTDOCDIR = @QTDOCDIR@ +-QTE_NORTTI = @QTE_NORTTI@ +-QT_INCLUDES = @QT_INCLUDES@ +-QT_LDFLAGS = @QT_LDFLAGS@ +-RANLIB = @RANLIB@ +-RUN_KAPPFINDER = @RUN_KAPPFINDER@ +-SASL2_LIBS = @SASL2_LIBS@ +-SETUIDFLAGS = @SETUIDFLAGS@ +-SET_MAKE = @SET_MAKE@ +-SHELL = @SHELL@ +-SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ +-SSL_INCLUDES = @SSL_INCLUDES@ +-SSL_LDFLAGS = @SSL_LDFLAGS@ +-STRIP = @STRIP@ +-TOPSUBDIRS = @TOPSUBDIRS@ +-UIC = @UIC@ +-UIC_TR = @UIC_TR@ +-UNAME = @UNAME@ +-USB_CFLAGS = @USB_CFLAGS@ +-USB_LIBS = @USB_LIBS@ +-USER_INCLUDES = @USER_INCLUDES@ +-USER_LDFLAGS = @USER_LDFLAGS@ +-USE_EXCEPTIONS = @USE_EXCEPTIONS@ +-USE_RTTI = @USE_RTTI@ +-USE_THREADS = @USE_THREADS@ +-VERSION = @VERSION@ +-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ +-XGETTEXT = @XGETTEXT@ +-XMLLINT = @XMLLINT@ +-XTESTLIB = @XTESTLIB@ +-X_EXTRA_LIBS = @X_EXTRA_LIBS@ +-X_INCLUDES = @X_INCLUDES@ +-X_LDFLAGS = @X_LDFLAGS@ +-X_PRE_LIBS = @X_PRE_LIBS@ +-X_RPATH = @X_RPATH@ +-ac_ct_AR = @ac_ct_AR@ +-ac_ct_CC = @ac_ct_CC@ +-ac_ct_CXX = @ac_ct_CXX@ +-ac_ct_F77 = @ac_ct_F77@ +-ac_ct_RANLIB = @ac_ct_RANLIB@ +-ac_ct_STRIP = @ac_ct_STRIP@ +-all_includes = @all_includes@ +-all_libraries = @all_libraries@ +-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +-am__include = @am__include@ +-am__leading_dot = @am__leading_dot@ +-am__quote = @am__quote@ +-am__tar = @am__tar@ +-am__untar = @am__untar@ +-applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ +-applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ +-bindir = @bindir@ +-build = @build@ +-build_alias = @build_alias@ +-build_cpu = @build_cpu@ +-build_os = @build_os@ +-build_vendor = @build_vendor@ +-datadir = @datadir@ +-doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ +-doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ +-drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ +-drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ +-exec_prefix = @exec_prefix@ +-have_xcursor_FALSE = @have_xcursor_FALSE@ +-have_xcursor_TRUE = @have_xcursor_TRUE@ +-host = @host@ +-host_alias = @host_alias@ +-host_cpu = @host_cpu@ +-host_os = @host_os@ +-host_vendor = @host_vendor@ +-include_ARTS_FALSE = @include_ARTS_FALSE@ +-include_ARTS_TRUE = @include_ARTS_TRUE@ +-include_BZIP2_FALSE = @include_BZIP2_FALSE@ +-include_BZIP2_TRUE = @include_BZIP2_TRUE@ +-include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ +-include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ +-include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ +-include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ +-include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ +-include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ +-include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ +-include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ +-include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ +-include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ +-include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ +-include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ +-include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ +-include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ +-include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ +-include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ +-include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ +-include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ +-include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ +-include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ +-include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ +-include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ +-include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ +-include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ +-include_kompmgr_FALSE = @include_kompmgr_FALSE@ +-include_kompmgr_TRUE = @include_kompmgr_TRUE@ +-include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ +-include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ +-include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ +-include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ +-include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ +-include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ +-include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ +-include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ +-include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ +-include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ +-include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ +-include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ +-include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ +-include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ +-include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ +-include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ +-include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ +-include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ +-include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ +-include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ +-include_x11_FALSE = @include_x11_FALSE@ +-include_x11_TRUE = @include_x11_TRUE@ +-includedir = @includedir@ +-infodir = @infodir@ +-install_sh = @install_sh@ +-install_usbids_FALSE = @install_usbids_FALSE@ +-install_usbids_TRUE = @install_usbids_TRUE@ +-jni_includes = @jni_includes@ +-kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ +-kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ +-kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ +-kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ +-kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ +-kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ +-kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ +-kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ +-kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ +-kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ +-kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ +-kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ +-kde_appsdir = @kde_appsdir@ +-kde_bindir = @kde_bindir@ +-kde_confdir = @kde_confdir@ +-kde_datadir = @kde_datadir@ +-kde_htmldir = @kde_htmldir@ +-kde_icondir = @kde_icondir@ +-kde_includes = @kde_includes@ +-kde_kcfgdir = @kde_kcfgdir@ +-kde_libraries = @kde_libraries@ +-kde_libs_htmldir = @kde_libs_htmldir@ +-kde_libs_prefix = @kde_libs_prefix@ +-kde_locale = @kde_locale@ +-kde_mimedir = @kde_mimedir@ +-kde_moduledir = @kde_moduledir@ +-kde_qtver = @kde_qtver@ +-kde_servicesdir = @kde_servicesdir@ +-kde_servicetypesdir = @kde_servicetypesdir@ +-kde_sounddir = @kde_sounddir@ +-kde_styledir = @kde_styledir@ +-kde_templatesdir = @kde_templatesdir@ +-kde_wallpaperdir = @kde_wallpaperdir@ +-kde_widgetdir = @kde_widgetdir@ +-kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ +-kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ +-kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ +-kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ +-kdeinitdir = @kdeinitdir@ +-kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ +-kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ +-kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ +-kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ +-kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ +-kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ +-kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ +-kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ +-kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ +-kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ +-kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ +-kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ +-kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ +-kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ +-kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ +-kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ +-khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ +-khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ +-khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ +-khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ +-kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ +-kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ +-kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ +-kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ +-klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ +-klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ +-kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ +-kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ +-knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ +-knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ +-konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ +-konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ +-konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ +-konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ +-kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ +-kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ +-kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ +-kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ +-kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ +-kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ +-kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ +-kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ +-ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ +-ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ +-ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ +-ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ +-kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ +-kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ +-ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ +-ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ +-ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ +-ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ +-ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ +-ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ +-kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ +-kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ +-kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ +-kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ +-l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ +-l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ +-libdir = @libdir@ +-libexecdir = @libexecdir@ +-libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ +-libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ +-localstatedir = @localstatedir@ +-mandir = @mandir@ +-mkdir_p = @mkdir_p@ +-nogroup = @nogroup@ +-nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ +-nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ +-oldincludedir = @oldincludedir@ +-pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ +-pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ +-prefix = @prefix@ +-program_transform_name = @program_transform_name@ +-qt_includes = @qt_includes@ +-qt_libraries = @qt_libraries@ +-sbindir = @sbindir@ +-sharedstatedir = @sharedstatedir@ +-supports_i8k_FALSE = @supports_i8k_FALSE@ +-supports_i8k_TRUE = @supports_i8k_TRUE@ +-sysconfdir = @sysconfdir@ +-target = @target@ +-target_alias = @target_alias@ +-target_cpu = @target_cpu@ +-target_os = @target_os@ +-target_vendor = @target_vendor@ +-unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ +-unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ +-x_includes = @x_includes@ +-x_libraries = @x_libraries@ +-xdg_appsdir = @xdg_appsdir@ +-xdg_directorydir = @xdg_directorydir@ +-xdg_menudir = @xdg_menudir@ +-#>- METASOURCES = AUTO +-kde_module_LTLIBRARIES = media_propsdlgplugin.la +-media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) +-media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) +-AM_CPPFLAGS = $(all_includes) +-kde_services_DATA = media_propsdlgplugin.desktop +-#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp +-#>+ 1 +-media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp +-#>- all: all-am +-#>+ 1 +-all: docs-am all-am +- +-.SUFFIXES: +-.SUFFIXES: .cpp .lo .o .obj +-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +-#>- @for dep in $?; do \ +-#>- case '$(am__configure_deps)' in \ +-#>- *$$dep*) \ +-#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +-#>- && exit 0; \ +-#>- exit 1;; \ +-#>- esac; \ +-#>- done; \ +-#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +-#>- cd $(top_srcdir) && \ +-#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +-#>+ 12 +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +-.PRECIOUS: Makefile +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +- @case '$?' in \ +- *config.status*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ +- *) \ +- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ +- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ +- esac; +- +-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +- +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) +- @$(NORMAL_INSTALL) +- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- if test -f $$p; then \ +- f=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ +- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ +- else :; fi; \ +- done +- +-uninstall-kde_moduleLTLIBRARIES: +- @$(NORMAL_UNINSTALL) +- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- p=$(am__strip_dir) \ +- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ +- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ +- done +- +-clean-kde_moduleLTLIBRARIES: +- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) +- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ +- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ +- test "$$dir" != "$$p" || dir=.; \ +- echo "rm -f \"$${dir}/so_locations\""; \ +- rm -f "$${dir}/so_locations"; \ +- done +-#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-#>+ 2 +-@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +-@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- +-mostlyclean-compile: +- -rm -f *.$(OBJEXT) +- +-distclean-compile: +- -rm -f *.tab.c +- +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ +- +-.cpp.o: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< +- +-.cpp.obj: +-@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +- +-.cpp.lo: +-@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +-@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +- +-mostlyclean-libtool: +- -rm -f *.lo +- +-clean-libtool: +- -rm -rf .libs _libs +- +-distclean-libtool: +- -rm -f libtool +-uninstall-info-am: +-install-kde_servicesDATA: $(kde_services_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-uninstall-kde_servicesDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(kde_services_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ +- done +- +-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- mkid -fID $$unique +-tags: TAGS +- +-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ +- test -n "$$unique" || unique=$$empty_fix; \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$tags $$unique; \ +- fi +-ctags: CTAGS +-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +- $(TAGS_FILES) $(LISP) +- tags=; \ +- here=`pwd`; \ +- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +- unique=`for i in $$list; do \ +- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ +- done | \ +- $(AWK) ' { files[$$0] = 1; } \ +- END { for (i in files) print i; }'`; \ +- test -z "$(CTAGS_ARGS)$$tags$$unique" \ +- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$tags $$unique +- +-GTAGS: +- here=`$(am__cd) $(top_builddir) && pwd` \ +- && cd $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) $$here +- +-distclean-tags: +- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +- +-distdir: $(DISTFILES) +- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ +- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ +- list='$(DISTFILES)'; for file in $$list; do \ +- case $$file in \ +- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ +- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ +- esac; \ +- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ +- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ +- dir="/$$dir"; \ +- $(mkdir_p) "$(distdir)$$dir"; \ +- else \ +- dir=''; \ +- fi; \ +- if test -d $$d/$$file; then \ +- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ +- fi; \ +- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ +- else \ +- test -f $(distdir)/$$file \ +- || cp -p $$d/$$file $(distdir)/$$file \ +- || exit 1; \ +- fi; \ +- done +-check-am: all-am +-check: check-am +-all-am: Makefile $(LTLIBRARIES) $(DATA) +-installdirs: +- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ +- test -z "$$dir" || $(mkdir_p) "$$dir"; \ +- done +-install: install-am +-install-exec: install-exec-am +-install-data: install-data-am +-uninstall: uninstall-am +- +-install-am: all-am +- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +- +-installcheck: installcheck-am +-install-strip: +- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ +- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ +- `test -z '$(STRIP)' || \ +- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +-mostlyclean-generic: +- +-clean-generic: +- +-distclean-generic: +- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- +-maintainer-clean-generic: +- @echo "This command is intended for maintainers to use" +- @echo "it deletes files that may require special tools to rebuild." +-#>- clean: clean-am +-#>+ 1 +-clean: kde-rpo-clean clean-am +- +-#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +-#>- mostlyclean-am +-#>+ 2 +-clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ +- mostlyclean-am +- +-distclean: distclean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-distclean-am: clean-am distclean-compile distclean-generic \ +- distclean-libtool distclean-tags +- +-dvi: dvi-am +- +-dvi-am: +- +-html: html-am +- +-info: info-am +- +-info-am: +- +-#>- install-data-am: install-kde_moduleLTLIBRARIES \ +-#>- install-kde_servicesDATA +-#>+ 2 +-install-data-am: \ +- install-kde_servicesDATA +- +-#>- install-exec-am: +-#>+ 1 +-install-exec-am: install-kde_moduleLTLIBRARIES +- +-install-info: install-info-am +- +-install-man: +- +-installcheck-am: +- +-maintainer-clean: maintainer-clean-am +- -rm -rf ./$(DEPDIR) +- -rm -f Makefile +-maintainer-clean-am: distclean-am maintainer-clean-generic +- +-mostlyclean: mostlyclean-am +- +-mostlyclean-am: mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool +- +-pdf: pdf-am +- +-pdf-am: +- +-ps: ps-am +- +-ps-am: +- +-uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ +- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ +- distclean-compile distclean-generic distclean-libtool \ +- distclean-tags distdir dvi dvi-am html html-am info info-am \ +- install install-am install-data install-data-am install-exec \ +- install-exec-am install-info install-info-am \ +- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ +- install-man install-strip installcheck installcheck-am \ +- installdirs maintainer-clean maintainer-clean-generic \ +- mostlyclean mostlyclean-compile mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ +- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ +- uninstall-kde_servicesDATA +- +-# Tell versions [3.59,3.63) of GNU make to not export all variables. +-# Otherwise a system limit (for SysV at least) may be exceeded. +-.NOEXPORT: +- +-#>+ 8 +-media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) +- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp +- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp +- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) +- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure +- @echo "timestamp" > media_propsdlgplugin.la.closure +- +- +-#>+ 3 +-propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h +- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc +- +-#>+ 2 +-mocs: propsdlgshareplugin.moc +- +-#>+ 3 +-propertiespage.moc: $(srcdir)/propertiespage.h +- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc +- +-#>+ 2 +-mocs: propertiespage.moc +- +-#>+ 3 +-clean-metasources: +- -rm -f propsdlgshareplugin.moc propertiespage.moc +- +-#>+ 2 +-KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am +- +-#>+ 4 +-clean-ui: +- -rm -f \ +- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc +- +-#>+ 3 +-clean-closures: +- -rm -f media_propsdlgplugin.la.closure +- +-#>+ 2 +-docs-am: +- +-#>+ 15 +-force-reedit: +- @for dep in $?; do \ +- case '$(am__configure_deps)' in \ +- *$$dep*) \ +- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ +- && exit 0; \ +- exit 1;; \ +- esac; \ +- done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ +- cd $(top_srcdir) && \ +- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile +- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in +- +- +-#>+ 21 +-clean-bcheck: +- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out +- +-bcheck: bcheck-am +- +-bcheck-am: +- @for i in ; do \ +- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ +- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ +- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ +- echo "$$i"; \ +- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ +- rm -f $$i.bchecktest.cc; exit 1; \ +- fi ; \ +- echo "" >> $$i.bchecktest.cc.class; \ +- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ +- rm -f a.out; \ +- fi ; \ +- done +- +- +-#>+ 11 +-media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc +- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ +- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ +- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ +- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ +- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ +- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ +- done; \ +- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ +- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files +- +-#>+ 3 +-clean-final: +- -rm -f media_propsdlgplugin_la.all_cpp.cpp +- +-#>+ 3 +-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am +- +-#>+ 3 +-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am +- +-#>+ 3 +-no-final: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am +- +-#>+ 3 +-no-final-install: +- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am +- +-#>+ 3 +-kde-rpo-clean: +- -rm -f *.rpo +- +-#>+ 9 +-nmcheck: +-propsdlgshareplugin.o: propsdlgshareplugin.moc +-nmcheck-am: nmcheck +-propsdlgshareplugin.lo: propsdlgshareplugin.moc +-propertiespage.lo: propertiespage.moc +-$(srcdir)/propertiespage.cpp: propertiespagegui.h +-$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h +-propertiespage.o: propertiespage.moc +- +-#>+ 15 +-propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc +- rm -f propertiespagegui.cpp +- echo '#include <kdialog.h>' > propertiespagegui.cpp +- echo '#include <klocale.h>' >> propertiespagegui.cpp +- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ +- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ +- rm -f propertiespagegui.cpp.temp ;\ +- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi +- +-propertiespagegui.h: $(srcdir)/propertiespagegui.ui +- rm -rf propertiespagegui.h; +- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; +-propertiespagegui.moc: propertiespagegui.h +- $(MOC) propertiespagegui.h -o propertiespagegui.moc +diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop +--- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 +@@ -1,73 +0,0 @@ +-[Desktop Entry] +-Encoding=UTF-8 +-Type=Service +-Name=Media Properties Page +-Name[ca]=Pà gina de propietats de suport +-Name[cs]=Stránka vlastnostà média +-Name[da]=Medieegenskabsside +-Name[de]=Eigenschaften von Medien +-Name[el]=Σελίδα ιδιοτήτων μÎσων +-Name[es]=Página de propiedades de medios +-Name[et]=Andmekandjate omadused +-Name[fa]=صÙØÛ€ ویژگیهای رسانه +-Name[fi]=Mediaominaisuudet +-Name[fr]=Page de propriétés du média +-Name[he]=דף מ××¤×™×™× ×™ מדיה +-Name[hr]=Stranica svojstva medija +-Name[hu]=MédiajellemzÅ‘k lap +-Name[is]=Eiginleikar miðils +-Name[it]=Pagina delle proprietà dei dispositivi di archiviazione +-Name[ja]=メディア属性ページ +-Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ +-Name[nb]=Side for medievarsling +-Name[nds]=Medienegenschappen-Siet +-Name[nl]=Pagina met media-eigenschappen +-Name[nn]=Side for medieeigenskapar +-Name[pl]=Strona wÅ‚aÅ›ciwoÅ›ci noÅ›nika +-Name[pt]=Página de Propriedades de Suportes FÃsicos +-Name[pt_BR]=Página de Propriedades de Suportes FÃsicos +-Name[ru]=СвойÑтва ноÑÐ¸Ñ‚ÐµÐ»Ñ +-Name[sk]=Strana vlastnostà média +-Name[sl]=Stran z lastnostmi nosilca +-Name[sr]=Страна Ñа ÑвојÑтвима медијума +-Name[sr@Latn]=Strana sa svojstvima medijuma +-Name[sv]=Sida för mediaegenskaper +-Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації +-Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện +-Name[zh_TW]=媒體內容é +-Comment=Konqueror properties dialog plugin to configure mount behaviour +-Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge +-Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror +-Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel +-Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden +-Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης +-Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje +-Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks +-Comment[fa]=وصلۀ Ù…Øاورۀ ویژگیهای Konqueror برای پیکربندی رÙتار سوار کردن +-Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä +-Comment[fr]=Module de Konqueror pour configurer le comportement du montage +-Comment[he]=תוסף חלון מ××¤×™×™× ×™× ×©×œ Konqueror לקביעת ×פשרויות חיבור +-Comment[hr]=Konqueror dodatak dijaloga svojstava za konfiguriranje naÄina pristupanja +-Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához +-Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun +-Comment[it]=Plugin della configurazione di Konqueror per configurare il montaggio +-Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン +-Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ +-Comment[nb]=Et programtillegg for Ã¥ sette opp montering av enheter i Konqueror +-Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen +-Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen +-Comment[nn]=Programtillegg for oppsett av montering i Konqueror +-Comment[pl]=Wtyczka okna wÅ‚aÅ›ciwoÅ›ci Konquerora do konfiguracji zachowania montowania +-Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem +-Comment[ru]=Модуль ÑвойÑтв Ð´Ð»Ñ Konqueror, отвечающий за поведение при подключении файловых ÑиÑтем +-Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia +-Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev +-Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању +-Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju +-Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende +-Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ +-Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết +-Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 +-X-KDE-Library=media_propsdlgplugin +-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted +diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp +--- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 +@@ -1,217 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#include <qcheckbox.h> +-#include <qtooltip.h> +-#include <qbuttongroup.h> +-#include <qlineedit.h> +-#include <qfileinfo.h> +-#include <qlabel.h> +-#include <qregexp.h> +-#include <kpushbutton.h> +-#include <kmessagebox.h> +-#include <klocale.h> +-#include <qcombobox.h> +-#include <qtimer.h> +-#include <kdebug.h> +-#include "propertiespage.h" +-#include <dcopref.h> +- +-// keep in sync with .ui and kded module +-const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; +-const char *journales[] = {"data", "ordered", "writeback", 0 }; +- +-PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) +- : PropertiesPageGUI(parent), id(_id) +-{ +- kdDebug() << "props page " << id << endl; +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "mountoptions", id); +- +- QStringList list; +- +- if (reply.isValid()) +- list = reply; +- +- if (list.size()) { +- kdDebug() << "list " << list << endl; +- +- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) +- { +- QString key = (*it).left((*it).find('=')); +- QString value = (*it).mid((*it).find('=') + 1); +- kdDebug() << "key '" << key << "' value '" << value << "'\n"; +- options[key] = value; +- } +- +- if (!options.contains("ro")) +- option_ro->hide(); +- else +- option_ro->setChecked(options["ro"] == "true"); +- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("quiet")) +- option_quiet->hide(); +- else +- option_quiet->setChecked(options["quiet"] == "true"); +- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("sync")) +- option_sync->hide(); +- else +- option_sync->setChecked(options["sync"] == "true"); +- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("atime")) +- option_atime->hide(); +- else +- option_atime->setChecked(options["atime"] == "true"); +- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("flush")) +- option_flush->hide(); +- else +- option_flush->setChecked(options["flush"] == "true"); +- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("utf8")) +- option_utf8->hide(); +- else +- option_utf8->setChecked(options["utf8"] == "true"); +- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("uid")) +- option_uid->hide(); +- else +- option_uid->setChecked(options["uid"] == "true"); +- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("shortname")) +- { +- option_shortname->hide(); +- text_shortname->hide(); +- } +- else +- { +- for (int index = 0; short_names[index]; ++index) +- if (options["shortname"] == short_names[index]) +- { +- option_shortname->setCurrentItem(index); +- break; +- } +- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- if (!options.contains("journaling")) +- { +- text_journaling->hide(); +- option_journaling->hide(); +- } +- else +- { +- for (int index = 0; journales[index]; ++index) +- if (options["journaling"] == journales[index]) +- { +- option_journaling->setCurrentItem(index); +- break; +- } +- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); +- } +- +- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); +- option_mountpoint->setText(options["mountpoint"]); +- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); +- option_automount->setChecked(options["automount"] == "true"); +- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); +- +- if (!options.contains("journaling") && +- !options.contains("shortname") && +- !options.contains("uid") && +- !options.contains("utf8") && +- !options.contains("flush")) +- groupbox_specific->hide(); +- +- } else { +- +- groupbox_generic->setEnabled(false); +- groupbox_specific->setEnabled(false); +- label_filesystem->hide(); +- } +-} +- +-PropertiesPage::~PropertiesPage() +-{ +-} +- +-bool PropertiesPage::save() +-{ +- QStringList result; +- +- if (options.contains("ro")) +- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); +- +- if (options.contains("quiet")) +- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); +- +- if (options.contains("sync")) +- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); +- +- if (options.contains("atime")) +- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); +- +- if (options.contains("flush")) +- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); +- +- if (options.contains("utf8")) +- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); +- +- if (options.contains("uid")) +- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); +- +- if (options.contains("shortname")) +- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); +- +- if (options.contains("journaling")) +- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); +- +- QString mp = option_mountpoint->text(); +- if (!mp.startsWith("/media/")) +- { +- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); +- return false; +- } +- result << QString("mountpoint=%1").arg(mp); +- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); +- +- kdDebug() << result << endl; +- +- DCOPRef mediamanager("kded", "mediamanager"); +- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); +- +- if (reply.isValid()) +- return (bool)reply; +- else { +- KMessageBox::sorry(this, +- i18n("Saving the changes failed")); +- +- return false; +- } +-} +- +-#include "propertiespage.moc" +diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h +--- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 +@@ -1,46 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef PROPERTIESPAGE_H +-#define PROPERTIESPAGE_H +- +-#include "propertiespagegui.h" +-#include <qmap.h> +- +-class QCheckBox; +-class Medium; +- +-class PropertiesPage : public PropertiesPageGUI +-{ +- Q_OBJECT +- +-public: +- PropertiesPage(QWidget* parent, const QString &_id); +- virtual ~PropertiesPage(); +- +- bool save(); +- +-protected: +- +- QMap<QString,QString> options; +- QString id; +- +-}; +- +-#endif +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui +--- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 +@@ -1,387 +0,0 @@ +-<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> +-<class>PropertiesPageGUI</class> +-<widget class="QWidget"> +- <property name="name"> +- <cstring>PropertiesPageGUI</cstring> +- </property> +- <property name="geometry"> +- <rect> +- <x>0</x> +- <y>0</y> +- <width>527</width> +- <height>476</height> +- </rect> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <property name="margin"> +- <number>0</number> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout17</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_generic</cstring> +- </property> +- <property name="title"> +- <string>Generic Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout15</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_ro</cstring> +- </property> +- <property name="text"> +- <string>Read only</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount the file system read-only.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_quiet</cstring> +- </property> +- <property name="text"> +- <string>Quiet</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_sync</cstring> +- </property> +- <property name="text"> +- <string>Synchronous</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>All I/O to the file system should be done synchronously.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_atime</cstring> +- </property> +- <property name="text"> +- <string>Access time updates</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Update inode access time for each access.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>textLabel3</cstring> +- </property> +- <property name="text"> +- <string>Mountpoint:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> +- </property> +- </widget> +- <widget class="QLineEdit"> +- <property name="name"> +- <cstring>option_mountpoint</cstring> +- </property> +- <property name="text"> +- <string></string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_automount</cstring> +- </property> +- <property name="text"> +- <string>Mount automatically</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system automatically.</string> +- </property> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QGroupBox"> +- <property name="name"> +- <cstring>groupbox_specific</cstring> +- </property> +- <property name="title"> +- <string>Filesystem Specific Mount Options</string> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout11</cstring> +- </property> +- <vbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_flush</cstring> +- </property> +- <property name="text"> +- <string>Flushed IO</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_utf8</cstring> +- </property> +- <property name="text"> +- <string>UTF-8 charset</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> +- </property> +- </widget> +- <widget class="QCheckBox"> +- <property name="name"> +- <cstring>option_uid</cstring> +- </property> +- <property name="text"> +- <string>Mount as user</string> +- </property> +- <property name="whatsThis" stdset="0"> +- <string>Mount this file system as user.</string> +- </property> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout7</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_journaling</cstring> +- </property> +- <property name="text"> +- <string>Journaling:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>All Data</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Ordered</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Write Back</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_journaling</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> +- +-<h3><b>All Data</b></h3> +- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. +- +-<h3><b>Ordered</b></h3> +- All data is forced directly out to the main file system prior to its metadata being committed to the journal. +- +-<h3><b>Write Back</b></h3> +- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- <widget class="QLayoutWidget"> +- <property name="name"> +- <cstring>layout14</cstring> +- </property> +- <hbox> +- <property name="name"> +- <cstring>unnamed</cstring> +- </property> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>text_shortname</cstring> +- </property> +- <property name="text"> +- <string>Short names:</string> +- </property> +- <property name="buddy" stdset="0"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- <widget class="QComboBox"> +- <item> +- <property name="text"> +- <string>Lower</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows 95</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Windows NT</string> +- </property> +- </item> +- <item> +- <property name="text"> +- <string>Mixed</string> +- </property> +- </item> +- <property name="name"> +- <cstring>option_shortname</cstring> +- </property> +- <property name="whatsThis" stdset="0"> +- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> +- +-<h3><b>Lower</b></h3> +-Force the short name to lower case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows 95</b></h3> +-Force the short name to upper case upon display; store a long name when the short name is not all upper case. +- +-<h3><b>Windows NT</b></h3> +-Display the shortname as is; store a long name when the short name is not all lower case or all upper case. +- +-<h3><b>Mixed</b></h3> +-Display the short name as is; store a long name when the short name is not all upper case.</string> +- </property> +- </widget> +- </hbox> +- </widget> +- </vbox> +- </widget> +- </vbox> +- </widget> +- <widget class="QLabel"> +- <property name="name"> +- <cstring>label_filesystem</cstring> +- </property> +- <property name="text"> +- <string>Filesystem: iso9660</string> +- </property> +- </widget> +- <spacer> +- <property name="name"> +- <cstring>spacer1</cstring> +- </property> +- <property name="orientation"> +- <enum>Vertical</enum> +- </property> +- <property name="sizeType"> +- <enum>Expanding</enum> +- </property> +- <property name="sizeHint"> +- <size> +- <width>20</width> +- <height>20</height> +- </size> +- </property> +- </spacer> +- </vbox> +- </widget> +- </hbox> +-</widget> +-<connections> +- <connection> +- <sender>option_ro</sender> +- <signal>stateChanged(int)</signal> +- <receiver>PropertiesPageGUI</receiver> +- <slot>changedSlot()</slot> +- </connection> +-</connections> +-<variables> +- <variable>bool m_hasChanged;</variable> +-</variables> +-<signals> +- <signal>changed()</signal> +-</signals> +-<slots> +- <slot access="protected">changedSlot()</slot> +-</slots> +-<functions> +- <function returnType="bool">hasChanged()</function> +-</functions> +-<layoutdefaults spacing="6" margin="11"/> +-</UI> +diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h +--- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 +@@ -1,22 +0,0 @@ +-/**************************************************************************** +-** ui.h extension file, included from the uic-generated form implementation. +-** +-** If you wish to add, delete or rename functions or slots use +-** Qt Designer which will update this file, preserving your code. Create an +-** init() function in place of a constructor, and a destroy() function in +-** place of a destructor. +-*****************************************************************************/ +- +- +-void PropertiesPageGUI::changedSlot() +-{ +- m_hasChanged = true; +- emit changed(); +-} +- +-bool PropertiesPageGUI::hasChanged() +-{ +- return m_hasChanged; +-} +- +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 +@@ -1,100 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +-#include <qstring.h> +-#include <qvbox.h> +-#include <qlayout.h> +-#include <qlabel.h> +-#include <qtimer.h> +- +-#include <kgenericfactory.h> +-#include <kdebug.h> +-#include <kpushbutton.h> +-#include <kfileshare.h> +-#include <kmessagebox.h> +-#include <kprocess.h> +-#include <kstandarddirs.h> +-#include <kdialog.h> +-#include <kglobal.h> +-#include <dcopref.h> +- +-#include "propertiespage.h" +-#include "propsdlgshareplugin.h" +-#include "../libmediacommon/medium.h" +- +-typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; +- +-K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, +- PropsDlgSharePluginFactory("media_propsdlgplugin") ) +- +-class PropsDlgSharePlugin::Private +-{ +- public: +- PropertiesPage* page; +-}; +- +-PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, +- const char *, const QStringList & ) +- : KPropsDlgPlugin(dlg), d(0) +-{ +- if (properties->items().count() != 1) +- return; +- +- KFileItem *item = properties->items().first(); +- +- DCOPRef mediamanager("kded", "mediamanager"); +- kdDebug() << "properties " << item->url() << endl; +- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); +- +- if ( !reply.isValid() ) +- return; +- +- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); +- +- d = new Private(); +- +- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); +- connect(d->page, SIGNAL(changed()), +- SLOT(slotChanged())); +- +- // QTimer::singleShot(100, this, SLOT(slotChanged())); +- +-} +- +-void PropsDlgSharePlugin::slotChanged() +-{ +- kdDebug() << "slotChanged()\n"; +- setDirty(true); +-} +- +-PropsDlgSharePlugin::~PropsDlgSharePlugin() +-{ +- delete d; +-} +- +-void PropsDlgSharePlugin::applyChanges() +-{ +- kdDebug() << "applychanges\n"; +- if (!d->page->save()) { +- properties->abortApplying(); +- } +-} +- +- +-#include "propsdlgshareplugin.moc" +- +diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h +--- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 ++++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 +@@ -1,44 +0,0 @@ +-/* +- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- GNU General Public License for more details. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +- +-*/ +- +-#ifndef KONQFILESHAREPLUGIN_H +-#define KONQFILESHAREPLUGIN_H +- +-#include <kpropertiesdialog.h> +- +-class PropsDlgSharePlugin : public KPropsDlgPlugin +-{ +-Q_OBJECT +-public: +- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); +- virtual ~PropsDlgSharePlugin(); +- virtual void applyChanges(); +- +-public slots: +- void slotChanged(); +- +-private: +- class Private; +- Private *d; +- +-}; +- +-#endif +- +- +diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in +--- kioslave/media/services/Makefile.in Sat Oct 7 16:42:32 2006 ++++ kioslave/media/services/Makefile.in Fri May 26 09:54:31 2006 +@@ -211,6 +211,7 @@ + LIBTOOL = @LIBTOOL@ + LIBUCB = @LIBUCB@ + LIBUSBCONFIG = @LIBUSBCONFIG@ ++LIBUTEMPTER = @LIBUTEMPTER@ + LIBUTIL = @LIBUTIL@ + LIBXDMCP = @LIBXDMCP@ + LIBXFT_LIB = @LIBXFT_LIB@ +diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop +--- kioslave/media/services/media_eject.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 +@@ -24,7 +24,7 @@ + Name[es]=Expulsar + Name[et]=Väljastamine + Name[eu]=Egotzi +-Name[fa]=پس زدن ++Name[fa]=اخراج + Name[fi]=Poista + Name[fr]=Éjecter + Name[fy]=Utsmytknop +diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop +--- kioslave/media/services/media_safelyremove.desktop Sun Oct 1 19:31:53 2006 ++++ kioslave/media/services/media_safelyremove.desktop Tue May 23 13:33:34 2006 +@@ -18,10 +18,8 @@ + Name[es]=Extracción segura + Name[et]=Eemalda turvaliselt + Name[eu]=Atera arriskurik gabe +-Name[fa]=Øذ٠امن + Name[fi]=Poista turvallisesti + Name[fr]=Enlever en toute sécurité +-Name[fy]=Feilich verwiderje + Name[ga]=Bain Amach go Sábháilte + Name[gl]=Eliminar de Maneira Segura + Name[he]=שליפה בבטחה +@@ -46,7 +44,6 @@ + Name[ru]=БезопаÑно извлечь + Name[rw]=Gukuramo Neza + Name[se]=DorvvoÅ¡laÅ¡ eretváldin +-Name[sk]=BezpeÄne odpojiÅ¥ + Name[sl]=Varno odstrani + Name[sr]=Безбедно уклони + Name[sr@Latn]=Bezbedno ukloni diff --git a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp index 5a6937d40f75..5a6937d40f75 100644 --- a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-fstabbackend.cpp diff --git a/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp new file mode 100644 index 000000000000..98bb0c705950 --- /dev/null +++ b/x11/kdebase4/files/extrapatch-kioslave_media_mediamanager-halbackend.cpp @@ -0,0 +1,50 @@ +--- kioslave/media/mediamanager/halbackend.cpp.orig Sun Oct 1 19:31:54 2006 ++++ kioslave/media/mediamanager/halbackend.cpp Tue Dec 19 11:14:04 2006 +@@ -17,7 +17,6 @@ + */ + + #include "halbackend.h" +-#include "linuxcdpolling.h" + + #include <stdlib.h> + +@@ -469,28 +468,23 @@ + else + mimeType = "media/dvd" + MOUNT_SUFFIX; + +- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) +- { +- mimeType = "media/audiocd"; +- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); +- } +- +- medium->setIconName(QString::null); +- + /* check if the disc id a vcd or a video dvd */ +- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); +- switch (type) ++ if (libhal_volume_disc_has_data(halVolume)) + { +- case DiscType::VCD: ++ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) + mimeType = "media/vcd"; +- break; +- case DiscType::SVCD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) + mimeType = "media/svcd"; +- break; +- case DiscType::DVD: ++ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) + mimeType = "media/dvdvideo"; +- break; + } ++ else if (libhal_volume_disc_has_audio(halVolume)) ++ { ++ mimeType = "media/audiocd"; ++ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); ++ } ++ ++ medium->setIconName(QString::null); + } + else + { diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in b/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in index a81fd6da8f38..950b6f73c910 100644 --- a/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in +++ b/x11/kdebase4/files/patch-kdm-kfrontend-Makefile.in @@ -1,12 +1,12 @@ ---- kdm/kfrontend/Makefile.in.orig Wed Feb 25 14:57:47 2004 -+++ kdm/kfrontend/Makefile.in Wed Feb 25 14:58:17 2004 -@@ -1149,9 +1149,6 @@ - uninstall-kde_moduleLTLIBRARIES uninstall-recursive +--- kdm/kfrontend/Makefile.in.orig Mon Nov 20 15:29:40 2006 ++++ kdm/kfrontend/Makefile.in Mon Nov 20 15:31:07 2006 +@@ -1126,9 +1126,6 @@ + uninstall-binPROGRAMS uninstall-info-am -install-data-local: genkdmconf -- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) +- ./genkdmconf --in $(DESTDIR)$(kde_confdir)/kdm --no-in-notice --face-src $(srcdir)/pics $(GENKDMCONF_FLAGS) - messages: - $(XGETTEXT) $(kdm_greet_SOURCES) -o $(podir)/kdmgreet.pot + $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kdmgreet.pot # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl b/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl new file mode 100644 index 000000000000..aba5681d8091 --- /dev/null +++ b/x11/kdebase4/files/patch-khelpcenter_searchhandlers-khc_mansearch.pl @@ -0,0 +1,11 @@ +--- khelpcenter/searchhandlers/khc_mansearch.pl.orig Mon Dec 18 14:35:13 2006 ++++ khelpcenter/searchhandlers/khc_mansearch.pl Mon Dec 18 14:35:37 2006 +@@ -55,7 +55,7 @@ + while( <MAN> ) { + # print "RAW:$_"; + chop; +- /^([^\s]+)\s+\((.*)\)\s+-\s+(.*)$/; ++ /^([^\s]+)\((.*)\)\s+-\s+(.*)$/; + my $page = $1; + my $section = $2; + my $description = $3; diff --git a/x11/kdebase4/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4/files/patch-kicker-taskbar-resize.diff deleted file mode 100644 index de1dbb73cc30..000000000000 --- a/x11/kdebase4/files/patch-kicker-taskbar-resize.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- kicker/taskbar/taskbar.cpp (revision 570839) -+++ kicker/taskbar/taskbar.cpp (revision 570840) -@@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension - - if (containerCount() == 0) - { -- actualMax = maxSize.height(); -+ actualMax = minButtonHeight; - } - - if (actualMax > maxSize.height()) - { - return maxSize; - } -- return QSize( maxSize.width(), maxSize.height() ); -+ return QSize( maxSize.width(), actualMax ); - } - else - { diff --git a/x11/kdebase4/files/patch-kio_media b/x11/kdebase4/files/patch-kio_media deleted file mode 100644 index 144c7914a0e5..000000000000 --- a/x11/kdebase4/files/patch-kio_media +++ /dev/null @@ -1,6118 +0,0 @@ -diff -urN kioslave/media/Makefile.in kioslave/media/Makefile.in ---- kioslave/media/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -122,8 +122,7 @@ - DATA = $(kde_services_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services propsdlgplugin -+DIST_SUBDIRS = $(SUBDIRS) - #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - #>+ 1 - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -276,6 +275,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -611,9 +611,8 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --@include_media_halbackend_TRUE@PROPSDLGPLUGINDIR = propsdlgplugin - SUBDIRS = libmediacommon . mediamanager medianotifier mounthelper \ -- kfile-plugin kcmodule mimetypes services $(PROPSDLGPLUGINDIR) -+ kfile-plugin kcmodule mimetypes services - - INCLUDES = -I$(srcdir)/libmediacommon $(all_includes) - #>- METASOURCES = AUTO -@@ -1092,8 +1091,7 @@ - ./testmedia - - messages: rc.cpp -- $(EXTRACTRC) propsdlgplugin/propertiespagegui.ui >> rc.cpp -- $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp propsdlgplugin/*.cpp -o $(podir)/kio_media.pot -+ $(XGETTEXT) *.cpp *.h kfile-plugin/*.cpp libmediacommon/*.cpp mediamanager/*.cpp mounthelper/*.cpp -o $(podir)/kio_media.pot - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: -diff -urN kioslave/media/kcmodule/Makefile.in kioslave/media/kcmodule/Makefile.in ---- kioslave/media/kcmodule/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kcmodule/Makefile.in Mon Mar 20 14:05:50 2006 -@@ -253,6 +253,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kcmodule/managermodule.cpp kioslave/media/kcmodule/managermodule.cpp ---- kioslave/media/kcmodule/managermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/managermodule.cpp Sun Nov 20 20:14:21 2005 -@@ -39,15 +39,15 @@ - QString hal_text = view->kcfg_HalBackendEnabled->text(); - hal_text += " ("+i18n("No support for HAL on this system")+")"; - view->kcfg_HalBackendEnabled->setText( hal_text ); --#endif - view->kcfg_HalBackendEnabled->setEnabled( false ); -+#endif - - #ifndef COMPILE_LINUXCDPOLLING - QString poll_text = view->kcfg_CdPollingEnabled->text(); - poll_text += " ("+i18n("No support for CD polling on this system")+")"; - view->kcfg_CdPollingEnabled->setText( poll_text ); --#endif - view->kcfg_CdPollingEnabled->setEnabled( false ); -+#endif - - load(); - } -diff -urN kioslave/media/kcmodule/media.desktop kioslave/media/kcmodule/media.desktop ---- kioslave/media/kcmodule/media.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/media.desktop Fri Mar 17 11:17:33 2006 -@@ -14,7 +14,6 @@ - Name[af]=Stoor Media - Name[bg]=СъхранÑващи уÑтройÑтва - Name[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া --Name[bs]=UreÄ‘aji za smjeÅ¡taj podataka - Name[ca]=Suports d'emmagatzematge - Name[cs]=Úložná zaÅ™Ãzenà - Name[da]=Opbevaringsmedie -@@ -31,7 +30,6 @@ - Name[gl]=Medios de armacenaxe - Name[he]=×”×ª×§× ×™× - Name[hi]=à¤à¤‚डार मीडिया --Name[hr]=Mediji za pohranjivanje - Name[hu]=Tárolóeszköz - Name[is]=Geymslumiðlar - Name[it]=Dispositivi di archiviazione -@@ -42,7 +40,7 @@ - Name[mk]=Медиуми за податоци - Name[ms]=Media Storan - Name[nb]=Lagringsenheter --Name[nds]=Spiekermedien -+Name[nds]=Spiekerreedschappen - Name[nl]=Opslagapparaten - Name[nn]=Lagringsmedium - Name[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ -@@ -53,7 +51,6 @@ - Name[ru]=УÑтройÑтва Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… - Name[rw]=Uburyo bwo Kubika - Name[se]=Vurkenmedia --Name[sk]=Zálohovacie médiá - Name[sl]=Nosilci za shranjevanje - Name[sr]=Складишни медијуми - Name[sr@Latn]=SkladiÅ¡ni medijumi -@@ -64,7 +61,6 @@ - Name[tt]=Saqlawlı Media - Name[uk]=ПриÑтрої Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Name[uz]=Сақлаш уÑкуналари --Name[vi]=á»” chứa Dữ liệu - Name[zh_CN]=å˜å‚¨ä»‹è´¨ - Name[zh_TW]=儲å˜åª’é«” - -@@ -72,7 +68,6 @@ - Comment[af]=Stel Stoor Media op - Comment[bg]=Конфигуриране на уÑтройÑтвата за Ñъхранение на Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ - Comment[bn]=সà§à¦Ÿà§‹à¦°à§‡à¦œ মিডিয়া কনফিগার করà§à¦¨ --Comment[bs]=Podesite prikaz ureÄ‘aja - Comment[ca]=Configura els suports d'emmagatzematge - Comment[cs]=Nastavenà úložných médià - Comment[da]=Opsætning af opbevarelsesmedie -@@ -86,16 +81,15 @@ - Comment[fy]=Opslachmedia ynstelle - Comment[ga]=Cumraigh Meáin Stórála - Comment[gl]=Configurar Medios de Armacenaxe --Comment[hr]=Konfiguriranje medija za pohranu - Comment[hu]=A tárolóeszközök beállÃtása - Comment[is]=Stillingar geymslumiðla - Comment[it]=Configura dispositivi di archiviazione --Comment[ja]=記憶メディアã®è¨å®š -+Comment[ja]=ストレージメディアã®è¨å®š - Comment[km]=កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឧបករណáŸâ€‹áž•áŸ’ទុក - Comment[lt]=KonfigÅ«ruoti saugojimo įrenginius - Comment[mk]=Конфигурирајте ги медиумите за податоци - Comment[nb]=Sett opp lagringsmedier --Comment[nds]=Spiekermedien instellen -+Comment[nds]=Spiekerreedschappen instellen - Comment[nl]=Opslagmedia instellen - Comment[nn]=Set opp lagringsmedium - Comment[pa]=ਸਟੋਰੇਜ਼ ਮੀਡਿਆ ਸੰਰਚਨਾ -@@ -104,7 +98,6 @@ - Comment[pt_BR]=Configura as mÃdias de armazenamento - Comment[ru]=ÐаÑтройка подключаемых уÑтройÑтв Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ - Comment[se]=Heivet vurkenmediaid --Comment[sk]=Nastavenie zálohovacÃch médià - Comment[sl]=Nastavitve nosilcev za shranjevanje - Comment[sr]=Подешавање медијума за Ñкладиштење - Comment[sr@Latn]=PodeÅ¡avanje medijuma za skladiÅ¡tenje -@@ -114,13 +107,11 @@ - Comment[tt]=Saqlaw Cıhazların Caylaw - Comment[uk]=ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтроїв Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ–Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ— - Comment[uz]=Сақлаш уÑкуналарни моÑлаш --Comment[vi]=Cấu hình á»” lÆ°u trữ Dữ liệu - Comment[zh_CN]=é…ç½®å˜å‚¨ä»‹è´¨ - Comment[zh_TW]=è¨å®šå„²å˜åª’é«” - - Keywords=storage,media,usb,cdrom,device - Keywords[bg]=Ñъхранение, информациÑ, компактдиÑк, уÑтройÑтво, данни, storage, media, usb, cdrom, device --Keywords[bs]=storage,media,usb,cdrom,device,ureÄ‘aji,mediji - Keywords[ca]=emmagatzematge,suport,usb,cdrom,dispositiu - Keywords[cs]=úložiÅ¡tÄ›,média,USB,CDROM,zaÅ™Ãzenà - Keywords[da]=opbevaring,medie,usb,cdrom,enhed -@@ -134,12 +125,10 @@ - Keywords[fy]=storage,opslach,media,usb,cd-rom,kompakt-skiif,device,apparaat,mp3-speler,usb-stick,geheugenkaart - Keywords[ga]=stóráil,stóras,meáin,meán,usb,cdrom,dlúthdhiosca,gléas - Keywords[gl]=armacenaxe,medios,usb,cdrom,dispositivo --Keywords[he]=storage,media,usb,cdrom,device,מדיה,התקן,סידירו×,תקליטור --Keywords[hr]=storage,media,usb,cdrom,device,pohrana,snimanje,mediji,ureÄ‘aj - Keywords[hu]=tároló,adathordozó,USB,CD-ROM,eszköz - Keywords[is]=geymsla,miðill,usb,cdrom,tæki - Keywords[it]=storage,media,usb,cdrom,dispositivi,dvd,penna usb,memory stick,stick --Keywords[ja]=記憶,メディア,usb,cdrom,デãƒã‚¤ã‚¹ -+Keywords[ja]=ストレージ,メディア,usb,cdrom,デãƒã‚¤ã‚¹ - Keywords[km]=ឧបករណáŸâ€‹áž•áŸ’ទុក, usb,ស៊ីឌីរ៉ូម,ឧបករណ០- Keywords[lt]=storage,media,usb,cdrom,device,saugojimas,media,įrenginiai,usb - Keywords[mk]=storage,media,usb,cdrom,device,медиуми,уÑб,цдром,уред -@@ -161,7 +150,6 @@ - Keywords[tr]=depolama,ortam,usb,cdrom,device - Keywords[uk]=зберіганнÑ,ноÑій,медіа,usb,cdrom,приÑтрій - Keywords[uz]=Ñақлаш уÑкунаÑи,usb,cdrom,компакт-диÑк --Keywords[vi]=lÆ°u trữ,ổ,usb,cdrom,thiết bị - Keywords[zh_CN]=storage,media,usb,cdrom,device,å˜å‚¨,介质,设备 - Keywords[zh_TW]=storage,media,usb,cdrom,device,儲å˜,媒體,光碟機,è£ç½® - -diff -urN kioslave/media/kcmodule/notifiermodule.cpp kioslave/media/kcmodule/notifiermodule.cpp ---- kioslave/media/kcmodule/notifiermodule.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/kcmodule/notifiermodule.cpp Mon Oct 10 17:04:00 2005 -@@ -174,8 +174,8 @@ - ActionListBoxItem *action_item - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - -- NotifierServiceAction * action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ NotifierServiceAction * action; -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - ServiceConfigDialog dialog(action, m_settings.supportedMimetypes(), this); - -@@ -195,8 +195,7 @@ - = static_cast<ActionListBoxItem*>(m_view->actionsList->selectedItem()); - - NotifierServiceAction *action; -- action = dynamic_cast<NotifierServiceAction*>( action_item->action() ); -- if ( action ) -+ if ( action = dynamic_cast<NotifierServiceAction*>( action_item->action() ) ) - { - m_settings.deleteAction( action ); - updateListBox(); -diff -urN kioslave/media/kfile-plugin/Makefile.in kioslave/media/kfile-plugin/Makefile.in ---- kioslave/media/kfile-plugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/kfile-plugin/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -248,6 +248,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/kfile-plugin/kfile_media.desktop kioslave/media/kfile-plugin/kfile_media.desktop ---- kioslave/media/kfile-plugin/kfile_media.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfile_media.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=Mediyum MÉ™'lumatı - Name[bg]=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° уÑтройÑтвата - Name[bn]=মিডিয়া তথà§à¦¯ --Name[bs]=Informacije o mediju - Name[ca]=Informació de suports - Name[cs]=Informace o médiu - Name[da]=Medieinformation --Name[de]=Medium-Information -+Name[de]=Medien-Information - Name[el]=ΠληÏοφοÏίες μÎσου - Name[eo]=Konservejaj informoj - Name[es]=Información de recursos -@@ -23,7 +22,6 @@ - Name[gl]=Informazón do Meio - Name[he]=מידע ×ודות המדיה - Name[hi]=माधà¥à¤¯à¤® जानकारी --Name[hr]=Podaci o mediju - Name[hu]=Adathordozó-jellemzÅ‘k - Name[is]=Upplýsingar um miðil - Name[it]=Informazioni supporto -@@ -46,7 +44,6 @@ - Name[ru]=Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ноÑителе - Name[rw]=Amakuru y'igitangazamakuru - Name[se]=MediumdieÄ‘ut --Name[sk]=Informácie o médiu - Name[sl]=Informacije o mediju - Name[sr]=Информације о медијуму - Name[sr@Latn]=Informacije o medijumu -@@ -55,11 +52,10 @@ - Name[th]=ข้à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸ªà¸·à¹ˆà¸ - Name[tr]=Ortam Bilgisi - Name[tt]=Media Turında --Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій -+Name[uk]=Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ноÑій інформації - Name[uz]=Сақлаш уÑкуна ҳақида маълумот --Name[vi]=Thông tin vá» á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨ä¿¡æ¯ - Name[zh_TW]=媒體資訊 - ServiceTypes=KFilePlugin - X-KDE-Library=kfile_media --MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera,media/camera_mounted,media/camera_unmounted -+MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdwriter_mounted;media/nfs_mounted;media/cdwriter_unmounted;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/dvd_unmounted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera -diff -urN kioslave/media/kfile-plugin/kfilemediaplugin.cpp kioslave/media/kfile-plugin/kfilemediaplugin.cpp ---- kioslave/media/kfile-plugin/kfilemediaplugin.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp Tue Nov 8 23:36:07 2005 -@@ -64,16 +64,12 @@ - addMimeType( "media/floppy_unmounted" ); - addMimeType( "media/zip_unmounted" ); - addMimeType( "media/gphoto2camera" ); -- addMimeType( "media/camera_mounted" ); -- addMimeType( "media/camera_unmounted" ); - } - - bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) - { -- const Medium medium = askMedium(info); -+ const Medium medium = askMedium(info); - -- kdDebug() << "KFileMediaPlugin::readInfo " << medium.id() << endl; -- - if (medium.id().isNull()) return false; - - QString mount_point = medium.mountPoint(); -@@ -165,8 +161,7 @@ - const Medium KFileMediaPlugin::askMedium(KFileMetaInfo &info) - { - DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << info.url() << endl; -- DCOPReply reply = mediamanager.call( "properties", info.url().url() ); -+ DCOPReply reply = mediamanager.call( "properties", info.url().fileName() ); - - if ( !reply.isValid() ) - { -diff -urN kioslave/media/libmediacommon/Makefile.in kioslave/media/libmediacommon/Makefile.in ---- kioslave/media/libmediacommon/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/libmediacommon/Makefile.in Mon Mar 20 14:05:51 2006 -@@ -250,6 +250,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/libmediacommon/medium.cpp kioslave/media/libmediacommon/medium.cpp ---- kioslave/media/libmediacommon/medium.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.cpp Mon Oct 10 17:04:00 2005 -@@ -40,8 +40,6 @@ - m_properties+= QString::null; /* ICON_NAME */ - - loadUserLabel(); -- -- m_halmounted = false; - } - - Medium::Medium() -@@ -59,8 +57,6 @@ - m_properties+= QString::null; /* BASE_URL */ - m_properties+= QString::null; /* MIME_TYPE */ - m_properties+= QString::null; /* ICON_NAME */ -- -- m_halmounted = false; - } - - const Medium Medium::create(const QStringList &properties) -@@ -163,7 +159,7 @@ - bool Medium::mountableState(bool mounted) - { - if ( m_properties[DEVICE_NODE].isEmpty() -- || ( mounted && m_properties[MOUNT_POINT].isEmpty() ) ) -+ || m_properties[MOUNT_POINT].isEmpty() ) - { - return false; - } -@@ -208,10 +204,14 @@ - - KURL Medium::prettyBaseURL() const - { -- if ( !baseURL().isEmpty() ) -- return baseURL(); -- -+ if ( isMountable() ) -+ { - return KURL( mountPoint() ); -+ } -+ else -+ { -+ return KURL( baseURL() ); -+ } - } - - QString Medium::prettyLabel() const -diff -urN kioslave/media/libmediacommon/medium.h kioslave/media/libmediacommon/medium.h ---- kioslave/media/libmediacommon/medium.h Sat Jul 22 10:15:42 2006 -+++ kioslave/media/libmediacommon/medium.h Mon Oct 10 17:04:00 2005 -@@ -22,7 +22,6 @@ - #include <qstring.h> - #include <qstringlist.h> - #include <kurl.h> --#include <qmap.h> - - class Medium - { -@@ -79,32 +78,14 @@ - - void setMimeType(const QString &mimeType); - void setIconName(const QString &iconName); -- void setHalMounted(bool flag) const { m_halmounted = flag; } -- bool halMounted() const { return m_halmounted; } - - private: - Medium(); - void loadUserLabel(); - - QStringList m_properties; -- mutable bool m_halmounted; -- -+ - friend class QValueListNode<const Medium>; - }; -- --namespace MediaManagerUtils { -- static inline QMap<QString,QString> splitOptions(const QStringList & options) -- { -- QMap<QString,QString> valids; -- -- for (QStringList::ConstIterator it = options.begin(); it != options.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- valids[key] = value; -- } -- return valids; -- } --} - - #endif -diff -urN kioslave/media/mediaimpl.cpp kioslave/media/mediaimpl.cpp ---- kioslave/media/mediaimpl.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediaimpl.cpp Mon Oct 10 17:04:01 2005 -@@ -226,8 +226,6 @@ - - mp_mounting = &medium; - -- -- /* - KIO::Job* job = KIO::mount(false, 0, - medium.deviceNode(), - medium.mountPoint()); -@@ -236,7 +234,6 @@ - this, SLOT( slotMountResult( KIO::Job * ) ) ); - connect( job, SIGNAL( warning( KIO::Job *, const QString & ) ), - this, SLOT( slotWarning( KIO::Job *, const QString & ) ) ); -- */ - kapp->dcopClient() - ->connectDCOPSignal("kded", "mediamanager", - "mediumChanged(QString, bool)", -@@ -244,17 +241,7 @@ - "slotMediumChanged(QString)", - false); - -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_lastErrorMessage); -- else -- m_lastErrorMessage = i18n("Internal Error"); -- if (!m_lastErrorMessage.isEmpty()) -- m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; -- else { -- qApp->eventLoop()->enterLoop(); -- } -+ qApp->eventLoop()->enterLoop(); - - mp_mounting = 0L; - -diff -urN kioslave/media/mediamanager/Makefile.in kioslave/media/mediamanager/Makefile.in ---- kioslave/media/mediamanager/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mediamanager/Makefile.in Mon Mar 20 14:05:53 2006 -@@ -284,6 +284,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mediamanager/fstabbackend.cpp kioslave/media/mediamanager/fstabbackend.cpp ---- kioslave/media/mediamanager/fstabbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 -@@ -111,7 +111,6 @@ - if ( mount->mountType() == "swap" - || mount->mountType() == "tmpfs" - || mount->mountType() == "sysfs" -- || mount->mountType() == "fdescfs" - || mount->mountType() == "kernfs" - || mount->mountType() == "usbfs" - || mount->mountType().contains( "proc" ) -@@ -159,23 +158,14 @@ - - if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; - -- /* Did we know this already before ? If yes, then -- nothing has changed, do not stat the mount point. Avoids -- hang if network shares are stalling */ -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- if(m_mtabEntries.contains(mtabEntry)) { -- new_mtabIds += m_mtabEntries[mtabEntry]; -- continue; -- } -- - QString id = generateId(dev, mp); - new_mtabIds+=id; -- m_mtabEntries[mtabEntry] = id; - - if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) - { - QString mime, icon, label; - guess(dev, mp, fs, true, mime, icon, label); -+ - m_mediaList.changeMediumState(id, true, false, - mime, icon, label); - } -@@ -212,10 +202,6 @@ - QString dev = medium->deviceNode(); - QString mp = medium->mountPoint(); - QString fs = medium->fsType(); -- -- -- QString mtabEntry = dev + "*" + mp + "*" + fs; -- m_mtabEntries.remove(mtabEntry); - - QString mime, icon, label; - guess(dev, mp, fs, false, mime, icon, label); -diff -urN kioslave/media/mediamanager/fstabbackend.h kioslave/media/mediamanager/fstabbackend.h ---- kioslave/media/mediamanager/fstabbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/fstabbackend.h Mon Oct 10 17:04:01 2005 -@@ -23,7 +23,6 @@ - - #include <qobject.h> - #include <qstringlist.h> --#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -54,7 +53,6 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; -diff -urN kioslave/media/mediamanager/halbackend.cpp kioslave/media/mediamanager/halbackend.cpp ---- kioslave/media/mediamanager/halbackend.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.cpp Thu Jan 19 18:00:58 2006 -@@ -21,16 +21,9 @@ - - #include <stdlib.h> - --#include <qfile.h> - #include <klocale.h> - #include <kurl.h> - #include <kdebug.h> --#include <kprocess.h> --#include <kconfig.h> --#include <qstylesheet.h> --#include <kmountpoint.h> --#include <kmessagebox.h> --#include <kio/job.h> - - #define MOUNT_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mounted") : QString("_unmounted")) - #define MOUNT_ICON_SUFFIX (libhal_volume_is_mounted(halVolume) ? QString("_mount") : QString("_unmount")) -@@ -39,1169 +32,615 @@ - static HALBackend* s_HALBackend; - - /* A macro function to convert HAL string properties to QString */ --QString libhal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) -+QString hal_device_get_property_QString(LibHalContext *ctx, const char* udi, const char *key) - { -- char* _ppt_string; -- QString _ppt_QString; -- _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -- _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -- libhal_free_string(_ppt_string); -- return _ppt_QString; -+ char* _ppt_string; -+ QString _ppt_QString; -+ _ppt_string = libhal_device_get_property_string(ctx, udi, key, NULL); -+ _ppt_QString = QString(_ppt_string ? _ppt_string : ""); -+ libhal_free_string(_ppt_string); -+ return _ppt_QString; - } - - /* Constructor */ - HALBackend::HALBackend(MediaList &list, QObject* parent) -- : QObject() -- , BackendBase(list) -- , m_halContext(NULL) -- , m_halStoragePolicy(NULL) -- , m_parent(parent) -+ : QObject() -+ , BackendBase(list) -+ , m_halContext(NULL) -+ , m_halStoragePolicy(NULL) -+ , m_parent(parent) - { -- s_HALBackend = this; -+ s_HALBackend = this; - } - - /* Destructor */ - HALBackend::~HALBackend() - { -- /* Close HAL connection */ -- if (m_halContext) -- { -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- unmount(current_medium->id()); -- -- -- /* Remove all the registered media first */ -- int numDevices; -- char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -- -- if ( halDeviceList ) -- { -- for ( int i = 0; i < numDevices; i++ ) -- { -- m_mediaList.removeMedium( halDeviceList[i], false ); -- } -- } -- -- libhal_free_string_array( halDeviceList ); -- -- DBusError error; -- dbus_error_init(&error); -- libhal_ctx_shutdown(m_halContext, &error); -- libhal_ctx_free(m_halContext); -- } -- -- if (m_halStoragePolicy) -- libhal_storage_policy_free(m_halStoragePolicy); -+ /* Close HAL connection */ -+ if (m_halContext) -+ { -+ /* Remove all the registered media first */ -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices( m_halContext, &numDevices, NULL ); -+ -+ if ( halDeviceList ) -+ { -+ for ( int i = 0; i < numDevices; i++ ) -+ { -+ m_mediaList.removeMedium( halDeviceList[i], false ); -+ } -+ } -+ -+ #ifdef HAL_0_4 -+ hal_shutdown(m_halContext); -+ #else -+ libhal_ctx_shutdown(m_halContext, NULL); -+ libhal_ctx_free(m_halContext); -+ #endif -+ } -+ -+ if (m_halStoragePolicy) -+ libhal_storage_policy_free(m_halStoragePolicy); - } - - /* Connect to the HAL */ - bool HALBackend::InitHal() - { -- kdDebug(1219) << "Context new" << endl; -- m_halContext = libhal_ctx_new(); -- if (!m_halContext) -- { -- kdDebug(1219) << "Failed to initialize HAL!" << endl; -- return false; -- } -- -- // Main loop integration -- kdDebug(1219) << "Main loop integration" << endl; -- DBusError error; -- dbus_error_init(&error); -- dbus_connection = dbus_connection_open_private(DBUS_SYSTEM_BUS, &error); -- dbus_bus_register(dbus_connection, &error); -- -- if (dbus_error_is_set(&error)) { -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- return false; -- } -- MainLoopIntegration(dbus_connection); -- libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -- -- // HAL callback functions -- kdDebug(1219) << "Callback functions" << endl; -- libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -- libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -- libhal_ctx_set_device_new_capability (m_halContext, NULL); -- libhal_ctx_set_device_lost_capability (m_halContext, NULL); -- libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -- libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); -- -- kdDebug(1219) << "Context Init" << endl; -- if (!libhal_ctx_init(m_halContext, &error)) -- { -- if (dbus_error_is_set(&error)) -- dbus_error_free(&error); -- libhal_ctx_free(m_halContext); -- m_halContext = NULL; -- kdDebug(1219) << "Failed to init HAL context!" << endl; -- return false; -- } -- -- /** @todo customize watch policy */ -- kdDebug(1219) << "Watch properties" << endl; -- if (!libhal_device_property_watch_all(m_halContext, &error)) -- { -- kdDebug(1219) << "Failed to watch HAL properties!" << endl; -- return false; -- } -- -- /* libhal-storage initialization */ -- kdDebug(1219) << "Storage Policy" << endl; -- m_halStoragePolicy = libhal_storage_policy_new(); -- /** @todo define libhal-storage icon policy */ -+#ifdef HAL_0_4 /* HAL API 0.4 */ -+ /* libhal initialization */ -+ m_halFunctions.main_loop_integration = HALBackend::hal_main_loop_integration; -+ m_halFunctions.device_added = HALBackend::hal_device_added; -+ m_halFunctions.device_removed = HALBackend::hal_device_removed; -+ m_halFunctions.device_new_capability = NULL; -+ m_halFunctions.device_lost_capability = NULL; -+ m_halFunctions.device_property_modified = HALBackend::hal_device_property_modified; -+ m_halFunctions.device_condition = HALBackend::hal_device_condition; -+ -+ m_halContext = hal_initialize(&m_halFunctions, false); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (libhal_device_property_watch_all(m_halContext, NULL)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#else /* HAL API >= 0.5 */ -+ kdDebug(1219) << "Context new" << endl; -+ m_halContext = libhal_ctx_new(); -+ if (!m_halContext) -+ { -+ kdDebug(1219) << "Failed to initialize HAL!" << endl; -+ return false; -+ } -+ -+ // Main loop integration -+ kdDebug(1219) << "Main loop integration" << endl; -+ DBusError error; -+ dbus_error_init(&error); -+ DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -+ if (dbus_error_is_set(&error)) { -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ return false; -+ } -+ MainLoopIntegration(dbus_connection); -+ libhal_ctx_set_dbus_connection(m_halContext, dbus_connection); -+ -+ // HAL callback functions -+ kdDebug(1219) << "Callback functions" << endl; -+ libhal_ctx_set_device_added(m_halContext, HALBackend::hal_device_added); -+ libhal_ctx_set_device_removed(m_halContext, HALBackend::hal_device_removed); -+ libhal_ctx_set_device_new_capability (m_halContext, NULL); -+ libhal_ctx_set_device_lost_capability (m_halContext, NULL); -+ libhal_ctx_set_device_property_modified (m_halContext, HALBackend::hal_device_property_modified); -+ libhal_ctx_set_device_condition(m_halContext, HALBackend::hal_device_condition); - -- /* List devices at startup */ -- return ListDevices(); -+ kdDebug(1219) << "Context Init" << endl; -+ if (!libhal_ctx_init(m_halContext, &error)) -+ { -+ if (dbus_error_is_set(&error)) -+ dbus_error_free(&error); -+ libhal_ctx_free(m_halContext); -+ m_halContext = NULL; -+ kdDebug(1219) << "Failed to init HAL context!" << endl; -+ return false; -+ } -+ -+ /** @todo customize watch policy */ -+ kdDebug(1219) << "Watch properties" << endl; -+ if (!libhal_device_property_watch_all(m_halContext, &error)) -+ { -+ kdDebug(1219) << "Failed to watch HAL properties!" << endl; -+ return false; -+ } -+#endif -+ -+ /* libhal-storage initialization */ -+ kdDebug(1219) << "Storage Policy" << endl; -+ m_halStoragePolicy = libhal_storage_policy_new(); -+ /** @todo define libhal-storage icon policy */ -+ -+ /* List devices at startup */ -+ return ListDevices(); - } - - /* List devices (at startup)*/ - bool HALBackend::ListDevices() - { -- kdDebug(1219) << "ListDevices" << endl; -+ kdDebug(1219) << "ListDevices" << endl; - -- int numDevices; -- char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); -+ int numDevices; -+ char** halDeviceList = libhal_get_all_devices(m_halContext, &numDevices, NULL); - -- if (!halDeviceList) -- return false; -+ if (!halDeviceList) -+ return false; - -- kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -- for (int i = 0; i < numDevices; i++) -- AddDevice(halDeviceList[i], false); -+ kdDebug(1219) << "HALBackend::ListDevices : " << numDevices << " devices found" << endl; -+ for (int i = 0; i < numDevices; i++) -+ AddDevice(halDeviceList[i], false); - -- libhal_free_string_array( halDeviceList ); -- -- return true; -+ return true; - } - - /* Create a media instance for the HAL device "udi". -- This functions checks whether the device is worth listing */ -+This functions checks whether the device is worth listing */ - void HALBackend::AddDevice(const char *udi, bool allowNotification) - { -- /* We don't deal with devices that do not expose their capabilities. -- If we don't check this, we will get a lot of warning messages from libhal */ -- if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- return; -- -- /* If the device is already listed, do not process. -- This should not happen, but who knows... */ -- /** @todo : refresh properties instead ? */ -- if (m_mediaList.findById(udi)) -- return; -- -- if (libhal_device_get_property_bool(m_halContext, "/org/freedesktop/Hal/devices/computer", "storage.disable_volume_handling", NULL)) -- allowNotification=false; -- -- /* Add volume block devices */ -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- /* We only list volume that have a filesystem or volume that have an audio track*/ -- if ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL) && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) ) -- return; -- -- if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" && -- !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) && -- ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) ) -- return; -- -- /* Query drive udi */ -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- /* We don't list floppy volumes because we list floppy drives */ -- if ((libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -- return; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "info.locked", NULL)) -- allowNotification=false; -- -- // if the device is locked do not act upon it -- if (libhal_device_get_property_bool(m_halContext, driveUdi.ascii(), "storage.partition_table_changed", NULL)) -- allowNotification=false; -- -- /** @todo check exclusion list **/ -- -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- -- QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi)); -- kdDebug() << "automount " << options["automount"] << endl; -- if (options["automount"] == "true" && allowNotification ) { -- QString error = mount(medium); -- if (!error.isEmpty()) -- kdDebug() << "error " << error << endl; -- } -- setVolumeProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- -- return; -- } -- -- /* Floppy & zip drives */ -- if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -- if ((libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -- (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setFloppyProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -- -- /* Camera handled by gphoto2*/ -- if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -- ((libhal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -- -- (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -- libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -- ) -- { -- /* Create medium */ -- Medium* medium = new Medium(udi, ""); -- setCameraProperties(medium); -- m_mediaList.addMedium(medium, allowNotification); -- return; -- } -+ /* We don't deal with devices that do not expose their capabilities. -+ If we don't check this, we will get a lot of warning messages from libhal */ -+ if (!libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ return; -+ -+ /* If the device is already listed, do not process. -+ This should not happen, but who knows... */ -+ /** @todo : refresh properties instead ? */ -+ if (m_mediaList.findById(udi)) -+ return; -+ -+ /* Add volume block devices */ -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ /* We only list volume that have a filesystem or volume that have an audio track*/ -+ if ( (hal_device_get_property_QString(m_halContext, udi, "volume.fsusage") != "filesystem") && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.has_audio", NULL)) && -+ (!libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL)) ) -+ return; -+ /* Query drive udi */ -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ /* We don't list floppy volumes because we list floppy drives */ -+ if ((hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, driveUdi.ascii(), "storage.drive_type") == "jaz")) -+ return; -+ -+ /** @todo check exclusion list **/ -+ -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setVolumeProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ -+ return; -+ } -+ -+ /* Floppy & zip drives */ -+ if (libhal_device_query_capability(m_halContext, udi, "storage", NULL)) -+ if ((hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") || -+ (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "jaz")) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setFloppyProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } -+ -+ /* Camera handled by gphoto2*/ -+ if (libhal_device_query_capability(m_halContext, udi, "camera", NULL) && -+#ifdef HAL_0_4 -+ libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2_support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2_support", NULL) -+#else -+ ((hal_device_get_property_QString(m_halContext, udi, "camera.access_method")=="ptp") || -+ -+ (libhal_device_property_exists(m_halContext, udi, "camera.libgphoto2.support", NULL) && -+ libhal_device_get_property_bool(m_halContext, udi, "camera.libgphoto2.support", NULL))) -+#endif -+ ) -+ { -+ /* Create medium */ -+ Medium* medium = new Medium(udi, ""); -+ setCameraProperties(medium); -+ m_mediaList.addMedium(medium, allowNotification); -+ return; -+ } - } - - void HALBackend::RemoveDevice(const char *udi) - { -- m_mediaList.removeMedium(udi, true); -+ m_mediaList.removeMedium(udi, true); - } - - void HALBackend::ModifyDevice(const char *udi, const char* key) - { -- Q_UNUSED(key); -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- if (!mediumUdi) -- return; -- ResetProperties(mediumUdi); -+ Q_UNUSED(key); -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ ResetProperties(mediumUdi); - } - - void HALBackend::DeviceCondition(const char* udi, const char* condition) - { -- QString conditionName = QString(condition); -- kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -- -- if (conditionName == "EjectPressed") { -- const Medium* medium = m_mediaList.findById(udi); -- if (!medium) { -- /* the ejectpressed appears on the drive and we need to find the volume */ -- const QPtrList<Medium> medlist = m_mediaList.list(); -- QPtrListIterator<Medium> it (medlist); -- for ( const Medium *current_medium = it.current(); current_medium; current_medium = ++it) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, current_medium->id().latin1(), "block.storage_device"); -- if (driveUdi == udi) -- { -- medium = current_medium; -- break; -- } -- } -- } -- if (medium) { -- KProcess p; -- p << "kio_media_mounthelper" << "-e" << medium->name(); -- p.start(KProcess::DontCare); -- } -- } -- -- const char* mediumUdi = findMediumUdiFromUdi(udi); -- kdDebug() << "findMedumUdiFromUdi " << udi << " returned " << mediumUdi << endl; -- if (!mediumUdi) -- return; -- -- /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -- if (conditionName == "VolumeUnmountForced") -- ResetProperties(mediumUdi); -- -- /* Reset properties after mounting */ -- if (conditionName == "VolumeMount") -- ResetProperties(mediumUdi); -- -- /* Reset properties after unmounting */ -- if (conditionName == "VolumeUnmount") -- ResetProperties(mediumUdi); -- -+ const char* mediumUdi = findMediumUdiFromUdi(udi); -+ if (!mediumUdi) -+ return; -+ -+ QString conditionName = QString(condition); -+ kdDebug(1219) << "Processing device condition " << conditionName << " for " << udi << endl; -+ -+ /* TODO: Warn the user that (s)he should unmount devices before unplugging */ -+ if (conditionName == "VolumeUnmountForced") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after mounting */ -+ if (conditionName == "VolumeMount") -+ ResetProperties(mediumUdi); -+ -+ /* Reset properties after unmounting */ -+ if (conditionName == "VolumeUnmount") -+ ResetProperties(mediumUdi); - } - - void HALBackend::MainLoopIntegration(DBusConnection *dbusConnection) - { -- m_dBusQtConnection = new DBusQt::Connection(m_parent); -- m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); -+ m_dBusQtConnection = new DBusQt::Connection(m_parent); -+ m_dBusQtConnection->dbus_connection_setup_with_qt_main(dbusConnection); - } - - /****************************************** -- ** Properties attribution ** -- ******************************************/ -+** Properties attribution ** -+******************************************/ - - /* Return the medium udi that should be updated when recieving a call for -- device udi */ -+device udi */ - const char* HALBackend::findMediumUdiFromUdi(const char* udi) - { -- /* Easy part : this Udi is already registered as a device */ -- const Medium* medium = m_mediaList.findById(udi); -- if (medium) -- return medium->id().ascii(); -- -- /* Hard part : this is a volume whose drive is registered */ -- if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -- if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -- { -- QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -- return findMediumUdiFromUdi(driveUdi.ascii()); -- } -+ /* Easy part : this Udi is already registered as a device */ -+ const Medium* medium = m_mediaList.findById(udi); -+ if (medium) -+ return medium->id().ascii(); -+ -+ /* Hard part : this is a volume whose drive is registered */ -+ if (libhal_device_property_exists(m_halContext, udi, "info.capabilities", NULL)) -+ if (libhal_device_query_capability(m_halContext, udi, "volume", NULL)) -+ { -+ QString driveUdi = hal_device_get_property_QString(m_halContext, udi, "block.storage_device"); -+ return findMediumUdiFromUdi(driveUdi.ascii()); -+ } - -- return NULL; -+ return NULL; - } - - void HALBackend::ResetProperties(const char* mediumUdi) - { -- kdDebug(1219) << "HALBackend::setProperties" << endl; -- if ( QString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) -- { -- const Medium *cmedium = m_mediaList.findById(mediumUdi); -- if ( cmedium ) -- { -- Medium m( *cmedium ); -- if ( setFstabProperties( &m ) ) { -- kdDebug() << "setFstabProperties worked" << endl; -- m_mediaList.changeMediumState(m, false); -- } -- return; -- } -- } -- -- Medium* m = new Medium(mediumUdi, ""); -- -- if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -- setVolumeProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -- setFloppyProperties(m); -- if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -- setCameraProperties(m); -+ kdDebug(1219) << "HALBackend::setProperties" << endl; - -- m_mediaList.changeMediumState(*m, false); -+ Medium* m = new Medium(mediumUdi, ""); -+ -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "volume", NULL)) -+ setVolumeProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "storage", NULL)) -+ setFloppyProperties(m); -+ if (libhal_device_query_capability(m_halContext, mediumUdi, "camera", NULL)) -+ setCameraProperties(m); - -- delete m; --} -+ m_mediaList.changeMediumState(*m, false); - --void HALBackend::setVolumeProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /* Get device information from libhal-storage */ -- LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -- if (!halVolume) -- return; -- QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -- if (!halDrive) { -- // at times HAL sends an UnmountForced event before the device is removed -- libhal_volume_free(halVolume); -- return; -- } -- -- medium->setName( -- generateName(libhal_volume_get_device_file(halVolume)) ); -- -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- -- char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- QString volume_name = QString::fromUtf8(name); -- QString media_name = volume_name; -- medium->setLabel(media_name); -- free(name); -- -- QString mimeType; -- if (libhal_volume_is_disc(halVolume)) -- { -- mimeType = "media/cdrom" + MOUNT_SUFFIX; -- -- LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankcd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/cdwriter" + MOUNT_SUFFIX; -- -- if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -- (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -- if (libhal_volume_disc_is_blank(halVolume)) -- { -- mimeType = "media/blankdvd"; -- medium->unmountableState(""); -- } -- else -- mimeType = "media/dvd" + MOUNT_SUFFIX; -- -- if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -- { -- mimeType = "media/audiocd"; -- medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -- } -- -- medium->setIconName(QString::null); -- -- /* check if the disc id a vcd or a video dvd */ -- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -- switch (type) -- { -- case DiscType::VCD: -- mimeType = "media/vcd"; -- break; -- case DiscType::SVCD: -- mimeType = "media/svcd"; -- break; -- case DiscType::DVD: -- mimeType = "media/dvdvideo"; -- break; -- } -- } -- else -- { -- mimeType = "media/hdd" + MOUNT_SUFFIX; -- if (libhal_drive_is_hotpluggable(halDrive)) -- { -- mimeType = "media/removable" + MOUNT_SUFFIX; -- medium->needMounting(); -- switch (libhal_drive_get_type(halDrive)) { -- case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -- medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -- medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -- medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_SD_MMC: -- medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -- break; -- case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -- { -- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -- break; -- } -- case LIBHAL_DRIVE_TYPE_CAMERA: -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -- // get model from camera -- if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -- { -- if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, physdev, "usb.product")); -- } -- break; -- } -- case LIBHAL_DRIVE_TYPE_TAPE: -- medium->setIconName(QString::null); //FIXME need icon -- break; -- default: -- medium->setIconName(QString::null); -- } -- -- if (medium->isMounted() && QFile::exists(medium->mountPoint() + "/dcim")) -- { -- mimeType = "media/camera" + MOUNT_SUFFIX; -- medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -- } -- } -- } -- medium->setMimeType(mimeType); -- -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); -+ delete m; - } - --bool HALBackend::setFstabProperties( Medium *medium ) -+void HALBackend::setVolumeProperties(Medium* medium) - { -- QString mp = isInFstab(medium); -+ kdDebug(1219) << "HALBackend::setVolumeProperties for " << medium->id() << endl; - -- if (!mp.isNull() && !medium->id().startsWith( "/org/kde" ) ) -- { -- // now that we know it's in fstab, we have to find out if it's mounted -- KMountPoint::List mtab = KMountPoint::currentMountPoints(); -- -- KMountPoint::List::iterator it = mtab.begin(); -- KMountPoint::List::iterator end = mtab.end(); -- -- bool mounted = false; -- -- for (; it!=end; ++it) -- { -- if ((*it)->mountedFrom() == medium->deviceNode() && (*it)->mountPoint() == mp ) -- { -- mounted = true; -- break; -- } -- } -- -- kdDebug() << mp << " " << mounted << " " << medium->deviceNode() << " " << endl; -- QString fstype = medium->fsType(); -- if ( fstype.isNull() ) -- fstype = "auto"; -- -- medium->mountableState( -- medium->deviceNode(), -- mp, /* Mount point */ -- fstype, /* Filesystem type */ -- mounted ); /* Mounted ? */ -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /* Get device information from libhal-storage */ -+ LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, udi); -+ if (!halVolume) -+ return; -+ QString driveUdi = libhal_volume_get_storage_device_udi(halVolume); -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, driveUdi.ascii()); -+ -+ medium->setName( -+ generateName(libhal_volume_get_device_file(halVolume)) ); -+ -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ -+ char* name = libhal_volume_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ QString media_name = volume_name; -+ medium->setLabel(media_name); -+ free(name); - -- return true; -- } -+ QString mimeType; -+ if (libhal_volume_is_disc(halVolume)) -+ { -+ mimeType = "media/cdrom" + MOUNT_SUFFIX; - -- return false; -+ LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume); -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankcd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/cdwriter" + MOUNT_SUFFIX; -+ -+ if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) || -+ (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) -+ if (libhal_volume_disc_is_blank(halVolume)) -+ { -+ mimeType = "media/blankdvd"; -+ medium->unmountableState(""); -+ } -+ else -+ mimeType = "media/dvd" + MOUNT_SUFFIX; -+ -+ if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) -+ { -+ mimeType = "media/audiocd"; -+ medium->unmountableState( "audiocd:/?device=" + QString(libhal_volume_get_device_file(halVolume)) ); -+ } -+ -+ medium->setIconName(QString::null); -+ -+ /* check if the disc id a vcd or a video dvd */ -+ DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume)); -+ switch (type) -+ { -+ case DiscType::VCD: -+ mimeType = "media/vcd"; -+ break; -+ case DiscType::SVCD: -+ mimeType = "media/svcd"; -+ break; -+ case DiscType::DVD: -+ mimeType = "media/dvdvideo"; -+ break; -+ } -+ } -+ else -+ { -+ mimeType = "media/hdd" + MOUNT_SUFFIX; -+ const char *physdev = libhal_drive_get_physical_device_udi(halDrive); -+ if (libhal_drive_is_hotpluggable(halDrive)) -+ { -+ mimeType = "media/removable" + MOUNT_SUFFIX; -+ medium->needMounting(); -+ switch (libhal_drive_get_type(halDrive)) { -+ case LIBHAL_DRIVE_TYPE_COMPACT_FLASH: -+ medium->setIconName("compact_flash" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_MEMORY_STICK: -+ medium->setIconName("memory_stick" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SMART_MEDIA: -+ medium->setIconName("smart_media" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_SD_MMC: -+ medium->setIconName("sd_mmc" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER: -+ medium->setIconName("ipod" + MOUNT_ICON_SUFFIX); -+ break; -+ case LIBHAL_DRIVE_TYPE_CAMERA: -+ mimeType = "media/camera" + MOUNT_SUFFIX; -+ medium->setIconName("camera" + MOUNT_ICON_SUFFIX); -+ // get model from camera -+ if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL)) -+ { -+ if (libhal_device_property_exists(m_halContext, physdev, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, physdev, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, physdev, "usb.product")); -+ } -+ break; -+ case LIBHAL_DRIVE_TYPE_TAPE: -+ medium->setIconName(QString::null); //FIXME need icon -+ break; -+ default: -+ medium->setIconName(QString::null); -+ }; -+ }; -+ } -+ medium->setMimeType(mimeType); - -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - - // Handle floppies and zip drives - void HALBackend::setFloppyProperties(Medium* medium) - { -- kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; -+ kdDebug(1219) << "HALBackend::setFloppyProperties for " << medium->id() << endl; - -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -- if (!halDrive) -- return; -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- LibHalVolume* halVolume = NULL; -- kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -- if (numVolumes) -- halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); -- -- medium->setName( -- generateName(libhal_drive_get_device_file(halDrive)) ); -- -- if (halVolume) -- { -- medium->mountableState( -- libhal_volume_get_device_file(halVolume), /* Device node */ -- libhal_volume_get_mount_point(halVolume), /* Mount point */ -- libhal_volume_get_fstype(halVolume), /* Filesystem type */ -- libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -- } -- else -- { -- // HAL hates floppies - so we have to do it twice ;( -- medium->mountableState(libhal_drive_get_device_file(halDrive), QString::null, QString::null, false); -- setFstabProperties( medium ); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -- { -- if (medium->isMounted()) // don't use _SUFFIX here as it accesses the volume -- medium->setMimeType("media/floppy_mounted" ); -- else -- medium->setMimeType("media/floppy_unmounted"); -- } -- -- if (libhal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -- { -- if (medium->isMounted()) -- medium->setMimeType("media/zip_mounted" ); -- else -- medium->setMimeType("media/zip_unmounted"); -- } -- -- /** @todo And mimtype for JAZ drives ? */ -- -- medium->setIconName(QString::null); -- -- char *name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -- -- if (name) { -- medium->setLabel( QString::fromUtf8(name) ); -- free(name); -- } -- -- free(volumes); -- libhal_drive_free(halDrive); -- libhal_volume_free(halVolume); --} -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, udi); -+ if (!halDrive) -+ return; -+ int numVolumes; -+ char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -+ LibHalVolume* halVolume = NULL; -+ kdDebug(1219) << " found " << numVolumes << " volumes" << endl; -+ if (numVolumes) -+ halVolume = libhal_volume_from_udi(m_halContext, volumes[0]); - --void HALBackend::setCameraProperties(Medium* medium) --{ -- kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; -- -- const char* udi = medium->id().ascii(); -- /* Check if the device still exists */ -- if (!libhal_device_exists(m_halContext, udi, NULL)) -- return; -- -- /** @todo find name */ -- medium->setName("camera"); -- -- QString device = "camera:/"; -- -- char *cam = libhal_device_get_property_string(m_halContext, udi, "camera.libgphoto2.name", NULL); -- DBusError error; -- dbus_error_init(&error); -- if (cam && -- libhal_device_property_exists(m_halContext, udi, "usb.linux.device_number", NULL) && -- libhal_device_property_exists(m_halContext, udi, "usb.bus_number", NULL)) -- device.sprintf("camera://%s@[usb:%03d,%03d]/", cam, -- libhal_device_get_property_int(m_halContext, udi, "usb.bus_number", &error), -- libhal_device_get_property_int(m_halContext, udi, "usb.linux.device_number", &error)); -- -- libhal_free_string(cam); -- -- /** @todo find the rest of this URL */ -- medium->unmountableState(device); -- medium->setMimeType("media/gphoto2camera"); -- medium->setIconName(QString::null); -- if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -- else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -- medium->setLabel(libhal_device_get_property_QString(m_halContext, udi, "usb.product")); -- else -- medium->setLabel(i18n("Camera")); --} -+ medium->setName( -+ generateName(libhal_drive_get_device_file(halDrive)) ); - --QString HALBackend::generateName(const QString &devNode) --{ -- return KURL(devNode).fileName(); --} -+ if (halVolume) -+ { -+ medium->mountableState( -+ libhal_volume_get_device_file(halVolume), /* Device node */ -+ libhal_volume_get_mount_point(halVolume), /* Mount point */ -+ libhal_volume_get_fstype(halVolume), /* Filesystem type */ -+ libhal_volume_is_mounted(halVolume) ); /* Mounted ? */ -+ } -+ else -+ { -+ medium->mountableState( -+ libhal_drive_get_device_file(halDrive), /* Device node */ -+ "", /* Mount point */ -+ "", /* Filesystem type */ -+ false ); /* Mounted ? */ -+ } - --/****************************************** -- ** HAL CALL-BACKS ** -- ******************************************/ -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "floppy") -+ { -+ if (halVolume) -+ medium->setMimeType("media/floppy" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/floppy_unmounted"); -+ } - --void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->AddDevice(udi); --} -+ if (hal_device_get_property_QString(m_halContext, udi, "storage.drive_type") == "zip") -+ { -+ if (halVolume) -+ medium->setMimeType("media/zip" + MOUNT_SUFFIX); -+ else -+ medium->setMimeType("media/zip_unmounted"); -+ } - --void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) --{ -- kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -- Q_UNUSED(ctx); -- s_HALBackend->RemoveDevice(udi); --} -+ /** @todo And mimtype for JAZ drives ? */ - --void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -- const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) --{ -- kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(is_removed); -- Q_UNUSED(is_added); -- s_HALBackend->ModifyDevice(udi, key); --} -+ medium->setIconName(QString::null); - --void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -- const char *condition_name, -- const char* message -- ) --{ -- kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -- Q_UNUSED(ctx); -- Q_UNUSED(message); -- s_HALBackend->DeviceCondition(udi, condition_name); -+ QString media_name; -+ if (halVolume) -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString volume_name = QString::fromUtf8(name); -+ media_name = volume_name; -+ free(name); -+ } -+ else -+ { -+ char* name = libhal_drive_policy_compute_display_name(halDrive, halVolume, m_halStoragePolicy); -+ QString drive_name = QString::fromUtf8(name); -+ media_name = drive_name; -+ free(name); -+ } -+ medium->setLabel(media_name); -+ -+ free(volumes); -+ libhal_drive_free(halDrive); -+ libhal_volume_free(halVolume); - } - --QStringList HALBackend::mountoptions(const QString &name) -+void HALBackend::setCameraProperties(Medium* medium) - { -- const Medium* medium = m_mediaList.findById(name); -- if (medium && !isInFstab(medium).isNull()) -- return QStringList(); // not handled by HAL - fstab entry -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- char ** array = libhal_device_get_property_strlist(m_halContext, name.latin1(), "volume.mount.valid_options", NULL); -- QMap<QString,bool> valids; -- -- for (int index = 0; array && array[index]; ++index) { -- QString t = array[index]; -- if (t.endsWith("=")) -- t = t.left(t.length() - 1); -- valids[t] = true; -- kdDebug() << "valid " << t << endl; -- } -- libhal_free_string_array(array); -- QStringList result; -- QString tmp; -- -- QString fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.fstype"); -- if (fstype.isNull()) -- fstype = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.mount_filesystem"); -- -- -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- -- bool removable = libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.removable", NULL) -- || libhal_device_get_property_bool(m_halContext, drive_udi.latin1(), "storage.hotpluggable", NULL); -- -- config.setGroup(drive_udi); -- bool value = config.readBoolEntry("automount", false); -- config.setGroup(name); -- -- if (libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_blank", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_vcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_svcd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.is_videodvd", NULL) -- || libhal_device_get_property_bool(m_halContext, name.latin1(), "volume.disc.has_audio", NULL)) -- value = false; -- -- result << QString("automount=%1").arg(value ? "true" : "false"); -- -- if (valids.contains("ro")) -- { -- value = config.readBoolEntry("ro", false); -- tmp = QString("ro=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("quiet")) -- { -- value = config.readBoolEntry("quiet", false); -- tmp = QString("quiet=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("flush")) -- { -- value = config.readBoolEntry("flush", fstype.endsWith("fat")); -- tmp = QString("flush=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("uid")) -- { -- value = config.readBoolEntry("uid", true); -- tmp = QString("uid=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("utf8")) -- { -- value = config.readBoolEntry("utf8", true); -- tmp = QString("utf8=%1").arg(value ? "true" : "false"); -- result << tmp; -- } -- -- if (valids.contains("shortname")) -- { -- QString svalue = config.readEntry("shortname", "lower").lower(); -- if (svalue == "winnt") -- result << "shortname=winnt"; -- else if (svalue == "win95") -- result << "shortname=win95"; -- else if (svalue == "mixed") -- result << "shortname=mixed"; -- else -- result << "shortname=lower"; -- } -- -- if (valids.contains("sync")) -- { -- value = config.readBoolEntry("sync", !fstype.endsWith("fat") && removable); -- tmp = QString("sync=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- if (valids.contains("noatime")) -- { -- value = config.readBoolEntry("atime", !fstype.endsWith("fat")); -- tmp = QString("atime=%1").arg(value ? "true" : "false"); -- if (fstype != "iso9660") // makes no sense -- result << tmp; -- } -- -- QString mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.mount_point"); -- if (mount_point.isEmpty()) -- mount_point = libhal_device_get_property_QString(m_halContext, name.latin1(), "volume.policy.desired_mount_point"); -- -- mount_point = config.readEntry("mountpoint", mount_point); -- -- if (!mount_point.startsWith("/")) -- mount_point = "/media/" + mount_point; -- -- result << QString("mountpoint=%1").arg(mount_point); -- result << QString("filesystem=%1").arg(fstype); -- -- if (valids.contains("data")) -- { -- QString svalue = config.readEntry("journaling").lower(); -- if (svalue == "ordered") -- result << "journaling=ordered"; -- else if (svalue == "writeback") -- result << "journaling=writeback"; -- else if (svalue == "data") -- result << "journaling=data"; -- else -- result << "journaling=ordered"; -- } -+ kdDebug(1219) << "HALBackend::setCameraProperties for " << medium->id() << endl; - -- return result; -+ const char* udi = medium->id().ascii(); -+ /* Check if the device still exists */ -+ if (!libhal_device_exists(m_halContext, udi, NULL)) -+ return; -+ -+ /** @todo find name */ -+ medium->setName("camera"); -+ /** @todo find the rest of this URL */ -+ medium->unmountableState("camera:/"); -+ medium->setMimeType("media/gphoto2camera"); -+ medium->setIconName(QString::null); -+ if (libhal_device_property_exists(m_halContext, udi, "usb_device.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb_device.product")); -+ else if (libhal_device_property_exists(m_halContext, udi, "usb.product", NULL)) -+ medium->setLabel(hal_device_get_property_QString(m_halContext, udi, "usb.product")); -+ else -+ medium->setLabel(i18n("Camera")); - } - --bool HALBackend::setMountoptions(const QString &name, const QStringList &options ) -+QString HALBackend::generateName(const QString &devNode) - { -- kdDebug() << "setMountoptions " << name << " " << options << endl; -- -- KConfig config("mediamanagerrc"); -- config.setGroup(name); -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options); -- -- const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; -- for (int index = 0; names[index]; ++index) -- if (valids.contains(names[index])) -- config.writeEntry(names[index], valids[names[index]] == "true"); -- -- if (valids.contains("shortname")) -- config.writeEntry("shortname", valids["shortname"]); -- -- if (valids.contains("journaling")) -- config.writeEntry("journaling", valids["journaling"]); -- -- if (!mountoptions(name).contains(QString("mountpoint=%1").arg(valids["mountpoint"]))) -- config.writeEntry("mountpoint", valids["mountpoint"]); -- -- if (valids.contains("automount")) { -- QString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); -- config.setGroup(drive_udi); -- config.writeEntry("automount", valids["automount"]); -- } -- -- return true; -+ return KURL(devNode).fileName(); - } - --static QString mount_priv(const char *udi, const char *mount_point, const char **poptions, int noptions, -- DBusConnection *dbus_connection) --{ -- DBusMessage *dmesg, *reply; -- DBusError error; -- -- const char *fstype = ""; -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Mount"))) { -- kdDebug() << "mount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, -- DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "mount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- QString qerror; -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- QString qerror = error.message; -- kdError() << "mount failed for " << udi << ": " << error.name << " - " << qerror << endl; -- if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.UnknownFilesystemType")) -- qerror = i18n("Invalid filesystem type"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.PermissionDenied")) -- qerror = i18n("Permissions denied"); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted")) -- qerror = i18n("Device is already mounted."); -- else if ( !strcmp(error.name, "org.freedesktop.Hal.Device.Volume.InvalidMountpoint") && strlen(mount_point)) { -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return mount_priv(udi, "", poptions, noptions, dbus_connection); -- } -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "mount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- return qerror; -+/****************************************** -+** HAL CALL-BACKS ** -+******************************************/ - -+#ifdef HAL_0_4 -+void HALBackend::hal_main_loop_integration(LibHalContext *ctx, -+ DBusConnection *dbus_connection) -+{ -+ kdDebug(1219) << "HALBackend::hal_main_loop_integration" << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->MainLoopIntegration(dbus_connection); - } -+#endif - --void HALBackend::slotResult(KIO::Job *job) -+void HALBackend::hal_device_added(LibHalContext *ctx, const char *udi) - { -- kdDebug() << "slotResult " << mount_jobs[job] << endl; -- if (job->error()) -- { -- KMessageBox::error(0, job->errorText()); -- } -- ResetProperties( mount_jobs[job].latin1() ); -- mount_jobs.remove(job); -+ kdDebug(1219) << "HALBackend::hal_device_added " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->AddDevice(udi); - } - --QString HALBackend::isInFstab(const Medium *medium) -+void HALBackend::hal_device_removed(LibHalContext *ctx, const char *udi) - { -- KMountPoint::List fstab = KMountPoint::possibleMountPoints(KMountPoint::NeedMountOptions|KMountPoint::NeedRealDeviceName); -- -- KMountPoint::List::iterator it = fstab.begin(); -- KMountPoint::List::iterator end = fstab.end(); -- -- for (; it!=end; ++it) -- { -- kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl; -- if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) ) -- { -- QStringList opts = (*it)->mountOptions(); -- if (opts.contains("user") || opts.contains("users")) -- return (*it)->mountPoint(); -- } -- } -- -- return QString::null; -+ kdDebug(1219) << "HALBackend::hal_device_removed " << udi << endl; -+ Q_UNUSED(ctx); -+ s_HALBackend->RemoveDevice(udi); - } - --QString HALBackend::mount(const Medium *medium) --{ -- if (medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user mount " << medium->deviceNode() << " " << mountPoint << " " << medium->id() << endl; -- KIO::Job *job = KIO::mount( false, 0, medium->deviceNode(), mountPoint ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } else if (medium->id().startsWith("/org/kde/") ) -- return i18n("Permissions denied"); -- -- QStringList soptions; -- -- kdDebug() << "mounting " << medium->id() << "..." << endl; -- -- QMap<QString,QString> valids = MediaManagerUtils::splitOptions(mountoptions(medium->id())); -- if (valids["flush"] == "true") -- soptions << "flush"; -- -- if (valids["uid"] == "true") -- { -- soptions << QString("uid=%1").arg(getuid()); -- } -- -- if (valids["ro"] == "true") -- soptions << "ro"; -- -- if (valids["atime"] != "true") -- soptions << "noatime"; -- -- if (valids["quiet"] == "true") -- soptions << "quiet"; -- -- if (valids["utf8"] == "true") -- soptions << "utf8"; -- -- if (valids["sync"] == "true") -- soptions << "sync"; -- -- QString mount_point = valids["mountpoint"]; -- if (mount_point.startsWith("/media/")) -- mount_point = mount_point.mid(7); -- -- if (valids.contains("shortname")) -- { -- soptions << QString("shortname=%1").arg(valids["shortname"]); -- } -- -- if (valids.contains("journaling")) -- { -- QString option = valids["journaling"]; -- if (option == "data") -- soptions << QString("data=journal"); -- else if (option == "writeback") -- soptions << QString("data=writeback"); -- else -- soptions << QString("data=ordered"); -- } -- -- const char **options = new const char*[soptions.size() + 1]; -- uint noptions = 0; -- for (QStringList::ConstIterator it = soptions.begin(); it != soptions.end(); ++it, ++noptions) -- options[noptions] = (*it).latin1(); -- options[noptions] = NULL; -- -- QString qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection); -- if (!qerror.isEmpty()) { -- kdError() << "mounting " << medium->id() << " returned " << qerror << endl; -- return qerror; -- } -- -- medium->setHalMounted(true); -- ResetProperties(medium->id().latin1()); -- -- return QString(); --} -- --QString HALBackend::mount(const QString &_udi) -+void HALBackend::hal_device_property_modified(LibHalContext *ctx, const char *udi, -+ const char *key, dbus_bool_t is_removed, dbus_bool_t is_added) - { -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- return i18n("No such medium: %1").arg(_udi); -- -- return mount(medium); -+ kdDebug(1219) << "HALBackend::hal_property_modified " << udi << " -- " << key << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(is_removed); -+ Q_UNUSED(is_added); -+ s_HALBackend->ModifyDevice(udi, key); - } - --QString HALBackend::unmount(const QString &_udi) --{ -- const Medium* medium = m_mediaList.findById(_udi); -- if (!medium) -- { // now we get fancy: if the udi is no volume, it _might_ be a device with only one -- // volume on it (think CDs) - so we're so nice to the caller to unmount that volume -- LibHalDrive* halDrive = libhal_drive_from_udi(m_halContext, _udi.latin1()); -- if (halDrive) -- { -- int numVolumes; -- char** volumes = libhal_drive_find_all_volumes(m_halContext, halDrive, &numVolumes); -- if (numVolumes == 1) -- medium = m_mediaList.findById( volumes[0] ); -- } -- } -- -- if ( !medium ) -- return i18n("No such medium: %1").arg(_udi); -- -- if (!medium->isMounted()) -- return QString(); // that was easy -- -- QString mountPoint = isInFstab(medium); -- if (!mountPoint.isNull()) -- { -- kdDebug() << "triggering user unmount " << medium->deviceNode() << " " << mountPoint << endl; -- KIO::Job *job = KIO::unmount( medium->mountPoint(), false ); -- connect(job, SIGNAL( result (KIO::Job *)), -- SLOT( slotResult( KIO::Job *))); -- mount_jobs[job] = medium->id(); -- return QString(); // we won't report an error here -- } -- -- DBusMessage *dmesg, *reply; -- DBusError error; -- const char *options[2]; -- -- const char *udi = medium->id().latin1(); -- kdDebug() << "unmounting " << udi << "..." << endl; -- -- dbus_error_init(&error); -- DBusConnection *dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); -- if (dbus_error_is_set(&error)) -- { -- dbus_error_free(&error); -- return false; -- } -- -- if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, -- "org.freedesktop.Hal.Device.Volume", -- "Unmount"))) { -- kdDebug() << "unmount failed for " << udi << ": could not create dbus message\n"; -- return i18n("Internal Error"); -- } -- -- options[0] = "force"; -- options[1] = 0; -- -- if (!dbus_message_append_args (dmesg, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, 0, -- DBUS_TYPE_INVALID)) -- { -- kdDebug() << "unmount failed for " << udi << ": could not append args to dbus message\n"; -- dbus_message_unref (dmesg); -- return i18n("Internal Error"); -- } -- -- dbus_error_init (&error); -- if (!(reply = dbus_connection_send_with_reply_and_block (dbus_connection, dmesg, -1, &error))) -- { -- kdDebug() << "unmount failed for " << udi << ": " << error.name << " " << error.message << endl; -- QString qerror = error.message; -- if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.Busy")) { -- qerror = QString("<qt>") + i18n("Device is Busy:"); -- QString cmdline = QString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint())); -- FILE *fuser = popen(cmdline.latin1(), "r"); -- uint counter = 0; -- if (fuser) { -- qerror += "<pre>"; -- QTextIStream is(fuser); -- QString tmp; -- while (!is.atEnd()) { -- tmp = is.readLine(); -- tmp = QStyleSheet::escape(tmp) + "\n"; -- -- qerror += tmp; -- if (counter++ > 20) -- { -- qerror += "..."; -- break; -- } -- } -- qerror += "</pre>"; -- (void)pclose( fuser ); -- } -- qerror += "</qt>"; -- } else if (!strcmp(error.name, "org.freedesktop.Hal.Device.Volume.NotMounted")) { -- // this is faking. The error is that the device wasn't mounted by hal (but by the system) -- qerror = i18n("Permissions denied"); -- } -- -- dbus_message_unref (dmesg); -- dbus_error_free (&error); -- return qerror; -- } -- -- kdDebug() << "unmount queued for " << udi << endl; -- -- dbus_message_unref (dmesg); -- dbus_message_unref (reply); -- -- medium->setHalMounted(false); -- ResetProperties(udi); -- -- return QString(); -+void HALBackend::hal_device_condition(LibHalContext *ctx, const char *udi, -+ const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else -+ const char* message -+ #endif -+ ) -+{ -+ kdDebug(1219) << "HALBackend::hal_device_condition " << udi << " -- " << condition_name << endl; -+ Q_UNUSED(ctx); -+ Q_UNUSED(message); -+ s_HALBackend->DeviceCondition(udi, condition_name); - } - - #include "halbackend.moc" -diff -urN kioslave/media/mediamanager/halbackend.h kioslave/media/mediamanager/halbackend.h ---- kioslave/media/mediamanager/halbackend.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/halbackend.h Mon Oct 10 17:04:01 2005 -@@ -45,9 +45,65 @@ - #include <libhal.h> - #include <libhal-storage.h> - --namespace KIO { -- class Job; --} -+/* The HAL API changed between 0.4 and 0.5 series. -+These defines enable backward compatibility */ -+#ifdef HAL_0_4 -+ // libhal-storage 0.4 API -+ #define LibHalStoragePolicy HalStoragePolicy -+ #define LibHalDrive HalDrive -+ #define LibHalVolume HalVolume -+ #define LibHalVolumeDiscType HalVolumeDiscType -+ #define libhal_storage_policy_free hal_storage_policy_free -+ #define libhal_storage_policy_new hal_storage_policy_new -+ #define libhal_drive_from_udi hal_drive_from_udi -+ #define libhal_drive_find_all_volumes hal_drive_find_all_volumes -+ #define libhal_drive_get_type hal_drive_get_type -+ #define libhal_drive_get_device_file hal_drive_get_device_file -+ #define libhal_drive_free hal_drive_free -+ #define libhal_drive_policy_compute_display_name hal_drive_policy_compute_display_name -+ #define libhal_drive_is_hotpluggable hal_drive_is_hotpluggable -+ #define libhal_drive_get_physical_device_udi hal_drive_get_physical_device_udi -+ #define libhal_volume_from_udi hal_volume_from_udi -+ #define libhal_volume_get_device_file hal_volume_get_device_file -+ #define libhal_volume_get_mount_point hal_volume_get_mount_point -+ #define libhal_volume_get_fstype hal_volume_get_fstype -+ #define libhal_volume_is_mounted hal_volume_is_mounted -+ #define libhal_volume_get_disc_type hal_volume_get_disc_type -+ #define libhal_volume_free hal_volume_free -+ #define libhal_volume_policy_compute_display_name hal_volume_policy_compute_display_name -+ #define libhal_volume_disc_has_data hal_volume_disc_has_data -+ #define libhal_volume_disc_has_audio hal_volume_disc_has_audio -+ #define libhal_volume_disc_is_blank hal_volume_disc_is_blank -+ #define libhal_volume_is_disc hal_volume_is_disc -+ #define libhal_volume_get_storage_device_udi hal_volume_get_storage_device_udi -+ #define LIBHAL_VOLUME_DISC_TYPE_CDROM HAL_VOLUME_DISC_TYPE_CDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_CDR HAL_VOLUME_DISC_TYPE_CDR -+ #define LIBHAL_VOLUME_DISC_TYPE_CDRW HAL_VOLUME_DISC_TYPE_CDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDROM HAL_VOLUME_DISC_TYPE_DVDROM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRAM HAL_VOLUME_DISC_TYPE_DVDRAM -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDR HAL_VOLUME_DISC_TYPE_DVDR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDRW HAL_VOLUME_DISC_TYPE_DVDRW -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR HAL_VOLUME_DISC_TYPE_DVDPLUSR -+ #define LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW HAL_VOLUME_DISC_TYPE_DVDPLUSRW -+ #define LIBHAL_DRIVE_TYPE_COMPACT_FLASH HAL_DRIVE_TYPE_COMPACT_FLASH -+ #define LIBHAL_DRIVE_TYPE_MEMORY_STICK HAL_DRIVE_TYPE_MEMORY_STICK -+ #define LIBHAL_DRIVE_TYPE_SMART_MEDIA HAL_DRIVE_TYPE_SMART_MEDIA -+ #define LIBHAL_DRIVE_TYPE_SD_MMC HAL_DRIVE_TYPE_SD_MMC -+ #define LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER HAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER -+ #define LIBHAL_DRIVE_TYPE_CAMERA HAL_DRIVE_TYPE_CAMERA -+ #define LIBHAL_DRIVE_TYPE_TAPE HAL_DRIVE_TYPE_TAPE -+ -+ // libhal 0.4 API -+ #define libhal_free_string hal_free_string -+ #define libhal_device_exists(ctx, udi, error) hal_device_exists(ctx, udi) -+ #define libhal_device_property_watch_all(ctx, error) hal_device_property_watch_all(ctx) -+ #define libhal_get_all_devices(ctx, num_devices, error) hal_get_all_devices(ctx, num_devices) -+ #define libhal_device_property_exists(ctx, udi, key, error) hal_device_property_exists(ctx, udi, key) -+ #define libhal_device_get_property_bool(ctx, udi, key, error) hal_device_get_property_bool(ctx, udi, key) -+ #define libhal_device_get_property_string(ctx, udi, key, error) hal_device_get_property_string(ctx, udi, key) -+ #define libhal_device_query_capability(ctx, udi, capability, error) hal_device_query_capability(ctx, udi, capability) -+#endif -+ - - /** - * A handy function to query a hal string -@@ -88,14 +144,6 @@ - */ - bool ListDevices(); - -- QStringList mountoptions(const QString &id); -- -- bool setMountoptions(const QString &id, const QStringList &options); -- -- QString mount(const QString &id); -- QString mount(const Medium *medium); -- QString unmount(const QString &id); -- - private: - /** - * Append a device in the media list. This function will check if the device -@@ -147,16 +195,20 @@ - - void setVolumeProperties(Medium* medium); - void setFloppyProperties(Medium* medium); -- bool setFstabProperties(Medium* medium); - void setCameraProperties(Medium* medium); - QString generateName(const QString &devNode); -- static QString isInFstab(const Medium *medium); -- --private slots: -- void slotResult(KIO::Job *job); - - /* Hal call-backs -- from gvm*/ - public: -+#ifdef HAL_0_4 -+ /** Invoked by libhal for integration with our mainloop. -+ * -+ * @param ctx LibHal context -+ * @param dbus_connection D-BUS connection to integrate -+ */ -+ static void hal_main_loop_integration(LibHalContext *ctx, DBusConnection *dbus_connection); -+#endif -+ - /** Invoked when a device is added to the Global Device List. - * - * @param ctx LibHal context -@@ -189,7 +241,11 @@ - */ - static void hal_device_condition(LibHalContext *ctx, const char *udi, - const char *condition_name, -+ #ifdef HAL_0_4 -+ DBusMessage *message -+ #else - const char* message -+ #endif - ); - - /* HAL and DBus structures */ -@@ -199,6 +255,13 @@ - */ - LibHalContext* m_halContext; - -+#ifdef HAL_0_4 -+ /** -+ * Structure defining the hal callback function for devices events -+ */ -+ LibHalFunctions m_halFunctions; -+#endif -+ - /** - * libhal-storage HAL policy, e.g. for icon names - */ -@@ -213,10 +276,6 @@ - * Object for the kded module - */ - QObject* m_parent; -- -- DBusConnection *dbus_connection; -- -- QMap<KIO::Job *, QString> mount_jobs; - }; - - #endif /* _HALBACKEND_H_ */ -diff -urN kioslave/media/mediamanager/mediamanager.cpp kioslave/media/mediamanager/mediamanager.cpp ---- kioslave/media/mediamanager/mediamanager.cpp Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.cpp Mon Oct 10 17:04:01 2005 -@@ -43,280 +43,201 @@ - MediaManager::MediaManager(const QCString &obj) - : KDEDModule(obj), m_dirNotify(m_mediaList) - { -- connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -- SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -- SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -- connect( &m_mediaList, -- SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -- SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumAdded(const QString&, const QString&, bool)), -+ SLOT(slotMediumAdded(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, SIGNAL(mediumRemoved(const QString&, const QString&, bool)), -+ SLOT(slotMediumRemoved(const QString&, const QString&, bool)) ); -+ connect( &m_mediaList, -+ SIGNAL(mediumStateChanged(const QString&, const QString&, bool, bool)), -+ SLOT(slotMediumChanged(const QString&, const QString&, bool, bool)) ); - -- QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); -+ QTimer::singleShot( 10, this, SLOT( loadBackends() ) ); - } - - MediaManager::~MediaManager() - { -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - } - - void MediaManager::loadBackends() - { - m_mediaList.blockSignals(true); - -- while ( !m_backends.isEmpty() ) -- { -- BackendBase *b = m_backends.first(); -- m_backends.remove( b ); -- delete b; -- } -+ while ( !m_backends.isEmpty() ) -+ { -+ BackendBase *b = m_backends.first(); -+ m_backends.remove( b ); -+ delete b; -+ } - -- mp_removableBackend = 0L; -- m_halbackend = 0L; -+ mp_removableBackend = 0L; - - #ifdef COMPILE_HALBACKEND -- if ( MediaManagerSettings::self()->halBackendEnabled() ) -- { -- m_halbackend = new HALBackend(m_mediaList, this); -- if (m_halbackend->InitHal()) -- { -- m_backends.append( m_halbackend ); -- m_backends.append( new FstabBackend(m_mediaList, true) ); -- // No need to load something else... -- m_mediaList.blockSignals(false); -- return; -- } -- else -- { -- delete m_halbackend; -- m_halbackend = 0; -- } -- } -+ if ( MediaManagerSettings::self()->halBackendEnabled() ) -+ { -+ HALBackend* hal_backend = new HALBackend(m_mediaList, this); -+ if (hal_backend->InitHal()) -+ { -+ m_backends.append( hal_backend ); -+ m_backends.append( new FstabBackend(m_mediaList, true) ); -+ // No need to load something else... -+ m_mediaList.blockSignals(false); -+ return; -+ } -+ else -+ { -+ delete hal_backend; -+ } -+ } - #endif // COMPILE_HALBACKEND - -- mp_removableBackend = new RemovableBackend(m_mediaList); -- m_backends.append( mp_removableBackend ); -+ mp_removableBackend = new RemovableBackend(m_mediaList); -+ m_backends.append( mp_removableBackend ); - - #ifdef COMPILE_LINUXCDPOLLING -- if ( MediaManagerSettings::self()->cdPollingEnabled() ) -- { -- m_backends.append( new LinuxCDPolling(m_mediaList) ); -- } -+ if ( MediaManagerSettings::self()->cdPollingEnabled() ) -+ { -+ m_backends.append( new LinuxCDPolling(m_mediaList) ); -+ } - #endif //COMPILE_LINUXCDPOLLING - -- m_backends.append( new FstabBackend(m_mediaList) ); -- m_mediaList.blockSignals(false); -+ m_backends.append( new FstabBackend(m_mediaList) ); -+ m_mediaList.blockSignals(false); - } - - - QStringList MediaManager::fullList() - { -- QPtrList<Medium> list = m_mediaList.list(); -+ QPtrList<Medium> list = m_mediaList.list(); - -- QStringList result; -+ QStringList result; - -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- result+= (*it)->properties(); -- result+= Medium::SEPARATOR; -- } -+ QPtrList<Medium>::const_iterator it = list.begin(); -+ QPtrList<Medium>::const_iterator end = list.end(); -+ for (; it!=end; ++it) -+ { -+ result+= (*it)->properties(); -+ result+= Medium::SEPARATOR; -+ } - -- return result; -+ return result; - } - - QStringList MediaManager::properties(const QString &name) - { -- const Medium *m = m_mediaList.findByName(name); -+ const Medium *m = m_mediaList.findByName(name); - -- if (!m) -- { -- KURL u(name); -- kdDebug() << "Media::prop " << name << " " << u.isValid() << endl; -- if (u.isValid()) -- { -- if (u.protocol() == "system") -- { -- QString path = u.path(); -- if (path.startsWith("/media/")) -- path = path.mid(strlen("/media/")); -- m = m_mediaList.findByName(path); -- kdDebug() << "findByName " << path << m << endl; -- } -- else if (u.protocol() == "media") -- { -- m = m_mediaList.findByName(u.filename()); -- kdDebug() << "findByName " << u.filename() << m << endl; -- } -- else if (u.protocol() == "file") -- { -- // look for the mount point -- QPtrList<Medium> list = m_mediaList.list(); -- QPtrList<Medium>::const_iterator it = list.begin(); -- QPtrList<Medium>::const_iterator end = list.end(); -- for (; it!=end; ++it) -- { -- kdDebug() << "comparing " << (*it)->mountPoint() << " " << u.path() << " " << (*it)->deviceNode() << endl; -- if ((*it)->mountPoint() == u.path() || (*it)->deviceNode() == u.path()) { -- m = *it; -- break; -- } -- } -- } -- } -- } -- -- if (m) -- return m->properties(); -- else -- return QStringList(); --} -- --QStringList MediaManager::mountoptions(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return QStringList(); -- return m_halbackend->mountoptions(name); --#else -- return QStringList(); --#endif --} -- --bool MediaManager::setMountoptions(const QString &name, const QStringList &options) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return false; -- return m_halbackend->setMountoptions(name, options); --#else -- return false; --#endif --} -- --QString MediaManager::mount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->mount(name); --#else -- return i18n("Feature only available with HAL"); --#endif --} -- --QString MediaManager::unmount(const QString &name) --{ --#ifdef COMPILE_HALBACKEND -- if (!m_halbackend) -- return i18n("Feature only available with HAL"); -- return m_halbackend->unmount(name); --#else -- return i18n("Feature only available with HAL"); --#endif -+ if (m!=0L) -+ { -+ return m->properties(); -+ } -+ else -+ { -+ return QStringList(); -+ } - } - - QString MediaManager::nameForLabel(const QString &label) - { -- const QPtrList<Medium> media = m_mediaList.list(); -+ const QPtrList<Medium> media = m_mediaList.list(); - -- QPtrList<Medium>::const_iterator it = media.begin(); -- QPtrList<Medium>::const_iterator end = media.end(); -- for (; it!=end; ++it) -- { -- const Medium *m = *it; -- -- if (m->prettyLabel()==label) -- { -- return m->name(); -- } -- } -+ QPtrList<Medium>::const_iterator it = media.begin(); -+ QPtrList<Medium>::const_iterator end = media.end(); -+ for (; it!=end; ++it) -+ { -+ const Medium *m = *it; -+ -+ if (m->prettyLabel()==label) -+ { -+ return m->name(); -+ } -+ } - -- return QString::null; -+ return QString::null; - } - - ASYNC MediaManager::setUserLabel(const QString &name, const QString &label) - { -- m_mediaList.setUserLabel(name, label); -+ m_mediaList.setUserLabel(name, label); - } - - ASYNC MediaManager::reloadBackends() - { -- MediaManagerSettings::self()->readConfig(); -- loadBackends(); -+ MediaManagerSettings::self()->readConfig(); -+ loadBackends(); - } - - bool MediaManager::removablePlug(const QString &devNode, const QString &label) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->plug(devNode, label); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->plug(devNode, label); -+ } -+ return false; - } - - bool MediaManager::removableUnplug(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->unplug(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->unplug(devNode); -+ } -+ return false; - } - - bool MediaManager::removableCamera(const QString &devNode) - { -- if (mp_removableBackend) -- { -- return mp_removableBackend->camera(devNode); -- } -- return false; -+ if (mp_removableBackend) -+ { -+ return mp_removableBackend->camera(devNode); -+ } -+ return false; - } - - - void MediaManager::slotMediumAdded(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumAdded: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesAdded( KURL("media:/") ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesAdded( KURL("media:/") ); - -- emit mediumAdded(name, allowNotification); -- emit mediumAdded(name); -+ emit mediumAdded(name, allowNotification); -+ emit mediumAdded(name); - } - - void MediaManager::slotMediumRemoved(const QString &/*id*/, const QString &name, - bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumRemoved: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- notifier.FilesRemoved( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ notifier.FilesRemoved( KURL("media:/"+name) ); - -- emit mediumRemoved(name, allowNotification); -- emit mediumRemoved(name); -+ emit mediumRemoved(name, allowNotification); -+ emit mediumRemoved(name); - } - - void MediaManager::slotMediumChanged(const QString &/*id*/, const QString &name, - bool mounted, bool allowNotification) - { -- kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; -+ kdDebug(1219) << "MediaManager::slotMediumChanged: " << name << endl; - -- KDirNotify_stub notifier("*", "*"); -- if (!mounted) -- { -- notifier.FilesRemoved( KURL("media:/"+name) ); -- } -- notifier.FilesChanged( KURL("media:/"+name) ); -+ KDirNotify_stub notifier("*", "*"); -+ if (!mounted) -+ { -+ notifier.FilesRemoved( KURL("media:/"+name) ); -+ } -+ notifier.FilesChanged( KURL("media:/"+name) ); - -- emit mediumChanged(name, allowNotification); -- emit mediumChanged(name); -+ emit mediumChanged(name, allowNotification); -+ emit mediumChanged(name); - } - - -diff -urN kioslave/media/mediamanager/mediamanager.desktop kioslave/media/mediamanager/mediamanager.desktop ---- kioslave/media/mediamanager/mediamanager.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.desktop Fri Mar 17 11:17:33 2006 -@@ -6,11 +6,10 @@ - Name[az]=KDED Mediya Ä°darÉ™cisi - Name[bg]=Управление на уÑтройÑтвата KDED - Name[bn]=কে.ডি.ই.ডি. মিডিয়া মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦° --Name[bs]=KDED upravitelj medijima - Name[ca]=Gestor de suports KDED - Name[cs]=KDED správce médià - Name[da]=KDED MediehÃ¥ndtering --Name[de]=KDED-Medienverwaltung -+Name[de]=KDED Medienverwaltung - Name[el]=ΔιαχειÏιστής μÎσων KDED - Name[eo]=Konserveja administrilo - Name[es]=Administrador de recursos KDED -@@ -18,12 +17,10 @@ - Name[eu]=KDED media kudeatzailea - Name[fi]=KDED-tallennusmedianhallinta - Name[fr]=Gestionnaire de médias KDED --Name[fy]=KDEDED-mediabehearder -+Name[fy]=KDEDED-mediabeheerder - Name[ga]=Bainisteoir Meán KDED - Name[gl]=Xestor de Meios de KDED --Name[he]=×ž× ×”×œ המדיה של KDED - Name[hi]=केडीईडी मीडिया पà¥à¤°à¤¬à¤‚धक --Name[hr]=KDED upravitelj medija - Name[hu]=KDED médiakezelÅ‘ - Name[is]=KDED miðilstjóri - Name[it]=Gestore dei supporti KDED -@@ -44,7 +41,6 @@ - Name[ru]=Управление подключаемыми уÑтройÑтвами - Name[rw]=Mugenga Igihuza KDED - Name[se]=KDED-mediagieÄ‘ahalli --Name[sk]=KDED správca médià - Name[sl]=Upravitelj medijev KDED - Name[sr]=Менаџер медијума, KDED - Name[sr@Latn]=Menadžer medijuma, KDED -@@ -55,14 +51,12 @@ - Name[tt]=KDED Media Ä°däräçe - Name[uk]=Менеджер ноÑіїв інформації Ð´Ð»Ñ KDED - Name[uz]=KDED Ñақлаш уÑкуналарни бошқарувчи --Name[vi]=Trình quản là Ổ lÆ°u trữ KDED - Name[zh_CN]=KDED 介质管ç†å™¨ - Name[zh_TW]=KDED 媒體管ç†ç¨‹å¼ - Comment=Keep track of media activities and allow to (un)mount (media:/) - Comment[af]=Hou tred van media aktiwiteite en laat die (ont)koppel van 'media:/' toe - Comment[bg]=Ðаблюдение на уÑтройÑтвата и разрешаване на монтиране/демонтиране на (media:/) - Comment[bn]=কোথায় কী মিডিয়া বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡ খেয়াল রাখà§à¦¨ à¦à¦¬à¦‚ (আন)মাউনà§à¦Ÿ করà§à¦¨ (media:/) --Comment[bs]=Prati aktivnosti montiranja ureÄ‘aja za smjeÅ¡taj podataka (media:/) - Comment[ca]=Fa el seguiment de les activitats dels suports i permet muntar i desmuntar (media:/) - Comment[cs]=Udržuje pÅ™ehled o pÅ™ipojených zaÅ™ÃzenÃch - Comment[da]=Hold styr pÃ¥ medieaktiviteter og tillad at (af)montere (media:/) -@@ -76,17 +70,15 @@ - Comment[fr]=Gardez une trace des montages et permettre le (dé)montage (media:/) - Comment[fy]=Hâld de media-aktiviteiten by en stien ta om media oan- en ôf te keppelje (media:/) - Comment[gl]=Seguimento das actividades dos meios e permite-lle (des)montar (media:/) --Comment[he]=×ž× ×˜×¨ ×חר פעילויות מדיה, ומ×פשר לחבר ×ו ×œ× ×ª×§ ×”×ª×§× ×™× (media:/) - Comment[hi]=मीडिया कà¥à¤°à¤¿à¤¯à¤¾à¤“ं की जानकारी रखे तथा (अन)माउनà¥à¤Ÿ करने दे (मीडिया:/) --Comment[hr]=Praćenje aktivnosti medija i omogućavanje pristupanja i napuÅ¡tanja - Comment[hu]=Az adathordozók követése, csatlakoztatása és leválasztása (media:/) - Comment[is]=Fylgjast með breytingum á tækjum og bjóða upp á (af)tengingu (media:/) - Comment[it]=Tiene traccia delle attività dei supporti e permette di montarli o smontarli (device:/) --Comment[ja]=メディアã®æ´»å‹•ã‚’追跡ã—ã€(media:/) をマウントã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ -+Comment[ja]=メディアã®æ´»å‹•ã‚’æ•æ‰ã—ã€ãƒžã‚¦ãƒ³ãƒˆã—ãŸã‚Šã‚¢ãƒ³ãƒžã‚¦ãƒ³ãƒˆã—ã¾ã™ã€‚(media:/) - Comment[km]=ážáž¶áž˜ážŠáž¶áž“​សកម្មភាព​ពáŸážáŸŒáž˜áž¶áž“ និង​អនុញ្ញាážâ€‹áž²áŸ’យ​រៀបចំ (មិន​រៀបចំ) (media:/) - Comment[lt]=Stebi laikmenose vykdomus veiksmus ir leidžia (iÅ¡)montuoti (media:/) - Comment[lv]=Seko datu nesÄ“ju aktivitÄtÄ“m un ļauj montÄ“t/nomontÄ“t tos (media:/) --Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (од)монтирање (media:/) -+Comment[mk]=Води Ñметка за активноÑтите на ноÑачите и дозволува (де)монтирање (media:/) - Comment[ms]=Ikuti perkembangan aktiviti media dan benarkan untuk (nyah)lekap (media:/) - Comment[mt]=Å»omm kont ta' attivitajiet ta' mmuntar u ippermetti (un)mount (media:/) - Comment[nb]=Holder styr pÃ¥ monteringsaktiviteter og lar deg (av)montere (media:/) -@@ -101,7 +93,6 @@ - Comment[ru]=ÐвтоматичеÑкое подключение уÑтройÑтв (media:/) - Comment[rw]=Kugumana inzira y'ibikorwa by'ibitangazamakuru no kwemerera gushyiramo(gukuramo) (ibitangazamakuru:/) - Comment[se]=Gozit mii dáhpáhuvvá median ja diktá du gálgat ja Äadnat daid (media:/) --Comment[sk]=Sledovanie pripojenia/odpojenia medià (media:/) - Comment[sl]=Nadzoruj dejanja medija in dovilo priklop/odklop (media:/) - Comment[sr]=Прати активноÑÑ‚ медијума и омогућава (де)монтирање (media:/) - Comment[sr@Latn]=Prati aktivnost medijuma i omogućava (de)montiranje (media:/) -@@ -111,7 +102,6 @@ - Comment[tr]=Ortam iÅŸlemlerini takip et ve baÄŸlanma iÅŸlemlerine izin ver(media:/) - Comment[tt]=Cıhazlarnıñ totaÅŸuın/ayırıluın sizüçe närsä (media:/) - Comment[uk]=СпоÑтерігає за змінами Ñеред ноÑіїв інформації та дозволÑÑ” (роз)Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ (media:/) --Comment[vi]=Theo dõi các hoạt Ä‘á»™ng của ổ lÆ°u trữ và cho phép lắp đặt hay gỡ bá» chúng ở thÆ° mục "media:/" - Comment[zh_CN]=跟踪介质活动并å…许挂载或å¸è½½(media:/) - Comment[zh_TW]=æŒçºŒè¿½è¹¤åª’體活動並å…許(解除)掛載 (media:/) - ServiceTypes=KDEDModule -@@ -120,4 +110,3 @@ - X-KDE-FactoryName=mediamanager - X-KDE-Kded-autoload=true - X-KDE-Kded-load-on-demand=true --X-KDE-Kded-phase=1 -diff -urN kioslave/media/mediamanager/mediamanager.h kioslave/media/mediamanager/mediamanager.h ---- kioslave/media/mediamanager/mediamanager.h Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mediamanager/mediamanager.h Mon Oct 10 17:04:01 2005 -@@ -28,7 +28,6 @@ - #include "removablebackend.h" - #include "mediadirnotify.h" - --class HALBackend; - - class MediaManager : public KDEDModule - { -@@ -41,12 +40,6 @@ - k_dcop: - QStringList fullList(); - QStringList properties(const QString &name); -- QStringList mountoptions(const QString &name); -- bool setMountoptions(const QString &name, const QStringList &options); -- -- QString mount(const QString &uid); -- QString unmount(const QString &uid); -- - QString nameForLabel(const QString &label); - ASYNC setUserLabel(const QString &name, const QString &label); - -@@ -81,7 +74,6 @@ - MediaList m_mediaList; - QValueList<BackendBase*> m_backends; - RemovableBackend *mp_removableBackend; -- HALBackend *m_halbackend; - MediaDirNotify m_dirNotify; - }; - -diff -urN kioslave/media/medianotifier/Makefile.in kioslave/media/medianotifier/Makefile.in ---- kioslave/media/medianotifier/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/medianotifier/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -254,6 +254,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/medianotifier/medianotifier.cpp kioslave/media/medianotifier/medianotifier.cpp ---- kioslave/media/medianotifier/medianotifier.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.cpp Fri Mar 17 11:17:33 2006 -@@ -54,10 +54,7 @@ - { - kdDebug() << "MediaNotifier::onMediumChange( " << name << ", " - << allowNotification << ")" << endl; -- -- if ( !allowNotification ) -- return; -- -+ - // Update user activity timestamp, otherwise the notification dialog will be shown - // in the background due to focus stealing prevention. Entering a new media can - // be seen as a kind of user activity after all. It'd be better to update the timestamp -@@ -98,11 +95,11 @@ - { - QString mimetype = medium.mimetype(); - -- bool is_cdrom = mimetype.startsWith( "cd" ) || mimetype.startsWith( "dvd" ); -+ bool is_cdrom = mimetype.contains( "cd" ) || mimetype.contains( "dvd" ); - bool is_mounted = mimetype.endsWith( "_mounted" ); - - // We autorun only on CD/DVD or removable disks (USB, Firewire) -- if ( !( is_cdrom || is_mounted ) -+ if ( !( is_cdrom && is_mounted ) - && mimetype!="media/removable_mounted" ) - { - return false; -diff -urN kioslave/media/medianotifier/medianotifier.desktop kioslave/media/medianotifier/medianotifier.desktop ---- kioslave/media/medianotifier/medianotifier.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/medianotifier/medianotifier.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - X-KDE-Kded-load-on-demand=false - Name=Media Notifier Daemon - Name[af]=Media Inkennistelling Bediener --Name[bs]=Daemon za obavjeÅ¡tenja o novim medijima - Name[ca]=Dimoni notificador de suports - Name[cs]=Démon upozorňovánà na média - Name[da]=Mediebekendtgørelsesdæmon -@@ -21,12 +20,10 @@ - Name[fi]=Mediahuomautin - Name[fr]=Démon de notifications des média - Name[fy]=Medianotifikaasje-daemon --Name[gl]=Daemon Notificador de Medios --Name[hr]=Demon obavijesti o medijima - Name[hu]=LemezfigyelÅ‘ szolgáltatás - Name[is]=Miðils tilkynningarpúki - Name[it]=Demone notifiche dispositivi --Name[ja]=メディア 通知 デーモン -+Name[ja]=メディア通知デーモン - Name[km]=ដáŸáž˜áž·áž“​របស់​ឧបករណáŸâ€‹áž”្រាប់​ដំណឹង​មáŸážŒáŸ€ - Name[lt]=Media praneÅ¡imų tarnyba - Name[nb]=Medievarslingsnisse -@@ -36,20 +33,16 @@ - Name[pt]=Servidor de Notificação de Dispositivos - Name[pt_BR]=Servidor de Notificação de Dispositivos - Name[ru]=Демон уведомлений от подключаемых уÑтройÑтв --Name[sk]=Notifikátor medià - Name[sl]=Demon za obveÅ¡Äanje o nosilcih - Name[sr]=Демон за обавештења о медијумима - Name[sr@Latn]=Demon za obaveÅ¡tenja o medijumima - Name[sv]=Demon för mediaunderrättelser - Name[uk]=Даемон ÑÐ¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ ноÑÑ–Ñ— інформації --Name[vi]=Trình ná»n Thông báo á»” lÆ°u trữ - Name[zh_CN]=ä»‹è´¨é€šçŸ¥å®ˆæŠ¤ç¨‹åº --Name[zh_TW]=媒體通知伺æœç¨‹å¼ - Comment=A media plugged notifier - Comment[af]='n Inpropbare media inkennissteller - Comment[bg]=Мултимедиен демон за уведомÑване при поÑтавÑне/включване на ново мултимедийно уÑтройÑтво - Comment[bn]=নতà§à¦¨ মিডিয়া পà§à¦°à¦¬à§‡à¦¶ করলে তা জানায় --Comment[bs]=ObavjeÅ¡tenje da je novi ureÄ‘aj prikljuÄen - Comment[ca]=Un notificador de què s'ha introduït un suport - Comment[cs]=Upozorňovánà na pÅ™ipojená média - Comment[da]=En opdager af at medier sættes ind -@@ -62,11 +55,10 @@ - Comment[fr]=Notification de connexion de média - Comment[fy]=Meidieling fan oankeppele media - Comment[gl]=Un notificador de meios disponÃbeis --Comment[hr]=PrikljuÄeno obavjeÅ¡tavanje o medijima - Comment[hu]=LemezérzékelÅ‘ - Comment[is]=Tilkynnari um tengda miðla - Comment[it]=Notifiche dei dispositivi attaccati --Comment[ja]=メディアã®æŽ¥ç¶šã‚’通知ã—ã¾ã™ -+Comment[ja]=メディア接続 notifier - Comment[lt]=PerspÄ—jimo apie media prijungimÄ… priedas - Comment[mk]=ИзвеÑтување за приклучен медиум - Comment[nb]=En medievarsler som programtillegg -@@ -78,7 +70,6 @@ - Comment[pt]=Um notificador ligado aos dispositivos - Comment[pt_BR]=um notificador para mÃdia que é espetada (plug) - Comment[ru]=СиÑтема обработки уведомлений от подключаемых уÑтройÑтв --Comment[sk]=Notifikátor pripojených médià - Comment[sl]=ObveÅ¡Äanje o vstavljenih/priklopljenih nosilcih - Comment[sr]=Обавештавач о укљученим медијима - Comment[sr@Latn]=ObaveÅ¡tavaÄ o ukljuÄenim medijima -@@ -88,6 +79,5 @@ - Comment[tt]=Cıhaz totaşılÄŸan buluı turında beldergeç - Comment[uk]=Ð¡Ð¿Ð¾Ð²Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð¿Ñ€Ð¸Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð¾Ñіїв інформації - Comment[uz]=Сақлаш уÑкуналар уланганида хабар берувчи --Comment[vi]=Trình thông báo vá» các ổ lÆ°u trữ đã kết nối - Comment[zh_CN]=介质æ’入通知器 - Comment[zh_TW]=媒體æ’å…¥é€šçŸ¥ç¨‹å¼ -diff -urN kioslave/media/mimetypes/Makefile.in kioslave/media/mimetypes/Makefile.in ---- kioslave/media/mimetypes/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mimetypes/Makefile.in Mon Mar 20 14:05:54 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/mimetypes/audiocd.desktop kioslave/media/mimetypes/audiocd.desktop ---- kioslave/media/mimetypes/audiocd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/audiocd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,13 +18,11 @@ - Comment[gl]=CD de audio - Comment[he]=תקליטורי שמע - Comment[hi]=ऑडियो सीडी --Comment[hr]=Glazbeni CD - Comment[hu]=Hang-CD - Comment[is]=Hljóðdiskur - Comment[it]=CD audio - Comment[ja]=オーディオ CD - Comment[km]=ស៊ីឌី​អូឌីយ៉ូ --Comment[mk]=Ðудио ЦД - Comment[ms]=CD Audio - Comment[nb]=Lyd-CD - Comment[nds]=Audio-CD -@@ -47,7 +45,6 @@ - Comment[tt]=Tawış CD - Comment[uk]=Ðудіо КД - Comment[uz]=Ðудио компакт-диÑк --Comment[vi]=CD Nhạc - Comment[zh_CN]=音频 CD - Comment[zh_TW]=音樂 CD - Icon=cdaudio_unmount -diff -urN kioslave/media/mimetypes/blankcd.desktop kioslave/media/mimetypes/blankcd.desktop ---- kioslave/media/mimetypes/blankcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankcd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк - Comment[bn]=ফাà¦à¦•à¦¾ সিডি - Comment[br]=Goullonderiñ ur CD --Comment[bs]=Prazan CD - Comment[ca]=CD en blanc - Comment[cs]=Prázdné CD - Comment[da]=Blank cd -@@ -23,7 +22,6 @@ - Comment[gl]=CD valeiro - Comment[he]=תקליטור ריק - Comment[hi]=खाली सीडी --Comment[hr]=Prazan CD - Comment[hu]=Ãœres CD - Comment[is]=Tómur CD - Comment[it]=CD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ស៊ីឌី​ទទ០- Comment[lt]=TuÅ¡Äias CD - Comment[lv]=TukÅ¡s CD --Comment[mk]=Празно ЦД - Comment[ms]=CD Kosong - Comment[nb]=Tom CD - Comment[nds]=Leddige CD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый CD - Comment[rw]=CD Itanditseho - Comment[se]=Guorus CD --Comment[sk]=ÄŒisté CD - Comment[sl]=Prazen CD - Comment[sr]=Празан CD - Comment[sr@Latn]=Prazan CD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ CD - Comment[uk]=ЧиÑтий КД - Comment[uz]=Бўш компакт-диÑк --Comment[vi]=CD trống - Comment[zh_CN]=空 CD - Comment[zh_TW]=空白 CD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/blankdvd.desktop kioslave/media/mimetypes/blankdvd.desktop ---- kioslave/media/mimetypes/blankdvd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/blankdvd.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Празен диÑк DVD - Comment[bn]=ফাà¦à¦•à¦¾ ডিà¦à¦¿à¦¡à¦¿ - Comment[br]=Goullonderiñ un DVD --Comment[bs]=Prazan DVD - Comment[ca]=DVD en blanc - Comment[cs]=Prázdné DVD - Comment[da]=Blank dvd -@@ -23,7 +22,6 @@ - Comment[gl]=DVD valeiro - Comment[he]=תקליטור DVD ריק - Comment[hi]=खाली डीवीडी --Comment[hr]=Prazan DVD - Comment[hu]=Ãœres DVD - Comment[is]=Tómur DVD - Comment[it]=DVD vergine -@@ -31,7 +29,6 @@ - Comment[km]=ឌីវីឌី​ទទ០- Comment[lt]=TuÅ¡Äias DVD - Comment[lv]=TukÅ¡s DVD --Comment[mk]=Празно DVD - Comment[ms]=DVD Kosong - Comment[nb]=Tom DVD - Comment[nds]=Leddige DVD -@@ -45,7 +42,6 @@ - Comment[ru]=ЧиÑтый DVD - Comment[rw]=DVD Itanditseho - Comment[se]=Guorus DVD --Comment[sk]=ÄŒisté DVD - Comment[sl]=Prazen DVD - Comment[sr]=Празан DVD - Comment[sr@Latn]=Prazan DVD -@@ -56,7 +52,6 @@ - Comment[tt]=BuÅŸ DVD - Comment[uk]=ЧиÑтий DVD - Comment[uz]=Бўш DVD --Comment[vi]=DVD trống - Comment[zh_CN]=空 DVD - Comment[zh_TW]=空白 DVD - Icon=cdwriter_unmount -diff -urN kioslave/media/mimetypes/camera_mounted.desktop kioslave/media/mimetypes/camera_mounted.desktop ---- kioslave/media/mimetypes/camera_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_mounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Монтиран фотоапарат - Comment[bn]=মাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera marc'het --Comment[bs]=PrikljuÄena kamera - Comment[ca]=Cà mara muntada - Comment[cs]=PÅ™ipojená kamera - Comment[da]=Monteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Oankeppele kamera - Comment[ga]=Ceamara Feistithe - Comment[gl]=Cámara Montada --Comment[he]=מצלמה מחוברת --Comment[hr]=Pristupljena kamera - Comment[hu]=Csatlakoztatott fényképezÅ‘gép - Comment[is]=Tengd myndavél - Comment[it]=Macchina fotografica montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera montada - Comment[ru]=ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=ÄŒatnon govvenapperáhtta --Comment[sk]=Pripojený digitálny fotoaparát - Comment[sl]=Priklopljen fotoaparat - Comment[sr]=Монтирана камера - Comment[sr@Latn]=Montirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=BaÄŸlı Kamera - Comment[uk]=Приєднана камера - Comment[uz]=Уланган фотоапарат --Comment[vi]=Máy chụp ảnh số đã kết nối - Comment[zh_CN]=挂载的相机 - Comment[zh_TW]=掛載的照相機 - Icon=camera_mount -diff -urN kioslave/media/mimetypes/camera_unmounted.desktop kioslave/media/mimetypes/camera_unmounted.desktop ---- kioslave/media/mimetypes/camera_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/camera_unmounted.desktop Thu Jan 19 18:00:58 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Демонтиран фотоапарат - Comment[bn]=আনমাউনà§à¦Ÿ করা কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=DVD-ROM divarc'het --Comment[bs]=OtkopÄana kamera - Comment[ca]=Cà mera desmuntada - Comment[cs]=Odpojená kamera - Comment[da]=Afmonteret kamera -@@ -21,8 +20,6 @@ - Comment[fy]=Ofkeppele kamera - Comment[ga]=Ceamara Neamhfheistithe - Comment[gl]=Cámara non Montada --Comment[he]=מצלמה ×ž× ×•×ª×§×ª --Comment[hr]=Nepristupljena kamera - Comment[hu]=Leválasztott fényképezÅ‘gép - Comment[is]=Aftengd myndavél - Comment[it]=Macchina fotografica non montata -@@ -40,7 +37,6 @@ - Comment[pt_BR]=Câmera desmontada - Comment[ru]=ÐÐµÐ¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ð°Ñ ÐºÐ°Ð¼ÐµÑ€Ð° - Comment[se]=Gálgajuvvon govvenapperáhtta --Comment[sk]=Odpojený digitálny fotoaparát - Comment[sl]=Odklopljen fotoaparat - Comment[sr]=Демонтирана камера - Comment[sr@Latn]=Demontirana kamera -@@ -49,7 +45,6 @@ - Comment[tr]=Ayrılmış Kamera - Comment[uk]=Роз'єднана камера - Comment[uz]=Уланмаган фотоапарат --Comment[vi]=Máy chụp ảnh số đã gỡ ra - Comment[zh_CN]=未挂载的相机 - Comment[zh_TW]=未掛載的照相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/cdrom_mounted.desktop kioslave/media/mimetypes/cdrom_mounted.desktop ---- kioslave/media/mimetypes/cdrom_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Montado - Comment[he]=תקליטור מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Pristupljeni CD-ROM -+Comment[hr]=Montirani CDROM - Comment[hu]=Csatlakoztatott CD-ROM - Comment[is]=Tengt geisladrif - Comment[it]=CD-ROM montato -@@ -68,7 +68,6 @@ - Comment[uk]=Змонтований КД - Comment[uz]=Уланган компакт-диÑк - Comment[ven]=CD-ROM yo gonyiswaho --Comment[vi]=á»” CD ROM đã kết nối - Comment[wa]=Plake lazer montêye - Comment[xh]=CD-ROM Enyusiweyo - Comment[zh_CN]=挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdrom_unmounted.desktop kioslave/media/mimetypes/cdrom_unmounted.desktop ---- kioslave/media/mimetypes/cdrom_unmounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/cdrom_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=CD-ROM Non Montado - Comment[he]=תקליטור ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-रोम --Comment[hr]=Nepristupljeni CD-ROM -+Comment[hr]=Nemontirani CDROM - Comment[hsb]=Njemontowany CDnik - Comment[hu]=Leválasztott CD-ROM - Comment[is]=Aftengt geisladrif -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований КД - Comment[uz]=Уланмаган компакт-диÑк - Comment[ven]=CD-ROM i songo gonyiswaho --Comment[vi]=á»” CD-ROM đã gỡ ra -+Comment[vi]=CD-ROM được gỡ - Comment[wa]=Plake lazer dismontêye - Comment[xh]=CD-ROM Enganyuswanga - Comment[zh_CN]=未挂载的 CD-ROM -diff -urN kioslave/media/mimetypes/cdwriter_mounted.desktop kioslave/media/mimetypes/cdwriter_mounted.desktop ---- kioslave/media/mimetypes/cdwriter_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Montada - Comment[he]=צורב מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Pristupljeni CD snimaÄ -+Comment[hr]=Montirani CD-pisaÄ - Comment[hsb]=Montowany CD-palak - Comment[hu]=Csatlakoztatott CD-Ãró - Comment[is]=Tengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Змонтований гравер КД - Comment[uz]=Уланган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tsho gonyiswaho --Comment[vi]=á»” ghi CD đã kết nối -+Comment[vi]=á»” ghi CD được gắn kết - Comment[wa]=Plake lazer sol broûleu montêye - Comment[xh]=CD Writer Enyusiweyo - Comment[zh_CN]=挂载的刻录机 -diff -urN kioslave/media/mimetypes/cdwriter_unmounted.desktop kioslave/media/mimetypes/cdwriter_unmounted.desktop ---- kioslave/media/mimetypes/cdwriter_unmounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/cdwriter_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Grabadora de CD Non Montada - Comment[he]=צורב ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सीडी-राइटर --Comment[hr]=Nepristupljeni CD snimaÄ -+Comment[hr]=Nemontirani CD-pisaÄ - Comment[hsb]=Njemontowany CD-palak - Comment[hu]=Leválasztott CD-Ãró - Comment[is]=Aftengdur geislaskrifari -@@ -69,7 +69,7 @@ - Comment[uk]=Демонтований гравер КД - Comment[uz]=Уланмаган компакт-диÑк ёзувчи - Comment[ven]=Tshinwali tsha CD tshi songo gonyiswaho --Comment[vi]=á»” ghi CD đã gỡ ra -+Comment[vi]=á»” ghi CD được gỡ - Comment[wa]=Plake lazer sol broûleu dismontêye - Comment[xh]=CD Writer Enganyuswanga - Comment[zh_CN]=未挂载的刻录机 -diff -urN kioslave/media/mimetypes/dvd_mounted.desktop kioslave/media/mimetypes/dvd_mounted.desktop ---- kioslave/media/mimetypes/dvd_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/dvd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD Montado - Comment[he]=×›×•× ×Ÿ DVD מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Pristupljeni DVD -+Comment[hr]=Montirani DVD - Comment[hu]=Csatlakoztatott DVD - Comment[is]=Tengt DVD - Comment[it]=DVD montato -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸqan DVD - Comment[uk]=Змонтований DVD - Comment[uz]=Уланган DVD --Comment[vi]=DVD đã kết nối -+Comment[vi]=DVD được gắn kết - Comment[wa]=Plake lazer DVD montêye - Comment[zh_CN]=挂载的 DVD - Comment[zh_TW]=已掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvd_unmounted.desktop kioslave/media/mimetypes/dvd_unmounted.desktop ---- kioslave/media/mimetypes/dvd_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/dvd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=DVD non Montado - Comment[he]=×›×•× ×Ÿ DVD ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ डीवीडी --Comment[hr]=Nepristupljeni DVD -+Comment[hr]=Nemontirani DVD - Comment[hu]=Leválasztott DVD - Comment[is]=Aftengt DVD - Comment[it]=DVD smontato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas DVD - Comment[lv]=NomontÄ“ts DVD --Comment[mk]=Одмонтиран DVD -+Comment[mk]=Демонтиран DVD - Comment[mn]=Салгаатай DVD - Comment[ms]=DVD Nyahlekap - Comment[mt]=DVD mhux immontat -@@ -66,7 +66,7 @@ - Comment[tt]=TotaÅŸmaÄŸan DVD - Comment[uk]=Демонтований DVD - Comment[uz]=Уланмаган DVD --Comment[vi]=DVD đã gỡ ra -+Comment[vi]=DVD được gỡ - Comment[wa]=Plake lazer DVD dismontêye - Comment[zh_CN]=未挂载的 DVD - Comment[zh_TW]=未掛載的 DVD-ROM -diff -urN kioslave/media/mimetypes/dvdvideo.desktop kioslave/media/mimetypes/dvdvideo.desktop ---- kioslave/media/mimetypes/dvdvideo.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/dvdvideo.desktop Fri Mar 17 11:17:34 2006 -@@ -7,7 +7,6 @@ - Comment[bg]=Видео диÑк DVD - Comment[bn]=ডিà¦à¦¿à¦¡à¦¿ à¦à¦¿à¦¡à¦¿à¦“ ডিসà§à¦• - Comment[br]=Pladenn DVD Video --Comment[bs]=DVD video disk - Comment[ca]=VÃdeo disc DVD - Comment[cs]=DVD video - Comment[da]=Dvd video-disk -@@ -23,7 +22,6 @@ - Comment[gl]=DVD de vÃdeo - Comment[he]=תקליטור ויד×ו של DVD - Comment[hi]=डीवीडी वीडियो डिसà¥à¤• --Comment[hr]=DVD video disk - Comment[hu]=DVD-videolemez - Comment[is]=DVD vÃdeódiskur - Comment[it]=Disco video DVD -@@ -31,7 +29,6 @@ - Comment[km]=ážáž¶ážŸâ€‹ážœáž¸ážŠáŸáž¢áž¼ ឌីវីឌី - Comment[lt]=DVD video diskas - Comment[lv]=DVD Video Disks --Comment[mk]=DVD ВидеодиÑк - Comment[ms]=Cakera Video DVD - Comment[nb]=DVD-videoplate - Comment[nds]=DVD-Videodisk -@@ -45,7 +42,6 @@ - Comment[ru]=DVD Ñ Ð²Ð¸Ð´ÐµÐ¾ - Comment[rw]=Disiki Videwo DVD - Comment[se]=DVD-videoskearru --Comment[sk]=DVD Video disk - Comment[sl]=DVD Video disk - Comment[sr]=DVD видео диÑк - Comment[sr@Latn]=DVD video disk -@@ -56,9 +52,7 @@ - Comment[tr]=DVD Vidyo Diski - Comment[uk]=Виідео диÑк DVD - Comment[uz]=DVD видео-диÑк --Comment[vi]=ÄÄ©a Video DVD - Comment[zh_CN]=DVD 影碟 - Comment[zh_TW]=DVD 視訊光碟 - Icon=dvd_unmount - --X-KDE-IsAlso=inode/directory -diff -urN kioslave/media/mimetypes/floppy5_mounted.desktop kioslave/media/mimetypes/floppy5_mounted.desktop ---- kioslave/media/mimetypes/floppy5_mounted.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/mimetypes/floppy5_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Montado - Comment[he]=תקליטון "¼5 מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena 5¼" disketa -+Comment[hr]=Montirana 5¼" disketa - Comment[hu]=Csatlakoztatott 5¼"-es floppy - Comment[is]=Tengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі 5¼" - Comment[uz]=Уланган 5¼"диÑкет - Comment[ven]=5¼" Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã kết nối -+Comment[vi]=ÄÄ©a má»m 5¼"được gỡ - Comment[wa]=Plakete 5" ¼ montêye - Comment[xh]=Elayishiweyo 5¼" Floppy - Comment[zh_CN]=挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy5_unmounted.desktop kioslave/media/mimetypes/floppy5_unmounted.desktop ---- kioslave/media/mimetypes/floppy5_unmounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/floppy5_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete 5¼" Non Montado - Comment[he]=תקליטון "¼5 ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ 5¼" फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena 5¼" disketa -+Comment[hr]=Nemontirana 5¼" disketa - Comment[hu]=Leválasztott 5¼"-es floppy - Comment[is]=Aftengdur 5¼" disklingur - Comment[it]=Dischetto da 5¼" non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas 5¼" lankstus diskelis - Comment[lv]=NomontÄ“ta 5¼" diskete --Comment[mk]=Одмонтирана 5¼" диÑкета -+Comment[mk]=Демонтирана 5¼" диÑкета - Comment[mn]=СалгагдÑан 5¼"-УÑн диÑк - Comment[ms]=Liut 5¼" Terlekap - Comment[mt]=Flopi 5¼" mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі 5¼" - Comment[uz]=Уланмаган 5¼"диÑкет - Comment[ven]=5¼" Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m 5¼" đã gỡ ra -+Comment[vi]=ÄÄ©a má»m 5¼" được gỡ - Comment[wa]=Plakete 5" ¼ dismontêye - Comment[xh]=Enganyuswanga 5¼" Floppy - Comment[zh_CN]=未挂载的 5.25 英寸软驱 -diff -urN kioslave/media/mimetypes/floppy_mounted.desktop kioslave/media/mimetypes/floppy_mounted.desktop ---- kioslave/media/mimetypes/floppy_mounted.desktop Mon May 22 20:12:43 2006 -+++ kioslave/media/mimetypes/floppy_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete Montado - Comment[he]=תקליטון מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Pristupljena disketa -+Comment[hr]=Montirana disketa - Comment[hu]=Csatlakoztatott floppy - Comment[is]=Tengdur disklingur - Comment[it]=Dischetto montato -@@ -68,7 +68,7 @@ - Comment[uk]=Змонтований флопі - Comment[uz]=Уланган диÑкет - Comment[ven]=Floppy yo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã kết nối -+Comment[vi]=ÄÄ©a má»m được gắn kết - Comment[wa]=Plakete montêye - Comment[xh]=Floppy Enyusiweyo - Comment[zh_CN]=挂载的软驱 -diff -urN kioslave/media/mimetypes/floppy_unmounted.desktop kioslave/media/mimetypes/floppy_unmounted.desktop ---- kioslave/media/mimetypes/floppy_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/floppy_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disquete non Montado - Comment[he]=תקליטון ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ फ़à¥à¤²à¥‰à¤ªà¥€ --Comment[hr]=Nepristupljena disketa -+Comment[hr]=Nemontirana disketa - Comment[hu]=Leválasztott floppy - Comment[is]=Aftengdur disklingur - Comment[it]=Dischetto non montato -@@ -38,7 +38,7 @@ - Comment[lo]=ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas lankstus diskelis - Comment[lv]=NomontÄ“ta diskete --Comment[mk]=Одмонтирана диÑкета -+Comment[mk]=Демонтирана диÑкета - Comment[mn]=СалгагдÑан уÑн диÑкүүд - Comment[ms]=Liut Nyahlekap - Comment[mt]=Flopi mhux immontat -@@ -68,7 +68,7 @@ - Comment[uk]=Демонтований флопі - Comment[uz]=Уланмаган диÑкет - Comment[ven]=Floppy i songo gonyiswaho --Comment[vi]=ÄÄ©a má»m đã gỡ ra -+Comment[vi]=ÄÄ©a má»m được gỡ - Comment[wa]=Plakete dismontêye - Comment[xh]=Floppy Enganyuswanga - Comment[zh_CN]=未挂载的软驱 -diff -urN kioslave/media/mimetypes/gphoto2camera.desktop kioslave/media/mimetypes/gphoto2camera.desktop ---- kioslave/media/mimetypes/gphoto2camera.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/gphoto2camera.desktop Thu Jan 19 18:00:58 2006 -@@ -8,7 +8,6 @@ - Comment[bg]=Фотоапарат - Comment[bn]=কà§à¦¯à¦¾à¦®à§‡à¦°à¦¾ - Comment[br]=Kamera --Comment[bs]=Kamera - Comment[ca]=Cà mara - Comment[cs]=Kamera - Comment[da]=Kamera -@@ -25,8 +24,7 @@ - Comment[gl]=Cámara - Comment[he]=מצלמה - Comment[hi]=कैमरा --Comment[hr]=Kamera --Comment[hu]=FényképezÅ‘gép -+Comment[hu]=Kamera - Comment[is]=Myndavél - Comment[it]=Macchina fotografica - Comment[ja]=カメラ -@@ -46,7 +44,6 @@ - Comment[ru]=Камера - Comment[rw]=Kamera - Comment[se]=Govvanaperáhtta --Comment[sk]=Digitálny fotoaparát - Comment[sl]=Fotoaparat - Comment[sr]=Камера - Comment[sr@Latn]=Kamera -@@ -58,7 +55,6 @@ - Comment[tt]=Kamera - Comment[uk]=Камера - Comment[uz]=Фотоапарат --Comment[vi]=Máy chụp ảnh số - Comment[zh_CN]=相机 - Comment[zh_TW]=相機 - Icon=camera_unmount -diff -urN kioslave/media/mimetypes/hdd_mounted.desktop kioslave/media/mimetypes/hdd_mounted.desktop ---- kioslave/media/mimetypes/hdd_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран дÑл на твърд диÑк - Comment[bn]=মাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn marc'het --Comment[bs]=Montirana hard disk particija - Comment[ca]=Disc dur muntat - Comment[cs]=PÅ™ipojený oddÃl pevného disku - Comment[da]=Monteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Pristupljeni volumen tvrdog diska - Comment[hu]=Csatlakoztatott merevlemezes partÃció - Comment[is]=Tengd disksneið - Comment[it]=Volume disco rigido montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwashyizwemo - Comment[se]=ÄŒatnon garraskearrooassi --Comment[sk]=Pripojený oddiel pevného disku - Comment[sl]=Priklopljen pogon trdega diska - Comment[sr]=Монтирана партиција хард диÑка - Comment[sr@Latn]=Montirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Qatı Disk Töpläme - Comment[uk]=Змонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã kết nối - Comment[zh_CN]=æŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=å·²æŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/hdd_unmounted.desktop kioslave/media/mimetypes/hdd_unmounted.desktop ---- kioslave/media/mimetypes/hdd_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/hdd_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран дÑл на твърд диÑк - Comment[bn]=আনমাউনà§à¦Ÿ করা হারà§à¦¡ ডিসà§à¦• à¦à¦²à¦¿à¦‰à¦® - Comment[br]=Pladenn divarc'het --Comment[bs]=Demontirana hard disk particija - Comment[ca]=Disc dur desmuntat - Comment[cs]=Odpojený oddÃl pevného disku - Comment[da]=Afmonteret harddisk-volumen -@@ -26,7 +25,6 @@ - Comment[gl]=Partizón do Disco Duro Non Montada - Comment[he]=מחיצת ×›×•× ×Ÿ קשיח ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ हारà¥à¤¡ डिसà¥à¤• वॉलà¥à¤¯à¥‚म --Comment[hr]=Nepristupljeni volumen tvrdog diska - Comment[hu]=Leválasztott merevlemezes partÃció - Comment[is]=Aftengd disksneið - Comment[it]=Volume disco rigido non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный раздел жёÑткого диÑка - Comment[rw]=Ububiko Disiki Bwakuwemo - Comment[se]=Gálgajuvvon garraskearrooassi --Comment[sk]=Odpojený oddiel pevného disku - Comment[sl]=Odklopljen pogon trdega diska - Comment[sr]=Демонтирана партиција хард диÑка - Comment[sr@Latn]=Demontirana particija hard diska -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Qatı Disk Töpläme - Comment[uk]=Демонтований розділ жорÑткого диÑку - Comment[uz]=Қаттиқ диÑкнинг уланмаган қиÑми --Comment[vi]=Các Phân vùng á»” cứng đã gỡ ra - Comment[zh_CN]=æœªæŒ‚è½½çš„ç¡¬ç›˜å· - Comment[zh_TW]=æœªæŽ›è¼‰çš„ç¡¬ç¢Ÿåˆ†å‰²å€ - Patterns= -diff -urN kioslave/media/mimetypes/nfs_mounted.desktop kioslave/media/mimetypes/nfs_mounted.desktop ---- kioslave/media/mimetypes/nfs_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=মাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS marc'het --Comment[bs]=Montiran NFS resurs - Comment[ca]=Recurs NFS muntat - Comment[cs]=PÅ™ipojený zdroj NFS - Comment[da]=Monteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS Montada - Comment[he]=מש×ב NFS מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Pristupljeno NFS dijeljenje - Comment[hu]=Csatlakoztatott NFS-megosztás - Comment[is]=Tengd NFS auðlind - Comment[it]=Risorsa NFS montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share បាន​រៀបចំ - Comment[lt]=Sumontuotas NFS bendro naudojimo resursas - Comment[lv]=PiemontÄ“ta NFS Å¡Äre --Comment[mk]=Монтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Монтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Terlekap - Comment[mt]=Riżors NFS immuntat - Comment[nb]=Montert NFS-ressurs --Comment[nds]=Inhangt NFS-Freegaav -+Comment[nds]=Inhangt NFS-Ressource - Comment[nl]=Aangekoppelde NFS-gegevensbron - Comment[nn]=Montert delt NFS-ressurs - Comment[pa]=ਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Washyizwemo - Comment[se]=ÄŒatnon NFS-resursa --Comment[sk]=Pripojený zdroj NFS - Comment[sl]=Priklopljen vir NFS - Comment[sr]=Монтирано NFS дељење - Comment[sr@Latn]=Montirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan NFS Urtağı - Comment[uk]=Змонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланган NFS манба --Comment[vi]=Chia sẻ NFS đã kết nối - Comment[zh_CN]=挂载的 NFS 共享 - Comment[zh_TW]=已掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/nfs_unmounted.desktop kioslave/media/mimetypes/nfs_unmounted.desktop ---- kioslave/media/mimetypes/nfs_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/nfs_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран реÑÑƒÑ€Ñ NFS - Comment[bn]=আনমাউনà§à¦Ÿ করা à¦à¦¨-à¦à¦«-à¦à¦¸ শেয়ার - Comment[br]=Rennad NFS divarc'het --Comment[bs]=Demontiran NFS resurs - Comment[ca]=Recurs NFS desmuntat - Comment[cs]=Odpojený zdroj NFS - Comment[da]=Afmonteret NFS-share -@@ -26,7 +25,6 @@ - Comment[gl]=Compartizón NFS non Montada - Comment[he]=מש×ב NFS ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ à¤à¤¨à¤à¤«à¤¼à¤à¤¸ साà¤à¤¾ --Comment[hr]=Nepristupljeno NFS dijeljenje - Comment[hu]=Leválasztott NFS-megosztás - Comment[is]=Aftengd NFS auðlind - Comment[it]=Risorsa NFS non montata -@@ -34,11 +32,11 @@ - Comment[km]=NFS Share មិន​បាន​រៀបចំ - Comment[lt]=IÅ¡montuotas NFS bendro naudojimo resursas - Comment[lv]=NomontÄ“ta NFS Å¡Äre --Comment[mk]=Одмонтиран NFS-реÑÑƒÑ€Ñ -+Comment[mk]=Одмонтиран NFS реÑÑƒÑ€Ñ - Comment[ms]=Perkongsian NFS Nyahlekap - Comment[mt]=Riżors NFS mhux immuntat - Comment[nb]=Avmontert NFS-ressurs --Comment[nds]=Afhangt NFS-Freegaav -+Comment[nds]=Afhangt NFS-Ressource - Comment[nl]=Afgekoppelde NFS-gegevensbron - Comment[nn]=Umontert delt NFS-ressurs - Comment[pa]=ਅਨਮਾਊਟ ਕੀਤੀ NFS ਸਾਂਠ-@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный реÑÑƒÑ€Ñ NFS - Comment[rw]=Umugabane NFS Wakuwemo - Comment[se]=Gálgajuvvon NFS-resursa --Comment[sk]=Odpojený zdroj NFS - Comment[sl]=Odklopljen vir NFS - Comment[sr]=Демонтирано NFS дељење - Comment[sr@Latn]=Demontirano NFS deljenje -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan NFS Urtağı - Comment[uk]=Демонтований реÑÑƒÑ€Ñ NFS - Comment[uz]=Уланмаган NFS манба --Comment[vi]=Chia sẻ NFS đã gỡ ra - Comment[zh_CN]=未挂载的 NFS 共享 - Comment[zh_TW]=未掛載的 NFS è³‡æº - Patterns= -diff -urN kioslave/media/mimetypes/removable_mounted.desktop kioslave/media/mimetypes/removable_mounted.desktop ---- kioslave/media/mimetypes/removable_mounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Монтиран преноÑим ноÑител - Comment[bn]=মাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium lem-laka marc'het --Comment[bs]=Montiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible muntat - Comment[cs]=PÅ™ipojené výmÄ›nné médium - Comment[da]=Monteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Montado - Comment[he]=מדיה ×—×™×¦×•× ×™×ª מחוברת - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Pristupljen izmjenjiv medij - Comment[hu]=Csatlakoztatott adathordozó - Comment[is]=Tengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile montato -@@ -49,7 +47,6 @@ - Comment[ru]=Смонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyashyizwemo - Comment[se]=Čátnon sirdehahtti medium --Comment[sk]=Pripojené vyberateľné médium - Comment[sl]=Priklopljen odstranljiv medij - Comment[sr]=Монтиран уклоњиви медијум - Comment[sr@Latn]=Montiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸqan Çığarulı Media - Comment[uk]=Змонтований переноÑний ноÑій - Comment[uz]=Уланган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã kết nối - Comment[zh_CN]=挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=已掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/removable_unmounted.desktop kioslave/media/mimetypes/removable_unmounted.desktop ---- kioslave/media/mimetypes/removable_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/removable_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -9,7 +9,6 @@ - Comment[bg]=Демонтиран преноÑим ноÑител - Comment[bn]=আনমাউনà§à¦Ÿ করা অপসারণযোগà§à¦¯ মিডিয়াম - Comment[br]=Medium ar skoroù lem/laka divarc'het --Comment[bs]=Demontiran izmjenjivi ureÄ‘aj - Comment[ca]=Suport extraible desmuntat - Comment[cs]=Odpojené výmÄ›nné médium - Comment[da]=Afmonteret medie der kan fjernes -@@ -26,7 +25,6 @@ - Comment[gl]=Dispositivo ExtraÃbel Non Montado - Comment[he]=מדייה ×—×™×¦×•× ×™×ª ×ž× ×•×ª×§×ª - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ रीमूवेबल माधà¥à¤¯à¤® --Comment[hr]=Nepristupljen izmjenjiv medij - Comment[hu]=Leválasztott adathordozó - Comment[is]=Aftengdur útskiptanlegur miðill - Comment[it]=Supporto rimovibile non montato -@@ -49,7 +47,6 @@ - Comment[ru]=Отмонтированный внешний диÑк - Comment[rw]=Igitangazamakuru Kivanwamo Cyavanwemo - Comment[se]=Gálgaduvvon sirdehahtti medium --Comment[sk]=Odpojené vyberateľné médium - Comment[sl]=Odklopljen odstranljiv medij - Comment[sr]=Демонтиран уклоњиви медијум - Comment[sr@Latn]=Demontiran uklonjivi medijum -@@ -60,7 +57,6 @@ - Comment[tt]=TotaÅŸmaÄŸan Çığarulı Medium - Comment[uk]=Демонтований переноÑний ноÑій - Comment[uz]=Уланмаган Ñақлаш уÑкунаÑи --Comment[vi]=á»” lÆ°u trữ Di Ä‘á»™ng đã gỡ ra - Comment[zh_CN]=未挂载的å¯ç§»åŠ¨ä»‹è´¨ - Comment[zh_TW]=未掛載的å¯æ”œå¼åª’é«” - Patterns= -diff -urN kioslave/media/mimetypes/smb_mounted.desktop kioslave/media/mimetypes/smb_mounted.desktop ---- kioslave/media/mimetypes/smb_mounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Pristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Montirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Montowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Csatlakoztatott Samba-megosztás - Comment[is]=Tengd Samba (Microsoft Network) sameign -@@ -43,7 +43,7 @@ - Comment[ms]=Perkongsian Samba Terlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) immuntat - Comment[nb]=Montert Samba-katalog (Microsoft nettverk) --Comment[nds]=Inhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Inhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Aangekoppelde Samba-netwerkbron (Microsoft-netwerken) - Comment[nn]=Montert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Nameleditswego ya Samba (Kgokagano ya Microsoft) -@@ -67,7 +67,7 @@ - Comment[tt]=TotaÅŸqan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Змонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba yo gonyaho (Vhukwamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã kết nối -+Comment[vi]=Vùng chia sẻ SAMBA (mạng của Microsoft) được gắn kết - Comment[xh]=Samba Enyusiweyo (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=已掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/smb_unmounted.desktop kioslave/media/mimetypes/smb_unmounted.desktop ---- kioslave/media/mimetypes/smb_unmounted.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/mimetypes/smb_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Compartizón Samba Non Montada (Rede de Microsoft) - Comment[he]=שיתוף Microsoft Network) Samba) ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ सामà¥à¤¬à¤¾ (माइकà¥à¤°à¥‹à¤¸à¤¾à¤«à¥à¤Ÿ नेटवरà¥à¤•) साà¤à¥‡à¤¦à¤¾à¤°à¥€ --Comment[hr]=Nepristupljeno Samba dijeljenje (Microsoft mreža) -+Comment[hr]=Neontirano djeljenje Sambom (Microsoft mreža) - Comment[hsb]=Njemontowany Samba-(Microsoft syć)-zapisk - Comment[hu]=Leválasztott Samba-megosztás - Comment[is]=Aftengd Samba (Microsoft Network) sameign -@@ -44,7 +44,7 @@ - Comment[ms]=Perkongsian Samba Nyahlekap (Rangkaian Microsoft) - Comment[mt]=Riżors Samba (Microsoft Network) mhux immuntat - Comment[nb]=Avmontert Samba-katalog (Microsoft nettverk) --Comment[nds]=Afhangt Samba-Freegaav (Microsoft-Nettwark) -+Comment[nds]=Afhangt Samba-Ressource (Microsoft-Nettwark) - Comment[nl]=Afgekoppelde Samba-netwerkbron (Microsoft-netwerkbron) - Comment[nn]=Avmontert Samba-ressurs (Microsoft-nettverk) - Comment[nso]=Kabagano yeo e Theositswego ya Samba (Kgokagano ya Microsoft) -@@ -68,7 +68,7 @@ - Comment[tt]=TotaÅŸmaÄŸan Samba (Microsoft Çeltäre) Urtağı - Comment[uk]=Демонтований Ñпільний реÑÑƒÑ€Ñ Samba (мережа Microsoft) - Comment[ven]=Samba i songo gonyaho (Vhukamani ha Microsoft) U kovhekana --Comment[vi]=Chia sẻ SAMBA (mạng của Microsoft) đã gỡ ra -+Comment[vi]=Vùng chia sẻ SAMBA (Mạng của Microsoft) được gỡ - Comment[xh]=Samba Enganyuswanga (Umsebenzi womnatha we Microsoft) Ulwahlulo - Comment[zh_CN]=未挂载的 Samba (Microsoft 网络)共享 - Comment[zh_TW]=未掛載的 Samba (Microsoft 網路) 分享 -diff -urN kioslave/media/mimetypes/svcd.desktop kioslave/media/mimetypes/svcd.desktop ---- kioslave/media/mimetypes/svcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/svcd.desktop Thu Jan 19 18:00:58 2006 -@@ -16,7 +16,6 @@ - Comment[it]=Super video CD - Comment[ja]=スーパービデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼â€‹áž‚ុណភាព​ážáŸ’ពស់ --Comment[mk]=Супер видео ЦД - Comment[ms]=CD Supervideo - Comment[nb]=Super video CD - Comment[nds]=Super-Video-CD -@@ -37,7 +36,6 @@ - Comment[tr]=Süper Vidyo CD - Comment[uk]=Супер відео КД - Comment[uz]=Супер-видео компакт-диÑк --Comment[vi]=ÄÄ©a siêu video CD - Comment[zh_CN]=超级 VCD - Comment[zh_TW]=超級視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/vcd.desktop kioslave/media/mimetypes/vcd.desktop ---- kioslave/media/mimetypes/vcd.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/vcd.desktop Fri Mar 17 11:17:34 2006 -@@ -18,7 +18,6 @@ - Comment[is]=VÃdeó CD - Comment[ja]=ビデオ CD - Comment[km]=ស៊ីឌី​វីដáŸáž¢áž¼ --Comment[mk]=Видео ЦД - Comment[ms]=CD Video - Comment[nds]=Video-CD - Comment[nl]=Video-cd -@@ -37,7 +36,6 @@ - Comment[tr]=Vidyo CD - Comment[uk]=Видео КД - Comment[uz]=Видео компакт-диÑк --Comment[vi]=ÄÄ©a video CD - Comment[zh_CN]=VCD - Comment[zh_TW]=視訊 CD - Icon=cdrom_unmount -diff -urN kioslave/media/mimetypes/zip_mounted.desktop kioslave/media/mimetypes/zip_mounted.desktop ---- kioslave/media/mimetypes/zip_mounted.desktop Tue May 23 13:33:35 2006 -+++ kioslave/media/mimetypes/zip_mounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,7 +29,7 @@ - Comment[gl]=Disco Zip Montado - Comment[he]=תקליטון Zip מחובר - Comment[hi]=माउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Pristupljeni Zip disk -+Comment[hr]=Montirani Zip disk - Comment[hu]=Csatlakoztatott Zip-lemez - Comment[is]=Tengdur Zip diskur - Comment[it]=Disco Zip montato -@@ -38,7 +38,6 @@ - Comment[lo]=ຈà»àºžàº²àºš - Comment[lt]=Sumontuotas Zip diskas - Comment[lv]=PiemontÄ“ts Zip disks --Comment[mk]=Монтиран Зип-диÑк - Comment[mn]=ЗалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Terlekap - Comment[mt]=Diska Zip immuntata -@@ -68,7 +67,6 @@ - Comment[uk]=Змонтований диÑк Zip - Comment[uz]=Уланган ZIP-диÑк - Comment[ven]=Disk ya Zip yo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã kết nối - Comment[wa]=Plakete ZIP montêye - Comment[xh]=Diski Yoqokelelo ndawonye Kwediski - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mimetypes/zip_unmounted.desktop kioslave/media/mimetypes/zip_unmounted.desktop ---- kioslave/media/mimetypes/zip_unmounted.desktop Sat Jul 22 10:15:45 2006 -+++ kioslave/media/mimetypes/zip_unmounted.desktop Fri Mar 17 11:17:34 2006 -@@ -29,16 +29,16 @@ - Comment[gl]=Disco Zip non Montado - Comment[he]=תקליטון Zip ×ž× ×•×ª×§ - Comment[hi]=अनमाउनà¥à¤Ÿà¥‡à¤¡ जिप डिसà¥à¤• --Comment[hr]=Nepristupljeni Zip disk -+Comment[hr]=Nemontirani Zip disk - Comment[hu]=Leválasztott Zip-lemez - Comment[is]=Aftengdur Zip diskur - Comment[it]=Disco Zip non montato --Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„ Zip ディスク -+Comment[ja]=マウントã•ã‚Œã¦ã„ãªã„Zipディスク - Comment[km]=ážáž¶ážŸ Zip មិន​បាន​រៀបចំ - Comment[lo]= ຫັງàºàº²àº¥àºµ - Comment[lt]=IÅ¡montuotas Zip diskas - Comment[lv]=NomontÄ“ts Zip disks --Comment[mk]=Одмонтиран Зип-диÑк -+Comment[mk]=Одмонтиран Зип диÑк - Comment[mn]=СалгагдÑан Zip-ДиÑк - Comment[ms]=Cakera Zip Nyahlekap - Comment[mt]=Diska Zip mhux immuntata -@@ -68,7 +68,6 @@ - Comment[uk]=Демонтований диÑк Zip - Comment[uz]=Уланмаган ZIP-диÑк - Comment[ven]=Disk ya Zip i songo gonyiswaho --Comment[vi]=ÄÄ©a ZIP đã gỡ ra - Comment[wa]=Plakete ZIP dismontêye - Comment[xh]=Diski Yoqokelelo ndawone Enganyuswanga - Comment[zh_CN]=挂载的 Zip ç£ç›˜ -diff -urN kioslave/media/mounthelper/Makefile.in kioslave/media/mounthelper/Makefile.in ---- kioslave/media/mounthelper/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/mounthelper/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -57,8 +57,8 @@ - #>+ 1 - kio_media_mounthelper_OBJECTS = kio_media_mounthelper.$(OBJEXT) - am__DEPENDENCIES_1 = --kio_media_mounthelper_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) -+kio_media_mounthelper_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -+ ../libmediacommon/libmediacommon.la - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles -@@ -236,6 +236,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -@@ -575,7 +576,7 @@ - AM_LDFLAGS = $(all_libraries) - kio_media_mounthelper_SOURCES = kio_media_mounthelper.cpp - kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) --kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) -+kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la - #>- METASOURCES = AUTO - #>- all: all-am - #>+ 1 -diff -urN kioslave/media/mounthelper/kio_media_mounthelper.cpp kioslave/media/mounthelper/kio_media_mounthelper.cpp ---- kioslave/media/mounthelper/kio_media_mounthelper.cpp Sat Jul 22 10:15:42 2006 -+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp Fri Mar 17 11:17:33 2006 -@@ -27,7 +27,6 @@ - #include <dcopclient.h> - #include <dcopref.h> - #include <qtimer.h> --#include <stdlib.h> - #include <kdebug.h> - #include <kglobal.h> - #include <kprocess.h> -@@ -79,30 +78,31 @@ - - if (args->isSet("u")) - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "unmount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- kdDebug() << "medium unmount " << m_errorStr << endl; -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - else if (args->isSet("s") || args->isSet("e")) - { -- invokeEject(device, true); -+ if (medium.isMounted()) -+ { -+ KIO::Job * job = KIO::unmount( mount_point ); -+ -+ m_device = device; -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResultSafe( KIO::Job * ) ) ); -+ } -+ else -+ { -+ invokeEject(device, true); -+ } - } - else - { -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mount", medium.id()); -- if (reply.isValid()) -- reply.get(m_errorStr); -- if (m_errorStr.isNull()) -- ::exit(0); -- else -- error(); -+ KIO::Job* job = KIO::mount( false, 0, device, mount_point); -+ connect( job, SIGNAL( result( KIO::Job * ) ), -+ this, SLOT( slotResult( KIO::Job * ) ) ); - } - } - -@@ -173,12 +173,12 @@ - void MountHelper::error() - { - KMessageBox::error(0, m_errorStr); -- ::exit(1); -+ kapp->exit(1); - } - - void MountHelper::finished() - { -- ::exit(0); -+ kapp->quit(); - } - - static KCmdLineOptions options[] = -@@ -207,7 +207,7 @@ - - KStartupInfo::appStarted(); - app->dcopClient()->attach(); -- return app->exec(); -+ app->exec(); - } - - #include "kio_media_mounthelper.moc" -diff -urN kioslave/media/propsdlgplugin/Makefile.in kioslave/media/propsdlgplugin/Makefile.in ---- kioslave/media/propsdlgplugin/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/propsdlgplugin/Makefile.in Thu Jan 1 01:00:00 1970 -@@ -1,1063 +0,0 @@ --# Makefile.in generated by automake 1.9.6 from Makefile.am. --# KDE tags expanded automatically by am_edit - $Revision: 483858 $ --# @configure_input@ -- --# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2005 Free Software Foundation, Inc. --# This Makefile.in is free software; the Free Software Foundation --# gives unlimited permission to copy and/or distribute it, --# with or without modifications, as long as this notice is preserved. -- --# This program is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY, to the extent permitted by law; without --# even the implied warranty of MERCHANTABILITY or FITNESS FOR A --# PARTICULAR PURPOSE. -- --@SET_MAKE@ -- -- --srcdir = @srcdir@ --top_srcdir = @top_srcdir@ --VPATH = @srcdir@ --pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ --pkgincludedir = $(includedir)/@PACKAGE@ --top_builddir = ../../.. --am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd --INSTALL = @INSTALL@ --install_sh_DATA = $(install_sh) -c -m 644 --install_sh_PROGRAM = $(install_sh) -c --install_sh_SCRIPT = $(install_sh) -c --INSTALL_HEADER = $(INSTALL_DATA) --transform = $(program_transform_name) --NORMAL_INSTALL = : --PRE_INSTALL = : --POST_INSTALL = : --NORMAL_UNINSTALL = : --PRE_UNINSTALL = : --POST_UNINSTALL = : --build_triplet = @build@ --host_triplet = @host@ --target_triplet = @target@ --subdir = kioslave/media/propsdlgplugin --DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in --ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 --am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ -- $(top_srcdir)/configure.in --am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -- $(ACLOCAL_M4) --mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs --CONFIG_HEADER = $(top_builddir)/config.h --CONFIG_CLEAN_FILES = --am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; --am__vpath_adj = case $$p in \ -- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ -- *) f=$$p;; \ -- esac; --am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; --am__installdirs = "$(DESTDIR)$(kde_moduledir)" \ -- "$(DESTDIR)$(kde_servicesdir)" --kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) --LTLIBRARIES = $(kde_module_LTLIBRARIES) --am__DEPENDENCIES_1 = --media_propsdlgplugin_la_DEPENDENCIES = \ -- ../libmediacommon/libmediacommon.la $(am__DEPENDENCIES_1) --am_media_propsdlgplugin_la_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo --#>- media_propsdlgplugin_la_OBJECTS = \ --#>- $(am_media_propsdlgplugin_la_OBJECTS) --#>+ 5 --media_propsdlgplugin_la_final_OBJECTS = media_propsdlgplugin_la.all_cpp.lo --media_propsdlgplugin_la_nofinal_OBJECTS = propertiespage.lo \ -- propsdlgshareplugin.lo propertiespagegui.lo --@KDE_USE_FINAL_FALSE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_nofinal_OBJECTS) --@KDE_USE_FINAL_TRUE@media_propsdlgplugin_la_OBJECTS = $(media_propsdlgplugin_la_final_OBJECTS) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) --depcomp = $(SHELL) $(top_srcdir)/admin/depcomp --am__depfiles_maybe = depfiles --#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ --#>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 2 --CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --#>- LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ --#>- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ --#>- $(AM_CXXFLAGS) $(CXXFLAGS) --#>+ 3 --LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ -- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ -- $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) --CXXLD = $(CXX) --#>- CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ --#>- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --#>+ 2 --CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ -- $(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ --SOURCES = $(media_propsdlgplugin_la_SOURCES) --DIST_SOURCES = $(media_propsdlgplugin_la_SOURCES) --kde_servicesDATA_INSTALL = $(INSTALL_DATA) --DATA = $(kde_services_DATA) --ETAGS = etags --CTAGS = ctags --#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) --#>+ 1 --DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) --ACLOCAL = @ACLOCAL@ --AMDEP_FALSE = @AMDEP_FALSE@ --AMDEP_TRUE = @AMDEP_TRUE@ --AMTAR = @AMTAR@ --AR = @AR@ --ARTSCCONFIG = @ARTSCCONFIG@ --ARTS_CFLAGS = @ARTS_CFLAGS@ --AUTOCONF = @AUTOCONF@ --AUTODIRS = @AUTODIRS@ --AUTOHEADER = @AUTOHEADER@ --AUTOMAKE = @AUTOMAKE@ --AWK = @AWK@ --CC = @CC@ --CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ --COMPILE_GL_INFO_FALSE = @COMPILE_GL_INFO_FALSE@ --COMPILE_GL_INFO_TRUE = @COMPILE_GL_INFO_TRUE@ --CONF_FILES = @CONF_FILES@ --CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ --CYGPATH_W = @CYGPATH_W@ --DBUSQT_INCS = @DBUSQT_INCS@ --DBUSQT_LIBS = @DBUSQT_LIBS@ --DBUS_CFLAGS = @DBUS_CFLAGS@ --DBUS_INCS = @DBUS_INCS@ --DBUS_LIBS = @DBUS_LIBS@ --DCOPIDL = @DCOPIDL@ --DCOPIDL2CPP = @DCOPIDL2CPP@ --DCOPIDLNG = @DCOPIDLNG@ --DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@ --DEFS = @DEFS@ --DEPDIR = @DEPDIR@ --DOXYGEN = @DOXYGEN@ --DOXYGEN_PROJECT_NAME = @DOXYGEN_PROJECT_NAME@ --DOXYGEN_PROJECT_NUMBER = @DOXYGEN_PROJECT_NUMBER@ --DPMSINC = @DPMSINC@ --DPMSLIB = @DPMSLIB@ --ECHO = @ECHO@ --ECHO_C = @ECHO_C@ --ECHO_N = @ECHO_N@ --ECHO_T = @ECHO_T@ --EGREP = @EGREP@ --ENABLE_PERMISSIVE_FLAG = @ENABLE_PERMISSIVE_FLAG@ --EXEEXT = @EXEEXT@ --EXR_FLAGS = @EXR_FLAGS@ --F77 = @F77@ --FFLAGS = @FFLAGS@ --FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@ --GLINC = @GLINC@ --GLLIB = @GLLIB@ --GMSGFMT = @GMSGFMT@ --HALBACKEND = @HALBACKEND@ --HAL_CFLAGS = @HAL_CFLAGS@ --HAL_INCS = @HAL_INCS@ --HAL_LIBS = @HAL_LIBS@ --HAVE_DNSSD_FALSE = @HAVE_DNSSD_FALSE@ --HAVE_DNSSD_TRUE = @HAVE_DNSSD_TRUE@ --HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@ --INSTALL_DATA = @INSTALL_DATA@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ --INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ --JAR = @JAR@ --JAVAC = @JAVAC@ --JAVAH = @JAVAH@ --JVMLIBS = @JVMLIBS@ --KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@ --KCHECKPASS_PAM_SERVICE = @KCHECKPASS_PAM_SERVICE@ --KCONFIG_COMPILER = @KCONFIG_COMPILER@ --KDECONFIG = @KDECONFIG@ --KDE_BINDIR = @KDE_BINDIR@ --KDE_CHECK_PLUGIN = @KDE_CHECK_PLUGIN@ --KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@ --KDE_HAS_DOXYGEN = @KDE_HAS_DOXYGEN@ --KDE_HAVE_DOT = @KDE_HAVE_DOT@ --KDE_INCLUDES = @KDE_INCLUDES@ --KDE_LDFLAGS = @KDE_LDFLAGS@ --KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@ --KDE_MT_LIBS = @KDE_MT_LIBS@ --KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@ --KDE_PLUGIN = @KDE_PLUGIN@ --KDE_RPATH = @KDE_RPATH@ --KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@ --KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@ --KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@ --KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@ --KDE_USE_FPIE = @KDE_USE_FPIE@ --KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@ --KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@ --KDE_USE_PIE = @KDE_USE_PIE@ --KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@ --KDM_PAM_SERVICE = @KDM_PAM_SERVICE@ --KHOTKEYS_ARTS_SUBDIR = @KHOTKEYS_ARTS_SUBDIR@ --KRB4_INCS = @KRB4_INCS@ --KRB4_LIBS = @KRB4_LIBS@ --KRB4_RPATH = @KRB4_RPATH@ --KRB5_INCS = @KRB5_INCS@ --KRB5_LIBS = @KRB5_LIBS@ --KRB5_RPATH = @KRB5_RPATH@ --KSCREENSAVER_PAM_SERVICE = @KSCREENSAVER_PAM_SERVICE@ --LDAP_INCS = @LDAP_INCS@ --LDAP_LIBS = @LDAP_LIBS@ --LDAP_RPATH = @LDAP_RPATH@ --LDFLAGS = @LDFLAGS@ --LDFLAGS_AS_NEEDED = @LDFLAGS_AS_NEEDED@ --LDFLAGS_NEW_DTAGS = @LDFLAGS_NEW_DTAGS@ --LIBALIB = @LIBALIB@ --LIBART_CFLAGS = @LIBART_CFLAGS@ --LIBART_LIBS = @LIBART_LIBS@ --LIBART_RPATH = @LIBART_RPATH@ --LIBBZ2 = @LIBBZ2@ --LIBCFG = @LIBCFG@ --LIBCOMPAT = @LIBCOMPAT@ --LIBCRYPT = @LIBCRYPT@ --LIBCURSES = @LIBCURSES@ --LIBDEVINFO = @LIBDEVINFO@ --LIBDL = @LIBDL@ --LIBFONTCONFIG_CFLAGS = @LIBFONTCONFIG_CFLAGS@ --LIBFONTCONFIG_LIBS = @LIBFONTCONFIG_LIBS@ --LIBFONTCONFIG_RPATH = @LIBFONTCONFIG_RPATH@ --LIBFREETYPE_CFLAGS = @LIBFREETYPE_CFLAGS@ --LIBFREETYPE_LIBS = @LIBFREETYPE_LIBS@ --LIBFREETYPE_RPATH = @LIBFREETYPE_RPATH@ --LIBGEN = @LIBGEN@ --LIBHOSTS = @LIBHOSTS@ --LIBJPEG = @LIBJPEG@ --LIBKSTAT = @LIBKSTAT@ --LIBMALLOC = @LIBMALLOC@ --LIBOBJS = @LIBOBJS@ --LIBODM = @LIBODM@ --LIBOSSAUDIO = @LIBOSSAUDIO@ --LIBPNG = @LIBPNG@ --LIBPOSIX4 = @LIBPOSIX4@ --LIBPTHREAD = @LIBPTHREAD@ --LIBRESOLV = @LIBRESOLV@ --LIBRPC = @LIBRPC@ --LIBS = @LIBS@ --LIBSENSORS = @LIBSENSORS@ --LIBSHADOW = @LIBSHADOW@ --LIBSM = @LIBSM@ --LIBSOCKET = @LIBSOCKET@ --LIBSSL = @LIBSSL@ --LIBTOOL = @LIBTOOL@ --LIBUCB = @LIBUCB@ --LIBUSBCONFIG = @LIBUSBCONFIG@ --LIBUTIL = @LIBUTIL@ --LIBXDMCP = @LIBXDMCP@ --LIBXFT_LIB = @LIBXFT_LIB@ --LIBZ = @LIBZ@ --LIB_ARTS = @LIB_ARTS@ --LIB_DNSSD = @LIB_DNSSD@ --LIB_EXR = @LIB_EXR@ --LIB_FONT_ENC = @LIB_FONT_ENC@ --LIB_KAB = @LIB_KAB@ --LIB_KABC = @LIB_KABC@ --LIB_KDECORE = @LIB_KDECORE@ --LIB_KDED = @LIB_KDED@ --LIB_KDEPIM = @LIB_KDEPIM@ --LIB_KDEPRINT = @LIB_KDEPRINT@ --LIB_KDEUI = @LIB_KDEUI@ --LIB_KDNSSD = @LIB_KDNSSD@ --LIB_KFILE = @LIB_KFILE@ --LIB_KFM = @LIB_KFM@ --LIB_KHTML = @LIB_KHTML@ --LIB_KIMPROXY = @LIB_KIMPROXY@ --LIB_KIO = @LIB_KIO@ --LIB_KJS = @LIB_KJS@ --LIB_KNEWSTUFF = @LIB_KNEWSTUFF@ --LIB_KPARTS = @LIB_KPARTS@ --LIB_KSPELL = @LIB_KSPELL@ --LIB_KSYCOCA = @LIB_KSYCOCA@ --LIB_KUNITTEST = @LIB_KUNITTEST@ --LIB_KUTILS = @LIB_KUTILS@ --LIB_KVM = @LIB_KVM@ --LIB_LBER = @LIB_LBER@ --LIB_LIBS = @LIB_LIBS@ --LIB_POLL = @LIB_POLL@ --LIB_QPE = @LIB_QPE@ --LIB_QT = @LIB_QT@ --LIB_SMB = @LIB_SMB@ --LIB_TRU64_MACH = @LIB_TRU64_MACH@ --LIB_X11 = @LIB_X11@ --LIB_XCOMPOSITE = @LIB_XCOMPOSITE@ --LIB_XCURSOR = @LIB_XCURSOR@ --LIB_XEXT = @LIB_XEXT@ --LIB_XF86MISC = @LIB_XF86MISC@ --LIB_XFIXES = @LIB_XFIXES@ --LIB_XINERAMA = @LIB_XINERAMA@ --LIB_XRANDR = @LIB_XRANDR@ --LIB_XRENDER = @LIB_XRENDER@ --LIB_XSS = @LIB_XSS@ --LINUXCDPOLLING = @LINUXCDPOLLING@ --LN_S = @LN_S@ --LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ --MAKEKDEWIDGETS = @MAKEKDEWIDGETS@ --MCOPIDL = @MCOPIDL@ --MD5SUM = @MD5SUM@ --MD5SUM_CUT = @MD5SUM_CUT@ --MEINPROC = @MEINPROC@ --MOC = @MOC@ --MSGFMT = @MSGFMT@ --NOOPT_CFLAGS = @NOOPT_CFLAGS@ --NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@ --OBJEXT = @OBJEXT@ --PACKAGE = @PACKAGE@ --PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ --PACKAGE_NAME = @PACKAGE_NAME@ --PACKAGE_STRING = @PACKAGE_STRING@ --PACKAGE_TARNAME = @PACKAGE_TARNAME@ --PACKAGE_VERSION = @PACKAGE_VERSION@ --PAMLIBS = @PAMLIBS@ --PASSWDLIBS = @PASSWDLIBS@ --PATH_SEPARATOR = @PATH_SEPARATOR@ --PERL = @PERL@ --PKG_CONFIG = @PKG_CONFIG@ --QTDOCDIR = @QTDOCDIR@ --QTE_NORTTI = @QTE_NORTTI@ --QT_INCLUDES = @QT_INCLUDES@ --QT_LDFLAGS = @QT_LDFLAGS@ --RANLIB = @RANLIB@ --RUN_KAPPFINDER = @RUN_KAPPFINDER@ --SASL2_LIBS = @SASL2_LIBS@ --SETUIDFLAGS = @SETUIDFLAGS@ --SET_MAKE = @SET_MAKE@ --SHELL = @SHELL@ --SMBCLIENT_EXTRA_LIBS = @SMBCLIENT_EXTRA_LIBS@ --SSL_INCLUDES = @SSL_INCLUDES@ --SSL_LDFLAGS = @SSL_LDFLAGS@ --STRIP = @STRIP@ --TOPSUBDIRS = @TOPSUBDIRS@ --UIC = @UIC@ --UIC_TR = @UIC_TR@ --UNAME = @UNAME@ --USB_CFLAGS = @USB_CFLAGS@ --USB_LIBS = @USB_LIBS@ --USER_INCLUDES = @USER_INCLUDES@ --USER_LDFLAGS = @USER_LDFLAGS@ --USE_EXCEPTIONS = @USE_EXCEPTIONS@ --USE_RTTI = @USE_RTTI@ --USE_THREADS = @USE_THREADS@ --VERSION = @VERSION@ --WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@ --XGETTEXT = @XGETTEXT@ --XMLLINT = @XMLLINT@ --XTESTLIB = @XTESTLIB@ --X_EXTRA_LIBS = @X_EXTRA_LIBS@ --X_INCLUDES = @X_INCLUDES@ --X_LDFLAGS = @X_LDFLAGS@ --X_PRE_LIBS = @X_PRE_LIBS@ --X_RPATH = @X_RPATH@ --ac_ct_AR = @ac_ct_AR@ --ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ --ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ --all_includes = @all_includes@ --all_libraries = @all_libraries@ --am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ --am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ --am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ --am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ --am__include = @am__include@ --am__leading_dot = @am__leading_dot@ --am__quote = @am__quote@ --am__tar = @am__tar@ --am__untar = @am__untar@ --applnk_SUBDIR_included_FALSE = @applnk_SUBDIR_included_FALSE@ --applnk_SUBDIR_included_TRUE = @applnk_SUBDIR_included_TRUE@ --bindir = @bindir@ --build = @build@ --build_alias = @build_alias@ --build_cpu = @build_cpu@ --build_os = @build_os@ --build_vendor = @build_vendor@ --datadir = @datadir@ --doc_SUBDIR_included_FALSE = @doc_SUBDIR_included_FALSE@ --doc_SUBDIR_included_TRUE = @doc_SUBDIR_included_TRUE@ --drkonqi_SUBDIR_included_FALSE = @drkonqi_SUBDIR_included_FALSE@ --drkonqi_SUBDIR_included_TRUE = @drkonqi_SUBDIR_included_TRUE@ --exec_prefix = @exec_prefix@ --have_xcursor_FALSE = @have_xcursor_FALSE@ --have_xcursor_TRUE = @have_xcursor_TRUE@ --host = @host@ --host_alias = @host_alias@ --host_cpu = @host_cpu@ --host_os = @host_os@ --host_vendor = @host_vendor@ --include_ARTS_FALSE = @include_ARTS_FALSE@ --include_ARTS_TRUE = @include_ARTS_TRUE@ --include_BZIP2_FALSE = @include_BZIP2_FALSE@ --include_BZIP2_TRUE = @include_BZIP2_TRUE@ --include_EXR_MODULES_FALSE = @include_EXR_MODULES_FALSE@ --include_EXR_MODULES_TRUE = @include_EXR_MODULES_TRUE@ --include_fontinst_tn_FALSE = @include_fontinst_tn_FALSE@ --include_fontinst_tn_TRUE = @include_fontinst_tn_TRUE@ --include_kcontrol_access_FALSE = @include_kcontrol_access_FALSE@ --include_kcontrol_access_TRUE = @include_kcontrol_access_TRUE@ --include_kcontrol_accessibility_FALSE = @include_kcontrol_accessibility_FALSE@ --include_kcontrol_accessibility_TRUE = @include_kcontrol_accessibility_TRUE@ --include_kcontrol_joystick_FALSE = @include_kcontrol_joystick_FALSE@ --include_kcontrol_joystick_TRUE = @include_kcontrol_joystick_TRUE@ --include_kcontrol_kfontinst_FALSE = @include_kcontrol_kfontinst_FALSE@ --include_kcontrol_kfontinst_TRUE = @include_kcontrol_kfontinst_TRUE@ --include_kcontrol_randr_FALSE = @include_kcontrol_randr_FALSE@ --include_kcontrol_randr_TRUE = @include_kcontrol_randr_TRUE@ --include_kcontrol_smartcard_FALSE = @include_kcontrol_smartcard_FALSE@ --include_kcontrol_smartcard_TRUE = @include_kcontrol_smartcard_TRUE@ --include_kcontrol_usbview_FALSE = @include_kcontrol_usbview_FALSE@ --include_kcontrol_usbview_TRUE = @include_kcontrol_usbview_TRUE@ --include_kcontrol_view1394_FALSE = @include_kcontrol_view1394_FALSE@ --include_kcontrol_view1394_TRUE = @include_kcontrol_view1394_TRUE@ --include_kioslave_ldap_FALSE = @include_kioslave_ldap_FALSE@ --include_kioslave_ldap_TRUE = @include_kioslave_ldap_TRUE@ --include_kioslave_smb_FALSE = @include_kioslave_smb_FALSE@ --include_kioslave_smb_TRUE = @include_kioslave_smb_TRUE@ --include_kompmgr_FALSE = @include_kompmgr_FALSE@ --include_kompmgr_TRUE = @include_kompmgr_TRUE@ --include_ksysguardd_FALSE = @include_ksysguardd_FALSE@ --include_ksysguardd_TRUE = @include_ksysguardd_TRUE@ --include_ksysguardd_freebsd_FALSE = @include_ksysguardd_freebsd_FALSE@ --include_ksysguardd_freebsd_TRUE = @include_ksysguardd_freebsd_TRUE@ --include_ksysguardd_irix_FALSE = @include_ksysguardd_irix_FALSE@ --include_ksysguardd_irix_TRUE = @include_ksysguardd_irix_TRUE@ --include_ksysguardd_linux_FALSE = @include_ksysguardd_linux_FALSE@ --include_ksysguardd_linux_TRUE = @include_ksysguardd_linux_TRUE@ --include_ksysguardd_netbsd_FALSE = @include_ksysguardd_netbsd_FALSE@ --include_ksysguardd_netbsd_TRUE = @include_ksysguardd_netbsd_TRUE@ --include_ksysguardd_openbsd_FALSE = @include_ksysguardd_openbsd_FALSE@ --include_ksysguardd_openbsd_TRUE = @include_ksysguardd_openbsd_TRUE@ --include_ksysguardd_solaris_FALSE = @include_ksysguardd_solaris_FALSE@ --include_ksysguardd_solaris_TRUE = @include_ksysguardd_solaris_TRUE@ --include_ksysguardd_tru64_FALSE = @include_ksysguardd_tru64_FALSE@ --include_ksysguardd_tru64_TRUE = @include_ksysguardd_tru64_TRUE@ --include_media_halbackend_FALSE = @include_media_halbackend_FALSE@ --include_media_halbackend_TRUE = @include_media_halbackend_TRUE@ --include_media_linuxcdpolling_FALSE = @include_media_linuxcdpolling_FALSE@ --include_media_linuxcdpolling_TRUE = @include_media_linuxcdpolling_TRUE@ --include_x11_FALSE = @include_x11_FALSE@ --include_x11_TRUE = @include_x11_TRUE@ --includedir = @includedir@ --infodir = @infodir@ --install_sh = @install_sh@ --install_usbids_FALSE = @install_usbids_FALSE@ --install_usbids_TRUE = @install_usbids_TRUE@ --jni_includes = @jni_includes@ --kappfinder_SUBDIR_included_FALSE = @kappfinder_SUBDIR_included_FALSE@ --kappfinder_SUBDIR_included_TRUE = @kappfinder_SUBDIR_included_TRUE@ --kate_SUBDIR_included_FALSE = @kate_SUBDIR_included_FALSE@ --kate_SUBDIR_included_TRUE = @kate_SUBDIR_included_TRUE@ --kcheckpass_SUBDIR_included_FALSE = @kcheckpass_SUBDIR_included_FALSE@ --kcheckpass_SUBDIR_included_TRUE = @kcheckpass_SUBDIR_included_TRUE@ --kcminit_SUBDIR_included_FALSE = @kcminit_SUBDIR_included_FALSE@ --kcminit_SUBDIR_included_TRUE = @kcminit_SUBDIR_included_TRUE@ --kcontrol_SUBDIR_included_FALSE = @kcontrol_SUBDIR_included_FALSE@ --kcontrol_SUBDIR_included_TRUE = @kcontrol_SUBDIR_included_TRUE@ --kdcop_SUBDIR_included_FALSE = @kdcop_SUBDIR_included_FALSE@ --kdcop_SUBDIR_included_TRUE = @kdcop_SUBDIR_included_TRUE@ --kde_appsdir = @kde_appsdir@ --kde_bindir = @kde_bindir@ --kde_confdir = @kde_confdir@ --kde_datadir = @kde_datadir@ --kde_htmldir = @kde_htmldir@ --kde_icondir = @kde_icondir@ --kde_includes = @kde_includes@ --kde_kcfgdir = @kde_kcfgdir@ --kde_libraries = @kde_libraries@ --kde_libs_htmldir = @kde_libs_htmldir@ --kde_libs_prefix = @kde_libs_prefix@ --kde_locale = @kde_locale@ --kde_mimedir = @kde_mimedir@ --kde_moduledir = @kde_moduledir@ --kde_qtver = @kde_qtver@ --kde_servicesdir = @kde_servicesdir@ --kde_servicetypesdir = @kde_servicetypesdir@ --kde_sounddir = @kde_sounddir@ --kde_styledir = @kde_styledir@ --kde_templatesdir = @kde_templatesdir@ --kde_wallpaperdir = @kde_wallpaperdir@ --kde_widgetdir = @kde_widgetdir@ --kdebugdialog_SUBDIR_included_FALSE = @kdebugdialog_SUBDIR_included_FALSE@ --kdebugdialog_SUBDIR_included_TRUE = @kdebugdialog_SUBDIR_included_TRUE@ --kdeeject_SUBDIR_included_FALSE = @kdeeject_SUBDIR_included_FALSE@ --kdeeject_SUBDIR_included_TRUE = @kdeeject_SUBDIR_included_TRUE@ --kdeinitdir = @kdeinitdir@ --kdepasswd_SUBDIR_included_FALSE = @kdepasswd_SUBDIR_included_FALSE@ --kdepasswd_SUBDIR_included_TRUE = @kdepasswd_SUBDIR_included_TRUE@ --kdeprint_SUBDIR_included_FALSE = @kdeprint_SUBDIR_included_FALSE@ --kdeprint_SUBDIR_included_TRUE = @kdeprint_SUBDIR_included_TRUE@ --kdesktop_SUBDIR_included_FALSE = @kdesktop_SUBDIR_included_FALSE@ --kdesktop_SUBDIR_included_TRUE = @kdesktop_SUBDIR_included_TRUE@ --kdesu_SUBDIR_included_FALSE = @kdesu_SUBDIR_included_FALSE@ --kdesu_SUBDIR_included_TRUE = @kdesu_SUBDIR_included_TRUE@ --kdialog_SUBDIR_included_FALSE = @kdialog_SUBDIR_included_FALSE@ --kdialog_SUBDIR_included_TRUE = @kdialog_SUBDIR_included_TRUE@ --kdm_SUBDIR_included_FALSE = @kdm_SUBDIR_included_FALSE@ --kdm_SUBDIR_included_TRUE = @kdm_SUBDIR_included_TRUE@ --kdmlib_SUBDIR_included_FALSE = @kdmlib_SUBDIR_included_FALSE@ --kdmlib_SUBDIR_included_TRUE = @kdmlib_SUBDIR_included_TRUE@ --kfind_SUBDIR_included_FALSE = @kfind_SUBDIR_included_FALSE@ --kfind_SUBDIR_included_TRUE = @kfind_SUBDIR_included_TRUE@ --khelpcenter_SUBDIR_included_FALSE = @khelpcenter_SUBDIR_included_FALSE@ --khelpcenter_SUBDIR_included_TRUE = @khelpcenter_SUBDIR_included_TRUE@ --khotkeys_SUBDIR_included_FALSE = @khotkeys_SUBDIR_included_FALSE@ --khotkeys_SUBDIR_included_TRUE = @khotkeys_SUBDIR_included_TRUE@ --kicker_SUBDIR_included_FALSE = @kicker_SUBDIR_included_FALSE@ --kicker_SUBDIR_included_TRUE = @kicker_SUBDIR_included_TRUE@ --kioslave_SUBDIR_included_FALSE = @kioslave_SUBDIR_included_FALSE@ --kioslave_SUBDIR_included_TRUE = @kioslave_SUBDIR_included_TRUE@ --klipper_SUBDIR_included_FALSE = @klipper_SUBDIR_included_FALSE@ --klipper_SUBDIR_included_TRUE = @klipper_SUBDIR_included_TRUE@ --kmenuedit_SUBDIR_included_FALSE = @kmenuedit_SUBDIR_included_FALSE@ --kmenuedit_SUBDIR_included_TRUE = @kmenuedit_SUBDIR_included_TRUE@ --knetattach_SUBDIR_included_FALSE = @knetattach_SUBDIR_included_FALSE@ --knetattach_SUBDIR_included_TRUE = @knetattach_SUBDIR_included_TRUE@ --konqueror_SUBDIR_included_FALSE = @konqueror_SUBDIR_included_FALSE@ --konqueror_SUBDIR_included_TRUE = @konqueror_SUBDIR_included_TRUE@ --konsole_SUBDIR_included_FALSE = @konsole_SUBDIR_included_FALSE@ --konsole_SUBDIR_included_TRUE = @konsole_SUBDIR_included_TRUE@ --kpager_SUBDIR_included_FALSE = @kpager_SUBDIR_included_FALSE@ --kpager_SUBDIR_included_TRUE = @kpager_SUBDIR_included_TRUE@ --kpersonalizer_SUBDIR_included_FALSE = @kpersonalizer_SUBDIR_included_FALSE@ --kpersonalizer_SUBDIR_included_TRUE = @kpersonalizer_SUBDIR_included_TRUE@ --kreadconfig_SUBDIR_included_FALSE = @kreadconfig_SUBDIR_included_FALSE@ --kreadconfig_SUBDIR_included_TRUE = @kreadconfig_SUBDIR_included_TRUE@ --kscreensaver_SUBDIR_included_FALSE = @kscreensaver_SUBDIR_included_FALSE@ --kscreensaver_SUBDIR_included_TRUE = @kscreensaver_SUBDIR_included_TRUE@ --ksmserver_SUBDIR_included_FALSE = @ksmserver_SUBDIR_included_FALSE@ --ksmserver_SUBDIR_included_TRUE = @ksmserver_SUBDIR_included_TRUE@ --ksplashml_SUBDIR_included_FALSE = @ksplashml_SUBDIR_included_FALSE@ --ksplashml_SUBDIR_included_TRUE = @ksplashml_SUBDIR_included_TRUE@ --kstart_SUBDIR_included_FALSE = @kstart_SUBDIR_included_FALSE@ --kstart_SUBDIR_included_TRUE = @kstart_SUBDIR_included_TRUE@ --ksysguard_SUBDIR_included_FALSE = @ksysguard_SUBDIR_included_FALSE@ --ksysguard_SUBDIR_included_TRUE = @ksysguard_SUBDIR_included_TRUE@ --ksystraycmd_SUBDIR_included_FALSE = @ksystraycmd_SUBDIR_included_FALSE@ --ksystraycmd_SUBDIR_included_TRUE = @ksystraycmd_SUBDIR_included_TRUE@ --ktip_SUBDIR_included_FALSE = @ktip_SUBDIR_included_FALSE@ --ktip_SUBDIR_included_TRUE = @ktip_SUBDIR_included_TRUE@ --kwin_SUBDIR_included_FALSE = @kwin_SUBDIR_included_FALSE@ --kwin_SUBDIR_included_TRUE = @kwin_SUBDIR_included_TRUE@ --kxkb_SUBDIR_included_FALSE = @kxkb_SUBDIR_included_FALSE@ --kxkb_SUBDIR_included_TRUE = @kxkb_SUBDIR_included_TRUE@ --l10n_SUBDIR_included_FALSE = @l10n_SUBDIR_included_FALSE@ --l10n_SUBDIR_included_TRUE = @l10n_SUBDIR_included_TRUE@ --libdir = @libdir@ --libexecdir = @libexecdir@ --libkonq_SUBDIR_included_FALSE = @libkonq_SUBDIR_included_FALSE@ --libkonq_SUBDIR_included_TRUE = @libkonq_SUBDIR_included_TRUE@ --localstatedir = @localstatedir@ --mandir = @mandir@ --mkdir_p = @mkdir_p@ --nogroup = @nogroup@ --nsplugins_SUBDIR_included_FALSE = @nsplugins_SUBDIR_included_FALSE@ --nsplugins_SUBDIR_included_TRUE = @nsplugins_SUBDIR_included_TRUE@ --oldincludedir = @oldincludedir@ --pics_SUBDIR_included_FALSE = @pics_SUBDIR_included_FALSE@ --pics_SUBDIR_included_TRUE = @pics_SUBDIR_included_TRUE@ --prefix = @prefix@ --program_transform_name = @program_transform_name@ --qt_includes = @qt_includes@ --qt_libraries = @qt_libraries@ --sbindir = @sbindir@ --sharedstatedir = @sharedstatedir@ --supports_i8k_FALSE = @supports_i8k_FALSE@ --supports_i8k_TRUE = @supports_i8k_TRUE@ --sysconfdir = @sysconfdir@ --target = @target@ --target_alias = @target_alias@ --target_cpu = @target_cpu@ --target_os = @target_os@ --target_vendor = @target_vendor@ --unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ --unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --x_includes = @x_includes@ --x_libraries = @x_libraries@ --xdg_appsdir = @xdg_appsdir@ --xdg_directorydir = @xdg_directorydir@ --xdg_menudir = @xdg_menudir@ --#>- METASOURCES = AUTO --kde_module_LTLIBRARIES = media_propsdlgplugin.la --media_propsdlgplugin_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) --media_propsdlgplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) --AM_CPPFLAGS = $(all_includes) --kde_services_DATA = media_propsdlgplugin.desktop --#>- media_propsdlgplugin_la_SOURCES = propertiespage.cpp propertiespagegui.ui propsdlgshareplugin.cpp --#>+ 1 --media_propsdlgplugin_la_SOURCES=propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp --#>- all: all-am --#>+ 1 --all: docs-am all-am -- --.SUFFIXES: --.SUFFIXES: .cpp .lo .o .obj --$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) --#>- @for dep in $?; do \ --#>- case '$(am__configure_deps)' in \ --#>- *$$dep*) \ --#>- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ --#>- && exit 0; \ --#>- exit 1;; \ --#>- esac; \ --#>- done; \ --#>- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ --#>- cd $(top_srcdir) && \ --#>- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile --#>+ 12 -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in --.PRECIOUS: Makefile --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- @case '$?' in \ -- *config.status*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -- *) \ -- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -- esac; -- --$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -- --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh --install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES) -- @$(NORMAL_INSTALL) -- test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)" -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- if test -f $$p; then \ -- f=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \ -- else :; fi; \ -- done -- --uninstall-kde_moduleLTLIBRARIES: -- @$(NORMAL_UNINSTALL) -- @set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- p=$(am__strip_dir) \ -- echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \ -- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \ -- done -- --clean-kde_moduleLTLIBRARIES: -- -test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES) -- @list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \ -- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -- test "$$dir" != "$$p" || dir=.; \ -- echo "rm -f \"$${dir}/so_locations\""; \ -- rm -f "$${dir}/so_locations"; \ -- done --#>- media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --#>+ 2 --@KDE_USE_CLOSURE_TRUE@media_propsdlgplugin.la: media_propsdlgplugin.la.closure $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) --@KDE_USE_CLOSURE_FALSE@media_propsdlgplugin.la: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- $(CXXLINK) -rpath $(kde_moduledir) $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- --mostlyclean-compile: -- -rm -f *.$(OBJEXT) -- --distclean-compile: -- -rm -f *.tab.c -- --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propertiespage.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/propsdlgshareplugin.Plo@am__quote@ -- --.cpp.o: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< -- --.cpp.obj: --@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -- --.cpp.lo: --@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ --@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ --@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< -- --mostlyclean-libtool: -- -rm -f *.lo -- --clean-libtool: -- -rm -rf .libs _libs -- --distclean-libtool: -- -rm -f libtool --uninstall-info-am: --install-kde_servicesDATA: $(kde_services_DATA) -- @$(NORMAL_INSTALL) -- test -z "$(kde_servicesdir)" || $(mkdir_p) "$(DESTDIR)$(kde_servicesdir)" -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f=$(am__strip_dir) \ -- echo " $(kde_servicesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- $(kde_servicesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --uninstall-kde_servicesDATA: -- @$(NORMAL_UNINSTALL) -- @list='$(kde_services_DATA)'; for p in $$list; do \ -- f=$(am__strip_dir) \ -- echo " rm -f '$(DESTDIR)$(kde_servicesdir)/$$f'"; \ -- rm -f "$(DESTDIR)$(kde_servicesdir)/$$f"; \ -- done -- --ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- mkid -fID $$unique --tags: TAGS -- --TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -n "$$unique" || unique=$$empty_fix; \ -- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -- $$tags $$unique; \ -- fi --ctags: CTAGS --CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -- $(TAGS_FILES) $(LISP) -- tags=; \ -- here=`pwd`; \ -- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -- unique=`for i in $$list; do \ -- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -- done | \ -- $(AWK) ' { files[$$0] = 1; } \ -- END { for (i in files) print i; }'`; \ -- test -z "$(CTAGS_ARGS)$$tags$$unique" \ -- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -- $$tags $$unique -- --GTAGS: -- here=`$(am__cd) $(top_builddir) && pwd` \ -- && cd $(top_srcdir) \ -- && gtags -i $(GTAGS_ARGS) $$here -- --distclean-tags: -- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -- --distdir: $(DISTFILES) -- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -- list='$(DISTFILES)'; for file in $$list; do \ -- case $$file in \ -- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -- esac; \ -- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -- if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -- dir="/$$dir"; \ -- $(mkdir_p) "$(distdir)$$dir"; \ -- else \ -- dir=''; \ -- fi; \ -- if test -d $$d/$$file; then \ -- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -- fi; \ -- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -- else \ -- test -f $(distdir)/$$file \ -- || cp -p $$d/$$file $(distdir)/$$file \ -- || exit 1; \ -- fi; \ -- done --check-am: all-am --check: check-am --all-am: Makefile $(LTLIBRARIES) $(DATA) --installdirs: -- for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(kde_servicesdir)"; do \ -- test -z "$$dir" || $(mkdir_p) "$$dir"; \ -- done --install: install-am --install-exec: install-exec-am --install-data: install-data-am --uninstall: uninstall-am -- --install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- --installcheck: installcheck-am --install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -- `test -z '$(STRIP)' || \ -- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install --mostlyclean-generic: -- --clean-generic: -- --distclean-generic: -- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -- --maintainer-clean-generic: -- @echo "This command is intended for maintainers to use" -- @echo "it deletes files that may require special tools to rebuild." --#>- clean: clean-am --#>+ 1 --clean: kde-rpo-clean clean-am -- --#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ --#>- mostlyclean-am --#>+ 2 --clean-am: clean-metasources clean-ui clean-closures clean-bcheck clean-final clean-generic clean-kde_moduleLTLIBRARIES clean-libtool \ -- mostlyclean-am -- --distclean: distclean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --distclean-am: clean-am distclean-compile distclean-generic \ -- distclean-libtool distclean-tags -- --dvi: dvi-am -- --dvi-am: -- --html: html-am -- --info: info-am -- --info-am: -- --#>- install-data-am: install-kde_moduleLTLIBRARIES \ --#>- install-kde_servicesDATA --#>+ 2 --install-data-am: \ -- install-kde_servicesDATA -- --#>- install-exec-am: --#>+ 1 --install-exec-am: install-kde_moduleLTLIBRARIES -- --install-info: install-info-am -- --install-man: -- --installcheck-am: -- --maintainer-clean: maintainer-clean-am -- -rm -rf ./$(DEPDIR) -- -rm -f Makefile --maintainer-clean-am: distclean-am maintainer-clean-generic -- --mostlyclean: mostlyclean-am -- --mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool -- --pdf: pdf-am -- --pdf-am: -- --ps: ps-am -- --ps-am: -- --uninstall-am: uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -- clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \ -- distclean-compile distclean-generic distclean-libtool \ -- distclean-tags distdir dvi dvi-am html html-am info info-am \ -- install install-am install-data install-data-am install-exec \ -- install-exec-am install-info install-info-am \ -- install-kde_moduleLTLIBRARIES install-kde_servicesDATA \ -- install-man install-strip installcheck installcheck-am \ -- installdirs maintainer-clean maintainer-clean-generic \ -- mostlyclean mostlyclean-compile mostlyclean-generic \ -- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ -- uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ -- uninstall-kde_servicesDATA -- --# Tell versions [3.59,3.63) of GNU make to not export all variables. --# Otherwise a system limit (for SysV at least) may be exceeded. --.NOEXPORT: -- --#>+ 8 --media_propsdlgplugin.la.closure: $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_DEPENDENCIES) -- @echo "int main() {return 0;}" > media_propsdlgplugin_la_closure.cpp -- @$(LTCXXCOMPILE) -c media_propsdlgplugin_la_closure.cpp -- $(CXXLINK) media_propsdlgplugin_la_closure.lo $(media_propsdlgplugin_la_LDFLAGS) $(media_propsdlgplugin_la_OBJECTS) $(media_propsdlgplugin_la_LIBADD) $(LIBS) -- @rm -f media_propsdlgplugin_la_closure.* media_propsdlgplugin.la.closure -- @echo "timestamp" > media_propsdlgplugin.la.closure -- -- --#>+ 3 --propsdlgshareplugin.moc: $(srcdir)/propsdlgshareplugin.h -- $(MOC) $(srcdir)/propsdlgshareplugin.h -o propsdlgshareplugin.moc -- --#>+ 2 --mocs: propsdlgshareplugin.moc -- --#>+ 3 --propertiespage.moc: $(srcdir)/propertiespage.h -- $(MOC) $(srcdir)/propertiespage.h -o propertiespage.moc -- --#>+ 2 --mocs: propertiespage.moc -- --#>+ 3 --clean-metasources: -- -rm -f propsdlgshareplugin.moc propertiespage.moc -- --#>+ 2 --KDE_DIST=propertiespagegui.ui Makefile.in propertiespage.h propsdlgshareplugin.h media_propsdlgplugin.desktop propertiespagegui.ui.h Makefile.am -- --#>+ 4 --clean-ui: -- -rm -f \ -- propertiespagegui.cpp propertiespagegui.h propertiespagegui.moc -- --#>+ 3 --clean-closures: -- -rm -f media_propsdlgplugin.la.closure -- --#>+ 2 --docs-am: -- --#>+ 15 --force-reedit: -- @for dep in $?; do \ -- case '$(am__configure_deps)' in \ -- *$$dep*) \ -- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ -- && exit 0; \ -- exit 1;; \ -- esac; \ -- done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile'; \ -- cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign kioslave/media/propsdlgplugin/Makefile -- cd $(top_srcdir) && perl admin/am_edit kioslave/media/propsdlgplugin/Makefile.in -- -- --#>+ 21 --clean-bcheck: -- rm -f *.bchecktest.cc *.bchecktest.cc.class a.out -- --bcheck: bcheck-am -- --bcheck-am: -- @for i in ; do \ -- if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \ -- echo "int main() {return 0;}" > $$i.bchecktest.cc ; \ -- echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \ -- echo "$$i"; \ -- if ! $(CXXCOMPILE) --dump-class-hierarchy -c $$i.bchecktest.cc; then \ -- rm -f $$i.bchecktest.cc; exit 1; \ -- fi ; \ -- echo "" >> $$i.bchecktest.cc.class; \ -- perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \ -- rm -f a.out; \ -- fi ; \ -- done -- -- --#>+ 11 --media_propsdlgplugin_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/propertiespage.cpp $(srcdir)/propsdlgshareplugin.cpp propertiespagegui.cpp propsdlgshareplugin.moc propertiespagegui.moc propertiespage.moc -- @echo 'creating media_propsdlgplugin_la.all_cpp.cpp ...'; \ -- rm -f media_propsdlgplugin_la.all_cpp.files media_propsdlgplugin_la.all_cpp.final; \ -- echo "#define KDE_USE_FINAL 1" >> media_propsdlgplugin_la.all_cpp.final; \ -- for file in propertiespage.cpp propsdlgshareplugin.cpp propertiespagegui.cpp ; do \ -- echo "#include \"$$file\"" >> media_propsdlgplugin_la.all_cpp.files; \ -- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> media_propsdlgplugin_la.all_cpp.final; \ -- done; \ -- cat media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files > media_propsdlgplugin_la.all_cpp.cpp; \ -- rm -f media_propsdlgplugin_la.all_cpp.final media_propsdlgplugin_la.all_cpp.files -- --#>+ 3 --clean-final: -- -rm -f media_propsdlgplugin_la.all_cpp.cpp -- --#>+ 3 --final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" all-am -- --#>+ 3 --final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_final_OBJECTS)" install-am -- --#>+ 3 --no-final: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" all-am -- --#>+ 3 --no-final-install: -- $(MAKE) media_propsdlgplugin_la_OBJECTS="$(media_propsdlgplugin_la_nofinal_OBJECTS)" install-am -- --#>+ 3 --kde-rpo-clean: -- -rm -f *.rpo -- --#>+ 9 --nmcheck: --propsdlgshareplugin.o: propsdlgshareplugin.moc --nmcheck-am: nmcheck --propsdlgshareplugin.lo: propsdlgshareplugin.moc --propertiespage.lo: propertiespage.moc --$(srcdir)/propertiespage.cpp: propertiespagegui.h --$(srcdir)/propsdlgshareplugin.cpp: propertiespagegui.h --propertiespage.o: propertiespage.moc -- --#>+ 15 --propertiespagegui.cpp: $(srcdir)/propertiespagegui.ui propertiespagegui.h propertiespagegui.moc -- rm -f propertiespagegui.cpp -- echo '#include <kdialog.h>' > propertiespagegui.cpp -- echo '#include <klocale.h>' >> propertiespagegui.cpp -- $(UIC) -tr ${UIC_TR} -i propertiespagegui.h $(srcdir)/propertiespagegui.ui > propertiespagegui.cpp.temp ; ret=$$?; \ -- $(PERL) -pe "s,${UIC_TR}( \"\" ),QString::null,g" propertiespagegui.cpp.temp | $(PERL) -pe "s,${UIC_TR}( \"\"\, \"\" ),QString::null,g" | $(PERL) -pe "s,image([0-9][0-9]*)_data,img\$$1_propertiespagegui,g" | $(PERL) -pe "s,: QWizard\(,: KWizard(,g" >> propertiespagegui.cpp ;\ -- rm -f propertiespagegui.cpp.temp ;\ -- if test "$$ret" = 0; then echo '#include "propertiespagegui.moc"' >> propertiespagegui.cpp; else rm -f propertiespagegui.cpp ; exit $$ret ; fi -- --propertiespagegui.h: $(srcdir)/propertiespagegui.ui -- rm -rf propertiespagegui.h; -- $(UIC) $(srcdir)/propertiespagegui.ui | $(PERL) -pi -e "s,public QWizard,public KWizard,g; s,#include <qwizard.h>,#include <kwizard.h>,g" >> propertiespagegui.h ; --propertiespagegui.moc: propertiespagegui.h -- $(MOC) propertiespagegui.h -o propertiespagegui.moc -diff -urN kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop ---- kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/media_propsdlgplugin.desktop Thu Jan 1 01:00:00 1970 -@@ -1,57 +0,0 @@ --[Desktop Entry] --Encoding=UTF-8 --Type=Service --Name=Media Properties Page --Name[ca]=Pà gina de propietats de suport --Name[cs]=Stránka vlastnostà média --Name[da]=Medieegenskabsside --Name[de]=Eigenschaften von Medien --Name[el]=Σελίδα ιδιοτήτων μÎσων --Name[es]=Página de propiedades de medios --Name[et]=Andmekandjate omadused --Name[fi]=Mediaominaisuudet --Name[fr]=Page de propriétés du média --Name[hu]=MédiajellemzÅ‘k lap --Name[is]=Eiginleikar miðils --Name[ja]=メディア属性ページ --Name[km]=ទំពáŸážšâ€‹áž›áž€áŸ’ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž·â€‹áž˜áŸážŒáŸ€ --Name[nds]=Medienegenschappen-Siet --Name[nl]=Pagina met media-eigenschappen --Name[pt]=Página de Propriedades de Suportes FÃsicos --Name[pt_BR]=Página de Propriedades de Suportes FÃsicos --Name[sk]=Strana vlastnostà média --Name[sl]=Stran z lastnostmi nosilca --Name[sr]=Страна Ñа ÑвојÑтвима медијума --Name[sr@Latn]=Strana sa svojstvima medijuma --Name[sv]=Sida för mediaegenskaper --Name[uk]=Сторінка влаÑтивоÑтей ноÑіїв інформації --Name[vi]=Trang tà i sản phÆ°Æ¡ng tiện --Name[zh_TW]=媒體內容é --Comment=Konqueror properties dialog plugin to configure mount behaviour --Comment[ca]=Dià leg de propietats de l'endollable Konqueror per a configurar el comportament de muntatge --Comment[cs]=Dialog nastavenà chovánà pÅ™ipojenà modulu pro Konqueror --Comment[da]=Konqueror plugin med egenskabsdialog til at indstille monteringsopførsel --Comment[de]=Konqueror-Modul zum Einstellen des Verhaltens beim Einbinden --Comment[el]=Î Ïόσθετο διαλόγου ιδιοτήτων του Konqueror για τη ÏÏθμιση της συμπεÏιφοÏάς Ï€ÏοσάÏτησης --Comment[es]=Plugin de diálogo de propiedades de Konqueror para configurar el comportamiento del montaje --Comment[et]=Konquerori seadistustedialoogi plugin andmekandjate ühendamise seadistamiseks --Comment[fi]=Konquerorin ominaisuussovelma, joka tarkkailee liitospisteitä --Comment[fr]=Module de Konqueror pour configurer le comportement du montage --Comment[hu]=Konqueror beállÃtómodul a csatlakoztatási mód megadásához --Comment[is]=Konqueror eiginleikagluggi til að stilla tengihegðun --Comment[ja]=mountã®æŒ™å‹•ã‚’è¨å®šã™ã‚‹ã€Konqueror属性ダイアãƒã‚° プラグイン --Comment[km]=កម្មវិធី​ជំនួយ​ឲ្យ​មាន​ប្រអប់​លក្ážážŽáŸˆážŸáž˜áŸ’áž”ážáŸ’ážáž· Konqueror ដើម្បី​កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ​ឥរិយាបážâ€‹áž˜áŸ‰áŸ„áž“ --Comment[nds]=Egenschappendialoog-Plugin för Konqueror för't Instellen vun't Inhangbedregen --Comment[nl]=Dialoogvenster voor Konqueror om het aankoppelgedrag in te stellen --Comment[pt]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[pt_BR]='Plugin' da janela de propriedades do Konqueror, para configurar o comportamento da montagem --Comment[sk]=Modul Konqueror dialógu vlastnostà pre konfiguráciu správania pripojenia --Comment[sl]=Vstavek za Konqueror s katerim se nastavlja obnaÅ¡anje priklopa medijev --Comment[sr]=Прикључак Ñа ÑвојÑтвима Konqueror-а за подешавање понашања при монтирању --Comment[sr@Latn]=PrikljuÄak sa svojstvima Konqueror-a za podeÅ¡avanje ponaÅ¡anja pri montiranju --Comment[sv]=Konqueror insticksprogram med egenskapsdialogruta för att anpassa monteringsbeteende --Comment[uk]=Втулок вікна влаÑтивоÑтей Konqueror Ð´Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÐµÐ´Ñ–Ð½ÐºÐ¸ Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ --Comment[vi]=bổ sung há»™p thoại tà i sản Konqueror để cấu hình ứng xá» gắn kết --Comment[zh_TW]=Konqueror 內容å°è©±æ¡†å¤–掛程å¼ï¼Œç”¨æ–¼è¨å®šæŽ›è¼‰çš„行為 --X-KDE-Library=media_propsdlgplugin --ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cdwriter_mounted,media/nfs_mounted,media/cdwriter_unmounted,media/nfs_unmounted,media/removable_mounted,media/dvd_mounted,media/removable_unmounted,media/dvd_unmounted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted -diff -urN kioslave/media/propsdlgplugin/propertiespage.cpp kioslave/media/propsdlgplugin/propertiespage.cpp ---- kioslave/media/propsdlgplugin/propertiespage.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.cpp Thu Jan 1 01:00:00 1970 -@@ -1,217 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#include <qcheckbox.h> --#include <qtooltip.h> --#include <qbuttongroup.h> --#include <qlineedit.h> --#include <qfileinfo.h> --#include <qlabel.h> --#include <qregexp.h> --#include <kpushbutton.h> --#include <kmessagebox.h> --#include <klocale.h> --#include <qcombobox.h> --#include <qtimer.h> --#include <kdebug.h> --#include "propertiespage.h" --#include <dcopref.h> -- --// keep in sync with .ui and kded module --const char *short_names[] = {"lower", "win95", "winnt", "mixed", 0 }; --const char *journales[] = {"data", "ordered", "writeback", 0 }; -- --PropertiesPage::PropertiesPage(QWidget* parent, const QString &_id) -- : PropertiesPageGUI(parent), id(_id) --{ -- kdDebug() << "props page " << id << endl; -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "mountoptions", id); -- -- QStringList list; -- -- if (reply.isValid()) -- list = reply; -- -- if (list.size()) { -- kdDebug() << "list " << list << endl; -- -- for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it) -- { -- QString key = (*it).left((*it).find('=')); -- QString value = (*it).mid((*it).find('=') + 1); -- kdDebug() << "key '" << key << "' value '" << value << "'\n"; -- options[key] = value; -- } -- -- if (!options.contains("ro")) -- option_ro->hide(); -- else -- option_ro->setChecked(options["ro"] == "true"); -- connect( option_ro, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("quiet")) -- option_quiet->hide(); -- else -- option_quiet->setChecked(options["quiet"] == "true"); -- connect( option_quiet, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("sync")) -- option_sync->hide(); -- else -- option_sync->setChecked(options["sync"] == "true"); -- connect( option_sync, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("atime")) -- option_atime->hide(); -- else -- option_atime->setChecked(options["atime"] == "true"); -- connect( option_atime, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("flush")) -- option_flush->hide(); -- else -- option_flush->setChecked(options["flush"] == "true"); -- connect( option_flush, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("utf8")) -- option_utf8->hide(); -- else -- option_utf8->setChecked(options["utf8"] == "true"); -- connect( option_utf8, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("uid")) -- option_uid->hide(); -- else -- option_uid->setChecked(options["uid"] == "true"); -- connect( option_uid, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("shortname")) -- { -- option_shortname->hide(); -- text_shortname->hide(); -- } -- else -- { -- for (int index = 0; short_names[index]; ++index) -- if (options["shortname"] == short_names[index]) -- { -- option_shortname->setCurrentItem(index); -- break; -- } -- connect( option_shortname, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- if (!options.contains("journaling")) -- { -- text_journaling->hide(); -- option_journaling->hide(); -- } -- else -- { -- for (int index = 0; journales[index]; ++index) -- if (options["journaling"] == journales[index]) -- { -- option_journaling->setCurrentItem(index); -- break; -- } -- connect( option_journaling, SIGNAL( activated(int) ), SIGNAL( changed() ) ); -- } -- -- label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); -- option_mountpoint->setText(options["mountpoint"]); -- connect( option_mountpoint, SIGNAL( textChanged( const QString &) ), SIGNAL( changed() ) ); -- option_automount->setChecked(options["automount"] == "true"); -- connect( option_automount, SIGNAL( stateChanged(int) ), SIGNAL( changed() ) ); -- -- if (!options.contains("journaling") && -- !options.contains("shortname") && -- !options.contains("uid") && -- !options.contains("utf8") && -- !options.contains("flush")) -- groupbox_specific->hide(); -- -- } else { -- -- groupbox_generic->setEnabled(false); -- groupbox_specific->setEnabled(false); -- label_filesystem->hide(); -- } --} -- --PropertiesPage::~PropertiesPage() --{ --} -- --bool PropertiesPage::save() --{ -- QStringList result; -- -- if (options.contains("ro")) -- result << QString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); -- -- if (options.contains("quiet")) -- result << QString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); -- -- if (options.contains("sync")) -- result << QString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); -- -- if (options.contains("atime")) -- result << QString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); -- -- if (options.contains("flush")) -- result << QString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); -- -- if (options.contains("utf8")) -- result << QString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); -- -- if (options.contains("uid")) -- result << QString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); -- -- if (options.contains("shortname")) -- result << QString("shortname=%1").arg(short_names[option_shortname->currentItem()]); -- -- if (options.contains("journaling")) -- result << QString("journaling=%1").arg(journales[option_journaling->currentItem()]); -- -- QString mp = option_mountpoint->text(); -- if (!mp.startsWith("/media/")) -- { -- KMessageBox::sorry(this, i18n("Mountpoint has to be below /media")); -- return false; -- } -- result << QString("mountpoint=%1").arg(mp); -- result << QString("automount=%1").arg(option_automount->isChecked() ? "true" : "false"); -- -- kdDebug() << result << endl; -- -- DCOPRef mediamanager("kded", "mediamanager"); -- DCOPReply reply = mediamanager.call( "setMountoptions", id, result); -- -- if (reply.isValid()) -- return (bool)reply; -- else { -- KMessageBox::sorry(this, -- i18n("Saving the changes failed")); -- -- return false; -- } --} -- --#include "propertiespage.moc" -diff -urN kioslave/media/propsdlgplugin/propertiespage.h kioslave/media/propsdlgplugin/propertiespage.h ---- kioslave/media/propsdlgplugin/propertiespage.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespage.h Thu Jan 1 01:00:00 1970 -@@ -1,46 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef PROPERTIESPAGE_H --#define PROPERTIESPAGE_H -- --#include "propertiespagegui.h" --#include <qmap.h> -- --class QCheckBox; --class Medium; -- --class PropertiesPage : public PropertiesPageGUI --{ -- Q_OBJECT -- --public: -- PropertiesPage(QWidget* parent, const QString &_id); -- virtual ~PropertiesPage(); -- -- bool save(); -- --protected: -- -- QMap<QString,QString> options; -- QString id; -- --}; -- --#endif -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui kioslave/media/propsdlgplugin/propertiespagegui.ui ---- kioslave/media/propsdlgplugin/propertiespagegui.ui Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui Thu Jan 1 01:00:00 1970 -@@ -1,387 +0,0 @@ --<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> --<class>PropertiesPageGUI</class> --<widget class="QWidget"> -- <property name="name"> -- <cstring>PropertiesPageGUI</cstring> -- </property> -- <property name="geometry"> -- <rect> -- <x>0</x> -- <y>0</y> -- <width>527</width> -- <height>476</height> -- </rect> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <property name="margin"> -- <number>0</number> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout17</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_generic</cstring> -- </property> -- <property name="title"> -- <string>Generic Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout15</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_ro</cstring> -- </property> -- <property name="text"> -- <string>Read only</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount the file system read-only.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_quiet</cstring> -- </property> -- <property name="text"> -- <string>Quiet</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Attempts to chown or chmod files do not return errors, although they fail. Use with caution!</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_sync</cstring> -- </property> -- <property name="text"> -- <string>Synchronous</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>All I/O to the file system should be done synchronously.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_atime</cstring> -- </property> -- <property name="text"> -- <string>Access time updates</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Update inode access time for each access.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>textLabel3</cstring> -- </property> -- <property name="text"> -- <string>Mountpoint:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Under what directory this file system shall be mounted. Please note that there is no guarantee that the system will respect your wish. For one the directory has to be below /media - and it does not yet have to exist.</string> -- </property> -- </widget> -- <widget class="QLineEdit"> -- <property name="name"> -- <cstring>option_mountpoint</cstring> -- </property> -- <property name="text"> -- <string></string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_automount</cstring> -- </property> -- <property name="text"> -- <string>Mount automatically</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system automatically.</string> -- </property> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QGroupBox"> -- <property name="name"> -- <cstring>groupbox_specific</cstring> -- </property> -- <property name="title"> -- <string>Filesystem Specific Mount Options</string> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout11</cstring> -- </property> -- <vbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_flush</cstring> -- </property> -- <property name="text"> -- <string>Flushed IO</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Always flush all data to the hot plug devices immediately and don't cache it.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_utf8</cstring> -- </property> -- <property name="text"> -- <string>UTF-8 charset</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the console. It can be be enabled for the filesystem with this option.</string> -- </property> -- </widget> -- <widget class="QCheckBox"> -- <property name="name"> -- <cstring>option_uid</cstring> -- </property> -- <property name="text"> -- <string>Mount as user</string> -- </property> -- <property name="whatsThis" stdset="0"> -- <string>Mount this file system as user.</string> -- </property> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout7</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_journaling</cstring> -- </property> -- <property name="text"> -- <string>Journaling:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>All Data</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Ordered</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Write Back</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_journaling</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Specifies the journalling mode for file data. Metadata is always journaled. </h2> -- --<h3><b>All Data</b></h3> -- All data is committed into the journal prior to being written into the main file system. This is the slowest variant with the highest data security. -- --<h3><b>Ordered</b></h3> -- All data is forced directly out to the main file system prior to its metadata being committed to the journal. -- --<h3><b>Write Back</b></h3> -- Data ordering is not preserved - data may be written into the main file system after its metadata has been committed to the journal. This is rumoured to be the highest-throughput option. It guarantees internal file system integrity, however it can allow old data to appear in files after a crash and journal recovery.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- <widget class="QLayoutWidget"> -- <property name="name"> -- <cstring>layout14</cstring> -- </property> -- <hbox> -- <property name="name"> -- <cstring>unnamed</cstring> -- </property> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>text_shortname</cstring> -- </property> -- <property name="text"> -- <string>Short names:</string> -- </property> -- <property name="buddy" stdset="0"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- <widget class="QComboBox"> -- <item> -- <property name="text"> -- <string>Lower</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows 95</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Windows NT</string> -- </property> -- </item> -- <item> -- <property name="text"> -- <string>Mixed</string> -- </property> -- </item> -- <property name="name"> -- <cstring>option_shortname</cstring> -- </property> -- <property name="whatsThis" stdset="0"> -- <string><h2>Defines the behaviour for creation and display of filenames which fit into 8.3 characters. If a long name for a file exists, it will always be preferred display.</h2> -- --<h3><b>Lower</b></h3> --Force the short name to lower case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows 95</b></h3> --Force the short name to upper case upon display; store a long name when the short name is not all upper case. -- --<h3><b>Windows NT</b></h3> --Display the shortname as is; store a long name when the short name is not all lower case or all upper case. -- --<h3><b>Mixed</b></h3> --Display the short name as is; store a long name when the short name is not all upper case.</string> -- </property> -- </widget> -- </hbox> -- </widget> -- </vbox> -- </widget> -- </vbox> -- </widget> -- <widget class="QLabel"> -- <property name="name"> -- <cstring>label_filesystem</cstring> -- </property> -- <property name="text"> -- <string>Filesystem: iso9660</string> -- </property> -- </widget> -- <spacer> -- <property name="name"> -- <cstring>spacer1</cstring> -- </property> -- <property name="orientation"> -- <enum>Vertical</enum> -- </property> -- <property name="sizeType"> -- <enum>Expanding</enum> -- </property> -- <property name="sizeHint"> -- <size> -- <width>20</width> -- <height>20</height> -- </size> -- </property> -- </spacer> -- </vbox> -- </widget> -- </hbox> --</widget> --<connections> -- <connection> -- <sender>option_ro</sender> -- <signal>stateChanged(int)</signal> -- <receiver>PropertiesPageGUI</receiver> -- <slot>changedSlot()</slot> -- </connection> --</connections> --<variables> -- <variable>bool m_hasChanged;</variable> --</variables> --<signals> -- <signal>changed()</signal> --</signals> --<slots> -- <slot access="protected">changedSlot()</slot> --</slots> --<functions> -- <function returnType="bool">hasChanged()</function> --</functions> --<layoutdefaults spacing="6" margin="11"/> --</UI> -diff -urN kioslave/media/propsdlgplugin/propertiespagegui.ui.h kioslave/media/propsdlgplugin/propertiespagegui.ui.h ---- kioslave/media/propsdlgplugin/propertiespagegui.ui.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propertiespagegui.ui.h Thu Jan 1 01:00:00 1970 -@@ -1,22 +0,0 @@ --/**************************************************************************** --** ui.h extension file, included from the uic-generated form implementation. --** --** If you wish to add, delete or rename functions or slots use --** Qt Designer which will update this file, preserving your code. Create an --** init() function in place of a constructor, and a destroy() function in --** place of a destructor. --*****************************************************************************/ -- -- --void PropertiesPageGUI::changedSlot() --{ -- m_hasChanged = true; -- emit changed(); --} -- --bool PropertiesPageGUI::hasChanged() --{ -- return m_hasChanged; --} -- -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.cpp Thu Jan 1 01:00:00 1970 -@@ -1,100 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ --#include <qstring.h> --#include <qvbox.h> --#include <qlayout.h> --#include <qlabel.h> --#include <qtimer.h> -- --#include <kgenericfactory.h> --#include <kdebug.h> --#include <kpushbutton.h> --#include <kfileshare.h> --#include <kmessagebox.h> --#include <kprocess.h> --#include <kstandarddirs.h> --#include <kdialog.h> --#include <kglobal.h> --#include <dcopref.h> -- --#include "propertiespage.h" --#include "propsdlgshareplugin.h" --#include "../libmediacommon/medium.h" -- --typedef KGenericFactory<PropsDlgSharePlugin, KPropertiesDialog> PropsDlgSharePluginFactory; -- --K_EXPORT_COMPONENT_FACTORY( media_propsdlgplugin, -- PropsDlgSharePluginFactory("media_propsdlgplugin") ) -- --class PropsDlgSharePlugin::Private --{ -- public: -- PropertiesPage* page; --}; -- --PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, -- const char *, const QStringList & ) -- : KPropsDlgPlugin(dlg), d(0) --{ -- if (properties->items().count() != 1) -- return; -- -- KFileItem *item = properties->items().first(); -- -- DCOPRef mediamanager("kded", "mediamanager"); -- kdDebug() << "properties " << item->url() << endl; -- DCOPReply reply = mediamanager.call( "properties", item->url().url() ); -- -- if ( !reply.isValid() ) -- return; -- -- QVBox* vbox = properties->addVBoxPage(i18n("&Mounting")); -- -- d = new Private(); -- -- d->page = new PropertiesPage(vbox, Medium::create(reply).id()); -- connect(d->page, SIGNAL(changed()), -- SLOT(slotChanged())); -- -- // QTimer::singleShot(100, this, SLOT(slotChanged())); -- --} -- --void PropsDlgSharePlugin::slotChanged() --{ -- kdDebug() << "slotChanged()\n"; -- setDirty(true); --} -- --PropsDlgSharePlugin::~PropsDlgSharePlugin() --{ -- delete d; --} -- --void PropsDlgSharePlugin::applyChanges() --{ -- kdDebug() << "applychanges\n"; -- if (!d->page->save()) { -- properties->abortApplying(); -- } --} -- -- --#include "propsdlgshareplugin.moc" -- -diff -urN kioslave/media/propsdlgplugin/propsdlgshareplugin.h kioslave/media/propsdlgplugin/propsdlgshareplugin.h ---- kioslave/media/propsdlgplugin/propsdlgshareplugin.h Sat Jul 22 10:15:43 2006 -+++ kioslave/media/propsdlgplugin/propsdlgshareplugin.h Thu Jan 1 01:00:00 1970 -@@ -1,44 +0,0 @@ --/* -- Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de> -- -- This program is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- --*/ -- --#ifndef KONQFILESHAREPLUGIN_H --#define KONQFILESHAREPLUGIN_H -- --#include <kpropertiesdialog.h> -- --class PropsDlgSharePlugin : public KPropsDlgPlugin --{ --Q_OBJECT --public: -- PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const QStringList & ); -- virtual ~PropsDlgSharePlugin(); -- virtual void applyChanges(); -- --public slots: -- void slotChanged(); -- --private: -- class Private; -- Private *d; -- --}; -- --#endif -- -- -diff -urN kioslave/media/services/Makefile.in kioslave/media/services/Makefile.in ---- kioslave/media/services/Makefile.in Mon Jul 24 17:56:31 2006 -+++ kioslave/media/services/Makefile.in Mon Mar 20 14:05:55 2006 -@@ -211,6 +211,7 @@ - LIBTOOL = @LIBTOOL@ - LIBUCB = @LIBUCB@ - LIBUSBCONFIG = @LIBUSBCONFIG@ -+LIBUTEMPTER = @LIBUTEMPTER@ - LIBUTIL = @LIBUTIL@ - LIBXDMCP = @LIBXDMCP@ - LIBXFT_LIB = @LIBXFT_LIB@ -diff -urN kioslave/media/services/media_eject.desktop kioslave/media/services/media_eject.desktop ---- kioslave/media/services/media_eject.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_eject.desktop Fri Mar 17 11:17:33 2006 -@@ -74,7 +74,7 @@ - Name[uk]=Виштовхнути - Name[uz]=Чиқариш - Name[ven]=Bvisa --Name[vi]=Äẩy Ä‘Ä©a ra -+Name[vi]=Äẩy ra - Name[wa]=Fé rexhe - Name[xh]=Khuphela ngaphandle - Name[zh_CN]=弹出 -diff -urN kioslave/media/services/media_mount.desktop kioslave/media/services/media_mount.desktop ---- kioslave/media/services/media_mount.desktop Mon May 22 20:12:42 2006 -+++ kioslave/media/services/media_mount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Montar - Name[he]=חבר - Name[hi]=माउनà¥à¤Ÿ --Name[hr]=Pristupi -+Name[hr]=Montiraj - Name[hsb]=montować - Name[hu]=Csatlakoztatás - Name[is]=Tengja -@@ -71,7 +71,7 @@ - Name[uk]=Змонтувати - Name[uz]=Улаш - Name[ven]=Gonya --Name[vi]=Kết nối -+Name[vi]=Gắn kết - Name[wa]=Monter - Name[xh]=Layisha - Name[zh_CN]=挂载 -diff -urN kioslave/media/services/media_safelyremove.desktop kioslave/media/services/media_safelyremove.desktop ---- kioslave/media/services/media_safelyremove.desktop Sat Jul 22 10:15:42 2006 -+++ kioslave/media/services/media_safelyremove.desktop Fri Mar 17 11:17:33 2006 -@@ -9,7 +9,6 @@ - Name[af]=Verwyder veilig - Name[bg]=БезопаÑно изваждане - Name[bn]=নিরাপদà¦à¦¾à¦¬à§‡ সরাও --Name[bs]=Sigurno ukloni - Name[ca]=Extreu amb seguretat - Name[cs]=BezpeÄnÄ› odstranit - Name[da]=Fjern sikkert -@@ -20,18 +19,17 @@ - Name[eu]=Atera arriskurik gabe - Name[fi]=Poista turvallisesti - Name[fr]=Enlever en toute sécurité --Name[fy]=Feilich verwiderje -+Name[fy]=Feilich ferwiderje - Name[ga]=Bain Amach go Sábháilte - Name[gl]=Eliminar de Maneira Segura - Name[he]=שליפה בבטחה --Name[hr]=Slobodno uklonite - Name[hu]=Biztonságos leválasztás - Name[is]=Fjarlægja öruggt - Name[it]=Rimozione sicura - Name[ja]=安全ã«å–り除ã - Name[km]=យកចáŸáž‰â€‹ážŠáŸ„យ​សុវážáŸ’ážáž·áž—ាព - Name[lt]=Saugiai paÅ¡alinti --Name[mk]=Безбедно отÑтрани -+Name[mk]=ОтÑтрани безбедно - Name[ms]=Buang Dengan Selamat - Name[nb]=Sikker fjerning - Name[nds]=Seker rutnehmen -@@ -45,7 +43,6 @@ - Name[ru]=БезопаÑно извлечь - Name[rw]=Gukuramo Neza - Name[se]=DorvvoÅ¡laÅ¡ eretváldin --Name[sk]=BezpeÄne odpojiÅ¥ - Name[sl]=Varno odstrani - Name[sr]=Безбедно уклони - Name[sr@Latn]=Bezbedno ukloni -@@ -56,7 +53,6 @@ - Name[tt]=Ä°min Çığaru - Name[uk]=Безпечно вилучити - Name[uz]=Ðҳтиётлик билан узиш --Name[vi]=Gỡ ra An toà n - Name[zh_CN]=å®‰å…¨åˆ é™¤ - Name[zh_TW]=安全的移除 - Exec=kio_media_mounthelper -s %u -diff -urN kioslave/media/services/media_unmount.desktop kioslave/media/services/media_unmount.desktop ---- kioslave/media/services/media_unmount.desktop Tue May 23 13:33:34 2006 -+++ kioslave/media/services/media_unmount.desktop Fri Mar 17 11:17:33 2006 -@@ -31,7 +31,7 @@ - Name[gl]=Desmontar - Name[he]=× ×ª×§ - Name[hi]=अनमाउनà¥à¤Ÿ --Name[hr]=Napusti -+Name[hr]=Demontiraj - Name[hsb]=Wotmontować - Name[hu]=Leválasztás - Name[is]=Aftengja -@@ -41,7 +41,7 @@ - Name[lo]=ຫັງàºàº²àº¥àºµ - Name[lt]=IÅ¡montuoti - Name[lv]=NomontÄ“t --Name[mk]=Одмонтирај -+Name[mk]=Демонтирај - Name[mn]=Салгах - Name[ms]=Nyahlekap - Name[mt]=Å»monta -@@ -71,7 +71,7 @@ - Name[uk]=Демонтувати - Name[uz]=Узиш - Name[ven]=Usa gonya --Name[vi]=Gỡ ra -+Name[vi]=Gỡ - Name[wa]=Dismonter - Name[xh]=Sukuyilayisha - Name[zh_CN]=å¸è½½ diff --git a/x11/kdebase4/files/patch-konsole_konsole-TECommon.h b/x11/kdebase4/files/patch-konsole_konsole-TECommon.h deleted file mode 100644 index a3d83a525c02..000000000000 --- a/x11/kdebase4/files/patch-konsole_konsole-TECommon.h +++ /dev/null @@ -1,13 +0,0 @@ ---- konsole/konsole/TECommon.h.orig Mon Sep 18 03:31:12 2006 -+++ konsole/konsole/TECommon.h Mon Sep 18 03:31:31 2006 -@@ -219,8 +219,8 @@ - - inline bool ca::isBold(const ColorEntry* base) const - { -- return (b.t == CO_DFT) && base[b.u+0+(b.v?BASE_COLORS:0)].bold -- || (b.t == CO_SYS) && base[b.u+2+(b.v?BASE_COLORS:0)].bold; -+ return (f.t == CO_DFT) && base[f.u+0+(f.v?BASE_COLORS:0)].bold -+ || (f.t == CO_SYS) && base[f.u+2+(f.v?BASE_COLORS:0)].bold; - } - - #endif // TECOMMON_H diff --git a/x11/kdebase4/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4/files/patch-ksystraycmd-quoting.diff deleted file mode 100644 index 8543f7254a95..000000000000 --- a/x11/kdebase4/files/patch-ksystraycmd-quoting.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- ksystraycmd/main.cpp (revision 572102) -+++ ksystraycmd/main.cpp (revision 572103) -@@ -5,6 +5,7 @@ - #include <kcmdlineargs.h> - #include <kdebug.h> - #include <klocale.h> -+#include <kprocess.h> - - #include "ksystraycmd.h" - -@@ -94,7 +95,7 @@ int main( int argc, char *argv[] ) - // Read the command - QString command; - for ( int i = 0; i < args->count(); i++ ) -- command += QCString( args->arg(i) ) + " "; -+ command += KProcess::quote(QString::fromLocal8Bit( args->arg(i) )) + " "; - if ( !command.isEmpty() ) - cmd.setCommand( command ); - diff --git a/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp index 904ef5903342..e81392e29477 100644 --- a/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp +++ b/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp @@ -1,11 +1,12 @@ --- nsplugins/pluginscan.cpp.orig Sat Mar 13 21:07:58 2004 +++ nsplugins/pluginscan.cpp Sat Mar 13 21:08:50 2004 -@@ -457,6 +457,8 @@ +@@ -457,6 +457,9 @@ paths.append("/usr/lib64/netscape/plugins"); paths.append("/usr/lib64/mozilla/plugins"); paths.append("$MOZILLA_HOME/plugins"); + paths.append("/usr/local/lib/linux-flashplugin6"); + paths.append("/usr/X11R6/lib/linux-flashplugin6"); ++ paths.append("/usr/local/lib/npapi/linux-flashplugin/"); config->writeEntry( "scanPaths", paths ); } diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index 6b3e02f57d98..46ca7f96cbe8 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -710,6 +710,9 @@ lib/kde3/lockout_panelapplet.so lib/kde3/media_panelapplet.a lib/kde3/media_panelapplet.la lib/kde3/media_panelapplet.so +%%MEDIA%%lib/kde3/media_propsdlgplugin.a +%%MEDIA%%lib/kde3/media_propsdlgplugin.la +%%MEDIA%%lib/kde3/media_propsdlgplugin.so lib/kde3/menu_panelapplet.a lib/kde3/menu_panelapplet.la lib/kde3/menu_panelapplet.so @@ -1933,6 +1936,7 @@ share/apps/konsole/vim.schema share/apps/konsole/vt100.keytab share/apps/konsole/vt420pc.keytab share/apps/konsole/wallpapers/Blkmarble.jpg +share/apps/konsole/wallpapers/Metric-Monospace-14.png share/apps/konsole/wallpapers/Paper01.jpg share/apps/konsole/wallpapers/gray02.jpg share/apps/konsole/x11r5.keytab @@ -4117,6 +4121,7 @@ share/services/localdomainurifilter.desktop share/services/mac.protocol share/services/man.protocol share/services/media.protocol +%%MEDIA%%share/services/media_propsdlgplugin.desktop share/services/nfs.protocol share/services/nntp.protocol share/services/nntps.protocol diff --git a/x11/kdelibs3-nocups/Makefile b/x11/kdelibs3-nocups/Makefile index d6e373162c29..30e1c98bac39 100644 --- a/x11/kdelibs3-nocups/Makefile +++ b/x11/kdelibs3-nocups/Makefile @@ -5,7 +5,6 @@ # $FreeBSD$ PORTNAME?= kdelibs3 -PORTREVISION= 5 PKGNAMESUFFIX?= -nocups MAINTAINER= kde@FreeBSD.org diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist index 05d8a0539556..7b3cca85a878 100644 --- a/x11/kdelibs3-nocups/pkg-plist +++ b/x11/kdelibs3-nocups/pkg-plist @@ -56,6 +56,7 @@ bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc bin/preparetips +bin/start_kdeinit etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index e005048593a6..af363daed050 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION?= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -67,6 +66,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" @@ -88,6 +88,11 @@ pre-configure: ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in + ${REINPLACE_CMD} -e "s,/etc/exports,/nonexistent,g" \ + -e "s,/etc/samba/,${LOCALBASE}/etc/,g" \ + -e "s,/etc/security/,${LOCALBASE}/etc/,g" \ + -e "s,'fileshare','network',g" \ + ${WRKSRC}/kio/misc/fileshareset ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 2097cf54e7e3..85c7caa7ecab 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.4.tar.bz2) = 979d056ca0e21c12caed270126e60e3e -SHA256 (KDE/kdelibs-3.5.4.tar.bz2) = 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e -SIZE (KDE/kdelibs-3.5.4.tar.bz2) = 15450025 +MD5 (KDE/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117 +SHA256 (KDE/kdelibs-3.5.5.tar.bz2) = e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 +SIZE (KDE/kdelibs-3.5.5.tar.bz2) = 15486690 diff --git a/x11/kdelibs3/files/patch-configure b/x11/kdelibs3/files/patch-configure deleted file mode 100644 index daa62d1877ab..000000000000 --- a/x11/kdelibs3/files/patch-configure +++ /dev/null @@ -1,702 +0,0 @@ ---- configure.orig Tue May 23 23:15:11 2006 -+++ configure Sat May 27 14:25:02 2006 -@@ -21855,10 +21855,10 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -+LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent' - - # Prevent multiple expansion - -@@ -42536,521 +42536,6 @@ - - - -- HAVE_LUA="" -- -- --# Check whether --with-lua-dir or --without-lua-dir was given. --if test "${with_lua_dir+set}" = set; then -- withval="$with_lua_dir" -- -- LUA="$withval" -- LUA_INCLUDES=-I"$withval"/include -- LUA_LIBS="-L$withval/lib" --fi; -- -- --# Check whether --with-lua-includes or --without-lua-includes was given. --if test "${with_lua_includes+set}" = set; then -- withval="$with_lua_includes" -- LUA_INCLUDES="-I$withval" --fi; -- -- --# Check whether --with-lua-libraries or --without-lua-libraries was given. --if test "${with_lua_libraries+set}" = set; then -- withval="$with_lua_libraries" -- -- LUA_LIBS="-L$withval" --fi; -- -- -- if ! test "x$LUA" = "x"; then -- echo "$as_me:$LINENO: result: using Lua from $LUA" >&5 --echo "${ECHO_T}using Lua from $LUA" >&6 -- fi -- if ! test "x$LUA_LIBS" = "x"; then -- echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5 --echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6 -- fi -- if ! test "x$LUA_INCLUDES" = "x"; then -- echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5 --echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6 -- fi -- -- ac_save_CFLAGS="$CFLAGS" -- ac_save_CPPFLAGS="$CPPFLAGS" -- ac_save_LDFLAGS="$LDFLAGS" -- CFLAGS="$LUA_INCLUDES $CFLAGS" -- CPPFLAGS="$LUA_INCLUDES $CPPFLAGS" -- LDFLAGS="$LUA_LIBS $LDFLAGS" -- -- LUAH_FOUND="" -- if test "${ac_cv_header_lua_h+set}" = set; then -- echo "$as_me:$LINENO: checking for lua.h" >&5 --echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 --if test "${ac_cv_header_lua_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 --echo "${ECHO_T}$ac_cv_header_lua_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking lua.h usability" >&5 --echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <lua.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking lua.h presence" >&5 --echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <lua.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for lua.h" >&5 --echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 --if test "${ac_cv_header_lua_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_lua_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 --echo "${ECHO_T}$ac_cv_header_lua_h" >&6 -- --fi --if test $ac_cv_header_lua_h = yes; then -- LUAH_FOUND="true" --else -- echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5 --echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6 -- --fi -- -- -- LUALIBH_FOUND="" -- if test "${ac_cv_header_lualib_h+set}" = set; then -- echo "$as_me:$LINENO: checking for lualib.h" >&5 --echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 --if test "${ac_cv_header_lualib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 --echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking lualib.h usability" >&5 --echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <lualib.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking lualib.h presence" >&5 --echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <lualib.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: lualib.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for lualib.h" >&5 --echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 --if test "${ac_cv_header_lualib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_lualib_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 --echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 -- --fi --if test $ac_cv_header_lualib_h = yes; then -- LUALIBH_FOUND="true" --else -- echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5 --echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6 -- --fi -- -- -- -- -- if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then -- LUA_LIBS="" -- else -- echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5 --echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6 --if test "${ac_cv_lib_lua50_lua_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-llua50 $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char lua_version (); --int --main () --{ --lua_version (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_lua50_lua_version=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_lua50_lua_version=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_lua50_lua_version" >&5 --echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6 --if test $ac_cv_lib_lua50_lua_version = yes; then -- LUA_LIBS="$LUA_LIBS -llua50 -llualib50" --else -- echo "$as_me:$LINENO: checking for lua_version in -llua" >&5 --echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6 --if test "${ac_cv_lib_lua_lua_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-llua $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char lua_version (); --int --main () --{ --lua_version (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_lua_lua_version=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_lua_lua_version=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_lua_lua_version" >&5 --echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6 --if test $ac_cv_lib_lua_lua_version = yes; then -- LUA_LIBS="$LUA_LIBS -llua -llualib" --else -- LUA_LIBS="" -- echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5 --echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6 -- --fi -- -- --fi -- -- fi -- CFLAGS="$ac_save_CFLAGS" -- CPPFLAGS="$ac_save_CPPFLAGS" -- LDFLAGS="$ac_save_LDFLAGS" -- -- -- if test -z "$LUA_LIBS"; then -- LUA="" -- LUA_INCLUDES="" -- LUA_LIBS="" -- else -- --cat >>confdefs.h <<_ACEOF --#define HAVE_LUA 1 --_ACEOF -- -- HAVE_LUA="yes" -- fi -- -- -- -- -- -- -- - cat >>confdefs.h <<_ACEOF - #define __KDE_EXECPREFIX "$exec_prefix" - _ACEOF -@@ -46439,7 +45924,7 @@ - - echo "$as_me:$LINENO: checking installation of PS driver needed" >&5 - echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6 --ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups" -+ac_cups_share_test=`$kde_cups_config --datadir` - cups_modeldir="" - for d in $ac_cups_share_test; do - if test -d $d && test -d $d/model; then -@@ -48102,155 +47587,6 @@ - ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - -- --for ac_header in valgrind/memcheck.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done - - CPPFLAGS=$kde_safe_cppflags - ac_ext=c diff --git a/x11/kdelibs3/files/patch-cups-1.2.x-sockets b/x11/kdelibs3/files/patch-cups-1.2.x-sockets index be679ae693e6..ae126ad441f6 100644 --- a/x11/kdelibs3/files/patch-cups-1.2.x-sockets +++ b/x11/kdelibs3/files/patch-cups-1.2.x-sockets @@ -1,251 +1,248 @@ ---- kdeprint/cups/Makefile.in Tue Sep 26 17:18:13 2006 -+++ kdeprint/cups/Makefile.in Tue Sep 26 17:19:12 2006 -@@ -110,7 +110,7 @@ - make_driver_db_cups_DEPENDENCIES = ../libdriverparse.a \ - $(top_builddir)/kdecore/libkdefakes.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kdecore/network -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ---- kdeprint/cups/cupsinfos.cpp 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsinfos.cpp 2006/09/20 15:33:24 586778 -@@ -69,6 +69,13 @@ - { +--- kdeprint/cups/ipprequest.cpp ++++ kdeprint/cups/ipprequest.cpp +@@ -329,6 +329,10 @@ + dumpRequest(request_, true); + } + ++ /* No printers found */ ++ if ( request_ && request_->request.status.status_code == 0x406 ) ++ return true; ++ + if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) + return false; + +--- kdeprint/cups/kmcupsmanager.cpp ++++ kdeprint/cups/kmcupsmanager.cpp +@@ -61,7 +61,7 @@ + #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) + + void extractMaticData(QString& buf, const QString& filename); +-QString printerURI(KMPrinter *p, bool useExistingURI = false); ++QString printerURI(KMPrinter *p, bool useExistingURI); + QString downloadDriver(KMPrinter *p); + + static int trials = 5; +@@ -218,7 +218,7 @@ + QString uri; + + req.setOperation(state); +- uri = printerURI(p); ++ uri = printerURI(p, true); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + if (req.doRequest("/admin/")) + return true; +--- kdeprint/cups/cupsinfos.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/cupsinfos.cpp 2006-10-26 21:29:07.000000000 +0300 +@@ -21,6 +21,7 @@ + #include "kmfactory.h" + #include "kmtimer.h" + #include "messagewindow.h" ++#include "ipprequest.h" + + #include <kio/passdlg.h> + #include <kio/authinfo.h> +@@ -76,6 +77,11 @@ + return host_; } -+QString CupsInfos::hostaddr() const ++QString CupsInfos::ippAssembleURI(const QString& resource) const +{ -+ if (host_[0] != '/') -+ return host_ + ":" + port_; -+ return host_; ++ return IppRequest::assembleURI(host(), port(), resource); +} + void CupsInfos::setHost(const QString& s) { host_ = s; ---- kdeprint/cups/kmcupsmanager.cpp 2005/11/28 03:56:46 483752 -+++ kdeprint/cups/kmcupsmanager.cpp 2006/09/20 15:38:41 586782 -@@ -45,12 +45,14 @@ - #include <klocale.h> - #include <kconfig.h> - #include <kstandarddirs.h> -+#include <ksocketbase.h> - #include <klibloader.h> - #include <kmessagebox.h> - #include <kaction.h> - #include <kdialogbase.h> - #include <kextendedsocket.h> - #include <kprocess.h> -+#include <kbufferedsocket.h> - #include <kfilterdev.h> - #include <cups/cups.h> - #include <cups/ppd.h> -@@ -88,7 +90,7 @@ - - KMCupsManager::~KMCupsManager() - { -- //delete m_socket; -+ delete m_socket; +--- kdeprint/cups/cupsinfos.h 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/cupsinfos.h 2006-10-26 21:26:26.000000000 +0300 +@@ -34,6 +34,7 @@ + const QString& host() const; + QString hostaddr() const; + int port() const; ++ QString ippAssembleURI(const QString& resource) const; + const QString& login() const; + const QString& password() const; + const QString& realLogin() const; +--- kdeprint/cups/ipprequest.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/ipprequest.cpp 2006-10-26 21:33:09.000000000 +0300 +@@ -529,4 +529,48 @@ + attr = attr->next; + } + #endif ++ ++ } ++ ++ ++QString IppRequest::assembleURI(const QString& host, int port, const QString& resource) ++{ ++ const char* hostname; ++ ++ // Replace UNIX socket address with "localhost". ipp URI specification ++ // does not allow UNIX socket addresses in the host portion ++ if (host[0] == '/' || host.isEmpty()) { ++ hostname = "localhost"; ++ port = 0; ++ } else { ++ hostname = host.local8Bit(); ++ } ++ ++ if (port < 0) ++ return QString::null; ++ ++#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 ++ QCString uri(HTTP_MAX_URI); ++ ++ // Use URI assembling function provided by CUPS ++ if (httpAssembleURI(HTTP_URI_CODING_ALL, uri.data(), uri.size(), ++ "ipp", NULL, hostname, port, resource.local8Bit()) == HTTP_URI_OK) ++ return QString(uri); ++ else ++ return QString::null; ++ ++#else ++ // Use our own URI assembling function ++ if (port > 0) ++ return QString("ipp://%1:%2%3") ++ .arg(hostname) ++ .arg(port) ++ .arg(KURL::encode_string(resource)); ++ else ++ return QString("ipp://%1%2") ++ .arg(hostname) ++ .arg(KURL::encode_string(resource)); ++#endif ++} ++ +--- kdeprint/cups/ipprequest.h 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/ipprequest.h 2006-10-26 21:24:41.000000000 +0300 +@@ -86,6 +86,9 @@ + // debug function + void dump(int state); + ++ // URI assembling function [static] ++ static QString assembleURI(const QString& host, int port, const QString& resource); ++ + protected: + void addString_p(int group, int type, const QString& name, const QString& value); + void addStringList_p(int group, int type, const QString& name, const QStringList& values); +--- kdeprint/cups/kmcupsjobmanager.cpp 2006-10-26 21:45:23.000000000 +0300 ++++ kdeprint/cups/kmcupsjobmanager.cpp 2006-10-27 01:33:12.000000000 +0300 +@@ -92,7 +92,7 @@ + case KMJob::Move: + if (argstr.isEmpty()) return false; + req.setOperation(CUPS_MOVE_JOB); +- uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr); ++ uri = CupsInfos::self()->ippAssembleURI(QString("/printers/%1").arg(argstr)); + req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); + break; + default: +@@ -109,7 +109,6 @@ + bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) + { + IppRequest req; +- QString uri("ipp://%1:%2/%3/%4"); + QStringList keys; + CupsInfos *infos = CupsInfos::self(); - QString KMCupsManager::driverDbCreationProgram() -@@ -135,7 +137,8 @@ - { +@@ -143,7 +142,8 @@ + */ + } + else +- req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)); ++ req.addURI(IPP_TAG_OPERATION, "printer-uri", ++ infos->ippAssembleURI(QString("/%1/%2").arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname))); + + // other attributes + req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); +--- kdeprint/cups/kmcupsmanager.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmcupsmanager.cpp 2006-10-26 21:31:12.000000000 +0300 +@@ -138,7 +138,7 @@ req.setOperation(CUPS_ADD_CLASS); QStringList members = p->members(), uris; -- QString s = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ QString s; -+ s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + QString s; +- s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); ++ s = CupsInfos::self()->ippAssembleURI("/printers/"); for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) uris.append(s+(*it)); req.addURI(IPP_TAG_PRINTER,"member-uris",uris); -@@ -907,25 +910,23 @@ - - QString KMCupsManager::stateInformation() - { -- return QString("%1: %2:%3") -+ return QString("%1: %2") - .arg(i18n("Server")) -- .arg(CupsInfos::self()->host()) -- .arg(CupsInfos::self()->port()); -+ .arg(CupsInfos::self()->hostaddr()); - } - - void KMCupsManager::checkUpdatePossibleInternal() - { - kdDebug(500) << "Checking for update possible" << endl; - delete m_socket; -- /*m_socket = new KExtendedSocket( CupsInfos::self()->host(), CupsInfos::self()->port() ); -- connect( m_socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) ); -- connect( m_socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) ); -- m_socket->setTimeout( 1 );*/ -- m_socket = new QSocket( this ); -- connect( m_socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) ); -- connect( m_socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) ); -- trials = 5; -- QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) ); -+ m_socket = new KNetwork::KBufferedSocket; -+ m_socket->setTimeout( 1 ); -+ connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), -+ SLOT( slotConnectionSuccess() ) ); -+ connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) ); -+ -+ trials = 5; -+ QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) ); - } - - void KMCupsManager::slotConnectionSuccess() -@@ -959,7 +960,10 @@ - { - kdDebug(500) << "Starting async connect" << endl; - //m_socket->startAsyncConnect(); -- m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() ); -+ if (CupsInfos::self()->host().startsWith("/")) -+ m_socket->connect( QString(), CupsInfos::self()->host()); -+ else -+ m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() ); - } - - void KMCupsManager::slotConnectionFailed( int errcode ) -@@ -975,9 +979,25 @@ - return; - } - -- setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. " -- "Error: %1." ).arg( errcode == QSocket::ErrConnectionRefused ? i18n( "connection refused" ) : i18n( "host not found" ) ) ); -- setUpdatePossible( false ); -+ QString einfo; -+ -+ switch (errcode) { -+ case KNetwork::KSocketBase::ConnectionRefused: -+ case KNetwork::KSocketBase::ConnectionTimedOut: -+ einfo = i18n("connection refused") + QString(" (%1)").arg(errcode); -+ break; -+ case KNetwork::KSocketBase::LookupFailure: -+ einfo = i18n("host not found") + QString(" (%1)").arg(errcode); -+ break; -+ case KNetwork::KSocketBase::WouldBlock: -+ default: -+ einfo = i18n("read failed (%1)").arg(errcode); -+ break; -+ } -+ -+ setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. " -+ "Error: %2: %1." ).arg( einfo, CupsInfos::self()->host())); -+ setUpdatePossible( false ); - } - - void KMCupsManager::hostPingSlot() { -@@ -1014,7 +1034,7 @@ +@@ -1024,7 +1024,7 @@ if (use && !p->uri().isEmpty()) uri = p->uri().prettyURL(); else -- uri = QString("ipp://%1:%2/%4/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); -+ uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); +- uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); ++ uri = CupsInfos::self()->ippAssembleURI(QString("/%2/%1").arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"))); return uri; } ---- kdeprint/cups/kmcupsuimanager.cpp 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/kmcupsuimanager.cpp 2006/09/20 15:38:41 586782 +--- kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 21:34:02.000000000 +0300 @@ -135,7 +135,7 @@ QString uri; req.setOperation(CUPS_GET_DEVICES); -- uri = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); +- uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); ++ uri = CupsInfos::self()->ippAssembleURI("/printers/"); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) ---- kdeprint/cups/cupsinfos.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsinfos.h 2006/09/20 15:33:24 586778 -@@ -32,6 +32,7 @@ - ~CupsInfos(); - - const QString& host() const; -+ QString hostaddr() const; - int port() const; - const QString& login() const; - const QString& password() const; ---- kdeprint/cups/kmcupsmanager.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/kmcupsmanager.h 2006/09/20 15:38:41 586782 -@@ -25,7 +25,10 @@ - class IppRequest; - class KLibrary; - class KExtendedSocket; --class QSocket; -+ -+namespace KNetwork { -+ class KStreamSocket; -+} - - class KMCupsManager : public KMManager - { -@@ -95,7 +98,7 @@ - private: - KLibrary *m_cupsdconf; - KMPrinter *m_currentprinter; -- QSocket *m_socket; -+ KNetwork::KStreamSocket *m_socket; - bool m_hostSuccess; - bool m_lookupDone; - }; ---- kdeprint/cups/cupsdconf2/cups-util.c 2005/11/30 19:59:17 484443 -+++ kdeprint/cups/cupsdconf2/cups-util.c 2006/09/20 15:22:50 586776 -@@ -14,7 +14,7 @@ - static int cups_local_auth(http_t *http); - - const char * /* O - Filename for PPD file */ --cupsGetConf() -+cupsGetConf(void) +--- kdeprint/cups/kmwfax.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwfax.cpp 2006-10-26 21:34:54.000000000 +0300 +@@ -48,7 +48,7 @@ + // initialize + IppRequest req; + req.setOperation(CUPS_GET_DEVICES); +- QString uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); ++ QString uri = CupsInfos::self()->ippAssembleURI("/printers/"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + if (req.doRequest("/")) + { +--- kdeprint/cups/kmwippprinter.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwippprinter.cpp 2006-10-26 21:41:20.000000000 +0300 +@@ -157,7 +157,7 @@ + req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); + req.setHost(item->text(1)); + req.setPort(item->text(2).toInt()); +- uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); ++ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + keys.append("printer-name"); + keys.append("printer-state"); +@@ -176,7 +176,7 @@ + if (req.uri("printer-uri-supported",value)) + { + if (value[0] == '/') +- value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); ++ value = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), value); + m_uri->setText(value); + } + if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); +@@ -203,7 +203,7 @@ + void KMWIppPrinter::slotIppReport() { - int fd; /* PPD file */ - int bytes; /* Number of bytes read */ -@@ -142,7 +142,11 @@ - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); -- httpEncode64(encode, plain); -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); -+#else -+ httpEncode64(encode, plain); -+#endif - snprintf(authstring, sizeof(authstring), "Basic %s", encode); - } - else -@@ -364,7 +368,11 @@ - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); -- httpEncode64(encode, plain); -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); -+#else -+ httpEncode64(encode, plain); -+#endif - snprintf(authstring, sizeof(authstring), "Basic %s", encode); - } - else -@@ -443,8 +451,7 @@ - the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) - */ - #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -- if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 && -- strcasecmp(http->hostname, "localhost") != 0) -+ if (!httpAddrLocalhost(http)) - #else - if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && - strcasecmp(http->hostname, "localhost") != 0) ---- kdeprint/cups/cupsdconf2/cups-util.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsdconf2/cups-util.h 2006/09/20 15:22:50 586776 -@@ -20,7 +20,7 @@ - #ifndef CUPS_UTIL_H - #define CUPS_UTIL_H - --const char* cupsGetConf(); -+const char* cupsGetConf(void); - int cupsPutConf(const char *filename); - - #endif + IppRequest req; +- QString uri("ipp://%1:%2/ipp"); ++ QString uri; + QListViewItem *item = m_list->currentItem(); + + if (item) +@@ -211,7 +211,7 @@ + req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); + req.setHost(item->text(1)); + req.setPort(item->text(2).toInt()); +- uri = uri.arg(item->text(1)).arg(item->text(2)); ++ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); + req.addURI(IPP_TAG_OPERATION, "printer-uri", uri); + if (req.doRequest("/ipp/")) + { +--- kdeprint/cups/kmwippselect.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwippselect.cpp 2006-10-26 21:32:34.000000000 +0300 +@@ -75,7 +75,7 @@ + IppRequest req; + QString uri; + req.setOperation(CUPS_GET_PRINTERS); +- uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port()); ++ uri = IppRequest::assembleURI(url.host(), url.port(), "/printers/"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); + if (req.doRequest("/printers/")) diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index bfad1b9ed1a6..eb29486ed87e 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -59,6 +59,7 @@ bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc bin/preparetips +bin/start_kdeinit etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index e005048593a6..af363daed050 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdelibs PORTVERSION= ${KDE_VERSION} -PORTREVISION?= 4 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -67,6 +66,7 @@ CONFIGURE_ARGS+=--disable-ltdl-install \ --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \ --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \ --with-libthai=yes \ + --with-lua=no \ --with-ssl-dir=${OPENSSLBASE} CONFIGURE_ENV+= libltdl_cv_shlibext=".so" @@ -88,6 +88,11 @@ pre-configure: ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in + ${REINPLACE_CMD} -e "s,/etc/exports,/nonexistent,g" \ + -e "s,/etc/samba/,${LOCALBASE}/etc/,g" \ + -e "s,/etc/security/,${LOCALBASE}/etc/,g" \ + -e "s,'fileshare','network',g" \ + ${WRKSRC}/kio/misc/fileshareset ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 2097cf54e7e3..85c7caa7ecab 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.4.tar.bz2) = 979d056ca0e21c12caed270126e60e3e -SHA256 (KDE/kdelibs-3.5.4.tar.bz2) = 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e -SIZE (KDE/kdelibs-3.5.4.tar.bz2) = 15450025 +MD5 (KDE/kdelibs-3.5.5.tar.bz2) = 2cba792e3b0a766431b837c8ef924117 +SHA256 (KDE/kdelibs-3.5.5.tar.bz2) = e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 +SIZE (KDE/kdelibs-3.5.5.tar.bz2) = 15486690 diff --git a/x11/kdelibs4/files/patch-configure b/x11/kdelibs4/files/patch-configure deleted file mode 100644 index daa62d1877ab..000000000000 --- a/x11/kdelibs4/files/patch-configure +++ /dev/null @@ -1,702 +0,0 @@ ---- configure.orig Tue May 23 23:15:11 2006 -+++ configure Sat May 27 14:25:02 2006 -@@ -21855,10 +21855,10 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh" - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent' -+LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent' - - # Prevent multiple expansion - -@@ -42536,521 +42536,6 @@ - - - -- HAVE_LUA="" -- -- --# Check whether --with-lua-dir or --without-lua-dir was given. --if test "${with_lua_dir+set}" = set; then -- withval="$with_lua_dir" -- -- LUA="$withval" -- LUA_INCLUDES=-I"$withval"/include -- LUA_LIBS="-L$withval/lib" --fi; -- -- --# Check whether --with-lua-includes or --without-lua-includes was given. --if test "${with_lua_includes+set}" = set; then -- withval="$with_lua_includes" -- LUA_INCLUDES="-I$withval" --fi; -- -- --# Check whether --with-lua-libraries or --without-lua-libraries was given. --if test "${with_lua_libraries+set}" = set; then -- withval="$with_lua_libraries" -- -- LUA_LIBS="-L$withval" --fi; -- -- -- if ! test "x$LUA" = "x"; then -- echo "$as_me:$LINENO: result: using Lua from $LUA" >&5 --echo "${ECHO_T}using Lua from $LUA" >&6 -- fi -- if ! test "x$LUA_LIBS" = "x"; then -- echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5 --echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6 -- fi -- if ! test "x$LUA_INCLUDES" = "x"; then -- echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5 --echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6 -- fi -- -- ac_save_CFLAGS="$CFLAGS" -- ac_save_CPPFLAGS="$CPPFLAGS" -- ac_save_LDFLAGS="$LDFLAGS" -- CFLAGS="$LUA_INCLUDES $CFLAGS" -- CPPFLAGS="$LUA_INCLUDES $CPPFLAGS" -- LDFLAGS="$LUA_LIBS $LDFLAGS" -- -- LUAH_FOUND="" -- if test "${ac_cv_header_lua_h+set}" = set; then -- echo "$as_me:$LINENO: checking for lua.h" >&5 --echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 --if test "${ac_cv_header_lua_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 --echo "${ECHO_T}$ac_cv_header_lua_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking lua.h usability" >&5 --echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <lua.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking lua.h presence" >&5 --echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <lua.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for lua.h" >&5 --echo $ECHO_N "checking for lua.h... $ECHO_C" >&6 --if test "${ac_cv_header_lua_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_lua_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5 --echo "${ECHO_T}$ac_cv_header_lua_h" >&6 -- --fi --if test $ac_cv_header_lua_h = yes; then -- LUAH_FOUND="true" --else -- echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5 --echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6 -- --fi -- -- -- LUALIBH_FOUND="" -- if test "${ac_cv_header_lualib_h+set}" = set; then -- echo "$as_me:$LINENO: checking for lualib.h" >&5 --echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 --if test "${ac_cv_header_lualib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 --echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking lualib.h usability" >&5 --echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <lualib.h> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking lualib.h presence" >&5 --echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <lualib.h> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5 --echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: lualib.h: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for lualib.h" >&5 --echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6 --if test "${ac_cv_header_lualib_h+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_header_lualib_h=$ac_header_preproc --fi --echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5 --echo "${ECHO_T}$ac_cv_header_lualib_h" >&6 -- --fi --if test $ac_cv_header_lualib_h = yes; then -- LUALIBH_FOUND="true" --else -- echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5 --echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6 -- --fi -- -- -- -- -- if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then -- LUA_LIBS="" -- else -- echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5 --echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6 --if test "${ac_cv_lib_lua50_lua_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-llua50 $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char lua_version (); --int --main () --{ --lua_version (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_lua50_lua_version=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_lua50_lua_version=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_lua50_lua_version" >&5 --echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6 --if test $ac_cv_lib_lua50_lua_version = yes; then -- LUA_LIBS="$LUA_LIBS -llua50 -llualib50" --else -- echo "$as_me:$LINENO: checking for lua_version in -llua" >&5 --echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6 --if test "${ac_cv_lib_lua_lua_version+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-llua $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char lua_version (); --int --main () --{ --lua_version (); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_lua_lua_version=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_lua_lua_version=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_lua_lua_version" >&5 --echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6 --if test $ac_cv_lib_lua_lua_version = yes; then -- LUA_LIBS="$LUA_LIBS -llua -llualib" --else -- LUA_LIBS="" -- echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5 --echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6 -- --fi -- -- --fi -- -- fi -- CFLAGS="$ac_save_CFLAGS" -- CPPFLAGS="$ac_save_CPPFLAGS" -- LDFLAGS="$ac_save_LDFLAGS" -- -- -- if test -z "$LUA_LIBS"; then -- LUA="" -- LUA_INCLUDES="" -- LUA_LIBS="" -- else -- --cat >>confdefs.h <<_ACEOF --#define HAVE_LUA 1 --_ACEOF -- -- HAVE_LUA="yes" -- fi -- -- -- -- -- -- -- - cat >>confdefs.h <<_ACEOF - #define __KDE_EXECPREFIX "$exec_prefix" - _ACEOF -@@ -46439,7 +45924,7 @@ - - echo "$as_me:$LINENO: checking installation of PS driver needed" >&5 - echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6 --ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups" -+ac_cups_share_test=`$kde_cups_config --datadir` - cups_modeldir="" - for d in $ac_cups_share_test; do - if test -d $d && test -d $d/model; then -@@ -48102,155 +47587,6 @@ - ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' - - -- --for ac_header in valgrind/memcheck.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_cxx_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_cxx_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -- cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 --_ACEOF -- --fi -- --done - - CPPFLAGS=$kde_safe_cppflags - ac_ext=c diff --git a/x11/kdelibs4/files/patch-cups-1.2.x-sockets b/x11/kdelibs4/files/patch-cups-1.2.x-sockets index be679ae693e6..ae126ad441f6 100644 --- a/x11/kdelibs4/files/patch-cups-1.2.x-sockets +++ b/x11/kdelibs4/files/patch-cups-1.2.x-sockets @@ -1,251 +1,248 @@ ---- kdeprint/cups/Makefile.in Tue Sep 26 17:18:13 2006 -+++ kdeprint/cups/Makefile.in Tue Sep 26 17:19:12 2006 -@@ -110,7 +110,7 @@ - make_driver_db_cups_DEPENDENCIES = ../libdriverparse.a \ - $(top_builddir)/kdecore/libkdefakes.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kdecore/network -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ ---- kdeprint/cups/cupsinfos.cpp 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsinfos.cpp 2006/09/20 15:33:24 586778 -@@ -69,6 +69,13 @@ - { +--- kdeprint/cups/ipprequest.cpp ++++ kdeprint/cups/ipprequest.cpp +@@ -329,6 +329,10 @@ + dumpRequest(request_, true); + } + ++ /* No printers found */ ++ if ( request_ && request_->request.status.status_code == 0x406 ) ++ return true; ++ + if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00)) + return false; + +--- kdeprint/cups/kmcupsmanager.cpp ++++ kdeprint/cups/kmcupsmanager.cpp +@@ -61,7 +61,7 @@ + #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) + + void extractMaticData(QString& buf, const QString& filename); +-QString printerURI(KMPrinter *p, bool useExistingURI = false); ++QString printerURI(KMPrinter *p, bool useExistingURI); + QString downloadDriver(KMPrinter *p); + + static int trials = 5; +@@ -218,7 +218,7 @@ + QString uri; + + req.setOperation(state); +- uri = printerURI(p); ++ uri = printerURI(p, true); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + if (req.doRequest("/admin/")) + return true; +--- kdeprint/cups/cupsinfos.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/cupsinfos.cpp 2006-10-26 21:29:07.000000000 +0300 +@@ -21,6 +21,7 @@ + #include "kmfactory.h" + #include "kmtimer.h" + #include "messagewindow.h" ++#include "ipprequest.h" + + #include <kio/passdlg.h> + #include <kio/authinfo.h> +@@ -76,6 +77,11 @@ + return host_; } -+QString CupsInfos::hostaddr() const ++QString CupsInfos::ippAssembleURI(const QString& resource) const +{ -+ if (host_[0] != '/') -+ return host_ + ":" + port_; -+ return host_; ++ return IppRequest::assembleURI(host(), port(), resource); +} + void CupsInfos::setHost(const QString& s) { host_ = s; ---- kdeprint/cups/kmcupsmanager.cpp 2005/11/28 03:56:46 483752 -+++ kdeprint/cups/kmcupsmanager.cpp 2006/09/20 15:38:41 586782 -@@ -45,12 +45,14 @@ - #include <klocale.h> - #include <kconfig.h> - #include <kstandarddirs.h> -+#include <ksocketbase.h> - #include <klibloader.h> - #include <kmessagebox.h> - #include <kaction.h> - #include <kdialogbase.h> - #include <kextendedsocket.h> - #include <kprocess.h> -+#include <kbufferedsocket.h> - #include <kfilterdev.h> - #include <cups/cups.h> - #include <cups/ppd.h> -@@ -88,7 +90,7 @@ - - KMCupsManager::~KMCupsManager() - { -- //delete m_socket; -+ delete m_socket; +--- kdeprint/cups/cupsinfos.h 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/cupsinfos.h 2006-10-26 21:26:26.000000000 +0300 +@@ -34,6 +34,7 @@ + const QString& host() const; + QString hostaddr() const; + int port() const; ++ QString ippAssembleURI(const QString& resource) const; + const QString& login() const; + const QString& password() const; + const QString& realLogin() const; +--- kdeprint/cups/ipprequest.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/ipprequest.cpp 2006-10-26 21:33:09.000000000 +0300 +@@ -529,4 +529,48 @@ + attr = attr->next; + } + #endif ++ ++ } ++ ++ ++QString IppRequest::assembleURI(const QString& host, int port, const QString& resource) ++{ ++ const char* hostname; ++ ++ // Replace UNIX socket address with "localhost". ipp URI specification ++ // does not allow UNIX socket addresses in the host portion ++ if (host[0] == '/' || host.isEmpty()) { ++ hostname = "localhost"; ++ port = 0; ++ } else { ++ hostname = host.local8Bit(); ++ } ++ ++ if (port < 0) ++ return QString::null; ++ ++#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 ++ QCString uri(HTTP_MAX_URI); ++ ++ // Use URI assembling function provided by CUPS ++ if (httpAssembleURI(HTTP_URI_CODING_ALL, uri.data(), uri.size(), ++ "ipp", NULL, hostname, port, resource.local8Bit()) == HTTP_URI_OK) ++ return QString(uri); ++ else ++ return QString::null; ++ ++#else ++ // Use our own URI assembling function ++ if (port > 0) ++ return QString("ipp://%1:%2%3") ++ .arg(hostname) ++ .arg(port) ++ .arg(KURL::encode_string(resource)); ++ else ++ return QString("ipp://%1%2") ++ .arg(hostname) ++ .arg(KURL::encode_string(resource)); ++#endif ++} ++ +--- kdeprint/cups/ipprequest.h 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/ipprequest.h 2006-10-26 21:24:41.000000000 +0300 +@@ -86,6 +86,9 @@ + // debug function + void dump(int state); + ++ // URI assembling function [static] ++ static QString assembleURI(const QString& host, int port, const QString& resource); ++ + protected: + void addString_p(int group, int type, const QString& name, const QString& value); + void addStringList_p(int group, int type, const QString& name, const QStringList& values); +--- kdeprint/cups/kmcupsjobmanager.cpp 2006-10-26 21:45:23.000000000 +0300 ++++ kdeprint/cups/kmcupsjobmanager.cpp 2006-10-27 01:33:12.000000000 +0300 +@@ -92,7 +92,7 @@ + case KMJob::Move: + if (argstr.isEmpty()) return false; + req.setOperation(CUPS_MOVE_JOB); +- uri = QString::fromLatin1("ipp://%1:%2/printers/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(argstr); ++ uri = CupsInfos::self()->ippAssembleURI(QString("/printers/%1").arg(argstr)); + req.addURI(IPP_TAG_OPERATION, "job-printer-uri", uri); + break; + default: +@@ -109,7 +109,6 @@ + bool KMCupsJobManager::listJobs(const QString& prname, KMJobManager::JobType type, int limit) + { + IppRequest req; +- QString uri("ipp://%1:%2/%3/%4"); + QStringList keys; + CupsInfos *infos = CupsInfos::self(); - QString KMCupsManager::driverDbCreationProgram() -@@ -135,7 +137,8 @@ - { +@@ -143,7 +142,8 @@ + */ + } + else +- req.addURI(IPP_TAG_OPERATION, "printer-uri", uri.arg(infos->host()).arg(infos->port()).arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname)); ++ req.addURI(IPP_TAG_OPERATION, "printer-uri", ++ infos->ippAssembleURI(QString("/%1/%2").arg(((mp&&mp->isClass())?"classes":"printers")).arg(prname))); + + // other attributes + req.addKeyword(IPP_TAG_OPERATION, "requested-attributes", keys); +--- kdeprint/cups/kmcupsmanager.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmcupsmanager.cpp 2006-10-26 21:31:12.000000000 +0300 +@@ -138,7 +138,7 @@ req.setOperation(CUPS_ADD_CLASS); QStringList members = p->members(), uris; -- QString s = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ QString s; -+ s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); + QString s; +- s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); ++ s = CupsInfos::self()->ippAssembleURI("/printers/"); for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) uris.append(s+(*it)); req.addURI(IPP_TAG_PRINTER,"member-uris",uris); -@@ -907,25 +910,23 @@ - - QString KMCupsManager::stateInformation() - { -- return QString("%1: %2:%3") -+ return QString("%1: %2") - .arg(i18n("Server")) -- .arg(CupsInfos::self()->host()) -- .arg(CupsInfos::self()->port()); -+ .arg(CupsInfos::self()->hostaddr()); - } - - void KMCupsManager::checkUpdatePossibleInternal() - { - kdDebug(500) << "Checking for update possible" << endl; - delete m_socket; -- /*m_socket = new KExtendedSocket( CupsInfos::self()->host(), CupsInfos::self()->port() ); -- connect( m_socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) ); -- connect( m_socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) ); -- m_socket->setTimeout( 1 );*/ -- m_socket = new QSocket( this ); -- connect( m_socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) ); -- connect( m_socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) ); -- trials = 5; -- QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) ); -+ m_socket = new KNetwork::KBufferedSocket; -+ m_socket->setTimeout( 1 ); -+ connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), -+ SLOT( slotConnectionSuccess() ) ); -+ connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) ); -+ -+ trials = 5; -+ QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) ); - } - - void KMCupsManager::slotConnectionSuccess() -@@ -959,7 +960,10 @@ - { - kdDebug(500) << "Starting async connect" << endl; - //m_socket->startAsyncConnect(); -- m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() ); -+ if (CupsInfos::self()->host().startsWith("/")) -+ m_socket->connect( QString(), CupsInfos::self()->host()); -+ else -+ m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() ); - } - - void KMCupsManager::slotConnectionFailed( int errcode ) -@@ -975,9 +979,25 @@ - return; - } - -- setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. " -- "Error: %1." ).arg( errcode == QSocket::ErrConnectionRefused ? i18n( "connection refused" ) : i18n( "host not found" ) ) ); -- setUpdatePossible( false ); -+ QString einfo; -+ -+ switch (errcode) { -+ case KNetwork::KSocketBase::ConnectionRefused: -+ case KNetwork::KSocketBase::ConnectionTimedOut: -+ einfo = i18n("connection refused") + QString(" (%1)").arg(errcode); -+ break; -+ case KNetwork::KSocketBase::LookupFailure: -+ einfo = i18n("host not found") + QString(" (%1)").arg(errcode); -+ break; -+ case KNetwork::KSocketBase::WouldBlock: -+ default: -+ einfo = i18n("read failed (%1)").arg(errcode); -+ break; -+ } -+ -+ setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. " -+ "Error: %2: %1." ).arg( einfo, CupsInfos::self()->host())); -+ setUpdatePossible( false ); - } - - void KMCupsManager::hostPingSlot() { -@@ -1014,7 +1034,7 @@ +@@ -1024,7 +1024,7 @@ if (use && !p->uri().isEmpty()) uri = p->uri().prettyURL(); else -- uri = QString("ipp://%1:%2/%4/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); -+ uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); +- uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers")); ++ uri = CupsInfos::self()->ippAssembleURI(QString("/%2/%1").arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"))); return uri; } ---- kdeprint/cups/kmcupsuimanager.cpp 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/kmcupsuimanager.cpp 2006/09/20 15:38:41 586782 +--- kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmcupsuimanager.cpp 2006-10-26 21:34:02.000000000 +0300 @@ -135,7 +135,7 @@ QString uri; req.setOperation(CUPS_GET_DEVICES); -- uri = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); -+ uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); +- uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); ++ uri = CupsInfos::self()->ippAssembleURI("/printers/"); req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); if (req.doRequest("/")) ---- kdeprint/cups/cupsinfos.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsinfos.h 2006/09/20 15:33:24 586778 -@@ -32,6 +32,7 @@ - ~CupsInfos(); - - const QString& host() const; -+ QString hostaddr() const; - int port() const; - const QString& login() const; - const QString& password() const; ---- kdeprint/cups/kmcupsmanager.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/kmcupsmanager.h 2006/09/20 15:38:41 586782 -@@ -25,7 +25,10 @@ - class IppRequest; - class KLibrary; - class KExtendedSocket; --class QSocket; -+ -+namespace KNetwork { -+ class KStreamSocket; -+} - - class KMCupsManager : public KMManager - { -@@ -95,7 +98,7 @@ - private: - KLibrary *m_cupsdconf; - KMPrinter *m_currentprinter; -- QSocket *m_socket; -+ KNetwork::KStreamSocket *m_socket; - bool m_hostSuccess; - bool m_lookupDone; - }; ---- kdeprint/cups/cupsdconf2/cups-util.c 2005/11/30 19:59:17 484443 -+++ kdeprint/cups/cupsdconf2/cups-util.c 2006/09/20 15:22:50 586776 -@@ -14,7 +14,7 @@ - static int cups_local_auth(http_t *http); - - const char * /* O - Filename for PPD file */ --cupsGetConf() -+cupsGetConf(void) +--- kdeprint/cups/kmwfax.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwfax.cpp 2006-10-26 21:34:54.000000000 +0300 +@@ -48,7 +48,7 @@ + // initialize + IppRequest req; + req.setOperation(CUPS_GET_DEVICES); +- QString uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()); ++ QString uri = CupsInfos::self()->ippAssembleURI("/printers/"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + if (req.doRequest("/")) + { +--- kdeprint/cups/kmwippprinter.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwippprinter.cpp 2006-10-26 21:41:20.000000000 +0300 +@@ -157,7 +157,7 @@ + req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); + req.setHost(item->text(1)); + req.setPort(item->text(2).toInt()); +- uri = QString::fromLatin1("ipp://%1:%2/ipp").arg(item->text(1)).arg(item->text(2)); ++ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + keys.append("printer-name"); + keys.append("printer-state"); +@@ -176,7 +176,7 @@ + if (req.uri("printer-uri-supported",value)) + { + if (value[0] == '/') +- value.prepend(QString::fromLatin1("ipp://%1:%2").arg(item->text(1)).arg(item->text(2))); ++ value = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), value); + m_uri->setText(value); + } + if (req.text("printer-make-and-model",value) && !value.isEmpty()) txt.append(i18n("<b>Model</b>: %1<br>").arg(value)); +@@ -203,7 +203,7 @@ + void KMWIppPrinter::slotIppReport() { - int fd; /* PPD file */ - int bytes; /* Number of bytes read */ -@@ -142,7 +142,11 @@ - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); -- httpEncode64(encode, plain); -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); -+#else -+ httpEncode64(encode, plain); -+#endif - snprintf(authstring, sizeof(authstring), "Basic %s", encode); - } - else -@@ -364,7 +368,11 @@ - */ - - snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring); -- httpEncode64(encode, plain); -+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain)); -+#else -+ httpEncode64(encode, plain); -+#endif - snprintf(authstring, sizeof(authstring), "Basic %s", encode); - } - else -@@ -443,8 +451,7 @@ - the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) - */ - #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2 -- if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 && -- strcasecmp(http->hostname, "localhost") != 0) -+ if (!httpAddrLocalhost(http)) - #else - if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && - strcasecmp(http->hostname, "localhost") != 0) ---- kdeprint/cups/cupsdconf2/cups-util.h 2005/09/29 09:47:40 465272 -+++ kdeprint/cups/cupsdconf2/cups-util.h 2006/09/20 15:22:50 586776 -@@ -20,7 +20,7 @@ - #ifndef CUPS_UTIL_H - #define CUPS_UTIL_H - --const char* cupsGetConf(); -+const char* cupsGetConf(void); - int cupsPutConf(const char *filename); - - #endif + IppRequest req; +- QString uri("ipp://%1:%2/ipp"); ++ QString uri; + QListViewItem *item = m_list->currentItem(); + + if (item) +@@ -211,7 +211,7 @@ + req.setOperation(IPP_GET_PRINTER_ATTRIBUTES); + req.setHost(item->text(1)); + req.setPort(item->text(2).toInt()); +- uri = uri.arg(item->text(1)).arg(item->text(2)); ++ uri = IppRequest::assembleURI(item->text(1), item->text(2).toInt(), "/ipp"); + req.addURI(IPP_TAG_OPERATION, "printer-uri", uri); + if (req.doRequest("/ipp/")) + { +--- kdeprint/cups/kmwippselect.cpp 2006-10-26 19:31:11.000000000 +0300 ++++ kdeprint/cups/kmwippselect.cpp 2006-10-26 21:32:34.000000000 +0300 +@@ -75,7 +75,7 @@ + IppRequest req; + QString uri; + req.setOperation(CUPS_GET_PRINTERS); +- uri = QString::fromLatin1("ipp://%1:%2/printers/").arg(url.host()).arg(url.port()); ++ uri = IppRequest::assembleURI(url.host(), url.port(), "/printers/"); + req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); + req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); + if (req.doRequest("/printers/")) diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index bfad1b9ed1a6..eb29486ed87e 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -59,6 +59,7 @@ bin/make_driver_db_lpr bin/makekdewidgets bin/meinproc bin/preparetips +bin/start_kdeinit etc/rc.d/kdelibs.sh etc/xdg/menus/kde-applications.menu include/arts/artskde.h diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index 2fe549731256..0ef5ba1c64d9 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -7,7 +7,6 @@ PORTNAME= xscreensaver-kde PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -34,9 +33,9 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop) +.if exists(${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop) WITH_XSGNOME= yes -.elif exists(${LOCALBASE}/bin/screensaver) +.elif exists(${X11BASE}/bin/screensaver) WITH_XSGNOME= yes .else WITH_XS= yes @@ -48,8 +47,8 @@ RUN_DEPENDS+= xscreensaver:${PORTSDIR}/x11/xscreensaver .endif # defined(WITH_XS) .if defined(WITH_XSGNOME) -BUILD_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome -RUN_DEPENDS+= ${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +BUILD_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome .endif # defined(WITH_XSGNOME) pre-configure: diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index 02d405956dc0..b32d6fb7c8d5 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.4.tar.bz2) = c7ff9048b9b68c976de08ed418598e40 -SHA256 (KDE/kdeartwork-3.5.4.tar.bz2) = b4c9347fc515d9ff9d15465a8c5d2c8535181d7e47d2b5713010517bffba826d -SIZE (KDE/kdeartwork-3.5.4.tar.bz2) = 16575390 +MD5 (KDE/kdeartwork-3.5.5.tar.bz2) = 8d35156b506cf870eb9641f72a304c8c +SHA256 (KDE/kdeartwork-3.5.5.tar.bz2) = 4966c255dc4ca9781e61b55e3a77b990c77e7d527ed49781035a7177639137a1 +SIZE (KDE/kdeartwork-3.5.5.tar.bz2) = 16586027 |
