diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-09-12 23:26:52 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-09-12 23:26:52 +0000 |
| commit | 431622844fcecf9286bca43cbdd9e3ae5ff5e273 (patch) | |
| tree | e1d9b3f62c8fb343d38afebf5cbf0b93095f1508 | |
| parent | b5c6ae5f82611e0c6f470a54bcdce721f86d15e4 (diff) | |
| download | ports-431622844fcecf9286bca43cbdd9e3ae5ff5e273.tar.gz ports-431622844fcecf9286bca43cbdd9e3ae5ff5e273.zip | |
Notes
707 files changed, 47758 insertions, 3680 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 43aa064f6347..d4bcdede52ca 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -97,7 +97,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.3 +KDE_VERSION= 3.5.4 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 43aa064f6347..d4bcdede52ca 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -97,7 +97,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.3 +KDE_VERSION= 3.5.4 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kaccessible/distinfo +++ b/accessibility/kaccessible/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/accessibility/kdeaccessibility/distinfo b/accessibility/kdeaccessibility/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kdeaccessibility/distinfo +++ b/accessibility/kdeaccessibility/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/accessibility/kdeaccessibility4/distinfo b/accessibility/kdeaccessibility4/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kdeaccessibility4/distinfo +++ b/accessibility/kdeaccessibility4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kmag/distinfo +++ b/accessibility/kmag/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kmousetool/distinfo +++ b/accessibility/kmousetool/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo index 4686212da22b..f4e9e727f978 100644 --- a/accessibility/kmouth/distinfo +++ b/accessibility/kmouth/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 99eadb3a73bc250e96cec370ee79caff -SHA256 (KDE/kdeaccessibility-3.5.3.tar.bz2) = 2537eef206f713c30e4621350497e38cd341ec3c9cb91b9bf2585e24d7d95caa -SIZE (KDE/kdeaccessibility-3.5.3.tar.bz2) = 8597940 +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 diff --git a/arabic/kde3-i18n/distinfo b/arabic/kde3-i18n/distinfo index 2b79b04f8562..bbf468feed3b 100644 --- a/arabic/kde3-i18n/distinfo +++ b/arabic/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 66358501eade79f2600f65767826268a -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 994ec7d927aab109fea7b6298e10616edb5543b0c271c6f1ffdb9daf11ee8760 -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 1646047 +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 diff --git a/arabic/kde3-i18n/pkg-plist b/arabic/kde3-i18n/pkg-plist index 78d89fb9dafd..7eac75f4651d 100644 --- a/arabic/kde3-i18n/pkg-plist +++ b/arabic/kde3-i18n/pkg-plist @@ -32,7 +32,6 @@ share/locale/ar/LC_MESSAGES/irkick.mo share/locale/ar/LC_MESSAGES/kabc2mutt.mo share/locale/ar/LC_MESSAGES/kabc_dir.mo share/locale/ar/LC_MESSAGES/kabc_file.mo -share/locale/ar/LC_MESSAGES/kabc_ldap.mo share/locale/ar/LC_MESSAGES/kabc_ldapkio.mo share/locale/ar/LC_MESSAGES/kabc_net.mo share/locale/ar/LC_MESSAGES/kabc_sql.mo @@ -252,7 +251,6 @@ share/locale/ar/LC_MESSAGES/kmail.mo share/locale/ar/LC_MESSAGES/kmcop.mo share/locale/ar/LC_MESSAGES/kmenuapplet.mo share/locale/ar/LC_MESSAGES/kmenuedit.mo -share/locale/ar/LC_MESSAGES/kmessedwords.mo share/locale/ar/LC_MESSAGES/kmid.mo share/locale/ar/LC_MESSAGES/kmines.mo share/locale/ar/LC_MESSAGES/kminipagerapplet.mo @@ -366,7 +364,6 @@ share/locale/ar/LC_MESSAGES/kxkb.mo share/locale/ar/LC_MESSAGES/kxsconfig.mo share/locale/ar/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ar/LC_MESSAGES/libkcal.mo -share/locale/ar/LC_MESSAGES/libkcalsystem.mo share/locale/ar/LC_MESSAGES/libkdegames.mo share/locale/ar/LC_MESSAGES/libkdepim.mo share/locale/ar/LC_MESSAGES/libkicker.mo diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo index 2b79b04f8562..bbf468feed3b 100644 --- a/arabic/kde4-l10n/distinfo +++ b/arabic/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 66358501eade79f2600f65767826268a -SHA256 (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 994ec7d927aab109fea7b6298e10616edb5543b0c271c6f1ffdb9daf11ee8760 -SIZE (KDE/kde-i18n/kde-i18n-ar-3.5.3.tar.bz2) = 1646047 +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 diff --git a/arabic/kde4-l10n/pkg-plist b/arabic/kde4-l10n/pkg-plist index 78d89fb9dafd..7eac75f4651d 100644 --- a/arabic/kde4-l10n/pkg-plist +++ b/arabic/kde4-l10n/pkg-plist @@ -32,7 +32,6 @@ share/locale/ar/LC_MESSAGES/irkick.mo share/locale/ar/LC_MESSAGES/kabc2mutt.mo share/locale/ar/LC_MESSAGES/kabc_dir.mo share/locale/ar/LC_MESSAGES/kabc_file.mo -share/locale/ar/LC_MESSAGES/kabc_ldap.mo share/locale/ar/LC_MESSAGES/kabc_ldapkio.mo share/locale/ar/LC_MESSAGES/kabc_net.mo share/locale/ar/LC_MESSAGES/kabc_sql.mo @@ -252,7 +251,6 @@ share/locale/ar/LC_MESSAGES/kmail.mo share/locale/ar/LC_MESSAGES/kmcop.mo share/locale/ar/LC_MESSAGES/kmenuapplet.mo share/locale/ar/LC_MESSAGES/kmenuedit.mo -share/locale/ar/LC_MESSAGES/kmessedwords.mo share/locale/ar/LC_MESSAGES/kmid.mo share/locale/ar/LC_MESSAGES/kmines.mo share/locale/ar/LC_MESSAGES/kminipagerapplet.mo @@ -366,7 +364,6 @@ share/locale/ar/LC_MESSAGES/kxkb.mo share/locale/ar/LC_MESSAGES/kxsconfig.mo share/locale/ar/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ar/LC_MESSAGES/libkcal.mo -share/locale/ar/LC_MESSAGES/libkcalsystem.mo share/locale/ar/LC_MESSAGES/libkdegames.mo share/locale/ar/LC_MESSAGES/libkdepim.mo share/locale/ar/LC_MESSAGES/libkicker.mo diff --git a/arabic/koffice-i18n/Makefile b/arabic/koffice-i18n/Makefile index 6801399d7dba..698731faf648 100644 --- a/arabic/koffice-i18n/Makefile +++ b/arabic/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= arabic kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/arabic/koffice-i18n/distinfo b/arabic/koffice-i18n/distinfo index 68aaf58ae5e6..86c1a0884f9f 100644 --- a/arabic/koffice-i18n/distinfo +++ b/arabic/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ar-1.5.1.tar.bz2) = 3ace1a68c04d3cb3d0e2b45ab9a059d0 -SHA256 (KDE/kde-i18n/koffice-l10n-ar-1.5.1.tar.bz2) = d98af0ac632f6f6efeae2d1d4017b5b86437724e43537ee48d913f9281741eab -SIZE (KDE/kde-i18n/koffice-l10n-ar-1.5.1.tar.bz2) = 316953 +MD5 (KDE/kde-i18n/koffice-l10n-ar-1.5.2.tar.bz2) = a35e9b3f75265488ca400469f23a5a91 +SHA256 (KDE/kde-i18n/koffice-l10n-ar-1.5.2.tar.bz2) = ad4d0b0950ea96b08f6da469d3198ee92aa1642f187de3b9a5e8822ed4117629 +SIZE (KDE/kde-i18n/koffice-l10n-ar-1.5.2.tar.bz2) = 318944 diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/archivers/ark/distinfo +++ b/archivers/ark/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/audio/arts/Makefile b/audio/arts/Makefile index aacf417235bc..4d6863ec6c3f 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -7,8 +7,7 @@ # PORTNAME= arts -PORTVERSION= 1.5.3 -PORTREVISION= 1 +PORTVERSION= 1.5.4 PORTEPOCH= 1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/audio/arts/distinfo b/audio/arts/distinfo index 4e805bf45262..54b45132bbe5 100644 --- a/audio/arts/distinfo +++ b/audio/arts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/arts-1.5.3.tar.bz2) = 1707ce44708a70acecd7a50ef05d365e -SHA256 (KDE/arts-1.5.3.tar.bz2) = 9aeda5f799a1edda0f687098d4e22688a8ef5fca80e051367b8d5eef58527032 -SIZE (KDE/arts-1.5.3.tar.bz2) = 966680 +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 diff --git a/audio/arts/files/patch-arts-1.2.x b/audio/arts/files/patch-arts-1.2.x deleted file mode 100644 index 377fecb704c1..000000000000 --- a/audio/arts/files/patch-arts-1.2.x +++ /dev/null @@ -1,33 +0,0 @@ -Index: soundserver/artswrapper.c -=================================================================== ---- soundserver/artswrapper.c (revision 546970) -+++ soundserver/artswrapper.c (working copy) -@@ -95,6 +95,10 @@ int main(int argc, char **argv) - #else - setreuid(-1, getuid()); - #endif -+ if (geteuid() != getuid()) { -+ perror("setuid()"); -+ return 2; -+ } - } - - if(argc == 0) -Index: soundserver/crashhandler.cc -=================================================================== ---- soundserver/crashhandler.cc (revision 546970) -+++ soundserver/crashhandler.cc (working copy) -@@ -196,7 +196,12 @@ CrashHandler::defaultCrashHandler (int s - argv[i++] = NULL; - - setgid(getgid()); -- setuid(getuid()); -+ if (getuid() != geteuid()) -+ setuid(getuid()); -+ if (getuid() != geteuid()) { -+ perror("setuid()"); -+ exit(255); -+ } - - execvp(crashApp, argv); - diff --git a/audio/mpeglib_artsplug/distinfo b/audio/mpeglib_artsplug/distinfo index 51232e3eeb35..a3c9dfa3cb96 100644 --- a/audio/mpeglib_artsplug/distinfo +++ b/audio/mpeglib_artsplug/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b -SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f -SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838 +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 diff --git a/chinese/calligra-l10n-zh_CN/Makefile b/chinese/calligra-l10n-zh_CN/Makefile index 25941d98b1ee..740dd398762b 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.1 +PORTVERSION= 1.5.2 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 dcad4fc4d5db..350c1b4e2110 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.1.tar.bz2) = f691b1667472c36f8c8ec3fb69ac11ea -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 920f19eef1d2331ce0c9adbd005c7950125f9049d1cb981640d2dd81d3843e11 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 343337 +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 diff --git a/chinese/calligra-l10n-zh_TW/Makefile b/chinese/calligra-l10n-zh_TW/Makefile index 88c267991eec..f71d18687493 100644 --- a/chinese/calligra-l10n-zh_TW/Makefile +++ b/chinese/calligra-l10n-zh_TW/Makefile @@ -6,10 +6,10 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.5 +PORTVERSION= 1.5.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= zh_TW- DIST_SUBDIR= KDE diff --git a/chinese/calligra-l10n-zh_TW/distinfo b/chinese/calligra-l10n-zh_TW/distinfo index f7d6d0111ecd..87e6dc793a73 100644 --- a/chinese/calligra-l10n-zh_TW/distinfo +++ b/chinese/calligra-l10n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = 5bb197f88cefdbf59d3ec5ab0e8604bd -SHA256 (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = ece606b6ed67910b8c7207cd065d5636c7dde76b93df5b4176f5b874ecd59acc -SIZE (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = 587628 +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 diff --git a/chinese/calligra-l10n-zh_TW/pkg-plist b/chinese/calligra-l10n-zh_TW/pkg-plist index d180b1952126..b84480f92d10 100644 --- a/chinese/calligra-l10n-zh_TW/pkg-plist +++ b/chinese/calligra-l10n-zh_TW/pkg-plist @@ -1,45 +1,30 @@ -share/locale/zh_TW/LC_MESSAGES/csvfilter.mo share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo -share/locale/zh_TW/LC_MESSAGES/graphite.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdatabase.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 share/locale/zh_TW/LC_MESSAGES/kfile_koffice.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ooo.mo +share/locale/zh_TW/LC_MESSAGES/kformdesigner.mo share/locale/zh_TW/LC_MESSAGES/kformula.mo -share/locale/zh_TW/LC_MESSAGES/kformulalatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kformulapngfilter.mo share/locale/zh_TW/LC_MESSAGES/kivio.mo share/locale/zh_TW/LC_MESSAGES/koconverter.mo -share/locale/zh_TW/LC_MESSAGES/kocryptfilter.mo share/locale/zh_TW/LC_MESSAGES/koffice.mo -share/locale/zh_TW/LC_MESSAGES/kontour.mo +share/locale/zh_TW/LC_MESSAGES/kofficefilters.mo +share/locale/zh_TW/LC_MESSAGES/koproperty.mo share/locale/zh_TW/LC_MESSAGES/koshell.mo share/locale/zh_TW/LC_MESSAGES/kounavail.mo share/locale/zh_TW/LC_MESSAGES/kplato.mo share/locale/zh_TW/LC_MESSAGES/kpresenter.mo -share/locale/zh_TW/LC_MESSAGES/kpresenterkwordfilter.mo share/locale/zh_TW/LC_MESSAGES/krita.mo share/locale/zh_TW/LC_MESSAGES/kscan_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kscreenshot_plugin.mo share/locale/zh_TW/LC_MESSAGES/kspread.mo share/locale/zh_TW/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/zh_TW/LC_MESSAGES/kspreadqprofilter.mo +share/locale/zh_TW/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/zh_TW/LC_MESSAGES/kthesaurus.mo -share/locale/zh_TW/LC_MESSAGES/kudesigner.mo share/locale/zh_TW/LC_MESSAGES/kugar.mo share/locale/zh_TW/LC_MESSAGES/kword.mo -share/locale/zh_TW/LC_MESSAGES/kwordabiwordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordasciifilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlateximportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswritefilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordpdfimport.mo -share/locale/zh_TW/LC_MESSAGES/olefilterswinword97filter.mo -share/locale/zh_TW/LC_MESSAGES/xsltexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltimportfilter.mo +share/locale/zh_TW/LC_MESSAGES/thesaurus_tool.mo diff --git a/chinese/kde3-i18n-zh_CN/distinfo b/chinese/kde3-i18n-zh_CN/distinfo index 107cec67ef57..1367852b93dc 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.3.tar.bz2) = b57a6684ef11d1b0ac6d18824ac42799 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.3.tar.bz2) = 4848c9c30cfed5ebe36253438c9429d2e6c1ffd3d06fbcc53c3f4df21569b791 -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.3.tar.bz2) = 1952274 +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 diff --git a/chinese/kde3-i18n-zh_TW/distinfo b/chinese/kde3-i18n-zh_TW/distinfo index 73336a461211..6b5a13ebb175 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.3.tar.bz2) = 957f858c53efa4c62ed4bfa3dd06ddfe -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.3.tar.bz2) = 9b3af694cb646a7b2ea9b937e5b3b01bf41ca6f5dcf5905ee93f7dee059e9369 -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.3.tar.bz2) = 1493859 +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 diff --git a/chinese/kde3-i18n-zh_TW/pkg-plist b/chinese/kde3-i18n-zh_TW/pkg-plist index b349a1b03332..629f07546488 100644 --- a/chinese/kde3-i18n-zh_TW/pkg-plist +++ b/chinese/kde3-i18n-zh_TW/pkg-plist @@ -9,20 +9,31 @@ share/doc/HTML/zh_TW/khelpcenter/links.docbook share/doc/HTML/zh_TW/khelpcenter/support.docbook share/doc/HTML/zh_TW/khelpcenter/welcome.docbook share/doc/HTML/zh_TW/khelpcenter/whatiskde.docbook +share/locale/zh_TW/LC_MESSAGES/akregator.mo +share/locale/zh_TW/LC_MESSAGES/akregator_konqplugin.mo share/locale/zh_TW/LC_MESSAGES/alsaplayerui.mo share/locale/zh_TW/LC_MESSAGES/amor.mo share/locale/zh_TW/LC_MESSAGES/appletproxy.mo share/locale/zh_TW/LC_MESSAGES/ark.mo +share/locale/zh_TW/LC_MESSAGES/ark_plugin.mo share/locale/zh_TW/LC_MESSAGES/artsbuilder.mo share/locale/zh_TW/LC_MESSAGES/artscontrol.mo +share/locale/zh_TW/LC_MESSAGES/artsmodules.mo share/locale/zh_TW/LC_MESSAGES/atlantik.mo share/locale/zh_TW/LC_MESSAGES/atlantikdesigner.mo +share/locale/zh_TW/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/zh_TW/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/zh_TW/LC_MESSAGES/audiorename_plugin.mo share/locale/zh_TW/LC_MESSAGES/autorefresh.mo share/locale/zh_TW/LC_MESSAGES/babelfish.mo +share/locale/zh_TW/LC_MESSAGES/blinken.mo +share/locale/zh_TW/LC_MESSAGES/cervisia.mo +share/locale/zh_TW/LC_MESSAGES/charlatanui.mo share/locale/zh_TW/LC_MESSAGES/clockapplet.mo share/locale/zh_TW/LC_MESSAGES/crashesplugin.mo share/locale/zh_TW/LC_MESSAGES/cupsdconf.mo +share/locale/zh_TW/LC_MESSAGES/cvsservice.mo +share/locale/zh_TW/LC_MESSAGES/dcoprss.mo share/locale/zh_TW/LC_MESSAGES/dirfilterplugin.mo share/locale/zh_TW/LC_MESSAGES/display.mo share/locale/zh_TW/LC_MESSAGES/dockbarextension.mo @@ -30,35 +41,49 @@ share/locale/zh_TW/LC_MESSAGES/domtreeviewer.mo share/locale/zh_TW/LC_MESSAGES/drkonqi.mo share/locale/zh_TW/LC_MESSAGES/dub.mo share/locale/zh_TW/LC_MESSAGES/extensionproxy.mo +share/locale/zh_TW/LC_MESSAGES/ffrs.mo share/locale/zh_TW/LC_MESSAGES/filetypes.mo +share/locale/zh_TW/LC_MESSAGES/fsview.mo share/locale/zh_TW/LC_MESSAGES/htmlsearch.mo share/locale/zh_TW/LC_MESSAGES/imagerename_plugin.mo share/locale/zh_TW/LC_MESSAGES/imgalleryplugin.mo +share/locale/zh_TW/LC_MESSAGES/irkick.mo share/locale/zh_TW/LC_MESSAGES/joystick.mo +share/locale/zh_TW/LC_MESSAGES/juk.mo share/locale/zh_TW/LC_MESSAGES/kabc2mutt.mo share/locale/zh_TW/LC_MESSAGES/kabc_dir.mo share/locale/zh_TW/LC_MESSAGES/kabc_file.mo share/locale/zh_TW/LC_MESSAGES/kabc_ldapkio.mo share/locale/zh_TW/LC_MESSAGES/kabc_net.mo +share/locale/zh_TW/LC_MESSAGES/kabc_slox.mo share/locale/zh_TW/LC_MESSAGES/kabc_sql.mo share/locale/zh_TW/LC_MESSAGES/kabcformat_binary.mo share/locale/zh_TW/LC_MESSAGES/kaboodle.mo share/locale/zh_TW/LC_MESSAGES/kaccess.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo share/locale/zh_TW/LC_MESSAGES/kalarm.mo +share/locale/zh_TW/LC_MESSAGES/kanagram.mo share/locale/zh_TW/LC_MESSAGES/kandy.mo share/locale/zh_TW/LC_MESSAGES/kappfinder.mo share/locale/zh_TW/LC_MESSAGES/karm.mo share/locale/zh_TW/LC_MESSAGES/kasbarextension.mo share/locale/zh_TW/LC_MESSAGES/kasteroids.mo share/locale/zh_TW/LC_MESSAGES/kate.mo +share/locale/zh_TW/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/zh_TW/LC_MESSAGES/katefiletemplates.mo +share/locale/zh_TW/LC_MESSAGES/katefll_initplugin.mo +share/locale/zh_TW/LC_MESSAGES/katefll_plugin.mo share/locale/zh_TW/LC_MESSAGES/katehelloworld.mo share/locale/zh_TW/LC_MESSAGES/katehtmltools.mo share/locale/zh_TW/LC_MESSAGES/kateinsertcommand.mo +share/locale/zh_TW/LC_MESSAGES/katekjswrapper.mo +share/locale/zh_TW/LC_MESSAGES/katemake.mo share/locale/zh_TW/LC_MESSAGES/katemodeline.mo share/locale/zh_TW/LC_MESSAGES/kateopenheader.mo share/locale/zh_TW/LC_MESSAGES/katepart.mo share/locale/zh_TW/LC_MESSAGES/katepybrowse.mo +share/locale/zh_TW/LC_MESSAGES/katesnippets.mo +share/locale/zh_TW/LC_MESSAGES/katetabbarextension.mo share/locale/zh_TW/LC_MESSAGES/katetextfilter.mo share/locale/zh_TW/LC_MESSAGES/katexmlcheck.mo share/locale/zh_TW/LC_MESSAGES/katexmltools.mo @@ -66,13 +91,22 @@ share/locale/zh_TW/LC_MESSAGES/katomic.mo share/locale/zh_TW/LC_MESSAGES/kaudiocreator.mo share/locale/zh_TW/LC_MESSAGES/kay.mo share/locale/zh_TW/LC_MESSAGES/kbabel.mo +share/locale/zh_TW/LC_MESSAGES/kbackgammon.mo share/locale/zh_TW/LC_MESSAGES/kbattleship.mo +share/locale/zh_TW/LC_MESSAGES/kbinaryclock.mo share/locale/zh_TW/LC_MESSAGES/kblackbox.mo share/locale/zh_TW/LC_MESSAGES/kbounce.mo +share/locale/zh_TW/LC_MESSAGES/kbruch.mo +share/locale/zh_TW/LC_MESSAGES/kbstateapplet.mo share/locale/zh_TW/LC_MESSAGES/kbugbuster.mo share/locale/zh_TW/LC_MESSAGES/kcalc.mo share/locale/zh_TW/LC_MESSAGES/kcharselect.mo share/locale/zh_TW/LC_MESSAGES/kcharselectapplet.mo +share/locale/zh_TW/LC_MESSAGES/kcm_krfb.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewcanvasconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewgeneralconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewpluginsconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo share/locale/zh_TW/LC_MESSAGES/kcmaccess.mo share/locale/zh_TW/LC_MESSAGES/kcmaccessibility.mo share/locale/zh_TW/LC_MESSAGES/kcmarts.mo @@ -92,6 +126,7 @@ share/locale/zh_TW/LC_MESSAGES/kcmicons.mo share/locale/zh_TW/LC_MESSAGES/kcminfo.mo share/locale/zh_TW/LC_MESSAGES/kcminput.mo share/locale/zh_TW/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/zh_TW/LC_MESSAGES/kcmkabconfig.mo share/locale/zh_TW/LC_MESSAGES/kcmkamera.mo share/locale/zh_TW/LC_MESSAGES/kcmkclock.mo share/locale/zh_TW/LC_MESSAGES/kcmkded.mo @@ -102,9 +137,12 @@ share/locale/zh_TW/LC_MESSAGES/kcmkio.mo share/locale/zh_TW/LC_MESSAGES/kcmkonq.mo share/locale/zh_TW/LC_MESSAGES/kcmkonqhtml.mo share/locale/zh_TW/LC_MESSAGES/kcmkonsole.mo +share/locale/zh_TW/LC_MESSAGES/kcmkontactnt.mo share/locale/zh_TW/LC_MESSAGES/kcmktalkd.mo share/locale/zh_TW/LC_MESSAGES/kcmkuick.mo share/locale/zh_TW/LC_MESSAGES/kcmkurifilt.mo +share/locale/zh_TW/LC_MESSAGES/kcmkvaio.mo +share/locale/zh_TW/LC_MESSAGES/kcmkwallet.mo share/locale/zh_TW/LC_MESSAGES/kcmkwindecoration.mo share/locale/zh_TW/LC_MESSAGES/kcmkwinrules.mo share/locale/zh_TW/LC_MESSAGES/kcmkwm.mo @@ -113,20 +151,25 @@ share/locale/zh_TW/LC_MESSAGES/kcmlaptop.mo share/locale/zh_TW/LC_MESSAGES/kcmlaunch.mo share/locale/zh_TW/LC_MESSAGES/kcmlayout.mo share/locale/zh_TW/LC_MESSAGES/kcmlilo.mo +share/locale/zh_TW/LC_MESSAGES/kcmlirc.mo share/locale/zh_TW/LC_MESSAGES/kcmlocale.mo +share/locale/zh_TW/LC_MESSAGES/kcmmedia.mo share/locale/zh_TW/LC_MESSAGES/kcmnic.mo share/locale/zh_TW/LC_MESSAGES/kcmnotify.mo share/locale/zh_TW/LC_MESSAGES/kcmperformance.mo share/locale/zh_TW/LC_MESSAGES/kcmprintmgr.mo share/locale/zh_TW/LC_MESSAGES/kcmsamba.mo share/locale/zh_TW/LC_MESSAGES/kcmscreensaver.mo +share/locale/zh_TW/LC_MESSAGES/kcmshell.mo share/locale/zh_TW/LC_MESSAGES/kcmsmartcard.mo share/locale/zh_TW/LC_MESSAGES/kcmsmserver.mo share/locale/zh_TW/LC_MESSAGES/kcmspellchecking.mo share/locale/zh_TW/LC_MESSAGES/kcmstyle.mo share/locale/zh_TW/LC_MESSAGES/kcmtaskbar.mo +share/locale/zh_TW/LC_MESSAGES/kcmthinkpad.mo share/locale/zh_TW/LC_MESSAGES/kcmusb.mo share/locale/zh_TW/LC_MESSAGES/kcmview1394.mo +share/locale/zh_TW/LC_MESSAGES/kcmwifi.mo share/locale/zh_TW/LC_MESSAGES/kcmxinerama.mo share/locale/zh_TW/LC_MESSAGES/kcoloredit.mo share/locale/zh_TW/LC_MESSAGES/kcontrol.mo @@ -136,7 +179,10 @@ share/locale/zh_TW/LC_MESSAGES/kdcop.mo share/locale/zh_TW/LC_MESSAGES/kdebugdialog.mo share/locale/zh_TW/LC_MESSAGES/kdelibs.mo share/locale/zh_TW/LC_MESSAGES/kdelibs_colors.mo +share/locale/zh_TW/LC_MESSAGES/kdelirc.mo share/locale/zh_TW/LC_MESSAGES/kdepasswd.mo +share/locale/zh_TW/LC_MESSAGES/kdepimresources.mo +share/locale/zh_TW/LC_MESSAGES/kdepimwizards.mo share/locale/zh_TW/LC_MESSAGES/kdeprint.mo share/locale/zh_TW/LC_MESSAGES/kdeprint_part.mo share/locale/zh_TW/LC_MESSAGES/kdeprintfax.mo @@ -146,9 +192,11 @@ share/locale/zh_TW/LC_MESSAGES/kdesu.mo share/locale/zh_TW/LC_MESSAGES/kdesud.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 share/locale/zh_TW/LC_MESSAGES/kdialog.mo share/locale/zh_TW/LC_MESSAGES/kdict.mo share/locale/zh_TW/LC_MESSAGES/kdictapplet.mo +share/locale/zh_TW/LC_MESSAGES/kdjview.mo share/locale/zh_TW/LC_MESSAGES/kdmconfig.mo share/locale/zh_TW/LC_MESSAGES/kdmgreet.mo share/locale/zh_TW/LC_MESSAGES/kdvi.mo @@ -156,48 +204,78 @@ share/locale/zh_TW/LC_MESSAGES/kedit.mo share/locale/zh_TW/LC_MESSAGES/keduca.mo share/locale/zh_TW/LC_MESSAGES/kenolaba.mo share/locale/zh_TW/LC_MESSAGES/kfax.mo +share/locale/zh_TW/LC_MESSAGES/kfaxview.mo share/locale/zh_TW/LC_MESSAGES/kfifteenapplet.mo share/locale/zh_TW/LC_MESSAGES/kfile_au.mo share/locale/zh_TW/LC_MESSAGES/kfile_avi.mo share/locale/zh_TW/LC_MESSAGES/kfile_bmp.mo +share/locale/zh_TW/LC_MESSAGES/kfile_cert.mo share/locale/zh_TW/LC_MESSAGES/kfile_cpp.mo +share/locale/zh_TW/LC_MESSAGES/kfile_dds.mo share/locale/zh_TW/LC_MESSAGES/kfile_deb.mo share/locale/zh_TW/LC_MESSAGES/kfile_desktop.mo share/locale/zh_TW/LC_MESSAGES/kfile_diff.mo +share/locale/zh_TW/LC_MESSAGES/kfile_drgeo.mo +share/locale/zh_TW/LC_MESSAGES/kfile_dvi.mo +share/locale/zh_TW/LC_MESSAGES/kfile_exr.mo +share/locale/zh_TW/LC_MESSAGES/kfile_flac.mo share/locale/zh_TW/LC_MESSAGES/kfile_folder.mo share/locale/zh_TW/LC_MESSAGES/kfile_gif.mo share/locale/zh_TW/LC_MESSAGES/kfile_html.mo share/locale/zh_TW/LC_MESSAGES/kfile_ico.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ics.mo share/locale/zh_TW/LC_MESSAGES/kfile_jpeg.mo +share/locale/zh_TW/LC_MESSAGES/kfile_kig.mo +share/locale/zh_TW/LC_MESSAGES/kfile_lnk.mo share/locale/zh_TW/LC_MESSAGES/kfile_m3u.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mhtml.mo share/locale/zh_TW/LC_MESSAGES/kfile_mp3.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mpc.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mpeg.mo share/locale/zh_TW/LC_MESSAGES/kfile_ogg.mo +share/locale/zh_TW/LC_MESSAGES/kfile_palm.mo +share/locale/zh_TW/LC_MESSAGES/kfile_pcx.mo share/locale/zh_TW/LC_MESSAGES/kfile_pdf.mo share/locale/zh_TW/LC_MESSAGES/kfile_png.mo +share/locale/zh_TW/LC_MESSAGES/kfile_pnm.mo share/locale/zh_TW/LC_MESSAGES/kfile_po.mo share/locale/zh_TW/LC_MESSAGES/kfile_ps.mo +share/locale/zh_TW/LC_MESSAGES/kfile_rfc822.mo +share/locale/zh_TW/LC_MESSAGES/kfile_rgb.mo share/locale/zh_TW/LC_MESSAGES/kfile_rpm.mo +share/locale/zh_TW/LC_MESSAGES/kfile_sid.mo share/locale/zh_TW/LC_MESSAGES/kfile_tga.mo +share/locale/zh_TW/LC_MESSAGES/kfile_theora.mo share/locale/zh_TW/LC_MESSAGES/kfile_tiff.mo +share/locale/zh_TW/LC_MESSAGES/kfile_torrent.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ts.mo share/locale/zh_TW/LC_MESSAGES/kfile_txt.mo share/locale/zh_TW/LC_MESSAGES/kfile_vcf.mo 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/kfileshare.mo share/locale/zh_TW/LC_MESSAGES/kfindpart.mo share/locale/zh_TW/LC_MESSAGES/kfloppy.mo share/locale/zh_TW/LC_MESSAGES/kfmclient.mo share/locale/zh_TW/LC_MESSAGES/kfontinst.mo share/locale/zh_TW/LC_MESSAGES/kfouleggs.mo +share/locale/zh_TW/LC_MESSAGES/kgamma.mo share/locale/zh_TW/LC_MESSAGES/kgantt.mo +share/locale/zh_TW/LC_MESSAGES/kgeography.mo share/locale/zh_TW/LC_MESSAGES/kget.mo share/locale/zh_TW/LC_MESSAGES/kghostview.mo share/locale/zh_TW/LC_MESSAGES/kgoldrunner.mo share/locale/zh_TW/LC_MESSAGES/kgpg.mo +share/locale/zh_TW/LC_MESSAGES/kgreet_classic.mo +share/locale/zh_TW/LC_MESSAGES/kgreet_winbind.mo share/locale/zh_TW/LC_MESSAGES/khangman.mo share/locale/zh_TW/LC_MESSAGES/khelpcenter.mo share/locale/zh_TW/LC_MESSAGES/khexedit.mo +share/locale/zh_TW/LC_MESSAGES/khexedit2part.mo share/locale/zh_TW/LC_MESSAGES/khotkeys.mo +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 @@ -207,19 +285,33 @@ share/locale/zh_TW/LC_MESSAGES/kio_audiocd.mo share/locale/zh_TW/LC_MESSAGES/kio_finger.mo share/locale/zh_TW/LC_MESSAGES/kio_fish.mo share/locale/zh_TW/LC_MESSAGES/kio_floppy.mo +share/locale/zh_TW/LC_MESSAGES/kio_groupwise.mo share/locale/zh_TW/LC_MESSAGES/kio_help.mo +share/locale/zh_TW/LC_MESSAGES/kio_home.mo share/locale/zh_TW/LC_MESSAGES/kio_imap4.mo +share/locale/zh_TW/LC_MESSAGES/kio_jabberdisco.mo share/locale/zh_TW/LC_MESSAGES/kio_lan.mo +share/locale/zh_TW/LC_MESSAGES/kio_ldap.mo share/locale/zh_TW/LC_MESSAGES/kio_mac.mo share/locale/zh_TW/LC_MESSAGES/kio_man.mo share/locale/zh_TW/LC_MESSAGES/kio_media.mo +share/locale/zh_TW/LC_MESSAGES/kio_mobile.mo share/locale/zh_TW/LC_MESSAGES/kio_nfs.mo share/locale/zh_TW/LC_MESSAGES/kio_nntp.mo share/locale/zh_TW/LC_MESSAGES/kio_pop3.mo share/locale/zh_TW/LC_MESSAGES/kio_print.mo +share/locale/zh_TW/LC_MESSAGES/kio_remote.mo +share/locale/zh_TW/LC_MESSAGES/kio_settings.mo share/locale/zh_TW/LC_MESSAGES/kio_sftp.mo +share/locale/zh_TW/LC_MESSAGES/kio_sieve.mo share/locale/zh_TW/LC_MESSAGES/kio_smb.mo share/locale/zh_TW/LC_MESSAGES/kio_smtp.mo +share/locale/zh_TW/LC_MESSAGES/kio_svn.mo +share/locale/zh_TW/LC_MESSAGES/kio_system.mo +share/locale/zh_TW/LC_MESSAGES/kio_tar.mo +share/locale/zh_TW/LC_MESSAGES/kio_thumbnail.mo +share/locale/zh_TW/LC_MESSAGES/kio_trash.mo +share/locale/zh_TW/LC_MESSAGES/kio_zeroconf.mo share/locale/zh_TW/LC_MESSAGES/kioexec.mo share/locale/zh_TW/LC_MESSAGES/kiten.mo share/locale/zh_TW/LC_MESSAGES/kjobviewer.mo @@ -227,38 +319,65 @@ share/locale/zh_TW/LC_MESSAGES/kjots.mo share/locale/zh_TW/LC_MESSAGES/kjumpingcube.mo share/locale/zh_TW/LC_MESSAGES/klaptopdaemon.mo share/locale/zh_TW/LC_MESSAGES/klatin.mo +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/klipper.mo share/locale/zh_TW/LC_MESSAGES/klock.mo +share/locale/zh_TW/LC_MESSAGES/kmag.mo share/locale/zh_TW/LC_MESSAGES/kmahjongg.mo share/locale/zh_TW/LC_MESSAGES/kmail.mo +share/locale/zh_TW/LC_MESSAGES/kmail_text_calendar_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/zh_TW/LC_MESSAGES/kmailcvt.mo share/locale/zh_TW/LC_MESSAGES/kmathapplet.mo +share/locale/zh_TW/LC_MESSAGES/kmcop.mo share/locale/zh_TW/LC_MESSAGES/kmenuapplet.mo share/locale/zh_TW/LC_MESSAGES/kmenuedit.mo -share/locale/zh_TW/LC_MESSAGES/kmessedwords.mo share/locale/zh_TW/LC_MESSAGES/kmid.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_delli8k.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_generic.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_kvaio.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_powerbook.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_thinkpad.mo +share/locale/zh_TW/LC_MESSAGES/kmilod.mo share/locale/zh_TW/LC_MESSAGES/kmines.mo share/locale/zh_TW/LC_MESSAGES/kminipagerapplet.mo share/locale/zh_TW/LC_MESSAGES/kmix.mo +share/locale/zh_TW/LC_MESSAGES/kmobile.mo share/locale/zh_TW/LC_MESSAGES/kmoon.mo share/locale/zh_TW/LC_MESSAGES/kmousetool.mo share/locale/zh_TW/LC_MESSAGES/kmouth.mo +share/locale/zh_TW/LC_MESSAGES/kmrml.mo +share/locale/zh_TW/LC_MESSAGES/knetattach.mo +share/locale/zh_TW/LC_MESSAGES/knetwalk.mo +share/locale/zh_TW/LC_MESSAGES/knetworkconf.mo share/locale/zh_TW/LC_MESSAGES/knewsticker.mo share/locale/zh_TW/LC_MESSAGES/knode.mo share/locale/zh_TW/LC_MESSAGES/knotes.mo share/locale/zh_TW/LC_MESSAGES/knotify.mo 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/kompare.mo +share/locale/zh_TW/LC_MESSAGES/konnector_dummy.mo +share/locale/zh_TW/LC_MESSAGES/konnector_kabc.mo +share/locale/zh_TW/LC_MESSAGES/konnector_kcal.mo +share/locale/zh_TW/LC_MESSAGES/konnector_local.mo +share/locale/zh_TW/LC_MESSAGES/konnector_qtopia.mo +share/locale/zh_TW/LC_MESSAGES/konnector_remote.mo +share/locale/zh_TW/LC_MESSAGES/konqsidebar_delicious.mo share/locale/zh_TW/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/zh_TW/LC_MESSAGES/konqsidebar_metabar.mo share/locale/zh_TW/LC_MESSAGES/konqsidebar_news.mo share/locale/zh_TW/LC_MESSAGES/konqueror.mo share/locale/zh_TW/LC_MESSAGES/konquest.mo share/locale/zh_TW/LC_MESSAGES/konsole.mo +share/locale/zh_TW/LC_MESSAGES/konsolekalendar.mo share/locale/zh_TW/LC_MESSAGES/kontact.mo +share/locale/zh_TW/LC_MESSAGES/kooka.mo share/locale/zh_TW/LC_MESSAGES/kopete.mo share/locale/zh_TW/LC_MESSAGES/korganizer.mo share/locale/zh_TW/LC_MESSAGES/korn.mo @@ -267,6 +386,7 @@ share/locale/zh_TW/LC_MESSAGES/kpager.mo share/locale/zh_TW/LC_MESSAGES/kpartsaver.mo share/locale/zh_TW/LC_MESSAGES/kpat.mo share/locale/zh_TW/LC_MESSAGES/kpdf.mo +share/locale/zh_TW/LC_MESSAGES/kpercentage.mo share/locale/zh_TW/LC_MESSAGES/kpersonalizer.mo share/locale/zh_TW/LC_MESSAGES/kpf.mo share/locale/zh_TW/LC_MESSAGES/kpilot.mo @@ -276,16 +396,32 @@ share/locale/zh_TW/LC_MESSAGES/kppplogview.mo share/locale/zh_TW/LC_MESSAGES/kprinter.mo share/locale/zh_TW/LC_MESSAGES/krandr.mo share/locale/zh_TW/LC_MESSAGES/krdb.mo +share/locale/zh_TW/LC_MESSAGES/krdc.mo share/locale/zh_TW/LC_MESSAGES/kreadconfig.mo share/locale/zh_TW/LC_MESSAGES/krec.mo share/locale/zh_TW/LC_MESSAGES/kregexpeditor.mo +share/locale/zh_TW/LC_MESSAGES/kres_birthday.mo +share/locale/zh_TW/LC_MESSAGES/kres_blogging.mo +share/locale/zh_TW/LC_MESSAGES/kres_bugzilla.mo +share/locale/zh_TW/LC_MESSAGES/kres_exchange.mo +share/locale/zh_TW/LC_MESSAGES/kres_featureplan.mo +share/locale/zh_TW/LC_MESSAGES/kres_groupware.mo +share/locale/zh_TW/LC_MESSAGES/kres_groupwise.mo +share/locale/zh_TW/LC_MESSAGES/kres_kolab.mo +share/locale/zh_TW/LC_MESSAGES/kres_remote.mo +share/locale/zh_TW/LC_MESSAGES/kres_tvanytime.mo +share/locale/zh_TW/LC_MESSAGES/kres_xmlrpc.mo share/locale/zh_TW/LC_MESSAGES/kreversi.mo +share/locale/zh_TW/LC_MESSAGES/krfb.mo share/locale/zh_TW/LC_MESSAGES/kruler.mo share/locale/zh_TW/LC_MESSAGES/krunapplet.mo share/locale/zh_TW/LC_MESSAGES/ksame.mo +share/locale/zh_TW/LC_MESSAGES/ksayit.mo share/locale/zh_TW/LC_MESSAGES/kscd.mo share/locale/zh_TW/LC_MESSAGES/kscreensaver.mo share/locale/zh_TW/LC_MESSAGES/kshisen.mo +share/locale/zh_TW/LC_MESSAGES/ksig.mo +share/locale/zh_TW/LC_MESSAGES/ksim.mo share/locale/zh_TW/LC_MESSAGES/ksirc.mo share/locale/zh_TW/LC_MESSAGES/ksirtet.mo share/locale/zh_TW/LC_MESSAGES/ksmiletris.mo @@ -299,12 +435,19 @@ share/locale/zh_TW/LC_MESSAGES/ksplashthemes.mo share/locale/zh_TW/LC_MESSAGES/kstars.mo share/locale/zh_TW/LC_MESSAGES/kstart.mo share/locale/zh_TW/LC_MESSAGES/kstartperf.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_highcontrast_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_phase_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_plastik_config.mo share/locale/zh_TW/LC_MESSAGES/ksvgplugin.mo share/locale/zh_TW/LC_MESSAGES/ksync.mo share/locale/zh_TW/LC_MESSAGES/ksysguard.mo share/locale/zh_TW/LC_MESSAGES/ksystemtrayapplet.mo +share/locale/zh_TW/LC_MESSAGES/ksystraycmd.mo share/locale/zh_TW/LC_MESSAGES/ksysv.mo share/locale/zh_TW/LC_MESSAGES/kteatime.mo +share/locale/zh_TW/LC_MESSAGES/ktexteditor_autobookmarker.mo +share/locale/zh_TW/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_isearch.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_kdatatool.mo @@ -312,28 +455,51 @@ share/locale/zh_TW/LC_MESSAGES/kthememanager.mo share/locale/zh_TW/LC_MESSAGES/ktimemon.mo share/locale/zh_TW/LC_MESSAGES/ktimer.mo share/locale/zh_TW/LC_MESSAGES/ktip.mo +share/locale/zh_TW/LC_MESSAGES/ktnef.mo share/locale/zh_TW/LC_MESSAGES/ktouch.mo share/locale/zh_TW/LC_MESSAGES/ktron.mo +share/locale/zh_TW/LC_MESSAGES/kttsd.mo share/locale/zh_TW/LC_MESSAGES/ktuberling.mo +share/locale/zh_TW/LC_MESSAGES/kturtle.mo share/locale/zh_TW/LC_MESSAGES/ktux.mo share/locale/zh_TW/LC_MESSAGES/kuick_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kuickshow.mo +share/locale/zh_TW/LC_MESSAGES/kuiviewer.mo share/locale/zh_TW/LC_MESSAGES/kuser.mo share/locale/zh_TW/LC_MESSAGES/kview.mo share/locale/zh_TW/LC_MESSAGES/kview_scale.mo share/locale/zh_TW/LC_MESSAGES/kviewbrowserplugin.mo +share/locale/zh_TW/LC_MESSAGES/kviewcanvas.mo +share/locale/zh_TW/LC_MESSAGES/kvieweffectsplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewpresenterplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewscannerplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewshell.mo +share/locale/zh_TW/LC_MESSAGES/kviewviewer.mo +share/locale/zh_TW/LC_MESSAGES/kwalletmanager.mo +share/locale/zh_TW/LC_MESSAGES/kwatchgnupg.mo share/locale/zh_TW/LC_MESSAGES/kweather.mo +share/locale/zh_TW/LC_MESSAGES/kwifimanager.mo share/locale/zh_TW/LC_MESSAGES/kwin.mo share/locale/zh_TW/LC_MESSAGES/kwin4.mo +share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo +share/locale/zh_TW/LC_MESSAGES/kwin_lib.mo +share/locale/zh_TW/LC_MESSAGES/kwireless.mo 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/libkcalsystem.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 +share/locale/zh_TW/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/zh_TW/LC_MESSAGES/libkcal.mo +share/locale/zh_TW/LC_MESSAGES/libkcddb.mo +share/locale/zh_TW/LC_MESSAGES/libkdeedu.mo share/locale/zh_TW/LC_MESSAGES/libkdegames.mo share/locale/zh_TW/LC_MESSAGES/libkdepim.mo +share/locale/zh_TW/LC_MESSAGES/libkfaximgage.mo +share/locale/zh_TW/LC_MESSAGES/libkholidays.mo share/locale/zh_TW/LC_MESSAGES/libkicker.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_konsole.mo @@ -342,28 +508,44 @@ share/locale/zh_TW/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_tom.mo +share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo +share/locale/zh_TW/LC_MESSAGES/libkmime.mo share/locale/zh_TW/LC_MESSAGES/libkonq.mo +share/locale/zh_TW/LC_MESSAGES/libkpgp.mo +share/locale/zh_TW/LC_MESSAGES/libkpimexchange.mo share/locale/zh_TW/LC_MESSAGES/libkscan.mo share/locale/zh_TW/LC_MESSAGES/libkscreensaver.mo +share/locale/zh_TW/LC_MESSAGES/libksieve.mo share/locale/zh_TW/LC_MESSAGES/libksirtet.mo +share/locale/zh_TW/LC_MESSAGES/libksync.mo share/locale/zh_TW/LC_MESSAGES/libtaskbar.mo share/locale/zh_TW/LC_MESSAGES/libtaskmanager.mo share/locale/zh_TW/LC_MESSAGES/lockout.mo share/locale/zh_TW/LC_MESSAGES/lskat.mo +share/locale/zh_TW/LC_MESSAGES/lyrics.mo share/locale/zh_TW/LC_MESSAGES/mediaapplet.mo share/locale/zh_TW/LC_MESSAGES/mediacontrol.mo +share/locale/zh_TW/LC_MESSAGES/mf_konqplugin.mo +share/locale/zh_TW/LC_MESSAGES/minitoolsplugin.mo +share/locale/zh_TW/LC_MESSAGES/multisynk.mo share/locale/zh_TW/LC_MESSAGES/naughtyapplet.mo +share/locale/zh_TW/LC_MESSAGES/nexscope.mo share/locale/zh_TW/LC_MESSAGES/noatun.mo share/locale/zh_TW/LC_MESSAGES/nsplugin.mo +share/locale/zh_TW/LC_MESSAGES/pitchablespeed.mo share/locale/zh_TW/LC_MESSAGES/ppdtranslations.mo share/locale/zh_TW/LC_MESSAGES/privacy.mo share/locale/zh_TW/LC_MESSAGES/qeditor.mo share/locale/zh_TW/LC_MESSAGES/quanta.mo share/locale/zh_TW/LC_MESSAGES/quicklauncher.mo +share/locale/zh_TW/LC_MESSAGES/rellinks.mo +share/locale/zh_TW/LC_MESSAGES/searchbarplugin.mo share/locale/zh_TW/LC_MESSAGES/secpolicy.mo share/locale/zh_TW/LC_MESSAGES/spy.mo +share/locale/zh_TW/LC_MESSAGES/superkaramba.mo share/locale/zh_TW/LC_MESSAGES/synaescope.mo share/locale/zh_TW/LC_MESSAGES/timezones.mo +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 diff --git a/chinese/kde4-l10n-zh_CN/distinfo b/chinese/kde4-l10n-zh_CN/distinfo index 107cec67ef57..1367852b93dc 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.3.tar.bz2) = b57a6684ef11d1b0ac6d18824ac42799 -SHA256 (KDE/kde-i18n/kde-i18n-zh_CN-3.5.3.tar.bz2) = 4848c9c30cfed5ebe36253438c9429d2e6c1ffd3d06fbcc53c3f4df21569b791 -SIZE (KDE/kde-i18n/kde-i18n-zh_CN-3.5.3.tar.bz2) = 1952274 +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 diff --git a/chinese/kde4-l10n-zh_TW/distinfo b/chinese/kde4-l10n-zh_TW/distinfo index 73336a461211..6b5a13ebb175 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.3.tar.bz2) = 957f858c53efa4c62ed4bfa3dd06ddfe -SHA256 (KDE/kde-i18n/kde-i18n-zh_TW-3.5.3.tar.bz2) = 9b3af694cb646a7b2ea9b937e5b3b01bf41ca6f5dcf5905ee93f7dee059e9369 -SIZE (KDE/kde-i18n/kde-i18n-zh_TW-3.5.3.tar.bz2) = 1493859 +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 diff --git a/chinese/kde4-l10n-zh_TW/pkg-plist b/chinese/kde4-l10n-zh_TW/pkg-plist index b349a1b03332..629f07546488 100644 --- a/chinese/kde4-l10n-zh_TW/pkg-plist +++ b/chinese/kde4-l10n-zh_TW/pkg-plist @@ -9,20 +9,31 @@ share/doc/HTML/zh_TW/khelpcenter/links.docbook share/doc/HTML/zh_TW/khelpcenter/support.docbook share/doc/HTML/zh_TW/khelpcenter/welcome.docbook share/doc/HTML/zh_TW/khelpcenter/whatiskde.docbook +share/locale/zh_TW/LC_MESSAGES/akregator.mo +share/locale/zh_TW/LC_MESSAGES/akregator_konqplugin.mo share/locale/zh_TW/LC_MESSAGES/alsaplayerui.mo share/locale/zh_TW/LC_MESSAGES/amor.mo share/locale/zh_TW/LC_MESSAGES/appletproxy.mo share/locale/zh_TW/LC_MESSAGES/ark.mo +share/locale/zh_TW/LC_MESSAGES/ark_plugin.mo share/locale/zh_TW/LC_MESSAGES/artsbuilder.mo share/locale/zh_TW/LC_MESSAGES/artscontrol.mo +share/locale/zh_TW/LC_MESSAGES/artsmodules.mo share/locale/zh_TW/LC_MESSAGES/atlantik.mo share/locale/zh_TW/LC_MESSAGES/atlantikdesigner.mo +share/locale/zh_TW/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/zh_TW/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/zh_TW/LC_MESSAGES/audiorename_plugin.mo share/locale/zh_TW/LC_MESSAGES/autorefresh.mo share/locale/zh_TW/LC_MESSAGES/babelfish.mo +share/locale/zh_TW/LC_MESSAGES/blinken.mo +share/locale/zh_TW/LC_MESSAGES/cervisia.mo +share/locale/zh_TW/LC_MESSAGES/charlatanui.mo share/locale/zh_TW/LC_MESSAGES/clockapplet.mo share/locale/zh_TW/LC_MESSAGES/crashesplugin.mo share/locale/zh_TW/LC_MESSAGES/cupsdconf.mo +share/locale/zh_TW/LC_MESSAGES/cvsservice.mo +share/locale/zh_TW/LC_MESSAGES/dcoprss.mo share/locale/zh_TW/LC_MESSAGES/dirfilterplugin.mo share/locale/zh_TW/LC_MESSAGES/display.mo share/locale/zh_TW/LC_MESSAGES/dockbarextension.mo @@ -30,35 +41,49 @@ share/locale/zh_TW/LC_MESSAGES/domtreeviewer.mo share/locale/zh_TW/LC_MESSAGES/drkonqi.mo share/locale/zh_TW/LC_MESSAGES/dub.mo share/locale/zh_TW/LC_MESSAGES/extensionproxy.mo +share/locale/zh_TW/LC_MESSAGES/ffrs.mo share/locale/zh_TW/LC_MESSAGES/filetypes.mo +share/locale/zh_TW/LC_MESSAGES/fsview.mo share/locale/zh_TW/LC_MESSAGES/htmlsearch.mo share/locale/zh_TW/LC_MESSAGES/imagerename_plugin.mo share/locale/zh_TW/LC_MESSAGES/imgalleryplugin.mo +share/locale/zh_TW/LC_MESSAGES/irkick.mo share/locale/zh_TW/LC_MESSAGES/joystick.mo +share/locale/zh_TW/LC_MESSAGES/juk.mo share/locale/zh_TW/LC_MESSAGES/kabc2mutt.mo share/locale/zh_TW/LC_MESSAGES/kabc_dir.mo share/locale/zh_TW/LC_MESSAGES/kabc_file.mo share/locale/zh_TW/LC_MESSAGES/kabc_ldapkio.mo share/locale/zh_TW/LC_MESSAGES/kabc_net.mo +share/locale/zh_TW/LC_MESSAGES/kabc_slox.mo share/locale/zh_TW/LC_MESSAGES/kabc_sql.mo share/locale/zh_TW/LC_MESSAGES/kabcformat_binary.mo share/locale/zh_TW/LC_MESSAGES/kaboodle.mo share/locale/zh_TW/LC_MESSAGES/kaccess.mo share/locale/zh_TW/LC_MESSAGES/kaddressbook.mo share/locale/zh_TW/LC_MESSAGES/kalarm.mo +share/locale/zh_TW/LC_MESSAGES/kanagram.mo share/locale/zh_TW/LC_MESSAGES/kandy.mo share/locale/zh_TW/LC_MESSAGES/kappfinder.mo share/locale/zh_TW/LC_MESSAGES/karm.mo share/locale/zh_TW/LC_MESSAGES/kasbarextension.mo share/locale/zh_TW/LC_MESSAGES/kasteroids.mo share/locale/zh_TW/LC_MESSAGES/kate.mo +share/locale/zh_TW/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/zh_TW/LC_MESSAGES/katefiletemplates.mo +share/locale/zh_TW/LC_MESSAGES/katefll_initplugin.mo +share/locale/zh_TW/LC_MESSAGES/katefll_plugin.mo share/locale/zh_TW/LC_MESSAGES/katehelloworld.mo share/locale/zh_TW/LC_MESSAGES/katehtmltools.mo share/locale/zh_TW/LC_MESSAGES/kateinsertcommand.mo +share/locale/zh_TW/LC_MESSAGES/katekjswrapper.mo +share/locale/zh_TW/LC_MESSAGES/katemake.mo share/locale/zh_TW/LC_MESSAGES/katemodeline.mo share/locale/zh_TW/LC_MESSAGES/kateopenheader.mo share/locale/zh_TW/LC_MESSAGES/katepart.mo share/locale/zh_TW/LC_MESSAGES/katepybrowse.mo +share/locale/zh_TW/LC_MESSAGES/katesnippets.mo +share/locale/zh_TW/LC_MESSAGES/katetabbarextension.mo share/locale/zh_TW/LC_MESSAGES/katetextfilter.mo share/locale/zh_TW/LC_MESSAGES/katexmlcheck.mo share/locale/zh_TW/LC_MESSAGES/katexmltools.mo @@ -66,13 +91,22 @@ share/locale/zh_TW/LC_MESSAGES/katomic.mo share/locale/zh_TW/LC_MESSAGES/kaudiocreator.mo share/locale/zh_TW/LC_MESSAGES/kay.mo share/locale/zh_TW/LC_MESSAGES/kbabel.mo +share/locale/zh_TW/LC_MESSAGES/kbackgammon.mo share/locale/zh_TW/LC_MESSAGES/kbattleship.mo +share/locale/zh_TW/LC_MESSAGES/kbinaryclock.mo share/locale/zh_TW/LC_MESSAGES/kblackbox.mo share/locale/zh_TW/LC_MESSAGES/kbounce.mo +share/locale/zh_TW/LC_MESSAGES/kbruch.mo +share/locale/zh_TW/LC_MESSAGES/kbstateapplet.mo share/locale/zh_TW/LC_MESSAGES/kbugbuster.mo share/locale/zh_TW/LC_MESSAGES/kcalc.mo share/locale/zh_TW/LC_MESSAGES/kcharselect.mo share/locale/zh_TW/LC_MESSAGES/kcharselectapplet.mo +share/locale/zh_TW/LC_MESSAGES/kcm_krfb.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewcanvasconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewgeneralconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewpluginsconfig.mo +share/locale/zh_TW/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo share/locale/zh_TW/LC_MESSAGES/kcmaccess.mo share/locale/zh_TW/LC_MESSAGES/kcmaccessibility.mo share/locale/zh_TW/LC_MESSAGES/kcmarts.mo @@ -92,6 +126,7 @@ share/locale/zh_TW/LC_MESSAGES/kcmicons.mo share/locale/zh_TW/LC_MESSAGES/kcminfo.mo share/locale/zh_TW/LC_MESSAGES/kcminput.mo share/locale/zh_TW/LC_MESSAGES/kcmioslaveinfo.mo +share/locale/zh_TW/LC_MESSAGES/kcmkabconfig.mo share/locale/zh_TW/LC_MESSAGES/kcmkamera.mo share/locale/zh_TW/LC_MESSAGES/kcmkclock.mo share/locale/zh_TW/LC_MESSAGES/kcmkded.mo @@ -102,9 +137,12 @@ share/locale/zh_TW/LC_MESSAGES/kcmkio.mo share/locale/zh_TW/LC_MESSAGES/kcmkonq.mo share/locale/zh_TW/LC_MESSAGES/kcmkonqhtml.mo share/locale/zh_TW/LC_MESSAGES/kcmkonsole.mo +share/locale/zh_TW/LC_MESSAGES/kcmkontactnt.mo share/locale/zh_TW/LC_MESSAGES/kcmktalkd.mo share/locale/zh_TW/LC_MESSAGES/kcmkuick.mo share/locale/zh_TW/LC_MESSAGES/kcmkurifilt.mo +share/locale/zh_TW/LC_MESSAGES/kcmkvaio.mo +share/locale/zh_TW/LC_MESSAGES/kcmkwallet.mo share/locale/zh_TW/LC_MESSAGES/kcmkwindecoration.mo share/locale/zh_TW/LC_MESSAGES/kcmkwinrules.mo share/locale/zh_TW/LC_MESSAGES/kcmkwm.mo @@ -113,20 +151,25 @@ share/locale/zh_TW/LC_MESSAGES/kcmlaptop.mo share/locale/zh_TW/LC_MESSAGES/kcmlaunch.mo share/locale/zh_TW/LC_MESSAGES/kcmlayout.mo share/locale/zh_TW/LC_MESSAGES/kcmlilo.mo +share/locale/zh_TW/LC_MESSAGES/kcmlirc.mo share/locale/zh_TW/LC_MESSAGES/kcmlocale.mo +share/locale/zh_TW/LC_MESSAGES/kcmmedia.mo share/locale/zh_TW/LC_MESSAGES/kcmnic.mo share/locale/zh_TW/LC_MESSAGES/kcmnotify.mo share/locale/zh_TW/LC_MESSAGES/kcmperformance.mo share/locale/zh_TW/LC_MESSAGES/kcmprintmgr.mo share/locale/zh_TW/LC_MESSAGES/kcmsamba.mo share/locale/zh_TW/LC_MESSAGES/kcmscreensaver.mo +share/locale/zh_TW/LC_MESSAGES/kcmshell.mo share/locale/zh_TW/LC_MESSAGES/kcmsmartcard.mo share/locale/zh_TW/LC_MESSAGES/kcmsmserver.mo share/locale/zh_TW/LC_MESSAGES/kcmspellchecking.mo share/locale/zh_TW/LC_MESSAGES/kcmstyle.mo share/locale/zh_TW/LC_MESSAGES/kcmtaskbar.mo +share/locale/zh_TW/LC_MESSAGES/kcmthinkpad.mo share/locale/zh_TW/LC_MESSAGES/kcmusb.mo share/locale/zh_TW/LC_MESSAGES/kcmview1394.mo +share/locale/zh_TW/LC_MESSAGES/kcmwifi.mo share/locale/zh_TW/LC_MESSAGES/kcmxinerama.mo share/locale/zh_TW/LC_MESSAGES/kcoloredit.mo share/locale/zh_TW/LC_MESSAGES/kcontrol.mo @@ -136,7 +179,10 @@ share/locale/zh_TW/LC_MESSAGES/kdcop.mo share/locale/zh_TW/LC_MESSAGES/kdebugdialog.mo share/locale/zh_TW/LC_MESSAGES/kdelibs.mo share/locale/zh_TW/LC_MESSAGES/kdelibs_colors.mo +share/locale/zh_TW/LC_MESSAGES/kdelirc.mo share/locale/zh_TW/LC_MESSAGES/kdepasswd.mo +share/locale/zh_TW/LC_MESSAGES/kdepimresources.mo +share/locale/zh_TW/LC_MESSAGES/kdepimwizards.mo share/locale/zh_TW/LC_MESSAGES/kdeprint.mo share/locale/zh_TW/LC_MESSAGES/kdeprint_part.mo share/locale/zh_TW/LC_MESSAGES/kdeprintfax.mo @@ -146,9 +192,11 @@ share/locale/zh_TW/LC_MESSAGES/kdesu.mo share/locale/zh_TW/LC_MESSAGES/kdesud.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 share/locale/zh_TW/LC_MESSAGES/kdialog.mo share/locale/zh_TW/LC_MESSAGES/kdict.mo share/locale/zh_TW/LC_MESSAGES/kdictapplet.mo +share/locale/zh_TW/LC_MESSAGES/kdjview.mo share/locale/zh_TW/LC_MESSAGES/kdmconfig.mo share/locale/zh_TW/LC_MESSAGES/kdmgreet.mo share/locale/zh_TW/LC_MESSAGES/kdvi.mo @@ -156,48 +204,78 @@ share/locale/zh_TW/LC_MESSAGES/kedit.mo share/locale/zh_TW/LC_MESSAGES/keduca.mo share/locale/zh_TW/LC_MESSAGES/kenolaba.mo share/locale/zh_TW/LC_MESSAGES/kfax.mo +share/locale/zh_TW/LC_MESSAGES/kfaxview.mo share/locale/zh_TW/LC_MESSAGES/kfifteenapplet.mo share/locale/zh_TW/LC_MESSAGES/kfile_au.mo share/locale/zh_TW/LC_MESSAGES/kfile_avi.mo share/locale/zh_TW/LC_MESSAGES/kfile_bmp.mo +share/locale/zh_TW/LC_MESSAGES/kfile_cert.mo share/locale/zh_TW/LC_MESSAGES/kfile_cpp.mo +share/locale/zh_TW/LC_MESSAGES/kfile_dds.mo share/locale/zh_TW/LC_MESSAGES/kfile_deb.mo share/locale/zh_TW/LC_MESSAGES/kfile_desktop.mo share/locale/zh_TW/LC_MESSAGES/kfile_diff.mo +share/locale/zh_TW/LC_MESSAGES/kfile_drgeo.mo +share/locale/zh_TW/LC_MESSAGES/kfile_dvi.mo +share/locale/zh_TW/LC_MESSAGES/kfile_exr.mo +share/locale/zh_TW/LC_MESSAGES/kfile_flac.mo share/locale/zh_TW/LC_MESSAGES/kfile_folder.mo share/locale/zh_TW/LC_MESSAGES/kfile_gif.mo share/locale/zh_TW/LC_MESSAGES/kfile_html.mo share/locale/zh_TW/LC_MESSAGES/kfile_ico.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ics.mo share/locale/zh_TW/LC_MESSAGES/kfile_jpeg.mo +share/locale/zh_TW/LC_MESSAGES/kfile_kig.mo +share/locale/zh_TW/LC_MESSAGES/kfile_lnk.mo share/locale/zh_TW/LC_MESSAGES/kfile_m3u.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mhtml.mo share/locale/zh_TW/LC_MESSAGES/kfile_mp3.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mpc.mo +share/locale/zh_TW/LC_MESSAGES/kfile_mpeg.mo share/locale/zh_TW/LC_MESSAGES/kfile_ogg.mo +share/locale/zh_TW/LC_MESSAGES/kfile_palm.mo +share/locale/zh_TW/LC_MESSAGES/kfile_pcx.mo share/locale/zh_TW/LC_MESSAGES/kfile_pdf.mo share/locale/zh_TW/LC_MESSAGES/kfile_png.mo +share/locale/zh_TW/LC_MESSAGES/kfile_pnm.mo share/locale/zh_TW/LC_MESSAGES/kfile_po.mo share/locale/zh_TW/LC_MESSAGES/kfile_ps.mo +share/locale/zh_TW/LC_MESSAGES/kfile_rfc822.mo +share/locale/zh_TW/LC_MESSAGES/kfile_rgb.mo share/locale/zh_TW/LC_MESSAGES/kfile_rpm.mo +share/locale/zh_TW/LC_MESSAGES/kfile_sid.mo share/locale/zh_TW/LC_MESSAGES/kfile_tga.mo +share/locale/zh_TW/LC_MESSAGES/kfile_theora.mo share/locale/zh_TW/LC_MESSAGES/kfile_tiff.mo +share/locale/zh_TW/LC_MESSAGES/kfile_torrent.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ts.mo share/locale/zh_TW/LC_MESSAGES/kfile_txt.mo share/locale/zh_TW/LC_MESSAGES/kfile_vcf.mo 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/kfileshare.mo share/locale/zh_TW/LC_MESSAGES/kfindpart.mo share/locale/zh_TW/LC_MESSAGES/kfloppy.mo share/locale/zh_TW/LC_MESSAGES/kfmclient.mo share/locale/zh_TW/LC_MESSAGES/kfontinst.mo share/locale/zh_TW/LC_MESSAGES/kfouleggs.mo +share/locale/zh_TW/LC_MESSAGES/kgamma.mo share/locale/zh_TW/LC_MESSAGES/kgantt.mo +share/locale/zh_TW/LC_MESSAGES/kgeography.mo share/locale/zh_TW/LC_MESSAGES/kget.mo share/locale/zh_TW/LC_MESSAGES/kghostview.mo share/locale/zh_TW/LC_MESSAGES/kgoldrunner.mo share/locale/zh_TW/LC_MESSAGES/kgpg.mo +share/locale/zh_TW/LC_MESSAGES/kgreet_classic.mo +share/locale/zh_TW/LC_MESSAGES/kgreet_winbind.mo share/locale/zh_TW/LC_MESSAGES/khangman.mo share/locale/zh_TW/LC_MESSAGES/khelpcenter.mo share/locale/zh_TW/LC_MESSAGES/khexedit.mo +share/locale/zh_TW/LC_MESSAGES/khexedit2part.mo share/locale/zh_TW/LC_MESSAGES/khotkeys.mo +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 @@ -207,19 +285,33 @@ share/locale/zh_TW/LC_MESSAGES/kio_audiocd.mo share/locale/zh_TW/LC_MESSAGES/kio_finger.mo share/locale/zh_TW/LC_MESSAGES/kio_fish.mo share/locale/zh_TW/LC_MESSAGES/kio_floppy.mo +share/locale/zh_TW/LC_MESSAGES/kio_groupwise.mo share/locale/zh_TW/LC_MESSAGES/kio_help.mo +share/locale/zh_TW/LC_MESSAGES/kio_home.mo share/locale/zh_TW/LC_MESSAGES/kio_imap4.mo +share/locale/zh_TW/LC_MESSAGES/kio_jabberdisco.mo share/locale/zh_TW/LC_MESSAGES/kio_lan.mo +share/locale/zh_TW/LC_MESSAGES/kio_ldap.mo share/locale/zh_TW/LC_MESSAGES/kio_mac.mo share/locale/zh_TW/LC_MESSAGES/kio_man.mo share/locale/zh_TW/LC_MESSAGES/kio_media.mo +share/locale/zh_TW/LC_MESSAGES/kio_mobile.mo share/locale/zh_TW/LC_MESSAGES/kio_nfs.mo share/locale/zh_TW/LC_MESSAGES/kio_nntp.mo share/locale/zh_TW/LC_MESSAGES/kio_pop3.mo share/locale/zh_TW/LC_MESSAGES/kio_print.mo +share/locale/zh_TW/LC_MESSAGES/kio_remote.mo +share/locale/zh_TW/LC_MESSAGES/kio_settings.mo share/locale/zh_TW/LC_MESSAGES/kio_sftp.mo +share/locale/zh_TW/LC_MESSAGES/kio_sieve.mo share/locale/zh_TW/LC_MESSAGES/kio_smb.mo share/locale/zh_TW/LC_MESSAGES/kio_smtp.mo +share/locale/zh_TW/LC_MESSAGES/kio_svn.mo +share/locale/zh_TW/LC_MESSAGES/kio_system.mo +share/locale/zh_TW/LC_MESSAGES/kio_tar.mo +share/locale/zh_TW/LC_MESSAGES/kio_thumbnail.mo +share/locale/zh_TW/LC_MESSAGES/kio_trash.mo +share/locale/zh_TW/LC_MESSAGES/kio_zeroconf.mo share/locale/zh_TW/LC_MESSAGES/kioexec.mo share/locale/zh_TW/LC_MESSAGES/kiten.mo share/locale/zh_TW/LC_MESSAGES/kjobviewer.mo @@ -227,38 +319,65 @@ share/locale/zh_TW/LC_MESSAGES/kjots.mo share/locale/zh_TW/LC_MESSAGES/kjumpingcube.mo share/locale/zh_TW/LC_MESSAGES/klaptopdaemon.mo share/locale/zh_TW/LC_MESSAGES/klatin.mo +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/klipper.mo share/locale/zh_TW/LC_MESSAGES/klock.mo +share/locale/zh_TW/LC_MESSAGES/kmag.mo share/locale/zh_TW/LC_MESSAGES/kmahjongg.mo share/locale/zh_TW/LC_MESSAGES/kmail.mo +share/locale/zh_TW/LC_MESSAGES/kmail_text_calendar_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/zh_TW/LC_MESSAGES/kmailcvt.mo share/locale/zh_TW/LC_MESSAGES/kmathapplet.mo +share/locale/zh_TW/LC_MESSAGES/kmcop.mo share/locale/zh_TW/LC_MESSAGES/kmenuapplet.mo share/locale/zh_TW/LC_MESSAGES/kmenuedit.mo -share/locale/zh_TW/LC_MESSAGES/kmessedwords.mo share/locale/zh_TW/LC_MESSAGES/kmid.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_delli8k.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_generic.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_kvaio.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_powerbook.mo +share/locale/zh_TW/LC_MESSAGES/kmilo_thinkpad.mo +share/locale/zh_TW/LC_MESSAGES/kmilod.mo share/locale/zh_TW/LC_MESSAGES/kmines.mo share/locale/zh_TW/LC_MESSAGES/kminipagerapplet.mo share/locale/zh_TW/LC_MESSAGES/kmix.mo +share/locale/zh_TW/LC_MESSAGES/kmobile.mo share/locale/zh_TW/LC_MESSAGES/kmoon.mo share/locale/zh_TW/LC_MESSAGES/kmousetool.mo share/locale/zh_TW/LC_MESSAGES/kmouth.mo +share/locale/zh_TW/LC_MESSAGES/kmrml.mo +share/locale/zh_TW/LC_MESSAGES/knetattach.mo +share/locale/zh_TW/LC_MESSAGES/knetwalk.mo +share/locale/zh_TW/LC_MESSAGES/knetworkconf.mo share/locale/zh_TW/LC_MESSAGES/knewsticker.mo share/locale/zh_TW/LC_MESSAGES/knode.mo share/locale/zh_TW/LC_MESSAGES/knotes.mo share/locale/zh_TW/LC_MESSAGES/knotify.mo 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/kompare.mo +share/locale/zh_TW/LC_MESSAGES/konnector_dummy.mo +share/locale/zh_TW/LC_MESSAGES/konnector_kabc.mo +share/locale/zh_TW/LC_MESSAGES/konnector_kcal.mo +share/locale/zh_TW/LC_MESSAGES/konnector_local.mo +share/locale/zh_TW/LC_MESSAGES/konnector_qtopia.mo +share/locale/zh_TW/LC_MESSAGES/konnector_remote.mo +share/locale/zh_TW/LC_MESSAGES/konqsidebar_delicious.mo share/locale/zh_TW/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/zh_TW/LC_MESSAGES/konqsidebar_metabar.mo share/locale/zh_TW/LC_MESSAGES/konqsidebar_news.mo share/locale/zh_TW/LC_MESSAGES/konqueror.mo share/locale/zh_TW/LC_MESSAGES/konquest.mo share/locale/zh_TW/LC_MESSAGES/konsole.mo +share/locale/zh_TW/LC_MESSAGES/konsolekalendar.mo share/locale/zh_TW/LC_MESSAGES/kontact.mo +share/locale/zh_TW/LC_MESSAGES/kooka.mo share/locale/zh_TW/LC_MESSAGES/kopete.mo share/locale/zh_TW/LC_MESSAGES/korganizer.mo share/locale/zh_TW/LC_MESSAGES/korn.mo @@ -267,6 +386,7 @@ share/locale/zh_TW/LC_MESSAGES/kpager.mo share/locale/zh_TW/LC_MESSAGES/kpartsaver.mo share/locale/zh_TW/LC_MESSAGES/kpat.mo share/locale/zh_TW/LC_MESSAGES/kpdf.mo +share/locale/zh_TW/LC_MESSAGES/kpercentage.mo share/locale/zh_TW/LC_MESSAGES/kpersonalizer.mo share/locale/zh_TW/LC_MESSAGES/kpf.mo share/locale/zh_TW/LC_MESSAGES/kpilot.mo @@ -276,16 +396,32 @@ share/locale/zh_TW/LC_MESSAGES/kppplogview.mo share/locale/zh_TW/LC_MESSAGES/kprinter.mo share/locale/zh_TW/LC_MESSAGES/krandr.mo share/locale/zh_TW/LC_MESSAGES/krdb.mo +share/locale/zh_TW/LC_MESSAGES/krdc.mo share/locale/zh_TW/LC_MESSAGES/kreadconfig.mo share/locale/zh_TW/LC_MESSAGES/krec.mo share/locale/zh_TW/LC_MESSAGES/kregexpeditor.mo +share/locale/zh_TW/LC_MESSAGES/kres_birthday.mo +share/locale/zh_TW/LC_MESSAGES/kres_blogging.mo +share/locale/zh_TW/LC_MESSAGES/kres_bugzilla.mo +share/locale/zh_TW/LC_MESSAGES/kres_exchange.mo +share/locale/zh_TW/LC_MESSAGES/kres_featureplan.mo +share/locale/zh_TW/LC_MESSAGES/kres_groupware.mo +share/locale/zh_TW/LC_MESSAGES/kres_groupwise.mo +share/locale/zh_TW/LC_MESSAGES/kres_kolab.mo +share/locale/zh_TW/LC_MESSAGES/kres_remote.mo +share/locale/zh_TW/LC_MESSAGES/kres_tvanytime.mo +share/locale/zh_TW/LC_MESSAGES/kres_xmlrpc.mo share/locale/zh_TW/LC_MESSAGES/kreversi.mo +share/locale/zh_TW/LC_MESSAGES/krfb.mo share/locale/zh_TW/LC_MESSAGES/kruler.mo share/locale/zh_TW/LC_MESSAGES/krunapplet.mo share/locale/zh_TW/LC_MESSAGES/ksame.mo +share/locale/zh_TW/LC_MESSAGES/ksayit.mo share/locale/zh_TW/LC_MESSAGES/kscd.mo share/locale/zh_TW/LC_MESSAGES/kscreensaver.mo share/locale/zh_TW/LC_MESSAGES/kshisen.mo +share/locale/zh_TW/LC_MESSAGES/ksig.mo +share/locale/zh_TW/LC_MESSAGES/ksim.mo share/locale/zh_TW/LC_MESSAGES/ksirc.mo share/locale/zh_TW/LC_MESSAGES/ksirtet.mo share/locale/zh_TW/LC_MESSAGES/ksmiletris.mo @@ -299,12 +435,19 @@ share/locale/zh_TW/LC_MESSAGES/ksplashthemes.mo share/locale/zh_TW/LC_MESSAGES/kstars.mo share/locale/zh_TW/LC_MESSAGES/kstart.mo share/locale/zh_TW/LC_MESSAGES/kstartperf.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_highcontrast_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_phase_config.mo +share/locale/zh_TW/LC_MESSAGES/kstyle_plastik_config.mo share/locale/zh_TW/LC_MESSAGES/ksvgplugin.mo share/locale/zh_TW/LC_MESSAGES/ksync.mo share/locale/zh_TW/LC_MESSAGES/ksysguard.mo share/locale/zh_TW/LC_MESSAGES/ksystemtrayapplet.mo +share/locale/zh_TW/LC_MESSAGES/ksystraycmd.mo share/locale/zh_TW/LC_MESSAGES/ksysv.mo share/locale/zh_TW/LC_MESSAGES/kteatime.mo +share/locale/zh_TW/LC_MESSAGES/ktexteditor_autobookmarker.mo +share/locale/zh_TW/LC_MESSAGES/ktexteditor_docwordcompletion.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_isearch.mo share/locale/zh_TW/LC_MESSAGES/ktexteditor_kdatatool.mo @@ -312,28 +455,51 @@ share/locale/zh_TW/LC_MESSAGES/kthememanager.mo share/locale/zh_TW/LC_MESSAGES/ktimemon.mo share/locale/zh_TW/LC_MESSAGES/ktimer.mo share/locale/zh_TW/LC_MESSAGES/ktip.mo +share/locale/zh_TW/LC_MESSAGES/ktnef.mo share/locale/zh_TW/LC_MESSAGES/ktouch.mo share/locale/zh_TW/LC_MESSAGES/ktron.mo +share/locale/zh_TW/LC_MESSAGES/kttsd.mo share/locale/zh_TW/LC_MESSAGES/ktuberling.mo +share/locale/zh_TW/LC_MESSAGES/kturtle.mo share/locale/zh_TW/LC_MESSAGES/ktux.mo share/locale/zh_TW/LC_MESSAGES/kuick_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kuickshow.mo +share/locale/zh_TW/LC_MESSAGES/kuiviewer.mo share/locale/zh_TW/LC_MESSAGES/kuser.mo share/locale/zh_TW/LC_MESSAGES/kview.mo share/locale/zh_TW/LC_MESSAGES/kview_scale.mo share/locale/zh_TW/LC_MESSAGES/kviewbrowserplugin.mo +share/locale/zh_TW/LC_MESSAGES/kviewcanvas.mo +share/locale/zh_TW/LC_MESSAGES/kvieweffectsplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewpresenterplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewscannerplugin.mo share/locale/zh_TW/LC_MESSAGES/kviewshell.mo +share/locale/zh_TW/LC_MESSAGES/kviewviewer.mo +share/locale/zh_TW/LC_MESSAGES/kwalletmanager.mo +share/locale/zh_TW/LC_MESSAGES/kwatchgnupg.mo share/locale/zh_TW/LC_MESSAGES/kweather.mo +share/locale/zh_TW/LC_MESSAGES/kwifimanager.mo share/locale/zh_TW/LC_MESSAGES/kwin.mo share/locale/zh_TW/LC_MESSAGES/kwin4.mo +share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo +share/locale/zh_TW/LC_MESSAGES/kwin_lib.mo +share/locale/zh_TW/LC_MESSAGES/kwireless.mo 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/libkcalsystem.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 +share/locale/zh_TW/LC_MESSAGES/libkaddrbk_gmx_xxport.mo +share/locale/zh_TW/LC_MESSAGES/libkcal.mo +share/locale/zh_TW/LC_MESSAGES/libkcddb.mo +share/locale/zh_TW/LC_MESSAGES/libkdeedu.mo share/locale/zh_TW/LC_MESSAGES/libkdegames.mo share/locale/zh_TW/LC_MESSAGES/libkdepim.mo +share/locale/zh_TW/LC_MESSAGES/libkfaximgage.mo +share/locale/zh_TW/LC_MESSAGES/libkholidays.mo share/locale/zh_TW/LC_MESSAGES/libkicker.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_konsole.mo @@ -342,28 +508,44 @@ share/locale/zh_TW/LC_MESSAGES/libkickermenu_recentdocs.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/zh_TW/LC_MESSAGES/libkickermenu_tom.mo +share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo +share/locale/zh_TW/LC_MESSAGES/libkmime.mo share/locale/zh_TW/LC_MESSAGES/libkonq.mo +share/locale/zh_TW/LC_MESSAGES/libkpgp.mo +share/locale/zh_TW/LC_MESSAGES/libkpimexchange.mo share/locale/zh_TW/LC_MESSAGES/libkscan.mo share/locale/zh_TW/LC_MESSAGES/libkscreensaver.mo +share/locale/zh_TW/LC_MESSAGES/libksieve.mo share/locale/zh_TW/LC_MESSAGES/libksirtet.mo +share/locale/zh_TW/LC_MESSAGES/libksync.mo share/locale/zh_TW/LC_MESSAGES/libtaskbar.mo share/locale/zh_TW/LC_MESSAGES/libtaskmanager.mo share/locale/zh_TW/LC_MESSAGES/lockout.mo share/locale/zh_TW/LC_MESSAGES/lskat.mo +share/locale/zh_TW/LC_MESSAGES/lyrics.mo share/locale/zh_TW/LC_MESSAGES/mediaapplet.mo share/locale/zh_TW/LC_MESSAGES/mediacontrol.mo +share/locale/zh_TW/LC_MESSAGES/mf_konqplugin.mo +share/locale/zh_TW/LC_MESSAGES/minitoolsplugin.mo +share/locale/zh_TW/LC_MESSAGES/multisynk.mo share/locale/zh_TW/LC_MESSAGES/naughtyapplet.mo +share/locale/zh_TW/LC_MESSAGES/nexscope.mo share/locale/zh_TW/LC_MESSAGES/noatun.mo share/locale/zh_TW/LC_MESSAGES/nsplugin.mo +share/locale/zh_TW/LC_MESSAGES/pitchablespeed.mo share/locale/zh_TW/LC_MESSAGES/ppdtranslations.mo share/locale/zh_TW/LC_MESSAGES/privacy.mo share/locale/zh_TW/LC_MESSAGES/qeditor.mo share/locale/zh_TW/LC_MESSAGES/quanta.mo share/locale/zh_TW/LC_MESSAGES/quicklauncher.mo +share/locale/zh_TW/LC_MESSAGES/rellinks.mo +share/locale/zh_TW/LC_MESSAGES/searchbarplugin.mo share/locale/zh_TW/LC_MESSAGES/secpolicy.mo share/locale/zh_TW/LC_MESSAGES/spy.mo +share/locale/zh_TW/LC_MESSAGES/superkaramba.mo share/locale/zh_TW/LC_MESSAGES/synaescope.mo share/locale/zh_TW/LC_MESSAGES/timezones.mo +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 diff --git a/chinese/koffice-i18n-zh_CN/Makefile b/chinese/koffice-i18n-zh_CN/Makefile index 25941d98b1ee..740dd398762b 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.1 +PORTVERSION= 1.5.2 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 dcad4fc4d5db..350c1b4e2110 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.1.tar.bz2) = f691b1667472c36f8c8ec3fb69ac11ea -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 920f19eef1d2331ce0c9adbd005c7950125f9049d1cb981640d2dd81d3843e11 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 343337 +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 diff --git a/chinese/koffice-i18n-zh_TW/Makefile b/chinese/koffice-i18n-zh_TW/Makefile index 88c267991eec..f71d18687493 100644 --- a/chinese/koffice-i18n-zh_TW/Makefile +++ b/chinese/koffice-i18n-zh_TW/Makefile @@ -6,10 +6,10 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.5 +PORTVERSION= 1.5.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= zh_TW- DIST_SUBDIR= KDE diff --git a/chinese/koffice-i18n-zh_TW/distinfo b/chinese/koffice-i18n-zh_TW/distinfo index f7d6d0111ecd..87e6dc793a73 100644 --- a/chinese/koffice-i18n-zh_TW/distinfo +++ b/chinese/koffice-i18n-zh_TW/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = 5bb197f88cefdbf59d3ec5ab0e8604bd -SHA256 (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = ece606b6ed67910b8c7207cd065d5636c7dde76b93df5b4176f5b874ecd59acc -SIZE (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = 587628 +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 diff --git a/chinese/koffice-i18n-zh_TW/pkg-plist b/chinese/koffice-i18n-zh_TW/pkg-plist index d180b1952126..b84480f92d10 100644 --- a/chinese/koffice-i18n-zh_TW/pkg-plist +++ b/chinese/koffice-i18n-zh_TW/pkg-plist @@ -1,45 +1,30 @@ -share/locale/zh_TW/LC_MESSAGES/csvfilter.mo share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo -share/locale/zh_TW/LC_MESSAGES/graphite.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdatabase.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 share/locale/zh_TW/LC_MESSAGES/kfile_koffice.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ooo.mo +share/locale/zh_TW/LC_MESSAGES/kformdesigner.mo share/locale/zh_TW/LC_MESSAGES/kformula.mo -share/locale/zh_TW/LC_MESSAGES/kformulalatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kformulapngfilter.mo share/locale/zh_TW/LC_MESSAGES/kivio.mo share/locale/zh_TW/LC_MESSAGES/koconverter.mo -share/locale/zh_TW/LC_MESSAGES/kocryptfilter.mo share/locale/zh_TW/LC_MESSAGES/koffice.mo -share/locale/zh_TW/LC_MESSAGES/kontour.mo +share/locale/zh_TW/LC_MESSAGES/kofficefilters.mo +share/locale/zh_TW/LC_MESSAGES/koproperty.mo share/locale/zh_TW/LC_MESSAGES/koshell.mo share/locale/zh_TW/LC_MESSAGES/kounavail.mo share/locale/zh_TW/LC_MESSAGES/kplato.mo share/locale/zh_TW/LC_MESSAGES/kpresenter.mo -share/locale/zh_TW/LC_MESSAGES/kpresenterkwordfilter.mo share/locale/zh_TW/LC_MESSAGES/krita.mo share/locale/zh_TW/LC_MESSAGES/kscan_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kscreenshot_plugin.mo share/locale/zh_TW/LC_MESSAGES/kspread.mo share/locale/zh_TW/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/zh_TW/LC_MESSAGES/kspreadqprofilter.mo +share/locale/zh_TW/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/zh_TW/LC_MESSAGES/kthesaurus.mo -share/locale/zh_TW/LC_MESSAGES/kudesigner.mo share/locale/zh_TW/LC_MESSAGES/kugar.mo share/locale/zh_TW/LC_MESSAGES/kword.mo -share/locale/zh_TW/LC_MESSAGES/kwordabiwordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordasciifilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlateximportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswritefilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordpdfimport.mo -share/locale/zh_TW/LC_MESSAGES/olefilterswinword97filter.mo -share/locale/zh_TW/LC_MESSAGES/xsltexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltimportfilter.mo +share/locale/zh_TW/LC_MESSAGES/thesaurus_tool.mo diff --git a/chinese/koffice-kde4-l10n-zh_CN/Makefile b/chinese/koffice-kde4-l10n-zh_CN/Makefile index 25941d98b1ee..740dd398762b 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.1 +PORTVERSION= 1.5.2 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 dcad4fc4d5db..350c1b4e2110 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.1.tar.bz2) = f691b1667472c36f8c8ec3fb69ac11ea -SHA256 (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 920f19eef1d2331ce0c9adbd005c7950125f9049d1cb981640d2dd81d3843e11 -SIZE (KDE/kde-i18n/koffice-l10n-zh_CN-1.5.1.tar.bz2) = 343337 +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 diff --git a/chinese/koffice-kde4-l10n-zh_TW/Makefile b/chinese/koffice-kde4-l10n-zh_TW/Makefile index 88c267991eec..f71d18687493 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/Makefile +++ b/chinese/koffice-kde4-l10n-zh_TW/Makefile @@ -6,10 +6,10 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.3.5 +PORTVERSION= 1.5.2 CATEGORIES?= chinese kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n PKGNAMEPREFIX= zh_TW- DIST_SUBDIR= KDE diff --git a/chinese/koffice-kde4-l10n-zh_TW/distinfo b/chinese/koffice-kde4-l10n-zh_TW/distinfo index f7d6d0111ecd..87e6dc793a73 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-i18n-zh_TW-1.3.5.tar.bz2) = 5bb197f88cefdbf59d3ec5ab0e8604bd -SHA256 (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = ece606b6ed67910b8c7207cd065d5636c7dde76b93df5b4176f5b874ecd59acc -SIZE (KDE/kde-i18n/koffice-i18n-zh_TW-1.3.5.tar.bz2) = 587628 +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 diff --git a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist index d180b1952126..b84480f92d10 100644 --- a/chinese/koffice-kde4-l10n-zh_TW/pkg-plist +++ b/chinese/koffice-kde4-l10n-zh_TW/pkg-plist @@ -1,45 +1,30 @@ -share/locale/zh_TW/LC_MESSAGES/csvfilter.mo share/locale/zh_TW/LC_MESSAGES/desktop_koffice.mo share/locale/zh_TW/LC_MESSAGES/example.mo -share/locale/zh_TW/LC_MESSAGES/graphite.mo share/locale/zh_TW/LC_MESSAGES/karbon.mo share/locale/zh_TW/LC_MESSAGES/kchart.mo -share/locale/zh_TW/LC_MESSAGES/kdatabase.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 share/locale/zh_TW/LC_MESSAGES/kfile_koffice.mo +share/locale/zh_TW/LC_MESSAGES/kfile_ooo.mo +share/locale/zh_TW/LC_MESSAGES/kformdesigner.mo share/locale/zh_TW/LC_MESSAGES/kformula.mo -share/locale/zh_TW/LC_MESSAGES/kformulalatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kformulapngfilter.mo share/locale/zh_TW/LC_MESSAGES/kivio.mo share/locale/zh_TW/LC_MESSAGES/koconverter.mo -share/locale/zh_TW/LC_MESSAGES/kocryptfilter.mo share/locale/zh_TW/LC_MESSAGES/koffice.mo -share/locale/zh_TW/LC_MESSAGES/kontour.mo +share/locale/zh_TW/LC_MESSAGES/kofficefilters.mo +share/locale/zh_TW/LC_MESSAGES/koproperty.mo share/locale/zh_TW/LC_MESSAGES/koshell.mo share/locale/zh_TW/LC_MESSAGES/kounavail.mo share/locale/zh_TW/LC_MESSAGES/kplato.mo share/locale/zh_TW/LC_MESSAGES/kpresenter.mo -share/locale/zh_TW/LC_MESSAGES/kpresenterkwordfilter.mo share/locale/zh_TW/LC_MESSAGES/krita.mo share/locale/zh_TW/LC_MESSAGES/kscan_plugin.mo +share/locale/zh_TW/LC_MESSAGES/kscreenshot_plugin.mo share/locale/zh_TW/LC_MESSAGES/kspread.mo share/locale/zh_TW/LC_MESSAGES/kspreadcalc_calc.mo -share/locale/zh_TW/LC_MESSAGES/kspreadqprofilter.mo +share/locale/zh_TW/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/zh_TW/LC_MESSAGES/kthesaurus.mo -share/locale/zh_TW/LC_MESSAGES/kudesigner.mo share/locale/zh_TW/LC_MESSAGES/kugar.mo share/locale/zh_TW/LC_MESSAGES/kword.mo -share/locale/zh_TW/LC_MESSAGES/kwordabiwordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordasciifilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordhtmlimportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlatexfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordlateximportfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswordfilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordmswritefilter.mo -share/locale/zh_TW/LC_MESSAGES/kwordpdfimport.mo -share/locale/zh_TW/LC_MESSAGES/olefilterswinword97filter.mo -share/locale/zh_TW/LC_MESSAGES/xsltexportfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltfilter.mo -share/locale/zh_TW/LC_MESSAGES/xsltimportfilter.mo +share/locale/zh_TW/LC_MESSAGES/thesaurus_tool.mo diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/comms/kremotecontrol/distinfo +++ b/comms/kremotecontrol/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index aad6ebbc2eee..0e6042bf052d 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -5,9 +5,10 @@ # $FreeBSD$ PORTNAME= keximdb -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 CATEGORIES= databases -MASTER_SITES= http://martin.ellis.name/koffice/ +MASTER_SITES= ${MASTER_SITE_KDE} +MASTER_SITE_SUBDIR= stable/koffice-1.5.2/src MAINTAINER= kde@FreeBSD.org COMMENT= MS Access import plugin for Kexi diff --git a/databases/keximdb/distinfo b/databases/keximdb/distinfo index 427532efebc2..bbebebfabdcf 100644 --- a/databases/keximdb/distinfo +++ b/databases/keximdb/distinfo @@ -1,3 +1,2 @@ -MD5 (keximdb-1.0.1.tar.gz) = 5c439795efbfdcb01b54f1f07772220f -SHA256 (keximdb-1.0.1.tar.gz) = f7cb7639d0f933474560bda95fb685889b9054cc5594626a5c4ffb4f461d9148 -SIZE (keximdb-1.0.1.tar.gz) = 596030 +MD5 (keximdb-1.0.2.tar.gz) = 5d63539e8ee69b9f4bb27932d809fde4 +SIZE (keximdb-1.0.2.tar.gz) = 583078 diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/deskutils/kcharselect/distinfo +++ b/deskutils/kcharselect/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo index 4c40f026b0ae..0c2772ca7f70 100644 --- a/deskutils/kdepim3/distinfo +++ b/deskutils/kdepim3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.3.tar.bz2) = 2b83885854a5953bca59508d9a7cf5ef -SHA256 (KDE/kdepim-3.5.3.tar.bz2) = 460f9104c63c8a57801f5405be7c709e8604abf93c7f35ee9d60d20e0e0e5adb -SIZE (KDE/kdepim-3.5.3.tar.bz2) = 12912017 +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 diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo index 4c40f026b0ae..0c2772ca7f70 100644 --- a/deskutils/kdepim4/distinfo +++ b/deskutils/kdepim4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.3.tar.bz2) = 2b83885854a5953bca59508d9a7cf5ef -SHA256 (KDE/kdepim-3.5.3.tar.bz2) = 460f9104c63c8a57801f5405be7c709e8604abf93c7f35ee9d60d20e0e0e5adb -SIZE (KDE/kdepim-3.5.3.tar.bz2) = 12912017 +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 diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo index 4c40f026b0ae..0c2772ca7f70 100644 --- a/deskutils/kdepim44/distinfo +++ b/deskutils/kdepim44/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdepim-3.5.3.tar.bz2) = 2b83885854a5953bca59508d9a7cf5ef -SHA256 (KDE/kdepim-3.5.3.tar.bz2) = 460f9104c63c8a57801f5405be7c709e8604abf93c7f35ee9d60d20e0e0e5adb -SIZE (KDE/kdepim-3.5.3.tar.bz2) = 12912017 +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 diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index 825094f0bafc..e7b1e72619ee 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.3.tar.bz2) = 75450d8905a2cc612df00927c7f81af9 -SHA256 (KDE/kdesdk-3.5.3.tar.bz2) = b600fe704db89a15cf908e36314dcfd7edfb896ee535fac00f5bf87b7eeb9971 -SIZE (KDE/kdesdk-3.5.3.tar.bz2) = 4909060 +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 diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index 825094f0bafc..e7b1e72619ee 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdesdk-3.5.3.tar.bz2) = 75450d8905a2cc612df00927c7f81af9 -SHA256 (KDE/kdesdk-3.5.3.tar.bz2) = b600fe704db89a15cf908e36314dcfd7edfb896ee535fac00f5bf87b7eeb9971 -SIZE (KDE/kdesdk-3.5.3.tar.bz2) = 4909060 +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 diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 0cae35011274..290ddd4af77f 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,8 +6,7 @@ # PORTNAME= kdevelop -PORTVERSION= 3.3.3 -PORTREVISION= 1 +PORTVERSION= 3.3.4 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 bd47d0ef2c4d..e039cbede87b 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdevelop-3.3.3.tar.bz2) = 89f3ad2b3e97e92bd9421f0d9ae8e427 -SHA256 (KDE/kdevelop-3.3.3.tar.bz2) = d80721da71e13302db53ab839a6f16a92e5bff1b628a5b7214bf30e8256c3f5b -SIZE (KDE/kdevelop-3.3.3.tar.bz2) = 8127041 +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 diff --git a/editors/calligra-l10n-ca/Makefile b/editors/calligra-l10n-ca/Makefile index 0e7ecad639c0..99d12bd89bdb 100644 --- a/editors/calligra-l10n-ca/Makefile +++ b/editors/calligra-l10n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 24b67e957f6b..5138bc7fcafb 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.1.tar.bz2) = a9386b6c6049814d6f4a3f67a4cb51d8 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 7eb35b1babbb185eee032a53b27d8298c8e6a8571c8fc070e006193ad8640005 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 414688 +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 diff --git a/editors/calligra-l10n-ca/pkg-plist b/editors/calligra-l10n-ca/pkg-plist index e9d1a88c22a9..232a56980982 100644 --- a/editors/calligra-l10n-ca/pkg-plist +++ b/editors/calligra-l10n-ca/pkg-plist @@ -1,4 +1,26 @@ share/apps/koffice/autocorrect/ca.xml +share/doc/HTML/ca/karbon/common +share/doc/HTML/ca/karbon/index.cache.bz2 +share/doc/HTML/ca/karbon/index.docbook +share/doc/HTML/ca/kchart/common +share/doc/HTML/ca/kchart/index.cache.bz2 +share/doc/HTML/ca/kchart/index.docbook +share/doc/HTML/ca/kexi/basics.docbook +share/doc/HTML/ca/kexi/building.docbook +share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/configuration.docbook +share/doc/HTML/ca/kexi/credits.docbook +share/doc/HTML/ca/kexi/database.docbook +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/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/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo @@ -29,5 +51,11 @@ 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/koshell +@dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kexi +@dirrm share/doc/HTML/ca/kchart +@dirrm share/doc/HTML/ca/karbon +@dirrm share/doc/HTML/ca @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/calligra-l10n-da/Makefile b/editors/calligra-l10n-da/Makefile index 6d2783ebb880..47c61c8df6cd 100644 --- a/editors/calligra-l10n-da/Makefile +++ b/editors/calligra-l10n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 f889e6500901..ea0cfc7cacff 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.1.tar.bz2) = aa38e3e0f04a930e89543cfb79c6184d -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 6a97b8c73cc23849016f9326ede15959f451c42754a828ea1f5c98e4fa03c25e -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 1009829 +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 diff --git a/editors/calligra-l10n-el/Makefile b/editors/calligra-l10n-el/Makefile index ec9cbed3e935..00dab794c8cf 100644 --- a/editors/calligra-l10n-el/Makefile +++ b/editors/calligra-l10n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 0dc8ee5b6cee..d99d2f341307 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.1.tar.bz2) = 350963ba95241e2576c077d4558d7fcb -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = e0578168a21cf0c525f67b429a5ce5b8bc21f2d93fe9c1864909ec928c55092f -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = 365646 +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 diff --git a/editors/calligra-l10n-en_GB/Makefile b/editors/calligra-l10n-en_GB/Makefile index 790a4e597f30..2aa1fd93bb12 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.1 +PORTVERSION= 1.5.2 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 aba9ce2990bc..28cf71ee2884 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.1.tar.bz2) = b7ae8b4aee9810f2b78235962f7f1dc2 -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 65abe80175f07027e95b4758550468822b336721293a42a5421d32e0b270c85d -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 340890 +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 diff --git a/editors/calligra-l10n-es/Makefile b/editors/calligra-l10n-es/Makefile index 41bae8e5423d..fe268dca1e63 100644 --- a/editors/calligra-l10n-es/Makefile +++ b/editors/calligra-l10n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 bc92c9429856..5aedacd37629 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.1.tar.bz2) = 70b926928aa1a2facb3409f144191967 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 0b77ba910fffa2cf23c9f9423d958e8efe9c0469a6433eb09f129781b8e94c5e -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 8804520 +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 diff --git a/editors/calligra-l10n-es/pkg-plist b/editors/calligra-l10n-es/pkg-plist index f5758a148958..a02bdd2b7e9d 100644 --- a/editors/calligra-l10n-es/pkg-plist +++ b/editors/calligra-l10n-es/pkg-plist @@ -1,4 +1,8 @@ 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 share/doc/HTML/es/kchart/common share/doc/HTML/es/kchart/cr22-action-chart_line.png share/doc/HTML/es/kchart/cr22-action-data.png @@ -31,12 +35,21 @@ share/doc/HTML/es/kchart/kchart-example1-9.png share/doc/HTML/es/kchart/kchart-kspread-bar.png share/doc/HTML/es/kchart/kchart-kspread.png share/doc/HTML/es/kchart/kchart-startupdialog.png +share/doc/HTML/es/kchart/kchart-wizard0.png share/doc/HTML/es/kchart/kchart-wizard1.png share/doc/HTML/es/kchart/kchart-wizard2.png share/doc/HTML/es/kchart/kchart-wizard3.png share/doc/HTML/es/kchart/kchart-wizard4.png 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/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/intro.docbook +share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png share/doc/HTML/es/kformula/common share/doc/HTML/es/kformula/correct_index_location.png @@ -84,14 +97,62 @@ share/doc/HTML/es/koffice/index.docbook share/doc/HTML/es/koshell/common share/doc/HTML/es/koshell/index.cache.bz2 share/doc/HTML/es/koshell/index.docbook +share/doc/HTML/es/koshell/koshell1.png +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/configure-wbs.png +share/doc/HTML/es/kplato/configure2.1.png +share/doc/HTML/es/kplato/configure2.png +share/doc/HTML/es/kplato/definitions.docbook +share/doc/HTML/es/kplato/edit-accounts.png +share/doc/HTML/es/kplato/edit-accounts1.png +share/doc/HTML/es/kplato/edit-calendar.png +share/doc/HTML/es/kplato/edit-calendar1.png +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/mainwindow.docbook +share/doc/HTML/es/kplato/mainwindow1.png +share/doc/HTML/es/kplato/options.docbook +share/doc/HTML/es/kplato/project-settings.png +share/doc/HTML/es/kplato/wbs.docbook +share/doc/HTML/es/kplato/wbs.png +share/doc/HTML/es/kplato/wbs1.png +share/doc/HTML/es/kplato/wbs2.png +share/doc/HTML/es/kplato/wbs3.png share/doc/HTML/es/kpresenter/a11y.docbook +share/doc/HTML/es/kpresenter/autocorrection1.png +share/doc/HTML/es/kpresenter/autocorrection2.png +share/doc/HTML/es/kpresenter/autocorrection3.png +share/doc/HTML/es/kpresenter/autocorrection4.png share/doc/HTML/es/kpresenter/barstyle1.png share/doc/HTML/es/kpresenter/barstyle3.png share/doc/HTML/es/kpresenter/barstyle4.png share/doc/HTML/es/kpresenter/barstyle5.png share/doc/HTML/es/kpresenter/barstyle6.png share/doc/HTML/es/kpresenter/barstyle7.png +share/doc/HTML/es/kpresenter/break.png +share/doc/HTML/es/kpresenter/changeformat.png share/doc/HTML/es/kpresenter/common +share/doc/HTML/es/kpresenter/completion.png +share/doc/HTML/es/kpresenter/configure1.png +share/doc/HTML/es/kpresenter/configure2.png +share/doc/HTML/es/kpresenter/configure3.png +share/doc/HTML/es/kpresenter/configure4.png +share/doc/HTML/es/kpresenter/configure4a.png +share/doc/HTML/es/kpresenter/configure4a1.png +share/doc/HTML/es/kpresenter/configure4b.png +share/doc/HTML/es/kpresenter/configure4c.png +share/doc/HTML/es/kpresenter/configure5.png +share/doc/HTML/es/kpresenter/configure6.png +share/doc/HTML/es/kpresenter/configure6b.png +share/doc/HTML/es/kpresenter/configure6c.png +share/doc/HTML/es/kpresenter/configure6d.png +share/doc/HTML/es/kpresenter/configure6e.png +share/doc/HTML/es/kpresenter/configure7.png share/doc/HTML/es/kpresenter/faq.docbook share/doc/HTML/es/kpresenter/great-presentations.docbook share/doc/HTML/es/kpresenter/guides.docbook @@ -103,14 +164,28 @@ share/doc/HTML/es/kpresenter/htmlshow03.png share/doc/HTML/es/kpresenter/htmlshow04.png share/doc/HTML/es/kpresenter/htmlshow05.png share/doc/HTML/es/kpresenter/htmlshow07.png +share/doc/HTML/es/kpresenter/htmlshow1.png +share/doc/HTML/es/kpresenter/htmlshow2.png +share/doc/HTML/es/kpresenter/htmlshow3.png +share/doc/HTML/es/kpresenter/htmlshow4.png +share/doc/HTML/es/kpresenter/htmlshow5.png +share/doc/HTML/es/kpresenter/htmlshow6.png +share/doc/HTML/es/kpresenter/htmlshow7.png +share/doc/HTML/es/kpresenter/htmlshow8.png +share/doc/HTML/es/kpresenter/htmlshow9.png share/doc/HTML/es/kpresenter/index.cache.bz2 share/doc/HTML/es/kpresenter/index.docbook +share/doc/HTML/es/kpresenter/kbd-focus-ext.png +share/doc/HTML/es/kpresenter/link.png share/doc/HTML/es/kpresenter/menus.docbook +share/doc/HTML/es/kpresenter/mousenav.png share/doc/HTML/es/kpresenter/msexport1.png share/doc/HTML/es/kpresenter/msexport2.png +share/doc/HTML/es/kpresenter/msexport2b.png share/doc/HTML/es/kpresenter/msexport3.png share/doc/HTML/es/kpresenter/msexport4.png share/doc/HTML/es/kpresenter/options.docbook +share/doc/HTML/es/kpresenter/properties.png share/doc/HTML/es/kpresenter/screen.docbook share/doc/HTML/es/kpresenter/settings03.png share/doc/HTML/es/kpresenter/settings04.png @@ -119,11 +194,15 @@ share/doc/HTML/es/kpresenter/settings06.png share/doc/HTML/es/kpresenter/template02.png share/doc/HTML/es/kpresenter/template03.png share/doc/HTML/es/kpresenter/template04.png +share/doc/HTML/es/kpresenter/template05.png share/doc/HTML/es/kpresenter/template06.png share/doc/HTML/es/kpresenter/template07.png share/doc/HTML/es/kpresenter/textmenu01.png share/doc/HTML/es/kpresenter/textmenu02.png share/doc/HTML/es/kpresenter/textmenu03a.png +share/doc/HTML/es/kpresenter/textmenu1.png +share/doc/HTML/es/kpresenter/textmenu2.png +share/doc/HTML/es/kpresenter/tts.png share/doc/HTML/es/kpresenter/tut01.png share/doc/HTML/es/kpresenter/tut02.png share/doc/HTML/es/kpresenter/tut03.png @@ -147,7 +226,147 @@ share/doc/HTML/es/kpresenter/tut20.png share/doc/HTML/es/kpresenter/tut21.png share/doc/HTML/es/kpresenter/tut22.png share/doc/HTML/es/kpresenter/tut23.png +share/doc/HTML/es/kpresenter/tut24.png +share/doc/HTML/es/kpresenter/tut25.png +share/doc/HTML/es/kpresenter/tut26.png share/doc/HTML/es/kpresenter/tutorial.docbook +share/doc/HTML/es/kpresenter/zoomfactor.png +share/doc/HTML/es/krita/commands-dialogs.docbook +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/createdocument.png +share/doc/HTML/es/krita/credits.docbook +share/doc/HTML/es/krita/crocusses-bumpmap.png +share/doc/HTML/es/krita/crocusses-edgebottom.png +share/doc/HTML/es/krita/crocusses-embossall.png +share/doc/HTML/es/krita/crocusses-embossvariable.png +share/doc/HTML/es/krita/crocusses-gaussianblur.png +share/doc/HTML/es/krita/crocusses-invert.png +share/doc/HTML/es/krita/crocusses-meanremoval.png +share/doc/HTML/es/krita/crocusses-oilpaint.png +share/doc/HTML/es/krita/crocusses-pixelize.png +share/doc/HTML/es/krita/crocusses-raindrops.png +share/doc/HTML/es/krita/crocusses-roundcorners.png +share/doc/HTML/es/krita/crocusses-sharpen.png +share/doc/HTML/es/krita/crocusses-simplenoise.png +share/doc/HTML/es/krita/crocusses-tiles.png +share/doc/HTML/es/krita/crocusses.png +share/doc/HTML/es/krita/developers.docbook +share/doc/HTML/es/krita/dialogs-addpalette.png +share/doc/HTML/es/krita/dialogs-brightnesscontrast.png +share/doc/HTML/es/krita/dialogs-bumpmap.png +share/doc/HTML/es/krita/dialogs-coloradjustment.png +share/doc/HTML/es/krita/dialogs-colorrange.png +share/doc/HTML/es/krita/dialogs-convertimagetype.png +share/doc/HTML/es/krita/dialogs-convertlayertype.png +share/doc/HTML/es/krita/dialogs-cubism.png +share/doc/HTML/es/krita/dialogs-documentinformation.png +share/doc/HTML/es/krita/dialogs-dropshadow.png +share/doc/HTML/es/krita/dialogs-emboss.png +share/doc/HTML/es/krita/dialogs-filtersgallery.png +share/doc/HTML/es/krita/dialogs-histogram.png +share/doc/HTML/es/krita/dialogs-imageproperties.png +share/doc/HTML/es/krita/dialogs-imagesize.png +share/doc/HTML/es/krita/dialogs-layerproperties.png +share/doc/HTML/es/krita/dialogs-layersize.png +share/doc/HTML/es/krita/dialogs-newadjustmentlayer.png +share/doc/HTML/es/krita/dialogs-newlayer.png +share/doc/HTML/es/krita/dialogs-oilpaint.png +share/doc/HTML/es/krita/dialogs-pixelize.png +share/doc/HTML/es/krita/dialogs-raindrops.png +share/doc/HTML/es/krita/dialogs-rotateimage.png +share/doc/HTML/es/krita/dialogs-rotatelayer.png +share/doc/HTML/es/krita/dialogs-roundcorners.png +share/doc/HTML/es/krita/dialogs-separateimage.png +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/installation.docbook +share/doc/HTML/es/krita/introduction.docbook +share/doc/HTML/es/krita/mainscreen.png +share/doc/HTML/es/krita/newimage.png +share/doc/HTML/es/krita/palettes-colors-gray.png +share/doc/HTML/es/krita/palettes-colors-hsv.png +share/doc/HTML/es/krita/palettes-colors-palettes.png +share/doc/HTML/es/krita/palettes-colors-rgb.png +share/doc/HTML/es/krita/palettes-colors-watercolors.png +share/doc/HTML/es/krita/palettes-controlbox-brush.png +share/doc/HTML/es/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/es/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/es/krita/palettes-controlbox-crop.png +share/doc/HTML/es/krita/palettes-controlbox-gradient.png +share/doc/HTML/es/krita/palettes-controlbox-histogram.png +share/doc/HTML/es/krita/palettes-controlbox-line.png +share/doc/HTML/es/krita/palettes-controlbox-overview.png +share/doc/HTML/es/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/es/krita/palettes-controlbox-rectangle.png +share/doc/HTML/es/krita/palettes-controlbox-select.png +share/doc/HTML/es/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/es/krita/palettes-controlbox-star.png +share/doc/HTML/es/krita/palettes-controlbox-text.png +share/doc/HTML/es/krita/palettes-controlbox-transform.png +share/doc/HTML/es/krita/palettes-layers-layers.png +share/doc/HTML/es/krita/palettes-layers-scriptsmanager.png +share/doc/HTML/es/krita/preferences-color.png +share/doc/HTML/es/krita/preferences-display.png +share/doc/HTML/es/krita/preferences-general.png +share/doc/HTML/es/krita/preferences-grid.png +share/doc/HTML/es/krita/preferences-performance.png +share/doc/HTML/es/krita/preferences-sidebar.png +share/doc/HTML/es/krita/preferences-tablet.png +share/doc/HTML/es/krita/scripting.docbook +share/doc/HTML/es/krita/settings.docbook +share/doc/HTML/es/krita/tool-brush.png +share/doc/HTML/es/krita/tool-colorpicker.png +share/doc/HTML/es/krita/tool-contiguousfill.png +share/doc/HTML/es/krita/tool-crop.png +share/doc/HTML/es/krita/tool-duplicate.png +share/doc/HTML/es/krita/tool-ellipse.png +share/doc/HTML/es/krita/tool-eraseselection.png +share/doc/HTML/es/krita/tool-gradient.png +share/doc/HTML/es/krita/tool-line.png +share/doc/HTML/es/krita/tool-move.png +share/doc/HTML/es/krita/tool-paintselection.png +share/doc/HTML/es/krita/tool-paintwithfilters.png +share/doc/HTML/es/krita/tool-pan.png +share/doc/HTML/es/krita/tool-polygon.png +share/doc/HTML/es/krita/tool-polyline.png +share/doc/HTML/es/krita/tool-rectangle.png +share/doc/HTML/es/krita/tool-selectcontiguous.png +share/doc/HTML/es/krita/tool-selectelliptical.png +share/doc/HTML/es/krita/tool-selectoutline.png +share/doc/HTML/es/krita/tool-selectpolygonal.png +share/doc/HTML/es/krita/tool-selectrectangular.png +share/doc/HTML/es/krita/tool-selectsimilar.png +share/doc/HTML/es/krita/tool-star.png +share/doc/HTML/es/krita/tool-text.png +share/doc/HTML/es/krita/tool-transform.png +share/doc/HTML/es/krita/tool-zoom.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-autobrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-custombrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-predefined.png +share/doc/HTML/es/krita/toolbar-brushes-gradients.png +share/doc/HTML/es/krita/toolbar-brushes-patterns-custompattern.png +share/doc/HTML/es/krita/toolbar-brushes-patterns.png +share/doc/HTML/es/krita/toolbar-brushesandstuff.png +share/doc/HTML/es/krita/toolbar-edit.png +share/doc/HTML/es/krita/toolbar-file.png +share/doc/HTML/es/krita/toolbar-krita.png +share/doc/HTML/es/krita/toolbar-navigation.png +share/doc/HTML/es/krita/toolbar-transformationtools.png +share/doc/HTML/es/krita/tutorial-quick-starts.docbook +share/doc/HTML/es/krita/tutorial-select-layer.docbook +share/doc/HTML/es/krita/tutorial-starting.docbook +share/doc/HTML/es/krita/tutorial.docbook +share/doc/HTML/es/krita/using-colorspaces.docbook +share/doc/HTML/es/krita/using-filters.docbook +share/doc/HTML/es/krita/using-layers.docbook +share/doc/HTML/es/krita/using-selections-6.png +share/doc/HTML/es/krita/using-selections.docbook +share/doc/HTML/es/kspread/a11y.docbook share/doc/HTML/es/kspread/advanced.docbook share/doc/HTML/es/kspread/basics.docbook share/doc/HTML/es/kspread/cellformat0.png @@ -156,22 +375,46 @@ share/doc/HTML/es/kspread/cellformat2.png share/doc/HTML/es/kspread/cellformat3.png share/doc/HTML/es/kspread/cellformat4.png share/doc/HTML/es/kspread/cellformat5.png +share/doc/HTML/es/kspread/cellformat6.png +share/doc/HTML/es/kspread/cellformat7.png +share/doc/HTML/es/kspread/cellprotection1.png +share/doc/HTML/es/kspread/cellprotection2.png share/doc/HTML/es/kspread/chart1.png share/doc/HTML/es/kspread/commands.docbook share/doc/HTML/es/kspread/common share/doc/HTML/es/kspread/config.docbook share/doc/HTML/es/kspread/configdialog.docbook +share/doc/HTML/es/kspread/configure1.png +share/doc/HTML/es/kspread/configure2.png +share/doc/HTML/es/kspread/configure3.png +share/doc/HTML/es/kspread/configure4.png +share/doc/HTML/es/kspread/configure5.png +share/doc/HTML/es/kspread/configure6.png share/doc/HTML/es/kspread/copy1.png +share/doc/HTML/es/kspread/currency.png +share/doc/HTML/es/kspread/decreasedecimal.png share/doc/HTML/es/kspread/faq.docbook share/doc/HTML/es/kspread/format.docbook +share/doc/HTML/es/kspread/hideformula1.png +share/doc/HTML/es/kspread/hideformula2.png +share/doc/HTML/es/kspread/hideformula3.png +share/doc/HTML/es/kspread/hideformula4.png +share/doc/HTML/es/kspread/hideformula5.png share/doc/HTML/es/kspread/importexport.docbook +share/doc/HTML/es/kspread/increasedecimal.png share/doc/HTML/es/kspread/index.cache.bz2 share/doc/HTML/es/kspread/index.docbook +share/doc/HTML/es/kspread/kbd-focus-ext.png +share/doc/HTML/es/kspread/mousenav.png +share/doc/HTML/es/kspread/newdocument.png +share/doc/HTML/es/kspread/percent.png +share/doc/HTML/es/kspread/sheetproperties.png share/doc/HTML/es/kspread/shortcut1.png share/doc/HTML/es/kspread/shortcut2.png share/doc/HTML/es/kspread/shortcut3.png share/doc/HTML/es/kspread/sort1.png share/doc/HTML/es/kspread/starting1.png +share/doc/HTML/es/kspread/tts.png share/doc/HTML/es/kugar/add_detail.png share/doc/HTML/es/kugar/add_detail_footer.png share/doc/HTML/es/kugar/add_detail_header.png @@ -219,6 +462,7 @@ share/doc/HTML/es/kword/Tut3.png share/doc/HTML/es/kword/Tut4.png share/doc/HTML/es/kword/Tut7.png share/doc/HTML/es/kword/Tut8.png +share/doc/HTML/es/kword/a11y.docbook share/doc/HTML/es/kword/addentry.png share/doc/HTML/es/kword/addrecord.png share/doc/HTML/es/kword/alignBlock.png @@ -281,6 +525,7 @@ share/doc/HTML/es/kword/editpaste.png share/doc/HTML/es/kword/edittb.png share/doc/HTML/es/kword/end.png share/doc/HTML/es/kword/enumlist.png +share/doc/HTML/es/kword/exoffset.png share/doc/HTML/es/kword/expression.png share/doc/HTML/es/kword/expressions.docbook share/doc/HTML/es/kword/exst.png @@ -288,6 +533,8 @@ share/doc/HTML/es/kword/exul.png share/doc/HTML/es/kword/fchardlg.png share/doc/HTML/es/kword/fchardlg2.png share/doc/HTML/es/kword/fchardlg3.png +share/doc/HTML/es/kword/fchardlg4.png +share/doc/HTML/es/kword/fchardlg5.png share/doc/HTML/es/kword/filefloppy.png share/doc/HTML/es/kword/filenew2.png share/doc/HTML/es/kword/fileopen.png @@ -360,6 +607,7 @@ share/doc/HTML/es/kword/intro2.png share/doc/HTML/es/kword/intro3.png share/doc/HTML/es/kword/ital.png share/doc/HTML/es/kword/joincell.png +share/doc/HTML/es/kword/kbd-focus-ext.png share/doc/HTML/es/kword/kformappcol.png share/doc/HTML/es/kword/kformapprow.png share/doc/HTML/es/kword/kforminscol.png @@ -388,6 +636,7 @@ share/doc/HTML/es/kword/mmergeab1.png share/doc/HTML/es/kword/mmergekspread1.png share/doc/HTML/es/kword/mmergesql1.png share/doc/HTML/es/kword/mmergesql2.png +share/doc/HTML/es/kword/mousenav.png share/doc/HTML/es/kword/numtxtbut.png share/doc/HTML/es/kword/opendlg.png share/doc/HTML/es/kword/opt.docbook @@ -453,6 +702,7 @@ share/doc/HTML/es/kword/textstyex.png share/doc/HTML/es/kword/tfcreatebut.png share/doc/HTML/es/kword/thesaurus.png share/doc/HTML/es/kword/toc.docbook +share/doc/HTML/es/kword/tts.png share/doc/HTML/es/kword/tutorial.docbook share/doc/HTML/es/kword/undl.png share/doc/HTML/es/kword/undo.png @@ -500,11 +750,16 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kword @dirrm share/doc/HTML/es/kugar @dirrm share/doc/HTML/es/kspread +@dirrm share/doc/HTML/es/krita @dirrm share/doc/HTML/es/kpresenter +@dirrm share/doc/HTML/es/kplato @dirrm share/doc/HTML/es/koshell @dirrm share/doc/HTML/es/koffice @dirrm share/doc/HTML/es/kivio @dirrm share/doc/HTML/es/kformula +@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 78638aab6083..c0ba82e8d416 100644 --- a/editors/calligra-l10n-et/Makefile +++ b/editors/calligra-l10n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 1fc8b57b8b66..74cb277ae6f8 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.1.tar.bz2) = 23311d668c05da159ea12240f950e763 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 674392e50b4b9dd0d39c282c5a86cc263b18785b3c733b027ae3da0e9d4e0409 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 1131254 +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 diff --git a/editors/calligra-l10n-it/Makefile b/editors/calligra-l10n-it/Makefile index bd26c890a0b1..3549b46cc8ed 100644 --- a/editors/calligra-l10n-it/Makefile +++ b/editors/calligra-l10n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 51c4c70710a7..dc9a385818d7 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.1.tar.bz2) = 71cf4cad9272090e6469a96736bd785e -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = c6b5f9696fd3d03eefd1eb92669dee2f6f4c0942d5604310d0d07868baf7fc2d -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = 1349698 +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 diff --git a/editors/calligra-l10n-it/pkg-plist b/editors/calligra-l10n-it/pkg-plist index 433a1c887ed5..81da090823f6 100644 --- a/editors/calligra-l10n-it/pkg-plist +++ b/editors/calligra-l10n-it/pkg-plist @@ -114,6 +114,7 @@ share/doc/HTML/it/kword/a11y.docbook share/doc/HTML/it/kword/basics.docbook share/doc/HTML/it/kword/bookmarks.docbook share/doc/HTML/it/kword/chapnumb.docbook +share/doc/HTML/it/kword/colorseldlg.png share/doc/HTML/it/kword/columns.docbook share/doc/HTML/it/kword/common share/doc/HTML/it/kword/doccomments.docbook @@ -122,6 +123,8 @@ share/doc/HTML/it/kword/docstruct.docbook share/doc/HTML/it/kword/docvariables.docbook share/doc/HTML/it/kword/editing.docbook share/doc/HTML/it/kword/expressions.docbook +share/doc/HTML/it/kword/finddlg.png +share/doc/HTML/it/kword/finddlg2.png share/doc/HTML/it/kword/footendnotes.docbook share/doc/HTML/it/kword/formatchar.docbook share/doc/HTML/it/kword/formatframes.docbook @@ -140,7 +143,18 @@ share/doc/HTML/it/kword/mailmerge.docbook share/doc/HTML/it/kword/mbtb.docbook share/doc/HTML/it/kword/migrating.docbook share/doc/HTML/it/kword/opt.docbook +share/doc/HTML/it/kword/opt1.png +share/doc/HTML/it/kword/opt2.png +share/doc/HTML/it/kword/opt3.png +share/doc/HTML/it/kword/opt4.png +share/doc/HTML/it/kword/opt5.png +share/doc/HTML/it/kword/optkb.png +share/doc/HTML/it/kword/optkb2.png +share/doc/HTML/it/kword/opttb.png share/doc/HTML/it/kword/pageformat.docbook +share/doc/HTML/it/kword/pntdlg.png +share/doc/HTML/it/kword/pntdlg1.png +share/doc/HTML/it/kword/repldlg.png share/doc/HTML/it/kword/storeprint.docbook share/doc/HTML/it/kword/styles.docbook share/doc/HTML/it/kword/table.docbook diff --git a/editors/calligra-l10n-nb/Makefile b/editors/calligra-l10n-nb/Makefile index c80c9012e630..4e111dae8f7f 100644 --- a/editors/calligra-l10n-nb/Makefile +++ b/editors/calligra-l10n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for koffice +COMMENT= Norwegian Bokml messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/editors/calligra-l10n-nb/distinfo b/editors/calligra-l10n-nb/distinfo index 84d9b5e9d8ae..3b1c0a14407b 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.1.tar.bz2) = ff774ceadd4c42b80ab138c4446d8843 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 4d1e1d4d461c336e5cc4386259658ba0e3c3f5f6ff1f57756399870a497a18c6 -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 359337 +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 diff --git a/editors/calligra-l10n-nb/pkg-plist b/editors/calligra-l10n-nb/pkg-plist index 747ac7827ea9..56cd255ecfe9 100644 --- a/editors/calligra-l10n-nb/pkg-plist +++ b/editors/calligra-l10n-nb/pkg-plist @@ -3,6 +3,8 @@ 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/kexi.mo +share/locale/nb/LC_MESSAGES/kfile_abiword.mo +share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo share/locale/nb/LC_MESSAGES/kfile_koffice.mo share/locale/nb/LC_MESSAGES/kfile_ooo.mo share/locale/nb/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/nb/LC_MESSAGES/kivio.mo share/locale/nb/LC_MESSAGES/koconverter.mo share/locale/nb/LC_MESSAGES/koffice.mo share/locale/nb/LC_MESSAGES/kofficefilters.mo +share/locale/nb/LC_MESSAGES/koproperty.mo share/locale/nb/LC_MESSAGES/koshell.mo share/locale/nb/LC_MESSAGES/kounavail.mo +share/locale/nb/LC_MESSAGES/kplato.mo share/locale/nb/LC_MESSAGES/kpresenter.mo share/locale/nb/LC_MESSAGES/krita.mo share/locale/nb/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/calligra-l10n-nl/Makefile b/editors/calligra-l10n-nl/Makefile index e5b75b872009..04aeaa72ffb2 100644 --- a/editors/calligra-l10n-nl/Makefile +++ b/editors/calligra-l10n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 517edcb4b923..9cbf82513851 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.1.tar.bz2) = f76f2b7b8a65a528d3d0514f5f1a0cbf -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 71fc1679a5aff43117cc22832b005249a5259e2c30e8d282d4adf7c54e42a2d8 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 3271404 +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 diff --git a/editors/calligra-l10n-sv/Makefile b/editors/calligra-l10n-sv/Makefile index 1cd24a30d0eb..2dfe5de3c96e 100644 --- a/editors/calligra-l10n-sv/Makefile +++ b/editors/calligra-l10n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 d95e58affcb1..c6c36bca9a65 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.1.tar.bz2) = 4afcc6585df0a171e90b595c3d3311ae -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 2a66b9f3f17e49a5e70cc8504ad10a537928c1b62892b081502003a479890f1c -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 5970774 +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 diff --git a/editors/calligra-l10n/Makefile b/editors/calligra-l10n/Makefile index 0b8845efdb0d..4df487a14bda 100644 --- a/editors/calligra-l10n/Makefile +++ b/editors/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 3cb58dc11716..6f27fc720383 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/calligra/distinfo b/editors/calligra/distinfo index 28b58c416210..746a0be2c24d 100644 --- a/editors/calligra/distinfo +++ b/editors/calligra/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.1.tar.bz2) = 50897bd5dfd4eba8a0d78a02003a6ec9 -SHA256 (KDE/koffice/koffice-1.5.1.tar.bz2) = 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 -SIZE (KDE/koffice/koffice-1.5.1.tar.bz2) = 36010120 +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 diff --git a/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in b/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in deleted file mode 100644 index 2a6b7ab620e5..000000000000 --- a/editors/calligra/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- kexi/kexidb/drivers/sqlite2/Makefile.in Wed May 17 12:07:36 2006 -+++ kexi/kexidb/drivers/sqlite2/Makefile.in Tue May 23 19:05:20 2006 -@@ -929,12 +929,6 @@ - uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kde_servicesDATA - -- --# we need the .mocs to be built --sqliteconnection.lo: ../sqlite/sqliteconnection.lo --sqlitecursor.lo: ../sqlite/sqlitecursor.lo --sqlitedriver.lo: ../sqlite/sqlitedriver.lo --sqlitepreparedstatement.lo: ../sqlite/sqlitepreparedstatement.lo - # 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: -@@ -949,7 +943,7 @@ - - - #>+ 2 --KDE_DIST=sqlitecursor.h sqlitedriver.h sqliteconnection.h Makefile.in kexidb_sqlite2driver.desktop sqliteconnection_p.h sqlite2.pro Makefile.am -+KDE_DIST=sqlitecursor.h sqliteconnection.h sqlite2.pro Makefile.in kexidb_sqlite2driver.desktop Makefile.am sqliteconnection_p.h sqlitedriver.h - - #>+ 3 - clean-closures: -@@ -997,7 +991,7 @@ - - - #>+ 11 --kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp ../sqlite/sqliteconnection.lo $(srcdir)/sqlitedriver.cpp ../sqlite/sqlitedriver.lo $(srcdir)/sqlitecursor.cpp ../sqlite/sqlitecursor.lo $(srcdir)/sqlitepreparedstatement.cpp ../sqlite/sqlitepreparedstatement.lo -+kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp $(srcdir)/sqlitedriver.cpp $(srcdir)/sqlitecursor.cpp $(srcdir)/sqlitepreparedstatement.cpp - @echo 'creating kexidb_sqlite2driver_la.all_cpp.cpp ...'; \ - rm -f kexidb_sqlite2driver_la.all_cpp.files kexidb_sqlite2driver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kexidb_sqlite2driver_la.all_cpp.final; \ diff --git a/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in b/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in deleted file mode 100644 index 9dc40bb8226c..000000000000 --- a/editors/calligra/files/patch-kexi_plugins_forms-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- kexi/plugins/forms/Makefile.in.orig Sun May 21 14:54:47 2006 -+++ kexi/plugins/forms/Makefile.in Sun May 21 14:56:19 2006 -@@ -658,9 +658,10 @@ - kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ - kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp - --libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner diff --git a/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in b/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in deleted file mode 100644 index 75d9bb157887..000000000000 --- a/editors/calligra/files/patch-kexi_plugins_reports-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- kexi/plugins/reports/Makefile.in.orig Sun May 21 14:56:30 2006 -+++ kexi/plugins/reports/Makefile.in Sun May 21 15:02:13 2006 -@@ -65,16 +65,20 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \ -- ../../widget/utils/libkexiguiutils.la \ -- ../../widget/libkexiextendedwidgets.la \ -- ../../formeditor/libkformdesigner.la \ -- ../forms/libkexiformutils.la ./libkexireportutils.la -+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ ./libkexireportutils.la - am_kexihandler_report_la_OBJECTS = kexireports.lo - #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS) - #>+ 1 - kexihandler_report_la_OBJECTS = kexireports.lo - kexireportwidgets_la_DEPENDENCIES = \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - ./libkexireportutils.la - am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \ - kexireportfactory.lo -@@ -645,10 +649,12 @@ - libkexireportutils_la_SOURCES = \ - kexireportpart.cpp kexireportview.cpp kexireportform.cpp - --libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner - kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop diff --git a/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in b/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in deleted file mode 100644 index 7e5d73f256d8..000000000000 --- a/editors/calligra/files/patch-krita_plugins_filters_cimg-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- krita/plugins/filters/cimg/Makefile.in.orig Mon May 22 12:44:21 2006 -+++ krita/plugins/filters/cimg/Makefile.in Mon May 22 12:44:39 2006 -@@ -562,7 +562,7 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L -+KDE_CXXFLAGS = $(USE_EXCEPTIONS) - kde_services_DATA = kritacimg.desktop - - # all_includes must remain last! diff --git a/editors/calligra/files/patch-post-1.5.1-kexi b/editors/calligra/files/patch-post-1.5.1-kexi deleted file mode 100644 index 798a3a872111..000000000000 --- a/editors/calligra/files/patch-post-1.5.1-kexi +++ /dev/null @@ -1,65 +0,0 @@ -Index: kexi/plugins/forms/kexidataprovider.cpp -=================================================================== ---- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) -+++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) -@@ -92,7 +92,8 @@ - for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); - it!=m_fieldNumbersForDataItems.constEnd(); ++it) - { -- kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; -+ kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() -+ << " data=" << row.at(it.data()) << endl; - it.key()->setValue( row.at(it.data()) ); - } - } -Index: kexi/plugins/forms/widgets/kexidbautofield.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) -@@ -446,8 +446,11 @@ - @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] - (see doc/dev/settings.txt) */ - if (!text.isEmpty()) { -- realText = text[0].upper(); -- realText += (text.mid(1) + ": "); -+ realText = text[0].upper() + text.mid(1); -+ if (m_widgetType!=Boolean) { -+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -+ realText += ": "; -+ } - } - } - else -Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) -@@ -27,7 +27,9 @@ - : QCheckBox(text, parent, name), KexiFormDataItemInterface() - { - m_invalidState = false; -+//! todo: tristate - setTristate(true); -+ setFocusPolicy(QWidget::StrongFocus); - connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); - } - -@@ -56,13 +58,16 @@ - - void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) - { -- setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+ setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); - } - - QVariant - KexiDBCheckBox::value() - { -- return QVariant( isChecked(), 3 ); -+ if (state()==NoChange) -+ return QVariant(); -+ return QVariant(state()==On, 1); - } - - void KexiDBCheckBox::slotStateChanged(int ) diff --git a/editors/kate-plugins/distinfo b/editors/kate-plugins/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/editors/kate-plugins/distinfo +++ b/editors/kate-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/editors/kate-plugins/pkg-plist b/editors/kate-plugins/pkg-plist index 9ac481c6daf3..ca0e8f31c34c 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.3 +share/applications/kdeaddons-kate-plugins-3.5.4 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-af/Makefile b/editors/koffice-i18n-af/Makefile index 62a99d1e371b..e4b9ec692332 100644 --- a/editors/koffice-i18n-af/Makefile +++ b/editors/koffice-i18n-af/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n/ diff --git a/editors/koffice-i18n-af/distinfo b/editors/koffice-i18n-af/distinfo index 63ace992aad6..a237df425523 100644 --- a/editors/koffice-i18n-af/distinfo +++ b/editors/koffice-i18n-af/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 99f5fae8b0d15bcdec7daa3dfadfc20d -SHA256 (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 703f8866481ccf0e3cffccc6dfd435773b832e0d1a32cabd88e02a6ccef6184c -SIZE (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 296643 +MD5 (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = c7a48bb275230d1152e29c67a869daee +SHA256 (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = faa430cfdffc355d2d5d62b14361d92149fe9837858c535403cb231db5faf615 +SIZE (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = 299202 diff --git a/editors/koffice-i18n-bg/Makefile b/editors/koffice-i18n-bg/Makefile index 7b8287bad1ad..2ecbec660515 100644 --- a/editors/koffice-i18n-bg/Makefile +++ b/editors/koffice-i18n-bg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-bg/distinfo b/editors/koffice-i18n-bg/distinfo index 2bc19d6b68fe..3258ff0bd7dc 100644 --- a/editors/koffice-i18n-bg/distinfo +++ b/editors/koffice-i18n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 8daaeb614b3439490c2dd64a5ca6a90d -SHA256 (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 0e06d8cc13613e92afba454b044b755c939bb9be9affba5bc830a197862abfda -SIZE (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 355616 +MD5 (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = b8be1348ffab32d826c358d44de68c5e +SHA256 (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = 294b662d5275caf11ad72ab11cb99ba48c4b095fb461eccaf63980e45ca69ba8 +SIZE (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = 351822 diff --git a/editors/koffice-i18n-br/Makefile b/editors/koffice-i18n-br/Makefile index a898054656d2..8fd8edc0fb11 100644 --- a/editors/koffice-i18n-br/Makefile +++ b/editors/koffice-i18n-br/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-br/distinfo b/editors/koffice-i18n-br/distinfo index d03578082ecb..9a37f4d3a6b3 100644 --- a/editors/koffice-i18n-br/distinfo +++ b/editors/koffice-i18n-br/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = bed06b1e8dc15ab3f0360d66ecb5eca8 -SHA256 (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = 9fe3993744750d9ffe4ee73b24d6b2d785ecbd58160553142fb9a814ee413d4f -SIZE (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = 341344 +MD5 (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = fd0738d2c9538994de3573ec00964cf1 +SHA256 (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = 94d9eb043e2ae74f796cda17ad7eb4150f1955337cb24cd490e7d7fc80d3df1f +SIZE (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = 343251 diff --git a/editors/koffice-i18n-bs/Makefile b/editors/koffice-i18n-bs/Makefile index 03fdd1a9aa62..7de5ad949abf 100644 --- a/editors/koffice-i18n-bs/Makefile +++ b/editors/koffice-i18n-bs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-bs/distinfo b/editors/koffice-i18n-bs/distinfo index c73ad621bc1a..17e6df30a9a7 100644 --- a/editors/koffice-i18n-bs/distinfo +++ b/editors/koffice-i18n-bs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = f5e83bf3d981a433fe8470947ed22c0a -SHA256 (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = 3b38dd2af360e0c72d189280c31a7e255472a2ada87acedb834719e49c264af3 -SIZE (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = 318009 +MD5 (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = b7de9b93298aba597d9d8f8da038fc37 +SHA256 (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = 590a0dc51ba2da5652f94cbf6927f79bae0c39bc8c36c752acf3937a9c7cca39 +SIZE (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = 321653 diff --git a/editors/koffice-i18n-ca/Makefile b/editors/koffice-i18n-ca/Makefile index 0e7ecad639c0..99d12bd89bdb 100644 --- a/editors/koffice-i18n-ca/Makefile +++ b/editors/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 24b67e957f6b..5138bc7fcafb 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.1.tar.bz2) = a9386b6c6049814d6f4a3f67a4cb51d8 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 7eb35b1babbb185eee032a53b27d8298c8e6a8571c8fc070e006193ad8640005 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 414688 +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 diff --git a/editors/koffice-i18n-ca/pkg-plist b/editors/koffice-i18n-ca/pkg-plist index e9d1a88c22a9..232a56980982 100644 --- a/editors/koffice-i18n-ca/pkg-plist +++ b/editors/koffice-i18n-ca/pkg-plist @@ -1,4 +1,26 @@ share/apps/koffice/autocorrect/ca.xml +share/doc/HTML/ca/karbon/common +share/doc/HTML/ca/karbon/index.cache.bz2 +share/doc/HTML/ca/karbon/index.docbook +share/doc/HTML/ca/kchart/common +share/doc/HTML/ca/kchart/index.cache.bz2 +share/doc/HTML/ca/kchart/index.docbook +share/doc/HTML/ca/kexi/basics.docbook +share/doc/HTML/ca/kexi/building.docbook +share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/configuration.docbook +share/doc/HTML/ca/kexi/credits.docbook +share/doc/HTML/ca/kexi/database.docbook +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/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/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo @@ -29,5 +51,11 @@ 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/koshell +@dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kexi +@dirrm share/doc/HTML/ca/kchart +@dirrm share/doc/HTML/ca/karbon +@dirrm share/doc/HTML/ca @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/koffice-i18n-cs/Makefile b/editors/koffice-i18n-cs/Makefile index 624a3095a679..11a8257a6539 100644 --- a/editors/koffice-i18n-cs/Makefile +++ b/editors/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 9f6c44685a00..0eff1f2b120c 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.1.tar.bz2) = 6f68790c56564626e42949979a4e1dba -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.5.1.tar.bz2) = f170cbce508526bf760f26714fbf24c1581195735f0c03407cd53a53db984be8 -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.5.1.tar.bz2) = 347217 +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 diff --git a/editors/koffice-i18n-cy/Makefile b/editors/koffice-i18n-cy/Makefile index c7ec076ea307..e2b1ba01c39b 100644 --- a/editors/koffice-i18n-cy/Makefile +++ b/editors/koffice-i18n-cy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-cy/distinfo b/editors/koffice-i18n-cy/distinfo index a43fd5606bc9..21d80be97f5b 100644 --- a/editors/koffice-i18n-cy/distinfo +++ b/editors/koffice-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = 780d5816865f60b88209059c6c2e7d02 -SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = ae49963408bfc302c3b1d5b9f606056ad21136edbaa30b51f90f39c899cfb3c4 -SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = 368554 +MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 64782ef55dbdfbbc3672b613dc7f5faf +SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = fe88628577f77f791b445682ab42dbd5448cd2b321135c207308e0399ee6f920 +SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 370382 diff --git a/editors/koffice-i18n-da/Makefile b/editors/koffice-i18n-da/Makefile index 6d2783ebb880..47c61c8df6cd 100644 --- a/editors/koffice-i18n-da/Makefile +++ b/editors/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 f889e6500901..ea0cfc7cacff 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.1.tar.bz2) = aa38e3e0f04a930e89543cfb79c6184d -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 6a97b8c73cc23849016f9326ede15959f451c42754a828ea1f5c98e4fa03c25e -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 1009829 +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 diff --git a/editors/koffice-i18n-el/Makefile b/editors/koffice-i18n-el/Makefile index ec9cbed3e935..00dab794c8cf 100644 --- a/editors/koffice-i18n-el/Makefile +++ b/editors/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 0dc8ee5b6cee..d99d2f341307 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.1.tar.bz2) = 350963ba95241e2576c077d4558d7fcb -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = e0578168a21cf0c525f67b429a5ce5b8bc21f2d93fe9c1864909ec928c55092f -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = 365646 +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 diff --git a/editors/koffice-i18n-en_GB/Makefile b/editors/koffice-i18n-en_GB/Makefile index 790a4e597f30..2aa1fd93bb12 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.1 +PORTVERSION= 1.5.2 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 aba9ce2990bc..28cf71ee2884 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.1.tar.bz2) = b7ae8b4aee9810f2b78235962f7f1dc2 -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 65abe80175f07027e95b4758550468822b336721293a42a5421d32e0b270c85d -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 340890 +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 diff --git a/editors/koffice-i18n-eo/Makefile b/editors/koffice-i18n-eo/Makefile index c9d1d050b5bd..86a742fdc68a 100644 --- a/editors/koffice-i18n-eo/Makefile +++ b/editors/koffice-i18n-eo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-eo/distinfo b/editors/koffice-i18n-eo/distinfo index 71f59a65c3ab..914ac4d07966 100644 --- a/editors/koffice-i18n-eo/distinfo +++ b/editors/koffice-i18n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 71c42a69ea9c417494d1603bc3b646b8 -SHA256 (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 60a27e9b52000afac67bd9601558c19216095be3634fe9011f832d4b805fbebc -SIZE (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 357414 +MD5 (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = c7025f7d946342267943fd146a5cc19c +SHA256 (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = 395762438e80573921acc1d21ae9a316b3d96ffc28252637be6137b4e7510e72 +SIZE (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = 359445 diff --git a/editors/koffice-i18n-es/Makefile b/editors/koffice-i18n-es/Makefile index 41bae8e5423d..fe268dca1e63 100644 --- a/editors/koffice-i18n-es/Makefile +++ b/editors/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 bc92c9429856..5aedacd37629 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.1.tar.bz2) = 70b926928aa1a2facb3409f144191967 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 0b77ba910fffa2cf23c9f9423d958e8efe9c0469a6433eb09f129781b8e94c5e -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 8804520 +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 diff --git a/editors/koffice-i18n-es/pkg-plist b/editors/koffice-i18n-es/pkg-plist index f5758a148958..a02bdd2b7e9d 100644 --- a/editors/koffice-i18n-es/pkg-plist +++ b/editors/koffice-i18n-es/pkg-plist @@ -1,4 +1,8 @@ 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 share/doc/HTML/es/kchart/common share/doc/HTML/es/kchart/cr22-action-chart_line.png share/doc/HTML/es/kchart/cr22-action-data.png @@ -31,12 +35,21 @@ share/doc/HTML/es/kchart/kchart-example1-9.png share/doc/HTML/es/kchart/kchart-kspread-bar.png share/doc/HTML/es/kchart/kchart-kspread.png share/doc/HTML/es/kchart/kchart-startupdialog.png +share/doc/HTML/es/kchart/kchart-wizard0.png share/doc/HTML/es/kchart/kchart-wizard1.png share/doc/HTML/es/kchart/kchart-wizard2.png share/doc/HTML/es/kchart/kchart-wizard3.png share/doc/HTML/es/kchart/kchart-wizard4.png 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/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/intro.docbook +share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png share/doc/HTML/es/kformula/common share/doc/HTML/es/kformula/correct_index_location.png @@ -84,14 +97,62 @@ share/doc/HTML/es/koffice/index.docbook share/doc/HTML/es/koshell/common share/doc/HTML/es/koshell/index.cache.bz2 share/doc/HTML/es/koshell/index.docbook +share/doc/HTML/es/koshell/koshell1.png +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/configure-wbs.png +share/doc/HTML/es/kplato/configure2.1.png +share/doc/HTML/es/kplato/configure2.png +share/doc/HTML/es/kplato/definitions.docbook +share/doc/HTML/es/kplato/edit-accounts.png +share/doc/HTML/es/kplato/edit-accounts1.png +share/doc/HTML/es/kplato/edit-calendar.png +share/doc/HTML/es/kplato/edit-calendar1.png +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/mainwindow.docbook +share/doc/HTML/es/kplato/mainwindow1.png +share/doc/HTML/es/kplato/options.docbook +share/doc/HTML/es/kplato/project-settings.png +share/doc/HTML/es/kplato/wbs.docbook +share/doc/HTML/es/kplato/wbs.png +share/doc/HTML/es/kplato/wbs1.png +share/doc/HTML/es/kplato/wbs2.png +share/doc/HTML/es/kplato/wbs3.png share/doc/HTML/es/kpresenter/a11y.docbook +share/doc/HTML/es/kpresenter/autocorrection1.png +share/doc/HTML/es/kpresenter/autocorrection2.png +share/doc/HTML/es/kpresenter/autocorrection3.png +share/doc/HTML/es/kpresenter/autocorrection4.png share/doc/HTML/es/kpresenter/barstyle1.png share/doc/HTML/es/kpresenter/barstyle3.png share/doc/HTML/es/kpresenter/barstyle4.png share/doc/HTML/es/kpresenter/barstyle5.png share/doc/HTML/es/kpresenter/barstyle6.png share/doc/HTML/es/kpresenter/barstyle7.png +share/doc/HTML/es/kpresenter/break.png +share/doc/HTML/es/kpresenter/changeformat.png share/doc/HTML/es/kpresenter/common +share/doc/HTML/es/kpresenter/completion.png +share/doc/HTML/es/kpresenter/configure1.png +share/doc/HTML/es/kpresenter/configure2.png +share/doc/HTML/es/kpresenter/configure3.png +share/doc/HTML/es/kpresenter/configure4.png +share/doc/HTML/es/kpresenter/configure4a.png +share/doc/HTML/es/kpresenter/configure4a1.png +share/doc/HTML/es/kpresenter/configure4b.png +share/doc/HTML/es/kpresenter/configure4c.png +share/doc/HTML/es/kpresenter/configure5.png +share/doc/HTML/es/kpresenter/configure6.png +share/doc/HTML/es/kpresenter/configure6b.png +share/doc/HTML/es/kpresenter/configure6c.png +share/doc/HTML/es/kpresenter/configure6d.png +share/doc/HTML/es/kpresenter/configure6e.png +share/doc/HTML/es/kpresenter/configure7.png share/doc/HTML/es/kpresenter/faq.docbook share/doc/HTML/es/kpresenter/great-presentations.docbook share/doc/HTML/es/kpresenter/guides.docbook @@ -103,14 +164,28 @@ share/doc/HTML/es/kpresenter/htmlshow03.png share/doc/HTML/es/kpresenter/htmlshow04.png share/doc/HTML/es/kpresenter/htmlshow05.png share/doc/HTML/es/kpresenter/htmlshow07.png +share/doc/HTML/es/kpresenter/htmlshow1.png +share/doc/HTML/es/kpresenter/htmlshow2.png +share/doc/HTML/es/kpresenter/htmlshow3.png +share/doc/HTML/es/kpresenter/htmlshow4.png +share/doc/HTML/es/kpresenter/htmlshow5.png +share/doc/HTML/es/kpresenter/htmlshow6.png +share/doc/HTML/es/kpresenter/htmlshow7.png +share/doc/HTML/es/kpresenter/htmlshow8.png +share/doc/HTML/es/kpresenter/htmlshow9.png share/doc/HTML/es/kpresenter/index.cache.bz2 share/doc/HTML/es/kpresenter/index.docbook +share/doc/HTML/es/kpresenter/kbd-focus-ext.png +share/doc/HTML/es/kpresenter/link.png share/doc/HTML/es/kpresenter/menus.docbook +share/doc/HTML/es/kpresenter/mousenav.png share/doc/HTML/es/kpresenter/msexport1.png share/doc/HTML/es/kpresenter/msexport2.png +share/doc/HTML/es/kpresenter/msexport2b.png share/doc/HTML/es/kpresenter/msexport3.png share/doc/HTML/es/kpresenter/msexport4.png share/doc/HTML/es/kpresenter/options.docbook +share/doc/HTML/es/kpresenter/properties.png share/doc/HTML/es/kpresenter/screen.docbook share/doc/HTML/es/kpresenter/settings03.png share/doc/HTML/es/kpresenter/settings04.png @@ -119,11 +194,15 @@ share/doc/HTML/es/kpresenter/settings06.png share/doc/HTML/es/kpresenter/template02.png share/doc/HTML/es/kpresenter/template03.png share/doc/HTML/es/kpresenter/template04.png +share/doc/HTML/es/kpresenter/template05.png share/doc/HTML/es/kpresenter/template06.png share/doc/HTML/es/kpresenter/template07.png share/doc/HTML/es/kpresenter/textmenu01.png share/doc/HTML/es/kpresenter/textmenu02.png share/doc/HTML/es/kpresenter/textmenu03a.png +share/doc/HTML/es/kpresenter/textmenu1.png +share/doc/HTML/es/kpresenter/textmenu2.png +share/doc/HTML/es/kpresenter/tts.png share/doc/HTML/es/kpresenter/tut01.png share/doc/HTML/es/kpresenter/tut02.png share/doc/HTML/es/kpresenter/tut03.png @@ -147,7 +226,147 @@ share/doc/HTML/es/kpresenter/tut20.png share/doc/HTML/es/kpresenter/tut21.png share/doc/HTML/es/kpresenter/tut22.png share/doc/HTML/es/kpresenter/tut23.png +share/doc/HTML/es/kpresenter/tut24.png +share/doc/HTML/es/kpresenter/tut25.png +share/doc/HTML/es/kpresenter/tut26.png share/doc/HTML/es/kpresenter/tutorial.docbook +share/doc/HTML/es/kpresenter/zoomfactor.png +share/doc/HTML/es/krita/commands-dialogs.docbook +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/createdocument.png +share/doc/HTML/es/krita/credits.docbook +share/doc/HTML/es/krita/crocusses-bumpmap.png +share/doc/HTML/es/krita/crocusses-edgebottom.png +share/doc/HTML/es/krita/crocusses-embossall.png +share/doc/HTML/es/krita/crocusses-embossvariable.png +share/doc/HTML/es/krita/crocusses-gaussianblur.png +share/doc/HTML/es/krita/crocusses-invert.png +share/doc/HTML/es/krita/crocusses-meanremoval.png +share/doc/HTML/es/krita/crocusses-oilpaint.png +share/doc/HTML/es/krita/crocusses-pixelize.png +share/doc/HTML/es/krita/crocusses-raindrops.png +share/doc/HTML/es/krita/crocusses-roundcorners.png +share/doc/HTML/es/krita/crocusses-sharpen.png +share/doc/HTML/es/krita/crocusses-simplenoise.png +share/doc/HTML/es/krita/crocusses-tiles.png +share/doc/HTML/es/krita/crocusses.png +share/doc/HTML/es/krita/developers.docbook +share/doc/HTML/es/krita/dialogs-addpalette.png +share/doc/HTML/es/krita/dialogs-brightnesscontrast.png +share/doc/HTML/es/krita/dialogs-bumpmap.png +share/doc/HTML/es/krita/dialogs-coloradjustment.png +share/doc/HTML/es/krita/dialogs-colorrange.png +share/doc/HTML/es/krita/dialogs-convertimagetype.png +share/doc/HTML/es/krita/dialogs-convertlayertype.png +share/doc/HTML/es/krita/dialogs-cubism.png +share/doc/HTML/es/krita/dialogs-documentinformation.png +share/doc/HTML/es/krita/dialogs-dropshadow.png +share/doc/HTML/es/krita/dialogs-emboss.png +share/doc/HTML/es/krita/dialogs-filtersgallery.png +share/doc/HTML/es/krita/dialogs-histogram.png +share/doc/HTML/es/krita/dialogs-imageproperties.png +share/doc/HTML/es/krita/dialogs-imagesize.png +share/doc/HTML/es/krita/dialogs-layerproperties.png +share/doc/HTML/es/krita/dialogs-layersize.png +share/doc/HTML/es/krita/dialogs-newadjustmentlayer.png +share/doc/HTML/es/krita/dialogs-newlayer.png +share/doc/HTML/es/krita/dialogs-oilpaint.png +share/doc/HTML/es/krita/dialogs-pixelize.png +share/doc/HTML/es/krita/dialogs-raindrops.png +share/doc/HTML/es/krita/dialogs-rotateimage.png +share/doc/HTML/es/krita/dialogs-rotatelayer.png +share/doc/HTML/es/krita/dialogs-roundcorners.png +share/doc/HTML/es/krita/dialogs-separateimage.png +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/installation.docbook +share/doc/HTML/es/krita/introduction.docbook +share/doc/HTML/es/krita/mainscreen.png +share/doc/HTML/es/krita/newimage.png +share/doc/HTML/es/krita/palettes-colors-gray.png +share/doc/HTML/es/krita/palettes-colors-hsv.png +share/doc/HTML/es/krita/palettes-colors-palettes.png +share/doc/HTML/es/krita/palettes-colors-rgb.png +share/doc/HTML/es/krita/palettes-colors-watercolors.png +share/doc/HTML/es/krita/palettes-controlbox-brush.png +share/doc/HTML/es/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/es/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/es/krita/palettes-controlbox-crop.png +share/doc/HTML/es/krita/palettes-controlbox-gradient.png +share/doc/HTML/es/krita/palettes-controlbox-histogram.png +share/doc/HTML/es/krita/palettes-controlbox-line.png +share/doc/HTML/es/krita/palettes-controlbox-overview.png +share/doc/HTML/es/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/es/krita/palettes-controlbox-rectangle.png +share/doc/HTML/es/krita/palettes-controlbox-select.png +share/doc/HTML/es/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/es/krita/palettes-controlbox-star.png +share/doc/HTML/es/krita/palettes-controlbox-text.png +share/doc/HTML/es/krita/palettes-controlbox-transform.png +share/doc/HTML/es/krita/palettes-layers-layers.png +share/doc/HTML/es/krita/palettes-layers-scriptsmanager.png +share/doc/HTML/es/krita/preferences-color.png +share/doc/HTML/es/krita/preferences-display.png +share/doc/HTML/es/krita/preferences-general.png +share/doc/HTML/es/krita/preferences-grid.png +share/doc/HTML/es/krita/preferences-performance.png +share/doc/HTML/es/krita/preferences-sidebar.png +share/doc/HTML/es/krita/preferences-tablet.png +share/doc/HTML/es/krita/scripting.docbook +share/doc/HTML/es/krita/settings.docbook +share/doc/HTML/es/krita/tool-brush.png +share/doc/HTML/es/krita/tool-colorpicker.png +share/doc/HTML/es/krita/tool-contiguousfill.png +share/doc/HTML/es/krita/tool-crop.png +share/doc/HTML/es/krita/tool-duplicate.png +share/doc/HTML/es/krita/tool-ellipse.png +share/doc/HTML/es/krita/tool-eraseselection.png +share/doc/HTML/es/krita/tool-gradient.png +share/doc/HTML/es/krita/tool-line.png +share/doc/HTML/es/krita/tool-move.png +share/doc/HTML/es/krita/tool-paintselection.png +share/doc/HTML/es/krita/tool-paintwithfilters.png +share/doc/HTML/es/krita/tool-pan.png +share/doc/HTML/es/krita/tool-polygon.png +share/doc/HTML/es/krita/tool-polyline.png +share/doc/HTML/es/krita/tool-rectangle.png +share/doc/HTML/es/krita/tool-selectcontiguous.png +share/doc/HTML/es/krita/tool-selectelliptical.png +share/doc/HTML/es/krita/tool-selectoutline.png +share/doc/HTML/es/krita/tool-selectpolygonal.png +share/doc/HTML/es/krita/tool-selectrectangular.png +share/doc/HTML/es/krita/tool-selectsimilar.png +share/doc/HTML/es/krita/tool-star.png +share/doc/HTML/es/krita/tool-text.png +share/doc/HTML/es/krita/tool-transform.png +share/doc/HTML/es/krita/tool-zoom.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-autobrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-custombrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-predefined.png +share/doc/HTML/es/krita/toolbar-brushes-gradients.png +share/doc/HTML/es/krita/toolbar-brushes-patterns-custompattern.png +share/doc/HTML/es/krita/toolbar-brushes-patterns.png +share/doc/HTML/es/krita/toolbar-brushesandstuff.png +share/doc/HTML/es/krita/toolbar-edit.png +share/doc/HTML/es/krita/toolbar-file.png +share/doc/HTML/es/krita/toolbar-krita.png +share/doc/HTML/es/krita/toolbar-navigation.png +share/doc/HTML/es/krita/toolbar-transformationtools.png +share/doc/HTML/es/krita/tutorial-quick-starts.docbook +share/doc/HTML/es/krita/tutorial-select-layer.docbook +share/doc/HTML/es/krita/tutorial-starting.docbook +share/doc/HTML/es/krita/tutorial.docbook +share/doc/HTML/es/krita/using-colorspaces.docbook +share/doc/HTML/es/krita/using-filters.docbook +share/doc/HTML/es/krita/using-layers.docbook +share/doc/HTML/es/krita/using-selections-6.png +share/doc/HTML/es/krita/using-selections.docbook +share/doc/HTML/es/kspread/a11y.docbook share/doc/HTML/es/kspread/advanced.docbook share/doc/HTML/es/kspread/basics.docbook share/doc/HTML/es/kspread/cellformat0.png @@ -156,22 +375,46 @@ share/doc/HTML/es/kspread/cellformat2.png share/doc/HTML/es/kspread/cellformat3.png share/doc/HTML/es/kspread/cellformat4.png share/doc/HTML/es/kspread/cellformat5.png +share/doc/HTML/es/kspread/cellformat6.png +share/doc/HTML/es/kspread/cellformat7.png +share/doc/HTML/es/kspread/cellprotection1.png +share/doc/HTML/es/kspread/cellprotection2.png share/doc/HTML/es/kspread/chart1.png share/doc/HTML/es/kspread/commands.docbook share/doc/HTML/es/kspread/common share/doc/HTML/es/kspread/config.docbook share/doc/HTML/es/kspread/configdialog.docbook +share/doc/HTML/es/kspread/configure1.png +share/doc/HTML/es/kspread/configure2.png +share/doc/HTML/es/kspread/configure3.png +share/doc/HTML/es/kspread/configure4.png +share/doc/HTML/es/kspread/configure5.png +share/doc/HTML/es/kspread/configure6.png share/doc/HTML/es/kspread/copy1.png +share/doc/HTML/es/kspread/currency.png +share/doc/HTML/es/kspread/decreasedecimal.png share/doc/HTML/es/kspread/faq.docbook share/doc/HTML/es/kspread/format.docbook +share/doc/HTML/es/kspread/hideformula1.png +share/doc/HTML/es/kspread/hideformula2.png +share/doc/HTML/es/kspread/hideformula3.png +share/doc/HTML/es/kspread/hideformula4.png +share/doc/HTML/es/kspread/hideformula5.png share/doc/HTML/es/kspread/importexport.docbook +share/doc/HTML/es/kspread/increasedecimal.png share/doc/HTML/es/kspread/index.cache.bz2 share/doc/HTML/es/kspread/index.docbook +share/doc/HTML/es/kspread/kbd-focus-ext.png +share/doc/HTML/es/kspread/mousenav.png +share/doc/HTML/es/kspread/newdocument.png +share/doc/HTML/es/kspread/percent.png +share/doc/HTML/es/kspread/sheetproperties.png share/doc/HTML/es/kspread/shortcut1.png share/doc/HTML/es/kspread/shortcut2.png share/doc/HTML/es/kspread/shortcut3.png share/doc/HTML/es/kspread/sort1.png share/doc/HTML/es/kspread/starting1.png +share/doc/HTML/es/kspread/tts.png share/doc/HTML/es/kugar/add_detail.png share/doc/HTML/es/kugar/add_detail_footer.png share/doc/HTML/es/kugar/add_detail_header.png @@ -219,6 +462,7 @@ share/doc/HTML/es/kword/Tut3.png share/doc/HTML/es/kword/Tut4.png share/doc/HTML/es/kword/Tut7.png share/doc/HTML/es/kword/Tut8.png +share/doc/HTML/es/kword/a11y.docbook share/doc/HTML/es/kword/addentry.png share/doc/HTML/es/kword/addrecord.png share/doc/HTML/es/kword/alignBlock.png @@ -281,6 +525,7 @@ share/doc/HTML/es/kword/editpaste.png share/doc/HTML/es/kword/edittb.png share/doc/HTML/es/kword/end.png share/doc/HTML/es/kword/enumlist.png +share/doc/HTML/es/kword/exoffset.png share/doc/HTML/es/kword/expression.png share/doc/HTML/es/kword/expressions.docbook share/doc/HTML/es/kword/exst.png @@ -288,6 +533,8 @@ share/doc/HTML/es/kword/exul.png share/doc/HTML/es/kword/fchardlg.png share/doc/HTML/es/kword/fchardlg2.png share/doc/HTML/es/kword/fchardlg3.png +share/doc/HTML/es/kword/fchardlg4.png +share/doc/HTML/es/kword/fchardlg5.png share/doc/HTML/es/kword/filefloppy.png share/doc/HTML/es/kword/filenew2.png share/doc/HTML/es/kword/fileopen.png @@ -360,6 +607,7 @@ share/doc/HTML/es/kword/intro2.png share/doc/HTML/es/kword/intro3.png share/doc/HTML/es/kword/ital.png share/doc/HTML/es/kword/joincell.png +share/doc/HTML/es/kword/kbd-focus-ext.png share/doc/HTML/es/kword/kformappcol.png share/doc/HTML/es/kword/kformapprow.png share/doc/HTML/es/kword/kforminscol.png @@ -388,6 +636,7 @@ share/doc/HTML/es/kword/mmergeab1.png share/doc/HTML/es/kword/mmergekspread1.png share/doc/HTML/es/kword/mmergesql1.png share/doc/HTML/es/kword/mmergesql2.png +share/doc/HTML/es/kword/mousenav.png share/doc/HTML/es/kword/numtxtbut.png share/doc/HTML/es/kword/opendlg.png share/doc/HTML/es/kword/opt.docbook @@ -453,6 +702,7 @@ share/doc/HTML/es/kword/textstyex.png share/doc/HTML/es/kword/tfcreatebut.png share/doc/HTML/es/kword/thesaurus.png share/doc/HTML/es/kword/toc.docbook +share/doc/HTML/es/kword/tts.png share/doc/HTML/es/kword/tutorial.docbook share/doc/HTML/es/kword/undl.png share/doc/HTML/es/kword/undo.png @@ -500,11 +750,16 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kword @dirrm share/doc/HTML/es/kugar @dirrm share/doc/HTML/es/kspread +@dirrm share/doc/HTML/es/krita @dirrm share/doc/HTML/es/kpresenter +@dirrm share/doc/HTML/es/kplato @dirrm share/doc/HTML/es/koshell @dirrm share/doc/HTML/es/koffice @dirrm share/doc/HTML/es/kivio @dirrm share/doc/HTML/es/kformula +@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 78638aab6083..c0ba82e8d416 100644 --- a/editors/koffice-i18n-et/Makefile +++ b/editors/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 1fc8b57b8b66..74cb277ae6f8 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.1.tar.bz2) = 23311d668c05da159ea12240f950e763 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 674392e50b4b9dd0d39c282c5a86cc263b18785b3c733b027ae3da0e9d4e0409 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 1131254 +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 diff --git a/editors/koffice-i18n-eu/Makefile b/editors/koffice-i18n-eu/Makefile index 90d160a11af6..e5083e946e8c 100644 --- a/editors/koffice-i18n-eu/Makefile +++ b/editors/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 723ba5a4e059..338a0dd9e315 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.1.tar.bz2) = 39f2c93001a037b79eda7e3f9611ea8a -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.5.1.tar.bz2) = 43106f5d6d5c6690b4183d3b06a473dffbbd27e4a570343634d31718acdaa6f7 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.5.1.tar.bz2) = 350236 +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 diff --git a/editors/koffice-i18n-fi/Makefile b/editors/koffice-i18n-fi/Makefile index a7d6fda8099d..bf398813ab6b 100644 --- a/editors/koffice-i18n-fi/Makefile +++ b/editors/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 c9bea0ae121c..148256ad170f 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.1.tar.bz2) = f72750aa5c9cd5aa3814715ff36acd33 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.5.1.tar.bz2) = 5462c36f67fb87104f8b5b16e37be1434dc5368af7fa11c2a2204f8624843093 -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.5.1.tar.bz2) = 346277 +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 diff --git a/editors/koffice-i18n-ga/Makefile b/editors/koffice-i18n-ga/Makefile index 0c2a4b58fd6e..19e61ac4b29e 100644 --- a/editors/koffice-i18n-ga/Makefile +++ b/editors/koffice-i18n-ga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ga/distinfo b/editors/koffice-i18n-ga/distinfo index 49c4b0ebd06b..ac64a92304b3 100644 --- a/editors/koffice-i18n-ga/distinfo +++ b/editors/koffice-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 42615504255afdbadcbaafb197a6adb4 -SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 6d3e3399e4ec87422f058040bae0fd0c252df57de2bea622bed8bac8d60a1294 -SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 317666 +MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = b8b4d4cbb0ff29bc0da4954eb9ba4e13 +SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 84c257d3c6672af336a3bf117a9eed2b54376dea172483bc1cb5a3ec021928a5 +SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 315618 diff --git a/editors/koffice-i18n-hi/Makefile b/editors/koffice-i18n-hi/Makefile index 2ef02cb38b6a..7b830f40a021 100644 --- a/editors/koffice-i18n-hi/Makefile +++ b/editors/koffice-i18n-hi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-hi/distinfo b/editors/koffice-i18n-hi/distinfo index eeb55f0f4aae..f22bbd3b239a 100644 --- a/editors/koffice-i18n-hi/distinfo +++ b/editors/koffice-i18n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 37de7254e2d6610ad395c260cb002201 -SHA256 (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 914e183d91e4588303cc834b370338ad8afdb6ea98b90a7a4a3446d3ded66b96 -SIZE (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 324579 +MD5 (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = 95a4edd9df2b1c4744ae0b590d68822a +SHA256 (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = d7a4025a03d14b93b8da650132cc33d941db1f9751ee0d936a7bd793edd40c17 +SIZE (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = 326673 diff --git a/editors/koffice-i18n-is/Makefile b/editors/koffice-i18n-is/Makefile index 7eb44e2aad25..a1271111d093 100644 --- a/editors/koffice-i18n-is/Makefile +++ b/editors/koffice-i18n-is/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-is/distinfo b/editors/koffice-i18n-is/distinfo index 6aa56e2a778d..a84ade3062ff 100644 --- a/editors/koffice-i18n-is/distinfo +++ b/editors/koffice-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 33cf09b995ffde0c28a794ce3f6c6d51 -SHA256 (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 91e9b1b6f70be7de8071e119a6daa024424dba378ca30e3b2704350abbc1c197 -SIZE (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 351465 +MD5 (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = e3b5ec6948dea217e79d3c692d3e3bd3 +SHA256 (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = bc5a9aa08b464178099c3b3d3d4b874bcab999558680d05ca0c906b024e96021 +SIZE (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = 353493 diff --git a/editors/koffice-i18n-it/Makefile b/editors/koffice-i18n-it/Makefile index bd26c890a0b1..3549b46cc8ed 100644 --- a/editors/koffice-i18n-it/Makefile +++ b/editors/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 51c4c70710a7..dc9a385818d7 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.1.tar.bz2) = 71cf4cad9272090e6469a96736bd785e -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = c6b5f9696fd3d03eefd1eb92669dee2f6f4c0942d5604310d0d07868baf7fc2d -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = 1349698 +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 diff --git a/editors/koffice-i18n-it/pkg-plist b/editors/koffice-i18n-it/pkg-plist index 433a1c887ed5..81da090823f6 100644 --- a/editors/koffice-i18n-it/pkg-plist +++ b/editors/koffice-i18n-it/pkg-plist @@ -114,6 +114,7 @@ share/doc/HTML/it/kword/a11y.docbook share/doc/HTML/it/kword/basics.docbook share/doc/HTML/it/kword/bookmarks.docbook share/doc/HTML/it/kword/chapnumb.docbook +share/doc/HTML/it/kword/colorseldlg.png share/doc/HTML/it/kword/columns.docbook share/doc/HTML/it/kword/common share/doc/HTML/it/kword/doccomments.docbook @@ -122,6 +123,8 @@ share/doc/HTML/it/kword/docstruct.docbook share/doc/HTML/it/kword/docvariables.docbook share/doc/HTML/it/kword/editing.docbook share/doc/HTML/it/kword/expressions.docbook +share/doc/HTML/it/kword/finddlg.png +share/doc/HTML/it/kword/finddlg2.png share/doc/HTML/it/kword/footendnotes.docbook share/doc/HTML/it/kword/formatchar.docbook share/doc/HTML/it/kword/formatframes.docbook @@ -140,7 +143,18 @@ share/doc/HTML/it/kword/mailmerge.docbook share/doc/HTML/it/kword/mbtb.docbook share/doc/HTML/it/kword/migrating.docbook share/doc/HTML/it/kword/opt.docbook +share/doc/HTML/it/kword/opt1.png +share/doc/HTML/it/kword/opt2.png +share/doc/HTML/it/kword/opt3.png +share/doc/HTML/it/kword/opt4.png +share/doc/HTML/it/kword/opt5.png +share/doc/HTML/it/kword/optkb.png +share/doc/HTML/it/kword/optkb2.png +share/doc/HTML/it/kword/opttb.png share/doc/HTML/it/kword/pageformat.docbook +share/doc/HTML/it/kword/pntdlg.png +share/doc/HTML/it/kword/pntdlg1.png +share/doc/HTML/it/kword/repldlg.png share/doc/HTML/it/kword/storeprint.docbook share/doc/HTML/it/kword/styles.docbook share/doc/HTML/it/kword/table.docbook diff --git a/editors/koffice-i18n-lt/Makefile b/editors/koffice-i18n-lt/Makefile index 009a16ae3587..9d620d27b56e 100644 --- a/editors/koffice-i18n-lt/Makefile +++ b/editors/koffice-i18n-lt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-lt/distinfo b/editors/koffice-i18n-lt/distinfo index 3fa9135ec09a..71183423de7b 100644 --- a/editors/koffice-i18n-lt/distinfo +++ b/editors/koffice-i18n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 6ece374294c001730552883defb0a53c -SHA256 (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 73a21d3968ce0ec755d843635284ce6a295d5c63cd20874e7f34a1f4ef362948 -SIZE (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 265022 +MD5 (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = bf8fb56e3b2ab401d4b3ac9e19ad30f4 +SHA256 (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = 8bee3210d43bf163e9e6e41ac2647c58137d5690020220a775b50550c7108221 +SIZE (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = 267174 diff --git a/editors/koffice-i18n-mk/Makefile b/editors/koffice-i18n-mk/Makefile index 1bda0e4c5412..45a7dce0da58 100644 --- a/editors/koffice-i18n-mk/Makefile +++ b/editors/koffice-i18n-mk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-mk/distinfo b/editors/koffice-i18n-mk/distinfo index 151c044afa98..486908124b1a 100644 --- a/editors/koffice-i18n-mk/distinfo +++ b/editors/koffice-i18n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 6adad6081c79ac9dc3edcae7bb5a9494 -SHA256 (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 19d66e663676800ef21bfe5555eae613e14b88bfa4ff3fe296ae0c964abfdde7 -SIZE (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 239231 +MD5 (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = 8f9a9ccea194653be186517c0879fe8c +SHA256 (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = e3edaa9a6fa66a071a9dc42b87d5afc59e51632312bd842fb229e24d8ad162a2 +SIZE (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = 241380 diff --git a/editors/koffice-i18n-ms/Makefile b/editors/koffice-i18n-ms/Makefile index 65b46d99f629..6f0ac75d4a06 100644 --- a/editors/koffice-i18n-ms/Makefile +++ b/editors/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 e402307ab6a7..5bd45bdbd37f 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.1.tar.bz2) = 43f77ffa86d70b1fb42cf4bc2312e783 -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.5.1.tar.bz2) = 6fd94a82aebe7521c07119b7f00a25e97a38118ccd2bd18e83eee3997ca9d78d -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.5.1.tar.bz2) = 345179 +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 diff --git a/editors/koffice-i18n-nb/Makefile b/editors/koffice-i18n-nb/Makefile index c80c9012e630..4e111dae8f7f 100644 --- a/editors/koffice-i18n-nb/Makefile +++ b/editors/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for koffice +COMMENT= Norwegian Bokml messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/editors/koffice-i18n-nb/distinfo b/editors/koffice-i18n-nb/distinfo index 84d9b5e9d8ae..3b1c0a14407b 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.1.tar.bz2) = ff774ceadd4c42b80ab138c4446d8843 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 4d1e1d4d461c336e5cc4386259658ba0e3c3f5f6ff1f57756399870a497a18c6 -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 359337 +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 diff --git a/editors/koffice-i18n-nb/pkg-plist b/editors/koffice-i18n-nb/pkg-plist index 747ac7827ea9..56cd255ecfe9 100644 --- a/editors/koffice-i18n-nb/pkg-plist +++ b/editors/koffice-i18n-nb/pkg-plist @@ -3,6 +3,8 @@ 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/kexi.mo +share/locale/nb/LC_MESSAGES/kfile_abiword.mo +share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo share/locale/nb/LC_MESSAGES/kfile_koffice.mo share/locale/nb/LC_MESSAGES/kfile_ooo.mo share/locale/nb/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/nb/LC_MESSAGES/kivio.mo share/locale/nb/LC_MESSAGES/koconverter.mo share/locale/nb/LC_MESSAGES/koffice.mo share/locale/nb/LC_MESSAGES/kofficefilters.mo +share/locale/nb/LC_MESSAGES/koproperty.mo share/locale/nb/LC_MESSAGES/koshell.mo share/locale/nb/LC_MESSAGES/kounavail.mo +share/locale/nb/LC_MESSAGES/kplato.mo share/locale/nb/LC_MESSAGES/kpresenter.mo share/locale/nb/LC_MESSAGES/krita.mo share/locale/nb/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-i18n-nl/Makefile b/editors/koffice-i18n-nl/Makefile index e5b75b872009..04aeaa72ffb2 100644 --- a/editors/koffice-i18n-nl/Makefile +++ b/editors/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 517edcb4b923..9cbf82513851 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.1.tar.bz2) = f76f2b7b8a65a528d3d0514f5f1a0cbf -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 71fc1679a5aff43117cc22832b005249a5259e2c30e8d282d4adf7c54e42a2d8 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 3271404 +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 diff --git a/editors/koffice-i18n-nn/Makefile b/editors/koffice-i18n-nn/Makefile index 47177c243e9c..fde1226727f6 100644 --- a/editors/koffice-i18n-nn/Makefile +++ b/editors/koffice-i18n-nn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-nn/distinfo b/editors/koffice-i18n-nn/distinfo index 61437d85633f..98189d663d26 100644 --- a/editors/koffice-i18n-nn/distinfo +++ b/editors/koffice-i18n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 12a451ca1384c776045a86aa3f0fecb5 -SHA256 (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 057b976291af306451f1776ae21c49a17729a71f17eb047ac0a2ecedeebff688 -SIZE (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 362572 +MD5 (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = 9926f8aa4449e839d40f97e7c621de96 +SHA256 (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = d713b7e93f9f096bc38af95be134696586b0e1dbd4ecc25830ae5397e4106811 +SIZE (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = 362501 diff --git a/editors/koffice-i18n-nn/pkg-plist b/editors/koffice-i18n-nn/pkg-plist index 223ea2642007..d43125d989de 100644 --- a/editors/koffice-i18n-nn/pkg-plist +++ b/editors/koffice-i18n-nn/pkg-plist @@ -14,6 +14,7 @@ share/locale/nn/LC_MESSAGES/koffice.mo share/locale/nn/LC_MESSAGES/kofficefilters.mo share/locale/nn/LC_MESSAGES/koshell.mo share/locale/nn/LC_MESSAGES/kounavail.mo +share/locale/nn/LC_MESSAGES/kplato.mo share/locale/nn/LC_MESSAGES/kpresenter.mo share/locale/nn/LC_MESSAGES/krita.mo share/locale/nn/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-i18n-ro/Makefile b/editors/koffice-i18n-ro/Makefile index 7d61a348f332..9032169e0637 100644 --- a/editors/koffice-i18n-ro/Makefile +++ b/editors/koffice-i18n-ro/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ro/distinfo b/editors/koffice-i18n-ro/distinfo index 5279f551493b..078b3863a1e5 100644 --- a/editors/koffice-i18n-ro/distinfo +++ b/editors/koffice-i18n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = b01b4652edcd49e2d1f77db8040a2552 -SHA256 (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = 96fb5e88c6aaef12e640f8046cf7daa26a4a060e1f476f303fedafe06bde7593 -SIZE (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = 306773 +MD5 (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 22d91909560288e7dd79a3db6e2aab42 +SHA256 (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 317e41f64d29815f7a9f8b7929f70939374fdd4b858af5006f35210775344394 +SIZE (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 304268 diff --git a/editors/koffice-i18n-se/Makefile b/editors/koffice-i18n-se/Makefile index 69c506a472db..9763599d3b81 100644 --- a/editors/koffice-i18n-se/Makefile +++ b/editors/koffice-i18n-se/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-se/distinfo b/editors/koffice-i18n-se/distinfo index 44e6656fbd6b..cba50d927654 100644 --- a/editors/koffice-i18n-se/distinfo +++ b/editors/koffice-i18n-se/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = ae4b1cabf24dcf7a89fbef573b07301a -SHA256 (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = 71c5cd3c6f6dfd5474a06401922a1aabf2369203d3e845676f71f02db904ed74 -SIZE (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = 275034 +MD5 (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 8fa484cd096f3f8461c054bad31c3601 +SHA256 (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 648d8624c7e7de1d2010e12a96859e8a1f58a8585ed0194b56befa88636631db +SIZE (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 296490 diff --git a/editors/koffice-i18n-se/pkg-plist b/editors/koffice-i18n-se/pkg-plist index a46fac9fdac9..49c29be14e5e 100644 --- a/editors/koffice-i18n-se/pkg-plist +++ b/editors/koffice-i18n-se/pkg-plist @@ -2,6 +2,8 @@ share/locale/se/LC_MESSAGES/desktop_koffice.mo share/locale/se/LC_MESSAGES/example.mo share/locale/se/LC_MESSAGES/karbon.mo share/locale/se/LC_MESSAGES/kchart.mo +share/locale/se/LC_MESSAGES/kfile_abiword.mo +share/locale/se/LC_MESSAGES/kfile_gnumeric.mo share/locale/se/LC_MESSAGES/kfile_koffice.mo share/locale/se/LC_MESSAGES/kfile_ooo.mo share/locale/se/LC_MESSAGES/kformdesigner.mo @@ -12,6 +14,7 @@ share/locale/se/LC_MESSAGES/koffice.mo share/locale/se/LC_MESSAGES/kofficefilters.mo share/locale/se/LC_MESSAGES/koshell.mo share/locale/se/LC_MESSAGES/kounavail.mo +share/locale/se/LC_MESSAGES/kplato.mo share/locale/se/LC_MESSAGES/kpresenter.mo share/locale/se/LC_MESSAGES/kscan_plugin.mo share/locale/se/LC_MESSAGES/kspread.mo diff --git a/editors/koffice-i18n-sk/Makefile b/editors/koffice-i18n-sk/Makefile index 8d7e8d61e87c..cb97a195f0ff 100644 --- a/editors/koffice-i18n-sk/Makefile +++ b/editors/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 a5f1bebd3f8a..b4f11b186fe3 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.1.tar.bz2) = 11a9def76b738074d5a70bf81a5e5b4b -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.5.1.tar.bz2) = d1d050fc7006c2b5bd0d9595f1bd1feda51b2a02d1dcc27acf5127d9d704d8e4 -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.5.1.tar.bz2) = 944380 +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 diff --git a/editors/koffice-i18n-sk/pkg-plist b/editors/koffice-i18n-sk/pkg-plist index fa6cc84e166b..3ca903cfe97c 100644 --- a/editors/koffice-i18n-sk/pkg-plist +++ b/editors/koffice-i18n-sk/pkg-plist @@ -35,6 +35,8 @@ 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/kexi.mo +share/locale/sk/LC_MESSAGES/kfile_abiword.mo +share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo share/locale/sk/LC_MESSAGES/kfile_koffice.mo share/locale/sk/LC_MESSAGES/kfile_ooo.mo share/locale/sk/LC_MESSAGES/kformdesigner.mo @@ -42,13 +44,17 @@ 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/koproperty.mo share/locale/sk/LC_MESSAGES/koshell.mo share/locale/sk/LC_MESSAGES/kounavail.mo +share/locale/sk/LC_MESSAGES/kplato.mo share/locale/sk/LC_MESSAGES/kpresenter.mo share/locale/sk/LC_MESSAGES/krita.mo share/locale/sk/LC_MESSAGES/kscan_plugin.mo +share/locale/sk/LC_MESSAGES/kscreenshot_plugin.mo share/locale/sk/LC_MESSAGES/kspread.mo share/locale/sk/LC_MESSAGES/kspreadcalc_calc.mo +share/locale/sk/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/sk/LC_MESSAGES/kthesaurus.mo share/locale/sk/LC_MESSAGES/kugar.mo share/locale/sk/LC_MESSAGES/kword.mo diff --git a/editors/koffice-i18n-sl/Makefile b/editors/koffice-i18n-sl/Makefile index 86a002773b37..dc9e320c05f1 100644 --- a/editors/koffice-i18n-sl/Makefile +++ b/editors/koffice-i18n-sl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-sl/distinfo b/editors/koffice-i18n-sl/distinfo index f52e486c0016..169aad72f8b6 100644 --- a/editors/koffice-i18n-sl/distinfo +++ b/editors/koffice-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 4520614986d6fb70b1d4b8eb117815a5 -SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 20072c70c2f031f9fae00bffc67ce09c631cde56feb70143063066fee0201d36 -SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 360715 +MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = e5fe2c8a350ba2636f4bd8dd2168b017 +SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 9a81919a223b2f8b243a68ea2802518843b861f721165c3be3f2405ecd28fa24 +SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 361997 diff --git a/editors/koffice-i18n-sr/Makefile b/editors/koffice-i18n-sr/Makefile index 935f5ed59743..ac8fbfda995a 100644 --- a/editors/koffice-i18n-sr/Makefile +++ b/editors/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 e36f4b30c396..ff59034bf3ca 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.1.tar.bz2) = a825f39361da5599bcd572907eb9d068 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.5.1.tar.bz2) = 9a6a66c0e283804cfb773f7e3fe40386c47f1c215af8608fb267683c747bbcf3 -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.5.1.tar.bz2) = 366780 +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 diff --git a/editors/koffice-i18n-sr@Latn/Makefile b/editors/koffice-i18n-sr@Latn/Makefile index f7e7e57c08c6..78eb80519d7d 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.1 +PORTVERSION= 1.5.2 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 151f870eedc0..513cc76e21ac 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.1.tar.bz2) = 0413072d626a8b6291f65504f76d93f6 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = ab5ea0e73ca6dd6235b5101e2ea95241a7fb7142b8293d60d228425d35aa2674 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = 375600 +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 diff --git a/editors/koffice-i18n-sr_Latn/Makefile b/editors/koffice-i18n-sr_Latn/Makefile index f7e7e57c08c6..78eb80519d7d 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.1 +PORTVERSION= 1.5.2 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 151f870eedc0..513cc76e21ac 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.1.tar.bz2) = 0413072d626a8b6291f65504f76d93f6 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = ab5ea0e73ca6dd6235b5101e2ea95241a7fb7142b8293d60d228425d35aa2674 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = 375600 +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 diff --git a/editors/koffice-i18n-sv/Makefile b/editors/koffice-i18n-sv/Makefile index 1cd24a30d0eb..2dfe5de3c96e 100644 --- a/editors/koffice-i18n-sv/Makefile +++ b/editors/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 d95e58affcb1..c6c36bca9a65 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.1.tar.bz2) = 4afcc6585df0a171e90b595c3d3311ae -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 2a66b9f3f17e49a5e70cc8504ad10a537928c1b62892b081502003a479890f1c -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 5970774 +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 diff --git a/editors/koffice-i18n-ta/Makefile b/editors/koffice-i18n-ta/Makefile index ff5c6dc34189..2de79fb19713 100644 --- a/editors/koffice-i18n-ta/Makefile +++ b/editors/koffice-i18n-ta/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-ta/distinfo b/editors/koffice-i18n-ta/distinfo index b8944f16ef57..4f696a6a844e 100644 --- a/editors/koffice-i18n-ta/distinfo +++ b/editors/koffice-i18n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 536e66f3b85923771f2af964b51a465e -SHA256 (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 8073f64014c36eb397e7ed1e7f7f9626298a5fb6299cf76f296d8eb829b3c6da -SIZE (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 342666 +MD5 (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = 3f0ce9e790415b90daf43c35736a62e7 +SHA256 (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = e75b7bfcf37b5fde61403d63edd11ceea4bf0f0fe9f5d05339025945596e99bf +SIZE (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = 344532 diff --git a/editors/koffice-i18n-tg/Makefile b/editors/koffice-i18n-tg/Makefile index 48f51350eb0b..53952441adfe 100644 --- a/editors/koffice-i18n-tg/Makefile +++ b/editors/koffice-i18n-tg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-tg/distinfo b/editors/koffice-i18n-tg/distinfo index 6a9ae797c5ee..fb21b9be91a2 100644 --- a/editors/koffice-i18n-tg/distinfo +++ b/editors/koffice-i18n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = a38ec98b0f6437ddb93196f369a09485 -SHA256 (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = 7427e8f9574206981cae0908be6c158e48ad1b1a7fabd2282bd51bf79ef0212f -SIZE (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = 349226 +MD5 (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = add764f98fd61d74bf0886f4bfe7808f +SHA256 (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = 0005bfc05c6757d4a3f70bde4a50787ab271f9530e2de13ba043020957fdb301 +SIZE (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = 345197 diff --git a/editors/koffice-i18n-tr/Makefile b/editors/koffice-i18n-tr/Makefile index 66a6cfb2c532..7e3333a820b6 100644 --- a/editors/koffice-i18n-tr/Makefile +++ b/editors/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 a974be35fac9..58c8a1243afa 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.1.tar.bz2) = 0026e7f0b40b76a700792bf3a8a40427 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = f6e4ee1799cca65a8238b3bf5ab911503095480494bc61c4135e5eae1ab55d65 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = 352993 +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 diff --git a/editors/koffice-i18n-uz/Makefile b/editors/koffice-i18n-uz/Makefile index 81c12972788b..b68dddb6bbc6 100644 --- a/editors/koffice-i18n-uz/Makefile +++ b/editors/koffice-i18n-uz/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/editors/koffice-i18n-uz/distinfo b/editors/koffice-i18n-uz/distinfo index 44694bb05025..a03a5a0ba22a 100644 --- a/editors/koffice-i18n-uz/distinfo +++ b/editors/koffice-i18n-uz/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = b4ce57436f31a2c5b63572b27b1c3582 -SHA256 (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = 15e068a5d81666276105a27ff841b4b42be3fec259fd4db6a7d89e614dae159a -SIZE (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = 289164 +MD5 (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 259739c2bde6d4fb890915cf7f3358c9 +SHA256 (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 50bcdda58b6f4ddc4cd229bf3a3bf057badb2e1022457665da992355e61a8b18 +SIZE (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 298853 diff --git a/editors/koffice-i18n/Makefile b/editors/koffice-i18n/Makefile index 0b8845efdb0d..4df487a14bda 100644 --- a/editors/koffice-i18n/Makefile +++ b/editors/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 3cb58dc11716..6f27fc720383 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/koffice-kde3/distinfo b/editors/koffice-kde3/distinfo index 28b58c416210..746a0be2c24d 100644 --- a/editors/koffice-kde3/distinfo +++ b/editors/koffice-kde3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.1.tar.bz2) = 50897bd5dfd4eba8a0d78a02003a6ec9 -SHA256 (KDE/koffice/koffice-1.5.1.tar.bz2) = 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 -SIZE (KDE/koffice/koffice-1.5.1.tar.bz2) = 36010120 +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 diff --git a/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in b/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in deleted file mode 100644 index 2a6b7ab620e5..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- kexi/kexidb/drivers/sqlite2/Makefile.in Wed May 17 12:07:36 2006 -+++ kexi/kexidb/drivers/sqlite2/Makefile.in Tue May 23 19:05:20 2006 -@@ -929,12 +929,6 @@ - uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kde_servicesDATA - -- --# we need the .mocs to be built --sqliteconnection.lo: ../sqlite/sqliteconnection.lo --sqlitecursor.lo: ../sqlite/sqlitecursor.lo --sqlitedriver.lo: ../sqlite/sqlitedriver.lo --sqlitepreparedstatement.lo: ../sqlite/sqlitepreparedstatement.lo - # 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: -@@ -949,7 +943,7 @@ - - - #>+ 2 --KDE_DIST=sqlitecursor.h sqlitedriver.h sqliteconnection.h Makefile.in kexidb_sqlite2driver.desktop sqliteconnection_p.h sqlite2.pro Makefile.am -+KDE_DIST=sqlitecursor.h sqliteconnection.h sqlite2.pro Makefile.in kexidb_sqlite2driver.desktop Makefile.am sqliteconnection_p.h sqlitedriver.h - - #>+ 3 - clean-closures: -@@ -997,7 +991,7 @@ - - - #>+ 11 --kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp ../sqlite/sqliteconnection.lo $(srcdir)/sqlitedriver.cpp ../sqlite/sqlitedriver.lo $(srcdir)/sqlitecursor.cpp ../sqlite/sqlitecursor.lo $(srcdir)/sqlitepreparedstatement.cpp ../sqlite/sqlitepreparedstatement.lo -+kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp $(srcdir)/sqlitedriver.cpp $(srcdir)/sqlitecursor.cpp $(srcdir)/sqlitepreparedstatement.cpp - @echo 'creating kexidb_sqlite2driver_la.all_cpp.cpp ...'; \ - rm -f kexidb_sqlite2driver_la.all_cpp.files kexidb_sqlite2driver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kexidb_sqlite2driver_la.all_cpp.final; \ diff --git a/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in b/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in deleted file mode 100644 index 9dc40bb8226c..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_plugins_forms-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- kexi/plugins/forms/Makefile.in.orig Sun May 21 14:54:47 2006 -+++ kexi/plugins/forms/Makefile.in Sun May 21 14:56:19 2006 -@@ -658,9 +658,10 @@ - kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ - kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp - --libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner diff --git a/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in b/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in deleted file mode 100644 index 75d9bb157887..000000000000 --- a/editors/koffice-kde3/files/patch-kexi_plugins_reports-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- kexi/plugins/reports/Makefile.in.orig Sun May 21 14:56:30 2006 -+++ kexi/plugins/reports/Makefile.in Sun May 21 15:02:13 2006 -@@ -65,16 +65,20 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \ -- ../../widget/utils/libkexiguiutils.la \ -- ../../widget/libkexiextendedwidgets.la \ -- ../../formeditor/libkformdesigner.la \ -- ../forms/libkexiformutils.la ./libkexireportutils.la -+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ ./libkexireportutils.la - am_kexihandler_report_la_OBJECTS = kexireports.lo - #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS) - #>+ 1 - kexihandler_report_la_OBJECTS = kexireports.lo - kexireportwidgets_la_DEPENDENCIES = \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - ./libkexireportutils.la - am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \ - kexireportfactory.lo -@@ -645,10 +649,12 @@ - libkexireportutils_la_SOURCES = \ - kexireportpart.cpp kexireportview.cpp kexireportform.cpp - --libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner - kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop diff --git a/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in b/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in deleted file mode 100644 index 7e5d73f256d8..000000000000 --- a/editors/koffice-kde3/files/patch-krita_plugins_filters_cimg-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- krita/plugins/filters/cimg/Makefile.in.orig Mon May 22 12:44:21 2006 -+++ krita/plugins/filters/cimg/Makefile.in Mon May 22 12:44:39 2006 -@@ -562,7 +562,7 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L -+KDE_CXXFLAGS = $(USE_EXCEPTIONS) - kde_services_DATA = kritacimg.desktop - - # all_includes must remain last! diff --git a/editors/koffice-kde3/files/patch-post-1.5.1-kexi b/editors/koffice-kde3/files/patch-post-1.5.1-kexi deleted file mode 100644 index 798a3a872111..000000000000 --- a/editors/koffice-kde3/files/patch-post-1.5.1-kexi +++ /dev/null @@ -1,65 +0,0 @@ -Index: kexi/plugins/forms/kexidataprovider.cpp -=================================================================== ---- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) -+++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) -@@ -92,7 +92,8 @@ - for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); - it!=m_fieldNumbersForDataItems.constEnd(); ++it) - { -- kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; -+ kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() -+ << " data=" << row.at(it.data()) << endl; - it.key()->setValue( row.at(it.data()) ); - } - } -Index: kexi/plugins/forms/widgets/kexidbautofield.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) -@@ -446,8 +446,11 @@ - @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] - (see doc/dev/settings.txt) */ - if (!text.isEmpty()) { -- realText = text[0].upper(); -- realText += (text.mid(1) + ": "); -+ realText = text[0].upper() + text.mid(1); -+ if (m_widgetType!=Boolean) { -+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -+ realText += ": "; -+ } - } - } - else -Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) -@@ -27,7 +27,9 @@ - : QCheckBox(text, parent, name), KexiFormDataItemInterface() - { - m_invalidState = false; -+//! todo: tristate - setTristate(true); -+ setFocusPolicy(QWidget::StrongFocus); - connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); - } - -@@ -56,13 +58,16 @@ - - void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) - { -- setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+ setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); - } - - QVariant - KexiDBCheckBox::value() - { -- return QVariant( isChecked(), 3 ); -+ if (state()==NoChange) -+ return QVariant(); -+ return QVariant(state()==On, 1); - } - - void KexiDBCheckBox::slotStateChanged(int ) diff --git a/editors/koffice-kde4-l10n-ca/Makefile b/editors/koffice-kde4-l10n-ca/Makefile index 0e7ecad639c0..99d12bd89bdb 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.1 +PORTVERSION= 1.5.2 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 24b67e957f6b..5138bc7fcafb 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.1.tar.bz2) = a9386b6c6049814d6f4a3f67a4cb51d8 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 7eb35b1babbb185eee032a53b27d8298c8e6a8571c8fc070e006193ad8640005 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 414688 +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 diff --git a/editors/koffice-kde4-l10n-ca/pkg-plist b/editors/koffice-kde4-l10n-ca/pkg-plist index e9d1a88c22a9..232a56980982 100644 --- a/editors/koffice-kde4-l10n-ca/pkg-plist +++ b/editors/koffice-kde4-l10n-ca/pkg-plist @@ -1,4 +1,26 @@ share/apps/koffice/autocorrect/ca.xml +share/doc/HTML/ca/karbon/common +share/doc/HTML/ca/karbon/index.cache.bz2 +share/doc/HTML/ca/karbon/index.docbook +share/doc/HTML/ca/kchart/common +share/doc/HTML/ca/kchart/index.cache.bz2 +share/doc/HTML/ca/kchart/index.docbook +share/doc/HTML/ca/kexi/basics.docbook +share/doc/HTML/ca/kexi/building.docbook +share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/configuration.docbook +share/doc/HTML/ca/kexi/credits.docbook +share/doc/HTML/ca/kexi/database.docbook +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/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/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo @@ -29,5 +51,11 @@ 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/koshell +@dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kexi +@dirrm share/doc/HTML/ca/kchart +@dirrm share/doc/HTML/ca/karbon +@dirrm share/doc/HTML/ca @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/editors/koffice-kde4-l10n-da/Makefile b/editors/koffice-kde4-l10n-da/Makefile index 6d2783ebb880..47c61c8df6cd 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.1 +PORTVERSION= 1.5.2 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 f889e6500901..ea0cfc7cacff 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.1.tar.bz2) = aa38e3e0f04a930e89543cfb79c6184d -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 6a97b8c73cc23849016f9326ede15959f451c42754a828ea1f5c98e4fa03c25e -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 1009829 +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 diff --git a/editors/koffice-kde4-l10n-el/Makefile b/editors/koffice-kde4-l10n-el/Makefile index ec9cbed3e935..00dab794c8cf 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.1 +PORTVERSION= 1.5.2 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 0dc8ee5b6cee..d99d2f341307 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.1.tar.bz2) = 350963ba95241e2576c077d4558d7fcb -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = e0578168a21cf0c525f67b429a5ce5b8bc21f2d93fe9c1864909ec928c55092f -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = 365646 +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 diff --git a/editors/koffice-kde4-l10n-en_GB/Makefile b/editors/koffice-kde4-l10n-en_GB/Makefile index 790a4e597f30..2aa1fd93bb12 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.1 +PORTVERSION= 1.5.2 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 aba9ce2990bc..28cf71ee2884 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.1.tar.bz2) = b7ae8b4aee9810f2b78235962f7f1dc2 -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 65abe80175f07027e95b4758550468822b336721293a42a5421d32e0b270c85d -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 340890 +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 diff --git a/editors/koffice-kde4-l10n-es/Makefile b/editors/koffice-kde4-l10n-es/Makefile index 41bae8e5423d..fe268dca1e63 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.1 +PORTVERSION= 1.5.2 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 bc92c9429856..5aedacd37629 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.1.tar.bz2) = 70b926928aa1a2facb3409f144191967 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 0b77ba910fffa2cf23c9f9423d958e8efe9c0469a6433eb09f129781b8e94c5e -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 8804520 +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 diff --git a/editors/koffice-kde4-l10n-es/pkg-plist b/editors/koffice-kde4-l10n-es/pkg-plist index f5758a148958..a02bdd2b7e9d 100644 --- a/editors/koffice-kde4-l10n-es/pkg-plist +++ b/editors/koffice-kde4-l10n-es/pkg-plist @@ -1,4 +1,8 @@ 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 share/doc/HTML/es/kchart/common share/doc/HTML/es/kchart/cr22-action-chart_line.png share/doc/HTML/es/kchart/cr22-action-data.png @@ -31,12 +35,21 @@ share/doc/HTML/es/kchart/kchart-example1-9.png share/doc/HTML/es/kchart/kchart-kspread-bar.png share/doc/HTML/es/kchart/kchart-kspread.png share/doc/HTML/es/kchart/kchart-startupdialog.png +share/doc/HTML/es/kchart/kchart-wizard0.png share/doc/HTML/es/kchart/kchart-wizard1.png share/doc/HTML/es/kchart/kchart-wizard2.png share/doc/HTML/es/kchart/kchart-wizard3.png share/doc/HTML/es/kchart/kchart-wizard4.png 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/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/intro.docbook +share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png share/doc/HTML/es/kformula/common share/doc/HTML/es/kformula/correct_index_location.png @@ -84,14 +97,62 @@ share/doc/HTML/es/koffice/index.docbook share/doc/HTML/es/koshell/common share/doc/HTML/es/koshell/index.cache.bz2 share/doc/HTML/es/koshell/index.docbook +share/doc/HTML/es/koshell/koshell1.png +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/configure-wbs.png +share/doc/HTML/es/kplato/configure2.1.png +share/doc/HTML/es/kplato/configure2.png +share/doc/HTML/es/kplato/definitions.docbook +share/doc/HTML/es/kplato/edit-accounts.png +share/doc/HTML/es/kplato/edit-accounts1.png +share/doc/HTML/es/kplato/edit-calendar.png +share/doc/HTML/es/kplato/edit-calendar1.png +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/mainwindow.docbook +share/doc/HTML/es/kplato/mainwindow1.png +share/doc/HTML/es/kplato/options.docbook +share/doc/HTML/es/kplato/project-settings.png +share/doc/HTML/es/kplato/wbs.docbook +share/doc/HTML/es/kplato/wbs.png +share/doc/HTML/es/kplato/wbs1.png +share/doc/HTML/es/kplato/wbs2.png +share/doc/HTML/es/kplato/wbs3.png share/doc/HTML/es/kpresenter/a11y.docbook +share/doc/HTML/es/kpresenter/autocorrection1.png +share/doc/HTML/es/kpresenter/autocorrection2.png +share/doc/HTML/es/kpresenter/autocorrection3.png +share/doc/HTML/es/kpresenter/autocorrection4.png share/doc/HTML/es/kpresenter/barstyle1.png share/doc/HTML/es/kpresenter/barstyle3.png share/doc/HTML/es/kpresenter/barstyle4.png share/doc/HTML/es/kpresenter/barstyle5.png share/doc/HTML/es/kpresenter/barstyle6.png share/doc/HTML/es/kpresenter/barstyle7.png +share/doc/HTML/es/kpresenter/break.png +share/doc/HTML/es/kpresenter/changeformat.png share/doc/HTML/es/kpresenter/common +share/doc/HTML/es/kpresenter/completion.png +share/doc/HTML/es/kpresenter/configure1.png +share/doc/HTML/es/kpresenter/configure2.png +share/doc/HTML/es/kpresenter/configure3.png +share/doc/HTML/es/kpresenter/configure4.png +share/doc/HTML/es/kpresenter/configure4a.png +share/doc/HTML/es/kpresenter/configure4a1.png +share/doc/HTML/es/kpresenter/configure4b.png +share/doc/HTML/es/kpresenter/configure4c.png +share/doc/HTML/es/kpresenter/configure5.png +share/doc/HTML/es/kpresenter/configure6.png +share/doc/HTML/es/kpresenter/configure6b.png +share/doc/HTML/es/kpresenter/configure6c.png +share/doc/HTML/es/kpresenter/configure6d.png +share/doc/HTML/es/kpresenter/configure6e.png +share/doc/HTML/es/kpresenter/configure7.png share/doc/HTML/es/kpresenter/faq.docbook share/doc/HTML/es/kpresenter/great-presentations.docbook share/doc/HTML/es/kpresenter/guides.docbook @@ -103,14 +164,28 @@ share/doc/HTML/es/kpresenter/htmlshow03.png share/doc/HTML/es/kpresenter/htmlshow04.png share/doc/HTML/es/kpresenter/htmlshow05.png share/doc/HTML/es/kpresenter/htmlshow07.png +share/doc/HTML/es/kpresenter/htmlshow1.png +share/doc/HTML/es/kpresenter/htmlshow2.png +share/doc/HTML/es/kpresenter/htmlshow3.png +share/doc/HTML/es/kpresenter/htmlshow4.png +share/doc/HTML/es/kpresenter/htmlshow5.png +share/doc/HTML/es/kpresenter/htmlshow6.png +share/doc/HTML/es/kpresenter/htmlshow7.png +share/doc/HTML/es/kpresenter/htmlshow8.png +share/doc/HTML/es/kpresenter/htmlshow9.png share/doc/HTML/es/kpresenter/index.cache.bz2 share/doc/HTML/es/kpresenter/index.docbook +share/doc/HTML/es/kpresenter/kbd-focus-ext.png +share/doc/HTML/es/kpresenter/link.png share/doc/HTML/es/kpresenter/menus.docbook +share/doc/HTML/es/kpresenter/mousenav.png share/doc/HTML/es/kpresenter/msexport1.png share/doc/HTML/es/kpresenter/msexport2.png +share/doc/HTML/es/kpresenter/msexport2b.png share/doc/HTML/es/kpresenter/msexport3.png share/doc/HTML/es/kpresenter/msexport4.png share/doc/HTML/es/kpresenter/options.docbook +share/doc/HTML/es/kpresenter/properties.png share/doc/HTML/es/kpresenter/screen.docbook share/doc/HTML/es/kpresenter/settings03.png share/doc/HTML/es/kpresenter/settings04.png @@ -119,11 +194,15 @@ share/doc/HTML/es/kpresenter/settings06.png share/doc/HTML/es/kpresenter/template02.png share/doc/HTML/es/kpresenter/template03.png share/doc/HTML/es/kpresenter/template04.png +share/doc/HTML/es/kpresenter/template05.png share/doc/HTML/es/kpresenter/template06.png share/doc/HTML/es/kpresenter/template07.png share/doc/HTML/es/kpresenter/textmenu01.png share/doc/HTML/es/kpresenter/textmenu02.png share/doc/HTML/es/kpresenter/textmenu03a.png +share/doc/HTML/es/kpresenter/textmenu1.png +share/doc/HTML/es/kpresenter/textmenu2.png +share/doc/HTML/es/kpresenter/tts.png share/doc/HTML/es/kpresenter/tut01.png share/doc/HTML/es/kpresenter/tut02.png share/doc/HTML/es/kpresenter/tut03.png @@ -147,7 +226,147 @@ share/doc/HTML/es/kpresenter/tut20.png share/doc/HTML/es/kpresenter/tut21.png share/doc/HTML/es/kpresenter/tut22.png share/doc/HTML/es/kpresenter/tut23.png +share/doc/HTML/es/kpresenter/tut24.png +share/doc/HTML/es/kpresenter/tut25.png +share/doc/HTML/es/kpresenter/tut26.png share/doc/HTML/es/kpresenter/tutorial.docbook +share/doc/HTML/es/kpresenter/zoomfactor.png +share/doc/HTML/es/krita/commands-dialogs.docbook +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/createdocument.png +share/doc/HTML/es/krita/credits.docbook +share/doc/HTML/es/krita/crocusses-bumpmap.png +share/doc/HTML/es/krita/crocusses-edgebottom.png +share/doc/HTML/es/krita/crocusses-embossall.png +share/doc/HTML/es/krita/crocusses-embossvariable.png +share/doc/HTML/es/krita/crocusses-gaussianblur.png +share/doc/HTML/es/krita/crocusses-invert.png +share/doc/HTML/es/krita/crocusses-meanremoval.png +share/doc/HTML/es/krita/crocusses-oilpaint.png +share/doc/HTML/es/krita/crocusses-pixelize.png +share/doc/HTML/es/krita/crocusses-raindrops.png +share/doc/HTML/es/krita/crocusses-roundcorners.png +share/doc/HTML/es/krita/crocusses-sharpen.png +share/doc/HTML/es/krita/crocusses-simplenoise.png +share/doc/HTML/es/krita/crocusses-tiles.png +share/doc/HTML/es/krita/crocusses.png +share/doc/HTML/es/krita/developers.docbook +share/doc/HTML/es/krita/dialogs-addpalette.png +share/doc/HTML/es/krita/dialogs-brightnesscontrast.png +share/doc/HTML/es/krita/dialogs-bumpmap.png +share/doc/HTML/es/krita/dialogs-coloradjustment.png +share/doc/HTML/es/krita/dialogs-colorrange.png +share/doc/HTML/es/krita/dialogs-convertimagetype.png +share/doc/HTML/es/krita/dialogs-convertlayertype.png +share/doc/HTML/es/krita/dialogs-cubism.png +share/doc/HTML/es/krita/dialogs-documentinformation.png +share/doc/HTML/es/krita/dialogs-dropshadow.png +share/doc/HTML/es/krita/dialogs-emboss.png +share/doc/HTML/es/krita/dialogs-filtersgallery.png +share/doc/HTML/es/krita/dialogs-histogram.png +share/doc/HTML/es/krita/dialogs-imageproperties.png +share/doc/HTML/es/krita/dialogs-imagesize.png +share/doc/HTML/es/krita/dialogs-layerproperties.png +share/doc/HTML/es/krita/dialogs-layersize.png +share/doc/HTML/es/krita/dialogs-newadjustmentlayer.png +share/doc/HTML/es/krita/dialogs-newlayer.png +share/doc/HTML/es/krita/dialogs-oilpaint.png +share/doc/HTML/es/krita/dialogs-pixelize.png +share/doc/HTML/es/krita/dialogs-raindrops.png +share/doc/HTML/es/krita/dialogs-rotateimage.png +share/doc/HTML/es/krita/dialogs-rotatelayer.png +share/doc/HTML/es/krita/dialogs-roundcorners.png +share/doc/HTML/es/krita/dialogs-separateimage.png +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/installation.docbook +share/doc/HTML/es/krita/introduction.docbook +share/doc/HTML/es/krita/mainscreen.png +share/doc/HTML/es/krita/newimage.png +share/doc/HTML/es/krita/palettes-colors-gray.png +share/doc/HTML/es/krita/palettes-colors-hsv.png +share/doc/HTML/es/krita/palettes-colors-palettes.png +share/doc/HTML/es/krita/palettes-colors-rgb.png +share/doc/HTML/es/krita/palettes-colors-watercolors.png +share/doc/HTML/es/krita/palettes-controlbox-brush.png +share/doc/HTML/es/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/es/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/es/krita/palettes-controlbox-crop.png +share/doc/HTML/es/krita/palettes-controlbox-gradient.png +share/doc/HTML/es/krita/palettes-controlbox-histogram.png +share/doc/HTML/es/krita/palettes-controlbox-line.png +share/doc/HTML/es/krita/palettes-controlbox-overview.png +share/doc/HTML/es/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/es/krita/palettes-controlbox-rectangle.png +share/doc/HTML/es/krita/palettes-controlbox-select.png +share/doc/HTML/es/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/es/krita/palettes-controlbox-star.png +share/doc/HTML/es/krita/palettes-controlbox-text.png +share/doc/HTML/es/krita/palettes-controlbox-transform.png +share/doc/HTML/es/krita/palettes-layers-layers.png +share/doc/HTML/es/krita/palettes-layers-scriptsmanager.png +share/doc/HTML/es/krita/preferences-color.png +share/doc/HTML/es/krita/preferences-display.png +share/doc/HTML/es/krita/preferences-general.png +share/doc/HTML/es/krita/preferences-grid.png +share/doc/HTML/es/krita/preferences-performance.png +share/doc/HTML/es/krita/preferences-sidebar.png +share/doc/HTML/es/krita/preferences-tablet.png +share/doc/HTML/es/krita/scripting.docbook +share/doc/HTML/es/krita/settings.docbook +share/doc/HTML/es/krita/tool-brush.png +share/doc/HTML/es/krita/tool-colorpicker.png +share/doc/HTML/es/krita/tool-contiguousfill.png +share/doc/HTML/es/krita/tool-crop.png +share/doc/HTML/es/krita/tool-duplicate.png +share/doc/HTML/es/krita/tool-ellipse.png +share/doc/HTML/es/krita/tool-eraseselection.png +share/doc/HTML/es/krita/tool-gradient.png +share/doc/HTML/es/krita/tool-line.png +share/doc/HTML/es/krita/tool-move.png +share/doc/HTML/es/krita/tool-paintselection.png +share/doc/HTML/es/krita/tool-paintwithfilters.png +share/doc/HTML/es/krita/tool-pan.png +share/doc/HTML/es/krita/tool-polygon.png +share/doc/HTML/es/krita/tool-polyline.png +share/doc/HTML/es/krita/tool-rectangle.png +share/doc/HTML/es/krita/tool-selectcontiguous.png +share/doc/HTML/es/krita/tool-selectelliptical.png +share/doc/HTML/es/krita/tool-selectoutline.png +share/doc/HTML/es/krita/tool-selectpolygonal.png +share/doc/HTML/es/krita/tool-selectrectangular.png +share/doc/HTML/es/krita/tool-selectsimilar.png +share/doc/HTML/es/krita/tool-star.png +share/doc/HTML/es/krita/tool-text.png +share/doc/HTML/es/krita/tool-transform.png +share/doc/HTML/es/krita/tool-zoom.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-autobrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-custombrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-predefined.png +share/doc/HTML/es/krita/toolbar-brushes-gradients.png +share/doc/HTML/es/krita/toolbar-brushes-patterns-custompattern.png +share/doc/HTML/es/krita/toolbar-brushes-patterns.png +share/doc/HTML/es/krita/toolbar-brushesandstuff.png +share/doc/HTML/es/krita/toolbar-edit.png +share/doc/HTML/es/krita/toolbar-file.png +share/doc/HTML/es/krita/toolbar-krita.png +share/doc/HTML/es/krita/toolbar-navigation.png +share/doc/HTML/es/krita/toolbar-transformationtools.png +share/doc/HTML/es/krita/tutorial-quick-starts.docbook +share/doc/HTML/es/krita/tutorial-select-layer.docbook +share/doc/HTML/es/krita/tutorial-starting.docbook +share/doc/HTML/es/krita/tutorial.docbook +share/doc/HTML/es/krita/using-colorspaces.docbook +share/doc/HTML/es/krita/using-filters.docbook +share/doc/HTML/es/krita/using-layers.docbook +share/doc/HTML/es/krita/using-selections-6.png +share/doc/HTML/es/krita/using-selections.docbook +share/doc/HTML/es/kspread/a11y.docbook share/doc/HTML/es/kspread/advanced.docbook share/doc/HTML/es/kspread/basics.docbook share/doc/HTML/es/kspread/cellformat0.png @@ -156,22 +375,46 @@ share/doc/HTML/es/kspread/cellformat2.png share/doc/HTML/es/kspread/cellformat3.png share/doc/HTML/es/kspread/cellformat4.png share/doc/HTML/es/kspread/cellformat5.png +share/doc/HTML/es/kspread/cellformat6.png +share/doc/HTML/es/kspread/cellformat7.png +share/doc/HTML/es/kspread/cellprotection1.png +share/doc/HTML/es/kspread/cellprotection2.png share/doc/HTML/es/kspread/chart1.png share/doc/HTML/es/kspread/commands.docbook share/doc/HTML/es/kspread/common share/doc/HTML/es/kspread/config.docbook share/doc/HTML/es/kspread/configdialog.docbook +share/doc/HTML/es/kspread/configure1.png +share/doc/HTML/es/kspread/configure2.png +share/doc/HTML/es/kspread/configure3.png +share/doc/HTML/es/kspread/configure4.png +share/doc/HTML/es/kspread/configure5.png +share/doc/HTML/es/kspread/configure6.png share/doc/HTML/es/kspread/copy1.png +share/doc/HTML/es/kspread/currency.png +share/doc/HTML/es/kspread/decreasedecimal.png share/doc/HTML/es/kspread/faq.docbook share/doc/HTML/es/kspread/format.docbook +share/doc/HTML/es/kspread/hideformula1.png +share/doc/HTML/es/kspread/hideformula2.png +share/doc/HTML/es/kspread/hideformula3.png +share/doc/HTML/es/kspread/hideformula4.png +share/doc/HTML/es/kspread/hideformula5.png share/doc/HTML/es/kspread/importexport.docbook +share/doc/HTML/es/kspread/increasedecimal.png share/doc/HTML/es/kspread/index.cache.bz2 share/doc/HTML/es/kspread/index.docbook +share/doc/HTML/es/kspread/kbd-focus-ext.png +share/doc/HTML/es/kspread/mousenav.png +share/doc/HTML/es/kspread/newdocument.png +share/doc/HTML/es/kspread/percent.png +share/doc/HTML/es/kspread/sheetproperties.png share/doc/HTML/es/kspread/shortcut1.png share/doc/HTML/es/kspread/shortcut2.png share/doc/HTML/es/kspread/shortcut3.png share/doc/HTML/es/kspread/sort1.png share/doc/HTML/es/kspread/starting1.png +share/doc/HTML/es/kspread/tts.png share/doc/HTML/es/kugar/add_detail.png share/doc/HTML/es/kugar/add_detail_footer.png share/doc/HTML/es/kugar/add_detail_header.png @@ -219,6 +462,7 @@ share/doc/HTML/es/kword/Tut3.png share/doc/HTML/es/kword/Tut4.png share/doc/HTML/es/kword/Tut7.png share/doc/HTML/es/kword/Tut8.png +share/doc/HTML/es/kword/a11y.docbook share/doc/HTML/es/kword/addentry.png share/doc/HTML/es/kword/addrecord.png share/doc/HTML/es/kword/alignBlock.png @@ -281,6 +525,7 @@ share/doc/HTML/es/kword/editpaste.png share/doc/HTML/es/kword/edittb.png share/doc/HTML/es/kword/end.png share/doc/HTML/es/kword/enumlist.png +share/doc/HTML/es/kword/exoffset.png share/doc/HTML/es/kword/expression.png share/doc/HTML/es/kword/expressions.docbook share/doc/HTML/es/kword/exst.png @@ -288,6 +533,8 @@ share/doc/HTML/es/kword/exul.png share/doc/HTML/es/kword/fchardlg.png share/doc/HTML/es/kword/fchardlg2.png share/doc/HTML/es/kword/fchardlg3.png +share/doc/HTML/es/kword/fchardlg4.png +share/doc/HTML/es/kword/fchardlg5.png share/doc/HTML/es/kword/filefloppy.png share/doc/HTML/es/kword/filenew2.png share/doc/HTML/es/kword/fileopen.png @@ -360,6 +607,7 @@ share/doc/HTML/es/kword/intro2.png share/doc/HTML/es/kword/intro3.png share/doc/HTML/es/kword/ital.png share/doc/HTML/es/kword/joincell.png +share/doc/HTML/es/kword/kbd-focus-ext.png share/doc/HTML/es/kword/kformappcol.png share/doc/HTML/es/kword/kformapprow.png share/doc/HTML/es/kword/kforminscol.png @@ -388,6 +636,7 @@ share/doc/HTML/es/kword/mmergeab1.png share/doc/HTML/es/kword/mmergekspread1.png share/doc/HTML/es/kword/mmergesql1.png share/doc/HTML/es/kword/mmergesql2.png +share/doc/HTML/es/kword/mousenav.png share/doc/HTML/es/kword/numtxtbut.png share/doc/HTML/es/kword/opendlg.png share/doc/HTML/es/kword/opt.docbook @@ -453,6 +702,7 @@ share/doc/HTML/es/kword/textstyex.png share/doc/HTML/es/kword/tfcreatebut.png share/doc/HTML/es/kword/thesaurus.png share/doc/HTML/es/kword/toc.docbook +share/doc/HTML/es/kword/tts.png share/doc/HTML/es/kword/tutorial.docbook share/doc/HTML/es/kword/undl.png share/doc/HTML/es/kword/undo.png @@ -500,11 +750,16 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kword @dirrm share/doc/HTML/es/kugar @dirrm share/doc/HTML/es/kspread +@dirrm share/doc/HTML/es/krita @dirrm share/doc/HTML/es/kpresenter +@dirrm share/doc/HTML/es/kplato @dirrm share/doc/HTML/es/koshell @dirrm share/doc/HTML/es/koffice @dirrm share/doc/HTML/es/kivio @dirrm share/doc/HTML/es/kformula +@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 78638aab6083..c0ba82e8d416 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.1 +PORTVERSION= 1.5.2 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 1fc8b57b8b66..74cb277ae6f8 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.1.tar.bz2) = 23311d668c05da159ea12240f950e763 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 674392e50b4b9dd0d39c282c5a86cc263b18785b3c733b027ae3da0e9d4e0409 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 1131254 +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 diff --git a/editors/koffice-kde4-l10n-it/Makefile b/editors/koffice-kde4-l10n-it/Makefile index bd26c890a0b1..3549b46cc8ed 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.1 +PORTVERSION= 1.5.2 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 51c4c70710a7..dc9a385818d7 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.1.tar.bz2) = 71cf4cad9272090e6469a96736bd785e -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = c6b5f9696fd3d03eefd1eb92669dee2f6f4c0942d5604310d0d07868baf7fc2d -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = 1349698 +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 diff --git a/editors/koffice-kde4-l10n-it/pkg-plist b/editors/koffice-kde4-l10n-it/pkg-plist index 433a1c887ed5..81da090823f6 100644 --- a/editors/koffice-kde4-l10n-it/pkg-plist +++ b/editors/koffice-kde4-l10n-it/pkg-plist @@ -114,6 +114,7 @@ share/doc/HTML/it/kword/a11y.docbook share/doc/HTML/it/kword/basics.docbook share/doc/HTML/it/kword/bookmarks.docbook share/doc/HTML/it/kword/chapnumb.docbook +share/doc/HTML/it/kword/colorseldlg.png share/doc/HTML/it/kword/columns.docbook share/doc/HTML/it/kword/common share/doc/HTML/it/kword/doccomments.docbook @@ -122,6 +123,8 @@ share/doc/HTML/it/kword/docstruct.docbook share/doc/HTML/it/kword/docvariables.docbook share/doc/HTML/it/kword/editing.docbook share/doc/HTML/it/kword/expressions.docbook +share/doc/HTML/it/kword/finddlg.png +share/doc/HTML/it/kword/finddlg2.png share/doc/HTML/it/kword/footendnotes.docbook share/doc/HTML/it/kword/formatchar.docbook share/doc/HTML/it/kword/formatframes.docbook @@ -140,7 +143,18 @@ share/doc/HTML/it/kword/mailmerge.docbook share/doc/HTML/it/kword/mbtb.docbook share/doc/HTML/it/kword/migrating.docbook share/doc/HTML/it/kword/opt.docbook +share/doc/HTML/it/kword/opt1.png +share/doc/HTML/it/kword/opt2.png +share/doc/HTML/it/kword/opt3.png +share/doc/HTML/it/kword/opt4.png +share/doc/HTML/it/kword/opt5.png +share/doc/HTML/it/kword/optkb.png +share/doc/HTML/it/kword/optkb2.png +share/doc/HTML/it/kword/opttb.png share/doc/HTML/it/kword/pageformat.docbook +share/doc/HTML/it/kword/pntdlg.png +share/doc/HTML/it/kword/pntdlg1.png +share/doc/HTML/it/kword/repldlg.png share/doc/HTML/it/kword/storeprint.docbook share/doc/HTML/it/kword/styles.docbook share/doc/HTML/it/kword/table.docbook diff --git a/editors/koffice-kde4-l10n-nb/Makefile b/editors/koffice-kde4-l10n-nb/Makefile index c80c9012e630..4e111dae8f7f 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.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for koffice +COMMENT= Norwegian Bokml messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/editors/koffice-kde4-l10n-nb/distinfo b/editors/koffice-kde4-l10n-nb/distinfo index 84d9b5e9d8ae..3b1c0a14407b 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.1.tar.bz2) = ff774ceadd4c42b80ab138c4446d8843 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 4d1e1d4d461c336e5cc4386259658ba0e3c3f5f6ff1f57756399870a497a18c6 -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 359337 +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 diff --git a/editors/koffice-kde4-l10n-nb/pkg-plist b/editors/koffice-kde4-l10n-nb/pkg-plist index 747ac7827ea9..56cd255ecfe9 100644 --- a/editors/koffice-kde4-l10n-nb/pkg-plist +++ b/editors/koffice-kde4-l10n-nb/pkg-plist @@ -3,6 +3,8 @@ 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/kexi.mo +share/locale/nb/LC_MESSAGES/kfile_abiword.mo +share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo share/locale/nb/LC_MESSAGES/kfile_koffice.mo share/locale/nb/LC_MESSAGES/kfile_ooo.mo share/locale/nb/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/nb/LC_MESSAGES/kivio.mo share/locale/nb/LC_MESSAGES/koconverter.mo share/locale/nb/LC_MESSAGES/koffice.mo share/locale/nb/LC_MESSAGES/kofficefilters.mo +share/locale/nb/LC_MESSAGES/koproperty.mo share/locale/nb/LC_MESSAGES/koshell.mo share/locale/nb/LC_MESSAGES/kounavail.mo +share/locale/nb/LC_MESSAGES/kplato.mo share/locale/nb/LC_MESSAGES/kpresenter.mo share/locale/nb/LC_MESSAGES/krita.mo share/locale/nb/LC_MESSAGES/kscan_plugin.mo diff --git a/editors/koffice-kde4-l10n-nl/Makefile b/editors/koffice-kde4-l10n-nl/Makefile index e5b75b872009..04aeaa72ffb2 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.1 +PORTVERSION= 1.5.2 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 517edcb4b923..9cbf82513851 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.1.tar.bz2) = f76f2b7b8a65a528d3d0514f5f1a0cbf -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 71fc1679a5aff43117cc22832b005249a5259e2c30e8d282d4adf7c54e42a2d8 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 3271404 +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 diff --git a/editors/koffice-kde4-l10n-sv/Makefile b/editors/koffice-kde4-l10n-sv/Makefile index 1cd24a30d0eb..2dfe5de3c96e 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.1 +PORTVERSION= 1.5.2 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 d95e58affcb1..c6c36bca9a65 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.1.tar.bz2) = 4afcc6585df0a171e90b595c3d3311ae -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 2a66b9f3f17e49a5e70cc8504ad10a537928c1b62892b081502003a479890f1c -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 5970774 +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 diff --git a/editors/koffice-kde4-l10n-tr/Makefile b/editors/koffice-kde4-l10n-tr/Makefile index 66a6cfb2c532..7e3333a820b6 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.1 +PORTVERSION= 1.5.2 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 a974be35fac9..58c8a1243afa 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.1.tar.bz2) = 0026e7f0b40b76a700792bf3a8a40427 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = f6e4ee1799cca65a8238b3bf5ab911503095480494bc61c4135e5eae1ab55d65 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = 352993 +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 diff --git a/editors/koffice-kde4-l10n/Makefile b/editors/koffice-kde4-l10n/Makefile index 0b8845efdb0d..4df487a14bda 100644 --- a/editors/koffice-kde4-l10n/Makefile +++ b/editors/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 3cb58dc11716..6f27fc720383 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 PORTEPOCH= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo index 28b58c416210..746a0be2c24d 100644 --- a/editors/koffice-kde4/distinfo +++ b/editors/koffice-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/koffice/koffice-1.5.1.tar.bz2) = 50897bd5dfd4eba8a0d78a02003a6ec9 -SHA256 (KDE/koffice/koffice-1.5.1.tar.bz2) = 4305018f71934d21a3f16cfc6195ebba8ab062260ae8c3ba1812f1d3658c7119 -SIZE (KDE/koffice/koffice-1.5.1.tar.bz2) = 36010120 +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 diff --git a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in b/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in deleted file mode 100644 index 2a6b7ab620e5..000000000000 --- a/editors/koffice-kde4/files/patch-kexi_kexidb_drivers_sqlite2-Makefile.in +++ /dev/null @@ -1,33 +0,0 @@ ---- kexi/kexidb/drivers/sqlite2/Makefile.in Wed May 17 12:07:36 2006 -+++ kexi/kexidb/drivers/sqlite2/Makefile.in Tue May 23 19:05:20 2006 -@@ -929,12 +929,6 @@ - uninstall-am uninstall-info-am uninstall-kde_moduleLTLIBRARIES \ - uninstall-kde_servicesDATA - -- --# we need the .mocs to be built --sqliteconnection.lo: ../sqlite/sqliteconnection.lo --sqlitecursor.lo: ../sqlite/sqlitecursor.lo --sqlitedriver.lo: ../sqlite/sqlitedriver.lo --sqlitepreparedstatement.lo: ../sqlite/sqlitepreparedstatement.lo - # 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: -@@ -949,7 +943,7 @@ - - - #>+ 2 --KDE_DIST=sqlitecursor.h sqlitedriver.h sqliteconnection.h Makefile.in kexidb_sqlite2driver.desktop sqliteconnection_p.h sqlite2.pro Makefile.am -+KDE_DIST=sqlitecursor.h sqliteconnection.h sqlite2.pro Makefile.in kexidb_sqlite2driver.desktop Makefile.am sqliteconnection_p.h sqlitedriver.h - - #>+ 3 - clean-closures: -@@ -997,7 +991,7 @@ - - - #>+ 11 --kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp ../sqlite/sqliteconnection.lo $(srcdir)/sqlitedriver.cpp ../sqlite/sqlitedriver.lo $(srcdir)/sqlitecursor.cpp ../sqlite/sqlitecursor.lo $(srcdir)/sqlitepreparedstatement.cpp ../sqlite/sqlitepreparedstatement.lo -+kexidb_sqlite2driver_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/sqliteconnection.cpp $(srcdir)/sqlitedriver.cpp $(srcdir)/sqlitecursor.cpp $(srcdir)/sqlitepreparedstatement.cpp - @echo 'creating kexidb_sqlite2driver_la.all_cpp.cpp ...'; \ - rm -f kexidb_sqlite2driver_la.all_cpp.files kexidb_sqlite2driver_la.all_cpp.final; \ - echo "#define KDE_USE_FINAL 1" >> kexidb_sqlite2driver_la.all_cpp.final; \ diff --git a/editors/koffice-kde4/files/patch-kexi_plugins_forms-Makefile.in b/editors/koffice-kde4/files/patch-kexi_plugins_forms-Makefile.in deleted file mode 100644 index 9dc40bb8226c..000000000000 --- a/editors/koffice-kde4/files/patch-kexi_plugins_forms-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- kexi/plugins/forms/Makefile.in.orig Sun May 21 14:54:47 2006 -+++ kexi/plugins/forms/Makefile.in Sun May 21 14:56:19 2006 -@@ -658,9 +658,10 @@ - kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ - kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp - --libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner diff --git a/editors/koffice-kde4/files/patch-kexi_plugins_reports-Makefile.in b/editors/koffice-kde4/files/patch-kexi_plugins_reports-Makefile.in deleted file mode 100644 index 75d9bb157887..000000000000 --- a/editors/koffice-kde4/files/patch-kexi_plugins_reports-Makefile.in +++ /dev/null @@ -1,42 +0,0 @@ ---- kexi/plugins/reports/Makefile.in.orig Sun May 21 14:56:30 2006 -+++ kexi/plugins/reports/Makefile.in Sun May 21 15:02:13 2006 -@@ -65,16 +65,20 @@ - libLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES) - kexihandler_report_la_DEPENDENCIES = ../../core/libkexicore.la \ -- ../../widget/utils/libkexiguiutils.la \ -- ../../widget/libkexiextendedwidgets.la \ -- ../../formeditor/libkformdesigner.la \ -- ../forms/libkexiformutils.la ./libkexireportutils.la -+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ ./libkexireportutils.la - am_kexihandler_report_la_OBJECTS = kexireports.lo - #>- kexihandler_report_la_OBJECTS = $(am_kexihandler_report_la_OBJECTS) - #>+ 1 - kexihandler_report_la_OBJECTS = kexireports.lo - kexireportwidgets_la_DEPENDENCIES = \ - $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ -+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - ./libkexireportutils.la - am_kexireportwidgets_la_OBJECTS = reportwidgets.lo \ - kexireportfactory.lo -@@ -645,10 +649,12 @@ - libkexireportutils_la_SOURCES = \ - kexireportpart.cpp kexireportview.cpp kexireportform.cpp - --libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved -+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) - libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ -+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ -+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ - $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ -- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la -+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la - - kformdesignerservicesdir = $(kde_servicesdir)/kformdesigner - kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop diff --git a/editors/koffice-kde4/files/patch-krita_plugins_filters_cimg-Makefile.in b/editors/koffice-kde4/files/patch-krita_plugins_filters_cimg-Makefile.in deleted file mode 100644 index 7e5d73f256d8..000000000000 --- a/editors/koffice-kde4/files/patch-krita_plugins_filters_cimg-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- krita/plugins/filters/cimg/Makefile.in.orig Mon May 22 12:44:21 2006 -+++ krita/plugins/filters/cimg/Makefile.in Mon May 22 12:44:39 2006 -@@ -562,7 +562,7 @@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --KDE_CXXFLAGS = $(USE_EXCEPTIONS) -D_POSIX_C_SOURCE=199309L -+KDE_CXXFLAGS = $(USE_EXCEPTIONS) - kde_services_DATA = kritacimg.desktop - - # all_includes must remain last! diff --git a/editors/koffice-kde4/files/patch-post-1.5.1-kexi b/editors/koffice-kde4/files/patch-post-1.5.1-kexi deleted file mode 100644 index 798a3a872111..000000000000 --- a/editors/koffice-kde4/files/patch-post-1.5.1-kexi +++ /dev/null @@ -1,65 +0,0 @@ -Index: kexi/plugins/forms/kexidataprovider.cpp -=================================================================== ---- kexi/plugins/forms/kexidataprovider.cpp (revision 542130) -+++ kexi/plugins/forms/kexidataprovider.cpp (revision 542131) -@@ -92,7 +92,8 @@ - for (KexiFormDataItemInterfaceToIntMap::ConstIterator it = m_fieldNumbersForDataItems.constBegin(); - it!=m_fieldNumbersForDataItems.constEnd(); ++it) - { -- kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() << endl; -+ kexipluginsdbg << "fill data of '" << it.key()->dataSource() << "' at idx=" << it.data() -+ << " data=" << row.at(it.data()) << endl; - it.key()->setValue( row.at(it.data()) ); - } - } -Index: kexi/plugins/forms/widgets/kexidbautofield.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbautofield.cpp (revision 542131) -@@ -446,8 +446,11 @@ - @todo look at makeFirstCharacterUpperCaseInAutoLabels setting [bool] - (see doc/dev/settings.txt) */ - if (!text.isEmpty()) { -- realText = text[0].upper(); -- realText += (text.mid(1) + ": "); -+ realText = text[0].upper() + text.mid(1); -+ if (m_widgetType!=Boolean) { -+//! @todo ":" suffix looks weird for checkbox; remove this condition when [x] is displayed _after_ label -+ realText += ": "; -+ } - } - } - else -Index: kexi/plugins/forms/widgets/kexidbcheckbox.cpp -=================================================================== ---- kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542130) -+++ kexi/plugins/forms/widgets/kexidbcheckbox.cpp (revision 542131) -@@ -27,7 +27,9 @@ - : QCheckBox(text, parent, name), KexiFormDataItemInterface() - { - m_invalidState = false; -+//! todo: tristate - setTristate(true); -+ setFocusPolicy(QWidget::StrongFocus); - connect(this, SIGNAL(stateChanged(int)), this, SLOT(slotStateChanged(int))); - } - -@@ -56,13 +58,16 @@ - - void KexiDBCheckBox::setValueInternal(const QVariant &add, bool ) - { -- setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+// setState( add.isNull() ? NoChange : (add.toBool() ? On : Off) ); -+ setState( m_origValue.isNull() ? NoChange : (m_origValue.toBool() ? On : Off) ); - } - - QVariant - KexiDBCheckBox::value() - { -- return QVariant( isChecked(), 3 ); -+ if (state()==NoChange) -+ return QVariant(); -+ return QVariant(state()==On, 1); - } - - void KexiDBCheckBox::slotStateChanged(int ) diff --git a/french/calligra-l10n/Makefile b/french/calligra-l10n/Makefile index e935d0cf49b2..3fa52e8eb71e 100644 --- a/french/calligra-l10n/Makefile +++ b/french/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 98a28c7de2e6..02435d2ce79b 100644 --- a/french/calligra-l10n/distinfo +++ b/french/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = d63d63daa55fa32e5c93b72c902cd4d1 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = b769bf81b7c1eb762aca5e47a7f67fa5a5ebba212752ac182d0cea231c7c1e6a -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = 6588898 +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 diff --git a/french/calligra-l10n/pkg-plist b/french/calligra-l10n/pkg-plist index 485da5385033..a9a3581bbfcd 100644 --- a/french/calligra-l10n/pkg-plist +++ b/french/calligra-l10n/pkg-plist @@ -66,6 +66,14 @@ share/doc/HTML/fr/koffice/index.docbook share/doc/HTML/fr/koshell/common share/doc/HTML/fr/koshell/index.cache.bz2 share/doc/HTML/fr/koshell/index.docbook +share/doc/HTML/fr/kplato/commands.docbook +share/doc/HTML/fr/kplato/common +share/doc/HTML/fr/kplato/definitions.docbook +share/doc/HTML/fr/kplato/index.cache.bz2 +share/doc/HTML/fr/kplato/index.docbook +share/doc/HTML/fr/kplato/mainwindow.docbook +share/doc/HTML/fr/kplato/options.docbook +share/doc/HTML/fr/kplato/wbs.docbook share/doc/HTML/fr/kpresenter/barstyle1.png share/doc/HTML/fr/kpresenter/barstyle3.png share/doc/HTML/fr/kpresenter/barstyle4.png @@ -419,6 +427,7 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kspread @dirrm share/doc/HTML/fr/kpresenter/pics @dirrm share/doc/HTML/fr/kpresenter +@dirrm share/doc/HTML/fr/kplato @dirrm share/doc/HTML/fr/koshell @dirrm share/doc/HTML/fr/koffice @dirrm share/doc/HTML/fr/kivio diff --git a/french/kde3-i18n/distinfo b/french/kde3-i18n/distinfo index 54a2c3876df4..19f8352d9d1e 100644 --- a/french/kde3-i18n/distinfo +++ b/french/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 02cd975bb784378b443855b8827b9607 -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 7bce23af08c8dfb9ca0cb362d5ae7368c3afd4cd8c6cf38a850fcd42a5389ed6 -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 18507071 +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 diff --git a/french/kde3-i18n/pkg-plist b/french/kde3-i18n/pkg-plist index 1a8f00b87aa0..d24df720f9a7 100644 --- a/french/kde3-i18n/pkg-plist +++ b/french/kde3-i18n/pkg-plist @@ -28,6 +28,9 @@ share/apps/kturtle/examples/fr_FR/triangle.logo share/doc/HTML/fr/KRegExpEditor/common share/doc/HTML/fr/KRegExpEditor/index.cache.bz2 share/doc/HTML/fr/KRegExpEditor/index.docbook +share/doc/HTML/fr/akregator/common +share/doc/HTML/fr/akregator/index.cache.bz2 +share/doc/HTML/fr/akregator/index.docbook share/doc/HTML/fr/amor/common share/doc/HTML/fr/amor/index.cache.bz2 share/doc/HTML/fr/amor/index.docbook @@ -541,8 +544,10 @@ share/doc/HTML/fr/khelpcenter/quickstart/common share/doc/HTML/fr/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/fr/khelpcenter/quickstart/index.docbook share/doc/HTML/fr/khelpcenter/support.docbook +share/doc/HTML/fr/khelpcenter/userguide/a-window.png share/doc/HTML/fr/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/fr/khelpcenter/userguide/accessibility.docbook +share/doc/HTML/fr/khelpcenter/userguide/amarok.png share/doc/HTML/fr/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/fr/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/fr/khelpcenter/userguide/burning-cds.docbook @@ -565,32 +570,64 @@ share/doc/HTML/fr/khelpcenter/userguide/index.docbook share/doc/HTML/fr/khelpcenter/userguide/installation.docbook share/doc/HTML/fr/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/fr/khelpcenter/userguide/intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/juk.png +share/doc/HTML/fr/khelpcenter/userguide/kaboodle.png +share/doc/HTML/fr/khelpcenter/userguide/kcalc-systray.png +share/doc/HTML/fr/khelpcenter/userguide/kcontrol.png share/doc/HTML/fr/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-office.docbook +share/doc/HTML/fr/khelpcenter/userguide/kmag.png +share/doc/HTML/fr/khelpcenter/userguide/kmousetool.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth2.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth3.png +share/doc/HTML/fr/khelpcenter/userguide/knode-identity.png +share/doc/HTML/fr/khelpcenter/userguide/knode-mail-account.png +share/doc/HTML/fr/khelpcenter/userguide/knode-news-account.png +share/doc/HTML/fr/khelpcenter/userguide/knode-start.png +share/doc/HTML/fr/khelpcenter/userguide/konq-sidebar.png +share/doc/HTML/fr/khelpcenter/userguide/konq-simple.png share/doc/HTML/fr/khelpcenter/userguide/konsole-intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/kopete.png +share/doc/HTML/fr/khelpcenter/userguide/kppp-dialer-tab.png +share/doc/HTML/fr/khelpcenter/userguide/kppp-wizard.png share/doc/HTML/fr/khelpcenter/userguide/messaging-intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/fr/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/fr/khelpcenter/userguide/more-help.docbook share/doc/HTML/fr/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/fr/khelpcenter/userguide/networking-with-windows.docbook +share/doc/HTML/fr/khelpcenter/userguide/noatun.png share/doc/HTML/fr/khelpcenter/userguide/notices-trademarks.docbook +share/doc/HTML/fr/khelpcenter/userguide/oggfolder.png +share/doc/HTML/fr/khelpcenter/userguide/open-file-dialog.png share/doc/HTML/fr/khelpcenter/userguide/panel-and-desktop.docbook share/doc/HTML/fr/khelpcenter/userguide/pdf-files.docbook +share/doc/HTML/fr/khelpcenter/userguide/playing-audiocds.docbook share/doc/HTML/fr/khelpcenter/userguide/playing-movies.docbook +share/doc/HTML/fr/khelpcenter/userguide/playing-music.docbook share/doc/HTML/fr/khelpcenter/userguide/printer-setup.docbook share/doc/HTML/fr/khelpcenter/userguide/printing-from-apps.docbook +share/doc/HTML/fr/khelpcenter/userguide/programs-and-documents.docbook share/doc/HTML/fr/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/fr/khelpcenter/userguide/removable-disks.docbook +share/doc/HTML/fr/khelpcenter/userguide/rip.png +share/doc/HTML/fr/khelpcenter/userguide/ripsettings.png share/doc/HTML/fr/khelpcenter/userguide/screen-captures.docbook +share/doc/HTML/fr/khelpcenter/userguide/services.png share/doc/HTML/fr/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/fr/khelpcenter/userguide/shortcuts.docbook share/doc/HTML/fr/khelpcenter/userguide/staff.docbook +share/doc/HTML/fr/khelpcenter/userguide/standard-menu-entries.docbook +share/doc/HTML/fr/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/fr/khelpcenter/userguide/the-filemanager.docbook +share/doc/HTML/fr/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/fr/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/fr/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/fr/khelpcenter/userguide/ug-faq.docbook +share/doc/HTML/fr/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/fr/khelpcenter/userguide/usenet.docbook share/doc/HTML/fr/khelpcenter/userguide/where-next.docbook share/doc/HTML/fr/khelpcenter/userguide/windows-how-to.docbook @@ -633,6 +670,7 @@ share/doc/HTML/fr/kicker/common share/doc/HTML/fr/kicker/index.cache.bz2 share/doc/HTML/fr/kicker/index.docbook share/doc/HTML/fr/kicker/k_menu_icon.png +share/doc/HTML/fr/kicker/man-appletproxy.1.docbook share/doc/HTML/fr/kicker/man-kicker.1.docbook share/doc/HTML/fr/kicker/screenshot_left.png share/doc/HTML/fr/kicker/screenshot_right.png @@ -1850,7 +1888,6 @@ share/locale/fr/LC_MESSAGES/kmathapplet.mo share/locale/fr/LC_MESSAGES/kmcop.mo share/locale/fr/LC_MESSAGES/kmenuapplet.mo share/locale/fr/LC_MESSAGES/kmenuedit.mo -share/locale/fr/LC_MESSAGES/kmessedwords.mo share/locale/fr/LC_MESSAGES/kmid.mo share/locale/fr/LC_MESSAGES/kmilo_delli8k.mo share/locale/fr/LC_MESSAGES/kmilo_generic.mo @@ -2017,7 +2054,6 @@ share/locale/fr/LC_MESSAGES/libdmctl.mo share/locale/fr/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/fr/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/fr/LC_MESSAGES/libkcal.mo -share/locale/fr/LC_MESSAGES/libkcalsystem.mo share/locale/fr/LC_MESSAGES/libkcddb.mo share/locale/fr/LC_MESSAGES/libkdeedu.mo share/locale/fr/LC_MESSAGES/libkdegames.mo @@ -2343,6 +2379,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/artsbuilder @dirrm share/doc/HTML/fr/ark @dirrm share/doc/HTML/fr/amor +@dirrm share/doc/HTML/fr/akregator @dirrm share/doc/HTML/fr/KRegExpEditor @dirrm share/apps/kturtle/examples/fr_FR @dirrm share/apps/kturtle/examples diff --git a/french/kde4-l10n/distinfo b/french/kde4-l10n/distinfo index 54a2c3876df4..19f8352d9d1e 100644 --- a/french/kde4-l10n/distinfo +++ b/french/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 02cd975bb784378b443855b8827b9607 -SHA256 (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 7bce23af08c8dfb9ca0cb362d5ae7368c3afd4cd8c6cf38a850fcd42a5389ed6 -SIZE (KDE/kde-i18n/kde-i18n-fr-3.5.3.tar.bz2) = 18507071 +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 diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist index 1a8f00b87aa0..d24df720f9a7 100644 --- a/french/kde4-l10n/pkg-plist +++ b/french/kde4-l10n/pkg-plist @@ -28,6 +28,9 @@ share/apps/kturtle/examples/fr_FR/triangle.logo share/doc/HTML/fr/KRegExpEditor/common share/doc/HTML/fr/KRegExpEditor/index.cache.bz2 share/doc/HTML/fr/KRegExpEditor/index.docbook +share/doc/HTML/fr/akregator/common +share/doc/HTML/fr/akregator/index.cache.bz2 +share/doc/HTML/fr/akregator/index.docbook share/doc/HTML/fr/amor/common share/doc/HTML/fr/amor/index.cache.bz2 share/doc/HTML/fr/amor/index.docbook @@ -541,8 +544,10 @@ share/doc/HTML/fr/khelpcenter/quickstart/common share/doc/HTML/fr/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/fr/khelpcenter/quickstart/index.docbook share/doc/HTML/fr/khelpcenter/support.docbook +share/doc/HTML/fr/khelpcenter/userguide/a-window.png share/doc/HTML/fr/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/fr/khelpcenter/userguide/accessibility.docbook +share/doc/HTML/fr/khelpcenter/userguide/amarok.png share/doc/HTML/fr/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/fr/khelpcenter/userguide/browser-fine-tuning.docbook share/doc/HTML/fr/khelpcenter/userguide/burning-cds.docbook @@ -565,32 +570,64 @@ share/doc/HTML/fr/khelpcenter/userguide/index.docbook share/doc/HTML/fr/khelpcenter/userguide/installation.docbook share/doc/HTML/fr/khelpcenter/userguide/internet-shortcuts.docbook share/doc/HTML/fr/khelpcenter/userguide/intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/juk.png +share/doc/HTML/fr/khelpcenter/userguide/kaboodle.png +share/doc/HTML/fr/khelpcenter/userguide/kcalc-systray.png +share/doc/HTML/fr/khelpcenter/userguide/kcontrol.png share/doc/HTML/fr/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/fr/khelpcenter/userguide/kde-office.docbook +share/doc/HTML/fr/khelpcenter/userguide/kmag.png +share/doc/HTML/fr/khelpcenter/userguide/kmousetool.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth2.png +share/doc/HTML/fr/khelpcenter/userguide/kmouth3.png +share/doc/HTML/fr/khelpcenter/userguide/knode-identity.png +share/doc/HTML/fr/khelpcenter/userguide/knode-mail-account.png +share/doc/HTML/fr/khelpcenter/userguide/knode-news-account.png +share/doc/HTML/fr/khelpcenter/userguide/knode-start.png +share/doc/HTML/fr/khelpcenter/userguide/konq-sidebar.png +share/doc/HTML/fr/khelpcenter/userguide/konq-simple.png share/doc/HTML/fr/khelpcenter/userguide/konsole-intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/kopete.png +share/doc/HTML/fr/khelpcenter/userguide/kppp-dialer-tab.png +share/doc/HTML/fr/khelpcenter/userguide/kppp-wizard.png share/doc/HTML/fr/khelpcenter/userguide/messaging-intro.docbook +share/doc/HTML/fr/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/fr/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/fr/khelpcenter/userguide/more-help.docbook share/doc/HTML/fr/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/fr/khelpcenter/userguide/networking-with-windows.docbook +share/doc/HTML/fr/khelpcenter/userguide/noatun.png share/doc/HTML/fr/khelpcenter/userguide/notices-trademarks.docbook +share/doc/HTML/fr/khelpcenter/userguide/oggfolder.png +share/doc/HTML/fr/khelpcenter/userguide/open-file-dialog.png share/doc/HTML/fr/khelpcenter/userguide/panel-and-desktop.docbook share/doc/HTML/fr/khelpcenter/userguide/pdf-files.docbook +share/doc/HTML/fr/khelpcenter/userguide/playing-audiocds.docbook share/doc/HTML/fr/khelpcenter/userguide/playing-movies.docbook +share/doc/HTML/fr/khelpcenter/userguide/playing-music.docbook share/doc/HTML/fr/khelpcenter/userguide/printer-setup.docbook share/doc/HTML/fr/khelpcenter/userguide/printing-from-apps.docbook +share/doc/HTML/fr/khelpcenter/userguide/programs-and-documents.docbook share/doc/HTML/fr/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/fr/khelpcenter/userguide/removable-disks.docbook +share/doc/HTML/fr/khelpcenter/userguide/rip.png +share/doc/HTML/fr/khelpcenter/userguide/ripsettings.png share/doc/HTML/fr/khelpcenter/userguide/screen-captures.docbook +share/doc/HTML/fr/khelpcenter/userguide/services.png share/doc/HTML/fr/khelpcenter/userguide/shared-sessions.docbook share/doc/HTML/fr/khelpcenter/userguide/shortcuts.docbook share/doc/HTML/fr/khelpcenter/userguide/staff.docbook +share/doc/HTML/fr/khelpcenter/userguide/standard-menu-entries.docbook +share/doc/HTML/fr/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/fr/khelpcenter/userguide/the-filemanager.docbook +share/doc/HTML/fr/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/fr/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/fr/khelpcenter/userguide/troubleshooting-no-open.docbook share/doc/HTML/fr/khelpcenter/userguide/ug-faq.docbook +share/doc/HTML/fr/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/fr/khelpcenter/userguide/usenet.docbook share/doc/HTML/fr/khelpcenter/userguide/where-next.docbook share/doc/HTML/fr/khelpcenter/userguide/windows-how-to.docbook @@ -633,6 +670,7 @@ share/doc/HTML/fr/kicker/common share/doc/HTML/fr/kicker/index.cache.bz2 share/doc/HTML/fr/kicker/index.docbook share/doc/HTML/fr/kicker/k_menu_icon.png +share/doc/HTML/fr/kicker/man-appletproxy.1.docbook share/doc/HTML/fr/kicker/man-kicker.1.docbook share/doc/HTML/fr/kicker/screenshot_left.png share/doc/HTML/fr/kicker/screenshot_right.png @@ -1850,7 +1888,6 @@ share/locale/fr/LC_MESSAGES/kmathapplet.mo share/locale/fr/LC_MESSAGES/kmcop.mo share/locale/fr/LC_MESSAGES/kmenuapplet.mo share/locale/fr/LC_MESSAGES/kmenuedit.mo -share/locale/fr/LC_MESSAGES/kmessedwords.mo share/locale/fr/LC_MESSAGES/kmid.mo share/locale/fr/LC_MESSAGES/kmilo_delli8k.mo share/locale/fr/LC_MESSAGES/kmilo_generic.mo @@ -2017,7 +2054,6 @@ share/locale/fr/LC_MESSAGES/libdmctl.mo share/locale/fr/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/fr/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/fr/LC_MESSAGES/libkcal.mo -share/locale/fr/LC_MESSAGES/libkcalsystem.mo share/locale/fr/LC_MESSAGES/libkcddb.mo share/locale/fr/LC_MESSAGES/libkdeedu.mo share/locale/fr/LC_MESSAGES/libkdegames.mo @@ -2343,6 +2379,7 @@ share/locale/fr/relecture_gui @dirrm share/doc/HTML/fr/artsbuilder @dirrm share/doc/HTML/fr/ark @dirrm share/doc/HTML/fr/amor +@dirrm share/doc/HTML/fr/akregator @dirrm share/doc/HTML/fr/KRegExpEditor @dirrm share/apps/kturtle/examples/fr_FR @dirrm share/apps/kturtle/examples diff --git a/french/koffice-i18n/Makefile b/french/koffice-i18n/Makefile index e935d0cf49b2..3fa52e8eb71e 100644 --- a/french/koffice-i18n/Makefile +++ b/french/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 98a28c7de2e6..02435d2ce79b 100644 --- a/french/koffice-i18n/distinfo +++ b/french/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = d63d63daa55fa32e5c93b72c902cd4d1 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = b769bf81b7c1eb762aca5e47a7f67fa5a5ebba212752ac182d0cea231c7c1e6a -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = 6588898 +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 diff --git a/french/koffice-i18n/pkg-plist b/french/koffice-i18n/pkg-plist index 485da5385033..a9a3581bbfcd 100644 --- a/french/koffice-i18n/pkg-plist +++ b/french/koffice-i18n/pkg-plist @@ -66,6 +66,14 @@ share/doc/HTML/fr/koffice/index.docbook share/doc/HTML/fr/koshell/common share/doc/HTML/fr/koshell/index.cache.bz2 share/doc/HTML/fr/koshell/index.docbook +share/doc/HTML/fr/kplato/commands.docbook +share/doc/HTML/fr/kplato/common +share/doc/HTML/fr/kplato/definitions.docbook +share/doc/HTML/fr/kplato/index.cache.bz2 +share/doc/HTML/fr/kplato/index.docbook +share/doc/HTML/fr/kplato/mainwindow.docbook +share/doc/HTML/fr/kplato/options.docbook +share/doc/HTML/fr/kplato/wbs.docbook share/doc/HTML/fr/kpresenter/barstyle1.png share/doc/HTML/fr/kpresenter/barstyle3.png share/doc/HTML/fr/kpresenter/barstyle4.png @@ -419,6 +427,7 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kspread @dirrm share/doc/HTML/fr/kpresenter/pics @dirrm share/doc/HTML/fr/kpresenter +@dirrm share/doc/HTML/fr/kplato @dirrm share/doc/HTML/fr/koshell @dirrm share/doc/HTML/fr/koffice @dirrm share/doc/HTML/fr/kivio diff --git a/french/koffice-kde4-l10n/Makefile b/french/koffice-kde4-l10n/Makefile index e935d0cf49b2..3fa52e8eb71e 100644 --- a/french/koffice-kde4-l10n/Makefile +++ b/french/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 98a28c7de2e6..02435d2ce79b 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.1.tar.bz2) = d63d63daa55fa32e5c93b72c902cd4d1 -SHA256 (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = b769bf81b7c1eb762aca5e47a7f67fa5a5ebba212752ac182d0cea231c7c1e6a -SIZE (KDE/kde-i18n/koffice-l10n-fr-1.5.1.tar.bz2) = 6588898 +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 diff --git a/french/koffice-kde4-l10n/pkg-plist b/french/koffice-kde4-l10n/pkg-plist index 485da5385033..a9a3581bbfcd 100644 --- a/french/koffice-kde4-l10n/pkg-plist +++ b/french/koffice-kde4-l10n/pkg-plist @@ -66,6 +66,14 @@ share/doc/HTML/fr/koffice/index.docbook share/doc/HTML/fr/koshell/common share/doc/HTML/fr/koshell/index.cache.bz2 share/doc/HTML/fr/koshell/index.docbook +share/doc/HTML/fr/kplato/commands.docbook +share/doc/HTML/fr/kplato/common +share/doc/HTML/fr/kplato/definitions.docbook +share/doc/HTML/fr/kplato/index.cache.bz2 +share/doc/HTML/fr/kplato/index.docbook +share/doc/HTML/fr/kplato/mainwindow.docbook +share/doc/HTML/fr/kplato/options.docbook +share/doc/HTML/fr/kplato/wbs.docbook share/doc/HTML/fr/kpresenter/barstyle1.png share/doc/HTML/fr/kpresenter/barstyle3.png share/doc/HTML/fr/kpresenter/barstyle4.png @@ -419,6 +427,7 @@ share/locale/fr/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/fr/kspread @dirrm share/doc/HTML/fr/kpresenter/pics @dirrm share/doc/HTML/fr/kpresenter +@dirrm share/doc/HTML/fr/kplato @dirrm share/doc/HTML/fr/koshell @dirrm share/doc/HTML/fr/koffice @dirrm share/doc/HTML/fr/kivio diff --git a/games/atlantikdesigner/distinfo b/games/atlantikdesigner/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/games/atlantikdesigner/distinfo +++ b/games/atlantikdesigner/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/games/atlantikdesigner/pkg-plist b/games/atlantikdesigner/pkg-plist index e60410571c21..3e514b457576 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.3 +share/applications/kdeaddons-atlantikdesigner-3.5.4 share/apps/atlantikdesigner/atlantikdesignerui.rc share/icons/hicolor/16x16/apps/atlantikdesigner.png share/icons/hicolor/32x32/apps/atlantikdesigner.png diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 471d48ec8a6d..9a750aa43f91 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.3.tar.bz2) = 17e8a2e28a0cb320486e3dc8ee45665f -SHA256 (KDE/kdegames-3.5.3.tar.bz2) = 173fb8ebb0c3ba583a04cc1292cab064fc01b4ef912b359a90c16569088ea95e -SIZE (KDE/kdegames-3.5.3.tar.bz2) = 10728200 +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 diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo index 471d48ec8a6d..9a750aa43f91 100644 --- a/games/kdegames4/distinfo +++ b/games/kdegames4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegames-3.5.3.tar.bz2) = 17e8a2e28a0cb320486e3dc8ee45665f -SHA256 (KDE/kdegames-3.5.3.tar.bz2) = 173fb8ebb0c3ba583a04cc1292cab064fc01b4ef912b359a90c16569088ea95e -SIZE (KDE/kdegames-3.5.3.tar.bz2) = 10728200 +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 diff --git a/german/calligra-l10n/Makefile b/german/calligra-l10n/Makefile index 4307c3d1db9d..7ec8da990525 100644 --- a/german/calligra-l10n/Makefile +++ b/german/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 87c7dec15484..8bf77d0cbc69 100644 --- a/german/calligra-l10n/distinfo +++ b/german/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = dcd8043ab5b5d2642e4302f1f89fc639 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 3931c5c99574a2d62c9b6efd2cef303ac84ac232ee67ccddfb8d50baba822986 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 2813991 +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 diff --git a/german/calligra-l10n/pkg-plist b/german/calligra-l10n/pkg-plist index a996b52f3389..cac9dfebd987 100644 --- a/german/calligra-l10n/pkg-plist +++ b/german/calligra-l10n/pkg-plist @@ -2,9 +2,52 @@ share/apps/koffice/autocorrect/de.xml share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook +share/doc/HTML/de/kchart/kchart-config1.png +share/doc/HTML/de/kchart/kchart-config2.png +share/doc/HTML/de/kchart/kchart-config3.png +share/doc/HTML/de/kchart/kchart-config4.png +share/doc/HTML/de/kchart/kchart-config5.png +share/doc/HTML/de/kchart/kchart-config6.png +share/doc/HTML/de/kchart/kchart-config7.png +share/doc/HTML/de/kchart/kchart-config8.png +share/doc/HTML/de/kchart/kchart-dataeditor.png +share/doc/HTML/de/kchart/kchart-default.png +share/doc/HTML/de/kchart/kchart-example1-1.png +share/doc/HTML/de/kchart/kchart-example1-2.png +share/doc/HTML/de/kchart/kchart-example1-3.png +share/doc/HTML/de/kchart/kchart-example1-4.png +share/doc/HTML/de/kchart/kchart-example1-5.png +share/doc/HTML/de/kchart/kchart-example1-6.png +share/doc/HTML/de/kchart/kchart-example1-7.png +share/doc/HTML/de/kchart/kchart-example1-8.png +share/doc/HTML/de/kchart/kchart-example1-9.png +share/doc/HTML/de/kchart/kchart-startupdialog.png +share/doc/HTML/de/kchart/kchart-wizard0.png +share/doc/HTML/de/kchart/kchart-wizard1.png +share/doc/HTML/de/kchart/kchart-wizard2.png +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/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common +share/doc/HTML/de/kformula/green1.png +share/doc/HTML/de/kformula/green2.png share/doc/HTML/de/kformula/index.cache.bz2 share/doc/HTML/de/kformula/index.docbook +share/doc/HTML/de/kformula/kfontinst1.png +share/doc/HTML/de/kformula/kfontinst2.png +share/doc/HTML/de/kformula/kfontinst3.png +share/doc/HTML/de/kformula/kfontinst4.png +share/doc/HTML/de/kformula/kfontinst5.png +share/doc/HTML/de/kformula/kfontinst6.png +share/doc/HTML/de/kformula/rk-edit0.png +share/doc/HTML/de/kformula/rk-edit1.png +share/doc/HTML/de/kformula/rk-edit2.png +share/doc/HTML/de/kformula/scilab-edit.png +share/doc/HTML/de/kformula/shortcut0.png +share/doc/HTML/de/kformula/shortcut1.png +share/doc/HTML/de/kformula/toolbars.png share/doc/HTML/de/kivio/common share/doc/HTML/de/kivio/credits.docbook share/doc/HTML/de/kivio/index.cache.bz2 @@ -28,6 +71,7 @@ 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/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook share/doc/HTML/de/kspread/commands.docbook @@ -60,6 +104,7 @@ share/doc/HTML/de/kword/Tut1.png share/doc/HTML/de/kword/Tut11a.png share/doc/HTML/de/kword/Tut11b.png share/doc/HTML/de/kword/Tut13.png +share/doc/HTML/de/kword/Tut13a.png share/doc/HTML/de/kword/Tut14.png share/doc/HTML/de/kword/Tut14a.png share/doc/HTML/de/kword/Tut14b.png diff --git a/german/kde3-i18n/distinfo b/german/kde3-i18n/distinfo index 52ee16a9bbc5..e72482d3b439 100644 --- a/german/kde3-i18n/distinfo +++ b/german/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = e449fb462911191447210b8e2c8ccb8d -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = de39ea8d282625563daf4766c56829d8323119f45866e3cf11f5f97aa3627c5d -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = 21296702 +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 diff --git a/german/kde3-i18n/pkg-plist b/german/kde3-i18n/pkg-plist index 63bcbe703c64..2d337a221d78 100644 --- a/german/kde3-i18n/pkg-plist +++ b/german/kde3-i18n/pkg-plist @@ -4,6 +4,72 @@ share/apps/khangman/data/de/easy.kvtml share/apps/khangman/data/de/hard.kvtml share/apps/khangman/data/de/medium.kvtml share/apps/khangman/de.txt +share/apps/klettres/de/alpha/a.ogg +share/apps/klettres/de/alpha/ae.ogg +share/apps/klettres/de/alpha/b.ogg +share/apps/klettres/de/alpha/c.ogg +share/apps/klettres/de/alpha/d.ogg +share/apps/klettres/de/alpha/e.ogg +share/apps/klettres/de/alpha/f.ogg +share/apps/klettres/de/alpha/g.ogg +share/apps/klettres/de/alpha/h.ogg +share/apps/klettres/de/alpha/i.ogg +share/apps/klettres/de/alpha/j.ogg +share/apps/klettres/de/alpha/k.ogg +share/apps/klettres/de/alpha/l.ogg +share/apps/klettres/de/alpha/m.ogg +share/apps/klettres/de/alpha/n.ogg +share/apps/klettres/de/alpha/o.ogg +share/apps/klettres/de/alpha/oe.ogg +share/apps/klettres/de/alpha/p.ogg +share/apps/klettres/de/alpha/q.ogg +share/apps/klettres/de/alpha/r.ogg +share/apps/klettres/de/alpha/s.ogg +share/apps/klettres/de/alpha/sz.ogg +share/apps/klettres/de/alpha/t.ogg +share/apps/klettres/de/alpha/u.ogg +share/apps/klettres/de/alpha/ue.ogg +share/apps/klettres/de/alpha/v.ogg +share/apps/klettres/de/alpha/w.ogg +share/apps/klettres/de/alpha/x.ogg +share/apps/klettres/de/alpha/y.ogg +share/apps/klettres/de/alpha/z.ogg +share/apps/klettres/de/sounds.xml +share/apps/klettres/de/syllab/affe.ogg +share/apps/klettres/de/syllab/auch.ogg +share/apps/klettres/de/syllab/baer.ogg +share/apps/klettres/de/syllab/bus.ogg +share/apps/klettres/de/syllab/dem.ogg +share/apps/klettres/de/syllab/die.ogg +share/apps/klettres/de/syllab/dir.ogg +share/apps/klettres/de/syllab/ein.ogg +share/apps/klettres/de/syllab/eule.ogg +share/apps/klettres/de/syllab/fisch.ogg +share/apps/klettres/de/syllab/frau.ogg +share/apps/klettres/de/syllab/fusz.ogg +share/apps/klettres/de/syllab/gut.ogg +share/apps/klettres/de/syllab/haus.ogg +share/apps/klettres/de/syllab/heu.ogg +share/apps/klettres/de/syllab/hund.ogg +share/apps/klettres/de/syllab/ist.ogg +share/apps/klettres/de/syllab/ja.ogg +share/apps/klettres/de/syllab/kind.ogg +share/apps/klettres/de/syllab/lisa.ogg +share/apps/klettres/de/syllab/mutter.ogg +share/apps/klettres/de/syllab/nase.ogg +share/apps/klettres/de/syllab/oel.ogg +share/apps/klettres/de/syllab/opa.ogg +share/apps/klettres/de/syllab/pute.ogg +share/apps/klettres/de/syllab/reh.ogg +share/apps/klettres/de/syllab/rot.ogg +share/apps/klettres/de/syllab/sein.ogg +share/apps/klettres/de/syllab/sitz.ogg +share/apps/klettres/de/syllab/tuer.ogg +share/apps/klettres/de/syllab/vor.ogg +share/apps/klettres/de/syllab/was.ogg +share/apps/klettres/de/syllab/will.ogg +share/apps/klettres/de/syllab/wo.ogg +share/apps/klettres/de/syllab/zu.ogg share/apps/ktuberling/sounds/de/abzeichen.wav share/apps/ktuberling/sounds/de/auge.wav share/apps/ktuberling/sounds/de/augenbraue.wav @@ -29,6 +95,9 @@ share/apps/kturtle/examples/de_DE/zufallsname.logo share/doc/HTML/de/KRegExpEditor/common share/doc/HTML/de/KRegExpEditor/index.cache.bz2 share/doc/HTML/de/KRegExpEditor/index.docbook +share/doc/HTML/de/akregator/common +share/doc/HTML/de/akregator/index.cache.bz2 +share/doc/HTML/de/akregator/index.docbook share/doc/HTML/de/amor/common share/doc/HTML/de/amor/index.cache.bz2 share/doc/HTML/de/amor/index.docbook @@ -36,6 +105,7 @@ share/doc/HTML/de/amor/man-amor.6.docbook share/doc/HTML/de/ark/common share/doc/HTML/de/ark/index.cache.bz2 share/doc/HTML/de/ark/index.docbook +share/doc/HTML/de/ark/man-ark.1.docbook share/doc/HTML/de/artsbuilder/apis.docbook share/doc/HTML/de/artsbuilder/artsbuilder.docbook share/doc/HTML/de/artsbuilder/common @@ -59,6 +129,16 @@ share/doc/HTML/de/atlantik/common share/doc/HTML/de/atlantik/index.cache.bz2 share/doc/HTML/de/atlantik/index.docbook share/doc/HTML/de/atlantik/man-atlantik.6.docbook +share/doc/HTML/de/blinken/blinken1.png +share/doc/HTML/de/blinken/blinken2.png +share/doc/HTML/de/blinken/blinken_accesskeys.png +share/doc/HTML/de/blinken/blinken_helpbutton.png +share/doc/HTML/de/blinken/blinken_highscorebutton.png +share/doc/HTML/de/blinken/blinken_nickprompt.png +share/doc/HTML/de/blinken/blinken_quitbutton.png +share/doc/HTML/de/blinken/common +share/doc/HTML/de/blinken/index.cache.bz2 +share/doc/HTML/de/blinken/index.docbook share/doc/HTML/de/cervisia/common share/doc/HTML/de/cervisia/index.cache.bz2 share/doc/HTML/de/cervisia/index.docbook @@ -451,6 +531,7 @@ share/doc/HTML/de/kedit/index.docbook share/doc/HTML/de/keduca/common share/doc/HTML/de/keduca/index.cache.bz2 share/doc/HTML/de/keduca/index.docbook +share/doc/HTML/de/keduca/man-keduca.1.docbook share/doc/HTML/de/keduca/screenshot.png share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 @@ -641,6 +722,9 @@ share/doc/HTML/de/kig/text_label_wizard__select_property.png share/doc/HTML/de/kinfocenter/blockdevices/common share/doc/HTML/de/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/de/kinfocenter/blockdevices/index.docbook +share/doc/HTML/de/kinfocenter/cdinfo/common +share/doc/HTML/de/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/de/kinfocenter/cdinfo/index.docbook share/doc/HTML/de/kinfocenter/common share/doc/HTML/de/kinfocenter/devices/common share/doc/HTML/de/kinfocenter/devices/index.cache.bz2 @@ -1373,6 +1457,7 @@ share/doc/HTML/de/kttsd/index.cache.bz2 share/doc/HTML/de/kttsd/index.docbook share/doc/HTML/de/kttsd/interruption.png share/doc/HTML/de/kttsd/jobs.png +share/doc/HTML/de/kttsd/selecttalker.png share/doc/HTML/de/kttsd/stringreplacer.png share/doc/HTML/de/kttsd/talkerchooser.png share/doc/HTML/de/kttsd/talkers.png @@ -1578,6 +1663,7 @@ share/doc/HTML/de/quanta/q-and-a.docbook share/doc/HTML/de/quanta/quanta-menus.docbook share/doc/HTML/de/quanta/quanta-projects.docbook share/doc/HTML/de/quanta/working-with-quanta.docbook +share/doc/HTML/de/scripts/man-adddebug.1.docbook share/doc/HTML/de/superkaramba/common share/doc/HTML/de/superkaramba/index.cache.bz2 share/doc/HTML/de/superkaramba/index.docbook @@ -2177,6 +2263,7 @@ share/locale/de/entry.desktop share/locale/de/flag.png @dirrm share/doc/HTML/de/umbrello @dirrm share/doc/HTML/de/superkaramba +@dirrm share/doc/HTML/de/scripts @dirrm share/doc/HTML/de/quanta @dirrm share/doc/HTML/de/noatun @dirrm share/doc/HTML/de/lskat @@ -2308,6 +2395,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kinfocenter/interrupts @dirrm share/doc/HTML/de/kinfocenter/dma @dirrm share/doc/HTML/de/kinfocenter/devices +@dirrm share/doc/HTML/de/kinfocenter/cdinfo @dirrm share/doc/HTML/de/kinfocenter/blockdevices @dirrm share/doc/HTML/de/kinfocenter @dirrm share/doc/HTML/de/kig @@ -2427,10 +2515,12 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/docs/common @dirrm share/doc/HTML/de/docs @dirrm share/doc/HTML/de/cervisia +@dirrm share/doc/HTML/de/blinken @dirrm share/doc/HTML/de/atlantik @dirrm share/doc/HTML/de/artsbuilder @dirrm share/doc/HTML/de/ark @dirrm share/doc/HTML/de/amor +@dirrm share/doc/HTML/de/akregator @dirrm share/doc/HTML/de/KRegExpEditor @dirrm share/apps/kturtle/examples/de_DE @dirrm share/apps/kturtle/examples @@ -2439,6 +2529,10 @@ share/locale/de/flag.png @dirrm share/apps/ktuberling/sounds/de @dirrm share/apps/ktuberling/sounds @dirrm share/apps/ktuberling +@dirrm share/apps/klettres/de/syllab +@dirrm share/apps/klettres/de/alpha +@dirrm share/apps/klettres/de +@dirrm share/apps/klettres @dirrm share/apps/khangman/data/de @dirrm share/apps/khangman/data @dirrm share/apps/khangman diff --git a/german/kde4-l10n/distinfo b/german/kde4-l10n/distinfo index 52ee16a9bbc5..e72482d3b439 100644 --- a/german/kde4-l10n/distinfo +++ b/german/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = e449fb462911191447210b8e2c8ccb8d -SHA256 (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = de39ea8d282625563daf4766c56829d8323119f45866e3cf11f5f97aa3627c5d -SIZE (KDE/kde-i18n/kde-i18n-de-3.5.3.tar.bz2) = 21296702 +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 diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist index 63bcbe703c64..2d337a221d78 100644 --- a/german/kde4-l10n/pkg-plist +++ b/german/kde4-l10n/pkg-plist @@ -4,6 +4,72 @@ share/apps/khangman/data/de/easy.kvtml share/apps/khangman/data/de/hard.kvtml share/apps/khangman/data/de/medium.kvtml share/apps/khangman/de.txt +share/apps/klettres/de/alpha/a.ogg +share/apps/klettres/de/alpha/ae.ogg +share/apps/klettres/de/alpha/b.ogg +share/apps/klettres/de/alpha/c.ogg +share/apps/klettres/de/alpha/d.ogg +share/apps/klettres/de/alpha/e.ogg +share/apps/klettres/de/alpha/f.ogg +share/apps/klettres/de/alpha/g.ogg +share/apps/klettres/de/alpha/h.ogg +share/apps/klettres/de/alpha/i.ogg +share/apps/klettres/de/alpha/j.ogg +share/apps/klettres/de/alpha/k.ogg +share/apps/klettres/de/alpha/l.ogg +share/apps/klettres/de/alpha/m.ogg +share/apps/klettres/de/alpha/n.ogg +share/apps/klettres/de/alpha/o.ogg +share/apps/klettres/de/alpha/oe.ogg +share/apps/klettres/de/alpha/p.ogg +share/apps/klettres/de/alpha/q.ogg +share/apps/klettres/de/alpha/r.ogg +share/apps/klettres/de/alpha/s.ogg +share/apps/klettres/de/alpha/sz.ogg +share/apps/klettres/de/alpha/t.ogg +share/apps/klettres/de/alpha/u.ogg +share/apps/klettres/de/alpha/ue.ogg +share/apps/klettres/de/alpha/v.ogg +share/apps/klettres/de/alpha/w.ogg +share/apps/klettres/de/alpha/x.ogg +share/apps/klettres/de/alpha/y.ogg +share/apps/klettres/de/alpha/z.ogg +share/apps/klettres/de/sounds.xml +share/apps/klettres/de/syllab/affe.ogg +share/apps/klettres/de/syllab/auch.ogg +share/apps/klettres/de/syllab/baer.ogg +share/apps/klettres/de/syllab/bus.ogg +share/apps/klettres/de/syllab/dem.ogg +share/apps/klettres/de/syllab/die.ogg +share/apps/klettres/de/syllab/dir.ogg +share/apps/klettres/de/syllab/ein.ogg +share/apps/klettres/de/syllab/eule.ogg +share/apps/klettres/de/syllab/fisch.ogg +share/apps/klettres/de/syllab/frau.ogg +share/apps/klettres/de/syllab/fusz.ogg +share/apps/klettres/de/syllab/gut.ogg +share/apps/klettres/de/syllab/haus.ogg +share/apps/klettres/de/syllab/heu.ogg +share/apps/klettres/de/syllab/hund.ogg +share/apps/klettres/de/syllab/ist.ogg +share/apps/klettres/de/syllab/ja.ogg +share/apps/klettres/de/syllab/kind.ogg +share/apps/klettres/de/syllab/lisa.ogg +share/apps/klettres/de/syllab/mutter.ogg +share/apps/klettres/de/syllab/nase.ogg +share/apps/klettres/de/syllab/oel.ogg +share/apps/klettres/de/syllab/opa.ogg +share/apps/klettres/de/syllab/pute.ogg +share/apps/klettres/de/syllab/reh.ogg +share/apps/klettres/de/syllab/rot.ogg +share/apps/klettres/de/syllab/sein.ogg +share/apps/klettres/de/syllab/sitz.ogg +share/apps/klettres/de/syllab/tuer.ogg +share/apps/klettres/de/syllab/vor.ogg +share/apps/klettres/de/syllab/was.ogg +share/apps/klettres/de/syllab/will.ogg +share/apps/klettres/de/syllab/wo.ogg +share/apps/klettres/de/syllab/zu.ogg share/apps/ktuberling/sounds/de/abzeichen.wav share/apps/ktuberling/sounds/de/auge.wav share/apps/ktuberling/sounds/de/augenbraue.wav @@ -29,6 +95,9 @@ share/apps/kturtle/examples/de_DE/zufallsname.logo share/doc/HTML/de/KRegExpEditor/common share/doc/HTML/de/KRegExpEditor/index.cache.bz2 share/doc/HTML/de/KRegExpEditor/index.docbook +share/doc/HTML/de/akregator/common +share/doc/HTML/de/akregator/index.cache.bz2 +share/doc/HTML/de/akregator/index.docbook share/doc/HTML/de/amor/common share/doc/HTML/de/amor/index.cache.bz2 share/doc/HTML/de/amor/index.docbook @@ -36,6 +105,7 @@ share/doc/HTML/de/amor/man-amor.6.docbook share/doc/HTML/de/ark/common share/doc/HTML/de/ark/index.cache.bz2 share/doc/HTML/de/ark/index.docbook +share/doc/HTML/de/ark/man-ark.1.docbook share/doc/HTML/de/artsbuilder/apis.docbook share/doc/HTML/de/artsbuilder/artsbuilder.docbook share/doc/HTML/de/artsbuilder/common @@ -59,6 +129,16 @@ share/doc/HTML/de/atlantik/common share/doc/HTML/de/atlantik/index.cache.bz2 share/doc/HTML/de/atlantik/index.docbook share/doc/HTML/de/atlantik/man-atlantik.6.docbook +share/doc/HTML/de/blinken/blinken1.png +share/doc/HTML/de/blinken/blinken2.png +share/doc/HTML/de/blinken/blinken_accesskeys.png +share/doc/HTML/de/blinken/blinken_helpbutton.png +share/doc/HTML/de/blinken/blinken_highscorebutton.png +share/doc/HTML/de/blinken/blinken_nickprompt.png +share/doc/HTML/de/blinken/blinken_quitbutton.png +share/doc/HTML/de/blinken/common +share/doc/HTML/de/blinken/index.cache.bz2 +share/doc/HTML/de/blinken/index.docbook share/doc/HTML/de/cervisia/common share/doc/HTML/de/cervisia/index.cache.bz2 share/doc/HTML/de/cervisia/index.docbook @@ -451,6 +531,7 @@ share/doc/HTML/de/kedit/index.docbook share/doc/HTML/de/keduca/common share/doc/HTML/de/keduca/index.cache.bz2 share/doc/HTML/de/keduca/index.docbook +share/doc/HTML/de/keduca/man-keduca.1.docbook share/doc/HTML/de/keduca/screenshot.png share/doc/HTML/de/kenolaba/common share/doc/HTML/de/kenolaba/index.cache.bz2 @@ -641,6 +722,9 @@ share/doc/HTML/de/kig/text_label_wizard__select_property.png share/doc/HTML/de/kinfocenter/blockdevices/common share/doc/HTML/de/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/de/kinfocenter/blockdevices/index.docbook +share/doc/HTML/de/kinfocenter/cdinfo/common +share/doc/HTML/de/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/de/kinfocenter/cdinfo/index.docbook share/doc/HTML/de/kinfocenter/common share/doc/HTML/de/kinfocenter/devices/common share/doc/HTML/de/kinfocenter/devices/index.cache.bz2 @@ -1373,6 +1457,7 @@ share/doc/HTML/de/kttsd/index.cache.bz2 share/doc/HTML/de/kttsd/index.docbook share/doc/HTML/de/kttsd/interruption.png share/doc/HTML/de/kttsd/jobs.png +share/doc/HTML/de/kttsd/selecttalker.png share/doc/HTML/de/kttsd/stringreplacer.png share/doc/HTML/de/kttsd/talkerchooser.png share/doc/HTML/de/kttsd/talkers.png @@ -1578,6 +1663,7 @@ share/doc/HTML/de/quanta/q-and-a.docbook share/doc/HTML/de/quanta/quanta-menus.docbook share/doc/HTML/de/quanta/quanta-projects.docbook share/doc/HTML/de/quanta/working-with-quanta.docbook +share/doc/HTML/de/scripts/man-adddebug.1.docbook share/doc/HTML/de/superkaramba/common share/doc/HTML/de/superkaramba/index.cache.bz2 share/doc/HTML/de/superkaramba/index.docbook @@ -2177,6 +2263,7 @@ share/locale/de/entry.desktop share/locale/de/flag.png @dirrm share/doc/HTML/de/umbrello @dirrm share/doc/HTML/de/superkaramba +@dirrm share/doc/HTML/de/scripts @dirrm share/doc/HTML/de/quanta @dirrm share/doc/HTML/de/noatun @dirrm share/doc/HTML/de/lskat @@ -2308,6 +2395,7 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/kinfocenter/interrupts @dirrm share/doc/HTML/de/kinfocenter/dma @dirrm share/doc/HTML/de/kinfocenter/devices +@dirrm share/doc/HTML/de/kinfocenter/cdinfo @dirrm share/doc/HTML/de/kinfocenter/blockdevices @dirrm share/doc/HTML/de/kinfocenter @dirrm share/doc/HTML/de/kig @@ -2427,10 +2515,12 @@ share/locale/de/flag.png @dirrm share/doc/HTML/de/docs/common @dirrm share/doc/HTML/de/docs @dirrm share/doc/HTML/de/cervisia +@dirrm share/doc/HTML/de/blinken @dirrm share/doc/HTML/de/atlantik @dirrm share/doc/HTML/de/artsbuilder @dirrm share/doc/HTML/de/ark @dirrm share/doc/HTML/de/amor +@dirrm share/doc/HTML/de/akregator @dirrm share/doc/HTML/de/KRegExpEditor @dirrm share/apps/kturtle/examples/de_DE @dirrm share/apps/kturtle/examples @@ -2439,6 +2529,10 @@ share/locale/de/flag.png @dirrm share/apps/ktuberling/sounds/de @dirrm share/apps/ktuberling/sounds @dirrm share/apps/ktuberling +@dirrm share/apps/klettres/de/syllab +@dirrm share/apps/klettres/de/alpha +@dirrm share/apps/klettres/de +@dirrm share/apps/klettres @dirrm share/apps/khangman/data/de @dirrm share/apps/khangman/data @dirrm share/apps/khangman diff --git a/german/koffice-i18n/Makefile b/german/koffice-i18n/Makefile index 4307c3d1db9d..7ec8da990525 100644 --- a/german/koffice-i18n/Makefile +++ b/german/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 87c7dec15484..8bf77d0cbc69 100644 --- a/german/koffice-i18n/distinfo +++ b/german/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = dcd8043ab5b5d2642e4302f1f89fc639 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 3931c5c99574a2d62c9b6efd2cef303ac84ac232ee67ccddfb8d50baba822986 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 2813991 +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 diff --git a/german/koffice-i18n/pkg-plist b/german/koffice-i18n/pkg-plist index a996b52f3389..cac9dfebd987 100644 --- a/german/koffice-i18n/pkg-plist +++ b/german/koffice-i18n/pkg-plist @@ -2,9 +2,52 @@ share/apps/koffice/autocorrect/de.xml share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook +share/doc/HTML/de/kchart/kchart-config1.png +share/doc/HTML/de/kchart/kchart-config2.png +share/doc/HTML/de/kchart/kchart-config3.png +share/doc/HTML/de/kchart/kchart-config4.png +share/doc/HTML/de/kchart/kchart-config5.png +share/doc/HTML/de/kchart/kchart-config6.png +share/doc/HTML/de/kchart/kchart-config7.png +share/doc/HTML/de/kchart/kchart-config8.png +share/doc/HTML/de/kchart/kchart-dataeditor.png +share/doc/HTML/de/kchart/kchart-default.png +share/doc/HTML/de/kchart/kchart-example1-1.png +share/doc/HTML/de/kchart/kchart-example1-2.png +share/doc/HTML/de/kchart/kchart-example1-3.png +share/doc/HTML/de/kchart/kchart-example1-4.png +share/doc/HTML/de/kchart/kchart-example1-5.png +share/doc/HTML/de/kchart/kchart-example1-6.png +share/doc/HTML/de/kchart/kchart-example1-7.png +share/doc/HTML/de/kchart/kchart-example1-8.png +share/doc/HTML/de/kchart/kchart-example1-9.png +share/doc/HTML/de/kchart/kchart-startupdialog.png +share/doc/HTML/de/kchart/kchart-wizard0.png +share/doc/HTML/de/kchart/kchart-wizard1.png +share/doc/HTML/de/kchart/kchart-wizard2.png +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/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common +share/doc/HTML/de/kformula/green1.png +share/doc/HTML/de/kformula/green2.png share/doc/HTML/de/kformula/index.cache.bz2 share/doc/HTML/de/kformula/index.docbook +share/doc/HTML/de/kformula/kfontinst1.png +share/doc/HTML/de/kformula/kfontinst2.png +share/doc/HTML/de/kformula/kfontinst3.png +share/doc/HTML/de/kformula/kfontinst4.png +share/doc/HTML/de/kformula/kfontinst5.png +share/doc/HTML/de/kformula/kfontinst6.png +share/doc/HTML/de/kformula/rk-edit0.png +share/doc/HTML/de/kformula/rk-edit1.png +share/doc/HTML/de/kformula/rk-edit2.png +share/doc/HTML/de/kformula/scilab-edit.png +share/doc/HTML/de/kformula/shortcut0.png +share/doc/HTML/de/kformula/shortcut1.png +share/doc/HTML/de/kformula/toolbars.png share/doc/HTML/de/kivio/common share/doc/HTML/de/kivio/credits.docbook share/doc/HTML/de/kivio/index.cache.bz2 @@ -28,6 +71,7 @@ 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/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook share/doc/HTML/de/kspread/commands.docbook @@ -60,6 +104,7 @@ share/doc/HTML/de/kword/Tut1.png share/doc/HTML/de/kword/Tut11a.png share/doc/HTML/de/kword/Tut11b.png share/doc/HTML/de/kword/Tut13.png +share/doc/HTML/de/kword/Tut13a.png share/doc/HTML/de/kword/Tut14.png share/doc/HTML/de/kword/Tut14a.png share/doc/HTML/de/kword/Tut14b.png diff --git a/german/koffice-kde4-l10n/Makefile b/german/koffice-kde4-l10n/Makefile index 4307c3d1db9d..7ec8da990525 100644 --- a/german/koffice-kde4-l10n/Makefile +++ b/german/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 87c7dec15484..8bf77d0cbc69 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.1.tar.bz2) = dcd8043ab5b5d2642e4302f1f89fc639 -SHA256 (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 3931c5c99574a2d62c9b6efd2cef303ac84ac232ee67ccddfb8d50baba822986 -SIZE (KDE/kde-i18n/koffice-l10n-de-1.5.1.tar.bz2) = 2813991 +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 diff --git a/german/koffice-kde4-l10n/pkg-plist b/german/koffice-kde4-l10n/pkg-plist index a996b52f3389..cac9dfebd987 100644 --- a/german/koffice-kde4-l10n/pkg-plist +++ b/german/koffice-kde4-l10n/pkg-plist @@ -2,9 +2,52 @@ share/apps/koffice/autocorrect/de.xml share/doc/HTML/de/kchart/common share/doc/HTML/de/kchart/index.cache.bz2 share/doc/HTML/de/kchart/index.docbook +share/doc/HTML/de/kchart/kchart-config1.png +share/doc/HTML/de/kchart/kchart-config2.png +share/doc/HTML/de/kchart/kchart-config3.png +share/doc/HTML/de/kchart/kchart-config4.png +share/doc/HTML/de/kchart/kchart-config5.png +share/doc/HTML/de/kchart/kchart-config6.png +share/doc/HTML/de/kchart/kchart-config7.png +share/doc/HTML/de/kchart/kchart-config8.png +share/doc/HTML/de/kchart/kchart-dataeditor.png +share/doc/HTML/de/kchart/kchart-default.png +share/doc/HTML/de/kchart/kchart-example1-1.png +share/doc/HTML/de/kchart/kchart-example1-2.png +share/doc/HTML/de/kchart/kchart-example1-3.png +share/doc/HTML/de/kchart/kchart-example1-4.png +share/doc/HTML/de/kchart/kchart-example1-5.png +share/doc/HTML/de/kchart/kchart-example1-6.png +share/doc/HTML/de/kchart/kchart-example1-7.png +share/doc/HTML/de/kchart/kchart-example1-8.png +share/doc/HTML/de/kchart/kchart-example1-9.png +share/doc/HTML/de/kchart/kchart-startupdialog.png +share/doc/HTML/de/kchart/kchart-wizard0.png +share/doc/HTML/de/kchart/kchart-wizard1.png +share/doc/HTML/de/kchart/kchart-wizard2.png +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/kformula/ambiguous-string.png share/doc/HTML/de/kformula/common +share/doc/HTML/de/kformula/green1.png +share/doc/HTML/de/kformula/green2.png share/doc/HTML/de/kformula/index.cache.bz2 share/doc/HTML/de/kformula/index.docbook +share/doc/HTML/de/kformula/kfontinst1.png +share/doc/HTML/de/kformula/kfontinst2.png +share/doc/HTML/de/kformula/kfontinst3.png +share/doc/HTML/de/kformula/kfontinst4.png +share/doc/HTML/de/kformula/kfontinst5.png +share/doc/HTML/de/kformula/kfontinst6.png +share/doc/HTML/de/kformula/rk-edit0.png +share/doc/HTML/de/kformula/rk-edit1.png +share/doc/HTML/de/kformula/rk-edit2.png +share/doc/HTML/de/kformula/scilab-edit.png +share/doc/HTML/de/kformula/shortcut0.png +share/doc/HTML/de/kformula/shortcut1.png +share/doc/HTML/de/kformula/toolbars.png share/doc/HTML/de/kivio/common share/doc/HTML/de/kivio/credits.docbook share/doc/HTML/de/kivio/index.cache.bz2 @@ -28,6 +71,7 @@ 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/kspread/a11y.docbook share/doc/HTML/de/kspread/advanced.docbook share/doc/HTML/de/kspread/basics.docbook share/doc/HTML/de/kspread/commands.docbook @@ -60,6 +104,7 @@ share/doc/HTML/de/kword/Tut1.png share/doc/HTML/de/kword/Tut11a.png share/doc/HTML/de/kword/Tut11b.png share/doc/HTML/de/kword/Tut13.png +share/doc/HTML/de/kword/Tut13a.png share/doc/HTML/de/kword/Tut14.png share/doc/HTML/de/kword/Tut14a.png share/doc/HTML/de/kword/Tut14b.png diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile index a646334103e8..355cd8ab2e24 100644 --- a/graphics/kamera-kde4/Makefile +++ b/graphics/kamera-kde4/Makefile @@ -7,7 +7,6 @@ PORTNAME= kamera 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/kamera-kde4/distinfo b/graphics/kamera-kde4/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kamera-kde4/distinfo +++ b/graphics/kamera-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile index a646334103e8..355cd8ab2e24 100644 --- a/graphics/kamera/Makefile +++ b/graphics/kamera/Makefile @@ -7,7 +7,6 @@ PORTNAME= kamera 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/kamera/distinfo b/graphics/kamera/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kamera/distinfo +++ b/graphics/kamera/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist index 22b4be87fdd2..4e191ecdd3cc 100644 --- a/graphics/kdegraphics3/pkg-plist +++ b/graphics/kdegraphics3/pkg-plist @@ -928,7 +928,6 @@ share/apps/kview/kpartplugins/kviewscanner.desktop share/apps/kview/kpartplugins/kviewscanner.rc share/apps/kview/kview.setdlg share/apps/kview/kviewui.rc -share/apps/kview/photobookui.rc share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png @@ -942,6 +941,7 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc share/apps/kviewviewer/kviewpopup.rc share/apps/kviewviewer/kviewviewer.rc share/apps/kviewviewer/kviewviewer_ro.rc +share/apps/photobook/photobookui.rc share/config.kcfg/djvumultipage.kcfg share/config.kcfg/kdvi.kcfg share/config.kcfg/kghostview.kcfg @@ -1205,18 +1205,13 @@ share/servicetypes/kimageviewer.desktop share/servicetypes/kimageviewercanvas.desktop share/servicetypes/kmultipage.desktop share/servicetypes/ksvgrenderer.desktop -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html @dirrm share/services/kconfiguredialog -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -1227,7 +1222,13 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/doc/HTML/en/kghostview @dirrm share/doc/HTML/en/kgamma @dirrm share/doc/HTML/en/kdvi +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview +@dirrm share/doc/HTML/en/kdegraphics-apidocs @dirrm share/doc/HTML/en/kcoloredit +@dirrm share/apps/photobook @dirrm share/apps/kviewviewer/kpartplugins @dirrm share/apps/kviewviewer @dirrm share/apps/kviewshell diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kdegraphics4/pkg-plist b/graphics/kdegraphics4/pkg-plist index 22b4be87fdd2..4e191ecdd3cc 100644 --- a/graphics/kdegraphics4/pkg-plist +++ b/graphics/kdegraphics4/pkg-plist @@ -928,7 +928,6 @@ share/apps/kview/kpartplugins/kviewscanner.desktop share/apps/kview/kpartplugins/kviewscanner.rc share/apps/kview/kview.setdlg share/apps/kview/kviewui.rc -share/apps/kview/photobookui.rc share/apps/kviewerpart/icons/hicolor/16x16/actions/movetool.png share/apps/kviewerpart/icons/hicolor/16x16/actions/selectiontool.png share/apps/kviewerpart/icons/hicolor/22x22/actions/movetool.png @@ -942,6 +941,7 @@ share/apps/kviewviewer/kpartplugins/kviewbrowser.rc share/apps/kviewviewer/kviewpopup.rc share/apps/kviewviewer/kviewviewer.rc share/apps/kviewviewer/kviewviewer_ro.rc +share/apps/photobook/photobookui.rc share/config.kcfg/djvumultipage.kcfg share/config.kcfg/kdvi.kcfg share/config.kcfg/kghostview.kcfg @@ -1205,18 +1205,13 @@ share/servicetypes/kimageviewer.desktop share/servicetypes/kimageviewercanvas.desktop share/servicetypes/kmultipage.desktop share/servicetypes/ksvgrenderer.desktop -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@exec /bin/mkdir -p %D/share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@exec /bin/mkdir -p %D/share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html @dirrm share/services/kconfiguredialog -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell/html -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kviewshell -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview/html -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs/kfaxview -@dirrm share/doc/HTML/en/libtext2path-0.1-apidocs @dirrm share/doc/HTML/en/kview @dirrm share/doc/HTML/en/ksnapshot @dirrm share/doc/HTML/en/kruler @@ -1227,7 +1222,13 @@ share/servicetypes/ksvgrenderer.desktop @dirrm share/doc/HTML/en/kghostview @dirrm share/doc/HTML/en/kgamma @dirrm share/doc/HTML/en/kdvi +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell/html +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kviewshell +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview/html +@dirrm share/doc/HTML/en/kdegraphics-apidocs/kfaxview +@dirrm share/doc/HTML/en/kdegraphics-apidocs @dirrm share/doc/HTML/en/kcoloredit +@dirrm share/apps/photobook @dirrm share/apps/kviewviewer/kpartplugins @dirrm share/apps/kviewviewer @dirrm share/apps/kviewshell diff --git a/graphics/kooka/distinfo b/graphics/kooka/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kooka/distinfo +++ b/graphics/kooka/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kuickshow-kde4/distinfo b/graphics/kuickshow-kde4/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kuickshow-kde4/distinfo +++ b/graphics/kuickshow-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/graphics/kuickshow/distinfo b/graphics/kuickshow/distinfo index c18207f21caa..4ea8461c008f 100644 --- a/graphics/kuickshow/distinfo +++ b/graphics/kuickshow/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdegraphics-3.5.3.tar.bz2) = 56bd5537521dc94633f8effaace523cb -SHA256 (KDE/kdegraphics-3.5.3.tar.bz2) = 1ee3895002a2cb7e6da2d27cd330141acf40dbdb9f3683c7685fd4ff71319861 -SIZE (KDE/kdegraphics-3.5.3.tar.bz2) = 7300366 +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 diff --git a/hebrew/kde3-i18n/distinfo b/hebrew/kde3-i18n/distinfo index b81321f00456..56b4c9958e8d 100644 --- a/hebrew/kde3-i18n/distinfo +++ b/hebrew/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 2800fd107ca1879abec14d0600704a5d -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 5f61b0ef696c873af21f4e31d47fdd0508a9c31e654c6d82caab4fac5be15540 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 1530249 +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 diff --git a/hebrew/kde3-i18n/pkg-plist b/hebrew/kde3-i18n/pkg-plist index 40f155ab5ef0..c3372faddcfa 100644 --- a/hebrew/kde3-i18n/pkg-plist +++ b/hebrew/kde3-i18n/pkg-plist @@ -433,6 +433,7 @@ share/locale/he/LC_MESSAGES/kwifimanager.mo share/locale/he/LC_MESSAGES/kwin.mo share/locale/he/LC_MESSAGES/kwin4.mo share/locale/he/LC_MESSAGES/kwin_art_clients.mo +share/locale/he/LC_MESSAGES/kwin_clients.mo share/locale/he/LC_MESSAGES/kwin_lib.mo share/locale/he/LC_MESSAGES/kwireless.mo share/locale/he/LC_MESSAGES/kworldclock.mo diff --git a/hebrew/kde4-l10n/distinfo b/hebrew/kde4-l10n/distinfo index b81321f00456..56b4c9958e8d 100644 --- a/hebrew/kde4-l10n/distinfo +++ b/hebrew/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 2800fd107ca1879abec14d0600704a5d -SHA256 (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 5f61b0ef696c873af21f4e31d47fdd0508a9c31e654c6d82caab4fac5be15540 -SIZE (KDE/kde-i18n/kde-i18n-he-3.5.3.tar.bz2) = 1530249 +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 diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist index 40f155ab5ef0..c3372faddcfa 100644 --- a/hebrew/kde4-l10n/pkg-plist +++ b/hebrew/kde4-l10n/pkg-plist @@ -433,6 +433,7 @@ share/locale/he/LC_MESSAGES/kwifimanager.mo share/locale/he/LC_MESSAGES/kwin.mo share/locale/he/LC_MESSAGES/kwin4.mo share/locale/he/LC_MESSAGES/kwin_art_clients.mo +share/locale/he/LC_MESSAGES/kwin_clients.mo share/locale/he/LC_MESSAGES/kwin_lib.mo share/locale/he/LC_MESSAGES/kwireless.mo share/locale/he/LC_MESSAGES/kworldclock.mo diff --git a/hebrew/koffice-i18n/Makefile b/hebrew/koffice-i18n/Makefile index 0aa0d572c236..09a51f627ff5 100644 --- a/hebrew/koffice-i18n/Makefile +++ b/hebrew/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= hebrew kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/hebrew/koffice-i18n/distinfo b/hebrew/koffice-i18n/distinfo index 8ac67bdebc96..314471cd7f02 100644 --- a/hebrew/koffice-i18n/distinfo +++ b/hebrew/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-he-1.5.1.tar.bz2) = a20e78860f0975b65ed59720924591ca -SHA256 (KDE/kde-i18n/koffice-l10n-he-1.5.1.tar.bz2) = 8536b52851ae69ce56e0e8e8108ebff47a375db73d7c3e898ecea4da6a544f90 -SIZE (KDE/kde-i18n/koffice-l10n-he-1.5.1.tar.bz2) = 336036 +MD5 (KDE/kde-i18n/koffice-l10n-he-1.5.2.tar.bz2) = a0368a287bf2a3566b802ffe6de8b472 +SHA256 (KDE/kde-i18n/koffice-l10n-he-1.5.2.tar.bz2) = 122806474624d4f4940c437acdf193626ab4d8b87cb8c76a02a0d0403a831ccd +SIZE (KDE/kde-i18n/koffice-l10n-he-1.5.2.tar.bz2) = 338317 diff --git a/hungarian/kde3-i18n/distinfo b/hungarian/kde3-i18n/distinfo index 21283075ba5d..f0017d49b8e4 100644 --- a/hungarian/kde3-i18n/distinfo +++ b/hungarian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 18faeab413d89d3c9bde9fe1a6fb17a6 -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 4e01f7b393645599c632c8f89d8af6f62181d9eb820f43ab514eac9f3cbaa71a -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 2960687 +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 diff --git a/hungarian/kde4-l10n/distinfo b/hungarian/kde4-l10n/distinfo index 21283075ba5d..f0017d49b8e4 100644 --- a/hungarian/kde4-l10n/distinfo +++ b/hungarian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 18faeab413d89d3c9bde9fe1a6fb17a6 -SHA256 (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 4e01f7b393645599c632c8f89d8af6f62181d9eb820f43ab514eac9f3cbaa71a -SIZE (KDE/kde-i18n/kde-i18n-hu-3.5.3.tar.bz2) = 2960687 +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 diff --git a/hungarian/koffice-i18n/Makefile b/hungarian/koffice-i18n/Makefile index edc7e1bd4f45..9fece577406f 100644 --- a/hungarian/koffice-i18n/Makefile +++ b/hungarian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 3c1764666027..bfac6389c370 100644 --- a/hungarian/koffice-i18n/distinfo +++ b/hungarian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-hu-1.5.1.tar.bz2) = 8a8d4f7adaaed89063c4971c9bbfbf43 -SHA256 (KDE/kde-i18n/koffice-l10n-hu-1.5.1.tar.bz2) = 68a2f61ca751297835de1fa88055344a2185c392aae4c0b3e6bc1b989251cf78 -SIZE (KDE/kde-i18n/koffice-l10n-hu-1.5.1.tar.bz2) = 371932 +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 diff --git a/japanese/kde3-i18n/distinfo b/japanese/kde3-i18n/distinfo index 9d87ce16cbbf..992d2786863f 100644 --- a/japanese/kde3-i18n/distinfo +++ b/japanese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 0bd28615477ec56978dcf5e700c1e5c3 -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 3ceac68ed004f5c58dec355663b8fa4f33218f5aae4eeca7bdd80448f2164409 -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 2400205 +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 diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo index 9d87ce16cbbf..992d2786863f 100644 --- a/japanese/kde4-l10n/distinfo +++ b/japanese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 0bd28615477ec56978dcf5e700c1e5c3 -SHA256 (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 3ceac68ed004f5c58dec355663b8fa4f33218f5aae4eeca7bdd80448f2164409 -SIZE (KDE/kde-i18n/kde-i18n-ja-3.5.3.tar.bz2) = 2400205 +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 diff --git a/japanese/koffice-i18n/Makefile b/japanese/koffice-i18n/Makefile index 45aed82350f3..d1dac099dddd 100644 --- a/japanese/koffice-i18n/Makefile +++ b/japanese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 ffd2682d8069..cfbb2d757e6b 100644 --- a/japanese/koffice-i18n/distinfo +++ b/japanese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ja-1.5.1.tar.bz2) = 8f7893e842afd51368bd18c37b221f57 -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.5.1.tar.bz2) = bb0d9862564f33b6215567b6c5495bb858c07b3d815b7fefab6017e78d3b6156 -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.5.1.tar.bz2) = 346160 +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 diff --git a/japanese/koffice-kde4-l10n/Makefile b/japanese/koffice-kde4-l10n/Makefile index 45aed82350f3..d1dac099dddd 100644 --- a/japanese/koffice-kde4-l10n/Makefile +++ b/japanese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 ffd2682d8069..cfbb2d757e6b 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.1.tar.bz2) = 8f7893e842afd51368bd18c37b221f57 -SHA256 (KDE/kde-i18n/koffice-l10n-ja-1.5.1.tar.bz2) = bb0d9862564f33b6215567b6c5495bb858c07b3d815b7fefab6017e78d3b6156 -SIZE (KDE/kde-i18n/koffice-l10n-ja-1.5.1.tar.bz2) = 346160 +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 diff --git a/korean/kde3-i18n/distinfo b/korean/kde3-i18n/distinfo index 13a865974032..b2d48b966ed9 100644 --- a/korean/kde3-i18n/distinfo +++ b/korean/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = 6076f24c27ad2a52eb3675e10e6b2af9 -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = d2a0df30d5ccda4a9e035507cf8c8342b9dad2e27e8dc3c7403334097f1da3ee -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = 1056607 +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 diff --git a/korean/kde3-i18n/pkg-plist b/korean/kde3-i18n/pkg-plist index 2024f458ea38..6d8be2e7bea6 100644 --- a/korean/kde3-i18n/pkg-plist +++ b/korean/kde3-i18n/pkg-plist @@ -19,7 +19,6 @@ share/locale/ko/LC_MESSAGES/htmlsearch.mo share/locale/ko/LC_MESSAGES/juk.mo share/locale/ko/LC_MESSAGES/kabc_dir.mo share/locale/ko/LC_MESSAGES/kabc_file.mo -share/locale/ko/LC_MESSAGES/kabc_ldap.mo share/locale/ko/LC_MESSAGES/kabc_ldapkio.mo share/locale/ko/LC_MESSAGES/kabc_net.mo share/locale/ko/LC_MESSAGES/kabc_sql.mo diff --git a/korean/kde4-l10n/distinfo b/korean/kde4-l10n/distinfo index 13a865974032..b2d48b966ed9 100644 --- a/korean/kde4-l10n/distinfo +++ b/korean/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = 6076f24c27ad2a52eb3675e10e6b2af9 -SHA256 (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = d2a0df30d5ccda4a9e035507cf8c8342b9dad2e27e8dc3c7403334097f1da3ee -SIZE (KDE/kde-i18n/kde-i18n-ko-3.5.3.tar.bz2) = 1056607 +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 diff --git a/korean/kde4-l10n/pkg-plist b/korean/kde4-l10n/pkg-plist index 2024f458ea38..6d8be2e7bea6 100644 --- a/korean/kde4-l10n/pkg-plist +++ b/korean/kde4-l10n/pkg-plist @@ -19,7 +19,6 @@ share/locale/ko/LC_MESSAGES/htmlsearch.mo share/locale/ko/LC_MESSAGES/juk.mo share/locale/ko/LC_MESSAGES/kabc_dir.mo share/locale/ko/LC_MESSAGES/kabc_file.mo -share/locale/ko/LC_MESSAGES/kabc_ldap.mo share/locale/ko/LC_MESSAGES/kabc_ldapkio.mo share/locale/ko/LC_MESSAGES/kabc_net.mo share/locale/ko/LC_MESSAGES/kabc_sql.mo diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/math/kcalc/distinfo +++ b/math/kcalc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/misc/kaddressbook-plugins/distinfo b/misc/kaddressbook-plugins/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/misc/kaddressbook-plugins/distinfo +++ b/misc/kaddressbook-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/kaddressbook-plugins/pkg-plist b/misc/kaddressbook-plugins/pkg-plist index 39721d754416..758b8c2a49ee 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.3 +share/applications/kdeaddons-kaddressbook-plugins-3.5.4 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 262c3edc74e6..58839ef0c5d9 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.3.tar.bz2) = 63cb83e7143b047497638c4315a3ee8a -SHA256 (KDE/kde-i18n/kde-i18n-af-3.5.3.tar.bz2) = c68eaf860916b36521265a878e0daaad0752e2ed22e754dfd125163b04476de0 -SIZE (KDE/kde-i18n/kde-i18n-af-3.5.3.tar.bz2) = 1529745 +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 diff --git a/misc/kde3-i18n-af/pkg-plist b/misc/kde3-i18n-af/pkg-plist index e740496ffd8f..c5568c134456 100644 --- a/misc/kde3-i18n-af/pkg-plist +++ b/misc/kde3-i18n-af/pkg-plist @@ -239,7 +239,6 @@ share/locale/af/LC_MESSAGES/kmailcvt.mo share/locale/af/LC_MESSAGES/kmcop.mo share/locale/af/LC_MESSAGES/kmenuapplet.mo share/locale/af/LC_MESSAGES/kmenuedit.mo -share/locale/af/LC_MESSAGES/kmessedwords.mo share/locale/af/LC_MESSAGES/kmid.mo share/locale/af/LC_MESSAGES/kmines.mo share/locale/af/LC_MESSAGES/kminipagerapplet.mo @@ -344,7 +343,6 @@ share/locale/af/LC_MESSAGES/kxkb.mo share/locale/af/LC_MESSAGES/kxsconfig.mo share/locale/af/LC_MESSAGES/libdmctl.mo share/locale/af/LC_MESSAGES/libkcal.mo -share/locale/af/LC_MESSAGES/libkcalsystem.mo share/locale/af/LC_MESSAGES/libkdegames.mo share/locale/af/LC_MESSAGES/libkdepim.mo share/locale/af/LC_MESSAGES/libkicker.mo diff --git a/misc/kde3-i18n-az/distinfo b/misc/kde3-i18n-az/distinfo index 9484bf6b4b4c..56e17a7172dc 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.3.tar.bz2) = 66635b71cac7ec39d8e0016e24ab8e87 -SHA256 (KDE/kde-i18n/kde-i18n-az-3.5.3.tar.bz2) = 01941b8415871103e298e164f9cb9f2309a6512abf10b52f73f49f2c23c3428b -SIZE (KDE/kde-i18n/kde-i18n-az-3.5.3.tar.bz2) = 1574855 +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 diff --git a/misc/kde3-i18n-az/pkg-plist b/misc/kde3-i18n-az/pkg-plist index ea530556804d..901584a5c29a 100644 --- a/misc/kde3-i18n-az/pkg-plist +++ b/misc/kde3-i18n-az/pkg-plist @@ -33,7 +33,6 @@ share/locale/az/LC_MESSAGES/juk.mo share/locale/az/LC_MESSAGES/kabc2mutt.mo share/locale/az/LC_MESSAGES/kabc_dir.mo share/locale/az/LC_MESSAGES/kabc_file.mo -share/locale/az/LC_MESSAGES/kabc_ldap.mo share/locale/az/LC_MESSAGES/kabc_ldapkio.mo share/locale/az/LC_MESSAGES/kabc_net.mo share/locale/az/LC_MESSAGES/kabc_sql.mo @@ -264,7 +263,6 @@ share/locale/az/LC_MESSAGES/kmailcvt.mo share/locale/az/LC_MESSAGES/kmcop.mo share/locale/az/LC_MESSAGES/kmenuapplet.mo share/locale/az/LC_MESSAGES/kmenuedit.mo -share/locale/az/LC_MESSAGES/kmessedwords.mo share/locale/az/LC_MESSAGES/kmid.mo share/locale/az/LC_MESSAGES/kmines.mo share/locale/az/LC_MESSAGES/kminipagerapplet.mo @@ -384,7 +382,6 @@ share/locale/az/LC_MESSAGES/kxkb.mo share/locale/az/LC_MESSAGES/kxsconfig.mo share/locale/az/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/az/LC_MESSAGES/libkcal.mo -share/locale/az/LC_MESSAGES/libkcalsystem.mo share/locale/az/LC_MESSAGES/libkcddb.mo share/locale/az/LC_MESSAGES/libkdegames.mo share/locale/az/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde3-i18n-bg/distinfo b/misc/kde3-i18n-bg/distinfo index 3f27331d0a23..25440aab4d9f 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.3.tar.bz2) = 5ee352d11d976d133343575c0267e7df -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.3.tar.bz2) = 987c52b61132f29b438cde3307cf7fffe0cbcdfe08fac293bb97ecd5d9153117 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.3.tar.bz2) = 1717598 +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 diff --git a/misc/kde3-i18n-bn/distinfo b/misc/kde3-i18n-bn/distinfo index 684f18916bf3..9dfc3a9e52f2 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.3.tar.bz2) = a2764d9391d71125ebba255dcde003f7 -SHA256 (KDE/kde-i18n/kde-i18n-bn-3.5.3.tar.bz2) = db04cf65406fb76154f2522f50f6251d7199aebb6664b1d7344c6a3868e5697b -SIZE (KDE/kde-i18n/kde-i18n-bn-3.5.3.tar.bz2) = 830095 +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 diff --git a/misc/kde3-i18n-br/distinfo b/misc/kde3-i18n-br/distinfo index 0c5462f85e2d..e00bcc0bdefe 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.3.tar.bz2) = b0bbed5d1e9636ae4240c9471ab00116 -SHA256 (KDE/kde-i18n/kde-i18n-br-3.5.3.tar.bz2) = 2d52346cbd5631c19da9647113099856e6d87c1816f0cfd3e919ad104f262db9 -SIZE (KDE/kde-i18n/kde-i18n-br-3.5.3.tar.bz2) = 1687068 +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 diff --git a/misc/kde3-i18n-br/pkg-plist b/misc/kde3-i18n-br/pkg-plist index dc26820444a6..6ad6a45089eb 100644 --- a/misc/kde3-i18n-br/pkg-plist +++ b/misc/kde3-i18n-br/pkg-plist @@ -332,7 +332,6 @@ share/locale/br/LC_MESSAGES/kmathapplet.mo share/locale/br/LC_MESSAGES/kmcop.mo share/locale/br/LC_MESSAGES/kmenuapplet.mo share/locale/br/LC_MESSAGES/kmenuedit.mo -share/locale/br/LC_MESSAGES/kmessedwords.mo share/locale/br/LC_MESSAGES/kmid.mo share/locale/br/LC_MESSAGES/kmilo_delli8k.mo share/locale/br/LC_MESSAGES/kmilo_generic.mo diff --git a/misc/kde3-i18n-bs/distinfo b/misc/kde3-i18n-bs/distinfo index 0407e6ba12c1..2fda5b83cbd0 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.3.tar.bz2) = e671403b7df7f572323834d91ac8621a -SHA256 (KDE/kde-i18n/kde-i18n-bs-3.5.3.tar.bz2) = 401f6d535f2837ef3fb7ba04402f9e0ba6ca488832b72314c195d13771dad96c -SIZE (KDE/kde-i18n/kde-i18n-bs-3.5.3.tar.bz2) = 1724132 +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 diff --git a/misc/kde3-i18n-ca/distinfo b/misc/kde3-i18n-ca/distinfo index 4ce2a98f48ad..f2a1f0d04da5 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.3.tar.bz2) = c9519abf1f62bf69a7288f4144d680c9 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.3.tar.bz2) = e964396956187dcf96120402ac1f7e4e38aa5bcedbc8bd3e37f025ce29073a8b -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.3.tar.bz2) = 4592584 +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 diff --git a/misc/kde3-i18n-ca/pkg-plist b/misc/kde3-i18n-ca/pkg-plist index 02ea0c525727..d5c4c96c0495 100644 --- a/misc/kde3-i18n-ca/pkg-plist +++ b/misc/kde3-i18n-ca/pkg-plist @@ -36,9 +36,12 @@ share/doc/HTML/ca/kate-plugins/textfilter.docbook 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/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/man-kate.1.docbook share/doc/HTML/ca/kate/mdi.docbook share/doc/HTML/ca/kate/menus.docbook @@ -392,6 +395,9 @@ share/doc/HTML/ca/kicker/man-kicker.1.docbook share/doc/HTML/ca/kinfocenter/blockdevices/common share/doc/HTML/ca/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/ca/kinfocenter/blockdevices/index.docbook +share/doc/HTML/ca/kinfocenter/cdinfo/common +share/doc/HTML/ca/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/ca/kinfocenter/cdinfo/index.docbook share/doc/HTML/ca/kinfocenter/common share/doc/HTML/ca/kinfocenter/devices/common share/doc/HTML/ca/kinfocenter/devices/index.cache.bz2 @@ -722,6 +728,9 @@ share/doc/HTML/ca/kteatime/index.docbook share/doc/HTML/ca/ktimer/common share/doc/HTML/ca/ktimer/index.cache.bz2 share/doc/HTML/ca/ktimer/index.docbook +share/doc/HTML/ca/ktnef/common +share/doc/HTML/ca/ktnef/index.cache.bz2 +share/doc/HTML/ca/ktnef/index.docbook share/doc/HTML/ca/ktouch/common share/doc/HTML/ca/ktouch/index.cache.bz2 share/doc/HTML/ca/ktouch/index.docbook @@ -1375,6 +1384,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kturtle @dirrm share/doc/HTML/ca/kttsd @dirrm share/doc/HTML/ca/ktouch +@dirrm share/doc/HTML/ca/ktnef @dirrm share/doc/HTML/ca/ktimer @dirrm share/doc/HTML/ca/kteatime @dirrm share/doc/HTML/ca/ksysv @@ -1441,6 +1451,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kinfocenter/interrupts @dirrm share/doc/HTML/ca/kinfocenter/dma @dirrm share/doc/HTML/ca/kinfocenter/devices +@dirrm share/doc/HTML/ca/kinfocenter/cdinfo @dirrm share/doc/HTML/ca/kinfocenter/blockdevices @dirrm share/doc/HTML/ca/kinfocenter @dirrm share/doc/HTML/ca/kicker-applets diff --git a/misc/kde3-i18n-cs/distinfo b/misc/kde3-i18n-cs/distinfo index 9f98ab9432ac..46924108f34a 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.3.tar.bz2) = e7a350afd2914188449749f10ad6d0bf -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.3.tar.bz2) = 33584edd9d00e51733cbbd49ca2ce47fe5b7fd980f06807559d75a340d735c3f -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.3.tar.bz2) = 3360743 +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 diff --git a/misc/kde3-i18n-cs/pkg-plist b/misc/kde3-i18n-cs/pkg-plist index 766405cf6e5d..042a5f981bb0 100644 --- a/misc/kde3-i18n-cs/pkg-plist +++ b/misc/kde3-i18n-cs/pkg-plist @@ -510,7 +510,6 @@ share/locale/cs/LC_MESSAGES/kmathtool.mo share/locale/cs/LC_MESSAGES/kmcop.mo share/locale/cs/LC_MESSAGES/kmenuapplet.mo share/locale/cs/LC_MESSAGES/kmenuedit.mo -share/locale/cs/LC_MESSAGES/kmessedwords.mo share/locale/cs/LC_MESSAGES/kmid.mo share/locale/cs/LC_MESSAGES/kmilo_delli8k.mo share/locale/cs/LC_MESSAGES/kmilo_generic.mo @@ -691,7 +690,6 @@ share/locale/cs/LC_MESSAGES/libdmctl.mo share/locale/cs/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/cs/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/cs/LC_MESSAGES/libkcal.mo -share/locale/cs/LC_MESSAGES/libkcalsystem.mo share/locale/cs/LC_MESSAGES/libkcddb.mo share/locale/cs/LC_MESSAGES/libkdeedu.mo share/locale/cs/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-cy/distinfo b/misc/kde3-i18n-cy/distinfo index b81f4e5ff50b..039aea2ff37e 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.3.tar.bz2) = 81951549ad8740548b7109e94a0056a6 -SHA256 (KDE/kde-i18n/kde-i18n-cy-3.5.3.tar.bz2) = 4fc5b755354dd0872cb7343a4927665f952defb91837d8351c71f10efb121c20 -SIZE (KDE/kde-i18n/kde-i18n-cy-3.5.3.tar.bz2) = 1909035 +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 diff --git a/misc/kde3-i18n-cy/pkg-plist b/misc/kde3-i18n-cy/pkg-plist index 840ccdd5baec..f9fd031ef88a 100644 --- a/misc/kde3-i18n-cy/pkg-plist +++ b/misc/kde3-i18n-cy/pkg-plist @@ -42,7 +42,6 @@ share/locale/cy/LC_MESSAGES/juk.mo share/locale/cy/LC_MESSAGES/kabc2mutt.mo share/locale/cy/LC_MESSAGES/kabc_dir.mo share/locale/cy/LC_MESSAGES/kabc_file.mo -share/locale/cy/LC_MESSAGES/kabc_ldap.mo share/locale/cy/LC_MESSAGES/kabc_ldapkio.mo share/locale/cy/LC_MESSAGES/kabc_net.mo share/locale/cy/LC_MESSAGES/kabc_slox.mo @@ -333,7 +332,6 @@ share/locale/cy/LC_MESSAGES/kmathapplet.mo share/locale/cy/LC_MESSAGES/kmcop.mo share/locale/cy/LC_MESSAGES/kmenuapplet.mo share/locale/cy/LC_MESSAGES/kmenuedit.mo -share/locale/cy/LC_MESSAGES/kmessedwords.mo share/locale/cy/LC_MESSAGES/kmid.mo share/locale/cy/LC_MESSAGES/kmilo_delli8k.mo share/locale/cy/LC_MESSAGES/kmilo_generic.mo diff --git a/misc/kde3-i18n-da/distinfo b/misc/kde3-i18n-da/distinfo index 4a51ee74189a..ae07f5515ee1 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.3.tar.bz2) = 0e347230250eb65f8f6722ecacbaface -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.3.tar.bz2) = 193c2e10724f491786206addaa689804c54e5911a203a00f8f4492ec3abbe603 -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.3.tar.bz2) = 12255073 +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 diff --git a/misc/kde3-i18n-el/distinfo b/misc/kde3-i18n-el/distinfo index 7dcea075a996..c91d76b9470e 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.3.tar.bz2) = aeeea7a9079ff5fd8f0bcfd34452ee4e -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.3.tar.bz2) = 59853b7b7838e98b170ed14c907ff5ac2fd018340b141ee335f875e9a2afb23e -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.3.tar.bz2) = 2241168 +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 diff --git a/misc/kde3-i18n-en_GB/distinfo b/misc/kde3-i18n-en_GB/distinfo index 5e4473b8375e..cfba5a263cd5 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.3.tar.bz2) = 1029cfba62fdd93fa2dc900111df2a4c -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.3.tar.bz2) = 8ceb5f25cf15916d72ad2456b6bae1be1155096f8b85d2a5e2f3c485a6bafb9c -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.3.tar.bz2) = 3686136 +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 diff --git a/misc/kde3-i18n-eo/distinfo b/misc/kde3-i18n-eo/distinfo index af4aa177626b..c950b7bb5362 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.3.tar.bz2) = e7e799e9c6d92149a8e6716906652c53 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.3.tar.bz2) = ab47e01abd8693be638cb2f18f47f2cc466b1418d060aff199b21a1cb4db772b -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.3.tar.bz2) = 1265674 +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 diff --git a/misc/kde3-i18n-eo/pkg-plist b/misc/kde3-i18n-eo/pkg-plist index a0e4e400036c..c04ac596ad9e 100644 --- a/misc/kde3-i18n-eo/pkg-plist +++ b/misc/kde3-i18n-eo/pkg-plist @@ -20,7 +20,6 @@ share/locale/eo/LC_MESSAGES/imgalleryplugin.mo share/locale/eo/LC_MESSAGES/joystick.mo share/locale/eo/LC_MESSAGES/kabc_dir.mo share/locale/eo/LC_MESSAGES/kabc_file.mo -share/locale/eo/LC_MESSAGES/kabc_ldap.mo share/locale/eo/LC_MESSAGES/kabc_ldapkio.mo share/locale/eo/LC_MESSAGES/kabc_net.mo share/locale/eo/LC_MESSAGES/kabc_sql.mo diff --git a/misc/kde3-i18n-es/distinfo b/misc/kde3-i18n-es/distinfo index 2096ea099c12..23d46b6c04eb 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.3.tar.bz2) = a84067e863f9c4eb6fdc1f64d03010b9 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.3.tar.bz2) = ec1786fb7de4ec560638ae023d1dad1ba4c578375125174f15296c9f18d93aba -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.3.tar.bz2) = 36178083 +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 diff --git a/misc/kde3-i18n-es/pkg-plist b/misc/kde3-i18n-es/pkg-plist index 7edccdfe2011..a270104fbf75 100644 --- a/misc/kde3-i18n-es/pkg-plist +++ b/misc/kde3-i18n-es/pkg-plist @@ -205,9 +205,6 @@ share/doc/HTML/es/KRegExpEditor/wordboundary.png share/doc/HTML/es/akregator/common share/doc/HTML/es/akregator/index.cache.bz2 share/doc/HTML/es/akregator/index.docbook -share/doc/HTML/es/aktion/common -share/doc/HTML/es/aktion/index.cache.bz2 -share/doc/HTML/es/aktion/index.docbook share/doc/HTML/es/amor/billy.png share/doc/HTML/es/amor/bonhomme.png share/doc/HTML/es/amor/bsd.png @@ -226,6 +223,7 @@ share/doc/HTML/es/amor/worm.png share/doc/HTML/es/api/Architecture.png share/doc/HTML/es/api/Development.png share/doc/HTML/es/api/Dox-pimlogo.png +share/doc/HTML/es/api/datetimewidgets.png share/doc/HTML/es/api/kcarddialog.png share/doc/HTML/es/api/kcharselect.png share/doc/HTML/es/api/kcolorbutton.png @@ -351,9 +349,6 @@ share/doc/HTML/es/docs/common/kde-localised.css share/doc/HTML/es/docs/common/kde_logo.png share/doc/HTML/es/docs/common/lgpl-translated.html share/doc/HTML/es/docs/common/logotp3.png -share/doc/HTML/es/flashkard/common -share/doc/HTML/es/flashkard/index.cache.bz2 -share/doc/HTML/es/flashkard/index.docbook share/doc/HTML/es/juk/common share/doc/HTML/es/juk/history-playlist.png share/doc/HTML/es/juk/index.cache.bz2 @@ -666,9 +661,6 @@ share/doc/HTML/es/kcontrol/icons/index.cache.bz2 share/doc/HTML/es/kcontrol/icons/index.docbook share/doc/HTML/es/kcontrol/index.cache.bz2 share/doc/HTML/es/kcontrol/index.docbook -share/doc/HTML/es/kcontrol/kalarmd/common -share/doc/HTML/es/kcontrol/kalarmd/index.cache.bz2 -share/doc/HTML/es/kcontrol/kalarmd/index.docbook share/doc/HTML/es/kcontrol/kcmaccess/common share/doc/HTML/es/kcontrol/kcmaccess/index.cache.bz2 share/doc/HTML/es/kcontrol/kcmaccess/index.docbook @@ -718,18 +710,12 @@ share/doc/HTML/es/kcontrol/khtml/common share/doc/HTML/es/kcontrol/khtml/index.cache.bz2 share/doc/HTML/es/kcontrol/khtml/index.docbook share/doc/HTML/es/kcontrol/khtml/nsplugin.docbook -share/doc/HTML/es/kcontrol/kmixcfg/common -share/doc/HTML/es/kcontrol/kmixcfg/index.cache.bz2 -share/doc/HTML/es/kcontrol/kmixcfg/index.docbook share/doc/HTML/es/kcontrol/kthememgr/common share/doc/HTML/es/kcontrol/kthememgr/index.cache.bz2 share/doc/HTML/es/kcontrol/kthememgr/index.docbook share/doc/HTML/es/kcontrol/kwindecoration/common share/doc/HTML/es/kcontrol/kwindecoration/index.cache.bz2 share/doc/HTML/es/kcontrol/kwindecoration/index.docbook -share/doc/HTML/es/kcontrol/kxmlrpcd/common -share/doc/HTML/es/kcontrol/kxmlrpcd/index.cache.bz2 -share/doc/HTML/es/kcontrol/kxmlrpcd/index.docbook share/doc/HTML/es/kcontrol/lanbrowser/common share/doc/HTML/es/kcontrol/lanbrowser/index.cache.bz2 share/doc/HTML/es/kcontrol/lanbrowser/index.docbook @@ -895,6 +881,9 @@ share/doc/HTML/es/kdesu/common share/doc/HTML/es/kdesu/index.cache.bz2 share/doc/HTML/es/kdesu/index.docbook share/doc/HTML/es/kdesu/man-kdesu.1.docbook +share/doc/HTML/es/kdesvn-build/common +share/doc/HTML/es/kdesvn-build/index.cache.bz2 +share/doc/HTML/es/kdesvn-build/index.docbook share/doc/HTML/es/kdevelop/SF-general.png share/doc/HTML/es/kdevelop/SF-indent.png share/doc/HTML/es/kdevelop/SF-other.png @@ -1134,7 +1123,6 @@ share/doc/HTML/es/khelpcenter/quickstart/index.docbook share/doc/HTML/es/khelpcenter/shadow1.png share/doc/HTML/es/khelpcenter/support.docbook share/doc/HTML/es/khelpcenter/userguide/a-window.png -share/doc/HTML/es/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/es/khelpcenter/userguide/accessibility.docbook share/doc/HTML/es/khelpcenter/userguide/amarok-icon.png share/doc/HTML/es/khelpcenter/userguide/amarok.png @@ -1149,18 +1137,13 @@ share/doc/HTML/es/khelpcenter/userguide/desktop.png share/doc/HTML/es/khelpcenter/userguide/email.docbook share/doc/HTML/es/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/es/khelpcenter/userguide/file-sharing.docbook -share/doc/HTML/es/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/es/khelpcenter/userguide/font-installation.docbook share/doc/HTML/es/khelpcenter/userguide/getting-help.docbook -share/doc/HTML/es/khelpcenter/userguide/getting-started.docbook share/doc/HTML/es/khelpcenter/userguide/glossary.docbook share/doc/HTML/es/khelpcenter/userguide/groupware-kontact.docbook -share/doc/HTML/es/khelpcenter/userguide/history.docbook share/doc/HTML/es/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/es/khelpcenter/userguide/index.docbook -share/doc/HTML/es/khelpcenter/userguide/installation.docbook share/doc/HTML/es/khelpcenter/userguide/internet-shortcuts.docbook -share/doc/HTML/es/khelpcenter/userguide/intro.docbook share/doc/HTML/es/khelpcenter/userguide/juk-icon.png share/doc/HTML/es/khelpcenter/userguide/juk.png share/doc/HTML/es/khelpcenter/userguide/kaboodle-icon.png @@ -1171,18 +1154,7 @@ share/doc/HTML/es/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/es/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/es/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/es/khelpcenter/userguide/kde-office.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeadmin-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdebase-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeedu-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdegames-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdegraphics-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdemultimedia-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdenetwork-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdepim-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdetoys-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeutils-apps.docbook share/doc/HTML/es/khelpcenter/userguide/kmag.png -share/doc/HTML/es/khelpcenter/userguide/kmenu.png share/doc/HTML/es/khelpcenter/userguide/kmousetool.png share/doc/HTML/es/khelpcenter/userguide/kmouth.png share/doc/HTML/es/khelpcenter/userguide/kmouth2.png @@ -1191,7 +1163,6 @@ share/doc/HTML/es/khelpcenter/userguide/knode-identity.png share/doc/HTML/es/khelpcenter/userguide/knode-mail-account.png share/doc/HTML/es/khelpcenter/userguide/knode-news-account.png share/doc/HTML/es/khelpcenter/userguide/knode-start.png -share/doc/HTML/es/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/es/khelpcenter/userguide/konq-sidebar.png share/doc/HTML/es/khelpcenter/userguide/konq-simple.png share/doc/HTML/es/khelpcenter/userguide/konsole-intro.docbook @@ -1201,7 +1172,6 @@ share/doc/HTML/es/khelpcenter/userguide/kppp-wizard.png share/doc/HTML/es/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/es/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/es/khelpcenter/userguide/migrator-dictionary.docbook -share/doc/HTML/es/khelpcenter/userguide/more-help.docbook share/doc/HTML/es/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/es/khelpcenter/userguide/networking-with-windows.docbook share/doc/HTML/es/khelpcenter/userguide/noatun-icon.png @@ -1223,15 +1193,12 @@ share/doc/HTML/es/khelpcenter/userguide/ripsettings.png share/doc/HTML/es/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/es/khelpcenter/userguide/services.png share/doc/HTML/es/khelpcenter/userguide/shared-sessions.docbook -share/doc/HTML/es/khelpcenter/userguide/shortcuts.docbook -share/doc/HTML/es/khelpcenter/userguide/staff.docbook share/doc/HTML/es/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/es/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/es/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/es/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/es/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/es/khelpcenter/userguide/troubleshooting-no-open.docbook -share/doc/HTML/es/khelpcenter/userguide/ug-faq.docbook share/doc/HTML/es/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/es/khelpcenter/userguide/usenet.docbook share/doc/HTML/es/khelpcenter/userguide/where-next.docbook @@ -1472,9 +1439,20 @@ share/doc/HTML/es/kmag/index.cache.bz2 share/doc/HTML/es/kmag/index.docbook share/doc/HTML/es/kmag/man-kmag.1.docbook share/doc/HTML/es/kmag/screenshot.png +share/doc/HTML/es/kmahjongg/background.png +share/doc/HTML/es/kmahjongg/boardeditor.png share/doc/HTML/es/kmahjongg/common +share/doc/HTML/es/kmahjongg/config.png +share/doc/HTML/es/kmahjongg/gamescreen.png +share/doc/HTML/es/kmahjongg/highscore.png share/doc/HTML/es/kmahjongg/index.cache.bz2 share/doc/HTML/es/kmahjongg/index.docbook +share/doc/HTML/es/kmahjongg/layout.png +share/doc/HTML/es/kmahjongg/numbered.png +share/doc/HTML/es/kmahjongg/shortcuts.png +share/doc/HTML/es/kmahjongg/showremoved.png +share/doc/HTML/es/kmahjongg/theme.png +share/doc/HTML/es/kmahjongg/tileset.png share/doc/HTML/es/kmail/common share/doc/HTML/es/kmail/configure.docbook share/doc/HTML/es/kmail/credits-and-licenses.docbook @@ -1486,20 +1464,8 @@ share/doc/HTML/es/kmail/index.docbook share/doc/HTML/es/kmail/intro.docbook share/doc/HTML/es/kmail/menus.docbook share/doc/HTML/es/kmail/using-kmail.docbook -share/doc/HTML/es/kmathtool/common -share/doc/HTML/es/kmathtool/index.cache.bz2 -share/doc/HTML/es/kmathtool/index.docbook share/doc/HTML/es/kmenuedit/common share/doc/HTML/es/kmenuedit/done.png -share/doc/HTML/es/kmenuedit/i_copy.png -share/doc/HTML/es/kmenuedit/i_cut.png -share/doc/HTML/es/kmenuedit/i_delete.png -share/doc/HTML/es/kmenuedit/i_k_button.png -share/doc/HTML/es/kmenuedit/i_new_item.png -share/doc/HTML/es/kmenuedit/i_new_submenu.png -share/doc/HTML/es/kmenuedit/i_paste.png -share/doc/HTML/es/kmenuedit/icon_sets.png -share/doc/HTML/es/kmenuedit/icons.png share/doc/HTML/es/kmenuedit/index.cache.bz2 share/doc/HTML/es/kmenuedit/index.docbook share/doc/HTML/es/kmenuedit/itemname.png @@ -1507,11 +1473,6 @@ share/doc/HTML/es/kmenuedit/kmenueditmain.png share/doc/HTML/es/kmenuedit/new.png share/doc/HTML/es/kmenuedit/selecticon.png share/doc/HTML/es/kmenuedit/selectinternet.png -share/doc/HTML/es/kmessedwords/common -share/doc/HTML/es/kmessedwords/index.cache.bz2 -share/doc/HTML/es/kmessedwords/index.docbook -share/doc/HTML/es/kmessedwords/kmw1.png -share/doc/HTML/es/kmessedwords/kmw2.png share/doc/HTML/es/kmid/common share/doc/HTML/es/kmid/index.cache.bz2 share/doc/HTML/es/kmid/index.docbook @@ -1549,8 +1510,6 @@ share/doc/HTML/es/kmouth/kmouthmain.png share/doc/HTML/es/kmouth/kmouthwizard.eps share/doc/HTML/es/kmouth/kmouthwizard.png share/doc/HTML/es/kmouth/man-kmouth.1.docbook -share/doc/HTML/es/kmplot/axesdlg.png -share/doc/HTML/es/kmplot/axesopt.png share/doc/HTML/es/kmplot/commands.docbook share/doc/HTML/es/kmplot/common share/doc/HTML/es/kmplot/configuration.docbook @@ -1559,8 +1518,6 @@ share/doc/HTML/es/kmplot/dcop.docbook share/doc/HTML/es/kmplot/developer.docbook share/doc/HTML/es/kmplot/edu-logo.png share/doc/HTML/es/kmplot/firststeps.docbook -share/doc/HTML/es/kmplot/functionsdlg.png -share/doc/HTML/es/kmplot/griddlg.png share/doc/HTML/es/kmplot/index.cache.bz2 share/doc/HTML/es/kmplot/index.docbook share/doc/HTML/es/kmplot/install.docbook @@ -1569,17 +1526,15 @@ share/doc/HTML/es/kmplot/kfkt.png share/doc/HTML/es/kmplot/ksys1.png share/doc/HTML/es/kmplot/ksys2.png share/doc/HTML/es/kmplot/ksys3.png -share/doc/HTML/es/kmplot/lo32-app-kmplot.png share/doc/HTML/es/kmplot/main.png share/doc/HTML/es/kmplot/man-kmplot.1.docbook share/doc/HTML/es/kmplot/menu.docbook -share/doc/HTML/es/kmplot/namesdlg.png share/doc/HTML/es/kmplot/reference.docbook -share/doc/HTML/es/kmplot/scaledlg.png +share/doc/HTML/es/kmplot/settings-colors.png +share/doc/HTML/es/kmplot/settings-fonts.png +share/doc/HTML/es/kmplot/settings-scaling.png share/doc/HTML/es/kmplot/settingsdlg.png -share/doc/HTML/es/kmplot/stepdlg.png share/doc/HTML/es/kmplot/threeplots.png -share/doc/HTML/es/kmplot/toolbar.png share/doc/HTML/es/kmplot/using.docbook share/doc/HTML/es/knetattach/common share/doc/HTML/es/knetattach/index.cache.bz2 @@ -1770,7 +1725,6 @@ share/doc/HTML/es/kompmgr/common share/doc/HTML/es/kompmgr/index.cache.bz2 share/doc/HTML/es/kompmgr/index.docbook share/doc/HTML/es/konq-plugins/babel/common -share/doc/HTML/es/konq-plugins/babel/cr16-action-babelfish.png share/doc/HTML/es/konq-plugins/babel/index.cache.bz2 share/doc/HTML/es/konq-plugins/babel/index.docbook share/doc/HTML/es/konq-plugins/common @@ -1827,14 +1781,10 @@ share/doc/HTML/es/konqueror/dirtree.png share/doc/HTML/es/konqueror/dragdrop.png share/doc/HTML/es/konqueror/faq.docbook share/doc/HTML/es/konqueror/filemanager.docbook -share/doc/HTML/es/konqueror/filetype1.png -share/doc/HTML/es/konqueror/filetype3.png -share/doc/HTML/es/konqueror/filetype4.png share/doc/HTML/es/konqueror/index.cache.bz2 share/doc/HTML/es/konqueror/index.docbook share/doc/HTML/es/konqueror/introduction.docbook share/doc/HTML/es/konqueror/konqorg.png -share/doc/HTML/es/konqueror/konqueror.png share/doc/HTML/es/konqueror/man-kbookmarkmerger.1.docbook share/doc/HTML/es/konqueror/parts.png share/doc/HTML/es/konqueror/path-complete.docbook @@ -1860,6 +1810,8 @@ share/doc/HTML/es/kontact/configuration-components.png share/doc/HTML/es/kontact/configuration-main.png share/doc/HTML/es/kontact/configuration-select-components.png share/doc/HTML/es/kontact/configuration-starting-component.png +share/doc/HTML/es/kontact/configuration-summary-view-kpilot.png +share/doc/HTML/es/kontact/configuration-summary-view.png share/doc/HTML/es/kontact/index.cache.bz2 share/doc/HTML/es/kontact/index.docbook share/doc/HTML/es/kontact/kaddressbook-sidebar-icon.png @@ -1877,7 +1829,6 @@ share/doc/HTML/es/kontact/summary-view-mail.png share/doc/HTML/es/kontact/summary-view-newsticker.png share/doc/HTML/es/kontact/summary-view-notes.png share/doc/HTML/es/kontact/summary-view-repositioning.png -share/doc/HTML/es/kontact/summary-view-special-dates.png share/doc/HTML/es/kontact/summary-view-todos.png share/doc/HTML/es/kontact/summary-view-weather.png share/doc/HTML/es/kontact/summary-view.png @@ -1899,16 +1850,54 @@ share/doc/HTML/es/kopete/index.cache.bz2 share/doc/HTML/es/kopete/index.docbook share/doc/HTML/es/kopete/menus.docbook share/doc/HTML/es/korganizer/common +share/doc/HTML/es/korganizer/event-attachments.png +share/doc/HTML/es/korganizer/event-attendees.png +share/doc/HTML/es/korganizer/event-freebusy.png +share/doc/HTML/es/korganizer/event-general.png +share/doc/HTML/es/korganizer/event-recurrence.png share/doc/HTML/es/korganizer/exchange-plugin.docbook share/doc/HTML/es/korganizer/group-scheduling.docbook +share/doc/HTML/es/korganizer/groupevent.png +share/doc/HTML/es/korganizer/i_actions_newevent.png +share/doc/HTML/es/korganizer/i_actions_newtodo.png +share/doc/HTML/es/korganizer/i_copy.png +share/doc/HTML/es/korganizer/i_cut.png +share/doc/HTML/es/korganizer/i_edit_delete.png +share/doc/HTML/es/korganizer/i_edit_find.png +share/doc/HTML/es/korganizer/i_edit_redo.png +share/doc/HTML/es/korganizer/i_edit_undo.png +share/doc/HTML/es/korganizer/i_file_close.png +share/doc/HTML/es/korganizer/i_file_new.png +share/doc/HTML/es/korganizer/i_file_open.png +share/doc/HTML/es/korganizer/i_file_print.png +share/doc/HTML/es/korganizer/i_file_quit.png +share/doc/HTML/es/korganizer/i_file_revert.png +share/doc/HTML/es/korganizer/i_file_save.png +share/doc/HTML/es/korganizer/i_file_saveas.png +share/doc/HTML/es/korganizer/i_go_backward.png +share/doc/HTML/es/korganizer/i_go_forward.png +share/doc/HTML/es/korganizer/i_go_to_today.png +share/doc/HTML/es/korganizer/i_paste.png +share/doc/HTML/es/korganizer/i_settings_prefs.png share/doc/HTML/es/korganizer/i_view_day.png share/doc/HTML/es/korganizer/i_view_journal.png share/doc/HTML/es/korganizer/i_view_list.png +share/doc/HTML/es/korganizer/i_view_month.png share/doc/HTML/es/korganizer/i_view_todo_list.png share/doc/HTML/es/korganizer/i_view_week.png +share/doc/HTML/es/korganizer/i_view_whatsnext.png +share/doc/HTML/es/korganizer/i_view_work_week.png +share/doc/HTML/es/korganizer/i_view_xdays.png share/doc/HTML/es/korganizer/index.cache.bz2 share/doc/HTML/es/korganizer/index.docbook share/doc/HTML/es/korganizer/korganizer-resource.png +share/doc/HTML/es/korganizer/o2v_importing1.png +share/doc/HTML/es/korganizer/o2v_importing2.png +share/doc/HTML/es/korganizer/o2v_importing3.png +share/doc/HTML/es/korganizer/o2v_main.png +share/doc/HTML/es/korganizer/o2v_progress.png +share/doc/HTML/es/korganizer/o2v_save.png +share/doc/HTML/es/korganizer/o2v_warning.png share/doc/HTML/es/korganizer/organizer.png share/doc/HTML/es/korganizer/outlook-to-vcalendar.docbook share/doc/HTML/es/korganizer/plugins-chapter.docbook @@ -2098,30 +2087,21 @@ share/doc/HTML/es/kppp/kppp-wizard.png share/doc/HTML/es/kppp/security.docbook share/doc/HTML/es/kppp/tricks.docbook share/doc/HTML/es/kppp/wizard.docbook -share/doc/HTML/es/krcd/authentication.eps -share/doc/HTML/es/krcd/authentication.png -share/doc/HTML/es/krcd/close.png -share/doc/HTML/es/krcd/krdc_window.eps -share/doc/HTML/es/krcd/krdc_window.png -share/doc/HTML/es/krcd/preferences_profilestab.eps -share/doc/HTML/es/krcd/preferences_profilestab.png -share/doc/HTML/es/krcd/preferences_rdpdefaultstab.eps -share/doc/HTML/es/krcd/preferences_rdpdefaultstab.png -share/doc/HTML/es/krcd/preferences_vncdefaultstab.eps -share/doc/HTML/es/krcd/preferences_vncdefaultstab.png -share/doc/HTML/es/krcd/snapshot.eps -share/doc/HTML/es/krcd/snapshot.png -share/doc/HTML/es/krcd/snapshot_connectionspeed.eps -share/doc/HTML/es/krcd/snapshot_connectionspeed.png -share/doc/HTML/es/krcd/snapshot_nobrowse.eps -share/doc/HTML/es/krcd/snapshot_nobrowse.png -share/doc/HTML/es/krcd/snapshot_vncentry.eps -share/doc/HTML/es/krcd/snapshot_vncentry.png -share/doc/HTML/es/krcd/window_fullscreen.png -share/doc/HTML/es/krcd/window_nofullscreen.png +share/doc/HTML/es/krdc/authentication.png +share/doc/HTML/es/krdc/close.png share/doc/HTML/es/krdc/common share/doc/HTML/es/krdc/index.cache.bz2 share/doc/HTML/es/krdc/index.docbook +share/doc/HTML/es/krdc/krdc_window.png +share/doc/HTML/es/krdc/preferences_profilestab.png +share/doc/HTML/es/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/es/krdc/preferences_vncdefaultstab.png +share/doc/HTML/es/krdc/snapshot.png +share/doc/HTML/es/krdc/snapshot_connectionspeed.png +share/doc/HTML/es/krdc/snapshot_nobrowse.png +share/doc/HTML/es/krdc/snapshot_vncentry.png +share/doc/HTML/es/krdc/window_fullscreen.png +share/doc/HTML/es/krdc/window_nofullscreen.png share/doc/HTML/es/krec/common share/doc/HTML/es/krec/index.cache.bz2 share/doc/HTML/es/krec/index.docbook @@ -2154,7 +2134,6 @@ share/doc/HTML/es/kscd/common share/doc/HTML/es/kscd/index.cache.bz2 share/doc/HTML/es/kscd/index.docbook share/doc/HTML/es/kscd/kscd.png -share/doc/HTML/es/kscd/kscd1.png share/doc/HTML/es/kscd/kscd11.png share/doc/HTML/es/kscd/kscd12.png share/doc/HTML/es/kscd/kscd13.png @@ -2373,15 +2352,22 @@ share/doc/HTML/es/ktuberling/menu-game.png share/doc/HTML/es/ktuberling/menu-help.png share/doc/HTML/es/ktuberling/menu-playground.png share/doc/HTML/es/ktuberling/menu-raw.png +share/doc/HTML/es/ktuberling/menu-settings.png share/doc/HTML/es/ktuberling/menu-speech.png share/doc/HTML/es/ktuberling/technical-reference.docbook share/doc/HTML/es/ktuberling/toolbar.png +share/doc/HTML/es/kturtle/common share/doc/HTML/es/kturtle/forward.png share/doc/HTML/es/kturtle/getting-started.docbook +share/doc/HTML/es/kturtle/glossary.docbook +share/doc/HTML/es/kturtle/index.cache.bz2 +share/doc/HTML/es/kturtle/index.docbook share/doc/HTML/es/kturtle/mainwindow.png share/doc/HTML/es/kturtle/mainwindow_flower_nrs.png share/doc/HTML/es/kturtle/print.png +share/doc/HTML/es/kturtle/programming-reference.docbook share/doc/HTML/es/kturtle/translator-guide.docbook +share/doc/HTML/es/kturtle/using-kturtle.docbook share/doc/HTML/es/kturtle/wrapping.png share/doc/HTML/es/kuickshow/common share/doc/HTML/es/kuickshow/index.cache.bz2 @@ -2403,7 +2389,6 @@ share/doc/HTML/es/kverbos/index.cache.bz2 share/doc/HTML/es/kverbos/index.docbook share/doc/HTML/es/kverbos/input.png share/doc/HTML/es/kverbos/letters.png -share/doc/HTML/es/kverbos/lettres.png share/doc/HTML/es/kverbos/limpiar.png share/doc/HTML/es/kverbos/limpiarpagina.png share/doc/HTML/es/kverbos/mainscreen-leer.png @@ -2422,15 +2407,6 @@ share/doc/HTML/es/kview/index.cache.bz2 share/doc/HTML/es/kview/index.docbook share/doc/HTML/es/kview/kview-application-configuration.png share/doc/HTML/es/kview/kview-viewer-configuration.png -share/doc/HTML/es/kview/snapshot1.png -share/doc/HTML/es/kview/snapshot2.png -share/doc/HTML/es/kview/snapshot3.png -share/doc/HTML/es/kview/snapshot4.png -share/doc/HTML/es/kview/snapshot5.png -share/doc/HTML/es/kview/snapshot6.png -share/doc/HTML/es/kview/snapshot7.png -share/doc/HTML/es/kview/snapshot8.png -share/doc/HTML/es/kview/snapshot9.png share/doc/HTML/es/kvoctrain/art-query-dlg.png share/doc/HTML/es/kvoctrain/common share/doc/HTML/es/kvoctrain/comp-query-dlg.png @@ -2491,6 +2467,7 @@ 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/kwq-dlg-characters.png +share/doc/HTML/es/kwordquiz/kwq-dlg-configure-appearance.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-characters.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-editor.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-quiz.png @@ -2543,7 +2520,6 @@ share/doc/HTML/es/kxsldbg/credits.docbook share/doc/HTML/es/kxsldbg/entities.docbook share/doc/HTML/es/kxsldbg/entities_window.png share/doc/HTML/es/kxsldbg/exit.png -share/doc/HTML/es/kxsldbg/globals_window.png share/doc/HTML/es/kxsldbg/glossary.docbook share/doc/HTML/es/kxsldbg/index.cache.bz2 share/doc/HTML/es/kxsldbg/index.docbook @@ -2582,9 +2558,6 @@ share/doc/HTML/es/lisa/index.docbook share/doc/HTML/es/lskat/common share/doc/HTML/es/lskat/index.cache.bz2 share/doc/HTML/es/lskat/index.docbook -share/doc/HTML/es/megami/common -share/doc/HTML/es/megami/index.cache.bz2 -share/doc/HTML/es/megami/index.docbook share/doc/HTML/es/multisynk/common share/doc/HTML/es/multisynk/editdialog-conflicts.png share/doc/HTML/es/multisynk/editdialog.png @@ -2659,7 +2632,6 @@ share/doc/HTML/es/quanta/ttab.png share/doc/HTML/es/quanta/using-quanta.docbook share/doc/HTML/es/quanta/view_sidetree.png share/doc/HTML/es/quanta/vplsourceview.png -share/doc/HTML/es/quanta/vpsourceview.png share/doc/HTML/es/quanta/working-with-quanta.docbook share/doc/HTML/es/scripts/man-adddebug.1.docbook share/doc/HTML/es/scripts/man-cheatmake.1.docbook @@ -3294,7 +3266,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/quanta @dirrm share/doc/HTML/es/noatun @dirrm share/doc/HTML/es/multisynk -@dirrm share/doc/HTML/es/megami @dirrm share/doc/HTML/es/lskat @dirrm share/doc/HTML/es/lisa @dirrm share/doc/HTML/es/lilo-config @@ -3345,7 +3316,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kreversi @dirrm share/doc/HTML/es/krec @dirrm share/doc/HTML/es/krdc -@dirrm share/doc/HTML/es/krcd @dirrm share/doc/HTML/es/kppp @dirrm share/doc/HTML/es/kpovmodeler @dirrm share/doc/HTML/es/kpoker @@ -3398,9 +3368,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kmix @dirrm share/doc/HTML/es/kmines @dirrm share/doc/HTML/es/kmid -@dirrm share/doc/HTML/es/kmessedwords @dirrm share/doc/HTML/es/kmenuedit -@dirrm share/doc/HTML/es/kmathtool @dirrm share/doc/HTML/es/kmail @dirrm share/doc/HTML/es/kmahjongg @dirrm share/doc/HTML/es/kmag @@ -3465,6 +3433,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kdict @dirrm share/doc/HTML/es/kdf @dirrm share/doc/HTML/es/kdevelop +@dirrm share/doc/HTML/es/kdesvn-build @dirrm share/doc/HTML/es/kdesu @dirrm share/doc/HTML/es/kdeprint @dirrm share/doc/HTML/es/kdelirc/kcmlirc @@ -3493,10 +3462,8 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/laptop @dirrm share/doc/HTML/es/kcontrol/language @dirrm share/doc/HTML/es/kcontrol/lanbrowser -@dirrm share/doc/HTML/es/kcontrol/kxmlrpcd @dirrm share/doc/HTML/es/kcontrol/kwindecoration @dirrm share/doc/HTML/es/kcontrol/kthememgr -@dirrm share/doc/HTML/es/kcontrol/kmixcfg @dirrm share/doc/HTML/es/kcontrol/khtml @dirrm share/doc/HTML/es/kcontrol/keys @dirrm share/doc/HTML/es/kcontrol/keyboard @@ -3513,7 +3480,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/kcmfontinst @dirrm share/doc/HTML/es/kcontrol/kcmcss @dirrm share/doc/HTML/es/kcontrol/kcmaccess -@dirrm share/doc/HTML/es/kcontrol/kalarmd @dirrm share/doc/HTML/es/kcontrol/icons @dirrm share/doc/HTML/es/kcontrol/helpindex @dirrm share/doc/HTML/es/kcontrol/fonts @@ -3560,7 +3526,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kaddressbook @dirrm share/doc/HTML/es/kaboodle @dirrm share/doc/HTML/es/juk -@dirrm share/doc/HTML/es/flashkard @dirrm share/doc/HTML/es/docs/common @dirrm share/doc/HTML/es/docs @dirrm share/doc/HTML/es/cervisia @@ -3571,7 +3536,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/ark @dirrm share/doc/HTML/es/api @dirrm share/doc/HTML/es/amor -@dirrm share/doc/HTML/es/aktion @dirrm share/doc/HTML/es/akregator @dirrm share/doc/HTML/es/KRegExpEditor @dirrm share/apps/kturtle/examples/es diff --git a/misc/kde3-i18n-et/distinfo b/misc/kde3-i18n-et/distinfo index 604735784e5c..6f4e4d9a8163 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.3.tar.bz2) = e6b667f07e4426c2bdb1cda59b081272 -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.3.tar.bz2) = 22256dba33271ac6e11a2284e8dede563d9d3693032cb94964607ed1bb6da3f0 -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.3.tar.bz2) = 10458710 +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 diff --git a/misc/kde3-i18n-et/pkg-plist b/misc/kde3-i18n-et/pkg-plist index 3f8967f8babf..47d93e462dcb 100644 --- a/misc/kde3-i18n-et/pkg-plist +++ b/misc/kde3-i18n-et/pkg-plist @@ -1,3 +1,17 @@ +share/apps/kanagram/data/et/arvutid.kvtml +share/apps/kanagram/data/et/elukutsed.kvtml +share/apps/kanagram/data/et/esemed.kvtml +share/apps/kanagram/data/et/inimesed.kvtml +share/apps/kanagram/data/et/juurviljad.kvtml +share/apps/kanagram/data/et/kosmos.kvtml +share/apps/kanagram/data/et/leiutused.kvtml +share/apps/kanagram/data/et/loomad.kvtml +share/apps/kanagram/data/et/pealinnad.kvtml +share/apps/kanagram/data/et/puuviljad.kvtml +share/apps/kanagram/data/et/raha.kvtml +share/apps/kanagram/data/et/riided.kvtml +share/apps/kanagram/data/et/sport.kvtml +share/apps/kanagram/data/et/transport.kvtml share/apps/khangman/data/et/animals.kvtml share/apps/khangman/data/et/easy.kvtml share/apps/khangman/data/et/hard.kvtml @@ -608,6 +622,9 @@ share/doc/HTML/et/kig/man-kig.1.docbook share/doc/HTML/et/kinfocenter/blockdevices/common share/doc/HTML/et/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/et/kinfocenter/blockdevices/index.docbook +share/doc/HTML/et/kinfocenter/cdinfo/common +share/doc/HTML/et/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/et/kinfocenter/cdinfo/index.docbook share/doc/HTML/et/kinfocenter/common share/doc/HTML/et/kinfocenter/devices/common share/doc/HTML/et/kinfocenter/devices/index.cache.bz2 @@ -2042,6 +2059,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kinfocenter/interrupts @dirrm share/doc/HTML/et/kinfocenter/dma @dirrm share/doc/HTML/et/kinfocenter/devices +@dirrm share/doc/HTML/et/kinfocenter/cdinfo @dirrm share/doc/HTML/et/kinfocenter/blockdevices @dirrm share/doc/HTML/et/kinfocenter @dirrm share/doc/HTML/et/kig @@ -2182,3 +2200,6 @@ share/locale/et/flag.png @dirrm share/apps/khangman/data/et @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/et +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/misc/kde3-i18n-eu/distinfo b/misc/kde3-i18n-eu/distinfo index cc6ca6041674..876e9610b769 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.3.tar.bz2) = 40ec15d8157ff996d3b721f267be57a3 -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.3.tar.bz2) = c8dfe61a784e53c312c40b21751c91f1476afd007e04fb224fa644449bcc22ff -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.3.tar.bz2) = 2225592 +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 diff --git a/misc/kde3-i18n-fa/distinfo b/misc/kde3-i18n-fa/distinfo index b259a458cc61..e7db44b6e9a6 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.3.tar.bz2) = eab7859668e1942b52e86aa8a895bdb2 -SHA256 (KDE/kde-i18n/kde-i18n-fa-3.5.3.tar.bz2) = c522164d7242222af19096676407bac4f0eedf2e86f5cfa3a227d4b732cfda0a -SIZE (KDE/kde-i18n/kde-i18n-fa-3.5.3.tar.bz2) = 572045 +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 diff --git a/misc/kde3-i18n-fa/pkg-plist b/misc/kde3-i18n-fa/pkg-plist index b6058d19ef27..cf801c0de672 100644 --- a/misc/kde3-i18n-fa/pkg-plist +++ b/misc/kde3-i18n-fa/pkg-plist @@ -10,7 +10,6 @@ share/locale/fa/LC_MESSAGES/filetypes.mo share/locale/fa/LC_MESSAGES/htmlsearch.mo share/locale/fa/LC_MESSAGES/kabc_dir.mo share/locale/fa/LC_MESSAGES/kabc_file.mo -share/locale/fa/LC_MESSAGES/kabc_ldap.mo share/locale/fa/LC_MESSAGES/kabc_ldapkio.mo share/locale/fa/LC_MESSAGES/kabc_net.mo share/locale/fa/LC_MESSAGES/kabc_sql.mo diff --git a/misc/kde3-i18n-fi/distinfo b/misc/kde3-i18n-fi/distinfo index 549a378c35db..7c4180b8cb4f 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.3.tar.bz2) = def712679b92b831b04ae704157f0c4f -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.3.tar.bz2) = 7b615a4a09929490d64bec445315133faaf00e6c8dce137cae8398a7341df771 -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.3.tar.bz2) = 2296420 +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 diff --git a/misc/kde3-i18n-fi/pkg-plist b/misc/kde3-i18n-fi/pkg-plist index e845d7512939..71873dbd4f5e 100644 --- a/misc/kde3-i18n-fi/pkg-plist +++ b/misc/kde3-i18n-fi/pkg-plist @@ -164,6 +164,7 @@ share/locale/fi/LC_MESSAGES/kcmlaptop.mo share/locale/fi/LC_MESSAGES/kcmlaunch.mo share/locale/fi/LC_MESSAGES/kcmlayout.mo share/locale/fi/LC_MESSAGES/kcmlilo.mo +share/locale/fi/LC_MESSAGES/kcmlirc.mo share/locale/fi/LC_MESSAGES/kcmlocale.mo share/locale/fi/LC_MESSAGES/kcmmedia.mo share/locale/fi/LC_MESSAGES/kcmnic.mo @@ -351,7 +352,6 @@ share/locale/fi/LC_MESSAGES/kmathapplet.mo share/locale/fi/LC_MESSAGES/kmcop.mo share/locale/fi/LC_MESSAGES/kmenuapplet.mo share/locale/fi/LC_MESSAGES/kmenuedit.mo -share/locale/fi/LC_MESSAGES/kmessedwords.mo share/locale/fi/LC_MESSAGES/kmid.mo share/locale/fi/LC_MESSAGES/kmilo_delli8k.mo share/locale/fi/LC_MESSAGES/kmilo_generic.mo diff --git a/misc/kde3-i18n-fy/distinfo b/misc/kde3-i18n-fy/distinfo index 59bc7d1b9d21..7fdacf9d70a7 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.3.tar.bz2) = c64d0ff6d11d4b9780416bb3375fd683 -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.3.tar.bz2) = b767519a3616fb0c16f8a44a876b5d6dde7e86e5120ffae39a47633bba0cb7c8 -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.3.tar.bz2) = 685849 +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 diff --git a/misc/kde3-i18n-ga/distinfo b/misc/kde3-i18n-ga/distinfo index 82012e09b798..0adccda2edf2 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.3.tar.bz2) = 9ce1ab7cda3534c1d5546027d29f2aff -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.3.tar.bz2) = e597dadff739ce9de278742da3407d5e1066b3c6a20731d57b9cd90c8ffadaf5 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.3.tar.bz2) = 1676303 +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 diff --git a/misc/kde3-i18n-gl/distinfo b/misc/kde3-i18n-gl/distinfo index 6f597c3d58db..c98aa1646529 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.3.tar.bz2) = 87707646baf5c36bda8f14dc68e3e3bc -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.3.tar.bz2) = a4010bfae6ead1ca3cd12bf104140a0e97e3b0baae398c494053fa86eddcead9 -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.3.tar.bz2) = 1340388 +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 diff --git a/misc/kde3-i18n-gl/pkg-plist b/misc/kde3-i18n-gl/pkg-plist index 72d6a29d47a3..4a2c8a85dfcc 100644 --- a/misc/kde3-i18n-gl/pkg-plist +++ b/misc/kde3-i18n-gl/pkg-plist @@ -224,7 +224,6 @@ share/locale/gl/LC_MESSAGES/kmail.mo share/locale/gl/LC_MESSAGES/kmcop.mo share/locale/gl/LC_MESSAGES/kmenuapplet.mo share/locale/gl/LC_MESSAGES/kmenuedit.mo -share/locale/gl/LC_MESSAGES/kmessedwords.mo share/locale/gl/LC_MESSAGES/kmid.mo share/locale/gl/LC_MESSAGES/kmines.mo share/locale/gl/LC_MESSAGES/kminipagerapplet.mo diff --git a/misc/kde3-i18n-hi/distinfo b/misc/kde3-i18n-hi/distinfo index 79c1793ecce4..0a0dc8fcad38 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.3.tar.bz2) = cde643d8b8760d092a16b475fdef3e89 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.3.tar.bz2) = 1bf436d03f5b988c0d0cf0a4f79bfd828f9fa9557e37e07a2d7b63bccf34eb36 -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.3.tar.bz2) = 1650371 +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 diff --git a/misc/kde3-i18n-hi/pkg-plist b/misc/kde3-i18n-hi/pkg-plist index 415b1446a56d..96cc998e80e0 100644 --- a/misc/kde3-i18n-hi/pkg-plist +++ b/misc/kde3-i18n-hi/pkg-plist @@ -288,7 +288,6 @@ share/locale/hi/LC_MESSAGES/kmathapplet.mo share/locale/hi/LC_MESSAGES/kmcop.mo share/locale/hi/LC_MESSAGES/kmenuapplet.mo share/locale/hi/LC_MESSAGES/kmenuedit.mo -share/locale/hi/LC_MESSAGES/kmessedwords.mo share/locale/hi/LC_MESSAGES/kmid.mo share/locale/hi/LC_MESSAGES/kmines.mo share/locale/hi/LC_MESSAGES/kminipagerapplet.mo @@ -421,7 +420,6 @@ share/locale/hi/LC_MESSAGES/libKTTSD.mo share/locale/hi/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/hi/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/hi/LC_MESSAGES/libkcal.mo -share/locale/hi/LC_MESSAGES/libkcalsystem.mo share/locale/hi/LC_MESSAGES/libkcddb.mo share/locale/hi/LC_MESSAGES/libkdegames.mo share/locale/hi/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde3-i18n-hr/distinfo b/misc/kde3-i18n-hr/distinfo index 29f7ecfd9246..6eaca1c602e5 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.3.tar.bz2) = 2b4cbd764d2eb21a244f56b2af63eef4 -SHA256 (KDE/kde-i18n/kde-i18n-hr-3.5.3.tar.bz2) = 10c531fefd72175653a931c82bfa43e1a1302a51ca01e87c4ff294481d0465aa -SIZE (KDE/kde-i18n/kde-i18n-hr-3.5.3.tar.bz2) = 1684241 +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 diff --git a/misc/kde3-i18n-hr/pkg-plist b/misc/kde3-i18n-hr/pkg-plist index 03c86552d33b..0aa3962fb944 100644 --- a/misc/kde3-i18n-hr/pkg-plist +++ b/misc/kde3-i18n-hr/pkg-plist @@ -258,7 +258,6 @@ share/locale/hr/LC_MESSAGES/kmailcvt.mo share/locale/hr/LC_MESSAGES/kmcop.mo share/locale/hr/LC_MESSAGES/kmenuapplet.mo share/locale/hr/LC_MESSAGES/kmenuedit.mo -share/locale/hr/LC_MESSAGES/kmessedwords.mo share/locale/hr/LC_MESSAGES/kmid.mo share/locale/hr/LC_MESSAGES/kmines.mo share/locale/hr/LC_MESSAGES/kminipagerapplet.mo @@ -365,7 +364,6 @@ 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/libkcal.mo -share/locale/hr/LC_MESSAGES/libkcalsystem.mo share/locale/hr/LC_MESSAGES/libkdegames.mo share/locale/hr/LC_MESSAGES/libkdepim.mo share/locale/hr/LC_MESSAGES/libkicker.mo diff --git a/misc/kde3-i18n-is/distinfo b/misc/kde3-i18n-is/distinfo index 52b2c671e589..e861df656248 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.3.tar.bz2) = ecfd4dcb121a15fc69af80354d48d0f1 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = ef847f5d9764aabc0c7822e46a0ae11fe190e283cafc25e50f1a763227e08ccb -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = 2088209 +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 diff --git a/misc/kde3-i18n-is/pkg-plist b/misc/kde3-i18n-is/pkg-plist index f7b85523583c..2915f1a33821 100644 --- a/misc/kde3-i18n-is/pkg-plist +++ b/misc/kde3-i18n-is/pkg-plist @@ -331,7 +331,6 @@ share/locale/is/LC_MESSAGES/kmathapplet.mo share/locale/is/LC_MESSAGES/kmcop.mo share/locale/is/LC_MESSAGES/kmenuapplet.mo share/locale/is/LC_MESSAGES/kmenuedit.mo -share/locale/is/LC_MESSAGES/kmessedwords.mo share/locale/is/LC_MESSAGES/kmid.mo share/locale/is/LC_MESSAGES/kmilo_delli8k.mo share/locale/is/LC_MESSAGES/kmilo_generic.mo @@ -497,7 +496,6 @@ share/locale/is/LC_MESSAGES/libdmctl.mo share/locale/is/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/is/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/is/LC_MESSAGES/libkcal.mo -share/locale/is/LC_MESSAGES/libkcalsystem.mo share/locale/is/LC_MESSAGES/libkcddb.mo share/locale/is/LC_MESSAGES/libkdeedu.mo share/locale/is/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-it/distinfo b/misc/kde3-i18n-it/distinfo index f52272f86298..5a5b4dc9c4c2 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.3.tar.bz2) = ad8e550f7a2656fa6c5210881fd09bc7 -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.3.tar.bz2) = 1ec119e79e3a96aa359b38aa005bc4b1986ddb990be182bd9a3221cac613750b -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.3.tar.bz2) = 15451773 +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 diff --git a/misc/kde3-i18n-it/pkg-plist b/misc/kde3-i18n-it/pkg-plist index 83a0c79136e1..ae75cdb7bd0e 100644 --- a/misc/kde3-i18n-it/pkg-plist +++ b/misc/kde3-i18n-it/pkg-plist @@ -701,6 +701,7 @@ share/doc/HTML/it/khelpcenter/userguide/getting-started.docbook share/doc/HTML/it/khelpcenter/userguide/glossary.docbook 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-edutainment.docbook share/doc/HTML/it/khelpcenter/userguide/kdeadmin-apps.docbook @@ -715,6 +716,7 @@ share/doc/HTML/it/khelpcenter/userguide/kdetoys-apps.docbook share/doc/HTML/it/khelpcenter/userguide/kdeutils-apps.docbook share/doc/HTML/it/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/it/khelpcenter/userguide/konsole-intro.docbook +share/doc/HTML/it/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/it/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/it/khelpcenter/userguide/more-help.docbook share/doc/HTML/it/khelpcenter/userguide/net-connection-setup.docbook @@ -729,6 +731,7 @@ share/doc/HTML/it/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/it/khelpcenter/userguide/shared-sessions.docbook 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/troubleshooting-network-x.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-no-open.docbook @@ -750,6 +753,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-kicker.1.docbook share/doc/HTML/it/kiconedit/common share/doc/HTML/it/kiconedit/index.cache.bz2 share/doc/HTML/it/kiconedit/index.docbook @@ -1178,8 +1182,12 @@ share/doc/HTML/it/kreversi/common share/doc/HTML/it/kreversi/index.cache.bz2 share/doc/HTML/it/kreversi/index.docbook share/doc/HTML/it/krfb/common +share/doc/HTML/it/krfb/email_invitation.png share/doc/HTML/it/krfb/index.cache.bz2 share/doc/HTML/it/krfb/index.docbook +share/doc/HTML/it/krfb/invitation_management.png +share/doc/HTML/it/krfb/personal_invitation.png +share/doc/HTML/it/krfb/screenshot.png share/doc/HTML/it/kruler/common share/doc/HTML/it/kruler/index.cache.bz2 share/doc/HTML/it/kruler/index.docbook @@ -1473,16 +1481,22 @@ share/doc/HTML/it/noatun/common share/doc/HTML/it/noatun/index.cache.bz2 share/doc/HTML/it/noatun/index.docbook share/doc/HTML/it/quanta/adv-quanta.docbook +share/doc/HTML/it/quanta/common share/doc/HTML/it/quanta/config-quanta.docbook share/doc/HTML/it/quanta/credits-license.docbook share/doc/HTML/it/quanta/debugging-quanta.docbook +share/doc/HTML/it/quanta/extending-quanta.docbook share/doc/HTML/it/quanta/fundamentals.docbook share/doc/HTML/it/quanta/glossary.docbook +share/doc/HTML/it/quanta/index.cache.bz2 +share/doc/HTML/it/quanta/index.docbook share/doc/HTML/it/quanta/installation.docbook share/doc/HTML/it/quanta/introduction.docbook share/doc/HTML/it/quanta/man-quanta.1.docbook share/doc/HTML/it/quanta/q-and-a.docbook share/doc/HTML/it/quanta/quanta-menus.docbook +share/doc/HTML/it/quanta/quanta-projects.docbook +share/doc/HTML/it/quanta/working-with-quanta.docbook share/doc/HTML/it/scripts/man-adddebug.1.docbook share/doc/HTML/it/scripts/man-cheatmake.1.docbook share/doc/HTML/it/scripts/man-create_cvsignore.1.docbook diff --git a/misc/kde3-i18n-kk/distinfo b/misc/kde3-i18n-kk/distinfo index 88ff997ec012..d53df3f40317 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.3.tar.bz2) = cbe63992bef052dfb39675edfd096ef6 -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.3.tar.bz2) = d5f272bb9a9aefacba49e8e223c2caef22e7ab8d3322bcaf6f0ce1321831132a -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.3.tar.bz2) = 709562 +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 diff --git a/misc/kde3-i18n-kk/pkg-plist b/misc/kde3-i18n-kk/pkg-plist index 62f92fce21d0..53e6b84253aa 100644 --- a/misc/kde3-i18n-kk/pkg-plist +++ b/misc/kde3-i18n-kk/pkg-plist @@ -1,13 +1,30 @@ +share/locale/kk/LC_MESSAGES/akregator_konqplugin.mo +share/locale/kk/LC_MESSAGES/alsaplayerui.mo share/locale/kk/LC_MESSAGES/appletproxy.mo share/locale/kk/LC_MESSAGES/ark.mo +share/locale/kk/LC_MESSAGES/ark_plugin.mo +share/locale/kk/LC_MESSAGES/atlantikdesigner.mo +share/locale/kk/LC_MESSAGES/audiorename_plugin.mo +share/locale/kk/LC_MESSAGES/autorefresh.mo +share/locale/kk/LC_MESSAGES/babelfish.mo +share/locale/kk/LC_MESSAGES/charlatanui.mo share/locale/kk/LC_MESSAGES/clockapplet.mo +share/locale/kk/LC_MESSAGES/crashesplugin.mo share/locale/kk/LC_MESSAGES/cupsdconf.mo +share/locale/kk/LC_MESSAGES/dcoprss.mo +share/locale/kk/LC_MESSAGES/dirfilterplugin.mo share/locale/kk/LC_MESSAGES/display.mo share/locale/kk/LC_MESSAGES/dockbarextension.mo +share/locale/kk/LC_MESSAGES/domtreeviewer.mo share/locale/kk/LC_MESSAGES/drkonqi.mo +share/locale/kk/LC_MESSAGES/dub.mo share/locale/kk/LC_MESSAGES/extensionproxy.mo +share/locale/kk/LC_MESSAGES/ffrs.mo share/locale/kk/LC_MESSAGES/filetypes.mo +share/locale/kk/LC_MESSAGES/fsview.mo share/locale/kk/LC_MESSAGES/htmlsearch.mo +share/locale/kk/LC_MESSAGES/imagerename_plugin.mo +share/locale/kk/LC_MESSAGES/imgalleryplugin.mo share/locale/kk/LC_MESSAGES/irkick.mo share/locale/kk/LC_MESSAGES/joystick.mo share/locale/kk/LC_MESSAGES/kabc_dir.mo @@ -20,11 +37,30 @@ share/locale/kk/LC_MESSAGES/kaccess.mo share/locale/kk/LC_MESSAGES/kappfinder.mo share/locale/kk/LC_MESSAGES/kasbarextension.mo share/locale/kk/LC_MESSAGES/kate.mo +share/locale/kk/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/kk/LC_MESSAGES/katefiletemplates.mo +share/locale/kk/LC_MESSAGES/katefll_initplugin.mo +share/locale/kk/LC_MESSAGES/katefll_plugin.mo +share/locale/kk/LC_MESSAGES/katehelloworld.mo +share/locale/kk/LC_MESSAGES/katehtmltools.mo +share/locale/kk/LC_MESSAGES/kateinsertcommand.mo +share/locale/kk/LC_MESSAGES/katekjswrapper.mo +share/locale/kk/LC_MESSAGES/katemake.mo +share/locale/kk/LC_MESSAGES/katemodeline.mo +share/locale/kk/LC_MESSAGES/kateopenheader.mo share/locale/kk/LC_MESSAGES/katepart.mo +share/locale/kk/LC_MESSAGES/katepybrowse.mo +share/locale/kk/LC_MESSAGES/katesnippets.mo +share/locale/kk/LC_MESSAGES/katetabbarextension.mo +share/locale/kk/LC_MESSAGES/katetextfilter.mo +share/locale/kk/LC_MESSAGES/katexmlcheck.mo +share/locale/kk/LC_MESSAGES/katexmltools.mo share/locale/kk/LC_MESSAGES/kay.mo +share/locale/kk/LC_MESSAGES/kbinaryclock.mo share/locale/kk/LC_MESSAGES/kcalc.mo share/locale/kk/LC_MESSAGES/kcharselect.mo share/locale/kk/LC_MESSAGES/kcharselectapplet.mo +share/locale/kk/LC_MESSAGES/kcm_krfb.mo share/locale/kk/LC_MESSAGES/kcmaccess.mo share/locale/kk/LC_MESSAGES/kcmaccessibility.mo share/locale/kk/LC_MESSAGES/kcmarts.mo @@ -51,12 +87,15 @@ share/locale/kk/LC_MESSAGES/kcmkio.mo share/locale/kk/LC_MESSAGES/kcmkonq.mo share/locale/kk/LC_MESSAGES/kcmkonqhtml.mo share/locale/kk/LC_MESSAGES/kcmkonsole.mo +share/locale/kk/LC_MESSAGES/kcmktalkd.mo +share/locale/kk/LC_MESSAGES/kcmkuick.mo share/locale/kk/LC_MESSAGES/kcmkurifilt.mo share/locale/kk/LC_MESSAGES/kcmkvaio.mo share/locale/kk/LC_MESSAGES/kcmkwallet.mo share/locale/kk/LC_MESSAGES/kcmkwindecoration.mo share/locale/kk/LC_MESSAGES/kcmkwinrules.mo share/locale/kk/LC_MESSAGES/kcmkwm.mo +share/locale/kk/LC_MESSAGES/kcmlanbrowser.mo share/locale/kk/LC_MESSAGES/kcmlaptop.mo share/locale/kk/LC_MESSAGES/kcmlaunch.mo share/locale/kk/LC_MESSAGES/kcmlayout.mo @@ -79,6 +118,7 @@ share/locale/kk/LC_MESSAGES/kcmtaskbar.mo share/locale/kk/LC_MESSAGES/kcmthinkpad.mo share/locale/kk/LC_MESSAGES/kcmusb.mo share/locale/kk/LC_MESSAGES/kcmview1394.mo +share/locale/kk/LC_MESSAGES/kcmwifi.mo share/locale/kk/LC_MESSAGES/kcmxinerama.mo share/locale/kk/LC_MESSAGES/kcontrol.mo share/locale/kk/LC_MESSAGES/kcron.mo @@ -98,11 +138,20 @@ 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/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo share/locale/kk/LC_MESSAGES/kedit.mo +share/locale/kk/LC_MESSAGES/kfile_cert.mo share/locale/kk/LC_MESSAGES/kfile_deb.mo +share/locale/kk/LC_MESSAGES/kfile_desktop.mo +share/locale/kk/LC_MESSAGES/kfile_folder.mo +share/locale/kk/LC_MESSAGES/kfile_html.mo +share/locale/kk/LC_MESSAGES/kfile_lnk.mo +share/locale/kk/LC_MESSAGES/kfile_mhtml.mo 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/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo @@ -112,16 +161,21 @@ share/locale/kk/LC_MESSAGES/kgpg.mo share/locale/kk/LC_MESSAGES/kgreet_classic.mo share/locale/kk/LC_MESSAGES/kgreet_winbind.mo share/locale/kk/LC_MESSAGES/khelpcenter.mo +share/locale/kk/LC_MESSAGES/khexedit.mo share/locale/kk/LC_MESSAGES/khexedit2part.mo share/locale/kk/LC_MESSAGES/khotkeys.mo share/locale/kk/LC_MESSAGES/khtmlkttsd.mo +share/locale/kk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/kk/LC_MESSAGES/kicker.mo +share/locale/kk/LC_MESSAGES/kinetd.mo share/locale/kk/LC_MESSAGES/kio.mo share/locale/kk/LC_MESSAGES/kio_finger.mo share/locale/kk/LC_MESSAGES/kio_fish.mo share/locale/kk/LC_MESSAGES/kio_floppy.mo share/locale/kk/LC_MESSAGES/kio_help.mo share/locale/kk/LC_MESSAGES/kio_home.mo +share/locale/kk/LC_MESSAGES/kio_jabberdisco.mo +share/locale/kk/LC_MESSAGES/kio_lan.mo share/locale/kk/LC_MESSAGES/kio_ldap.mo share/locale/kk/LC_MESSAGES/kio_mac.mo share/locale/kk/LC_MESSAGES/kio_man.mo @@ -139,11 +193,13 @@ share/locale/kk/LC_MESSAGES/kio_system.mo share/locale/kk/LC_MESSAGES/kio_tar.mo share/locale/kk/LC_MESSAGES/kio_thumbnail.mo share/locale/kk/LC_MESSAGES/kio_trash.mo +share/locale/kk/LC_MESSAGES/kio_zeroconf.mo share/locale/kk/LC_MESSAGES/kioexec.mo share/locale/kk/LC_MESSAGES/kjobviewer.mo share/locale/kk/LC_MESSAGES/kjots.mo share/locale/kk/LC_MESSAGES/klaptopdaemon.mo share/locale/kk/LC_MESSAGES/klipper.mo +share/locale/kk/LC_MESSAGES/kmathapplet.mo share/locale/kk/LC_MESSAGES/kmcop.mo share/locale/kk/LC_MESSAGES/kmenuapplet.mo share/locale/kk/LC_MESSAGES/kmenuedit.mo @@ -157,11 +213,17 @@ 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/knotify.mo +share/locale/kk/LC_MESSAGES/kolourpicker.mo +share/locale/kk/LC_MESSAGES/konqsidebar_delicious.mo +share/locale/kk/LC_MESSAGES/konqsidebar_mediaplayer.mo +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/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/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo @@ -169,6 +231,9 @@ share/locale/kk/LC_MESSAGES/kreadconfig.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo share/locale/kk/LC_MESSAGES/krunapplet.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo +share/locale/kk/LC_MESSAGES/ksig.mo +share/locale/kk/LC_MESSAGES/ksim.mo +share/locale/kk/LC_MESSAGES/ksirc.mo share/locale/kk/LC_MESSAGES/ksmserver.mo share/locale/kk/LC_MESSAGES/ksplash.mo share/locale/kk/LC_MESSAGES/ksplashthemes.mo @@ -186,16 +251,22 @@ share/locale/kk/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/kk/LC_MESSAGES/ktexteditor_isearch.mo share/locale/kk/LC_MESSAGES/ktexteditor_kdatatool.mo share/locale/kk/LC_MESSAGES/kthememanager.mo +share/locale/kk/LC_MESSAGES/ktimemon.mo share/locale/kk/LC_MESSAGES/ktimer.mo share/locale/kk/LC_MESSAGES/ktip.mo +share/locale/kk/LC_MESSAGES/kuick_plugin.mo share/locale/kk/LC_MESSAGES/kuser.mo share/locale/kk/LC_MESSAGES/kwalletmanager.mo +share/locale/kk/LC_MESSAGES/kwifimanager.mo share/locale/kk/LC_MESSAGES/kwin.mo share/locale/kk/LC_MESSAGES/kwin_clients.mo share/locale/kk/LC_MESSAGES/kwin_lib.mo +share/locale/kk/LC_MESSAGES/kwireless.mo share/locale/kk/LC_MESSAGES/kwriteconfig.mo share/locale/kk/LC_MESSAGES/kxkb.mo share/locale/kk/LC_MESSAGES/libdmctl.mo +share/locale/kk/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/kk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/kk/LC_MESSAGES/libkicker.mo share/locale/kk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/kk/LC_MESSAGES/libkickermenu_konsole.mo @@ -209,17 +280,33 @@ share/locale/kk/LC_MESSAGES/libkscreensaver.mo share/locale/kk/LC_MESSAGES/libtaskbar.mo share/locale/kk/LC_MESSAGES/libtaskmanager.mo share/locale/kk/LC_MESSAGES/lockout.mo +share/locale/kk/LC_MESSAGES/lyrics.mo share/locale/kk/LC_MESSAGES/mediaapplet.mo +share/locale/kk/LC_MESSAGES/mediacontrol.mo +share/locale/kk/LC_MESSAGES/mf_konqplugin.mo +share/locale/kk/LC_MESSAGES/minitoolsplugin.mo share/locale/kk/LC_MESSAGES/naughtyapplet.mo +share/locale/kk/LC_MESSAGES/nexscope.mo share/locale/kk/LC_MESSAGES/nsplugin.mo +share/locale/kk/LC_MESSAGES/pitchablespeed.mo share/locale/kk/LC_MESSAGES/ppdtranslations.mo share/locale/kk/LC_MESSAGES/privacy.mo share/locale/kk/LC_MESSAGES/quicklauncher.mo +share/locale/kk/LC_MESSAGES/rellinks.mo +share/locale/kk/LC_MESSAGES/searchbarplugin.mo share/locale/kk/LC_MESSAGES/secpolicy.mo share/locale/kk/LC_MESSAGES/superkaramba.mo +share/locale/kk/LC_MESSAGES/synaescope.mo share/locale/kk/LC_MESSAGES/timezones.mo +share/locale/kk/LC_MESSAGES/tippecanoe.mo share/locale/kk/LC_MESSAGES/trashapplet.mo +share/locale/kk/LC_MESSAGES/tyler.mo +share/locale/kk/LC_MESSAGES/uachangerplugin.mo share/locale/kk/LC_MESSAGES/useraccount.mo +share/locale/kk/LC_MESSAGES/validatorsplugin.mo +share/locale/kk/LC_MESSAGES/wakeup.mo +share/locale/kk/LC_MESSAGES/wavecapture.mo +share/locale/kk/LC_MESSAGES/webarchiver.mo share/locale/kk/charset share/locale/kk/entry.desktop share/locale/kk/flag.png diff --git a/misc/kde3-i18n-km/distinfo b/misc/kde3-i18n-km/distinfo index a63fbbe49d77..7870071d140b 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.3.tar.bz2) = c2d3bd0e7df18167cca2cfc8c67b94f8 -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.3.tar.bz2) = 886c8d7913c83ff3c05ef0f5bc2f0f743c8559dc2c7d71f74a7fa9ed31fc5411 -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.3.tar.bz2) = 1244595 +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 diff --git a/misc/kde3-i18n-km/pkg-plist b/misc/kde3-i18n-km/pkg-plist index 79314c06bcde..21f5cc7068f2 100644 --- a/misc/kde3-i18n-km/pkg-plist +++ b/misc/kde3-i18n-km/pkg-plist @@ -15,6 +15,7 @@ share/locale/km/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/km/LC_MESSAGES/audiorename_plugin.mo share/locale/km/LC_MESSAGES/autorefresh.mo share/locale/km/LC_MESSAGES/babelfish.mo +share/locale/km/LC_MESSAGES/blinken.mo share/locale/km/LC_MESSAGES/charlatanui.mo share/locale/km/LC_MESSAGES/clockapplet.mo share/locale/km/LC_MESSAGES/crashesplugin.mo @@ -48,6 +49,7 @@ 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/kanagram.mo share/locale/km/LC_MESSAGES/kandy.mo share/locale/km/LC_MESSAGES/kappfinder.mo share/locale/km/LC_MESSAGES/kasbarextension.mo @@ -84,6 +86,7 @@ share/locale/km/LC_MESSAGES/kbattleship.mo 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/kcalc.mo share/locale/km/LC_MESSAGES/kcharselect.mo share/locale/km/LC_MESSAGES/kcharselectapplet.mo @@ -183,6 +186,7 @@ share/locale/km/LC_MESSAGES/kdictapplet.mo share/locale/km/LC_MESSAGES/kdmconfig.mo share/locale/km/LC_MESSAGES/kdmgreet.mo share/locale/km/LC_MESSAGES/kedit.mo +share/locale/km/LC_MESSAGES/keduca.mo share/locale/km/LC_MESSAGES/kenolaba.mo share/locale/km/LC_MESSAGES/kfax.mo share/locale/km/LC_MESSAGES/kfaxview.mo @@ -192,6 +196,7 @@ share/locale/km/LC_MESSAGES/kfile_avi.mo share/locale/km/LC_MESSAGES/kfile_bmp.mo 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_dvi.mo share/locale/km/LC_MESSAGES/kfile_exr.mo @@ -217,6 +222,7 @@ share/locale/km/LC_MESSAGES/kfile_pnm.mo share/locale/km/LC_MESSAGES/kfile_ps.mo share/locale/km/LC_MESSAGES/kfile_rfc822.mo share/locale/km/LC_MESSAGES/kfile_rgb.mo +share/locale/km/LC_MESSAGES/kfile_rpm.mo share/locale/km/LC_MESSAGES/kfile_sid.mo share/locale/km/LC_MESSAGES/kfile_tga.mo share/locale/km/LC_MESSAGES/kfile_theora.mo @@ -241,6 +247,7 @@ share/locale/km/LC_MESSAGES/kghostview.mo share/locale/km/LC_MESSAGES/kgoldrunner.mo share/locale/km/LC_MESSAGES/kgreet_classic.mo share/locale/km/LC_MESSAGES/kgreet_winbind.mo +share/locale/km/LC_MESSAGES/khangman.mo share/locale/km/LC_MESSAGES/khelpcenter.mo share/locale/km/LC_MESSAGES/khexedit2part.mo share/locale/km/LC_MESSAGES/khotkeys.mo @@ -287,6 +294,7 @@ 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/klegacyimport.mo +share/locale/km/LC_MESSAGES/klettres.mo share/locale/km/LC_MESSAGES/klickety.mo share/locale/km/LC_MESSAGES/klines.mo share/locale/km/LC_MESSAGES/klipper.mo @@ -343,6 +351,7 @@ share/locale/km/LC_MESSAGES/kpager.mo share/locale/km/LC_MESSAGES/kpartapp.mo share/locale/km/LC_MESSAGES/kpat.mo 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/kpoker.mo @@ -431,8 +440,8 @@ 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 share/locale/km/LC_MESSAGES/libkdehighscores.mo share/locale/km/LC_MESSAGES/libkdenetwork.mo diff --git a/misc/kde3-i18n-lt/distinfo b/misc/kde3-i18n-lt/distinfo index fdf56685b772..2423dc732c2e 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.3.tar.bz2) = e36ddd66007a7a405369731bea56ae83 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.3.tar.bz2) = 714115df198bb90c8f8b8d33843d8fde941499c6a6ee48ccfc8ccd4c8c9740bc -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.3.tar.bz2) = 1868878 +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 diff --git a/misc/kde3-i18n-lv/distinfo b/misc/kde3-i18n-lv/distinfo index e9ff56e941fa..d84d478ac379 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.3.tar.bz2) = 549ed7bc713a7ca725e8eae0149be613 -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.3.tar.bz2) = 2773431baa802c81cbd83940266b94b1cd96954547409f0f5901cbb84125e9a1 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.3.tar.bz2) = 1339689 +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 diff --git a/misc/kde3-i18n-lv/pkg-plist b/misc/kde3-i18n-lv/pkg-plist index 13c576e611c6..9945da1791fd 100644 --- a/misc/kde3-i18n-lv/pkg-plist +++ b/misc/kde3-i18n-lv/pkg-plist @@ -15,6 +15,7 @@ share/locale/lv/LC_MESSAGES/extensionproxy.mo share/locale/lv/LC_MESSAGES/filetypes.mo share/locale/lv/LC_MESSAGES/htmlsearch.mo share/locale/lv/LC_MESSAGES/imgalleryplugin.mo +share/locale/lv/LC_MESSAGES/kabc_file.mo share/locale/lv/LC_MESSAGES/kaboodle.mo share/locale/lv/LC_MESSAGES/kaccess.mo share/locale/lv/LC_MESSAGES/kaddressbook.mo @@ -95,6 +96,7 @@ share/locale/lv/LC_MESSAGES/kdat.mo share/locale/lv/LC_MESSAGES/kdcop.mo share/locale/lv/LC_MESSAGES/kdebugdialog.mo share/locale/lv/LC_MESSAGES/kdelibs.mo +share/locale/lv/LC_MESSAGES/kdelibs_colors.mo share/locale/lv/LC_MESSAGES/kdepasswd.mo share/locale/lv/LC_MESSAGES/kdeprint.mo share/locale/lv/LC_MESSAGES/kdeprintfax.mo @@ -139,6 +141,7 @@ share/locale/lv/LC_MESSAGES/kio_audiocd.mo share/locale/lv/LC_MESSAGES/kio_finger.mo share/locale/lv/LC_MESSAGES/kio_floppy.mo share/locale/lv/LC_MESSAGES/kio_help.mo +share/locale/lv/LC_MESSAGES/kio_home.mo share/locale/lv/LC_MESSAGES/kio_imap4.mo share/locale/lv/LC_MESSAGES/kio_lan.mo share/locale/lv/LC_MESSAGES/kio_man.mo @@ -168,7 +171,6 @@ share/locale/lv/LC_MESSAGES/kmail.mo share/locale/lv/LC_MESSAGES/kmailcvt.mo share/locale/lv/LC_MESSAGES/kmcop.mo share/locale/lv/LC_MESSAGES/kmenuedit.mo -share/locale/lv/LC_MESSAGES/kmessedwords.mo share/locale/lv/LC_MESSAGES/kmid.mo share/locale/lv/LC_MESSAGES/kmines.mo share/locale/lv/LC_MESSAGES/kminipagerapplet.mo @@ -209,6 +211,7 @@ share/locale/lv/LC_MESSAGES/kruler.mo share/locale/lv/LC_MESSAGES/krunapplet.mo share/locale/lv/LC_MESSAGES/ksame.mo share/locale/lv/LC_MESSAGES/kscd.mo +share/locale/lv/LC_MESSAGES/kscreensaver.mo share/locale/lv/LC_MESSAGES/kshisen.mo share/locale/lv/LC_MESSAGES/ksirc.mo share/locale/lv/LC_MESSAGES/ksirtet.mo @@ -269,6 +272,7 @@ share/locale/lv/LC_MESSAGES/quanta.mo share/locale/lv/LC_MESSAGES/quicklauncher.mo share/locale/lv/LC_MESSAGES/secpolicy.mo share/locale/lv/LC_MESSAGES/spy.mo +share/locale/lv/LC_MESSAGES/timezones.mo share/locale/lv/LC_MESSAGES/trashapplet.mo share/locale/lv/LC_MESSAGES/uachangerplugin.mo share/locale/lv/LC_MESSAGES/validatorsplugin.mo diff --git a/misc/kde3-i18n-mk/distinfo b/misc/kde3-i18n-mk/distinfo index 7473519766a4..096f9bf1eee6 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.3.tar.bz2) = a61b0e098265e3d0cc6ed7a77e6178f9 -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.3.tar.bz2) = 074316594f235c8706789a4c16473cdb0a2b5ea659c0c48f06da593a42645206 -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.3.tar.bz2) = 1645708 +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 diff --git a/misc/kde3-i18n-mk/pkg-plist b/misc/kde3-i18n-mk/pkg-plist index 84f6d0ab82e6..c2c20b9ba7f7 100644 --- a/misc/kde3-i18n-mk/pkg-plist +++ b/misc/kde3-i18n-mk/pkg-plist @@ -1,3 +1,4 @@ +share/locale/mk/LC_MESSAGES/akregator.mo share/locale/mk/LC_MESSAGES/akregator_konqplugin.mo share/locale/mk/LC_MESSAGES/alsaplayerui.mo share/locale/mk/LC_MESSAGES/amor.mo @@ -14,10 +15,12 @@ share/locale/mk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/mk/LC_MESSAGES/audiorename_plugin.mo share/locale/mk/LC_MESSAGES/autorefresh.mo share/locale/mk/LC_MESSAGES/babelfish.mo +share/locale/mk/LC_MESSAGES/blinken.mo share/locale/mk/LC_MESSAGES/charlatanui.mo share/locale/mk/LC_MESSAGES/clockapplet.mo share/locale/mk/LC_MESSAGES/crashesplugin.mo share/locale/mk/LC_MESSAGES/cupsdconf.mo +share/locale/mk/LC_MESSAGES/cvsservice.mo share/locale/mk/LC_MESSAGES/dcoprss.mo share/locale/mk/LC_MESSAGES/dirfilterplugin.mo share/locale/mk/LC_MESSAGES/display.mo @@ -47,6 +50,7 @@ share/locale/mk/LC_MESSAGES/kaccess.mo share/locale/mk/LC_MESSAGES/kaddressbook.mo share/locale/mk/LC_MESSAGES/kalarm.mo share/locale/mk/LC_MESSAGES/kalzium.mo +share/locale/mk/LC_MESSAGES/kanagram.mo share/locale/mk/LC_MESSAGES/kappfinder.mo share/locale/mk/LC_MESSAGES/karm.mo share/locale/mk/LC_MESSAGES/kasbarextension.mo @@ -79,6 +83,8 @@ share/locale/mk/LC_MESSAGES/kbattleship.mo share/locale/mk/LC_MESSAGES/kbinaryclock.mo share/locale/mk/LC_MESSAGES/kblackbox.mo share/locale/mk/LC_MESSAGES/kbounce.mo +share/locale/mk/LC_MESSAGES/kbruch.mo +share/locale/mk/LC_MESSAGES/kbstateapplet.mo share/locale/mk/LC_MESSAGES/kcalc.mo share/locale/mk/LC_MESSAGES/kcharselect.mo share/locale/mk/LC_MESSAGES/kcharselectapplet.mo @@ -170,6 +176,7 @@ share/locale/mk/LC_MESSAGES/kdf.mo share/locale/mk/LC_MESSAGES/kdialog.mo share/locale/mk/LC_MESSAGES/kdict.mo share/locale/mk/LC_MESSAGES/kdictapplet.mo +share/locale/mk/LC_MESSAGES/kdjview.mo share/locale/mk/LC_MESSAGES/kdmconfig.mo share/locale/mk/LC_MESSAGES/kdmgreet.mo share/locale/mk/LC_MESSAGES/kdvi.mo @@ -249,6 +256,7 @@ share/locale/mk/LC_MESSAGES/khtmlkttsd.mo share/locale/mk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/mk/LC_MESSAGES/kicker.mo share/locale/mk/LC_MESSAGES/kiconedit.mo +share/locale/mk/LC_MESSAGES/kig.mo share/locale/mk/LC_MESSAGES/kinetd.mo share/locale/mk/LC_MESSAGES/kio.mo share/locale/mk/LC_MESSAGES/kio_audiocd.mo @@ -291,6 +299,7 @@ share/locale/mk/LC_MESSAGES/klickety.mo share/locale/mk/LC_MESSAGES/klines.mo share/locale/mk/LC_MESSAGES/klipper.mo share/locale/mk/LC_MESSAGES/klock.mo +share/locale/mk/LC_MESSAGES/kmag.mo share/locale/mk/LC_MESSAGES/kmahjongg.mo share/locale/mk/LC_MESSAGES/kmail.mo share/locale/mk/LC_MESSAGES/kmail_text_calendar_plugin.mo @@ -311,6 +320,8 @@ share/locale/mk/LC_MESSAGES/kmines.mo share/locale/mk/LC_MESSAGES/kminipagerapplet.mo share/locale/mk/LC_MESSAGES/kmix.mo share/locale/mk/LC_MESSAGES/kmoon.mo +share/locale/mk/LC_MESSAGES/kmousetool.mo +share/locale/mk/LC_MESSAGES/kmouth.mo share/locale/mk/LC_MESSAGES/kmplot.mo share/locale/mk/LC_MESSAGES/kmrml.mo share/locale/mk/LC_MESSAGES/knetattach.mo @@ -379,6 +390,7 @@ share/locale/mk/LC_MESSAGES/krfb.mo share/locale/mk/LC_MESSAGES/kruler.mo share/locale/mk/LC_MESSAGES/krunapplet.mo share/locale/mk/LC_MESSAGES/ksame.mo +share/locale/mk/LC_MESSAGES/ksayit.mo share/locale/mk/LC_MESSAGES/kscd.mo share/locale/mk/LC_MESSAGES/kscreensaver.mo share/locale/mk/LC_MESSAGES/kshisen.mo @@ -418,6 +430,7 @@ share/locale/mk/LC_MESSAGES/ktimer.mo share/locale/mk/LC_MESSAGES/ktip.mo share/locale/mk/LC_MESSAGES/ktouch.mo share/locale/mk/LC_MESSAGES/ktron.mo +share/locale/mk/LC_MESSAGES/kttsd.mo share/locale/mk/LC_MESSAGES/ktuberling.mo share/locale/mk/LC_MESSAGES/kturtle.mo share/locale/mk/LC_MESSAGES/ktux.mo @@ -449,6 +462,7 @@ share/locale/mk/LC_MESSAGES/kworldclock.mo share/locale/mk/LC_MESSAGES/kwriteconfig.mo share/locale/mk/LC_MESSAGES/kxkb.mo share/locale/mk/LC_MESSAGES/kxsconfig.mo +share/locale/mk/LC_MESSAGES/libKTTSD.mo share/locale/mk/LC_MESSAGES/libdmctl.mo share/locale/mk/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/mk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo diff --git a/misc/kde3-i18n-mn/distinfo b/misc/kde3-i18n-mn/distinfo index 91be0510a572..c1f0a4b84904 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.3.tar.bz2) = 8ad2a5a56045038174ba5eb2572b4f11 -SHA256 (KDE/kde-i18n/kde-i18n-mn-3.5.3.tar.bz2) = 0b608782fbdb1fe09fb6846740dd0cfcd2ce604404c87f2729713762e006c469 -SIZE (KDE/kde-i18n/kde-i18n-mn-3.5.3.tar.bz2) = 674832 +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 diff --git a/misc/kde3-i18n-mn/pkg-plist b/misc/kde3-i18n-mn/pkg-plist index bb457626aa28..a201819ee28e 100644 --- a/misc/kde3-i18n-mn/pkg-plist +++ b/misc/kde3-i18n-mn/pkg-plist @@ -11,7 +11,6 @@ share/locale/mn/LC_MESSAGES/filetypes.mo share/locale/mn/LC_MESSAGES/htmlsearch.mo share/locale/mn/LC_MESSAGES/kabc_dir.mo share/locale/mn/LC_MESSAGES/kabc_file.mo -share/locale/mn/LC_MESSAGES/kabc_ldap.mo share/locale/mn/LC_MESSAGES/kabc_ldapkio.mo share/locale/mn/LC_MESSAGES/kabc_net.mo share/locale/mn/LC_MESSAGES/kabc_sql.mo @@ -137,7 +136,6 @@ share/locale/mn/LC_MESSAGES/klipper.mo share/locale/mn/LC_MESSAGES/kmcop.mo share/locale/mn/LC_MESSAGES/kmenuapplet.mo share/locale/mn/LC_MESSAGES/kmenuedit.mo -share/locale/mn/LC_MESSAGES/kmessedwords.mo share/locale/mn/LC_MESSAGES/kminipagerapplet.mo share/locale/mn/LC_MESSAGES/knotify.mo share/locale/mn/LC_MESSAGES/konqueror.mo diff --git a/misc/kde3-i18n-ms/distinfo b/misc/kde3-i18n-ms/distinfo index 2d40cd8de1b3..bf50271f1b59 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.3.tar.bz2) = 8aa28011097fdac0bfefb92c48140ac3 -SHA256 (KDE/kde-i18n/kde-i18n-ms-3.5.3.tar.bz2) = aa67f93c690851a4d89b0ed4057abb2b0cbef0800abdacd97b19bb27a9526bd8 -SIZE (KDE/kde-i18n/kde-i18n-ms-3.5.3.tar.bz2) = 1339174 +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 diff --git a/misc/kde3-i18n-ms/pkg-plist b/misc/kde3-i18n-ms/pkg-plist index ca01bda19eb8..40c48cd2b580 100644 --- a/misc/kde3-i18n-ms/pkg-plist +++ b/misc/kde3-i18n-ms/pkg-plist @@ -14,6 +14,7 @@ share/locale/ms/LC_MESSAGES/audiocd_encoder_vorbis.mo 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/charlatanui.mo share/locale/ms/LC_MESSAGES/clockapplet.mo share/locale/ms/LC_MESSAGES/crashesplugin.mo @@ -46,6 +47,8 @@ share/locale/ms/LC_MESSAGES/kaboodle.mo share/locale/ms/LC_MESSAGES/kaccess.mo share/locale/ms/LC_MESSAGES/kaddressbook.mo share/locale/ms/LC_MESSAGES/kalarm.mo +share/locale/ms/LC_MESSAGES/kalzium.mo +share/locale/ms/LC_MESSAGES/kanagram.mo share/locale/ms/LC_MESSAGES/kandy.mo share/locale/ms/LC_MESSAGES/kappfinder.mo share/locale/ms/LC_MESSAGES/karm.mo @@ -75,6 +78,7 @@ share/locale/ms/LC_MESSAGES/kay.mo share/locale/ms/LC_MESSAGES/kbinaryclock.mo share/locale/ms/LC_MESSAGES/kblackbox.mo share/locale/ms/LC_MESSAGES/kbounce.mo +share/locale/ms/LC_MESSAGES/kbruch.mo share/locale/ms/LC_MESSAGES/kbstateapplet.mo share/locale/ms/LC_MESSAGES/kcalc.mo share/locale/ms/LC_MESSAGES/kcharselect.mo @@ -171,6 +175,7 @@ share/locale/ms/LC_MESSAGES/kdmconfig.mo share/locale/ms/LC_MESSAGES/kdmgreet.mo share/locale/ms/LC_MESSAGES/kdvi.mo share/locale/ms/LC_MESSAGES/kedit.mo +share/locale/ms/LC_MESSAGES/keduca.mo share/locale/ms/LC_MESSAGES/kfax.mo share/locale/ms/LC_MESSAGES/kfaxview.mo share/locale/ms/LC_MESSAGES/kfifteenapplet.mo @@ -181,6 +186,7 @@ share/locale/ms/LC_MESSAGES/kfile_cert.mo share/locale/ms/LC_MESSAGES/kfile_dds.mo share/locale/ms/LC_MESSAGES/kfile_deb.mo share/locale/ms/LC_MESSAGES/kfile_desktop.mo +share/locale/ms/LC_MESSAGES/kfile_drgeo.mo share/locale/ms/LC_MESSAGES/kfile_dvi.mo share/locale/ms/LC_MESSAGES/kfile_exr.mo share/locale/ms/LC_MESSAGES/kfile_flac.mo @@ -190,6 +196,7 @@ share/locale/ms/LC_MESSAGES/kfile_html.mo share/locale/ms/LC_MESSAGES/kfile_ico.mo share/locale/ms/LC_MESSAGES/kfile_ics.mo share/locale/ms/LC_MESSAGES/kfile_jpeg.mo +share/locale/ms/LC_MESSAGES/kfile_kig.mo share/locale/ms/LC_MESSAGES/kfile_lnk.mo share/locale/ms/LC_MESSAGES/kfile_m3u.mo share/locale/ms/LC_MESSAGES/kfile_mhtml.mo @@ -221,6 +228,7 @@ share/locale/ms/LC_MESSAGES/kfmclient.mo 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/kghostview.mo share/locale/ms/LC_MESSAGES/kgpg.mo share/locale/ms/LC_MESSAGES/kgreet_classic.mo @@ -234,6 +242,7 @@ share/locale/ms/LC_MESSAGES/khtmlkttsd.mo 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/kio.mo share/locale/ms/LC_MESSAGES/kio_audiocd.mo share/locale/ms/LC_MESSAGES/kio_finger.mo @@ -263,10 +272,13 @@ 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/kioexec.mo +share/locale/ms/LC_MESSAGES/kiten.mo share/locale/ms/LC_MESSAGES/kjobviewer.mo share/locale/ms/LC_MESSAGES/kjots.mo 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/klipper.mo share/locale/ms/LC_MESSAGES/klock.mo share/locale/ms/LC_MESSAGES/kmag.mo @@ -292,6 +304,7 @@ share/locale/ms/LC_MESSAGES/kmobile.mo share/locale/ms/LC_MESSAGES/kmoon.mo share/locale/ms/LC_MESSAGES/kmousetool.mo 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/knode.mo @@ -322,6 +335,7 @@ share/locale/ms/LC_MESSAGES/kpackage.mo share/locale/ms/LC_MESSAGES/kpager.mo 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/kpilot.mo share/locale/ms/LC_MESSAGES/kpovmodeler.mo @@ -354,6 +368,7 @@ share/locale/ms/LC_MESSAGES/ksnapshot.mo share/locale/ms/LC_MESSAGES/ksokoban.mo share/locale/ms/LC_MESSAGES/ksplash.mo share/locale/ms/LC_MESSAGES/ksplashthemes.mo +share/locale/ms/LC_MESSAGES/kstars.mo share/locale/ms/LC_MESSAGES/kstart.mo share/locale/ms/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/ms/LC_MESSAGES/kstyle_keramik_config.mo @@ -376,12 +391,15 @@ share/locale/ms/LC_MESSAGES/ktimemon.mo share/locale/ms/LC_MESSAGES/ktimer.mo share/locale/ms/LC_MESSAGES/ktip.mo share/locale/ms/LC_MESSAGES/ktnef.mo +share/locale/ms/LC_MESSAGES/ktouch.mo share/locale/ms/LC_MESSAGES/ktron.mo share/locale/ms/LC_MESSAGES/kttsd.mo +share/locale/ms/LC_MESSAGES/kturtle.mo share/locale/ms/LC_MESSAGES/ktux.mo share/locale/ms/LC_MESSAGES/kuick_plugin.mo share/locale/ms/LC_MESSAGES/kuickshow.mo share/locale/ms/LC_MESSAGES/kuser.mo +share/locale/ms/LC_MESSAGES/kverbos.mo share/locale/ms/LC_MESSAGES/kview.mo share/locale/ms/LC_MESSAGES/kview_scale.mo share/locale/ms/LC_MESSAGES/kviewbrowserplugin.mo @@ -391,6 +409,7 @@ share/locale/ms/LC_MESSAGES/kviewpresenterplugin.mo share/locale/ms/LC_MESSAGES/kviewscannerplugin.mo share/locale/ms/LC_MESSAGES/kviewshell.mo share/locale/ms/LC_MESSAGES/kviewviewer.mo +share/locale/ms/LC_MESSAGES/kvoctrain.mo share/locale/ms/LC_MESSAGES/kwalletmanager.mo share/locale/ms/LC_MESSAGES/kwatchgnupg.mo share/locale/ms/LC_MESSAGES/kweather.mo @@ -398,6 +417,7 @@ share/locale/ms/LC_MESSAGES/kwin.mo share/locale/ms/LC_MESSAGES/kwin_art_clients.mo share/locale/ms/LC_MESSAGES/kwin_clients.mo share/locale/ms/LC_MESSAGES/kwin_lib.mo +share/locale/ms/LC_MESSAGES/kwordquiz.mo share/locale/ms/LC_MESSAGES/kworldclock.mo share/locale/ms/LC_MESSAGES/kwriteconfig.mo share/locale/ms/LC_MESSAGES/kxkb.mo @@ -408,6 +428,7 @@ share/locale/ms/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ms/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/ms/LC_MESSAGES/libkcal.mo share/locale/ms/LC_MESSAGES/libkcddb.mo +share/locale/ms/LC_MESSAGES/libkdeedu.mo share/locale/ms/LC_MESSAGES/libkdepim.mo share/locale/ms/LC_MESSAGES/libkfaximgage.mo share/locale/ms/LC_MESSAGES/libkholidays.mo diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile index 590cc3154e97..a141541edef1 100644 --- a/misc/kde3-i18n-nb/Makefile +++ b/misc/kde3-i18n-nb/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for KDE3 +COMMENT= Norwegian Bokml messages and documentation for KDE3 BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/misc/kde3-i18n-nb/distinfo b/misc/kde3-i18n-nb/distinfo index 75384c5edd55..06fce1430198 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.3.tar.bz2) = b8698e7aa889cc25a65c948fb4228b9c -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.3.tar.bz2) = 584e86ab1d89c99aa51d3916094718b73645ea59ee66034b888b7f21a6d59b27 -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.3.tar.bz2) = 2119865 +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 diff --git a/misc/kde3-i18n-nb/pkg-plist b/misc/kde3-i18n-nb/pkg-plist index c830213828c7..7abbf78e55af 100644 --- a/misc/kde3-i18n-nb/pkg-plist +++ b/misc/kde3-i18n-nb/pkg-plist @@ -57,6 +57,7 @@ share/locale/nb/LC_MESSAGES/kaccess.mo share/locale/nb/LC_MESSAGES/kaddressbook.mo share/locale/nb/LC_MESSAGES/kalarm.mo share/locale/nb/LC_MESSAGES/kalzium.mo +share/locale/nb/LC_MESSAGES/kanagram.mo share/locale/nb/LC_MESSAGES/kandy.mo share/locale/nb/LC_MESSAGES/kappfinder.mo share/locale/nb/LC_MESSAGES/karm.mo @@ -334,7 +335,6 @@ share/locale/nb/LC_MESSAGES/kmathapplet.mo share/locale/nb/LC_MESSAGES/kmcop.mo share/locale/nb/LC_MESSAGES/kmenuapplet.mo share/locale/nb/LC_MESSAGES/kmenuedit.mo -share/locale/nb/LC_MESSAGES/kmessedwords.mo share/locale/nb/LC_MESSAGES/kmid.mo share/locale/nb/LC_MESSAGES/kmilo_delli8k.mo share/locale/nb/LC_MESSAGES/kmilo_generic.mo @@ -352,6 +352,7 @@ share/locale/nb/LC_MESSAGES/kmouth.mo share/locale/nb/LC_MESSAGES/kmplot.mo share/locale/nb/LC_MESSAGES/kmrml.mo share/locale/nb/LC_MESSAGES/knetattach.mo +share/locale/nb/LC_MESSAGES/knetwalk.mo share/locale/nb/LC_MESSAGES/knetworkconf.mo share/locale/nb/LC_MESSAGES/knewsticker.mo share/locale/nb/LC_MESSAGES/knode.mo @@ -370,6 +371,7 @@ share/locale/nb/LC_MESSAGES/konnector_qtopia.mo share/locale/nb/LC_MESSAGES/konnector_remote.mo share/locale/nb/LC_MESSAGES/konqsidebar_delicious.mo share/locale/nb/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/nb/LC_MESSAGES/konqsidebar_metabar.mo share/locale/nb/LC_MESSAGES/konqsidebar_news.mo share/locale/nb/LC_MESSAGES/konqueror.mo share/locale/nb/LC_MESSAGES/konquest.mo @@ -497,7 +499,6 @@ share/locale/nb/LC_MESSAGES/libdmctl.mo share/locale/nb/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nb/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nb/LC_MESSAGES/libkcal.mo -share/locale/nb/LC_MESSAGES/libkcalsystem.mo share/locale/nb/LC_MESSAGES/libkcddb.mo share/locale/nb/LC_MESSAGES/libkdeedu.mo share/locale/nb/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-nds/distinfo b/misc/kde3-i18n-nds/distinfo index e3e351e5d8c8..53a96866a7f6 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.3.tar.bz2) = ee124b60df24fe6556f74f53b4e9d7da -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.3.tar.bz2) = c030149871b7e5a6f7b2a62ef839d38e91570143de6c6fc375bcbf6aa2283241 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.3.tar.bz2) = 1225602 +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 diff --git a/misc/kde3-i18n-nds/pkg-plist b/misc/kde3-i18n-nds/pkg-plist index 74e308316cd3..da2397782ffe 100644 --- a/misc/kde3-i18n-nds/pkg-plist +++ b/misc/kde3-i18n-nds/pkg-plist @@ -4,6 +4,8 @@ share/locale/nds/LC_MESSAGES/alsaplayerui.mo 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/atlantik.mo share/locale/nds/LC_MESSAGES/atlantikdesigner.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo @@ -45,13 +47,16 @@ share/locale/nds/LC_MESSAGES/kandy.mo share/locale/nds/LC_MESSAGES/kappfinder.mo share/locale/nds/LC_MESSAGES/karm.mo share/locale/nds/LC_MESSAGES/kasbarextension.mo +share/locale/nds/LC_MESSAGES/kasteroids.mo share/locale/nds/LC_MESSAGES/kate.mo share/locale/nds/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/nds/LC_MESSAGES/katefiletemplates.mo share/locale/nds/LC_MESSAGES/katefll_initplugin.mo share/locale/nds/LC_MESSAGES/katefll_plugin.mo share/locale/nds/LC_MESSAGES/katehelloworld.mo share/locale/nds/LC_MESSAGES/katehtmltools.mo share/locale/nds/LC_MESSAGES/kateinsertcommand.mo +share/locale/nds/LC_MESSAGES/katekjswrapper.mo share/locale/nds/LC_MESSAGES/katemake.mo share/locale/nds/LC_MESSAGES/katemodeline.mo share/locale/nds/LC_MESSAGES/kateopenheader.mo @@ -62,6 +67,7 @@ share/locale/nds/LC_MESSAGES/katetabbarextension.mo 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/kay.mo share/locale/nds/LC_MESSAGES/kbabel.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo @@ -69,6 +75,7 @@ share/locale/nds/LC_MESSAGES/kbstateapplet.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_kviewgeneralconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -108,6 +115,7 @@ share/locale/nds/LC_MESSAGES/kcmkwallet.mo share/locale/nds/LC_MESSAGES/kcmkwindecoration.mo share/locale/nds/LC_MESSAGES/kcmkwinrules.mo share/locale/nds/LC_MESSAGES/kcmkwm.mo +share/locale/nds/LC_MESSAGES/kcmlanbrowser.mo share/locale/nds/LC_MESSAGES/kcmlaptop.mo share/locale/nds/LC_MESSAGES/kcmlaunch.mo share/locale/nds/LC_MESSAGES/kcmlayout.mo @@ -127,8 +135,10 @@ share/locale/nds/LC_MESSAGES/kcmsmserver.mo share/locale/nds/LC_MESSAGES/kcmspellchecking.mo share/locale/nds/LC_MESSAGES/kcmstyle.mo share/locale/nds/LC_MESSAGES/kcmtaskbar.mo +share/locale/nds/LC_MESSAGES/kcmthinkpad.mo share/locale/nds/LC_MESSAGES/kcmusb.mo share/locale/nds/LC_MESSAGES/kcmview1394.mo +share/locale/nds/LC_MESSAGES/kcmwifi.mo share/locale/nds/LC_MESSAGES/kcmxinerama.mo share/locale/nds/LC_MESSAGES/kcoloredit.mo share/locale/nds/LC_MESSAGES/kcontrol.mo @@ -149,9 +159,11 @@ share/locale/nds/LC_MESSAGES/kdesktop.mo 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/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/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo @@ -171,6 +183,7 @@ share/locale/nds/LC_MESSAGES/kfile_gif.mo share/locale/nds/LC_MESSAGES/kfile_html.mo share/locale/nds/LC_MESSAGES/kfile_ico.mo share/locale/nds/LC_MESSAGES/kfile_ics.mo +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 @@ -195,6 +208,7 @@ share/locale/nds/LC_MESSAGES/kfile_wav.mo share/locale/nds/LC_MESSAGES/kfile_xbm.mo share/locale/nds/LC_MESSAGES/kfile_xpm.mo share/locale/nds/LC_MESSAGES/kfileaudiopreview.mo +share/locale/nds/LC_MESSAGES/kfileshare.mo share/locale/nds/LC_MESSAGES/kfindpart.mo share/locale/nds/LC_MESSAGES/kfloppy.mo share/locale/nds/LC_MESSAGES/kfmclient.mo @@ -207,6 +221,7 @@ share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo share/locale/nds/LC_MESSAGES/khelpcenter.mo share/locale/nds/LC_MESSAGES/khexedit.mo +share/locale/nds/LC_MESSAGES/khexedit2part.mo share/locale/nds/LC_MESSAGES/khotkeys.mo share/locale/nds/LC_MESSAGES/khtmlkttsd.mo share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo @@ -256,12 +271,15 @@ share/locale/nds/LC_MESSAGES/kmail.mo share/locale/nds/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/nds/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/nds/LC_MESSAGES/kmailcvt.mo +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/kmilo_delli8k.mo share/locale/nds/LC_MESSAGES/kmilo_generic.mo share/locale/nds/LC_MESSAGES/kmilo_kvaio.mo share/locale/nds/LC_MESSAGES/kmilo_powerbook.mo +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 @@ -270,6 +288,7 @@ 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/knetworkconf.mo share/locale/nds/LC_MESSAGES/knewsticker.mo share/locale/nds/LC_MESSAGES/knode.mo share/locale/nds/LC_MESSAGES/knotes.mo @@ -283,7 +302,10 @@ share/locale/nds/LC_MESSAGES/konnector_kcal.mo share/locale/nds/LC_MESSAGES/konnector_local.mo share/locale/nds/LC_MESSAGES/konnector_qtopia.mo share/locale/nds/LC_MESSAGES/konnector_remote.mo +share/locale/nds/LC_MESSAGES/konqsidebar_delicious.mo 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/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo @@ -313,6 +335,7 @@ 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/krfb.mo share/locale/nds/LC_MESSAGES/kruler.mo share/locale/nds/LC_MESSAGES/krunapplet.mo share/locale/nds/LC_MESSAGES/ksayit.mo @@ -361,6 +384,7 @@ share/locale/nds/LC_MESSAGES/kviewscannerplugin.mo share/locale/nds/LC_MESSAGES/kwalletmanager.mo 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/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo @@ -372,8 +396,8 @@ share/locale/nds/LC_MESSAGES/kxsconfig.mo share/locale/nds/LC_MESSAGES/libKTTSD.mo 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/libkcalsystem.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo share/locale/nds/LC_MESSAGES/libkholidays.mo @@ -410,6 +434,8 @@ 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/quicklauncher.mo +share/locale/nds/LC_MESSAGES/rellinks.mo +share/locale/nds/LC_MESSAGES/searchbarplugin.mo share/locale/nds/LC_MESSAGES/secpolicy.mo share/locale/nds/LC_MESSAGES/spy.mo share/locale/nds/LC_MESSAGES/superkaramba.mo diff --git a/misc/kde3-i18n-nl/distinfo b/misc/kde3-i18n-nl/distinfo index a172a39e4eda..1cd0bfe4f9d5 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.3.tar.bz2) = ebc1507bf23421c07e0e1bce2bcb216e -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.3.tar.bz2) = 76428faf1fc918552a1f79f5c37c440b99c1631e3b32b478c1dd0908f6403273 -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.3.tar.bz2) = 10191873 +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 diff --git a/misc/kde3-i18n-nn/distinfo b/misc/kde3-i18n-nn/distinfo index 4378027aa03b..23af7daf022a 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.3.tar.bz2) = eed3d9cd4271df35b78fdb7aaf9c11e4 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.3.tar.bz2) = 2078c80703dc924433bf7d8d2da236e6ee336dff2cbf016f98d1c6e2a72dd71b -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.3.tar.bz2) = 1855645 +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 diff --git a/misc/kde3-i18n-nn/pkg-plist b/misc/kde3-i18n-nn/pkg-plist index 9f4dd5195217..a78dfb5b608a 100644 --- a/misc/kde3-i18n-nn/pkg-plist +++ b/misc/kde3-i18n-nn/pkg-plist @@ -283,7 +283,6 @@ share/locale/nn/LC_MESSAGES/kmathapplet.mo share/locale/nn/LC_MESSAGES/kmcop.mo share/locale/nn/LC_MESSAGES/kmenuapplet.mo share/locale/nn/LC_MESSAGES/kmenuedit.mo -share/locale/nn/LC_MESSAGES/kmessedwords.mo share/locale/nn/LC_MESSAGES/kmid.mo share/locale/nn/LC_MESSAGES/kmines.mo share/locale/nn/LC_MESSAGES/kminipagerapplet.mo @@ -409,7 +408,6 @@ share/locale/nn/LC_MESSAGES/kxkb.mo share/locale/nn/LC_MESSAGES/kxsconfig.mo share/locale/nn/LC_MESSAGES/libdmctl.mo share/locale/nn/LC_MESSAGES/libkcal.mo -share/locale/nn/LC_MESSAGES/libkcalsystem.mo share/locale/nn/LC_MESSAGES/libkcddb.mo share/locale/nn/LC_MESSAGES/libkdegames.mo share/locale/nn/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde3-i18n-pa/distinfo b/misc/kde3-i18n-pa/distinfo index 48ebba16f97f..dc0b355e1290 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.3.tar.bz2) = 1bf7fb2adbf61536be4872d8be1dd5cd -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.3.tar.bz2) = 734a17156c5f030a2acc5c72b4ed4956aa18d9ccefc0f2daaf2c8716b0318e71 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.3.tar.bz2) = 1267539 +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 diff --git a/misc/kde3-i18n-pa/pkg-plist b/misc/kde3-i18n-pa/pkg-plist index 5552a9df32cc..8dab0cae9924 100644 --- a/misc/kde3-i18n-pa/pkg-plist +++ b/misc/kde3-i18n-pa/pkg-plist @@ -425,7 +425,6 @@ share/locale/pa/LC_MESSAGES/libdmctl.mo share/locale/pa/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/pa/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/pa/LC_MESSAGES/libkcal.mo -share/locale/pa/LC_MESSAGES/libkcalsystem.mo share/locale/pa/LC_MESSAGES/libkcddb.mo share/locale/pa/LC_MESSAGES/libkdegames.mo share/locale/pa/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde3-i18n-ro/distinfo b/misc/kde3-i18n-ro/distinfo index 44546ce0eef6..7907462c6074 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.3.tar.bz2) = e1a7a05994927ab9ac76174430d76991 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.3.tar.bz2) = ee230651d90cba46401c10f99544873a4a2be4b23fdeb7487208c315a621ff10 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.3.tar.bz2) = 3166197 +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 diff --git a/misc/kde3-i18n-ro/pkg-plist b/misc/kde3-i18n-ro/pkg-plist index c507d997fe74..e5e6a2c39bc1 100644 --- a/misc/kde3-i18n-ro/pkg-plist +++ b/misc/kde3-i18n-ro/pkg-plist @@ -195,7 +195,6 @@ share/locale/ro/LC_MESSAGES/juk.mo share/locale/ro/LC_MESSAGES/kabc2mutt.mo share/locale/ro/LC_MESSAGES/kabc_dir.mo share/locale/ro/LC_MESSAGES/kabc_file.mo -share/locale/ro/LC_MESSAGES/kabc_ldap.mo share/locale/ro/LC_MESSAGES/kabc_ldapkio.mo share/locale/ro/LC_MESSAGES/kabc_net.mo share/locale/ro/LC_MESSAGES/kabc_sql.mo @@ -413,6 +412,7 @@ share/locale/ro/LC_MESSAGES/kio_finger.mo share/locale/ro/LC_MESSAGES/kio_fish.mo share/locale/ro/LC_MESSAGES/kio_floppy.mo share/locale/ro/LC_MESSAGES/kio_help.mo +share/locale/ro/LC_MESSAGES/kio_home.mo share/locale/ro/LC_MESSAGES/kio_imap4.mo share/locale/ro/LC_MESSAGES/kio_lan.mo share/locale/ro/LC_MESSAGES/kio_ldap.mo @@ -452,7 +452,6 @@ share/locale/ro/LC_MESSAGES/kmathapplet.mo share/locale/ro/LC_MESSAGES/kmcop.mo share/locale/ro/LC_MESSAGES/kmenuapplet.mo share/locale/ro/LC_MESSAGES/kmenuedit.mo -share/locale/ro/LC_MESSAGES/kmessedwords.mo share/locale/ro/LC_MESSAGES/kmid.mo share/locale/ro/LC_MESSAGES/kmilo_generic.mo share/locale/ro/LC_MESSAGES/kmilo_kvaio.mo @@ -586,9 +585,9 @@ share/locale/ro/LC_MESSAGES/kwriteconfig.mo share/locale/ro/LC_MESSAGES/kxkb.mo share/locale/ro/LC_MESSAGES/kxsconfig.mo share/locale/ro/LC_MESSAGES/kxsldbg.mo +share/locale/ro/LC_MESSAGES/libdmctl.mo share/locale/ro/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ro/LC_MESSAGES/libkcal.mo -share/locale/ro/LC_MESSAGES/libkcalsystem.mo share/locale/ro/LC_MESSAGES/libkcddb.mo share/locale/ro/LC_MESSAGES/libkdegames.mo share/locale/ro/LC_MESSAGES/libkdepim.mo @@ -597,6 +596,8 @@ share/locale/ro/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/ro/LC_MESSAGES/libkickermenu_konsole.mo share/locale/ro/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/ro/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/ro/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/ro/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ro/LC_MESSAGES/libkickermenu_tom.mo share/locale/ro/LC_MESSAGES/libkleopatra.mo share/locale/ro/LC_MESSAGES/libkonq.mo @@ -631,6 +632,7 @@ share/locale/ro/LC_MESSAGES/spy.mo share/locale/ro/LC_MESSAGES/synaescope.mo share/locale/ro/LC_MESSAGES/timezones.mo share/locale/ro/LC_MESSAGES/tippecanoe.mo +share/locale/ro/LC_MESSAGES/trashapplet.mo share/locale/ro/LC_MESSAGES/tyler.mo share/locale/ro/LC_MESSAGES/uachangerplugin.mo share/locale/ro/LC_MESSAGES/umbrello.mo diff --git a/misc/kde3-i18n-rw/distinfo b/misc/kde3-i18n-rw/distinfo index 41639a1e4700..eb0191e3ca13 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.3.tar.bz2) = 8ca582918eb0a82d7ed150c1d5e1993a -SHA256 (KDE/kde-i18n/kde-i18n-rw-3.5.3.tar.bz2) = bbbcd931c6181e4d338a7e31c3180e7d0da408b281bc294fb680143be0b01a45 -SIZE (KDE/kde-i18n/kde-i18n-rw-3.5.3.tar.bz2) = 2006393 +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 diff --git a/misc/kde3-i18n-rw/pkg-plist b/misc/kde3-i18n-rw/pkg-plist index 50a55c7dd2fc..0f937df18d10 100644 --- a/misc/kde3-i18n-rw/pkg-plist +++ b/misc/kde3-i18n-rw/pkg-plist @@ -332,7 +332,6 @@ share/locale/rw/LC_MESSAGES/kmathapplet.mo share/locale/rw/LC_MESSAGES/kmcop.mo share/locale/rw/LC_MESSAGES/kmenuapplet.mo share/locale/rw/LC_MESSAGES/kmenuedit.mo -share/locale/rw/LC_MESSAGES/kmessedwords.mo share/locale/rw/LC_MESSAGES/kmid.mo share/locale/rw/LC_MESSAGES/kmilo_delli8k.mo share/locale/rw/LC_MESSAGES/kmilo_generic.mo @@ -498,7 +497,6 @@ share/locale/rw/LC_MESSAGES/libdmctl.mo share/locale/rw/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/rw/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/rw/LC_MESSAGES/libkcal.mo -share/locale/rw/LC_MESSAGES/libkcalsystem.mo share/locale/rw/LC_MESSAGES/libkcddb.mo share/locale/rw/LC_MESSAGES/libkdeedu.mo share/locale/rw/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-se/distinfo b/misc/kde3-i18n-se/distinfo index 463294587f85..a5783072aeb1 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.3.tar.bz2) = 7cc35090c312e6f0c0aabfc3be3c54fb -SHA256 (KDE/kde-i18n/kde-i18n-se-3.5.3.tar.bz2) = abcb5e90b0efde7f07b80fec217babc97cfed284032b9883227c992e93ee1d02 -SIZE (KDE/kde-i18n/kde-i18n-se-3.5.3.tar.bz2) = 959797 +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 diff --git a/misc/kde3-i18n-se/pkg-plist b/misc/kde3-i18n-se/pkg-plist index c5ad6b32d166..143b385fdb2d 100644 --- a/misc/kde3-i18n-se/pkg-plist +++ b/misc/kde3-i18n-se/pkg-plist @@ -1,6 +1,7 @@ share/locale/se/ChangeLog share/locale/se/LC_MESSAGES/akregator.mo share/locale/se/LC_MESSAGES/appletproxy.mo +share/locale/se/LC_MESSAGES/atlantik.mo share/locale/se/LC_MESSAGES/clockapplet.mo share/locale/se/LC_MESSAGES/cupsdconf.mo share/locale/se/LC_MESSAGES/display.mo @@ -29,6 +30,7 @@ share/locale/se/LC_MESSAGES/kasbarextension.mo share/locale/se/LC_MESSAGES/kate.mo share/locale/se/LC_MESSAGES/katepart.mo share/locale/se/LC_MESSAGES/kbabel.mo +share/locale/se/LC_MESSAGES/kbounce.mo share/locale/se/LC_MESSAGES/kcm_kviewcanvasconfig.mo share/locale/se/LC_MESSAGES/kcm_kviewgeneralconfig.mo share/locale/se/LC_MESSAGES/kcm_kviewpluginsconfig.mo @@ -201,6 +203,7 @@ share/locale/se/LC_MESSAGES/korganizer.mo share/locale/se/LC_MESSAGES/korn.mo share/locale/se/LC_MESSAGES/kpackage.mo share/locale/se/LC_MESSAGES/kpager.mo +share/locale/se/LC_MESSAGES/kpat.mo share/locale/se/LC_MESSAGES/kpdf.mo share/locale/se/LC_MESSAGES/kpersonalizer.mo share/locale/se/LC_MESSAGES/kpilot.mo @@ -217,8 +220,10 @@ share/locale/se/LC_MESSAGES/kres_remote.mo share/locale/se/LC_MESSAGES/kres_xmlrpc.mo share/locale/se/LC_MESSAGES/kruler.mo share/locale/se/LC_MESSAGES/krunapplet.mo +share/locale/se/LC_MESSAGES/ksame.mo share/locale/se/LC_MESSAGES/kscreensaver.mo share/locale/se/LC_MESSAGES/ksirc.mo +share/locale/se/LC_MESSAGES/ksirtet.mo share/locale/se/LC_MESSAGES/ksmserver.mo share/locale/se/LC_MESSAGES/ksnapshot.mo share/locale/se/LC_MESSAGES/ksplash.mo @@ -258,8 +263,8 @@ share/locale/se/LC_MESSAGES/kwireless.mo share/locale/se/LC_MESSAGES/kwriteconfig.mo share/locale/se/LC_MESSAGES/kxkb.mo share/locale/se/LC_MESSAGES/libkcal.mo -share/locale/se/LC_MESSAGES/libkcalsystem.mo share/locale/se/LC_MESSAGES/libkcddb.mo +share/locale/se/LC_MESSAGES/libkdegames.mo share/locale/se/LC_MESSAGES/libkdepim.mo share/locale/se/LC_MESSAGES/libkicker.mo share/locale/se/LC_MESSAGES/libkickermenu_kdeprint.mo @@ -273,6 +278,7 @@ share/locale/se/LC_MESSAGES/libkleopatra.mo share/locale/se/LC_MESSAGES/libkonq.mo share/locale/se/LC_MESSAGES/libkscan.mo share/locale/se/LC_MESSAGES/libkscreensaver.mo +share/locale/se/LC_MESSAGES/libksirtet.mo share/locale/se/LC_MESSAGES/libtaskbar.mo share/locale/se/LC_MESSAGES/libtaskmanager.mo share/locale/se/LC_MESSAGES/lockout.mo diff --git a/misc/kde3-i18n-sk/distinfo b/misc/kde3-i18n-sk/distinfo index b77b180cc84e..cb0f289ad3bf 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.3.tar.bz2) = 6d74e2e2d58e0c10c177d9852e283f14 -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.3.tar.bz2) = b002b24323ee5e1a1ef45f66c4743689affb9a42da8dfb953938699731257d1c -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.3.tar.bz2) = 5472498 +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 diff --git a/misc/kde3-i18n-sk/pkg-plist b/misc/kde3-i18n-sk/pkg-plist index 10cab6cc0870..3aa924aa4cb6 100644 --- a/misc/kde3-i18n-sk/pkg-plist +++ b/misc/kde3-i18n-sk/pkg-plist @@ -781,6 +781,8 @@ share/doc/HTML/sk/umbrello/pics/use-case-diagram.png share/doc/HTML/sk/umbrello/screen-shots.xmi share/doc/HTML/sk/umbrello/uml_basics.docbook share/doc/HTML/sk/umbrello/working_with_umbrello.docbook +share/locale/sk/LC_MESSAGES/akregator.mo +share/locale/sk/LC_MESSAGES/akregator_konqplugin.mo share/locale/sk/LC_MESSAGES/alsaplayerui.mo share/locale/sk/LC_MESSAGES/amor.mo share/locale/sk/LC_MESSAGES/appletproxy.mo @@ -791,9 +793,12 @@ share/locale/sk/LC_MESSAGES/artscontrol.mo share/locale/sk/LC_MESSAGES/artsmodules.mo share/locale/sk/LC_MESSAGES/atlantik.mo share/locale/sk/LC_MESSAGES/atlantikdesigner.mo +share/locale/sk/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/sk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/sk/LC_MESSAGES/audiorename_plugin.mo share/locale/sk/LC_MESSAGES/autorefresh.mo share/locale/sk/LC_MESSAGES/babelfish.mo +share/locale/sk/LC_MESSAGES/blinken.mo share/locale/sk/LC_MESSAGES/cervisia.mo share/locale/sk/LC_MESSAGES/charlatanui.mo share/locale/sk/LC_MESSAGES/clockapplet.mo @@ -830,6 +835,7 @@ share/locale/sk/LC_MESSAGES/kaccess.mo share/locale/sk/LC_MESSAGES/kaddressbook.mo share/locale/sk/LC_MESSAGES/kalarm.mo share/locale/sk/LC_MESSAGES/kalzium.mo +share/locale/sk/LC_MESSAGES/kanagram.mo share/locale/sk/LC_MESSAGES/kandy.mo share/locale/sk/LC_MESSAGES/kappfinder.mo share/locale/sk/LC_MESSAGES/karm.mo @@ -849,12 +855,14 @@ share/locale/sk/LC_MESSAGES/katemodeline.mo share/locale/sk/LC_MESSAGES/kateopenheader.mo share/locale/sk/LC_MESSAGES/katepart.mo share/locale/sk/LC_MESSAGES/katepybrowse.mo +share/locale/sk/LC_MESSAGES/katesnippets.mo share/locale/sk/LC_MESSAGES/katetabbarextension.mo share/locale/sk/LC_MESSAGES/katetextfilter.mo share/locale/sk/LC_MESSAGES/katexmlcheck.mo share/locale/sk/LC_MESSAGES/katexmltools.mo share/locale/sk/LC_MESSAGES/katomic.mo share/locale/sk/LC_MESSAGES/kaudiocreator.mo +share/locale/sk/LC_MESSAGES/kay.mo share/locale/sk/LC_MESSAGES/kbabel.mo share/locale/sk/LC_MESSAGES/kbackgammon.mo share/locale/sk/LC_MESSAGES/kbattleship.mo @@ -862,7 +870,9 @@ share/locale/sk/LC_MESSAGES/kbinaryclock.mo share/locale/sk/LC_MESSAGES/kblackbox.mo share/locale/sk/LC_MESSAGES/kbounce.mo share/locale/sk/LC_MESSAGES/kbruch.mo +share/locale/sk/LC_MESSAGES/kbstateapplet.mo share/locale/sk/LC_MESSAGES/kbugbuster.mo +share/locale/sk/LC_MESSAGES/kcachegrind.mo share/locale/sk/LC_MESSAGES/kcalc.mo share/locale/sk/LC_MESSAGES/kcharselect.mo share/locale/sk/LC_MESSAGES/kcharselectapplet.mo @@ -894,6 +904,7 @@ share/locale/sk/LC_MESSAGES/kcmkabconfig.mo share/locale/sk/LC_MESSAGES/kcmkamera.mo share/locale/sk/LC_MESSAGES/kcmkclock.mo share/locale/sk/LC_MESSAGES/kcmkded.mo +share/locale/sk/LC_MESSAGES/kcmkdnssd.mo share/locale/sk/LC_MESSAGES/kcmkeys.mo share/locale/sk/LC_MESSAGES/kcmkicker.mo share/locale/sk/LC_MESSAGES/kcmkio.mo @@ -916,6 +927,7 @@ share/locale/sk/LC_MESSAGES/kcmlayout.mo share/locale/sk/LC_MESSAGES/kcmlilo.mo share/locale/sk/LC_MESSAGES/kcmlirc.mo share/locale/sk/LC_MESSAGES/kcmlocale.mo +share/locale/sk/LC_MESSAGES/kcmmedia.mo share/locale/sk/LC_MESSAGES/kcmnic.mo share/locale/sk/LC_MESSAGES/kcmnotify.mo share/locale/sk/LC_MESSAGES/kcmperformance.mo @@ -943,6 +955,7 @@ share/locale/sk/LC_MESSAGES/kdelibs.mo share/locale/sk/LC_MESSAGES/kdelibs_colors.mo share/locale/sk/LC_MESSAGES/kdelirc.mo share/locale/sk/LC_MESSAGES/kdepasswd.mo +share/locale/sk/LC_MESSAGES/kdepimresources.mo share/locale/sk/LC_MESSAGES/kdepimwizards.mo share/locale/sk/LC_MESSAGES/kdeprint.mo share/locale/sk/LC_MESSAGES/kdeprint_part.mo @@ -959,6 +972,7 @@ share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kdialog.mo share/locale/sk/LC_MESSAGES/kdict.mo share/locale/sk/LC_MESSAGES/kdictapplet.mo +share/locale/sk/LC_MESSAGES/kdjview.mo share/locale/sk/LC_MESSAGES/kdmconfig.mo share/locale/sk/LC_MESSAGES/kdmgreet.mo share/locale/sk/LC_MESSAGES/kdvi.mo @@ -966,11 +980,14 @@ share/locale/sk/LC_MESSAGES/kedit.mo share/locale/sk/LC_MESSAGES/keduca.mo share/locale/sk/LC_MESSAGES/kenolaba.mo share/locale/sk/LC_MESSAGES/kfax.mo +share/locale/sk/LC_MESSAGES/kfaxview.mo share/locale/sk/LC_MESSAGES/kfifteenapplet.mo share/locale/sk/LC_MESSAGES/kfile_au.mo share/locale/sk/LC_MESSAGES/kfile_avi.mo share/locale/sk/LC_MESSAGES/kfile_bmp.mo +share/locale/sk/LC_MESSAGES/kfile_cert.mo share/locale/sk/LC_MESSAGES/kfile_cpp.mo +share/locale/sk/LC_MESSAGES/kfile_dds.mo share/locale/sk/LC_MESSAGES/kfile_deb.mo share/locale/sk/LC_MESSAGES/kfile_desktop.mo share/locale/sk/LC_MESSAGES/kfile_diff.mo @@ -982,12 +999,15 @@ share/locale/sk/LC_MESSAGES/kfile_folder.mo share/locale/sk/LC_MESSAGES/kfile_gif.mo share/locale/sk/LC_MESSAGES/kfile_html.mo share/locale/sk/LC_MESSAGES/kfile_ico.mo +share/locale/sk/LC_MESSAGES/kfile_ics.mo share/locale/sk/LC_MESSAGES/kfile_jpeg.mo share/locale/sk/LC_MESSAGES/kfile_kig.mo share/locale/sk/LC_MESSAGES/kfile_lnk.mo share/locale/sk/LC_MESSAGES/kfile_m3u.mo +share/locale/sk/LC_MESSAGES/kfile_mhtml.mo share/locale/sk/LC_MESSAGES/kfile_mp3.mo share/locale/sk/LC_MESSAGES/kfile_mpc.mo +share/locale/sk/LC_MESSAGES/kfile_mpeg.mo share/locale/sk/LC_MESSAGES/kfile_ogg.mo share/locale/sk/LC_MESSAGES/kfile_palm.mo share/locale/sk/LC_MESSAGES/kfile_pcx.mo @@ -1001,13 +1021,18 @@ share/locale/sk/LC_MESSAGES/kfile_rgb.mo share/locale/sk/LC_MESSAGES/kfile_rpm.mo share/locale/sk/LC_MESSAGES/kfile_sid.mo share/locale/sk/LC_MESSAGES/kfile_tga.mo +share/locale/sk/LC_MESSAGES/kfile_theora.mo share/locale/sk/LC_MESSAGES/kfile_tiff.mo +share/locale/sk/LC_MESSAGES/kfile_torrent.mo share/locale/sk/LC_MESSAGES/kfile_ts.mo share/locale/sk/LC_MESSAGES/kfile_txt.mo share/locale/sk/LC_MESSAGES/kfile_vcf.mo share/locale/sk/LC_MESSAGES/kfile_wav.mo share/locale/sk/LC_MESSAGES/kfile_xbm.mo +share/locale/sk/LC_MESSAGES/kfile_xpm.mo share/locale/sk/LC_MESSAGES/kfileaudiopreview.mo +share/locale/sk/LC_MESSAGES/kfilereplace.mo +share/locale/sk/LC_MESSAGES/kfileshare.mo share/locale/sk/LC_MESSAGES/kfindpart.mo share/locale/sk/LC_MESSAGES/kfloppy.mo share/locale/sk/LC_MESSAGES/kfmclient.mo @@ -1015,27 +1040,35 @@ share/locale/sk/LC_MESSAGES/kfontinst.mo share/locale/sk/LC_MESSAGES/kfouleggs.mo share/locale/sk/LC_MESSAGES/kgamma.mo share/locale/sk/LC_MESSAGES/kgantt.mo +share/locale/sk/LC_MESSAGES/kgeography.mo share/locale/sk/LC_MESSAGES/kget.mo share/locale/sk/LC_MESSAGES/kghostview.mo share/locale/sk/LC_MESSAGES/kgoldrunner.mo share/locale/sk/LC_MESSAGES/kgpg.mo share/locale/sk/LC_MESSAGES/kgreet_classic.mo +share/locale/sk/LC_MESSAGES/kgreet_winbind.mo share/locale/sk/LC_MESSAGES/khangman.mo share/locale/sk/LC_MESSAGES/khelpcenter.mo share/locale/sk/LC_MESSAGES/khexedit.mo +share/locale/sk/LC_MESSAGES/khexedit2part.mo share/locale/sk/LC_MESSAGES/khotkeys.mo +share/locale/sk/LC_MESSAGES/khtmlkttsd.mo share/locale/sk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sk/LC_MESSAGES/kicker.mo share/locale/sk/LC_MESSAGES/kiconedit.mo share/locale/sk/LC_MESSAGES/kig.mo +share/locale/sk/LC_MESSAGES/kimagemapeditor.mo share/locale/sk/LC_MESSAGES/kinetd.mo share/locale/sk/LC_MESSAGES/kio.mo share/locale/sk/LC_MESSAGES/kio_audiocd.mo share/locale/sk/LC_MESSAGES/kio_finger.mo share/locale/sk/LC_MESSAGES/kio_fish.mo share/locale/sk/LC_MESSAGES/kio_floppy.mo +share/locale/sk/LC_MESSAGES/kio_groupwise.mo share/locale/sk/LC_MESSAGES/kio_help.mo +share/locale/sk/LC_MESSAGES/kio_home.mo share/locale/sk/LC_MESSAGES/kio_imap4.mo +share/locale/sk/LC_MESSAGES/kio_jabberdisco.mo share/locale/sk/LC_MESSAGES/kio_lan.mo share/locale/sk/LC_MESSAGES/kio_ldap.mo share/locale/sk/LC_MESSAGES/kio_mac.mo @@ -1052,8 +1085,12 @@ share/locale/sk/LC_MESSAGES/kio_sftp.mo share/locale/sk/LC_MESSAGES/kio_sieve.mo share/locale/sk/LC_MESSAGES/kio_smb.mo share/locale/sk/LC_MESSAGES/kio_smtp.mo +share/locale/sk/LC_MESSAGES/kio_svn.mo share/locale/sk/LC_MESSAGES/kio_system.mo +share/locale/sk/LC_MESSAGES/kio_tar.mo +share/locale/sk/LC_MESSAGES/kio_thumbnail.mo share/locale/sk/LC_MESSAGES/kio_trash.mo +share/locale/sk/LC_MESSAGES/kio_zeroconf.mo share/locale/sk/LC_MESSAGES/kioexec.mo share/locale/sk/LC_MESSAGES/kiten.mo share/locale/sk/LC_MESSAGES/kjobviewer.mo @@ -1065,6 +1102,7 @@ share/locale/sk/LC_MESSAGES/kleopatra.mo share/locale/sk/LC_MESSAGES/klettres.mo share/locale/sk/LC_MESSAGES/klickety.mo share/locale/sk/LC_MESSAGES/klines.mo +share/locale/sk/LC_MESSAGES/klinkstatus.mo share/locale/sk/LC_MESSAGES/klipper.mo share/locale/sk/LC_MESSAGES/klock.mo share/locale/sk/LC_MESSAGES/kmag.mo @@ -1077,8 +1115,8 @@ share/locale/sk/LC_MESSAGES/kmathapplet.mo share/locale/sk/LC_MESSAGES/kmcop.mo share/locale/sk/LC_MESSAGES/kmenuapplet.mo share/locale/sk/LC_MESSAGES/kmenuedit.mo -share/locale/sk/LC_MESSAGES/kmessedwords.mo share/locale/sk/LC_MESSAGES/kmid.mo +share/locale/sk/LC_MESSAGES/kmilo_delli8k.mo share/locale/sk/LC_MESSAGES/kmilo_generic.mo share/locale/sk/LC_MESSAGES/kmilo_kvaio.mo share/locale/sk/LC_MESSAGES/kmilo_powerbook.mo @@ -1093,6 +1131,9 @@ share/locale/sk/LC_MESSAGES/kmousetool.mo share/locale/sk/LC_MESSAGES/kmouth.mo share/locale/sk/LC_MESSAGES/kmplot.mo share/locale/sk/LC_MESSAGES/kmrml.mo +share/locale/sk/LC_MESSAGES/knetattach.mo +share/locale/sk/LC_MESSAGES/knetwalk.mo +share/locale/sk/LC_MESSAGES/knetworkconf.mo share/locale/sk/LC_MESSAGES/knewsticker.mo share/locale/sk/LC_MESSAGES/knode.mo share/locale/sk/LC_MESSAGES/knotes.mo @@ -1101,8 +1142,17 @@ share/locale/sk/LC_MESSAGES/kodo.mo share/locale/sk/LC_MESSAGES/kolf.mo share/locale/sk/LC_MESSAGES/kolourpaint.mo share/locale/sk/LC_MESSAGES/kolourpicker.mo +share/locale/sk/LC_MESSAGES/kommander.mo share/locale/sk/LC_MESSAGES/kompare.mo +share/locale/sk/LC_MESSAGES/konnector_dummy.mo +share/locale/sk/LC_MESSAGES/konnector_kabc.mo +share/locale/sk/LC_MESSAGES/konnector_kcal.mo +share/locale/sk/LC_MESSAGES/konnector_local.mo +share/locale/sk/LC_MESSAGES/konnector_qtopia.mo +share/locale/sk/LC_MESSAGES/konnector_remote.mo +share/locale/sk/LC_MESSAGES/konqsidebar_delicious.mo share/locale/sk/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/sk/LC_MESSAGES/konqsidebar_metabar.mo share/locale/sk/LC_MESSAGES/konqsidebar_news.mo share/locale/sk/LC_MESSAGES/konqueror.mo share/locale/sk/LC_MESSAGES/konquest.mo @@ -1133,14 +1183,23 @@ share/locale/sk/LC_MESSAGES/krdc.mo share/locale/sk/LC_MESSAGES/kreadconfig.mo share/locale/sk/LC_MESSAGES/krec.mo share/locale/sk/LC_MESSAGES/kregexpeditor.mo +share/locale/sk/LC_MESSAGES/kres_birthday.mo +share/locale/sk/LC_MESSAGES/kres_blogging.mo +share/locale/sk/LC_MESSAGES/kres_bugzilla.mo share/locale/sk/LC_MESSAGES/kres_exchange.mo +share/locale/sk/LC_MESSAGES/kres_featureplan.mo +share/locale/sk/LC_MESSAGES/kres_groupware.mo +share/locale/sk/LC_MESSAGES/kres_groupwise.mo +share/locale/sk/LC_MESSAGES/kres_kolab.mo share/locale/sk/LC_MESSAGES/kres_remote.mo +share/locale/sk/LC_MESSAGES/kres_tvanytime.mo share/locale/sk/LC_MESSAGES/kres_xmlrpc.mo share/locale/sk/LC_MESSAGES/kreversi.mo share/locale/sk/LC_MESSAGES/krfb.mo share/locale/sk/LC_MESSAGES/kruler.mo share/locale/sk/LC_MESSAGES/krunapplet.mo share/locale/sk/LC_MESSAGES/ksame.mo +share/locale/sk/LC_MESSAGES/ksayit.mo share/locale/sk/LC_MESSAGES/kscd.mo share/locale/sk/LC_MESSAGES/kscreensaver.mo share/locale/sk/LC_MESSAGES/kshisen.mo @@ -1159,7 +1218,9 @@ share/locale/sk/LC_MESSAGES/ksplashthemes.mo share/locale/sk/LC_MESSAGES/kstars.mo share/locale/sk/LC_MESSAGES/kstart.mo share/locale/sk/LC_MESSAGES/kstartperf.mo +share/locale/sk/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/sk/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/sk/LC_MESSAGES/kstyle_phase_config.mo share/locale/sk/LC_MESSAGES/kstyle_plastik_config.mo share/locale/sk/LC_MESSAGES/ksvgplugin.mo share/locale/sk/LC_MESSAGES/ksync.mo @@ -1180,7 +1241,9 @@ share/locale/sk/LC_MESSAGES/ktip.mo share/locale/sk/LC_MESSAGES/ktnef.mo share/locale/sk/LC_MESSAGES/ktouch.mo share/locale/sk/LC_MESSAGES/ktron.mo +share/locale/sk/LC_MESSAGES/kttsd.mo share/locale/sk/LC_MESSAGES/ktuberling.mo +share/locale/sk/LC_MESSAGES/kturtle.mo share/locale/sk/LC_MESSAGES/ktux.mo share/locale/sk/LC_MESSAGES/kuick_plugin.mo share/locale/sk/LC_MESSAGES/kuickshow.mo @@ -1205,17 +1268,25 @@ share/locale/sk/LC_MESSAGES/kwin.mo share/locale/sk/LC_MESSAGES/kwin4.mo share/locale/sk/LC_MESSAGES/kwin_art_clients.mo share/locale/sk/LC_MESSAGES/kwin_clients.mo +share/locale/sk/LC_MESSAGES/kwin_lib.mo share/locale/sk/LC_MESSAGES/kwireless.mo +share/locale/sk/LC_MESSAGES/kwordquiz.mo share/locale/sk/LC_MESSAGES/kworldclock.mo share/locale/sk/LC_MESSAGES/kwriteconfig.mo share/locale/sk/LC_MESSAGES/kxkb.mo share/locale/sk/LC_MESSAGES/kxsconfig.mo +share/locale/sk/LC_MESSAGES/kxsldbg.mo +share/locale/sk/LC_MESSAGES/libKTTSD.mo +share/locale/sk/LC_MESSAGES/libdmctl.mo share/locale/sk/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/sk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/sk/LC_MESSAGES/libkcal.mo -share/locale/sk/LC_MESSAGES/libkcalsystem.mo share/locale/sk/LC_MESSAGES/libkcddb.mo +share/locale/sk/LC_MESSAGES/libkdeedu.mo share/locale/sk/LC_MESSAGES/libkdegames.mo share/locale/sk/LC_MESSAGES/libkdepim.mo +share/locale/sk/LC_MESSAGES/libkfaximgage.mo +share/locale/sk/LC_MESSAGES/libkholidays.mo share/locale/sk/LC_MESSAGES/libkicker.mo share/locale/sk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/sk/LC_MESSAGES/libkickermenu_konsole.mo @@ -1225,7 +1296,9 @@ share/locale/sk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_tom.mo share/locale/sk/LC_MESSAGES/libkleopatra.mo +share/locale/sk/LC_MESSAGES/libkmime.mo share/locale/sk/LC_MESSAGES/libkonq.mo +share/locale/sk/LC_MESSAGES/libkpgp.mo share/locale/sk/LC_MESSAGES/libkpimexchange.mo share/locale/sk/LC_MESSAGES/libkscan.mo share/locale/sk/LC_MESSAGES/libkscreensaver.mo @@ -1239,7 +1312,9 @@ share/locale/sk/LC_MESSAGES/lskat.mo share/locale/sk/LC_MESSAGES/lyrics.mo share/locale/sk/LC_MESSAGES/mediaapplet.mo share/locale/sk/LC_MESSAGES/mediacontrol.mo +share/locale/sk/LC_MESSAGES/mf_konqplugin.mo share/locale/sk/LC_MESSAGES/minitoolsplugin.mo +share/locale/sk/LC_MESSAGES/multisynk.mo share/locale/sk/LC_MESSAGES/naughtyapplet.mo share/locale/sk/LC_MESSAGES/nexscope.mo share/locale/sk/LC_MESSAGES/noatun.mo @@ -1254,9 +1329,11 @@ share/locale/sk/LC_MESSAGES/rellinks.mo share/locale/sk/LC_MESSAGES/searchbarplugin.mo share/locale/sk/LC_MESSAGES/secpolicy.mo share/locale/sk/LC_MESSAGES/spy.mo +share/locale/sk/LC_MESSAGES/superkaramba.mo share/locale/sk/LC_MESSAGES/synaescope.mo share/locale/sk/LC_MESSAGES/timezones.mo share/locale/sk/LC_MESSAGES/tippecanoe.mo +share/locale/sk/LC_MESSAGES/trashapplet.mo share/locale/sk/LC_MESSAGES/tyler.mo share/locale/sk/LC_MESSAGES/uachangerplugin.mo share/locale/sk/LC_MESSAGES/umbrello.mo diff --git a/misc/kde3-i18n-sl/distinfo b/misc/kde3-i18n-sl/distinfo index 7c44d5245283..2f66f43feb20 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.3.tar.bz2) = 49f0579ca96ecbe65cee0ad13e2fd144 -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.3.tar.bz2) = 0b07ad024182fe1a2fa64f82b49bfa1f1517ad5db9e73d23c8fe6199aa2ccdba -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.3.tar.bz2) = 4459131 +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 diff --git a/misc/kde3-i18n-sl/pkg-plist b/misc/kde3-i18n-sl/pkg-plist index e0a3531dac97..d59a8173525c 100644 --- a/misc/kde3-i18n-sl/pkg-plist +++ b/misc/kde3-i18n-sl/pkg-plist @@ -629,7 +629,6 @@ share/locale/sl/LC_MESSAGES/kmathapplet.mo share/locale/sl/LC_MESSAGES/kmcop.mo share/locale/sl/LC_MESSAGES/kmenuapplet.mo share/locale/sl/LC_MESSAGES/kmenuedit.mo -share/locale/sl/LC_MESSAGES/kmessedwords.mo share/locale/sl/LC_MESSAGES/kmid.mo share/locale/sl/LC_MESSAGES/kmilo_delli8k.mo share/locale/sl/LC_MESSAGES/kmilo_generic.mo @@ -664,7 +663,9 @@ share/locale/sl/LC_MESSAGES/konnector_kcal.mo share/locale/sl/LC_MESSAGES/konnector_local.mo share/locale/sl/LC_MESSAGES/konnector_qtopia.mo share/locale/sl/LC_MESSAGES/konnector_remote.mo +share/locale/sl/LC_MESSAGES/konqsidebar_delicious.mo share/locale/sl/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/sl/LC_MESSAGES/konqsidebar_metabar.mo share/locale/sl/LC_MESSAGES/konqsidebar_news.mo share/locale/sl/LC_MESSAGES/konqueror.mo share/locale/sl/LC_MESSAGES/konquest.mo @@ -824,6 +825,7 @@ share/locale/sl/LC_MESSAGES/lskat.mo share/locale/sl/LC_MESSAGES/lyrics.mo share/locale/sl/LC_MESSAGES/mediaapplet.mo share/locale/sl/LC_MESSAGES/mediacontrol.mo +share/locale/sl/LC_MESSAGES/mf_konqplugin.mo share/locale/sl/LC_MESSAGES/minitoolsplugin.mo share/locale/sl/LC_MESSAGES/multisynk.mo share/locale/sl/LC_MESSAGES/naughtyapplet.mo diff --git a/misc/kde3-i18n-sr/distinfo b/misc/kde3-i18n-sr/distinfo index f28c0017a533..be96771e41a0 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.3.tar.bz2) = d8823f8b5765a61b290346257c660c61 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.3.tar.bz2) = 62ffab2bdc5670389e115310b381ad6adf78f05b9bc3e8d207f480b4ccaeb02b -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.3.tar.bz2) = 2622662 +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 diff --git a/misc/kde3-i18n-sr@Latn/distinfo b/misc/kde3-i18n-sr@Latn/distinfo index 3b3635dcead9..578a7d38b6a0 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.3.tar.bz2) = fc3b8a8a9fef5da8985b77b187ee8543 -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.3.tar.bz2) = a6f72acdb120aa8b02aff14045a5e2f88fbe1bbcf9ffc4aabbe2cc6ff107a8c3 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.3.tar.bz2) = 2613579 +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 diff --git a/misc/kde3-i18n-sr_Latn/distinfo b/misc/kde3-i18n-sr_Latn/distinfo index 3b3635dcead9..578a7d38b6a0 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.3.tar.bz2) = fc3b8a8a9fef5da8985b77b187ee8543 -SHA256 (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.3.tar.bz2) = a6f72acdb120aa8b02aff14045a5e2f88fbe1bbcf9ffc4aabbe2cc6ff107a8c3 -SIZE (KDE/kde-i18n/kde-i18n-sr@Latn-3.5.3.tar.bz2) = 2613579 +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 diff --git a/misc/kde3-i18n-ss/distinfo b/misc/kde3-i18n-ss/distinfo index 3277c636bb88..00975ec9dca8 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.3.tar.bz2) = 3c94565a2526224e43fac55b6b12e745 -SHA256 (KDE/kde-i18n/kde-i18n-ss-3.5.3.tar.bz2) = 289c91819ba79b6bbabfcc23937c64b88bd3ea513196c632e0f19e3ef5c47f66 -SIZE (KDE/kde-i18n/kde-i18n-ss-3.5.3.tar.bz2) = 649891 +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 diff --git a/misc/kde3-i18n-sv/distinfo b/misc/kde3-i18n-sv/distinfo index fa8ccc63b59b..dee2774642e5 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.3.tar.bz2) = dad7a462acf4dc90790aaeb63320e839 -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.3.tar.bz2) = 64cd304d3c491131a3f5baa32f7ccc7d89132aed2295bf03534cbe666aedfb06 -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.3.tar.bz2) = 28388570 +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 diff --git a/misc/kde3-i18n-sv/pkg-plist b/misc/kde3-i18n-sv/pkg-plist index a46707c96cf3..ed3c1a3c11d5 100644 --- a/misc/kde3-i18n-sv/pkg-plist +++ b/misc/kde3-i18n-sv/pkg-plist @@ -971,6 +971,9 @@ share/doc/HTML/sv/kig/text_label_wizard__select_property.png share/doc/HTML/sv/kinfocenter/blockdevices/common share/doc/HTML/sv/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/sv/kinfocenter/blockdevices/index.docbook +share/doc/HTML/sv/kinfocenter/cdinfo/common +share/doc/HTML/sv/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/sv/kinfocenter/cdinfo/index.docbook share/doc/HTML/sv/kinfocenter/common share/doc/HTML/sv/kinfocenter/devices/common share/doc/HTML/sv/kinfocenter/devices/index.cache.bz2 @@ -2890,6 +2893,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kinfocenter/interrupts @dirrm share/doc/HTML/sv/kinfocenter/dma @dirrm share/doc/HTML/sv/kinfocenter/devices +@dirrm share/doc/HTML/sv/kinfocenter/cdinfo @dirrm share/doc/HTML/sv/kinfocenter/blockdevices @dirrm share/doc/HTML/sv/kinfocenter @dirrm share/doc/HTML/sv/kig diff --git a/misc/kde3-i18n-ta/distinfo b/misc/kde3-i18n-ta/distinfo index acf29435bc76..9a26f11b3a09 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.3.tar.bz2) = 987f75a1f89abaa6f3562ef94d75d84d -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.3.tar.bz2) = 32499427d70a68836ee63d28df1cfeb2329801cc1d5bbf94d52d83dddc249879 -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.3.tar.bz2) = 2113656 +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 diff --git a/misc/kde3-i18n-ta/pkg-plist b/misc/kde3-i18n-ta/pkg-plist index 71246b1f0b5c..3354190f6e26 100644 --- a/misc/kde3-i18n-ta/pkg-plist +++ b/misc/kde3-i18n-ta/pkg-plist @@ -321,7 +321,6 @@ share/locale/ta/LC_MESSAGES/kmathapplet.mo share/locale/ta/LC_MESSAGES/kmcop.mo share/locale/ta/LC_MESSAGES/kmenuapplet.mo share/locale/ta/LC_MESSAGES/kmenuedit.mo -share/locale/ta/LC_MESSAGES/kmessedwords.mo share/locale/ta/LC_MESSAGES/kmid.mo share/locale/ta/LC_MESSAGES/kmilo_delli8k.mo share/locale/ta/LC_MESSAGES/kmilo_generic.mo @@ -480,7 +479,6 @@ share/locale/ta/LC_MESSAGES/libdmctl.mo share/locale/ta/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ta/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/ta/LC_MESSAGES/libkcal.mo -share/locale/ta/LC_MESSAGES/libkcalsystem.mo share/locale/ta/LC_MESSAGES/libkcddb.mo share/locale/ta/LC_MESSAGES/libkdegames.mo share/locale/ta/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde3-i18n-tg/distinfo b/misc/kde3-i18n-tg/distinfo index 445236af881c..dc7398a1d6eb 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.3.tar.bz2) = b5964f459c74b57349ddd5f3934bc93f -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.3.tar.bz2) = d873bdb042330efe2c7a8ed56463a8acc5d6402f5aae3c1931ee6d6bac15f896 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.3.tar.bz2) = 2118659 +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 diff --git a/misc/kde3-i18n-tg/pkg-plist b/misc/kde3-i18n-tg/pkg-plist index 5d0a5ee7a42a..e169e74231f8 100644 --- a/misc/kde3-i18n-tg/pkg-plist +++ b/misc/kde3-i18n-tg/pkg-plist @@ -307,7 +307,6 @@ share/locale/tg/LC_MESSAGES/kmathapplet.mo share/locale/tg/LC_MESSAGES/kmcop.mo share/locale/tg/LC_MESSAGES/kmenuapplet.mo share/locale/tg/LC_MESSAGES/kmenuedit.mo -share/locale/tg/LC_MESSAGES/kmessedwords.mo share/locale/tg/LC_MESSAGES/kmid.mo share/locale/tg/LC_MESSAGES/kmilo_generic.mo share/locale/tg/LC_MESSAGES/kmilo_kvaio.mo @@ -450,8 +449,8 @@ share/locale/tg/LC_MESSAGES/kxsconfig.mo share/locale/tg/LC_MESSAGES/kxsldbg.mo share/locale/tg/LC_MESSAGES/libKTTSD.mo share/locale/tg/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/tg/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/tg/LC_MESSAGES/libkcal.mo -share/locale/tg/LC_MESSAGES/libkcalsystem.mo share/locale/tg/LC_MESSAGES/libkcddb.mo share/locale/tg/LC_MESSAGES/libkdeedu.mo share/locale/tg/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-tr/distinfo b/misc/kde3-i18n-tr/distinfo index e3b80bf92416..d5f37c24edae 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.3.tar.bz2) = 598d5f55f9e4512757ee40f802968097 -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.3.tar.bz2) = 388e39ce97865da1980cf8a7c79264fe1e6fe358f680958356cff7cbb7951509 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.3.tar.bz2) = 2124704 +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 diff --git a/misc/kde3-i18n-tr/pkg-plist b/misc/kde3-i18n-tr/pkg-plist index fad26d5dc0bf..6f5fa4455217 100644 --- a/misc/kde3-i18n-tr/pkg-plist +++ b/misc/kde3-i18n-tr/pkg-plist @@ -557,7 +557,6 @@ share/locale/tr/LC_MESSAGES/libdmctl.mo share/locale/tr/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/tr/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/tr/LC_MESSAGES/libkcal.mo -share/locale/tr/LC_MESSAGES/libkcalsystem.mo share/locale/tr/LC_MESSAGES/libkcddb.mo share/locale/tr/LC_MESSAGES/libkdeedu.mo share/locale/tr/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde3-i18n-uz/distinfo b/misc/kde3-i18n-uz/distinfo index f57856b6f86c..47c41bb9e844 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.3.tar.bz2) = b9a8858a6288a8288265c6130c022130 -SHA256 (KDE/kde-i18n/kde-i18n-uz-3.5.3.tar.bz2) = fd5633816e3d6168c867be80c1bfa26ef652dc236f0ce461300897272af76cc4 -SIZE (KDE/kde-i18n/kde-i18n-uz-3.5.3.tar.bz2) = 823617 +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 diff --git a/misc/kde4-i18n-is/distinfo b/misc/kde4-i18n-is/distinfo index 52b2c671e589..e861df656248 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.3.tar.bz2) = ecfd4dcb121a15fc69af80354d48d0f1 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = ef847f5d9764aabc0c7822e46a0ae11fe190e283cafc25e50f1a763227e08ccb -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = 2088209 +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 diff --git a/misc/kde4-i18n-is/pkg-plist b/misc/kde4-i18n-is/pkg-plist index f7b85523583c..2915f1a33821 100644 --- a/misc/kde4-i18n-is/pkg-plist +++ b/misc/kde4-i18n-is/pkg-plist @@ -331,7 +331,6 @@ share/locale/is/LC_MESSAGES/kmathapplet.mo share/locale/is/LC_MESSAGES/kmcop.mo share/locale/is/LC_MESSAGES/kmenuapplet.mo share/locale/is/LC_MESSAGES/kmenuedit.mo -share/locale/is/LC_MESSAGES/kmessedwords.mo share/locale/is/LC_MESSAGES/kmid.mo share/locale/is/LC_MESSAGES/kmilo_delli8k.mo share/locale/is/LC_MESSAGES/kmilo_generic.mo @@ -497,7 +496,6 @@ share/locale/is/LC_MESSAGES/libdmctl.mo share/locale/is/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/is/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/is/LC_MESSAGES/libkcal.mo -share/locale/is/LC_MESSAGES/libkcalsystem.mo share/locale/is/LC_MESSAGES/libkcddb.mo share/locale/is/LC_MESSAGES/libkdeedu.mo share/locale/is/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde4-l10n-bg/distinfo b/misc/kde4-l10n-bg/distinfo index 3f27331d0a23..25440aab4d9f 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.3.tar.bz2) = 5ee352d11d976d133343575c0267e7df -SHA256 (KDE/kde-i18n/kde-i18n-bg-3.5.3.tar.bz2) = 987c52b61132f29b438cde3307cf7fffe0cbcdfe08fac293bb97ecd5d9153117 -SIZE (KDE/kde-i18n/kde-i18n-bg-3.5.3.tar.bz2) = 1717598 +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 diff --git a/misc/kde4-l10n-ca/distinfo b/misc/kde4-l10n-ca/distinfo index 4ce2a98f48ad..f2a1f0d04da5 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.3.tar.bz2) = c9519abf1f62bf69a7288f4144d680c9 -SHA256 (KDE/kde-i18n/kde-i18n-ca-3.5.3.tar.bz2) = e964396956187dcf96120402ac1f7e4e38aa5bcedbc8bd3e37f025ce29073a8b -SIZE (KDE/kde-i18n/kde-i18n-ca-3.5.3.tar.bz2) = 4592584 +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 diff --git a/misc/kde4-l10n-ca/pkg-plist b/misc/kde4-l10n-ca/pkg-plist index 02ea0c525727..d5c4c96c0495 100644 --- a/misc/kde4-l10n-ca/pkg-plist +++ b/misc/kde4-l10n-ca/pkg-plist @@ -36,9 +36,12 @@ share/doc/HTML/ca/kate-plugins/textfilter.docbook 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/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/man-kate.1.docbook share/doc/HTML/ca/kate/mdi.docbook share/doc/HTML/ca/kate/menus.docbook @@ -392,6 +395,9 @@ share/doc/HTML/ca/kicker/man-kicker.1.docbook share/doc/HTML/ca/kinfocenter/blockdevices/common share/doc/HTML/ca/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/ca/kinfocenter/blockdevices/index.docbook +share/doc/HTML/ca/kinfocenter/cdinfo/common +share/doc/HTML/ca/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/ca/kinfocenter/cdinfo/index.docbook share/doc/HTML/ca/kinfocenter/common share/doc/HTML/ca/kinfocenter/devices/common share/doc/HTML/ca/kinfocenter/devices/index.cache.bz2 @@ -722,6 +728,9 @@ share/doc/HTML/ca/kteatime/index.docbook share/doc/HTML/ca/ktimer/common share/doc/HTML/ca/ktimer/index.cache.bz2 share/doc/HTML/ca/ktimer/index.docbook +share/doc/HTML/ca/ktnef/common +share/doc/HTML/ca/ktnef/index.cache.bz2 +share/doc/HTML/ca/ktnef/index.docbook share/doc/HTML/ca/ktouch/common share/doc/HTML/ca/ktouch/index.cache.bz2 share/doc/HTML/ca/ktouch/index.docbook @@ -1375,6 +1384,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kturtle @dirrm share/doc/HTML/ca/kttsd @dirrm share/doc/HTML/ca/ktouch +@dirrm share/doc/HTML/ca/ktnef @dirrm share/doc/HTML/ca/ktimer @dirrm share/doc/HTML/ca/kteatime @dirrm share/doc/HTML/ca/ksysv @@ -1441,6 +1451,7 @@ share/locale/ca/flag.png @dirrm share/doc/HTML/ca/kinfocenter/interrupts @dirrm share/doc/HTML/ca/kinfocenter/dma @dirrm share/doc/HTML/ca/kinfocenter/devices +@dirrm share/doc/HTML/ca/kinfocenter/cdinfo @dirrm share/doc/HTML/ca/kinfocenter/blockdevices @dirrm share/doc/HTML/ca/kinfocenter @dirrm share/doc/HTML/ca/kicker-applets diff --git a/misc/kde4-l10n-cs/distinfo b/misc/kde4-l10n-cs/distinfo index 9f98ab9432ac..46924108f34a 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.3.tar.bz2) = e7a350afd2914188449749f10ad6d0bf -SHA256 (KDE/kde-i18n/kde-i18n-cs-3.5.3.tar.bz2) = 33584edd9d00e51733cbbd49ca2ce47fe5b7fd980f06807559d75a340d735c3f -SIZE (KDE/kde-i18n/kde-i18n-cs-3.5.3.tar.bz2) = 3360743 +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 diff --git a/misc/kde4-l10n-cs/pkg-plist b/misc/kde4-l10n-cs/pkg-plist index 766405cf6e5d..042a5f981bb0 100644 --- a/misc/kde4-l10n-cs/pkg-plist +++ b/misc/kde4-l10n-cs/pkg-plist @@ -510,7 +510,6 @@ share/locale/cs/LC_MESSAGES/kmathtool.mo share/locale/cs/LC_MESSAGES/kmcop.mo share/locale/cs/LC_MESSAGES/kmenuapplet.mo share/locale/cs/LC_MESSAGES/kmenuedit.mo -share/locale/cs/LC_MESSAGES/kmessedwords.mo share/locale/cs/LC_MESSAGES/kmid.mo share/locale/cs/LC_MESSAGES/kmilo_delli8k.mo share/locale/cs/LC_MESSAGES/kmilo_generic.mo @@ -691,7 +690,6 @@ share/locale/cs/LC_MESSAGES/libdmctl.mo share/locale/cs/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/cs/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/cs/LC_MESSAGES/libkcal.mo -share/locale/cs/LC_MESSAGES/libkcalsystem.mo share/locale/cs/LC_MESSAGES/libkcddb.mo share/locale/cs/LC_MESSAGES/libkdeedu.mo share/locale/cs/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde4-l10n-da/distinfo b/misc/kde4-l10n-da/distinfo index 4a51ee74189a..ae07f5515ee1 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.3.tar.bz2) = 0e347230250eb65f8f6722ecacbaface -SHA256 (KDE/kde-i18n/kde-i18n-da-3.5.3.tar.bz2) = 193c2e10724f491786206addaa689804c54e5911a203a00f8f4492ec3abbe603 -SIZE (KDE/kde-i18n/kde-i18n-da-3.5.3.tar.bz2) = 12255073 +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 diff --git a/misc/kde4-l10n-el/distinfo b/misc/kde4-l10n-el/distinfo index 7dcea075a996..c91d76b9470e 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.3.tar.bz2) = aeeea7a9079ff5fd8f0bcfd34452ee4e -SHA256 (KDE/kde-i18n/kde-i18n-el-3.5.3.tar.bz2) = 59853b7b7838e98b170ed14c907ff5ac2fd018340b141ee335f875e9a2afb23e -SIZE (KDE/kde-i18n/kde-i18n-el-3.5.3.tar.bz2) = 2241168 +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 diff --git a/misc/kde4-l10n-en_GB/distinfo b/misc/kde4-l10n-en_GB/distinfo index 5e4473b8375e..cfba5a263cd5 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.3.tar.bz2) = 1029cfba62fdd93fa2dc900111df2a4c -SHA256 (KDE/kde-i18n/kde-i18n-en_GB-3.5.3.tar.bz2) = 8ceb5f25cf15916d72ad2456b6bae1be1155096f8b85d2a5e2f3c485a6bafb9c -SIZE (KDE/kde-i18n/kde-i18n-en_GB-3.5.3.tar.bz2) = 3686136 +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 diff --git a/misc/kde4-l10n-eo/distinfo b/misc/kde4-l10n-eo/distinfo index af4aa177626b..c950b7bb5362 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.3.tar.bz2) = e7e799e9c6d92149a8e6716906652c53 -SHA256 (KDE/kde-i18n/kde-i18n-eo-3.5.3.tar.bz2) = ab47e01abd8693be638cb2f18f47f2cc466b1418d060aff199b21a1cb4db772b -SIZE (KDE/kde-i18n/kde-i18n-eo-3.5.3.tar.bz2) = 1265674 +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 diff --git a/misc/kde4-l10n-eo/pkg-plist b/misc/kde4-l10n-eo/pkg-plist index a0e4e400036c..c04ac596ad9e 100644 --- a/misc/kde4-l10n-eo/pkg-plist +++ b/misc/kde4-l10n-eo/pkg-plist @@ -20,7 +20,6 @@ share/locale/eo/LC_MESSAGES/imgalleryplugin.mo share/locale/eo/LC_MESSAGES/joystick.mo share/locale/eo/LC_MESSAGES/kabc_dir.mo share/locale/eo/LC_MESSAGES/kabc_file.mo -share/locale/eo/LC_MESSAGES/kabc_ldap.mo share/locale/eo/LC_MESSAGES/kabc_ldapkio.mo share/locale/eo/LC_MESSAGES/kabc_net.mo share/locale/eo/LC_MESSAGES/kabc_sql.mo diff --git a/misc/kde4-l10n-es/distinfo b/misc/kde4-l10n-es/distinfo index 2096ea099c12..23d46b6c04eb 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.3.tar.bz2) = a84067e863f9c4eb6fdc1f64d03010b9 -SHA256 (KDE/kde-i18n/kde-i18n-es-3.5.3.tar.bz2) = ec1786fb7de4ec560638ae023d1dad1ba4c578375125174f15296c9f18d93aba -SIZE (KDE/kde-i18n/kde-i18n-es-3.5.3.tar.bz2) = 36178083 +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 diff --git a/misc/kde4-l10n-es/pkg-plist b/misc/kde4-l10n-es/pkg-plist index 7edccdfe2011..a270104fbf75 100644 --- a/misc/kde4-l10n-es/pkg-plist +++ b/misc/kde4-l10n-es/pkg-plist @@ -205,9 +205,6 @@ share/doc/HTML/es/KRegExpEditor/wordboundary.png share/doc/HTML/es/akregator/common share/doc/HTML/es/akregator/index.cache.bz2 share/doc/HTML/es/akregator/index.docbook -share/doc/HTML/es/aktion/common -share/doc/HTML/es/aktion/index.cache.bz2 -share/doc/HTML/es/aktion/index.docbook share/doc/HTML/es/amor/billy.png share/doc/HTML/es/amor/bonhomme.png share/doc/HTML/es/amor/bsd.png @@ -226,6 +223,7 @@ share/doc/HTML/es/amor/worm.png share/doc/HTML/es/api/Architecture.png share/doc/HTML/es/api/Development.png share/doc/HTML/es/api/Dox-pimlogo.png +share/doc/HTML/es/api/datetimewidgets.png share/doc/HTML/es/api/kcarddialog.png share/doc/HTML/es/api/kcharselect.png share/doc/HTML/es/api/kcolorbutton.png @@ -351,9 +349,6 @@ share/doc/HTML/es/docs/common/kde-localised.css share/doc/HTML/es/docs/common/kde_logo.png share/doc/HTML/es/docs/common/lgpl-translated.html share/doc/HTML/es/docs/common/logotp3.png -share/doc/HTML/es/flashkard/common -share/doc/HTML/es/flashkard/index.cache.bz2 -share/doc/HTML/es/flashkard/index.docbook share/doc/HTML/es/juk/common share/doc/HTML/es/juk/history-playlist.png share/doc/HTML/es/juk/index.cache.bz2 @@ -666,9 +661,6 @@ share/doc/HTML/es/kcontrol/icons/index.cache.bz2 share/doc/HTML/es/kcontrol/icons/index.docbook share/doc/HTML/es/kcontrol/index.cache.bz2 share/doc/HTML/es/kcontrol/index.docbook -share/doc/HTML/es/kcontrol/kalarmd/common -share/doc/HTML/es/kcontrol/kalarmd/index.cache.bz2 -share/doc/HTML/es/kcontrol/kalarmd/index.docbook share/doc/HTML/es/kcontrol/kcmaccess/common share/doc/HTML/es/kcontrol/kcmaccess/index.cache.bz2 share/doc/HTML/es/kcontrol/kcmaccess/index.docbook @@ -718,18 +710,12 @@ share/doc/HTML/es/kcontrol/khtml/common share/doc/HTML/es/kcontrol/khtml/index.cache.bz2 share/doc/HTML/es/kcontrol/khtml/index.docbook share/doc/HTML/es/kcontrol/khtml/nsplugin.docbook -share/doc/HTML/es/kcontrol/kmixcfg/common -share/doc/HTML/es/kcontrol/kmixcfg/index.cache.bz2 -share/doc/HTML/es/kcontrol/kmixcfg/index.docbook share/doc/HTML/es/kcontrol/kthememgr/common share/doc/HTML/es/kcontrol/kthememgr/index.cache.bz2 share/doc/HTML/es/kcontrol/kthememgr/index.docbook share/doc/HTML/es/kcontrol/kwindecoration/common share/doc/HTML/es/kcontrol/kwindecoration/index.cache.bz2 share/doc/HTML/es/kcontrol/kwindecoration/index.docbook -share/doc/HTML/es/kcontrol/kxmlrpcd/common -share/doc/HTML/es/kcontrol/kxmlrpcd/index.cache.bz2 -share/doc/HTML/es/kcontrol/kxmlrpcd/index.docbook share/doc/HTML/es/kcontrol/lanbrowser/common share/doc/HTML/es/kcontrol/lanbrowser/index.cache.bz2 share/doc/HTML/es/kcontrol/lanbrowser/index.docbook @@ -895,6 +881,9 @@ share/doc/HTML/es/kdesu/common share/doc/HTML/es/kdesu/index.cache.bz2 share/doc/HTML/es/kdesu/index.docbook share/doc/HTML/es/kdesu/man-kdesu.1.docbook +share/doc/HTML/es/kdesvn-build/common +share/doc/HTML/es/kdesvn-build/index.cache.bz2 +share/doc/HTML/es/kdesvn-build/index.docbook share/doc/HTML/es/kdevelop/SF-general.png share/doc/HTML/es/kdevelop/SF-indent.png share/doc/HTML/es/kdevelop/SF-other.png @@ -1134,7 +1123,6 @@ share/doc/HTML/es/khelpcenter/quickstart/index.docbook share/doc/HTML/es/khelpcenter/shadow1.png share/doc/HTML/es/khelpcenter/support.docbook share/doc/HTML/es/khelpcenter/userguide/a-window.png -share/doc/HTML/es/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/es/khelpcenter/userguide/accessibility.docbook share/doc/HTML/es/khelpcenter/userguide/amarok-icon.png share/doc/HTML/es/khelpcenter/userguide/amarok.png @@ -1149,18 +1137,13 @@ share/doc/HTML/es/khelpcenter/userguide/desktop.png share/doc/HTML/es/khelpcenter/userguide/email.docbook share/doc/HTML/es/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/es/khelpcenter/userguide/file-sharing.docbook -share/doc/HTML/es/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/es/khelpcenter/userguide/font-installation.docbook share/doc/HTML/es/khelpcenter/userguide/getting-help.docbook -share/doc/HTML/es/khelpcenter/userguide/getting-started.docbook share/doc/HTML/es/khelpcenter/userguide/glossary.docbook share/doc/HTML/es/khelpcenter/userguide/groupware-kontact.docbook -share/doc/HTML/es/khelpcenter/userguide/history.docbook share/doc/HTML/es/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/es/khelpcenter/userguide/index.docbook -share/doc/HTML/es/khelpcenter/userguide/installation.docbook share/doc/HTML/es/khelpcenter/userguide/internet-shortcuts.docbook -share/doc/HTML/es/khelpcenter/userguide/intro.docbook share/doc/HTML/es/khelpcenter/userguide/juk-icon.png share/doc/HTML/es/khelpcenter/userguide/juk.png share/doc/HTML/es/khelpcenter/userguide/kaboodle-icon.png @@ -1171,18 +1154,7 @@ share/doc/HTML/es/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/es/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/es/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/es/khelpcenter/userguide/kde-office.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeadmin-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdebase-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeedu-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdegames-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdegraphics-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdemultimedia-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdenetwork-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdepim-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdetoys-apps.docbook -share/doc/HTML/es/khelpcenter/userguide/kdeutils-apps.docbook share/doc/HTML/es/khelpcenter/userguide/kmag.png -share/doc/HTML/es/khelpcenter/userguide/kmenu.png share/doc/HTML/es/khelpcenter/userguide/kmousetool.png share/doc/HTML/es/khelpcenter/userguide/kmouth.png share/doc/HTML/es/khelpcenter/userguide/kmouth2.png @@ -1191,7 +1163,6 @@ share/doc/HTML/es/khelpcenter/userguide/knode-identity.png share/doc/HTML/es/khelpcenter/userguide/knode-mail-account.png share/doc/HTML/es/khelpcenter/userguide/knode-news-account.png share/doc/HTML/es/khelpcenter/userguide/knode-start.png -share/doc/HTML/es/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/es/khelpcenter/userguide/konq-sidebar.png share/doc/HTML/es/khelpcenter/userguide/konq-simple.png share/doc/HTML/es/khelpcenter/userguide/konsole-intro.docbook @@ -1201,7 +1172,6 @@ share/doc/HTML/es/khelpcenter/userguide/kppp-wizard.png share/doc/HTML/es/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/es/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/es/khelpcenter/userguide/migrator-dictionary.docbook -share/doc/HTML/es/khelpcenter/userguide/more-help.docbook share/doc/HTML/es/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/es/khelpcenter/userguide/networking-with-windows.docbook share/doc/HTML/es/khelpcenter/userguide/noatun-icon.png @@ -1223,15 +1193,12 @@ share/doc/HTML/es/khelpcenter/userguide/ripsettings.png share/doc/HTML/es/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/es/khelpcenter/userguide/services.png share/doc/HTML/es/khelpcenter/userguide/shared-sessions.docbook -share/doc/HTML/es/khelpcenter/userguide/shortcuts.docbook -share/doc/HTML/es/khelpcenter/userguide/staff.docbook share/doc/HTML/es/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/es/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/es/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/es/khelpcenter/userguide/titlebar-menu.png share/doc/HTML/es/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/es/khelpcenter/userguide/troubleshooting-no-open.docbook -share/doc/HTML/es/khelpcenter/userguide/ug-faq.docbook share/doc/HTML/es/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/es/khelpcenter/userguide/usenet.docbook share/doc/HTML/es/khelpcenter/userguide/where-next.docbook @@ -1472,9 +1439,20 @@ share/doc/HTML/es/kmag/index.cache.bz2 share/doc/HTML/es/kmag/index.docbook share/doc/HTML/es/kmag/man-kmag.1.docbook share/doc/HTML/es/kmag/screenshot.png +share/doc/HTML/es/kmahjongg/background.png +share/doc/HTML/es/kmahjongg/boardeditor.png share/doc/HTML/es/kmahjongg/common +share/doc/HTML/es/kmahjongg/config.png +share/doc/HTML/es/kmahjongg/gamescreen.png +share/doc/HTML/es/kmahjongg/highscore.png share/doc/HTML/es/kmahjongg/index.cache.bz2 share/doc/HTML/es/kmahjongg/index.docbook +share/doc/HTML/es/kmahjongg/layout.png +share/doc/HTML/es/kmahjongg/numbered.png +share/doc/HTML/es/kmahjongg/shortcuts.png +share/doc/HTML/es/kmahjongg/showremoved.png +share/doc/HTML/es/kmahjongg/theme.png +share/doc/HTML/es/kmahjongg/tileset.png share/doc/HTML/es/kmail/common share/doc/HTML/es/kmail/configure.docbook share/doc/HTML/es/kmail/credits-and-licenses.docbook @@ -1486,20 +1464,8 @@ share/doc/HTML/es/kmail/index.docbook share/doc/HTML/es/kmail/intro.docbook share/doc/HTML/es/kmail/menus.docbook share/doc/HTML/es/kmail/using-kmail.docbook -share/doc/HTML/es/kmathtool/common -share/doc/HTML/es/kmathtool/index.cache.bz2 -share/doc/HTML/es/kmathtool/index.docbook share/doc/HTML/es/kmenuedit/common share/doc/HTML/es/kmenuedit/done.png -share/doc/HTML/es/kmenuedit/i_copy.png -share/doc/HTML/es/kmenuedit/i_cut.png -share/doc/HTML/es/kmenuedit/i_delete.png -share/doc/HTML/es/kmenuedit/i_k_button.png -share/doc/HTML/es/kmenuedit/i_new_item.png -share/doc/HTML/es/kmenuedit/i_new_submenu.png -share/doc/HTML/es/kmenuedit/i_paste.png -share/doc/HTML/es/kmenuedit/icon_sets.png -share/doc/HTML/es/kmenuedit/icons.png share/doc/HTML/es/kmenuedit/index.cache.bz2 share/doc/HTML/es/kmenuedit/index.docbook share/doc/HTML/es/kmenuedit/itemname.png @@ -1507,11 +1473,6 @@ share/doc/HTML/es/kmenuedit/kmenueditmain.png share/doc/HTML/es/kmenuedit/new.png share/doc/HTML/es/kmenuedit/selecticon.png share/doc/HTML/es/kmenuedit/selectinternet.png -share/doc/HTML/es/kmessedwords/common -share/doc/HTML/es/kmessedwords/index.cache.bz2 -share/doc/HTML/es/kmessedwords/index.docbook -share/doc/HTML/es/kmessedwords/kmw1.png -share/doc/HTML/es/kmessedwords/kmw2.png share/doc/HTML/es/kmid/common share/doc/HTML/es/kmid/index.cache.bz2 share/doc/HTML/es/kmid/index.docbook @@ -1549,8 +1510,6 @@ share/doc/HTML/es/kmouth/kmouthmain.png share/doc/HTML/es/kmouth/kmouthwizard.eps share/doc/HTML/es/kmouth/kmouthwizard.png share/doc/HTML/es/kmouth/man-kmouth.1.docbook -share/doc/HTML/es/kmplot/axesdlg.png -share/doc/HTML/es/kmplot/axesopt.png share/doc/HTML/es/kmplot/commands.docbook share/doc/HTML/es/kmplot/common share/doc/HTML/es/kmplot/configuration.docbook @@ -1559,8 +1518,6 @@ share/doc/HTML/es/kmplot/dcop.docbook share/doc/HTML/es/kmplot/developer.docbook share/doc/HTML/es/kmplot/edu-logo.png share/doc/HTML/es/kmplot/firststeps.docbook -share/doc/HTML/es/kmplot/functionsdlg.png -share/doc/HTML/es/kmplot/griddlg.png share/doc/HTML/es/kmplot/index.cache.bz2 share/doc/HTML/es/kmplot/index.docbook share/doc/HTML/es/kmplot/install.docbook @@ -1569,17 +1526,15 @@ share/doc/HTML/es/kmplot/kfkt.png share/doc/HTML/es/kmplot/ksys1.png share/doc/HTML/es/kmplot/ksys2.png share/doc/HTML/es/kmplot/ksys3.png -share/doc/HTML/es/kmplot/lo32-app-kmplot.png share/doc/HTML/es/kmplot/main.png share/doc/HTML/es/kmplot/man-kmplot.1.docbook share/doc/HTML/es/kmplot/menu.docbook -share/doc/HTML/es/kmplot/namesdlg.png share/doc/HTML/es/kmplot/reference.docbook -share/doc/HTML/es/kmplot/scaledlg.png +share/doc/HTML/es/kmplot/settings-colors.png +share/doc/HTML/es/kmplot/settings-fonts.png +share/doc/HTML/es/kmplot/settings-scaling.png share/doc/HTML/es/kmplot/settingsdlg.png -share/doc/HTML/es/kmplot/stepdlg.png share/doc/HTML/es/kmplot/threeplots.png -share/doc/HTML/es/kmplot/toolbar.png share/doc/HTML/es/kmplot/using.docbook share/doc/HTML/es/knetattach/common share/doc/HTML/es/knetattach/index.cache.bz2 @@ -1770,7 +1725,6 @@ share/doc/HTML/es/kompmgr/common share/doc/HTML/es/kompmgr/index.cache.bz2 share/doc/HTML/es/kompmgr/index.docbook share/doc/HTML/es/konq-plugins/babel/common -share/doc/HTML/es/konq-plugins/babel/cr16-action-babelfish.png share/doc/HTML/es/konq-plugins/babel/index.cache.bz2 share/doc/HTML/es/konq-plugins/babel/index.docbook share/doc/HTML/es/konq-plugins/common @@ -1827,14 +1781,10 @@ share/doc/HTML/es/konqueror/dirtree.png share/doc/HTML/es/konqueror/dragdrop.png share/doc/HTML/es/konqueror/faq.docbook share/doc/HTML/es/konqueror/filemanager.docbook -share/doc/HTML/es/konqueror/filetype1.png -share/doc/HTML/es/konqueror/filetype3.png -share/doc/HTML/es/konqueror/filetype4.png share/doc/HTML/es/konqueror/index.cache.bz2 share/doc/HTML/es/konqueror/index.docbook share/doc/HTML/es/konqueror/introduction.docbook share/doc/HTML/es/konqueror/konqorg.png -share/doc/HTML/es/konqueror/konqueror.png share/doc/HTML/es/konqueror/man-kbookmarkmerger.1.docbook share/doc/HTML/es/konqueror/parts.png share/doc/HTML/es/konqueror/path-complete.docbook @@ -1860,6 +1810,8 @@ share/doc/HTML/es/kontact/configuration-components.png share/doc/HTML/es/kontact/configuration-main.png share/doc/HTML/es/kontact/configuration-select-components.png share/doc/HTML/es/kontact/configuration-starting-component.png +share/doc/HTML/es/kontact/configuration-summary-view-kpilot.png +share/doc/HTML/es/kontact/configuration-summary-view.png share/doc/HTML/es/kontact/index.cache.bz2 share/doc/HTML/es/kontact/index.docbook share/doc/HTML/es/kontact/kaddressbook-sidebar-icon.png @@ -1877,7 +1829,6 @@ share/doc/HTML/es/kontact/summary-view-mail.png share/doc/HTML/es/kontact/summary-view-newsticker.png share/doc/HTML/es/kontact/summary-view-notes.png share/doc/HTML/es/kontact/summary-view-repositioning.png -share/doc/HTML/es/kontact/summary-view-special-dates.png share/doc/HTML/es/kontact/summary-view-todos.png share/doc/HTML/es/kontact/summary-view-weather.png share/doc/HTML/es/kontact/summary-view.png @@ -1899,16 +1850,54 @@ share/doc/HTML/es/kopete/index.cache.bz2 share/doc/HTML/es/kopete/index.docbook share/doc/HTML/es/kopete/menus.docbook share/doc/HTML/es/korganizer/common +share/doc/HTML/es/korganizer/event-attachments.png +share/doc/HTML/es/korganizer/event-attendees.png +share/doc/HTML/es/korganizer/event-freebusy.png +share/doc/HTML/es/korganizer/event-general.png +share/doc/HTML/es/korganizer/event-recurrence.png share/doc/HTML/es/korganizer/exchange-plugin.docbook share/doc/HTML/es/korganizer/group-scheduling.docbook +share/doc/HTML/es/korganizer/groupevent.png +share/doc/HTML/es/korganizer/i_actions_newevent.png +share/doc/HTML/es/korganizer/i_actions_newtodo.png +share/doc/HTML/es/korganizer/i_copy.png +share/doc/HTML/es/korganizer/i_cut.png +share/doc/HTML/es/korganizer/i_edit_delete.png +share/doc/HTML/es/korganizer/i_edit_find.png +share/doc/HTML/es/korganizer/i_edit_redo.png +share/doc/HTML/es/korganizer/i_edit_undo.png +share/doc/HTML/es/korganizer/i_file_close.png +share/doc/HTML/es/korganizer/i_file_new.png +share/doc/HTML/es/korganizer/i_file_open.png +share/doc/HTML/es/korganizer/i_file_print.png +share/doc/HTML/es/korganizer/i_file_quit.png +share/doc/HTML/es/korganizer/i_file_revert.png +share/doc/HTML/es/korganizer/i_file_save.png +share/doc/HTML/es/korganizer/i_file_saveas.png +share/doc/HTML/es/korganizer/i_go_backward.png +share/doc/HTML/es/korganizer/i_go_forward.png +share/doc/HTML/es/korganizer/i_go_to_today.png +share/doc/HTML/es/korganizer/i_paste.png +share/doc/HTML/es/korganizer/i_settings_prefs.png share/doc/HTML/es/korganizer/i_view_day.png share/doc/HTML/es/korganizer/i_view_journal.png share/doc/HTML/es/korganizer/i_view_list.png +share/doc/HTML/es/korganizer/i_view_month.png share/doc/HTML/es/korganizer/i_view_todo_list.png share/doc/HTML/es/korganizer/i_view_week.png +share/doc/HTML/es/korganizer/i_view_whatsnext.png +share/doc/HTML/es/korganizer/i_view_work_week.png +share/doc/HTML/es/korganizer/i_view_xdays.png share/doc/HTML/es/korganizer/index.cache.bz2 share/doc/HTML/es/korganizer/index.docbook share/doc/HTML/es/korganizer/korganizer-resource.png +share/doc/HTML/es/korganizer/o2v_importing1.png +share/doc/HTML/es/korganizer/o2v_importing2.png +share/doc/HTML/es/korganizer/o2v_importing3.png +share/doc/HTML/es/korganizer/o2v_main.png +share/doc/HTML/es/korganizer/o2v_progress.png +share/doc/HTML/es/korganizer/o2v_save.png +share/doc/HTML/es/korganizer/o2v_warning.png share/doc/HTML/es/korganizer/organizer.png share/doc/HTML/es/korganizer/outlook-to-vcalendar.docbook share/doc/HTML/es/korganizer/plugins-chapter.docbook @@ -2098,30 +2087,21 @@ share/doc/HTML/es/kppp/kppp-wizard.png share/doc/HTML/es/kppp/security.docbook share/doc/HTML/es/kppp/tricks.docbook share/doc/HTML/es/kppp/wizard.docbook -share/doc/HTML/es/krcd/authentication.eps -share/doc/HTML/es/krcd/authentication.png -share/doc/HTML/es/krcd/close.png -share/doc/HTML/es/krcd/krdc_window.eps -share/doc/HTML/es/krcd/krdc_window.png -share/doc/HTML/es/krcd/preferences_profilestab.eps -share/doc/HTML/es/krcd/preferences_profilestab.png -share/doc/HTML/es/krcd/preferences_rdpdefaultstab.eps -share/doc/HTML/es/krcd/preferences_rdpdefaultstab.png -share/doc/HTML/es/krcd/preferences_vncdefaultstab.eps -share/doc/HTML/es/krcd/preferences_vncdefaultstab.png -share/doc/HTML/es/krcd/snapshot.eps -share/doc/HTML/es/krcd/snapshot.png -share/doc/HTML/es/krcd/snapshot_connectionspeed.eps -share/doc/HTML/es/krcd/snapshot_connectionspeed.png -share/doc/HTML/es/krcd/snapshot_nobrowse.eps -share/doc/HTML/es/krcd/snapshot_nobrowse.png -share/doc/HTML/es/krcd/snapshot_vncentry.eps -share/doc/HTML/es/krcd/snapshot_vncentry.png -share/doc/HTML/es/krcd/window_fullscreen.png -share/doc/HTML/es/krcd/window_nofullscreen.png +share/doc/HTML/es/krdc/authentication.png +share/doc/HTML/es/krdc/close.png share/doc/HTML/es/krdc/common share/doc/HTML/es/krdc/index.cache.bz2 share/doc/HTML/es/krdc/index.docbook +share/doc/HTML/es/krdc/krdc_window.png +share/doc/HTML/es/krdc/preferences_profilestab.png +share/doc/HTML/es/krdc/preferences_rdpdefaultstab.png +share/doc/HTML/es/krdc/preferences_vncdefaultstab.png +share/doc/HTML/es/krdc/snapshot.png +share/doc/HTML/es/krdc/snapshot_connectionspeed.png +share/doc/HTML/es/krdc/snapshot_nobrowse.png +share/doc/HTML/es/krdc/snapshot_vncentry.png +share/doc/HTML/es/krdc/window_fullscreen.png +share/doc/HTML/es/krdc/window_nofullscreen.png share/doc/HTML/es/krec/common share/doc/HTML/es/krec/index.cache.bz2 share/doc/HTML/es/krec/index.docbook @@ -2154,7 +2134,6 @@ share/doc/HTML/es/kscd/common share/doc/HTML/es/kscd/index.cache.bz2 share/doc/HTML/es/kscd/index.docbook share/doc/HTML/es/kscd/kscd.png -share/doc/HTML/es/kscd/kscd1.png share/doc/HTML/es/kscd/kscd11.png share/doc/HTML/es/kscd/kscd12.png share/doc/HTML/es/kscd/kscd13.png @@ -2373,15 +2352,22 @@ share/doc/HTML/es/ktuberling/menu-game.png share/doc/HTML/es/ktuberling/menu-help.png share/doc/HTML/es/ktuberling/menu-playground.png share/doc/HTML/es/ktuberling/menu-raw.png +share/doc/HTML/es/ktuberling/menu-settings.png share/doc/HTML/es/ktuberling/menu-speech.png share/doc/HTML/es/ktuberling/technical-reference.docbook share/doc/HTML/es/ktuberling/toolbar.png +share/doc/HTML/es/kturtle/common share/doc/HTML/es/kturtle/forward.png share/doc/HTML/es/kturtle/getting-started.docbook +share/doc/HTML/es/kturtle/glossary.docbook +share/doc/HTML/es/kturtle/index.cache.bz2 +share/doc/HTML/es/kturtle/index.docbook share/doc/HTML/es/kturtle/mainwindow.png share/doc/HTML/es/kturtle/mainwindow_flower_nrs.png share/doc/HTML/es/kturtle/print.png +share/doc/HTML/es/kturtle/programming-reference.docbook share/doc/HTML/es/kturtle/translator-guide.docbook +share/doc/HTML/es/kturtle/using-kturtle.docbook share/doc/HTML/es/kturtle/wrapping.png share/doc/HTML/es/kuickshow/common share/doc/HTML/es/kuickshow/index.cache.bz2 @@ -2403,7 +2389,6 @@ share/doc/HTML/es/kverbos/index.cache.bz2 share/doc/HTML/es/kverbos/index.docbook share/doc/HTML/es/kverbos/input.png share/doc/HTML/es/kverbos/letters.png -share/doc/HTML/es/kverbos/lettres.png share/doc/HTML/es/kverbos/limpiar.png share/doc/HTML/es/kverbos/limpiarpagina.png share/doc/HTML/es/kverbos/mainscreen-leer.png @@ -2422,15 +2407,6 @@ share/doc/HTML/es/kview/index.cache.bz2 share/doc/HTML/es/kview/index.docbook share/doc/HTML/es/kview/kview-application-configuration.png share/doc/HTML/es/kview/kview-viewer-configuration.png -share/doc/HTML/es/kview/snapshot1.png -share/doc/HTML/es/kview/snapshot2.png -share/doc/HTML/es/kview/snapshot3.png -share/doc/HTML/es/kview/snapshot4.png -share/doc/HTML/es/kview/snapshot5.png -share/doc/HTML/es/kview/snapshot6.png -share/doc/HTML/es/kview/snapshot7.png -share/doc/HTML/es/kview/snapshot8.png -share/doc/HTML/es/kview/snapshot9.png share/doc/HTML/es/kvoctrain/art-query-dlg.png share/doc/HTML/es/kvoctrain/common share/doc/HTML/es/kvoctrain/comp-query-dlg.png @@ -2491,6 +2467,7 @@ 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/kwq-dlg-characters.png +share/doc/HTML/es/kwordquiz/kwq-dlg-configure-appearance.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-characters.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-editor.png share/doc/HTML/es/kwordquiz/kwq-dlg-configure-quiz.png @@ -2543,7 +2520,6 @@ share/doc/HTML/es/kxsldbg/credits.docbook share/doc/HTML/es/kxsldbg/entities.docbook share/doc/HTML/es/kxsldbg/entities_window.png share/doc/HTML/es/kxsldbg/exit.png -share/doc/HTML/es/kxsldbg/globals_window.png share/doc/HTML/es/kxsldbg/glossary.docbook share/doc/HTML/es/kxsldbg/index.cache.bz2 share/doc/HTML/es/kxsldbg/index.docbook @@ -2582,9 +2558,6 @@ share/doc/HTML/es/lisa/index.docbook share/doc/HTML/es/lskat/common share/doc/HTML/es/lskat/index.cache.bz2 share/doc/HTML/es/lskat/index.docbook -share/doc/HTML/es/megami/common -share/doc/HTML/es/megami/index.cache.bz2 -share/doc/HTML/es/megami/index.docbook share/doc/HTML/es/multisynk/common share/doc/HTML/es/multisynk/editdialog-conflicts.png share/doc/HTML/es/multisynk/editdialog.png @@ -2659,7 +2632,6 @@ share/doc/HTML/es/quanta/ttab.png share/doc/HTML/es/quanta/using-quanta.docbook share/doc/HTML/es/quanta/view_sidetree.png share/doc/HTML/es/quanta/vplsourceview.png -share/doc/HTML/es/quanta/vpsourceview.png share/doc/HTML/es/quanta/working-with-quanta.docbook share/doc/HTML/es/scripts/man-adddebug.1.docbook share/doc/HTML/es/scripts/man-cheatmake.1.docbook @@ -3294,7 +3266,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/quanta @dirrm share/doc/HTML/es/noatun @dirrm share/doc/HTML/es/multisynk -@dirrm share/doc/HTML/es/megami @dirrm share/doc/HTML/es/lskat @dirrm share/doc/HTML/es/lisa @dirrm share/doc/HTML/es/lilo-config @@ -3345,7 +3316,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kreversi @dirrm share/doc/HTML/es/krec @dirrm share/doc/HTML/es/krdc -@dirrm share/doc/HTML/es/krcd @dirrm share/doc/HTML/es/kppp @dirrm share/doc/HTML/es/kpovmodeler @dirrm share/doc/HTML/es/kpoker @@ -3398,9 +3368,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kmix @dirrm share/doc/HTML/es/kmines @dirrm share/doc/HTML/es/kmid -@dirrm share/doc/HTML/es/kmessedwords @dirrm share/doc/HTML/es/kmenuedit -@dirrm share/doc/HTML/es/kmathtool @dirrm share/doc/HTML/es/kmail @dirrm share/doc/HTML/es/kmahjongg @dirrm share/doc/HTML/es/kmag @@ -3465,6 +3433,7 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kdict @dirrm share/doc/HTML/es/kdf @dirrm share/doc/HTML/es/kdevelop +@dirrm share/doc/HTML/es/kdesvn-build @dirrm share/doc/HTML/es/kdesu @dirrm share/doc/HTML/es/kdeprint @dirrm share/doc/HTML/es/kdelirc/kcmlirc @@ -3493,10 +3462,8 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/laptop @dirrm share/doc/HTML/es/kcontrol/language @dirrm share/doc/HTML/es/kcontrol/lanbrowser -@dirrm share/doc/HTML/es/kcontrol/kxmlrpcd @dirrm share/doc/HTML/es/kcontrol/kwindecoration @dirrm share/doc/HTML/es/kcontrol/kthememgr -@dirrm share/doc/HTML/es/kcontrol/kmixcfg @dirrm share/doc/HTML/es/kcontrol/khtml @dirrm share/doc/HTML/es/kcontrol/keys @dirrm share/doc/HTML/es/kcontrol/keyboard @@ -3513,7 +3480,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kcontrol/kcmfontinst @dirrm share/doc/HTML/es/kcontrol/kcmcss @dirrm share/doc/HTML/es/kcontrol/kcmaccess -@dirrm share/doc/HTML/es/kcontrol/kalarmd @dirrm share/doc/HTML/es/kcontrol/icons @dirrm share/doc/HTML/es/kcontrol/helpindex @dirrm share/doc/HTML/es/kcontrol/fonts @@ -3560,7 +3526,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/kaddressbook @dirrm share/doc/HTML/es/kaboodle @dirrm share/doc/HTML/es/juk -@dirrm share/doc/HTML/es/flashkard @dirrm share/doc/HTML/es/docs/common @dirrm share/doc/HTML/es/docs @dirrm share/doc/HTML/es/cervisia @@ -3571,7 +3536,6 @@ share/locale/es/flag.png @dirrm share/doc/HTML/es/ark @dirrm share/doc/HTML/es/api @dirrm share/doc/HTML/es/amor -@dirrm share/doc/HTML/es/aktion @dirrm share/doc/HTML/es/akregator @dirrm share/doc/HTML/es/KRegExpEditor @dirrm share/apps/kturtle/examples/es diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo index 604735784e5c..6f4e4d9a8163 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.3.tar.bz2) = e6b667f07e4426c2bdb1cda59b081272 -SHA256 (KDE/kde-i18n/kde-i18n-et-3.5.3.tar.bz2) = 22256dba33271ac6e11a2284e8dede563d9d3693032cb94964607ed1bb6da3f0 -SIZE (KDE/kde-i18n/kde-i18n-et-3.5.3.tar.bz2) = 10458710 +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 diff --git a/misc/kde4-l10n-et/pkg-plist b/misc/kde4-l10n-et/pkg-plist index 3f8967f8babf..47d93e462dcb 100644 --- a/misc/kde4-l10n-et/pkg-plist +++ b/misc/kde4-l10n-et/pkg-plist @@ -1,3 +1,17 @@ +share/apps/kanagram/data/et/arvutid.kvtml +share/apps/kanagram/data/et/elukutsed.kvtml +share/apps/kanagram/data/et/esemed.kvtml +share/apps/kanagram/data/et/inimesed.kvtml +share/apps/kanagram/data/et/juurviljad.kvtml +share/apps/kanagram/data/et/kosmos.kvtml +share/apps/kanagram/data/et/leiutused.kvtml +share/apps/kanagram/data/et/loomad.kvtml +share/apps/kanagram/data/et/pealinnad.kvtml +share/apps/kanagram/data/et/puuviljad.kvtml +share/apps/kanagram/data/et/raha.kvtml +share/apps/kanagram/data/et/riided.kvtml +share/apps/kanagram/data/et/sport.kvtml +share/apps/kanagram/data/et/transport.kvtml share/apps/khangman/data/et/animals.kvtml share/apps/khangman/data/et/easy.kvtml share/apps/khangman/data/et/hard.kvtml @@ -608,6 +622,9 @@ share/doc/HTML/et/kig/man-kig.1.docbook share/doc/HTML/et/kinfocenter/blockdevices/common share/doc/HTML/et/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/et/kinfocenter/blockdevices/index.docbook +share/doc/HTML/et/kinfocenter/cdinfo/common +share/doc/HTML/et/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/et/kinfocenter/cdinfo/index.docbook share/doc/HTML/et/kinfocenter/common share/doc/HTML/et/kinfocenter/devices/common share/doc/HTML/et/kinfocenter/devices/index.cache.bz2 @@ -2042,6 +2059,7 @@ share/locale/et/flag.png @dirrm share/doc/HTML/et/kinfocenter/interrupts @dirrm share/doc/HTML/et/kinfocenter/dma @dirrm share/doc/HTML/et/kinfocenter/devices +@dirrm share/doc/HTML/et/kinfocenter/cdinfo @dirrm share/doc/HTML/et/kinfocenter/blockdevices @dirrm share/doc/HTML/et/kinfocenter @dirrm share/doc/HTML/et/kig @@ -2182,3 +2200,6 @@ share/locale/et/flag.png @dirrm share/apps/khangman/data/et @dirrm share/apps/khangman/data @dirrm share/apps/khangman +@dirrm share/apps/kanagram/data/et +@dirrm share/apps/kanagram/data +@dirrm share/apps/kanagram diff --git a/misc/kde4-l10n-eu/distinfo b/misc/kde4-l10n-eu/distinfo index cc6ca6041674..876e9610b769 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.3.tar.bz2) = 40ec15d8157ff996d3b721f267be57a3 -SHA256 (KDE/kde-i18n/kde-i18n-eu-3.5.3.tar.bz2) = c8dfe61a784e53c312c40b21751c91f1476afd007e04fb224fa644449bcc22ff -SIZE (KDE/kde-i18n/kde-i18n-eu-3.5.3.tar.bz2) = 2225592 +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 diff --git a/misc/kde4-l10n-fi/distinfo b/misc/kde4-l10n-fi/distinfo index 549a378c35db..7c4180b8cb4f 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.3.tar.bz2) = def712679b92b831b04ae704157f0c4f -SHA256 (KDE/kde-i18n/kde-i18n-fi-3.5.3.tar.bz2) = 7b615a4a09929490d64bec445315133faaf00e6c8dce137cae8398a7341df771 -SIZE (KDE/kde-i18n/kde-i18n-fi-3.5.3.tar.bz2) = 2296420 +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 diff --git a/misc/kde4-l10n-fi/pkg-plist b/misc/kde4-l10n-fi/pkg-plist index e845d7512939..71873dbd4f5e 100644 --- a/misc/kde4-l10n-fi/pkg-plist +++ b/misc/kde4-l10n-fi/pkg-plist @@ -164,6 +164,7 @@ share/locale/fi/LC_MESSAGES/kcmlaptop.mo share/locale/fi/LC_MESSAGES/kcmlaunch.mo share/locale/fi/LC_MESSAGES/kcmlayout.mo share/locale/fi/LC_MESSAGES/kcmlilo.mo +share/locale/fi/LC_MESSAGES/kcmlirc.mo share/locale/fi/LC_MESSAGES/kcmlocale.mo share/locale/fi/LC_MESSAGES/kcmmedia.mo share/locale/fi/LC_MESSAGES/kcmnic.mo @@ -351,7 +352,6 @@ share/locale/fi/LC_MESSAGES/kmathapplet.mo share/locale/fi/LC_MESSAGES/kmcop.mo share/locale/fi/LC_MESSAGES/kmenuapplet.mo share/locale/fi/LC_MESSAGES/kmenuedit.mo -share/locale/fi/LC_MESSAGES/kmessedwords.mo share/locale/fi/LC_MESSAGES/kmid.mo share/locale/fi/LC_MESSAGES/kmilo_delli8k.mo share/locale/fi/LC_MESSAGES/kmilo_generic.mo diff --git a/misc/kde4-l10n-fy/distinfo b/misc/kde4-l10n-fy/distinfo index 59bc7d1b9d21..7fdacf9d70a7 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.3.tar.bz2) = c64d0ff6d11d4b9780416bb3375fd683 -SHA256 (KDE/kde-i18n/kde-i18n-fy-3.5.3.tar.bz2) = b767519a3616fb0c16f8a44a876b5d6dde7e86e5120ffae39a47633bba0cb7c8 -SIZE (KDE/kde-i18n/kde-i18n-fy-3.5.3.tar.bz2) = 685849 +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 diff --git a/misc/kde4-l10n-ga/distinfo b/misc/kde4-l10n-ga/distinfo index 82012e09b798..0adccda2edf2 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.3.tar.bz2) = 9ce1ab7cda3534c1d5546027d29f2aff -SHA256 (KDE/kde-i18n/kde-i18n-ga-3.5.3.tar.bz2) = e597dadff739ce9de278742da3407d5e1066b3c6a20731d57b9cd90c8ffadaf5 -SIZE (KDE/kde-i18n/kde-i18n-ga-3.5.3.tar.bz2) = 1676303 +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 diff --git a/misc/kde4-l10n-gl/distinfo b/misc/kde4-l10n-gl/distinfo index 6f597c3d58db..c98aa1646529 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.3.tar.bz2) = 87707646baf5c36bda8f14dc68e3e3bc -SHA256 (KDE/kde-i18n/kde-i18n-gl-3.5.3.tar.bz2) = a4010bfae6ead1ca3cd12bf104140a0e97e3b0baae398c494053fa86eddcead9 -SIZE (KDE/kde-i18n/kde-i18n-gl-3.5.3.tar.bz2) = 1340388 +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 diff --git a/misc/kde4-l10n-gl/pkg-plist b/misc/kde4-l10n-gl/pkg-plist index 72d6a29d47a3..4a2c8a85dfcc 100644 --- a/misc/kde4-l10n-gl/pkg-plist +++ b/misc/kde4-l10n-gl/pkg-plist @@ -224,7 +224,6 @@ share/locale/gl/LC_MESSAGES/kmail.mo share/locale/gl/LC_MESSAGES/kmcop.mo share/locale/gl/LC_MESSAGES/kmenuapplet.mo share/locale/gl/LC_MESSAGES/kmenuedit.mo -share/locale/gl/LC_MESSAGES/kmessedwords.mo share/locale/gl/LC_MESSAGES/kmid.mo share/locale/gl/LC_MESSAGES/kmines.mo share/locale/gl/LC_MESSAGES/kminipagerapplet.mo diff --git a/misc/kde4-l10n-hi/distinfo b/misc/kde4-l10n-hi/distinfo index 79c1793ecce4..0a0dc8fcad38 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.3.tar.bz2) = cde643d8b8760d092a16b475fdef3e89 -SHA256 (KDE/kde-i18n/kde-i18n-hi-3.5.3.tar.bz2) = 1bf436d03f5b988c0d0cf0a4f79bfd828f9fa9557e37e07a2d7b63bccf34eb36 -SIZE (KDE/kde-i18n/kde-i18n-hi-3.5.3.tar.bz2) = 1650371 +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 diff --git a/misc/kde4-l10n-hi/pkg-plist b/misc/kde4-l10n-hi/pkg-plist index 415b1446a56d..96cc998e80e0 100644 --- a/misc/kde4-l10n-hi/pkg-plist +++ b/misc/kde4-l10n-hi/pkg-plist @@ -288,7 +288,6 @@ share/locale/hi/LC_MESSAGES/kmathapplet.mo share/locale/hi/LC_MESSAGES/kmcop.mo share/locale/hi/LC_MESSAGES/kmenuapplet.mo share/locale/hi/LC_MESSAGES/kmenuedit.mo -share/locale/hi/LC_MESSAGES/kmessedwords.mo share/locale/hi/LC_MESSAGES/kmid.mo share/locale/hi/LC_MESSAGES/kmines.mo share/locale/hi/LC_MESSAGES/kminipagerapplet.mo @@ -421,7 +420,6 @@ share/locale/hi/LC_MESSAGES/libKTTSD.mo share/locale/hi/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/hi/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/hi/LC_MESSAGES/libkcal.mo -share/locale/hi/LC_MESSAGES/libkcalsystem.mo share/locale/hi/LC_MESSAGES/libkcddb.mo share/locale/hi/LC_MESSAGES/libkdegames.mo share/locale/hi/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde4-l10n-is/distinfo b/misc/kde4-l10n-is/distinfo index 52b2c671e589..e861df656248 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.3.tar.bz2) = ecfd4dcb121a15fc69af80354d48d0f1 -SHA256 (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = ef847f5d9764aabc0c7822e46a0ae11fe190e283cafc25e50f1a763227e08ccb -SIZE (KDE/kde-i18n/kde-i18n-is-3.5.3.tar.bz2) = 2088209 +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 diff --git a/misc/kde4-l10n-is/pkg-plist b/misc/kde4-l10n-is/pkg-plist index f7b85523583c..2915f1a33821 100644 --- a/misc/kde4-l10n-is/pkg-plist +++ b/misc/kde4-l10n-is/pkg-plist @@ -331,7 +331,6 @@ share/locale/is/LC_MESSAGES/kmathapplet.mo share/locale/is/LC_MESSAGES/kmcop.mo share/locale/is/LC_MESSAGES/kmenuapplet.mo share/locale/is/LC_MESSAGES/kmenuedit.mo -share/locale/is/LC_MESSAGES/kmessedwords.mo share/locale/is/LC_MESSAGES/kmid.mo share/locale/is/LC_MESSAGES/kmilo_delli8k.mo share/locale/is/LC_MESSAGES/kmilo_generic.mo @@ -497,7 +496,6 @@ share/locale/is/LC_MESSAGES/libdmctl.mo share/locale/is/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/is/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/is/LC_MESSAGES/libkcal.mo -share/locale/is/LC_MESSAGES/libkcalsystem.mo share/locale/is/LC_MESSAGES/libkcddb.mo share/locale/is/LC_MESSAGES/libkdeedu.mo share/locale/is/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde4-l10n-it/distinfo b/misc/kde4-l10n-it/distinfo index f52272f86298..5a5b4dc9c4c2 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.3.tar.bz2) = ad8e550f7a2656fa6c5210881fd09bc7 -SHA256 (KDE/kde-i18n/kde-i18n-it-3.5.3.tar.bz2) = 1ec119e79e3a96aa359b38aa005bc4b1986ddb990be182bd9a3221cac613750b -SIZE (KDE/kde-i18n/kde-i18n-it-3.5.3.tar.bz2) = 15451773 +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 diff --git a/misc/kde4-l10n-it/pkg-plist b/misc/kde4-l10n-it/pkg-plist index 83a0c79136e1..ae75cdb7bd0e 100644 --- a/misc/kde4-l10n-it/pkg-plist +++ b/misc/kde4-l10n-it/pkg-plist @@ -701,6 +701,7 @@ share/doc/HTML/it/khelpcenter/userguide/getting-started.docbook share/doc/HTML/it/khelpcenter/userguide/glossary.docbook 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-edutainment.docbook share/doc/HTML/it/khelpcenter/userguide/kdeadmin-apps.docbook @@ -715,6 +716,7 @@ share/doc/HTML/it/khelpcenter/userguide/kdetoys-apps.docbook share/doc/HTML/it/khelpcenter/userguide/kdeutils-apps.docbook share/doc/HTML/it/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/it/khelpcenter/userguide/konsole-intro.docbook +share/doc/HTML/it/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/it/khelpcenter/userguide/migrator-dictionary.docbook share/doc/HTML/it/khelpcenter/userguide/more-help.docbook share/doc/HTML/it/khelpcenter/userguide/net-connection-setup.docbook @@ -729,6 +731,7 @@ share/doc/HTML/it/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/it/khelpcenter/userguide/shared-sessions.docbook 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/troubleshooting-network-x.docbook share/doc/HTML/it/khelpcenter/userguide/troubleshooting-no-open.docbook @@ -750,6 +753,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-kicker.1.docbook share/doc/HTML/it/kiconedit/common share/doc/HTML/it/kiconedit/index.cache.bz2 share/doc/HTML/it/kiconedit/index.docbook @@ -1178,8 +1182,12 @@ share/doc/HTML/it/kreversi/common share/doc/HTML/it/kreversi/index.cache.bz2 share/doc/HTML/it/kreversi/index.docbook share/doc/HTML/it/krfb/common +share/doc/HTML/it/krfb/email_invitation.png share/doc/HTML/it/krfb/index.cache.bz2 share/doc/HTML/it/krfb/index.docbook +share/doc/HTML/it/krfb/invitation_management.png +share/doc/HTML/it/krfb/personal_invitation.png +share/doc/HTML/it/krfb/screenshot.png share/doc/HTML/it/kruler/common share/doc/HTML/it/kruler/index.cache.bz2 share/doc/HTML/it/kruler/index.docbook @@ -1473,16 +1481,22 @@ share/doc/HTML/it/noatun/common share/doc/HTML/it/noatun/index.cache.bz2 share/doc/HTML/it/noatun/index.docbook share/doc/HTML/it/quanta/adv-quanta.docbook +share/doc/HTML/it/quanta/common share/doc/HTML/it/quanta/config-quanta.docbook share/doc/HTML/it/quanta/credits-license.docbook share/doc/HTML/it/quanta/debugging-quanta.docbook +share/doc/HTML/it/quanta/extending-quanta.docbook share/doc/HTML/it/quanta/fundamentals.docbook share/doc/HTML/it/quanta/glossary.docbook +share/doc/HTML/it/quanta/index.cache.bz2 +share/doc/HTML/it/quanta/index.docbook share/doc/HTML/it/quanta/installation.docbook share/doc/HTML/it/quanta/introduction.docbook share/doc/HTML/it/quanta/man-quanta.1.docbook share/doc/HTML/it/quanta/q-and-a.docbook share/doc/HTML/it/quanta/quanta-menus.docbook +share/doc/HTML/it/quanta/quanta-projects.docbook +share/doc/HTML/it/quanta/working-with-quanta.docbook share/doc/HTML/it/scripts/man-adddebug.1.docbook share/doc/HTML/it/scripts/man-cheatmake.1.docbook share/doc/HTML/it/scripts/man-create_cvsignore.1.docbook diff --git a/misc/kde4-l10n-kk/distinfo b/misc/kde4-l10n-kk/distinfo index 88ff997ec012..d53df3f40317 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.3.tar.bz2) = cbe63992bef052dfb39675edfd096ef6 -SHA256 (KDE/kde-i18n/kde-i18n-kk-3.5.3.tar.bz2) = d5f272bb9a9aefacba49e8e223c2caef22e7ab8d3322bcaf6f0ce1321831132a -SIZE (KDE/kde-i18n/kde-i18n-kk-3.5.3.tar.bz2) = 709562 +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 diff --git a/misc/kde4-l10n-kk/pkg-plist b/misc/kde4-l10n-kk/pkg-plist index 62f92fce21d0..53e6b84253aa 100644 --- a/misc/kde4-l10n-kk/pkg-plist +++ b/misc/kde4-l10n-kk/pkg-plist @@ -1,13 +1,30 @@ +share/locale/kk/LC_MESSAGES/akregator_konqplugin.mo +share/locale/kk/LC_MESSAGES/alsaplayerui.mo share/locale/kk/LC_MESSAGES/appletproxy.mo share/locale/kk/LC_MESSAGES/ark.mo +share/locale/kk/LC_MESSAGES/ark_plugin.mo +share/locale/kk/LC_MESSAGES/atlantikdesigner.mo +share/locale/kk/LC_MESSAGES/audiorename_plugin.mo +share/locale/kk/LC_MESSAGES/autorefresh.mo +share/locale/kk/LC_MESSAGES/babelfish.mo +share/locale/kk/LC_MESSAGES/charlatanui.mo share/locale/kk/LC_MESSAGES/clockapplet.mo +share/locale/kk/LC_MESSAGES/crashesplugin.mo share/locale/kk/LC_MESSAGES/cupsdconf.mo +share/locale/kk/LC_MESSAGES/dcoprss.mo +share/locale/kk/LC_MESSAGES/dirfilterplugin.mo share/locale/kk/LC_MESSAGES/display.mo share/locale/kk/LC_MESSAGES/dockbarextension.mo +share/locale/kk/LC_MESSAGES/domtreeviewer.mo share/locale/kk/LC_MESSAGES/drkonqi.mo +share/locale/kk/LC_MESSAGES/dub.mo share/locale/kk/LC_MESSAGES/extensionproxy.mo +share/locale/kk/LC_MESSAGES/ffrs.mo share/locale/kk/LC_MESSAGES/filetypes.mo +share/locale/kk/LC_MESSAGES/fsview.mo share/locale/kk/LC_MESSAGES/htmlsearch.mo +share/locale/kk/LC_MESSAGES/imagerename_plugin.mo +share/locale/kk/LC_MESSAGES/imgalleryplugin.mo share/locale/kk/LC_MESSAGES/irkick.mo share/locale/kk/LC_MESSAGES/joystick.mo share/locale/kk/LC_MESSAGES/kabc_dir.mo @@ -20,11 +37,30 @@ share/locale/kk/LC_MESSAGES/kaccess.mo share/locale/kk/LC_MESSAGES/kappfinder.mo share/locale/kk/LC_MESSAGES/kasbarextension.mo share/locale/kk/LC_MESSAGES/kate.mo +share/locale/kk/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/kk/LC_MESSAGES/katefiletemplates.mo +share/locale/kk/LC_MESSAGES/katefll_initplugin.mo +share/locale/kk/LC_MESSAGES/katefll_plugin.mo +share/locale/kk/LC_MESSAGES/katehelloworld.mo +share/locale/kk/LC_MESSAGES/katehtmltools.mo +share/locale/kk/LC_MESSAGES/kateinsertcommand.mo +share/locale/kk/LC_MESSAGES/katekjswrapper.mo +share/locale/kk/LC_MESSAGES/katemake.mo +share/locale/kk/LC_MESSAGES/katemodeline.mo +share/locale/kk/LC_MESSAGES/kateopenheader.mo share/locale/kk/LC_MESSAGES/katepart.mo +share/locale/kk/LC_MESSAGES/katepybrowse.mo +share/locale/kk/LC_MESSAGES/katesnippets.mo +share/locale/kk/LC_MESSAGES/katetabbarextension.mo +share/locale/kk/LC_MESSAGES/katetextfilter.mo +share/locale/kk/LC_MESSAGES/katexmlcheck.mo +share/locale/kk/LC_MESSAGES/katexmltools.mo share/locale/kk/LC_MESSAGES/kay.mo +share/locale/kk/LC_MESSAGES/kbinaryclock.mo share/locale/kk/LC_MESSAGES/kcalc.mo share/locale/kk/LC_MESSAGES/kcharselect.mo share/locale/kk/LC_MESSAGES/kcharselectapplet.mo +share/locale/kk/LC_MESSAGES/kcm_krfb.mo share/locale/kk/LC_MESSAGES/kcmaccess.mo share/locale/kk/LC_MESSAGES/kcmaccessibility.mo share/locale/kk/LC_MESSAGES/kcmarts.mo @@ -51,12 +87,15 @@ share/locale/kk/LC_MESSAGES/kcmkio.mo share/locale/kk/LC_MESSAGES/kcmkonq.mo share/locale/kk/LC_MESSAGES/kcmkonqhtml.mo share/locale/kk/LC_MESSAGES/kcmkonsole.mo +share/locale/kk/LC_MESSAGES/kcmktalkd.mo +share/locale/kk/LC_MESSAGES/kcmkuick.mo share/locale/kk/LC_MESSAGES/kcmkurifilt.mo share/locale/kk/LC_MESSAGES/kcmkvaio.mo share/locale/kk/LC_MESSAGES/kcmkwallet.mo share/locale/kk/LC_MESSAGES/kcmkwindecoration.mo share/locale/kk/LC_MESSAGES/kcmkwinrules.mo share/locale/kk/LC_MESSAGES/kcmkwm.mo +share/locale/kk/LC_MESSAGES/kcmlanbrowser.mo share/locale/kk/LC_MESSAGES/kcmlaptop.mo share/locale/kk/LC_MESSAGES/kcmlaunch.mo share/locale/kk/LC_MESSAGES/kcmlayout.mo @@ -79,6 +118,7 @@ share/locale/kk/LC_MESSAGES/kcmtaskbar.mo share/locale/kk/LC_MESSAGES/kcmthinkpad.mo share/locale/kk/LC_MESSAGES/kcmusb.mo share/locale/kk/LC_MESSAGES/kcmview1394.mo +share/locale/kk/LC_MESSAGES/kcmwifi.mo share/locale/kk/LC_MESSAGES/kcmxinerama.mo share/locale/kk/LC_MESSAGES/kcontrol.mo share/locale/kk/LC_MESSAGES/kcron.mo @@ -98,11 +138,20 @@ 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/kdictapplet.mo share/locale/kk/LC_MESSAGES/kdmconfig.mo share/locale/kk/LC_MESSAGES/kdmgreet.mo share/locale/kk/LC_MESSAGES/kedit.mo +share/locale/kk/LC_MESSAGES/kfile_cert.mo share/locale/kk/LC_MESSAGES/kfile_deb.mo +share/locale/kk/LC_MESSAGES/kfile_desktop.mo +share/locale/kk/LC_MESSAGES/kfile_folder.mo +share/locale/kk/LC_MESSAGES/kfile_html.mo +share/locale/kk/LC_MESSAGES/kfile_lnk.mo +share/locale/kk/LC_MESSAGES/kfile_mhtml.mo 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/kfindpart.mo share/locale/kk/LC_MESSAGES/kfloppy.mo @@ -112,16 +161,21 @@ share/locale/kk/LC_MESSAGES/kgpg.mo share/locale/kk/LC_MESSAGES/kgreet_classic.mo share/locale/kk/LC_MESSAGES/kgreet_winbind.mo share/locale/kk/LC_MESSAGES/khelpcenter.mo +share/locale/kk/LC_MESSAGES/khexedit.mo share/locale/kk/LC_MESSAGES/khexedit2part.mo share/locale/kk/LC_MESSAGES/khotkeys.mo share/locale/kk/LC_MESSAGES/khtmlkttsd.mo +share/locale/kk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/kk/LC_MESSAGES/kicker.mo +share/locale/kk/LC_MESSAGES/kinetd.mo share/locale/kk/LC_MESSAGES/kio.mo share/locale/kk/LC_MESSAGES/kio_finger.mo share/locale/kk/LC_MESSAGES/kio_fish.mo share/locale/kk/LC_MESSAGES/kio_floppy.mo share/locale/kk/LC_MESSAGES/kio_help.mo share/locale/kk/LC_MESSAGES/kio_home.mo +share/locale/kk/LC_MESSAGES/kio_jabberdisco.mo +share/locale/kk/LC_MESSAGES/kio_lan.mo share/locale/kk/LC_MESSAGES/kio_ldap.mo share/locale/kk/LC_MESSAGES/kio_mac.mo share/locale/kk/LC_MESSAGES/kio_man.mo @@ -139,11 +193,13 @@ share/locale/kk/LC_MESSAGES/kio_system.mo share/locale/kk/LC_MESSAGES/kio_tar.mo share/locale/kk/LC_MESSAGES/kio_thumbnail.mo share/locale/kk/LC_MESSAGES/kio_trash.mo +share/locale/kk/LC_MESSAGES/kio_zeroconf.mo share/locale/kk/LC_MESSAGES/kioexec.mo share/locale/kk/LC_MESSAGES/kjobviewer.mo share/locale/kk/LC_MESSAGES/kjots.mo share/locale/kk/LC_MESSAGES/klaptopdaemon.mo share/locale/kk/LC_MESSAGES/klipper.mo +share/locale/kk/LC_MESSAGES/kmathapplet.mo share/locale/kk/LC_MESSAGES/kmcop.mo share/locale/kk/LC_MESSAGES/kmenuapplet.mo share/locale/kk/LC_MESSAGES/kmenuedit.mo @@ -157,11 +213,17 @@ 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/knotify.mo +share/locale/kk/LC_MESSAGES/kolourpicker.mo +share/locale/kk/LC_MESSAGES/konqsidebar_delicious.mo +share/locale/kk/LC_MESSAGES/konqsidebar_mediaplayer.mo +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/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/kprinter.mo share/locale/kk/LC_MESSAGES/krandr.mo share/locale/kk/LC_MESSAGES/krdb.mo @@ -169,6 +231,9 @@ share/locale/kk/LC_MESSAGES/kreadconfig.mo share/locale/kk/LC_MESSAGES/kregexpeditor.mo share/locale/kk/LC_MESSAGES/krunapplet.mo share/locale/kk/LC_MESSAGES/kscreensaver.mo +share/locale/kk/LC_MESSAGES/ksig.mo +share/locale/kk/LC_MESSAGES/ksim.mo +share/locale/kk/LC_MESSAGES/ksirc.mo share/locale/kk/LC_MESSAGES/ksmserver.mo share/locale/kk/LC_MESSAGES/ksplash.mo share/locale/kk/LC_MESSAGES/ksplashthemes.mo @@ -186,16 +251,22 @@ share/locale/kk/LC_MESSAGES/ktexteditor_insertfile.mo share/locale/kk/LC_MESSAGES/ktexteditor_isearch.mo share/locale/kk/LC_MESSAGES/ktexteditor_kdatatool.mo share/locale/kk/LC_MESSAGES/kthememanager.mo +share/locale/kk/LC_MESSAGES/ktimemon.mo share/locale/kk/LC_MESSAGES/ktimer.mo share/locale/kk/LC_MESSAGES/ktip.mo +share/locale/kk/LC_MESSAGES/kuick_plugin.mo share/locale/kk/LC_MESSAGES/kuser.mo share/locale/kk/LC_MESSAGES/kwalletmanager.mo +share/locale/kk/LC_MESSAGES/kwifimanager.mo share/locale/kk/LC_MESSAGES/kwin.mo share/locale/kk/LC_MESSAGES/kwin_clients.mo share/locale/kk/LC_MESSAGES/kwin_lib.mo +share/locale/kk/LC_MESSAGES/kwireless.mo share/locale/kk/LC_MESSAGES/kwriteconfig.mo share/locale/kk/LC_MESSAGES/kxkb.mo share/locale/kk/LC_MESSAGES/libdmctl.mo +share/locale/kk/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/kk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/kk/LC_MESSAGES/libkicker.mo share/locale/kk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/kk/LC_MESSAGES/libkickermenu_konsole.mo @@ -209,17 +280,33 @@ share/locale/kk/LC_MESSAGES/libkscreensaver.mo share/locale/kk/LC_MESSAGES/libtaskbar.mo share/locale/kk/LC_MESSAGES/libtaskmanager.mo share/locale/kk/LC_MESSAGES/lockout.mo +share/locale/kk/LC_MESSAGES/lyrics.mo share/locale/kk/LC_MESSAGES/mediaapplet.mo +share/locale/kk/LC_MESSAGES/mediacontrol.mo +share/locale/kk/LC_MESSAGES/mf_konqplugin.mo +share/locale/kk/LC_MESSAGES/minitoolsplugin.mo share/locale/kk/LC_MESSAGES/naughtyapplet.mo +share/locale/kk/LC_MESSAGES/nexscope.mo share/locale/kk/LC_MESSAGES/nsplugin.mo +share/locale/kk/LC_MESSAGES/pitchablespeed.mo share/locale/kk/LC_MESSAGES/ppdtranslations.mo share/locale/kk/LC_MESSAGES/privacy.mo share/locale/kk/LC_MESSAGES/quicklauncher.mo +share/locale/kk/LC_MESSAGES/rellinks.mo +share/locale/kk/LC_MESSAGES/searchbarplugin.mo share/locale/kk/LC_MESSAGES/secpolicy.mo share/locale/kk/LC_MESSAGES/superkaramba.mo +share/locale/kk/LC_MESSAGES/synaescope.mo share/locale/kk/LC_MESSAGES/timezones.mo +share/locale/kk/LC_MESSAGES/tippecanoe.mo share/locale/kk/LC_MESSAGES/trashapplet.mo +share/locale/kk/LC_MESSAGES/tyler.mo +share/locale/kk/LC_MESSAGES/uachangerplugin.mo share/locale/kk/LC_MESSAGES/useraccount.mo +share/locale/kk/LC_MESSAGES/validatorsplugin.mo +share/locale/kk/LC_MESSAGES/wakeup.mo +share/locale/kk/LC_MESSAGES/wavecapture.mo +share/locale/kk/LC_MESSAGES/webarchiver.mo share/locale/kk/charset share/locale/kk/entry.desktop share/locale/kk/flag.png diff --git a/misc/kde4-l10n-km/distinfo b/misc/kde4-l10n-km/distinfo index a63fbbe49d77..7870071d140b 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.3.tar.bz2) = c2d3bd0e7df18167cca2cfc8c67b94f8 -SHA256 (KDE/kde-i18n/kde-i18n-km-3.5.3.tar.bz2) = 886c8d7913c83ff3c05ef0f5bc2f0f743c8559dc2c7d71f74a7fa9ed31fc5411 -SIZE (KDE/kde-i18n/kde-i18n-km-3.5.3.tar.bz2) = 1244595 +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 diff --git a/misc/kde4-l10n-km/pkg-plist b/misc/kde4-l10n-km/pkg-plist index 79314c06bcde..21f5cc7068f2 100644 --- a/misc/kde4-l10n-km/pkg-plist +++ b/misc/kde4-l10n-km/pkg-plist @@ -15,6 +15,7 @@ share/locale/km/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/km/LC_MESSAGES/audiorename_plugin.mo share/locale/km/LC_MESSAGES/autorefresh.mo share/locale/km/LC_MESSAGES/babelfish.mo +share/locale/km/LC_MESSAGES/blinken.mo share/locale/km/LC_MESSAGES/charlatanui.mo share/locale/km/LC_MESSAGES/clockapplet.mo share/locale/km/LC_MESSAGES/crashesplugin.mo @@ -48,6 +49,7 @@ 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/kanagram.mo share/locale/km/LC_MESSAGES/kandy.mo share/locale/km/LC_MESSAGES/kappfinder.mo share/locale/km/LC_MESSAGES/kasbarextension.mo @@ -84,6 +86,7 @@ share/locale/km/LC_MESSAGES/kbattleship.mo 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/kcalc.mo share/locale/km/LC_MESSAGES/kcharselect.mo share/locale/km/LC_MESSAGES/kcharselectapplet.mo @@ -183,6 +186,7 @@ share/locale/km/LC_MESSAGES/kdictapplet.mo share/locale/km/LC_MESSAGES/kdmconfig.mo share/locale/km/LC_MESSAGES/kdmgreet.mo share/locale/km/LC_MESSAGES/kedit.mo +share/locale/km/LC_MESSAGES/keduca.mo share/locale/km/LC_MESSAGES/kenolaba.mo share/locale/km/LC_MESSAGES/kfax.mo share/locale/km/LC_MESSAGES/kfaxview.mo @@ -192,6 +196,7 @@ share/locale/km/LC_MESSAGES/kfile_avi.mo share/locale/km/LC_MESSAGES/kfile_bmp.mo 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_dvi.mo share/locale/km/LC_MESSAGES/kfile_exr.mo @@ -217,6 +222,7 @@ share/locale/km/LC_MESSAGES/kfile_pnm.mo share/locale/km/LC_MESSAGES/kfile_ps.mo share/locale/km/LC_MESSAGES/kfile_rfc822.mo share/locale/km/LC_MESSAGES/kfile_rgb.mo +share/locale/km/LC_MESSAGES/kfile_rpm.mo share/locale/km/LC_MESSAGES/kfile_sid.mo share/locale/km/LC_MESSAGES/kfile_tga.mo share/locale/km/LC_MESSAGES/kfile_theora.mo @@ -241,6 +247,7 @@ share/locale/km/LC_MESSAGES/kghostview.mo share/locale/km/LC_MESSAGES/kgoldrunner.mo share/locale/km/LC_MESSAGES/kgreet_classic.mo share/locale/km/LC_MESSAGES/kgreet_winbind.mo +share/locale/km/LC_MESSAGES/khangman.mo share/locale/km/LC_MESSAGES/khelpcenter.mo share/locale/km/LC_MESSAGES/khexedit2part.mo share/locale/km/LC_MESSAGES/khotkeys.mo @@ -287,6 +294,7 @@ 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/klegacyimport.mo +share/locale/km/LC_MESSAGES/klettres.mo share/locale/km/LC_MESSAGES/klickety.mo share/locale/km/LC_MESSAGES/klines.mo share/locale/km/LC_MESSAGES/klipper.mo @@ -343,6 +351,7 @@ share/locale/km/LC_MESSAGES/kpager.mo share/locale/km/LC_MESSAGES/kpartapp.mo share/locale/km/LC_MESSAGES/kpat.mo 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/kpoker.mo @@ -431,8 +440,8 @@ 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 share/locale/km/LC_MESSAGES/libkdehighscores.mo share/locale/km/LC_MESSAGES/libkdenetwork.mo diff --git a/misc/kde4-l10n-lt/distinfo b/misc/kde4-l10n-lt/distinfo index fdf56685b772..2423dc732c2e 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.3.tar.bz2) = e36ddd66007a7a405369731bea56ae83 -SHA256 (KDE/kde-i18n/kde-i18n-lt-3.5.3.tar.bz2) = 714115df198bb90c8f8b8d33843d8fde941499c6a6ee48ccfc8ccd4c8c9740bc -SIZE (KDE/kde-i18n/kde-i18n-lt-3.5.3.tar.bz2) = 1868878 +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 diff --git a/misc/kde4-l10n-lv/distinfo b/misc/kde4-l10n-lv/distinfo index e9ff56e941fa..d84d478ac379 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.3.tar.bz2) = 549ed7bc713a7ca725e8eae0149be613 -SHA256 (KDE/kde-i18n/kde-i18n-lv-3.5.3.tar.bz2) = 2773431baa802c81cbd83940266b94b1cd96954547409f0f5901cbb84125e9a1 -SIZE (KDE/kde-i18n/kde-i18n-lv-3.5.3.tar.bz2) = 1339689 +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 diff --git a/misc/kde4-l10n-lv/pkg-plist b/misc/kde4-l10n-lv/pkg-plist index 13c576e611c6..9945da1791fd 100644 --- a/misc/kde4-l10n-lv/pkg-plist +++ b/misc/kde4-l10n-lv/pkg-plist @@ -15,6 +15,7 @@ share/locale/lv/LC_MESSAGES/extensionproxy.mo share/locale/lv/LC_MESSAGES/filetypes.mo share/locale/lv/LC_MESSAGES/htmlsearch.mo share/locale/lv/LC_MESSAGES/imgalleryplugin.mo +share/locale/lv/LC_MESSAGES/kabc_file.mo share/locale/lv/LC_MESSAGES/kaboodle.mo share/locale/lv/LC_MESSAGES/kaccess.mo share/locale/lv/LC_MESSAGES/kaddressbook.mo @@ -95,6 +96,7 @@ share/locale/lv/LC_MESSAGES/kdat.mo share/locale/lv/LC_MESSAGES/kdcop.mo share/locale/lv/LC_MESSAGES/kdebugdialog.mo share/locale/lv/LC_MESSAGES/kdelibs.mo +share/locale/lv/LC_MESSAGES/kdelibs_colors.mo share/locale/lv/LC_MESSAGES/kdepasswd.mo share/locale/lv/LC_MESSAGES/kdeprint.mo share/locale/lv/LC_MESSAGES/kdeprintfax.mo @@ -139,6 +141,7 @@ share/locale/lv/LC_MESSAGES/kio_audiocd.mo share/locale/lv/LC_MESSAGES/kio_finger.mo share/locale/lv/LC_MESSAGES/kio_floppy.mo share/locale/lv/LC_MESSAGES/kio_help.mo +share/locale/lv/LC_MESSAGES/kio_home.mo share/locale/lv/LC_MESSAGES/kio_imap4.mo share/locale/lv/LC_MESSAGES/kio_lan.mo share/locale/lv/LC_MESSAGES/kio_man.mo @@ -168,7 +171,6 @@ share/locale/lv/LC_MESSAGES/kmail.mo share/locale/lv/LC_MESSAGES/kmailcvt.mo share/locale/lv/LC_MESSAGES/kmcop.mo share/locale/lv/LC_MESSAGES/kmenuedit.mo -share/locale/lv/LC_MESSAGES/kmessedwords.mo share/locale/lv/LC_MESSAGES/kmid.mo share/locale/lv/LC_MESSAGES/kmines.mo share/locale/lv/LC_MESSAGES/kminipagerapplet.mo @@ -209,6 +211,7 @@ share/locale/lv/LC_MESSAGES/kruler.mo share/locale/lv/LC_MESSAGES/krunapplet.mo share/locale/lv/LC_MESSAGES/ksame.mo share/locale/lv/LC_MESSAGES/kscd.mo +share/locale/lv/LC_MESSAGES/kscreensaver.mo share/locale/lv/LC_MESSAGES/kshisen.mo share/locale/lv/LC_MESSAGES/ksirc.mo share/locale/lv/LC_MESSAGES/ksirtet.mo @@ -269,6 +272,7 @@ share/locale/lv/LC_MESSAGES/quanta.mo share/locale/lv/LC_MESSAGES/quicklauncher.mo share/locale/lv/LC_MESSAGES/secpolicy.mo share/locale/lv/LC_MESSAGES/spy.mo +share/locale/lv/LC_MESSAGES/timezones.mo share/locale/lv/LC_MESSAGES/trashapplet.mo share/locale/lv/LC_MESSAGES/uachangerplugin.mo share/locale/lv/LC_MESSAGES/validatorsplugin.mo diff --git a/misc/kde4-l10n-mk/distinfo b/misc/kde4-l10n-mk/distinfo index 7473519766a4..096f9bf1eee6 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.3.tar.bz2) = a61b0e098265e3d0cc6ed7a77e6178f9 -SHA256 (KDE/kde-i18n/kde-i18n-mk-3.5.3.tar.bz2) = 074316594f235c8706789a4c16473cdb0a2b5ea659c0c48f06da593a42645206 -SIZE (KDE/kde-i18n/kde-i18n-mk-3.5.3.tar.bz2) = 1645708 +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 diff --git a/misc/kde4-l10n-mk/pkg-plist b/misc/kde4-l10n-mk/pkg-plist index 84f6d0ab82e6..c2c20b9ba7f7 100644 --- a/misc/kde4-l10n-mk/pkg-plist +++ b/misc/kde4-l10n-mk/pkg-plist @@ -1,3 +1,4 @@ +share/locale/mk/LC_MESSAGES/akregator.mo share/locale/mk/LC_MESSAGES/akregator_konqplugin.mo share/locale/mk/LC_MESSAGES/alsaplayerui.mo share/locale/mk/LC_MESSAGES/amor.mo @@ -14,10 +15,12 @@ share/locale/mk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/mk/LC_MESSAGES/audiorename_plugin.mo share/locale/mk/LC_MESSAGES/autorefresh.mo share/locale/mk/LC_MESSAGES/babelfish.mo +share/locale/mk/LC_MESSAGES/blinken.mo share/locale/mk/LC_MESSAGES/charlatanui.mo share/locale/mk/LC_MESSAGES/clockapplet.mo share/locale/mk/LC_MESSAGES/crashesplugin.mo share/locale/mk/LC_MESSAGES/cupsdconf.mo +share/locale/mk/LC_MESSAGES/cvsservice.mo share/locale/mk/LC_MESSAGES/dcoprss.mo share/locale/mk/LC_MESSAGES/dirfilterplugin.mo share/locale/mk/LC_MESSAGES/display.mo @@ -47,6 +50,7 @@ share/locale/mk/LC_MESSAGES/kaccess.mo share/locale/mk/LC_MESSAGES/kaddressbook.mo share/locale/mk/LC_MESSAGES/kalarm.mo share/locale/mk/LC_MESSAGES/kalzium.mo +share/locale/mk/LC_MESSAGES/kanagram.mo share/locale/mk/LC_MESSAGES/kappfinder.mo share/locale/mk/LC_MESSAGES/karm.mo share/locale/mk/LC_MESSAGES/kasbarextension.mo @@ -79,6 +83,8 @@ share/locale/mk/LC_MESSAGES/kbattleship.mo share/locale/mk/LC_MESSAGES/kbinaryclock.mo share/locale/mk/LC_MESSAGES/kblackbox.mo share/locale/mk/LC_MESSAGES/kbounce.mo +share/locale/mk/LC_MESSAGES/kbruch.mo +share/locale/mk/LC_MESSAGES/kbstateapplet.mo share/locale/mk/LC_MESSAGES/kcalc.mo share/locale/mk/LC_MESSAGES/kcharselect.mo share/locale/mk/LC_MESSAGES/kcharselectapplet.mo @@ -170,6 +176,7 @@ share/locale/mk/LC_MESSAGES/kdf.mo share/locale/mk/LC_MESSAGES/kdialog.mo share/locale/mk/LC_MESSAGES/kdict.mo share/locale/mk/LC_MESSAGES/kdictapplet.mo +share/locale/mk/LC_MESSAGES/kdjview.mo share/locale/mk/LC_MESSAGES/kdmconfig.mo share/locale/mk/LC_MESSAGES/kdmgreet.mo share/locale/mk/LC_MESSAGES/kdvi.mo @@ -249,6 +256,7 @@ share/locale/mk/LC_MESSAGES/khtmlkttsd.mo share/locale/mk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/mk/LC_MESSAGES/kicker.mo share/locale/mk/LC_MESSAGES/kiconedit.mo +share/locale/mk/LC_MESSAGES/kig.mo share/locale/mk/LC_MESSAGES/kinetd.mo share/locale/mk/LC_MESSAGES/kio.mo share/locale/mk/LC_MESSAGES/kio_audiocd.mo @@ -291,6 +299,7 @@ share/locale/mk/LC_MESSAGES/klickety.mo share/locale/mk/LC_MESSAGES/klines.mo share/locale/mk/LC_MESSAGES/klipper.mo share/locale/mk/LC_MESSAGES/klock.mo +share/locale/mk/LC_MESSAGES/kmag.mo share/locale/mk/LC_MESSAGES/kmahjongg.mo share/locale/mk/LC_MESSAGES/kmail.mo share/locale/mk/LC_MESSAGES/kmail_text_calendar_plugin.mo @@ -311,6 +320,8 @@ share/locale/mk/LC_MESSAGES/kmines.mo share/locale/mk/LC_MESSAGES/kminipagerapplet.mo share/locale/mk/LC_MESSAGES/kmix.mo share/locale/mk/LC_MESSAGES/kmoon.mo +share/locale/mk/LC_MESSAGES/kmousetool.mo +share/locale/mk/LC_MESSAGES/kmouth.mo share/locale/mk/LC_MESSAGES/kmplot.mo share/locale/mk/LC_MESSAGES/kmrml.mo share/locale/mk/LC_MESSAGES/knetattach.mo @@ -379,6 +390,7 @@ share/locale/mk/LC_MESSAGES/krfb.mo share/locale/mk/LC_MESSAGES/kruler.mo share/locale/mk/LC_MESSAGES/krunapplet.mo share/locale/mk/LC_MESSAGES/ksame.mo +share/locale/mk/LC_MESSAGES/ksayit.mo share/locale/mk/LC_MESSAGES/kscd.mo share/locale/mk/LC_MESSAGES/kscreensaver.mo share/locale/mk/LC_MESSAGES/kshisen.mo @@ -418,6 +430,7 @@ share/locale/mk/LC_MESSAGES/ktimer.mo share/locale/mk/LC_MESSAGES/ktip.mo share/locale/mk/LC_MESSAGES/ktouch.mo share/locale/mk/LC_MESSAGES/ktron.mo +share/locale/mk/LC_MESSAGES/kttsd.mo share/locale/mk/LC_MESSAGES/ktuberling.mo share/locale/mk/LC_MESSAGES/kturtle.mo share/locale/mk/LC_MESSAGES/ktux.mo @@ -449,6 +462,7 @@ share/locale/mk/LC_MESSAGES/kworldclock.mo share/locale/mk/LC_MESSAGES/kwriteconfig.mo share/locale/mk/LC_MESSAGES/kxkb.mo share/locale/mk/LC_MESSAGES/kxsconfig.mo +share/locale/mk/LC_MESSAGES/libKTTSD.mo share/locale/mk/LC_MESSAGES/libdmctl.mo share/locale/mk/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/mk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile index 590cc3154e97..a141541edef1 100644 --- a/misc/kde4-l10n-nb/Makefile +++ b/misc/kde4-l10n-nb/Makefile @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for KDE3 +COMMENT= Norwegian Bokml messages and documentation for KDE3 BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/misc/kde4-l10n-nb/distinfo b/misc/kde4-l10n-nb/distinfo index 75384c5edd55..06fce1430198 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.3.tar.bz2) = b8698e7aa889cc25a65c948fb4228b9c -SHA256 (KDE/kde-i18n/kde-i18n-nb-3.5.3.tar.bz2) = 584e86ab1d89c99aa51d3916094718b73645ea59ee66034b888b7f21a6d59b27 -SIZE (KDE/kde-i18n/kde-i18n-nb-3.5.3.tar.bz2) = 2119865 +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 diff --git a/misc/kde4-l10n-nb/pkg-plist b/misc/kde4-l10n-nb/pkg-plist index c830213828c7..7abbf78e55af 100644 --- a/misc/kde4-l10n-nb/pkg-plist +++ b/misc/kde4-l10n-nb/pkg-plist @@ -57,6 +57,7 @@ share/locale/nb/LC_MESSAGES/kaccess.mo share/locale/nb/LC_MESSAGES/kaddressbook.mo share/locale/nb/LC_MESSAGES/kalarm.mo share/locale/nb/LC_MESSAGES/kalzium.mo +share/locale/nb/LC_MESSAGES/kanagram.mo share/locale/nb/LC_MESSAGES/kandy.mo share/locale/nb/LC_MESSAGES/kappfinder.mo share/locale/nb/LC_MESSAGES/karm.mo @@ -334,7 +335,6 @@ share/locale/nb/LC_MESSAGES/kmathapplet.mo share/locale/nb/LC_MESSAGES/kmcop.mo share/locale/nb/LC_MESSAGES/kmenuapplet.mo share/locale/nb/LC_MESSAGES/kmenuedit.mo -share/locale/nb/LC_MESSAGES/kmessedwords.mo share/locale/nb/LC_MESSAGES/kmid.mo share/locale/nb/LC_MESSAGES/kmilo_delli8k.mo share/locale/nb/LC_MESSAGES/kmilo_generic.mo @@ -352,6 +352,7 @@ share/locale/nb/LC_MESSAGES/kmouth.mo share/locale/nb/LC_MESSAGES/kmplot.mo share/locale/nb/LC_MESSAGES/kmrml.mo share/locale/nb/LC_MESSAGES/knetattach.mo +share/locale/nb/LC_MESSAGES/knetwalk.mo share/locale/nb/LC_MESSAGES/knetworkconf.mo share/locale/nb/LC_MESSAGES/knewsticker.mo share/locale/nb/LC_MESSAGES/knode.mo @@ -370,6 +371,7 @@ share/locale/nb/LC_MESSAGES/konnector_qtopia.mo share/locale/nb/LC_MESSAGES/konnector_remote.mo share/locale/nb/LC_MESSAGES/konqsidebar_delicious.mo share/locale/nb/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/nb/LC_MESSAGES/konqsidebar_metabar.mo share/locale/nb/LC_MESSAGES/konqsidebar_news.mo share/locale/nb/LC_MESSAGES/konqueror.mo share/locale/nb/LC_MESSAGES/konquest.mo @@ -497,7 +499,6 @@ share/locale/nb/LC_MESSAGES/libdmctl.mo share/locale/nb/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/nb/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/nb/LC_MESSAGES/libkcal.mo -share/locale/nb/LC_MESSAGES/libkcalsystem.mo share/locale/nb/LC_MESSAGES/libkcddb.mo share/locale/nb/LC_MESSAGES/libkdeedu.mo share/locale/nb/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde4-l10n-nds/distinfo b/misc/kde4-l10n-nds/distinfo index e3e351e5d8c8..53a96866a7f6 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.3.tar.bz2) = ee124b60df24fe6556f74f53b4e9d7da -SHA256 (KDE/kde-i18n/kde-i18n-nds-3.5.3.tar.bz2) = c030149871b7e5a6f7b2a62ef839d38e91570143de6c6fc375bcbf6aa2283241 -SIZE (KDE/kde-i18n/kde-i18n-nds-3.5.3.tar.bz2) = 1225602 +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 diff --git a/misc/kde4-l10n-nds/pkg-plist b/misc/kde4-l10n-nds/pkg-plist index 74e308316cd3..da2397782ffe 100644 --- a/misc/kde4-l10n-nds/pkg-plist +++ b/misc/kde4-l10n-nds/pkg-plist @@ -4,6 +4,8 @@ share/locale/nds/LC_MESSAGES/alsaplayerui.mo 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/atlantik.mo share/locale/nds/LC_MESSAGES/atlantikdesigner.mo share/locale/nds/LC_MESSAGES/audiorename_plugin.mo share/locale/nds/LC_MESSAGES/autorefresh.mo @@ -45,13 +47,16 @@ share/locale/nds/LC_MESSAGES/kandy.mo share/locale/nds/LC_MESSAGES/kappfinder.mo share/locale/nds/LC_MESSAGES/karm.mo share/locale/nds/LC_MESSAGES/kasbarextension.mo +share/locale/nds/LC_MESSAGES/kasteroids.mo share/locale/nds/LC_MESSAGES/kate.mo share/locale/nds/LC_MESSAGES/katecppsymbolviewer.mo +share/locale/nds/LC_MESSAGES/katefiletemplates.mo share/locale/nds/LC_MESSAGES/katefll_initplugin.mo share/locale/nds/LC_MESSAGES/katefll_plugin.mo share/locale/nds/LC_MESSAGES/katehelloworld.mo share/locale/nds/LC_MESSAGES/katehtmltools.mo share/locale/nds/LC_MESSAGES/kateinsertcommand.mo +share/locale/nds/LC_MESSAGES/katekjswrapper.mo share/locale/nds/LC_MESSAGES/katemake.mo share/locale/nds/LC_MESSAGES/katemodeline.mo share/locale/nds/LC_MESSAGES/kateopenheader.mo @@ -62,6 +67,7 @@ share/locale/nds/LC_MESSAGES/katetabbarextension.mo 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/kay.mo share/locale/nds/LC_MESSAGES/kbabel.mo share/locale/nds/LC_MESSAGES/kbinaryclock.mo @@ -69,6 +75,7 @@ share/locale/nds/LC_MESSAGES/kbstateapplet.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_kviewgeneralconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewpluginsconfig.mo share/locale/nds/LC_MESSAGES/kcm_kviewviewerpluginsconfig.mo @@ -108,6 +115,7 @@ share/locale/nds/LC_MESSAGES/kcmkwallet.mo share/locale/nds/LC_MESSAGES/kcmkwindecoration.mo share/locale/nds/LC_MESSAGES/kcmkwinrules.mo share/locale/nds/LC_MESSAGES/kcmkwm.mo +share/locale/nds/LC_MESSAGES/kcmlanbrowser.mo share/locale/nds/LC_MESSAGES/kcmlaptop.mo share/locale/nds/LC_MESSAGES/kcmlaunch.mo share/locale/nds/LC_MESSAGES/kcmlayout.mo @@ -127,8 +135,10 @@ share/locale/nds/LC_MESSAGES/kcmsmserver.mo share/locale/nds/LC_MESSAGES/kcmspellchecking.mo share/locale/nds/LC_MESSAGES/kcmstyle.mo share/locale/nds/LC_MESSAGES/kcmtaskbar.mo +share/locale/nds/LC_MESSAGES/kcmthinkpad.mo share/locale/nds/LC_MESSAGES/kcmusb.mo share/locale/nds/LC_MESSAGES/kcmview1394.mo +share/locale/nds/LC_MESSAGES/kcmwifi.mo share/locale/nds/LC_MESSAGES/kcmxinerama.mo share/locale/nds/LC_MESSAGES/kcoloredit.mo share/locale/nds/LC_MESSAGES/kcontrol.mo @@ -149,9 +159,11 @@ share/locale/nds/LC_MESSAGES/kdesktop.mo 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/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/kdmconfig.mo share/locale/nds/LC_MESSAGES/kdmgreet.mo @@ -171,6 +183,7 @@ share/locale/nds/LC_MESSAGES/kfile_gif.mo share/locale/nds/LC_MESSAGES/kfile_html.mo share/locale/nds/LC_MESSAGES/kfile_ico.mo share/locale/nds/LC_MESSAGES/kfile_ics.mo +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 @@ -195,6 +208,7 @@ share/locale/nds/LC_MESSAGES/kfile_wav.mo share/locale/nds/LC_MESSAGES/kfile_xbm.mo share/locale/nds/LC_MESSAGES/kfile_xpm.mo share/locale/nds/LC_MESSAGES/kfileaudiopreview.mo +share/locale/nds/LC_MESSAGES/kfileshare.mo share/locale/nds/LC_MESSAGES/kfindpart.mo share/locale/nds/LC_MESSAGES/kfloppy.mo share/locale/nds/LC_MESSAGES/kfmclient.mo @@ -207,6 +221,7 @@ share/locale/nds/LC_MESSAGES/kgreet_classic.mo share/locale/nds/LC_MESSAGES/kgreet_winbind.mo share/locale/nds/LC_MESSAGES/khelpcenter.mo share/locale/nds/LC_MESSAGES/khexedit.mo +share/locale/nds/LC_MESSAGES/khexedit2part.mo share/locale/nds/LC_MESSAGES/khotkeys.mo share/locale/nds/LC_MESSAGES/khtmlkttsd.mo share/locale/nds/LC_MESSAGES/khtmlsettingsplugin.mo @@ -256,12 +271,15 @@ share/locale/nds/LC_MESSAGES/kmail.mo share/locale/nds/LC_MESSAGES/kmail_text_calendar_plugin.mo share/locale/nds/LC_MESSAGES/kmail_text_vcard_plugin.mo share/locale/nds/LC_MESSAGES/kmailcvt.mo +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/kmilo_delli8k.mo share/locale/nds/LC_MESSAGES/kmilo_generic.mo share/locale/nds/LC_MESSAGES/kmilo_kvaio.mo share/locale/nds/LC_MESSAGES/kmilo_powerbook.mo +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 @@ -270,6 +288,7 @@ 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/knetworkconf.mo share/locale/nds/LC_MESSAGES/knewsticker.mo share/locale/nds/LC_MESSAGES/knode.mo share/locale/nds/LC_MESSAGES/knotes.mo @@ -283,7 +302,10 @@ share/locale/nds/LC_MESSAGES/konnector_kcal.mo share/locale/nds/LC_MESSAGES/konnector_local.mo share/locale/nds/LC_MESSAGES/konnector_qtopia.mo share/locale/nds/LC_MESSAGES/konnector_remote.mo +share/locale/nds/LC_MESSAGES/konqsidebar_delicious.mo 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/konsole.mo share/locale/nds/LC_MESSAGES/konsolekalendar.mo @@ -313,6 +335,7 @@ 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/krfb.mo share/locale/nds/LC_MESSAGES/kruler.mo share/locale/nds/LC_MESSAGES/krunapplet.mo share/locale/nds/LC_MESSAGES/ksayit.mo @@ -361,6 +384,7 @@ share/locale/nds/LC_MESSAGES/kviewscannerplugin.mo share/locale/nds/LC_MESSAGES/kwalletmanager.mo 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/kwin_clients.mo share/locale/nds/LC_MESSAGES/kwin_lib.mo @@ -372,8 +396,8 @@ share/locale/nds/LC_MESSAGES/kxsconfig.mo share/locale/nds/LC_MESSAGES/libKTTSD.mo 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/libkcalsystem.mo share/locale/nds/LC_MESSAGES/libkdegames.mo share/locale/nds/LC_MESSAGES/libkdepim.mo share/locale/nds/LC_MESSAGES/libkholidays.mo @@ -410,6 +434,8 @@ 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/quicklauncher.mo +share/locale/nds/LC_MESSAGES/rellinks.mo +share/locale/nds/LC_MESSAGES/searchbarplugin.mo share/locale/nds/LC_MESSAGES/secpolicy.mo share/locale/nds/LC_MESSAGES/spy.mo share/locale/nds/LC_MESSAGES/superkaramba.mo diff --git a/misc/kde4-l10n-nl/distinfo b/misc/kde4-l10n-nl/distinfo index a172a39e4eda..1cd0bfe4f9d5 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.3.tar.bz2) = ebc1507bf23421c07e0e1bce2bcb216e -SHA256 (KDE/kde-i18n/kde-i18n-nl-3.5.3.tar.bz2) = 76428faf1fc918552a1f79f5c37c440b99c1631e3b32b478c1dd0908f6403273 -SIZE (KDE/kde-i18n/kde-i18n-nl-3.5.3.tar.bz2) = 10191873 +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 diff --git a/misc/kde4-l10n-nn/distinfo b/misc/kde4-l10n-nn/distinfo index 4378027aa03b..23af7daf022a 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.3.tar.bz2) = eed3d9cd4271df35b78fdb7aaf9c11e4 -SHA256 (KDE/kde-i18n/kde-i18n-nn-3.5.3.tar.bz2) = 2078c80703dc924433bf7d8d2da236e6ee336dff2cbf016f98d1c6e2a72dd71b -SIZE (KDE/kde-i18n/kde-i18n-nn-3.5.3.tar.bz2) = 1855645 +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 diff --git a/misc/kde4-l10n-nn/pkg-plist b/misc/kde4-l10n-nn/pkg-plist index 9f4dd5195217..a78dfb5b608a 100644 --- a/misc/kde4-l10n-nn/pkg-plist +++ b/misc/kde4-l10n-nn/pkg-plist @@ -283,7 +283,6 @@ share/locale/nn/LC_MESSAGES/kmathapplet.mo share/locale/nn/LC_MESSAGES/kmcop.mo share/locale/nn/LC_MESSAGES/kmenuapplet.mo share/locale/nn/LC_MESSAGES/kmenuedit.mo -share/locale/nn/LC_MESSAGES/kmessedwords.mo share/locale/nn/LC_MESSAGES/kmid.mo share/locale/nn/LC_MESSAGES/kmines.mo share/locale/nn/LC_MESSAGES/kminipagerapplet.mo @@ -409,7 +408,6 @@ share/locale/nn/LC_MESSAGES/kxkb.mo share/locale/nn/LC_MESSAGES/kxsconfig.mo share/locale/nn/LC_MESSAGES/libdmctl.mo share/locale/nn/LC_MESSAGES/libkcal.mo -share/locale/nn/LC_MESSAGES/libkcalsystem.mo share/locale/nn/LC_MESSAGES/libkcddb.mo share/locale/nn/LC_MESSAGES/libkdegames.mo share/locale/nn/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde4-l10n-pa/distinfo b/misc/kde4-l10n-pa/distinfo index 48ebba16f97f..dc0b355e1290 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.3.tar.bz2) = 1bf7fb2adbf61536be4872d8be1dd5cd -SHA256 (KDE/kde-i18n/kde-i18n-pa-3.5.3.tar.bz2) = 734a17156c5f030a2acc5c72b4ed4956aa18d9ccefc0f2daaf2c8716b0318e71 -SIZE (KDE/kde-i18n/kde-i18n-pa-3.5.3.tar.bz2) = 1267539 +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 diff --git a/misc/kde4-l10n-pa/pkg-plist b/misc/kde4-l10n-pa/pkg-plist index 5552a9df32cc..8dab0cae9924 100644 --- a/misc/kde4-l10n-pa/pkg-plist +++ b/misc/kde4-l10n-pa/pkg-plist @@ -425,7 +425,6 @@ share/locale/pa/LC_MESSAGES/libdmctl.mo share/locale/pa/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/pa/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/pa/LC_MESSAGES/libkcal.mo -share/locale/pa/LC_MESSAGES/libkcalsystem.mo share/locale/pa/LC_MESSAGES/libkcddb.mo share/locale/pa/LC_MESSAGES/libkdegames.mo share/locale/pa/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde4-l10n-ro/distinfo b/misc/kde4-l10n-ro/distinfo index 44546ce0eef6..7907462c6074 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.3.tar.bz2) = e1a7a05994927ab9ac76174430d76991 -SHA256 (KDE/kde-i18n/kde-i18n-ro-3.5.3.tar.bz2) = ee230651d90cba46401c10f99544873a4a2be4b23fdeb7487208c315a621ff10 -SIZE (KDE/kde-i18n/kde-i18n-ro-3.5.3.tar.bz2) = 3166197 +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 diff --git a/misc/kde4-l10n-ro/pkg-plist b/misc/kde4-l10n-ro/pkg-plist index c507d997fe74..e5e6a2c39bc1 100644 --- a/misc/kde4-l10n-ro/pkg-plist +++ b/misc/kde4-l10n-ro/pkg-plist @@ -195,7 +195,6 @@ share/locale/ro/LC_MESSAGES/juk.mo share/locale/ro/LC_MESSAGES/kabc2mutt.mo share/locale/ro/LC_MESSAGES/kabc_dir.mo share/locale/ro/LC_MESSAGES/kabc_file.mo -share/locale/ro/LC_MESSAGES/kabc_ldap.mo share/locale/ro/LC_MESSAGES/kabc_ldapkio.mo share/locale/ro/LC_MESSAGES/kabc_net.mo share/locale/ro/LC_MESSAGES/kabc_sql.mo @@ -413,6 +412,7 @@ share/locale/ro/LC_MESSAGES/kio_finger.mo share/locale/ro/LC_MESSAGES/kio_fish.mo share/locale/ro/LC_MESSAGES/kio_floppy.mo share/locale/ro/LC_MESSAGES/kio_help.mo +share/locale/ro/LC_MESSAGES/kio_home.mo share/locale/ro/LC_MESSAGES/kio_imap4.mo share/locale/ro/LC_MESSAGES/kio_lan.mo share/locale/ro/LC_MESSAGES/kio_ldap.mo @@ -452,7 +452,6 @@ share/locale/ro/LC_MESSAGES/kmathapplet.mo share/locale/ro/LC_MESSAGES/kmcop.mo share/locale/ro/LC_MESSAGES/kmenuapplet.mo share/locale/ro/LC_MESSAGES/kmenuedit.mo -share/locale/ro/LC_MESSAGES/kmessedwords.mo share/locale/ro/LC_MESSAGES/kmid.mo share/locale/ro/LC_MESSAGES/kmilo_generic.mo share/locale/ro/LC_MESSAGES/kmilo_kvaio.mo @@ -586,9 +585,9 @@ share/locale/ro/LC_MESSAGES/kwriteconfig.mo share/locale/ro/LC_MESSAGES/kxkb.mo share/locale/ro/LC_MESSAGES/kxsconfig.mo share/locale/ro/LC_MESSAGES/kxsldbg.mo +share/locale/ro/LC_MESSAGES/libdmctl.mo share/locale/ro/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ro/LC_MESSAGES/libkcal.mo -share/locale/ro/LC_MESSAGES/libkcalsystem.mo share/locale/ro/LC_MESSAGES/libkcddb.mo share/locale/ro/LC_MESSAGES/libkdegames.mo share/locale/ro/LC_MESSAGES/libkdepim.mo @@ -597,6 +596,8 @@ share/locale/ro/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/ro/LC_MESSAGES/libkickermenu_konsole.mo share/locale/ro/LC_MESSAGES/libkickermenu_prefmenu.mo share/locale/ro/LC_MESSAGES/libkickermenu_recentdocs.mo +share/locale/ro/LC_MESSAGES/libkickermenu_remotemenu.mo +share/locale/ro/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/ro/LC_MESSAGES/libkickermenu_tom.mo share/locale/ro/LC_MESSAGES/libkleopatra.mo share/locale/ro/LC_MESSAGES/libkonq.mo @@ -631,6 +632,7 @@ share/locale/ro/LC_MESSAGES/spy.mo share/locale/ro/LC_MESSAGES/synaescope.mo share/locale/ro/LC_MESSAGES/timezones.mo share/locale/ro/LC_MESSAGES/tippecanoe.mo +share/locale/ro/LC_MESSAGES/trashapplet.mo share/locale/ro/LC_MESSAGES/tyler.mo share/locale/ro/LC_MESSAGES/uachangerplugin.mo share/locale/ro/LC_MESSAGES/umbrello.mo diff --git a/misc/kde4-l10n-sk/distinfo b/misc/kde4-l10n-sk/distinfo index b77b180cc84e..cb0f289ad3bf 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.3.tar.bz2) = 6d74e2e2d58e0c10c177d9852e283f14 -SHA256 (KDE/kde-i18n/kde-i18n-sk-3.5.3.tar.bz2) = b002b24323ee5e1a1ef45f66c4743689affb9a42da8dfb953938699731257d1c -SIZE (KDE/kde-i18n/kde-i18n-sk-3.5.3.tar.bz2) = 5472498 +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 diff --git a/misc/kde4-l10n-sk/pkg-plist b/misc/kde4-l10n-sk/pkg-plist index 10cab6cc0870..3aa924aa4cb6 100644 --- a/misc/kde4-l10n-sk/pkg-plist +++ b/misc/kde4-l10n-sk/pkg-plist @@ -781,6 +781,8 @@ share/doc/HTML/sk/umbrello/pics/use-case-diagram.png share/doc/HTML/sk/umbrello/screen-shots.xmi share/doc/HTML/sk/umbrello/uml_basics.docbook share/doc/HTML/sk/umbrello/working_with_umbrello.docbook +share/locale/sk/LC_MESSAGES/akregator.mo +share/locale/sk/LC_MESSAGES/akregator_konqplugin.mo share/locale/sk/LC_MESSAGES/alsaplayerui.mo share/locale/sk/LC_MESSAGES/amor.mo share/locale/sk/LC_MESSAGES/appletproxy.mo @@ -791,9 +793,12 @@ share/locale/sk/LC_MESSAGES/artscontrol.mo share/locale/sk/LC_MESSAGES/artsmodules.mo share/locale/sk/LC_MESSAGES/atlantik.mo share/locale/sk/LC_MESSAGES/atlantikdesigner.mo +share/locale/sk/LC_MESSAGES/audiocd_encoder_lame.mo +share/locale/sk/LC_MESSAGES/audiocd_encoder_vorbis.mo share/locale/sk/LC_MESSAGES/audiorename_plugin.mo share/locale/sk/LC_MESSAGES/autorefresh.mo share/locale/sk/LC_MESSAGES/babelfish.mo +share/locale/sk/LC_MESSAGES/blinken.mo share/locale/sk/LC_MESSAGES/cervisia.mo share/locale/sk/LC_MESSAGES/charlatanui.mo share/locale/sk/LC_MESSAGES/clockapplet.mo @@ -830,6 +835,7 @@ share/locale/sk/LC_MESSAGES/kaccess.mo share/locale/sk/LC_MESSAGES/kaddressbook.mo share/locale/sk/LC_MESSAGES/kalarm.mo share/locale/sk/LC_MESSAGES/kalzium.mo +share/locale/sk/LC_MESSAGES/kanagram.mo share/locale/sk/LC_MESSAGES/kandy.mo share/locale/sk/LC_MESSAGES/kappfinder.mo share/locale/sk/LC_MESSAGES/karm.mo @@ -849,12 +855,14 @@ share/locale/sk/LC_MESSAGES/katemodeline.mo share/locale/sk/LC_MESSAGES/kateopenheader.mo share/locale/sk/LC_MESSAGES/katepart.mo share/locale/sk/LC_MESSAGES/katepybrowse.mo +share/locale/sk/LC_MESSAGES/katesnippets.mo share/locale/sk/LC_MESSAGES/katetabbarextension.mo share/locale/sk/LC_MESSAGES/katetextfilter.mo share/locale/sk/LC_MESSAGES/katexmlcheck.mo share/locale/sk/LC_MESSAGES/katexmltools.mo share/locale/sk/LC_MESSAGES/katomic.mo share/locale/sk/LC_MESSAGES/kaudiocreator.mo +share/locale/sk/LC_MESSAGES/kay.mo share/locale/sk/LC_MESSAGES/kbabel.mo share/locale/sk/LC_MESSAGES/kbackgammon.mo share/locale/sk/LC_MESSAGES/kbattleship.mo @@ -862,7 +870,9 @@ share/locale/sk/LC_MESSAGES/kbinaryclock.mo share/locale/sk/LC_MESSAGES/kblackbox.mo share/locale/sk/LC_MESSAGES/kbounce.mo share/locale/sk/LC_MESSAGES/kbruch.mo +share/locale/sk/LC_MESSAGES/kbstateapplet.mo share/locale/sk/LC_MESSAGES/kbugbuster.mo +share/locale/sk/LC_MESSAGES/kcachegrind.mo share/locale/sk/LC_MESSAGES/kcalc.mo share/locale/sk/LC_MESSAGES/kcharselect.mo share/locale/sk/LC_MESSAGES/kcharselectapplet.mo @@ -894,6 +904,7 @@ share/locale/sk/LC_MESSAGES/kcmkabconfig.mo share/locale/sk/LC_MESSAGES/kcmkamera.mo share/locale/sk/LC_MESSAGES/kcmkclock.mo share/locale/sk/LC_MESSAGES/kcmkded.mo +share/locale/sk/LC_MESSAGES/kcmkdnssd.mo share/locale/sk/LC_MESSAGES/kcmkeys.mo share/locale/sk/LC_MESSAGES/kcmkicker.mo share/locale/sk/LC_MESSAGES/kcmkio.mo @@ -916,6 +927,7 @@ share/locale/sk/LC_MESSAGES/kcmlayout.mo share/locale/sk/LC_MESSAGES/kcmlilo.mo share/locale/sk/LC_MESSAGES/kcmlirc.mo share/locale/sk/LC_MESSAGES/kcmlocale.mo +share/locale/sk/LC_MESSAGES/kcmmedia.mo share/locale/sk/LC_MESSAGES/kcmnic.mo share/locale/sk/LC_MESSAGES/kcmnotify.mo share/locale/sk/LC_MESSAGES/kcmperformance.mo @@ -943,6 +955,7 @@ share/locale/sk/LC_MESSAGES/kdelibs.mo share/locale/sk/LC_MESSAGES/kdelibs_colors.mo share/locale/sk/LC_MESSAGES/kdelirc.mo share/locale/sk/LC_MESSAGES/kdepasswd.mo +share/locale/sk/LC_MESSAGES/kdepimresources.mo share/locale/sk/LC_MESSAGES/kdepimwizards.mo share/locale/sk/LC_MESSAGES/kdeprint.mo share/locale/sk/LC_MESSAGES/kdeprint_part.mo @@ -959,6 +972,7 @@ share/locale/sk/LC_MESSAGES/kdgantt.mo share/locale/sk/LC_MESSAGES/kdialog.mo share/locale/sk/LC_MESSAGES/kdict.mo share/locale/sk/LC_MESSAGES/kdictapplet.mo +share/locale/sk/LC_MESSAGES/kdjview.mo share/locale/sk/LC_MESSAGES/kdmconfig.mo share/locale/sk/LC_MESSAGES/kdmgreet.mo share/locale/sk/LC_MESSAGES/kdvi.mo @@ -966,11 +980,14 @@ share/locale/sk/LC_MESSAGES/kedit.mo share/locale/sk/LC_MESSAGES/keduca.mo share/locale/sk/LC_MESSAGES/kenolaba.mo share/locale/sk/LC_MESSAGES/kfax.mo +share/locale/sk/LC_MESSAGES/kfaxview.mo share/locale/sk/LC_MESSAGES/kfifteenapplet.mo share/locale/sk/LC_MESSAGES/kfile_au.mo share/locale/sk/LC_MESSAGES/kfile_avi.mo share/locale/sk/LC_MESSAGES/kfile_bmp.mo +share/locale/sk/LC_MESSAGES/kfile_cert.mo share/locale/sk/LC_MESSAGES/kfile_cpp.mo +share/locale/sk/LC_MESSAGES/kfile_dds.mo share/locale/sk/LC_MESSAGES/kfile_deb.mo share/locale/sk/LC_MESSAGES/kfile_desktop.mo share/locale/sk/LC_MESSAGES/kfile_diff.mo @@ -982,12 +999,15 @@ share/locale/sk/LC_MESSAGES/kfile_folder.mo share/locale/sk/LC_MESSAGES/kfile_gif.mo share/locale/sk/LC_MESSAGES/kfile_html.mo share/locale/sk/LC_MESSAGES/kfile_ico.mo +share/locale/sk/LC_MESSAGES/kfile_ics.mo share/locale/sk/LC_MESSAGES/kfile_jpeg.mo share/locale/sk/LC_MESSAGES/kfile_kig.mo share/locale/sk/LC_MESSAGES/kfile_lnk.mo share/locale/sk/LC_MESSAGES/kfile_m3u.mo +share/locale/sk/LC_MESSAGES/kfile_mhtml.mo share/locale/sk/LC_MESSAGES/kfile_mp3.mo share/locale/sk/LC_MESSAGES/kfile_mpc.mo +share/locale/sk/LC_MESSAGES/kfile_mpeg.mo share/locale/sk/LC_MESSAGES/kfile_ogg.mo share/locale/sk/LC_MESSAGES/kfile_palm.mo share/locale/sk/LC_MESSAGES/kfile_pcx.mo @@ -1001,13 +1021,18 @@ share/locale/sk/LC_MESSAGES/kfile_rgb.mo share/locale/sk/LC_MESSAGES/kfile_rpm.mo share/locale/sk/LC_MESSAGES/kfile_sid.mo share/locale/sk/LC_MESSAGES/kfile_tga.mo +share/locale/sk/LC_MESSAGES/kfile_theora.mo share/locale/sk/LC_MESSAGES/kfile_tiff.mo +share/locale/sk/LC_MESSAGES/kfile_torrent.mo share/locale/sk/LC_MESSAGES/kfile_ts.mo share/locale/sk/LC_MESSAGES/kfile_txt.mo share/locale/sk/LC_MESSAGES/kfile_vcf.mo share/locale/sk/LC_MESSAGES/kfile_wav.mo share/locale/sk/LC_MESSAGES/kfile_xbm.mo +share/locale/sk/LC_MESSAGES/kfile_xpm.mo share/locale/sk/LC_MESSAGES/kfileaudiopreview.mo +share/locale/sk/LC_MESSAGES/kfilereplace.mo +share/locale/sk/LC_MESSAGES/kfileshare.mo share/locale/sk/LC_MESSAGES/kfindpart.mo share/locale/sk/LC_MESSAGES/kfloppy.mo share/locale/sk/LC_MESSAGES/kfmclient.mo @@ -1015,27 +1040,35 @@ share/locale/sk/LC_MESSAGES/kfontinst.mo share/locale/sk/LC_MESSAGES/kfouleggs.mo share/locale/sk/LC_MESSAGES/kgamma.mo share/locale/sk/LC_MESSAGES/kgantt.mo +share/locale/sk/LC_MESSAGES/kgeography.mo share/locale/sk/LC_MESSAGES/kget.mo share/locale/sk/LC_MESSAGES/kghostview.mo share/locale/sk/LC_MESSAGES/kgoldrunner.mo share/locale/sk/LC_MESSAGES/kgpg.mo share/locale/sk/LC_MESSAGES/kgreet_classic.mo +share/locale/sk/LC_MESSAGES/kgreet_winbind.mo share/locale/sk/LC_MESSAGES/khangman.mo share/locale/sk/LC_MESSAGES/khelpcenter.mo share/locale/sk/LC_MESSAGES/khexedit.mo +share/locale/sk/LC_MESSAGES/khexedit2part.mo share/locale/sk/LC_MESSAGES/khotkeys.mo +share/locale/sk/LC_MESSAGES/khtmlkttsd.mo share/locale/sk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/sk/LC_MESSAGES/kicker.mo share/locale/sk/LC_MESSAGES/kiconedit.mo share/locale/sk/LC_MESSAGES/kig.mo +share/locale/sk/LC_MESSAGES/kimagemapeditor.mo share/locale/sk/LC_MESSAGES/kinetd.mo share/locale/sk/LC_MESSAGES/kio.mo share/locale/sk/LC_MESSAGES/kio_audiocd.mo share/locale/sk/LC_MESSAGES/kio_finger.mo share/locale/sk/LC_MESSAGES/kio_fish.mo share/locale/sk/LC_MESSAGES/kio_floppy.mo +share/locale/sk/LC_MESSAGES/kio_groupwise.mo share/locale/sk/LC_MESSAGES/kio_help.mo +share/locale/sk/LC_MESSAGES/kio_home.mo share/locale/sk/LC_MESSAGES/kio_imap4.mo +share/locale/sk/LC_MESSAGES/kio_jabberdisco.mo share/locale/sk/LC_MESSAGES/kio_lan.mo share/locale/sk/LC_MESSAGES/kio_ldap.mo share/locale/sk/LC_MESSAGES/kio_mac.mo @@ -1052,8 +1085,12 @@ share/locale/sk/LC_MESSAGES/kio_sftp.mo share/locale/sk/LC_MESSAGES/kio_sieve.mo share/locale/sk/LC_MESSAGES/kio_smb.mo share/locale/sk/LC_MESSAGES/kio_smtp.mo +share/locale/sk/LC_MESSAGES/kio_svn.mo share/locale/sk/LC_MESSAGES/kio_system.mo +share/locale/sk/LC_MESSAGES/kio_tar.mo +share/locale/sk/LC_MESSAGES/kio_thumbnail.mo share/locale/sk/LC_MESSAGES/kio_trash.mo +share/locale/sk/LC_MESSAGES/kio_zeroconf.mo share/locale/sk/LC_MESSAGES/kioexec.mo share/locale/sk/LC_MESSAGES/kiten.mo share/locale/sk/LC_MESSAGES/kjobviewer.mo @@ -1065,6 +1102,7 @@ share/locale/sk/LC_MESSAGES/kleopatra.mo share/locale/sk/LC_MESSAGES/klettres.mo share/locale/sk/LC_MESSAGES/klickety.mo share/locale/sk/LC_MESSAGES/klines.mo +share/locale/sk/LC_MESSAGES/klinkstatus.mo share/locale/sk/LC_MESSAGES/klipper.mo share/locale/sk/LC_MESSAGES/klock.mo share/locale/sk/LC_MESSAGES/kmag.mo @@ -1077,8 +1115,8 @@ share/locale/sk/LC_MESSAGES/kmathapplet.mo share/locale/sk/LC_MESSAGES/kmcop.mo share/locale/sk/LC_MESSAGES/kmenuapplet.mo share/locale/sk/LC_MESSAGES/kmenuedit.mo -share/locale/sk/LC_MESSAGES/kmessedwords.mo share/locale/sk/LC_MESSAGES/kmid.mo +share/locale/sk/LC_MESSAGES/kmilo_delli8k.mo share/locale/sk/LC_MESSAGES/kmilo_generic.mo share/locale/sk/LC_MESSAGES/kmilo_kvaio.mo share/locale/sk/LC_MESSAGES/kmilo_powerbook.mo @@ -1093,6 +1131,9 @@ share/locale/sk/LC_MESSAGES/kmousetool.mo share/locale/sk/LC_MESSAGES/kmouth.mo share/locale/sk/LC_MESSAGES/kmplot.mo share/locale/sk/LC_MESSAGES/kmrml.mo +share/locale/sk/LC_MESSAGES/knetattach.mo +share/locale/sk/LC_MESSAGES/knetwalk.mo +share/locale/sk/LC_MESSAGES/knetworkconf.mo share/locale/sk/LC_MESSAGES/knewsticker.mo share/locale/sk/LC_MESSAGES/knode.mo share/locale/sk/LC_MESSAGES/knotes.mo @@ -1101,8 +1142,17 @@ share/locale/sk/LC_MESSAGES/kodo.mo share/locale/sk/LC_MESSAGES/kolf.mo share/locale/sk/LC_MESSAGES/kolourpaint.mo share/locale/sk/LC_MESSAGES/kolourpicker.mo +share/locale/sk/LC_MESSAGES/kommander.mo share/locale/sk/LC_MESSAGES/kompare.mo +share/locale/sk/LC_MESSAGES/konnector_dummy.mo +share/locale/sk/LC_MESSAGES/konnector_kabc.mo +share/locale/sk/LC_MESSAGES/konnector_kcal.mo +share/locale/sk/LC_MESSAGES/konnector_local.mo +share/locale/sk/LC_MESSAGES/konnector_qtopia.mo +share/locale/sk/LC_MESSAGES/konnector_remote.mo +share/locale/sk/LC_MESSAGES/konqsidebar_delicious.mo share/locale/sk/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/sk/LC_MESSAGES/konqsidebar_metabar.mo share/locale/sk/LC_MESSAGES/konqsidebar_news.mo share/locale/sk/LC_MESSAGES/konqueror.mo share/locale/sk/LC_MESSAGES/konquest.mo @@ -1133,14 +1183,23 @@ share/locale/sk/LC_MESSAGES/krdc.mo share/locale/sk/LC_MESSAGES/kreadconfig.mo share/locale/sk/LC_MESSAGES/krec.mo share/locale/sk/LC_MESSAGES/kregexpeditor.mo +share/locale/sk/LC_MESSAGES/kres_birthday.mo +share/locale/sk/LC_MESSAGES/kres_blogging.mo +share/locale/sk/LC_MESSAGES/kres_bugzilla.mo share/locale/sk/LC_MESSAGES/kres_exchange.mo +share/locale/sk/LC_MESSAGES/kres_featureplan.mo +share/locale/sk/LC_MESSAGES/kres_groupware.mo +share/locale/sk/LC_MESSAGES/kres_groupwise.mo +share/locale/sk/LC_MESSAGES/kres_kolab.mo share/locale/sk/LC_MESSAGES/kres_remote.mo +share/locale/sk/LC_MESSAGES/kres_tvanytime.mo share/locale/sk/LC_MESSAGES/kres_xmlrpc.mo share/locale/sk/LC_MESSAGES/kreversi.mo share/locale/sk/LC_MESSAGES/krfb.mo share/locale/sk/LC_MESSAGES/kruler.mo share/locale/sk/LC_MESSAGES/krunapplet.mo share/locale/sk/LC_MESSAGES/ksame.mo +share/locale/sk/LC_MESSAGES/ksayit.mo share/locale/sk/LC_MESSAGES/kscd.mo share/locale/sk/LC_MESSAGES/kscreensaver.mo share/locale/sk/LC_MESSAGES/kshisen.mo @@ -1159,7 +1218,9 @@ share/locale/sk/LC_MESSAGES/ksplashthemes.mo share/locale/sk/LC_MESSAGES/kstars.mo share/locale/sk/LC_MESSAGES/kstart.mo share/locale/sk/LC_MESSAGES/kstartperf.mo +share/locale/sk/LC_MESSAGES/kstyle_highcontrast_config.mo share/locale/sk/LC_MESSAGES/kstyle_keramik_config.mo +share/locale/sk/LC_MESSAGES/kstyle_phase_config.mo share/locale/sk/LC_MESSAGES/kstyle_plastik_config.mo share/locale/sk/LC_MESSAGES/ksvgplugin.mo share/locale/sk/LC_MESSAGES/ksync.mo @@ -1180,7 +1241,9 @@ share/locale/sk/LC_MESSAGES/ktip.mo share/locale/sk/LC_MESSAGES/ktnef.mo share/locale/sk/LC_MESSAGES/ktouch.mo share/locale/sk/LC_MESSAGES/ktron.mo +share/locale/sk/LC_MESSAGES/kttsd.mo share/locale/sk/LC_MESSAGES/ktuberling.mo +share/locale/sk/LC_MESSAGES/kturtle.mo share/locale/sk/LC_MESSAGES/ktux.mo share/locale/sk/LC_MESSAGES/kuick_plugin.mo share/locale/sk/LC_MESSAGES/kuickshow.mo @@ -1205,17 +1268,25 @@ share/locale/sk/LC_MESSAGES/kwin.mo share/locale/sk/LC_MESSAGES/kwin4.mo share/locale/sk/LC_MESSAGES/kwin_art_clients.mo share/locale/sk/LC_MESSAGES/kwin_clients.mo +share/locale/sk/LC_MESSAGES/kwin_lib.mo share/locale/sk/LC_MESSAGES/kwireless.mo +share/locale/sk/LC_MESSAGES/kwordquiz.mo share/locale/sk/LC_MESSAGES/kworldclock.mo share/locale/sk/LC_MESSAGES/kwriteconfig.mo share/locale/sk/LC_MESSAGES/kxkb.mo share/locale/sk/LC_MESSAGES/kxsconfig.mo +share/locale/sk/LC_MESSAGES/kxsldbg.mo +share/locale/sk/LC_MESSAGES/libKTTSD.mo +share/locale/sk/LC_MESSAGES/libdmctl.mo share/locale/sk/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/sk/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/sk/LC_MESSAGES/libkcal.mo -share/locale/sk/LC_MESSAGES/libkcalsystem.mo share/locale/sk/LC_MESSAGES/libkcddb.mo +share/locale/sk/LC_MESSAGES/libkdeedu.mo share/locale/sk/LC_MESSAGES/libkdegames.mo share/locale/sk/LC_MESSAGES/libkdepim.mo +share/locale/sk/LC_MESSAGES/libkfaximgage.mo +share/locale/sk/LC_MESSAGES/libkholidays.mo share/locale/sk/LC_MESSAGES/libkicker.mo share/locale/sk/LC_MESSAGES/libkickermenu_kdeprint.mo share/locale/sk/LC_MESSAGES/libkickermenu_konsole.mo @@ -1225,7 +1296,9 @@ share/locale/sk/LC_MESSAGES/libkickermenu_remotemenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_systemmenu.mo share/locale/sk/LC_MESSAGES/libkickermenu_tom.mo share/locale/sk/LC_MESSAGES/libkleopatra.mo +share/locale/sk/LC_MESSAGES/libkmime.mo share/locale/sk/LC_MESSAGES/libkonq.mo +share/locale/sk/LC_MESSAGES/libkpgp.mo share/locale/sk/LC_MESSAGES/libkpimexchange.mo share/locale/sk/LC_MESSAGES/libkscan.mo share/locale/sk/LC_MESSAGES/libkscreensaver.mo @@ -1239,7 +1312,9 @@ share/locale/sk/LC_MESSAGES/lskat.mo share/locale/sk/LC_MESSAGES/lyrics.mo share/locale/sk/LC_MESSAGES/mediaapplet.mo share/locale/sk/LC_MESSAGES/mediacontrol.mo +share/locale/sk/LC_MESSAGES/mf_konqplugin.mo share/locale/sk/LC_MESSAGES/minitoolsplugin.mo +share/locale/sk/LC_MESSAGES/multisynk.mo share/locale/sk/LC_MESSAGES/naughtyapplet.mo share/locale/sk/LC_MESSAGES/nexscope.mo share/locale/sk/LC_MESSAGES/noatun.mo @@ -1254,9 +1329,11 @@ share/locale/sk/LC_MESSAGES/rellinks.mo share/locale/sk/LC_MESSAGES/searchbarplugin.mo share/locale/sk/LC_MESSAGES/secpolicy.mo share/locale/sk/LC_MESSAGES/spy.mo +share/locale/sk/LC_MESSAGES/superkaramba.mo share/locale/sk/LC_MESSAGES/synaescope.mo share/locale/sk/LC_MESSAGES/timezones.mo share/locale/sk/LC_MESSAGES/tippecanoe.mo +share/locale/sk/LC_MESSAGES/trashapplet.mo share/locale/sk/LC_MESSAGES/tyler.mo share/locale/sk/LC_MESSAGES/uachangerplugin.mo share/locale/sk/LC_MESSAGES/umbrello.mo diff --git a/misc/kde4-l10n-sl/distinfo b/misc/kde4-l10n-sl/distinfo index 7c44d5245283..2f66f43feb20 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.3.tar.bz2) = 49f0579ca96ecbe65cee0ad13e2fd144 -SHA256 (KDE/kde-i18n/kde-i18n-sl-3.5.3.tar.bz2) = 0b07ad024182fe1a2fa64f82b49bfa1f1517ad5db9e73d23c8fe6199aa2ccdba -SIZE (KDE/kde-i18n/kde-i18n-sl-3.5.3.tar.bz2) = 4459131 +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 diff --git a/misc/kde4-l10n-sl/pkg-plist b/misc/kde4-l10n-sl/pkg-plist index e0a3531dac97..d59a8173525c 100644 --- a/misc/kde4-l10n-sl/pkg-plist +++ b/misc/kde4-l10n-sl/pkg-plist @@ -629,7 +629,6 @@ share/locale/sl/LC_MESSAGES/kmathapplet.mo share/locale/sl/LC_MESSAGES/kmcop.mo share/locale/sl/LC_MESSAGES/kmenuapplet.mo share/locale/sl/LC_MESSAGES/kmenuedit.mo -share/locale/sl/LC_MESSAGES/kmessedwords.mo share/locale/sl/LC_MESSAGES/kmid.mo share/locale/sl/LC_MESSAGES/kmilo_delli8k.mo share/locale/sl/LC_MESSAGES/kmilo_generic.mo @@ -664,7 +663,9 @@ share/locale/sl/LC_MESSAGES/konnector_kcal.mo share/locale/sl/LC_MESSAGES/konnector_local.mo share/locale/sl/LC_MESSAGES/konnector_qtopia.mo share/locale/sl/LC_MESSAGES/konnector_remote.mo +share/locale/sl/LC_MESSAGES/konqsidebar_delicious.mo share/locale/sl/LC_MESSAGES/konqsidebar_mediaplayer.mo +share/locale/sl/LC_MESSAGES/konqsidebar_metabar.mo share/locale/sl/LC_MESSAGES/konqsidebar_news.mo share/locale/sl/LC_MESSAGES/konqueror.mo share/locale/sl/LC_MESSAGES/konquest.mo @@ -824,6 +825,7 @@ share/locale/sl/LC_MESSAGES/lskat.mo share/locale/sl/LC_MESSAGES/lyrics.mo share/locale/sl/LC_MESSAGES/mediaapplet.mo share/locale/sl/LC_MESSAGES/mediacontrol.mo +share/locale/sl/LC_MESSAGES/mf_konqplugin.mo share/locale/sl/LC_MESSAGES/minitoolsplugin.mo share/locale/sl/LC_MESSAGES/multisynk.mo share/locale/sl/LC_MESSAGES/naughtyapplet.mo diff --git a/misc/kde4-l10n-sr/distinfo b/misc/kde4-l10n-sr/distinfo index f28c0017a533..be96771e41a0 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.3.tar.bz2) = d8823f8b5765a61b290346257c660c61 -SHA256 (KDE/kde-i18n/kde-i18n-sr-3.5.3.tar.bz2) = 62ffab2bdc5670389e115310b381ad6adf78f05b9bc3e8d207f480b4ccaeb02b -SIZE (KDE/kde-i18n/kde-i18n-sr-3.5.3.tar.bz2) = 2622662 +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 diff --git a/misc/kde4-l10n-sv/distinfo b/misc/kde4-l10n-sv/distinfo index fa8ccc63b59b..dee2774642e5 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.3.tar.bz2) = dad7a462acf4dc90790aaeb63320e839 -SHA256 (KDE/kde-i18n/kde-i18n-sv-3.5.3.tar.bz2) = 64cd304d3c491131a3f5baa32f7ccc7d89132aed2295bf03534cbe666aedfb06 -SIZE (KDE/kde-i18n/kde-i18n-sv-3.5.3.tar.bz2) = 28388570 +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 diff --git a/misc/kde4-l10n-sv/pkg-plist b/misc/kde4-l10n-sv/pkg-plist index a46707c96cf3..ed3c1a3c11d5 100644 --- a/misc/kde4-l10n-sv/pkg-plist +++ b/misc/kde4-l10n-sv/pkg-plist @@ -971,6 +971,9 @@ share/doc/HTML/sv/kig/text_label_wizard__select_property.png share/doc/HTML/sv/kinfocenter/blockdevices/common share/doc/HTML/sv/kinfocenter/blockdevices/index.cache.bz2 share/doc/HTML/sv/kinfocenter/blockdevices/index.docbook +share/doc/HTML/sv/kinfocenter/cdinfo/common +share/doc/HTML/sv/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/sv/kinfocenter/cdinfo/index.docbook share/doc/HTML/sv/kinfocenter/common share/doc/HTML/sv/kinfocenter/devices/common share/doc/HTML/sv/kinfocenter/devices/index.cache.bz2 @@ -2890,6 +2893,7 @@ share/locale/sv/flag.png @dirrm share/doc/HTML/sv/kinfocenter/interrupts @dirrm share/doc/HTML/sv/kinfocenter/dma @dirrm share/doc/HTML/sv/kinfocenter/devices +@dirrm share/doc/HTML/sv/kinfocenter/cdinfo @dirrm share/doc/HTML/sv/kinfocenter/blockdevices @dirrm share/doc/HTML/sv/kinfocenter @dirrm share/doc/HTML/sv/kig diff --git a/misc/kde4-l10n-ta/distinfo b/misc/kde4-l10n-ta/distinfo index acf29435bc76..9a26f11b3a09 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.3.tar.bz2) = 987f75a1f89abaa6f3562ef94d75d84d -SHA256 (KDE/kde-i18n/kde-i18n-ta-3.5.3.tar.bz2) = 32499427d70a68836ee63d28df1cfeb2329801cc1d5bbf94d52d83dddc249879 -SIZE (KDE/kde-i18n/kde-i18n-ta-3.5.3.tar.bz2) = 2113656 +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 diff --git a/misc/kde4-l10n-ta/pkg-plist b/misc/kde4-l10n-ta/pkg-plist index 71246b1f0b5c..3354190f6e26 100644 --- a/misc/kde4-l10n-ta/pkg-plist +++ b/misc/kde4-l10n-ta/pkg-plist @@ -321,7 +321,6 @@ share/locale/ta/LC_MESSAGES/kmathapplet.mo share/locale/ta/LC_MESSAGES/kmcop.mo share/locale/ta/LC_MESSAGES/kmenuapplet.mo share/locale/ta/LC_MESSAGES/kmenuedit.mo -share/locale/ta/LC_MESSAGES/kmessedwords.mo share/locale/ta/LC_MESSAGES/kmid.mo share/locale/ta/LC_MESSAGES/kmilo_delli8k.mo share/locale/ta/LC_MESSAGES/kmilo_generic.mo @@ -480,7 +479,6 @@ share/locale/ta/LC_MESSAGES/libdmctl.mo share/locale/ta/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/ta/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/ta/LC_MESSAGES/libkcal.mo -share/locale/ta/LC_MESSAGES/libkcalsystem.mo share/locale/ta/LC_MESSAGES/libkcddb.mo share/locale/ta/LC_MESSAGES/libkdegames.mo share/locale/ta/LC_MESSAGES/libkdepim.mo diff --git a/misc/kde4-l10n-tg/distinfo b/misc/kde4-l10n-tg/distinfo index 445236af881c..dc7398a1d6eb 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.3.tar.bz2) = b5964f459c74b57349ddd5f3934bc93f -SHA256 (KDE/kde-i18n/kde-i18n-tg-3.5.3.tar.bz2) = d873bdb042330efe2c7a8ed56463a8acc5d6402f5aae3c1931ee6d6bac15f896 -SIZE (KDE/kde-i18n/kde-i18n-tg-3.5.3.tar.bz2) = 2118659 +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 diff --git a/misc/kde4-l10n-tg/pkg-plist b/misc/kde4-l10n-tg/pkg-plist index 5d0a5ee7a42a..e169e74231f8 100644 --- a/misc/kde4-l10n-tg/pkg-plist +++ b/misc/kde4-l10n-tg/pkg-plist @@ -307,7 +307,6 @@ share/locale/tg/LC_MESSAGES/kmathapplet.mo share/locale/tg/LC_MESSAGES/kmcop.mo share/locale/tg/LC_MESSAGES/kmenuapplet.mo share/locale/tg/LC_MESSAGES/kmenuedit.mo -share/locale/tg/LC_MESSAGES/kmessedwords.mo share/locale/tg/LC_MESSAGES/kmid.mo share/locale/tg/LC_MESSAGES/kmilo_generic.mo share/locale/tg/LC_MESSAGES/kmilo_kvaio.mo @@ -450,8 +449,8 @@ share/locale/tg/LC_MESSAGES/kxsconfig.mo share/locale/tg/LC_MESSAGES/kxsldbg.mo share/locale/tg/LC_MESSAGES/libKTTSD.mo share/locale/tg/LC_MESSAGES/libkaddrbk_geo_xxport.mo +share/locale/tg/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/tg/LC_MESSAGES/libkcal.mo -share/locale/tg/LC_MESSAGES/libkcalsystem.mo share/locale/tg/LC_MESSAGES/libkcddb.mo share/locale/tg/LC_MESSAGES/libkdeedu.mo share/locale/tg/LC_MESSAGES/libkdegames.mo diff --git a/misc/kde4-l10n-tr/distinfo b/misc/kde4-l10n-tr/distinfo index e3b80bf92416..d5f37c24edae 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.3.tar.bz2) = 598d5f55f9e4512757ee40f802968097 -SHA256 (KDE/kde-i18n/kde-i18n-tr-3.5.3.tar.bz2) = 388e39ce97865da1980cf8a7c79264fe1e6fe358f680958356cff7cbb7951509 -SIZE (KDE/kde-i18n/kde-i18n-tr-3.5.3.tar.bz2) = 2124704 +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 diff --git a/misc/kde4-l10n-tr/pkg-plist b/misc/kde4-l10n-tr/pkg-plist index fad26d5dc0bf..6f5fa4455217 100644 --- a/misc/kde4-l10n-tr/pkg-plist +++ b/misc/kde4-l10n-tr/pkg-plist @@ -557,7 +557,6 @@ share/locale/tr/LC_MESSAGES/libdmctl.mo share/locale/tr/LC_MESSAGES/libkaddrbk_geo_xxport.mo share/locale/tr/LC_MESSAGES/libkaddrbk_gmx_xxport.mo share/locale/tr/LC_MESSAGES/libkcal.mo -share/locale/tr/LC_MESSAGES/libkcalsystem.mo share/locale/tr/LC_MESSAGES/libkcddb.mo share/locale/tr/LC_MESSAGES/libkdeedu.mo share/locale/tr/LC_MESSAGES/libkdegames.mo diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index 6a622b816560..11b2c4da6035 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.3.tar.bz2) = 5c9cb7f25c8627772d6de5a3ed550691 -SHA256 (KDE/kdeedu-3.5.3.tar.bz2) = dae2944e365e915d39409306dc035969e9730a4d9b0bf1088bad77380731c99a -SIZE (KDE/kdeedu-3.5.3.tar.bz2) = 29862187 +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 diff --git a/misc/kdeedu3/pkg-plist b/misc/kdeedu3/pkg-plist index 5dcf2745eda7..27316fc4835e 100644 --- a/misc/kdeedu3/pkg-plist +++ b/misc/kdeedu3/pkg-plist @@ -571,6 +571,7 @@ share/apps/kgeography/flags/lebanon.png share/apps/kgeography/flags/lesotho.png share/apps/kgeography/flags/liberia.png share/apps/kgeography/flags/libya.png +share/apps/kgeography/flags/liechtenstein.png share/apps/kgeography/flags/lithuania.png share/apps/kgeography/flags/lower_saxony.png share/apps/kgeography/flags/luxembourg.png @@ -1059,6 +1060,7 @@ share/apps/klatin/klatinui.rc share/apps/klettres/cs.txt share/apps/klettres/da.txt share/apps/klettres/data/sounds.xml +share/apps/klettres/de.txt share/apps/klettres/en/alpha/A.ogg share/apps/klettres/en/alpha/B.ogg share/apps/klettres/en/alpha/C.ogg diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo index 6a622b816560..11b2c4da6035 100644 --- a/misc/kdeedu4/distinfo +++ b/misc/kdeedu4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeedu-3.5.3.tar.bz2) = 5c9cb7f25c8627772d6de5a3ed550691 -SHA256 (KDE/kdeedu-3.5.3.tar.bz2) = dae2944e365e915d39409306dc035969e9730a4d9b0bf1088bad77380731c99a -SIZE (KDE/kdeedu-3.5.3.tar.bz2) = 29862187 +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 diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist index 5dcf2745eda7..27316fc4835e 100644 --- a/misc/kdeedu4/pkg-plist +++ b/misc/kdeedu4/pkg-plist @@ -571,6 +571,7 @@ share/apps/kgeography/flags/lebanon.png share/apps/kgeography/flags/lesotho.png share/apps/kgeography/flags/liberia.png share/apps/kgeography/flags/libya.png +share/apps/kgeography/flags/liechtenstein.png share/apps/kgeography/flags/lithuania.png share/apps/kgeography/flags/lower_saxony.png share/apps/kgeography/flags/luxembourg.png @@ -1059,6 +1060,7 @@ share/apps/klatin/klatinui.rc share/apps/klettres/cs.txt share/apps/klettres/da.txt share/apps/klettres/data/sounds.xml +share/apps/klettres/de.txt share/apps/klettres/en/alpha/A.ogg share/apps/klettres/en/alpha/B.ogg share/apps/klettres/en/alpha/C.ogg diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/misc/kdeutils4/distinfo +++ b/misc/kdeutils4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/misc/kfile-plugins/distinfo b/misc/kfile-plugins/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/misc/kfile-plugins/distinfo +++ b/misc/kfile-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/kfile-plugins/pkg-plist b/misc/kfile-plugins/pkg-plist index f16cd778975f..cf8284dd8f9f 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.3 +share/applications/kdeaddons-kfile-plugins-3.5.4 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 5488a4e522d4..4f56fe634057 100644 --- a/misc/kicker-applets/distinfo +++ b/misc/kicker-applets/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/kicker-applets/pkg-plist b/misc/kicker-applets/pkg-plist index f6a5f1f66c06..10d4637ce477 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.3 +share/applications/kdeaddons-kicker-applets-3.5.4 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 5488a4e522d4..4f56fe634057 100644 --- a/misc/knewsticker-scripts/distinfo +++ b/misc/knewsticker-scripts/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/knewsticker-scripts/pkg-plist b/misc/knewsticker-scripts/pkg-plist index e8309c0dc7bb..9ab6d8408026 100644 --- a/misc/knewsticker-scripts/pkg-plist +++ b/misc/knewsticker-scripts/pkg-plist @@ -1,4 +1,4 @@ -share/applications/kdeaddons-knewsticker-scripts-3.5.3 +share/applications/kdeaddons-knewsticker-scripts-3.5.4 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-af/Makefile b/misc/koffice-i18n-af/Makefile index 62a99d1e371b..e4b9ec692332 100644 --- a/misc/koffice-i18n-af/Makefile +++ b/misc/koffice-i18n-af/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n/ diff --git a/misc/koffice-i18n-af/distinfo b/misc/koffice-i18n-af/distinfo index 63ace992aad6..a237df425523 100644 --- a/misc/koffice-i18n-af/distinfo +++ b/misc/koffice-i18n-af/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 99f5fae8b0d15bcdec7daa3dfadfc20d -SHA256 (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 703f8866481ccf0e3cffccc6dfd435773b832e0d1a32cabd88e02a6ccef6184c -SIZE (KDE/kde-i18n/koffice-l10n-af-1.5.1.tar.bz2) = 296643 +MD5 (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = c7a48bb275230d1152e29c67a869daee +SHA256 (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = faa430cfdffc355d2d5d62b14361d92149fe9837858c535403cb231db5faf615 +SIZE (KDE/kde-i18n/koffice-l10n-af-1.5.2.tar.bz2) = 299202 diff --git a/misc/koffice-i18n-bg/Makefile b/misc/koffice-i18n-bg/Makefile index 7b8287bad1ad..2ecbec660515 100644 --- a/misc/koffice-i18n-bg/Makefile +++ b/misc/koffice-i18n-bg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-bg/distinfo b/misc/koffice-i18n-bg/distinfo index 2bc19d6b68fe..3258ff0bd7dc 100644 --- a/misc/koffice-i18n-bg/distinfo +++ b/misc/koffice-i18n-bg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 8daaeb614b3439490c2dd64a5ca6a90d -SHA256 (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 0e06d8cc13613e92afba454b044b755c939bb9be9affba5bc830a197862abfda -SIZE (KDE/kde-i18n/koffice-l10n-bg-1.5.1.tar.bz2) = 355616 +MD5 (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = b8be1348ffab32d826c358d44de68c5e +SHA256 (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = 294b662d5275caf11ad72ab11cb99ba48c4b095fb461eccaf63980e45ca69ba8 +SIZE (KDE/kde-i18n/koffice-l10n-bg-1.5.2.tar.bz2) = 351822 diff --git a/misc/koffice-i18n-br/Makefile b/misc/koffice-i18n-br/Makefile index a898054656d2..8fd8edc0fb11 100644 --- a/misc/koffice-i18n-br/Makefile +++ b/misc/koffice-i18n-br/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-br/distinfo b/misc/koffice-i18n-br/distinfo index d03578082ecb..9a37f4d3a6b3 100644 --- a/misc/koffice-i18n-br/distinfo +++ b/misc/koffice-i18n-br/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = bed06b1e8dc15ab3f0360d66ecb5eca8 -SHA256 (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = 9fe3993744750d9ffe4ee73b24d6b2d785ecbd58160553142fb9a814ee413d4f -SIZE (KDE/kde-i18n/koffice-l10n-br-1.5.1.tar.bz2) = 341344 +MD5 (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = fd0738d2c9538994de3573ec00964cf1 +SHA256 (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = 94d9eb043e2ae74f796cda17ad7eb4150f1955337cb24cd490e7d7fc80d3df1f +SIZE (KDE/kde-i18n/koffice-l10n-br-1.5.2.tar.bz2) = 343251 diff --git a/misc/koffice-i18n-bs/Makefile b/misc/koffice-i18n-bs/Makefile index 03fdd1a9aa62..7de5ad949abf 100644 --- a/misc/koffice-i18n-bs/Makefile +++ b/misc/koffice-i18n-bs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-bs/distinfo b/misc/koffice-i18n-bs/distinfo index c73ad621bc1a..17e6df30a9a7 100644 --- a/misc/koffice-i18n-bs/distinfo +++ b/misc/koffice-i18n-bs/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = f5e83bf3d981a433fe8470947ed22c0a -SHA256 (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = 3b38dd2af360e0c72d189280c31a7e255472a2ada87acedb834719e49c264af3 -SIZE (KDE/kde-i18n/koffice-l10n-bs-1.5.1.tar.bz2) = 318009 +MD5 (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = b7de9b93298aba597d9d8f8da038fc37 +SHA256 (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = 590a0dc51ba2da5652f94cbf6927f79bae0c39bc8c36c752acf3937a9c7cca39 +SIZE (KDE/kde-i18n/koffice-l10n-bs-1.5.2.tar.bz2) = 321653 diff --git a/misc/koffice-i18n-ca/Makefile b/misc/koffice-i18n-ca/Makefile index 0e7ecad639c0..99d12bd89bdb 100644 --- a/misc/koffice-i18n-ca/Makefile +++ b/misc/koffice-i18n-ca/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 24b67e957f6b..5138bc7fcafb 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.1.tar.bz2) = a9386b6c6049814d6f4a3f67a4cb51d8 -SHA256 (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 7eb35b1babbb185eee032a53b27d8298c8e6a8571c8fc070e006193ad8640005 -SIZE (KDE/kde-i18n/koffice-l10n-ca-1.5.1.tar.bz2) = 414688 +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 diff --git a/misc/koffice-i18n-ca/pkg-plist b/misc/koffice-i18n-ca/pkg-plist index e9d1a88c22a9..232a56980982 100644 --- a/misc/koffice-i18n-ca/pkg-plist +++ b/misc/koffice-i18n-ca/pkg-plist @@ -1,4 +1,26 @@ share/apps/koffice/autocorrect/ca.xml +share/doc/HTML/ca/karbon/common +share/doc/HTML/ca/karbon/index.cache.bz2 +share/doc/HTML/ca/karbon/index.docbook +share/doc/HTML/ca/kchart/common +share/doc/HTML/ca/kchart/index.cache.bz2 +share/doc/HTML/ca/kchart/index.docbook +share/doc/HTML/ca/kexi/basics.docbook +share/doc/HTML/ca/kexi/building.docbook +share/doc/HTML/ca/kexi/common +share/doc/HTML/ca/kexi/configuration.docbook +share/doc/HTML/ca/kexi/credits.docbook +share/doc/HTML/ca/kexi/database.docbook +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/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/locale/ca/LC_MESSAGES/desktop_koffice.mo share/locale/ca/LC_MESSAGES/example.mo share/locale/ca/LC_MESSAGES/karbon.mo @@ -29,5 +51,11 @@ 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/koshell +@dirrm share/doc/HTML/ca/koffice +@dirrm share/doc/HTML/ca/kexi +@dirrm share/doc/HTML/ca/kchart +@dirrm share/doc/HTML/ca/karbon +@dirrm share/doc/HTML/ca @dirrm share/apps/koffice/autocorrect @dirrm share/apps/koffice diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile index 624a3095a679..11a8257a6539 100644 --- a/misc/koffice-i18n-cs/Makefile +++ b/misc/koffice-i18n-cs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 9f6c44685a00..0eff1f2b120c 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.1.tar.bz2) = 6f68790c56564626e42949979a4e1dba -SHA256 (KDE/kde-i18n/koffice-l10n-cs-1.5.1.tar.bz2) = f170cbce508526bf760f26714fbf24c1581195735f0c03407cd53a53db984be8 -SIZE (KDE/kde-i18n/koffice-l10n-cs-1.5.1.tar.bz2) = 347217 +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 diff --git a/misc/koffice-i18n-cy/Makefile b/misc/koffice-i18n-cy/Makefile index c7ec076ea307..e2b1ba01c39b 100644 --- a/misc/koffice-i18n-cy/Makefile +++ b/misc/koffice-i18n-cy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-cy/distinfo b/misc/koffice-i18n-cy/distinfo index a43fd5606bc9..21d80be97f5b 100644 --- a/misc/koffice-i18n-cy/distinfo +++ b/misc/koffice-i18n-cy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = 780d5816865f60b88209059c6c2e7d02 -SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = ae49963408bfc302c3b1d5b9f606056ad21136edbaa30b51f90f39c899cfb3c4 -SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.1.tar.bz2) = 368554 +MD5 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 64782ef55dbdfbbc3672b613dc7f5faf +SHA256 (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = fe88628577f77f791b445682ab42dbd5448cd2b321135c207308e0399ee6f920 +SIZE (KDE/kde-i18n/koffice-l10n-cy-1.5.2.tar.bz2) = 370382 diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile index 6d2783ebb880..47c61c8df6cd 100644 --- a/misc/koffice-i18n-da/Makefile +++ b/misc/koffice-i18n-da/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 f889e6500901..ea0cfc7cacff 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.1.tar.bz2) = aa38e3e0f04a930e89543cfb79c6184d -SHA256 (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 6a97b8c73cc23849016f9326ede15959f451c42754a828ea1f5c98e4fa03c25e -SIZE (KDE/kde-i18n/koffice-l10n-da-1.5.1.tar.bz2) = 1009829 +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 diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile index ec9cbed3e935..00dab794c8cf 100644 --- a/misc/koffice-i18n-el/Makefile +++ b/misc/koffice-i18n-el/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 0dc8ee5b6cee..d99d2f341307 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.1.tar.bz2) = 350963ba95241e2576c077d4558d7fcb -SHA256 (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = e0578168a21cf0c525f67b429a5ce5b8bc21f2d93fe9c1864909ec928c55092f -SIZE (KDE/kde-i18n/koffice-l10n-el-1.5.1.tar.bz2) = 365646 +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 diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile index 790a4e597f30..2aa1fd93bb12 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.1 +PORTVERSION= 1.5.2 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 aba9ce2990bc..28cf71ee2884 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.1.tar.bz2) = b7ae8b4aee9810f2b78235962f7f1dc2 -SHA256 (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 65abe80175f07027e95b4758550468822b336721293a42a5421d32e0b270c85d -SIZE (KDE/kde-i18n/koffice-l10n-en_GB-1.5.1.tar.bz2) = 340890 +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 diff --git a/misc/koffice-i18n-eo/Makefile b/misc/koffice-i18n-eo/Makefile index c9d1d050b5bd..86a742fdc68a 100644 --- a/misc/koffice-i18n-eo/Makefile +++ b/misc/koffice-i18n-eo/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-eo/distinfo b/misc/koffice-i18n-eo/distinfo index 71f59a65c3ab..914ac4d07966 100644 --- a/misc/koffice-i18n-eo/distinfo +++ b/misc/koffice-i18n-eo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 71c42a69ea9c417494d1603bc3b646b8 -SHA256 (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 60a27e9b52000afac67bd9601558c19216095be3634fe9011f832d4b805fbebc -SIZE (KDE/kde-i18n/koffice-l10n-eo-1.5.1.tar.bz2) = 357414 +MD5 (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = c7025f7d946342267943fd146a5cc19c +SHA256 (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = 395762438e80573921acc1d21ae9a316b3d96ffc28252637be6137b4e7510e72 +SIZE (KDE/kde-i18n/koffice-l10n-eo-1.5.2.tar.bz2) = 359445 diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile index 41bae8e5423d..fe268dca1e63 100644 --- a/misc/koffice-i18n-es/Makefile +++ b/misc/koffice-i18n-es/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 bc92c9429856..5aedacd37629 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.1.tar.bz2) = 70b926928aa1a2facb3409f144191967 -SHA256 (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 0b77ba910fffa2cf23c9f9423d958e8efe9c0469a6433eb09f129781b8e94c5e -SIZE (KDE/kde-i18n/koffice-l10n-es-1.5.1.tar.bz2) = 8804520 +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 diff --git a/misc/koffice-i18n-es/pkg-plist b/misc/koffice-i18n-es/pkg-plist index f5758a148958..a02bdd2b7e9d 100644 --- a/misc/koffice-i18n-es/pkg-plist +++ b/misc/koffice-i18n-es/pkg-plist @@ -1,4 +1,8 @@ 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 share/doc/HTML/es/kchart/common share/doc/HTML/es/kchart/cr22-action-chart_line.png share/doc/HTML/es/kchart/cr22-action-data.png @@ -31,12 +35,21 @@ share/doc/HTML/es/kchart/kchart-example1-9.png share/doc/HTML/es/kchart/kchart-kspread-bar.png share/doc/HTML/es/kchart/kchart-kspread.png share/doc/HTML/es/kchart/kchart-startupdialog.png +share/doc/HTML/es/kchart/kchart-wizard0.png share/doc/HTML/es/kchart/kchart-wizard1.png share/doc/HTML/es/kchart/kchart-wizard2.png share/doc/HTML/es/kchart/kchart-wizard3.png share/doc/HTML/es/kchart/kchart-wizard4.png 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/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/intro.docbook +share/doc/HTML/es/kexi/menus.docbook share/doc/HTML/es/kformula/ambiguous-string.png share/doc/HTML/es/kformula/common share/doc/HTML/es/kformula/correct_index_location.png @@ -84,14 +97,62 @@ share/doc/HTML/es/koffice/index.docbook share/doc/HTML/es/koshell/common share/doc/HTML/es/koshell/index.cache.bz2 share/doc/HTML/es/koshell/index.docbook +share/doc/HTML/es/koshell/koshell1.png +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/configure-wbs.png +share/doc/HTML/es/kplato/configure2.1.png +share/doc/HTML/es/kplato/configure2.png +share/doc/HTML/es/kplato/definitions.docbook +share/doc/HTML/es/kplato/edit-accounts.png +share/doc/HTML/es/kplato/edit-accounts1.png +share/doc/HTML/es/kplato/edit-calendar.png +share/doc/HTML/es/kplato/edit-calendar1.png +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/mainwindow.docbook +share/doc/HTML/es/kplato/mainwindow1.png +share/doc/HTML/es/kplato/options.docbook +share/doc/HTML/es/kplato/project-settings.png +share/doc/HTML/es/kplato/wbs.docbook +share/doc/HTML/es/kplato/wbs.png +share/doc/HTML/es/kplato/wbs1.png +share/doc/HTML/es/kplato/wbs2.png +share/doc/HTML/es/kplato/wbs3.png share/doc/HTML/es/kpresenter/a11y.docbook +share/doc/HTML/es/kpresenter/autocorrection1.png +share/doc/HTML/es/kpresenter/autocorrection2.png +share/doc/HTML/es/kpresenter/autocorrection3.png +share/doc/HTML/es/kpresenter/autocorrection4.png share/doc/HTML/es/kpresenter/barstyle1.png share/doc/HTML/es/kpresenter/barstyle3.png share/doc/HTML/es/kpresenter/barstyle4.png share/doc/HTML/es/kpresenter/barstyle5.png share/doc/HTML/es/kpresenter/barstyle6.png share/doc/HTML/es/kpresenter/barstyle7.png +share/doc/HTML/es/kpresenter/break.png +share/doc/HTML/es/kpresenter/changeformat.png share/doc/HTML/es/kpresenter/common +share/doc/HTML/es/kpresenter/completion.png +share/doc/HTML/es/kpresenter/configure1.png +share/doc/HTML/es/kpresenter/configure2.png +share/doc/HTML/es/kpresenter/configure3.png +share/doc/HTML/es/kpresenter/configure4.png +share/doc/HTML/es/kpresenter/configure4a.png +share/doc/HTML/es/kpresenter/configure4a1.png +share/doc/HTML/es/kpresenter/configure4b.png +share/doc/HTML/es/kpresenter/configure4c.png +share/doc/HTML/es/kpresenter/configure5.png +share/doc/HTML/es/kpresenter/configure6.png +share/doc/HTML/es/kpresenter/configure6b.png +share/doc/HTML/es/kpresenter/configure6c.png +share/doc/HTML/es/kpresenter/configure6d.png +share/doc/HTML/es/kpresenter/configure6e.png +share/doc/HTML/es/kpresenter/configure7.png share/doc/HTML/es/kpresenter/faq.docbook share/doc/HTML/es/kpresenter/great-presentations.docbook share/doc/HTML/es/kpresenter/guides.docbook @@ -103,14 +164,28 @@ share/doc/HTML/es/kpresenter/htmlshow03.png share/doc/HTML/es/kpresenter/htmlshow04.png share/doc/HTML/es/kpresenter/htmlshow05.png share/doc/HTML/es/kpresenter/htmlshow07.png +share/doc/HTML/es/kpresenter/htmlshow1.png +share/doc/HTML/es/kpresenter/htmlshow2.png +share/doc/HTML/es/kpresenter/htmlshow3.png +share/doc/HTML/es/kpresenter/htmlshow4.png +share/doc/HTML/es/kpresenter/htmlshow5.png +share/doc/HTML/es/kpresenter/htmlshow6.png +share/doc/HTML/es/kpresenter/htmlshow7.png +share/doc/HTML/es/kpresenter/htmlshow8.png +share/doc/HTML/es/kpresenter/htmlshow9.png share/doc/HTML/es/kpresenter/index.cache.bz2 share/doc/HTML/es/kpresenter/index.docbook +share/doc/HTML/es/kpresenter/kbd-focus-ext.png +share/doc/HTML/es/kpresenter/link.png share/doc/HTML/es/kpresenter/menus.docbook +share/doc/HTML/es/kpresenter/mousenav.png share/doc/HTML/es/kpresenter/msexport1.png share/doc/HTML/es/kpresenter/msexport2.png +share/doc/HTML/es/kpresenter/msexport2b.png share/doc/HTML/es/kpresenter/msexport3.png share/doc/HTML/es/kpresenter/msexport4.png share/doc/HTML/es/kpresenter/options.docbook +share/doc/HTML/es/kpresenter/properties.png share/doc/HTML/es/kpresenter/screen.docbook share/doc/HTML/es/kpresenter/settings03.png share/doc/HTML/es/kpresenter/settings04.png @@ -119,11 +194,15 @@ share/doc/HTML/es/kpresenter/settings06.png share/doc/HTML/es/kpresenter/template02.png share/doc/HTML/es/kpresenter/template03.png share/doc/HTML/es/kpresenter/template04.png +share/doc/HTML/es/kpresenter/template05.png share/doc/HTML/es/kpresenter/template06.png share/doc/HTML/es/kpresenter/template07.png share/doc/HTML/es/kpresenter/textmenu01.png share/doc/HTML/es/kpresenter/textmenu02.png share/doc/HTML/es/kpresenter/textmenu03a.png +share/doc/HTML/es/kpresenter/textmenu1.png +share/doc/HTML/es/kpresenter/textmenu2.png +share/doc/HTML/es/kpresenter/tts.png share/doc/HTML/es/kpresenter/tut01.png share/doc/HTML/es/kpresenter/tut02.png share/doc/HTML/es/kpresenter/tut03.png @@ -147,7 +226,147 @@ share/doc/HTML/es/kpresenter/tut20.png share/doc/HTML/es/kpresenter/tut21.png share/doc/HTML/es/kpresenter/tut22.png share/doc/HTML/es/kpresenter/tut23.png +share/doc/HTML/es/kpresenter/tut24.png +share/doc/HTML/es/kpresenter/tut25.png +share/doc/HTML/es/kpresenter/tut26.png share/doc/HTML/es/kpresenter/tutorial.docbook +share/doc/HTML/es/kpresenter/zoomfactor.png +share/doc/HTML/es/krita/commands-dialogs.docbook +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/createdocument.png +share/doc/HTML/es/krita/credits.docbook +share/doc/HTML/es/krita/crocusses-bumpmap.png +share/doc/HTML/es/krita/crocusses-edgebottom.png +share/doc/HTML/es/krita/crocusses-embossall.png +share/doc/HTML/es/krita/crocusses-embossvariable.png +share/doc/HTML/es/krita/crocusses-gaussianblur.png +share/doc/HTML/es/krita/crocusses-invert.png +share/doc/HTML/es/krita/crocusses-meanremoval.png +share/doc/HTML/es/krita/crocusses-oilpaint.png +share/doc/HTML/es/krita/crocusses-pixelize.png +share/doc/HTML/es/krita/crocusses-raindrops.png +share/doc/HTML/es/krita/crocusses-roundcorners.png +share/doc/HTML/es/krita/crocusses-sharpen.png +share/doc/HTML/es/krita/crocusses-simplenoise.png +share/doc/HTML/es/krita/crocusses-tiles.png +share/doc/HTML/es/krita/crocusses.png +share/doc/HTML/es/krita/developers.docbook +share/doc/HTML/es/krita/dialogs-addpalette.png +share/doc/HTML/es/krita/dialogs-brightnesscontrast.png +share/doc/HTML/es/krita/dialogs-bumpmap.png +share/doc/HTML/es/krita/dialogs-coloradjustment.png +share/doc/HTML/es/krita/dialogs-colorrange.png +share/doc/HTML/es/krita/dialogs-convertimagetype.png +share/doc/HTML/es/krita/dialogs-convertlayertype.png +share/doc/HTML/es/krita/dialogs-cubism.png +share/doc/HTML/es/krita/dialogs-documentinformation.png +share/doc/HTML/es/krita/dialogs-dropshadow.png +share/doc/HTML/es/krita/dialogs-emboss.png +share/doc/HTML/es/krita/dialogs-filtersgallery.png +share/doc/HTML/es/krita/dialogs-histogram.png +share/doc/HTML/es/krita/dialogs-imageproperties.png +share/doc/HTML/es/krita/dialogs-imagesize.png +share/doc/HTML/es/krita/dialogs-layerproperties.png +share/doc/HTML/es/krita/dialogs-layersize.png +share/doc/HTML/es/krita/dialogs-newadjustmentlayer.png +share/doc/HTML/es/krita/dialogs-newlayer.png +share/doc/HTML/es/krita/dialogs-oilpaint.png +share/doc/HTML/es/krita/dialogs-pixelize.png +share/doc/HTML/es/krita/dialogs-raindrops.png +share/doc/HTML/es/krita/dialogs-rotateimage.png +share/doc/HTML/es/krita/dialogs-rotatelayer.png +share/doc/HTML/es/krita/dialogs-roundcorners.png +share/doc/HTML/es/krita/dialogs-separateimage.png +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/installation.docbook +share/doc/HTML/es/krita/introduction.docbook +share/doc/HTML/es/krita/mainscreen.png +share/doc/HTML/es/krita/newimage.png +share/doc/HTML/es/krita/palettes-colors-gray.png +share/doc/HTML/es/krita/palettes-colors-hsv.png +share/doc/HTML/es/krita/palettes-colors-palettes.png +share/doc/HTML/es/krita/palettes-colors-rgb.png +share/doc/HTML/es/krita/palettes-colors-watercolors.png +share/doc/HTML/es/krita/palettes-controlbox-brush.png +share/doc/HTML/es/krita/palettes-controlbox-colorpicker.png +share/doc/HTML/es/krita/palettes-controlbox-contiguousfill.png +share/doc/HTML/es/krita/palettes-controlbox-crop.png +share/doc/HTML/es/krita/palettes-controlbox-gradient.png +share/doc/HTML/es/krita/palettes-controlbox-histogram.png +share/doc/HTML/es/krita/palettes-controlbox-line.png +share/doc/HTML/es/krita/palettes-controlbox-overview.png +share/doc/HTML/es/krita/palettes-controlbox-paintwithfilters.png +share/doc/HTML/es/krita/palettes-controlbox-rectangle.png +share/doc/HTML/es/krita/palettes-controlbox-select.png +share/doc/HTML/es/krita/palettes-controlbox-selectcontiguous.png +share/doc/HTML/es/krita/palettes-controlbox-star.png +share/doc/HTML/es/krita/palettes-controlbox-text.png +share/doc/HTML/es/krita/palettes-controlbox-transform.png +share/doc/HTML/es/krita/palettes-layers-layers.png +share/doc/HTML/es/krita/palettes-layers-scriptsmanager.png +share/doc/HTML/es/krita/preferences-color.png +share/doc/HTML/es/krita/preferences-display.png +share/doc/HTML/es/krita/preferences-general.png +share/doc/HTML/es/krita/preferences-grid.png +share/doc/HTML/es/krita/preferences-performance.png +share/doc/HTML/es/krita/preferences-sidebar.png +share/doc/HTML/es/krita/preferences-tablet.png +share/doc/HTML/es/krita/scripting.docbook +share/doc/HTML/es/krita/settings.docbook +share/doc/HTML/es/krita/tool-brush.png +share/doc/HTML/es/krita/tool-colorpicker.png +share/doc/HTML/es/krita/tool-contiguousfill.png +share/doc/HTML/es/krita/tool-crop.png +share/doc/HTML/es/krita/tool-duplicate.png +share/doc/HTML/es/krita/tool-ellipse.png +share/doc/HTML/es/krita/tool-eraseselection.png +share/doc/HTML/es/krita/tool-gradient.png +share/doc/HTML/es/krita/tool-line.png +share/doc/HTML/es/krita/tool-move.png +share/doc/HTML/es/krita/tool-paintselection.png +share/doc/HTML/es/krita/tool-paintwithfilters.png +share/doc/HTML/es/krita/tool-pan.png +share/doc/HTML/es/krita/tool-polygon.png +share/doc/HTML/es/krita/tool-polyline.png +share/doc/HTML/es/krita/tool-rectangle.png +share/doc/HTML/es/krita/tool-selectcontiguous.png +share/doc/HTML/es/krita/tool-selectelliptical.png +share/doc/HTML/es/krita/tool-selectoutline.png +share/doc/HTML/es/krita/tool-selectpolygonal.png +share/doc/HTML/es/krita/tool-selectrectangular.png +share/doc/HTML/es/krita/tool-selectsimilar.png +share/doc/HTML/es/krita/tool-star.png +share/doc/HTML/es/krita/tool-text.png +share/doc/HTML/es/krita/tool-transform.png +share/doc/HTML/es/krita/tool-zoom.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-autobrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-custombrush.png +share/doc/HTML/es/krita/toolbar-brushes-brushshapes-predefined.png +share/doc/HTML/es/krita/toolbar-brushes-gradients.png +share/doc/HTML/es/krita/toolbar-brushes-patterns-custompattern.png +share/doc/HTML/es/krita/toolbar-brushes-patterns.png +share/doc/HTML/es/krita/toolbar-brushesandstuff.png +share/doc/HTML/es/krita/toolbar-edit.png +share/doc/HTML/es/krita/toolbar-file.png +share/doc/HTML/es/krita/toolbar-krita.png +share/doc/HTML/es/krita/toolbar-navigation.png +share/doc/HTML/es/krita/toolbar-transformationtools.png +share/doc/HTML/es/krita/tutorial-quick-starts.docbook +share/doc/HTML/es/krita/tutorial-select-layer.docbook +share/doc/HTML/es/krita/tutorial-starting.docbook +share/doc/HTML/es/krita/tutorial.docbook +share/doc/HTML/es/krita/using-colorspaces.docbook +share/doc/HTML/es/krita/using-filters.docbook +share/doc/HTML/es/krita/using-layers.docbook +share/doc/HTML/es/krita/using-selections-6.png +share/doc/HTML/es/krita/using-selections.docbook +share/doc/HTML/es/kspread/a11y.docbook share/doc/HTML/es/kspread/advanced.docbook share/doc/HTML/es/kspread/basics.docbook share/doc/HTML/es/kspread/cellformat0.png @@ -156,22 +375,46 @@ share/doc/HTML/es/kspread/cellformat2.png share/doc/HTML/es/kspread/cellformat3.png share/doc/HTML/es/kspread/cellformat4.png share/doc/HTML/es/kspread/cellformat5.png +share/doc/HTML/es/kspread/cellformat6.png +share/doc/HTML/es/kspread/cellformat7.png +share/doc/HTML/es/kspread/cellprotection1.png +share/doc/HTML/es/kspread/cellprotection2.png share/doc/HTML/es/kspread/chart1.png share/doc/HTML/es/kspread/commands.docbook share/doc/HTML/es/kspread/common share/doc/HTML/es/kspread/config.docbook share/doc/HTML/es/kspread/configdialog.docbook +share/doc/HTML/es/kspread/configure1.png +share/doc/HTML/es/kspread/configure2.png +share/doc/HTML/es/kspread/configure3.png +share/doc/HTML/es/kspread/configure4.png +share/doc/HTML/es/kspread/configure5.png +share/doc/HTML/es/kspread/configure6.png share/doc/HTML/es/kspread/copy1.png +share/doc/HTML/es/kspread/currency.png +share/doc/HTML/es/kspread/decreasedecimal.png share/doc/HTML/es/kspread/faq.docbook share/doc/HTML/es/kspread/format.docbook +share/doc/HTML/es/kspread/hideformula1.png +share/doc/HTML/es/kspread/hideformula2.png +share/doc/HTML/es/kspread/hideformula3.png +share/doc/HTML/es/kspread/hideformula4.png +share/doc/HTML/es/kspread/hideformula5.png share/doc/HTML/es/kspread/importexport.docbook +share/doc/HTML/es/kspread/increasedecimal.png share/doc/HTML/es/kspread/index.cache.bz2 share/doc/HTML/es/kspread/index.docbook +share/doc/HTML/es/kspread/kbd-focus-ext.png +share/doc/HTML/es/kspread/mousenav.png +share/doc/HTML/es/kspread/newdocument.png +share/doc/HTML/es/kspread/percent.png +share/doc/HTML/es/kspread/sheetproperties.png share/doc/HTML/es/kspread/shortcut1.png share/doc/HTML/es/kspread/shortcut2.png share/doc/HTML/es/kspread/shortcut3.png share/doc/HTML/es/kspread/sort1.png share/doc/HTML/es/kspread/starting1.png +share/doc/HTML/es/kspread/tts.png share/doc/HTML/es/kugar/add_detail.png share/doc/HTML/es/kugar/add_detail_footer.png share/doc/HTML/es/kugar/add_detail_header.png @@ -219,6 +462,7 @@ share/doc/HTML/es/kword/Tut3.png share/doc/HTML/es/kword/Tut4.png share/doc/HTML/es/kword/Tut7.png share/doc/HTML/es/kword/Tut8.png +share/doc/HTML/es/kword/a11y.docbook share/doc/HTML/es/kword/addentry.png share/doc/HTML/es/kword/addrecord.png share/doc/HTML/es/kword/alignBlock.png @@ -281,6 +525,7 @@ share/doc/HTML/es/kword/editpaste.png share/doc/HTML/es/kword/edittb.png share/doc/HTML/es/kword/end.png share/doc/HTML/es/kword/enumlist.png +share/doc/HTML/es/kword/exoffset.png share/doc/HTML/es/kword/expression.png share/doc/HTML/es/kword/expressions.docbook share/doc/HTML/es/kword/exst.png @@ -288,6 +533,8 @@ share/doc/HTML/es/kword/exul.png share/doc/HTML/es/kword/fchardlg.png share/doc/HTML/es/kword/fchardlg2.png share/doc/HTML/es/kword/fchardlg3.png +share/doc/HTML/es/kword/fchardlg4.png +share/doc/HTML/es/kword/fchardlg5.png share/doc/HTML/es/kword/filefloppy.png share/doc/HTML/es/kword/filenew2.png share/doc/HTML/es/kword/fileopen.png @@ -360,6 +607,7 @@ share/doc/HTML/es/kword/intro2.png share/doc/HTML/es/kword/intro3.png share/doc/HTML/es/kword/ital.png share/doc/HTML/es/kword/joincell.png +share/doc/HTML/es/kword/kbd-focus-ext.png share/doc/HTML/es/kword/kformappcol.png share/doc/HTML/es/kword/kformapprow.png share/doc/HTML/es/kword/kforminscol.png @@ -388,6 +636,7 @@ share/doc/HTML/es/kword/mmergeab1.png share/doc/HTML/es/kword/mmergekspread1.png share/doc/HTML/es/kword/mmergesql1.png share/doc/HTML/es/kword/mmergesql2.png +share/doc/HTML/es/kword/mousenav.png share/doc/HTML/es/kword/numtxtbut.png share/doc/HTML/es/kword/opendlg.png share/doc/HTML/es/kword/opt.docbook @@ -453,6 +702,7 @@ share/doc/HTML/es/kword/textstyex.png share/doc/HTML/es/kword/tfcreatebut.png share/doc/HTML/es/kword/thesaurus.png share/doc/HTML/es/kword/toc.docbook +share/doc/HTML/es/kword/tts.png share/doc/HTML/es/kword/tutorial.docbook share/doc/HTML/es/kword/undl.png share/doc/HTML/es/kword/undo.png @@ -500,11 +750,16 @@ share/locale/es/LC_MESSAGES/thesaurus_tool.mo @dirrm share/doc/HTML/es/kword @dirrm share/doc/HTML/es/kugar @dirrm share/doc/HTML/es/kspread +@dirrm share/doc/HTML/es/krita @dirrm share/doc/HTML/es/kpresenter +@dirrm share/doc/HTML/es/kplato @dirrm share/doc/HTML/es/koshell @dirrm share/doc/HTML/es/koffice @dirrm share/doc/HTML/es/kivio @dirrm share/doc/HTML/es/kformula +@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 78638aab6083..c0ba82e8d416 100644 --- a/misc/koffice-i18n-et/Makefile +++ b/misc/koffice-i18n-et/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 1fc8b57b8b66..74cb277ae6f8 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.1.tar.bz2) = 23311d668c05da159ea12240f950e763 -SHA256 (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 674392e50b4b9dd0d39c282c5a86cc263b18785b3c733b027ae3da0e9d4e0409 -SIZE (KDE/kde-i18n/koffice-l10n-et-1.5.1.tar.bz2) = 1131254 +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 diff --git a/misc/koffice-i18n-eu/Makefile b/misc/koffice-i18n-eu/Makefile index 90d160a11af6..e5083e946e8c 100644 --- a/misc/koffice-i18n-eu/Makefile +++ b/misc/koffice-i18n-eu/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 723ba5a4e059..338a0dd9e315 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.1.tar.bz2) = 39f2c93001a037b79eda7e3f9611ea8a -SHA256 (KDE/kde-i18n/koffice-l10n-eu-1.5.1.tar.bz2) = 43106f5d6d5c6690b4183d3b06a473dffbbd27e4a570343634d31718acdaa6f7 -SIZE (KDE/kde-i18n/koffice-l10n-eu-1.5.1.tar.bz2) = 350236 +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 diff --git a/misc/koffice-i18n-fi/Makefile b/misc/koffice-i18n-fi/Makefile index a7d6fda8099d..bf398813ab6b 100644 --- a/misc/koffice-i18n-fi/Makefile +++ b/misc/koffice-i18n-fi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 c9bea0ae121c..148256ad170f 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.1.tar.bz2) = f72750aa5c9cd5aa3814715ff36acd33 -SHA256 (KDE/kde-i18n/koffice-l10n-fi-1.5.1.tar.bz2) = 5462c36f67fb87104f8b5b16e37be1434dc5368af7fa11c2a2204f8624843093 -SIZE (KDE/kde-i18n/koffice-l10n-fi-1.5.1.tar.bz2) = 346277 +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 diff --git a/misc/koffice-i18n-ga/Makefile b/misc/koffice-i18n-ga/Makefile index 0c2a4b58fd6e..19e61ac4b29e 100644 --- a/misc/koffice-i18n-ga/Makefile +++ b/misc/koffice-i18n-ga/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ga/distinfo b/misc/koffice-i18n-ga/distinfo index 49c4b0ebd06b..ac64a92304b3 100644 --- a/misc/koffice-i18n-ga/distinfo +++ b/misc/koffice-i18n-ga/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 42615504255afdbadcbaafb197a6adb4 -SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 6d3e3399e4ec87422f058040bae0fd0c252df57de2bea622bed8bac8d60a1294 -SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.1.tar.bz2) = 317666 +MD5 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = b8b4d4cbb0ff29bc0da4954eb9ba4e13 +SHA256 (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 84c257d3c6672af336a3bf117a9eed2b54376dea172483bc1cb5a3ec021928a5 +SIZE (KDE/kde-i18n/koffice-l10n-ga-1.5.2.tar.bz2) = 315618 diff --git a/misc/koffice-i18n-hi/Makefile b/misc/koffice-i18n-hi/Makefile index 2ef02cb38b6a..7b830f40a021 100644 --- a/misc/koffice-i18n-hi/Makefile +++ b/misc/koffice-i18n-hi/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-hi/distinfo b/misc/koffice-i18n-hi/distinfo index eeb55f0f4aae..f22bbd3b239a 100644 --- a/misc/koffice-i18n-hi/distinfo +++ b/misc/koffice-i18n-hi/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 37de7254e2d6610ad395c260cb002201 -SHA256 (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 914e183d91e4588303cc834b370338ad8afdb6ea98b90a7a4a3446d3ded66b96 -SIZE (KDE/kde-i18n/koffice-l10n-hi-1.5.1.tar.bz2) = 324579 +MD5 (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = 95a4edd9df2b1c4744ae0b590d68822a +SHA256 (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = d7a4025a03d14b93b8da650132cc33d941db1f9751ee0d936a7bd793edd40c17 +SIZE (KDE/kde-i18n/koffice-l10n-hi-1.5.2.tar.bz2) = 326673 diff --git a/misc/koffice-i18n-is/Makefile b/misc/koffice-i18n-is/Makefile index 7eb44e2aad25..a1271111d093 100644 --- a/misc/koffice-i18n-is/Makefile +++ b/misc/koffice-i18n-is/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-is/distinfo b/misc/koffice-i18n-is/distinfo index 6aa56e2a778d..a84ade3062ff 100644 --- a/misc/koffice-i18n-is/distinfo +++ b/misc/koffice-i18n-is/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 33cf09b995ffde0c28a794ce3f6c6d51 -SHA256 (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 91e9b1b6f70be7de8071e119a6daa024424dba378ca30e3b2704350abbc1c197 -SIZE (KDE/kde-i18n/koffice-l10n-is-1.5.1.tar.bz2) = 351465 +MD5 (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = e3b5ec6948dea217e79d3c692d3e3bd3 +SHA256 (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = bc5a9aa08b464178099c3b3d3d4b874bcab999558680d05ca0c906b024e96021 +SIZE (KDE/kde-i18n/koffice-l10n-is-1.5.2.tar.bz2) = 353493 diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile index bd26c890a0b1..3549b46cc8ed 100644 --- a/misc/koffice-i18n-it/Makefile +++ b/misc/koffice-i18n-it/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 51c4c70710a7..dc9a385818d7 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.1.tar.bz2) = 71cf4cad9272090e6469a96736bd785e -SHA256 (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = c6b5f9696fd3d03eefd1eb92669dee2f6f4c0942d5604310d0d07868baf7fc2d -SIZE (KDE/kde-i18n/koffice-l10n-it-1.5.1.tar.bz2) = 1349698 +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 diff --git a/misc/koffice-i18n-it/pkg-plist b/misc/koffice-i18n-it/pkg-plist index 433a1c887ed5..81da090823f6 100644 --- a/misc/koffice-i18n-it/pkg-plist +++ b/misc/koffice-i18n-it/pkg-plist @@ -114,6 +114,7 @@ share/doc/HTML/it/kword/a11y.docbook share/doc/HTML/it/kword/basics.docbook share/doc/HTML/it/kword/bookmarks.docbook share/doc/HTML/it/kword/chapnumb.docbook +share/doc/HTML/it/kword/colorseldlg.png share/doc/HTML/it/kword/columns.docbook share/doc/HTML/it/kword/common share/doc/HTML/it/kword/doccomments.docbook @@ -122,6 +123,8 @@ share/doc/HTML/it/kword/docstruct.docbook share/doc/HTML/it/kword/docvariables.docbook share/doc/HTML/it/kword/editing.docbook share/doc/HTML/it/kword/expressions.docbook +share/doc/HTML/it/kword/finddlg.png +share/doc/HTML/it/kword/finddlg2.png share/doc/HTML/it/kword/footendnotes.docbook share/doc/HTML/it/kword/formatchar.docbook share/doc/HTML/it/kword/formatframes.docbook @@ -140,7 +143,18 @@ share/doc/HTML/it/kword/mailmerge.docbook share/doc/HTML/it/kword/mbtb.docbook share/doc/HTML/it/kword/migrating.docbook share/doc/HTML/it/kword/opt.docbook +share/doc/HTML/it/kword/opt1.png +share/doc/HTML/it/kword/opt2.png +share/doc/HTML/it/kword/opt3.png +share/doc/HTML/it/kword/opt4.png +share/doc/HTML/it/kword/opt5.png +share/doc/HTML/it/kword/optkb.png +share/doc/HTML/it/kword/optkb2.png +share/doc/HTML/it/kword/opttb.png share/doc/HTML/it/kword/pageformat.docbook +share/doc/HTML/it/kword/pntdlg.png +share/doc/HTML/it/kword/pntdlg1.png +share/doc/HTML/it/kword/repldlg.png share/doc/HTML/it/kword/storeprint.docbook share/doc/HTML/it/kword/styles.docbook share/doc/HTML/it/kword/table.docbook diff --git a/misc/koffice-i18n-lt/Makefile b/misc/koffice-i18n-lt/Makefile index 009a16ae3587..9d620d27b56e 100644 --- a/misc/koffice-i18n-lt/Makefile +++ b/misc/koffice-i18n-lt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-lt/distinfo b/misc/koffice-i18n-lt/distinfo index 3fa9135ec09a..71183423de7b 100644 --- a/misc/koffice-i18n-lt/distinfo +++ b/misc/koffice-i18n-lt/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 6ece374294c001730552883defb0a53c -SHA256 (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 73a21d3968ce0ec755d843635284ce6a295d5c63cd20874e7f34a1f4ef362948 -SIZE (KDE/kde-i18n/koffice-l10n-lt-1.5.1.tar.bz2) = 265022 +MD5 (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = bf8fb56e3b2ab401d4b3ac9e19ad30f4 +SHA256 (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = 8bee3210d43bf163e9e6e41ac2647c58137d5690020220a775b50550c7108221 +SIZE (KDE/kde-i18n/koffice-l10n-lt-1.5.2.tar.bz2) = 267174 diff --git a/misc/koffice-i18n-mk/Makefile b/misc/koffice-i18n-mk/Makefile index 1bda0e4c5412..45a7dce0da58 100644 --- a/misc/koffice-i18n-mk/Makefile +++ b/misc/koffice-i18n-mk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-mk/distinfo b/misc/koffice-i18n-mk/distinfo index 151c044afa98..486908124b1a 100644 --- a/misc/koffice-i18n-mk/distinfo +++ b/misc/koffice-i18n-mk/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 6adad6081c79ac9dc3edcae7bb5a9494 -SHA256 (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 19d66e663676800ef21bfe5555eae613e14b88bfa4ff3fe296ae0c964abfdde7 -SIZE (KDE/kde-i18n/koffice-l10n-mk-1.5.1.tar.bz2) = 239231 +MD5 (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = 8f9a9ccea194653be186517c0879fe8c +SHA256 (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = e3edaa9a6fa66a071a9dc42b87d5afc59e51632312bd842fb229e24d8ad162a2 +SIZE (KDE/kde-i18n/koffice-l10n-mk-1.5.2.tar.bz2) = 241380 diff --git a/misc/koffice-i18n-ms/Makefile b/misc/koffice-i18n-ms/Makefile index 65b46d99f629..6f0ac75d4a06 100644 --- a/misc/koffice-i18n-ms/Makefile +++ b/misc/koffice-i18n-ms/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 e402307ab6a7..5bd45bdbd37f 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.1.tar.bz2) = 43f77ffa86d70b1fb42cf4bc2312e783 -SHA256 (KDE/kde-i18n/koffice-l10n-ms-1.5.1.tar.bz2) = 6fd94a82aebe7521c07119b7f00a25e97a38118ccd2bd18e83eee3997ca9d78d -SIZE (KDE/kde-i18n/koffice-l10n-ms-1.5.1.tar.bz2) = 345179 +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 diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile index c80c9012e630..4e111dae8f7f 100644 --- a/misc/koffice-i18n-nb/Makefile +++ b/misc/koffice-i18n-nb/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n @@ -14,7 +14,7 @@ PKGNAMEPREFIX= nb- DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Norwegian Bokmal messages and documentation for koffice +COMMENT= Norwegian Bokml messages and documentation for koffice BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext diff --git a/misc/koffice-i18n-nb/distinfo b/misc/koffice-i18n-nb/distinfo index 84d9b5e9d8ae..3b1c0a14407b 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.1.tar.bz2) = ff774ceadd4c42b80ab138c4446d8843 -SHA256 (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 4d1e1d4d461c336e5cc4386259658ba0e3c3f5f6ff1f57756399870a497a18c6 -SIZE (KDE/kde-i18n/koffice-l10n-nb-1.5.1.tar.bz2) = 359337 +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 diff --git a/misc/koffice-i18n-nb/pkg-plist b/misc/koffice-i18n-nb/pkg-plist index 747ac7827ea9..56cd255ecfe9 100644 --- a/misc/koffice-i18n-nb/pkg-plist +++ b/misc/koffice-i18n-nb/pkg-plist @@ -3,6 +3,8 @@ 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/kexi.mo +share/locale/nb/LC_MESSAGES/kfile_abiword.mo +share/locale/nb/LC_MESSAGES/kfile_gnumeric.mo share/locale/nb/LC_MESSAGES/kfile_koffice.mo share/locale/nb/LC_MESSAGES/kfile_ooo.mo share/locale/nb/LC_MESSAGES/kformdesigner.mo @@ -11,8 +13,10 @@ share/locale/nb/LC_MESSAGES/kivio.mo share/locale/nb/LC_MESSAGES/koconverter.mo share/locale/nb/LC_MESSAGES/koffice.mo share/locale/nb/LC_MESSAGES/kofficefilters.mo +share/locale/nb/LC_MESSAGES/koproperty.mo share/locale/nb/LC_MESSAGES/koshell.mo share/locale/nb/LC_MESSAGES/kounavail.mo +share/locale/nb/LC_MESSAGES/kplato.mo share/locale/nb/LC_MESSAGES/kpresenter.mo share/locale/nb/LC_MESSAGES/krita.mo share/locale/nb/LC_MESSAGES/kscan_plugin.mo diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile index e5b75b872009..04aeaa72ffb2 100644 --- a/misc/koffice-i18n-nl/Makefile +++ b/misc/koffice-i18n-nl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 517edcb4b923..9cbf82513851 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.1.tar.bz2) = f76f2b7b8a65a528d3d0514f5f1a0cbf -SHA256 (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 71fc1679a5aff43117cc22832b005249a5259e2c30e8d282d4adf7c54e42a2d8 -SIZE (KDE/kde-i18n/koffice-l10n-nl-1.5.1.tar.bz2) = 3271404 +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 diff --git a/misc/koffice-i18n-nn/Makefile b/misc/koffice-i18n-nn/Makefile index 47177c243e9c..fde1226727f6 100644 --- a/misc/koffice-i18n-nn/Makefile +++ b/misc/koffice-i18n-nn/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-nn/distinfo b/misc/koffice-i18n-nn/distinfo index 61437d85633f..98189d663d26 100644 --- a/misc/koffice-i18n-nn/distinfo +++ b/misc/koffice-i18n-nn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 12a451ca1384c776045a86aa3f0fecb5 -SHA256 (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 057b976291af306451f1776ae21c49a17729a71f17eb047ac0a2ecedeebff688 -SIZE (KDE/kde-i18n/koffice-l10n-nn-1.5.1.tar.bz2) = 362572 +MD5 (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = 9926f8aa4449e839d40f97e7c621de96 +SHA256 (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = d713b7e93f9f096bc38af95be134696586b0e1dbd4ecc25830ae5397e4106811 +SIZE (KDE/kde-i18n/koffice-l10n-nn-1.5.2.tar.bz2) = 362501 diff --git a/misc/koffice-i18n-nn/pkg-plist b/misc/koffice-i18n-nn/pkg-plist index 223ea2642007..d43125d989de 100644 --- a/misc/koffice-i18n-nn/pkg-plist +++ b/misc/koffice-i18n-nn/pkg-plist @@ -14,6 +14,7 @@ share/locale/nn/LC_MESSAGES/koffice.mo share/locale/nn/LC_MESSAGES/kofficefilters.mo share/locale/nn/LC_MESSAGES/koshell.mo share/locale/nn/LC_MESSAGES/kounavail.mo +share/locale/nn/LC_MESSAGES/kplato.mo share/locale/nn/LC_MESSAGES/kpresenter.mo share/locale/nn/LC_MESSAGES/krita.mo share/locale/nn/LC_MESSAGES/kscan_plugin.mo diff --git a/misc/koffice-i18n-ro/Makefile b/misc/koffice-i18n-ro/Makefile index 7d61a348f332..9032169e0637 100644 --- a/misc/koffice-i18n-ro/Makefile +++ b/misc/koffice-i18n-ro/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ro/distinfo b/misc/koffice-i18n-ro/distinfo index 5279f551493b..078b3863a1e5 100644 --- a/misc/koffice-i18n-ro/distinfo +++ b/misc/koffice-i18n-ro/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = b01b4652edcd49e2d1f77db8040a2552 -SHA256 (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = 96fb5e88c6aaef12e640f8046cf7daa26a4a060e1f476f303fedafe06bde7593 -SIZE (KDE/kde-i18n/koffice-l10n-ro-1.5.1.tar.bz2) = 306773 +MD5 (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 22d91909560288e7dd79a3db6e2aab42 +SHA256 (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 317e41f64d29815f7a9f8b7929f70939374fdd4b858af5006f35210775344394 +SIZE (KDE/kde-i18n/koffice-l10n-ro-1.5.2.tar.bz2) = 304268 diff --git a/misc/koffice-i18n-se/Makefile b/misc/koffice-i18n-se/Makefile index 69c506a472db..9763599d3b81 100644 --- a/misc/koffice-i18n-se/Makefile +++ b/misc/koffice-i18n-se/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-se/distinfo b/misc/koffice-i18n-se/distinfo index 44e6656fbd6b..cba50d927654 100644 --- a/misc/koffice-i18n-se/distinfo +++ b/misc/koffice-i18n-se/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = ae4b1cabf24dcf7a89fbef573b07301a -SHA256 (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = 71c5cd3c6f6dfd5474a06401922a1aabf2369203d3e845676f71f02db904ed74 -SIZE (KDE/kde-i18n/koffice-l10n-se-1.5.1.tar.bz2) = 275034 +MD5 (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 8fa484cd096f3f8461c054bad31c3601 +SHA256 (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 648d8624c7e7de1d2010e12a96859e8a1f58a8585ed0194b56befa88636631db +SIZE (KDE/kde-i18n/koffice-l10n-se-1.5.2.tar.bz2) = 296490 diff --git a/misc/koffice-i18n-se/pkg-plist b/misc/koffice-i18n-se/pkg-plist index a46fac9fdac9..49c29be14e5e 100644 --- a/misc/koffice-i18n-se/pkg-plist +++ b/misc/koffice-i18n-se/pkg-plist @@ -2,6 +2,8 @@ share/locale/se/LC_MESSAGES/desktop_koffice.mo share/locale/se/LC_MESSAGES/example.mo share/locale/se/LC_MESSAGES/karbon.mo share/locale/se/LC_MESSAGES/kchart.mo +share/locale/se/LC_MESSAGES/kfile_abiword.mo +share/locale/se/LC_MESSAGES/kfile_gnumeric.mo share/locale/se/LC_MESSAGES/kfile_koffice.mo share/locale/se/LC_MESSAGES/kfile_ooo.mo share/locale/se/LC_MESSAGES/kformdesigner.mo @@ -12,6 +14,7 @@ share/locale/se/LC_MESSAGES/koffice.mo share/locale/se/LC_MESSAGES/kofficefilters.mo share/locale/se/LC_MESSAGES/koshell.mo share/locale/se/LC_MESSAGES/kounavail.mo +share/locale/se/LC_MESSAGES/kplato.mo share/locale/se/LC_MESSAGES/kpresenter.mo share/locale/se/LC_MESSAGES/kscan_plugin.mo share/locale/se/LC_MESSAGES/kspread.mo diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile index 8d7e8d61e87c..cb97a195f0ff 100644 --- a/misc/koffice-i18n-sk/Makefile +++ b/misc/koffice-i18n-sk/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 a5f1bebd3f8a..b4f11b186fe3 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.1.tar.bz2) = 11a9def76b738074d5a70bf81a5e5b4b -SHA256 (KDE/kde-i18n/koffice-l10n-sk-1.5.1.tar.bz2) = d1d050fc7006c2b5bd0d9595f1bd1feda51b2a02d1dcc27acf5127d9d704d8e4 -SIZE (KDE/kde-i18n/koffice-l10n-sk-1.5.1.tar.bz2) = 944380 +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 diff --git a/misc/koffice-i18n-sk/pkg-plist b/misc/koffice-i18n-sk/pkg-plist index fa6cc84e166b..3ca903cfe97c 100644 --- a/misc/koffice-i18n-sk/pkg-plist +++ b/misc/koffice-i18n-sk/pkg-plist @@ -35,6 +35,8 @@ 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/kexi.mo +share/locale/sk/LC_MESSAGES/kfile_abiword.mo +share/locale/sk/LC_MESSAGES/kfile_gnumeric.mo share/locale/sk/LC_MESSAGES/kfile_koffice.mo share/locale/sk/LC_MESSAGES/kfile_ooo.mo share/locale/sk/LC_MESSAGES/kformdesigner.mo @@ -42,13 +44,17 @@ 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/koproperty.mo share/locale/sk/LC_MESSAGES/koshell.mo share/locale/sk/LC_MESSAGES/kounavail.mo +share/locale/sk/LC_MESSAGES/kplato.mo share/locale/sk/LC_MESSAGES/kpresenter.mo share/locale/sk/LC_MESSAGES/krita.mo share/locale/sk/LC_MESSAGES/kscan_plugin.mo +share/locale/sk/LC_MESSAGES/kscreenshot_plugin.mo share/locale/sk/LC_MESSAGES/kspread.mo share/locale/sk/LC_MESSAGES/kspreadcalc_calc.mo +share/locale/sk/LC_MESSAGES/kspreadinsertcalendar.mo share/locale/sk/LC_MESSAGES/kthesaurus.mo share/locale/sk/LC_MESSAGES/kugar.mo share/locale/sk/LC_MESSAGES/kword.mo diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile index 86a002773b37..dc9e320c05f1 100644 --- a/misc/koffice-i18n-sl/Makefile +++ b/misc/koffice-i18n-sl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-sl/distinfo b/misc/koffice-i18n-sl/distinfo index f52e486c0016..169aad72f8b6 100644 --- a/misc/koffice-i18n-sl/distinfo +++ b/misc/koffice-i18n-sl/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 4520614986d6fb70b1d4b8eb117815a5 -SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 20072c70c2f031f9fae00bffc67ce09c631cde56feb70143063066fee0201d36 -SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.1.tar.bz2) = 360715 +MD5 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = e5fe2c8a350ba2636f4bd8dd2168b017 +SHA256 (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 9a81919a223b2f8b243a68ea2802518843b861f721165c3be3f2405ecd28fa24 +SIZE (KDE/kde-i18n/koffice-l10n-sl-1.5.2.tar.bz2) = 361997 diff --git a/misc/koffice-i18n-sr/Makefile b/misc/koffice-i18n-sr/Makefile index 935f5ed59743..ac8fbfda995a 100644 --- a/misc/koffice-i18n-sr/Makefile +++ b/misc/koffice-i18n-sr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 e36f4b30c396..ff59034bf3ca 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.1.tar.bz2) = a825f39361da5599bcd572907eb9d068 -SHA256 (KDE/kde-i18n/koffice-l10n-sr-1.5.1.tar.bz2) = 9a6a66c0e283804cfb773f7e3fe40386c47f1c215af8608fb267683c747bbcf3 -SIZE (KDE/kde-i18n/koffice-l10n-sr-1.5.1.tar.bz2) = 366780 +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 diff --git a/misc/koffice-i18n-sr@Latn/Makefile b/misc/koffice-i18n-sr@Latn/Makefile index f7e7e57c08c6..78eb80519d7d 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.1 +PORTVERSION= 1.5.2 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 151f870eedc0..513cc76e21ac 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.1.tar.bz2) = 0413072d626a8b6291f65504f76d93f6 -SHA256 (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = ab5ea0e73ca6dd6235b5101e2ea95241a7fb7142b8293d60d228425d35aa2674 -SIZE (KDE/kde-i18n/koffice-l10n-sr@Latn-1.5.1.tar.bz2) = 375600 +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 diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile index 1cd24a30d0eb..2dfe5de3c96e 100644 --- a/misc/koffice-i18n-sv/Makefile +++ b/misc/koffice-i18n-sv/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 d95e58affcb1..c6c36bca9a65 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.1.tar.bz2) = 4afcc6585df0a171e90b595c3d3311ae -SHA256 (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 2a66b9f3f17e49a5e70cc8504ad10a537928c1b62892b081502003a479890f1c -SIZE (KDE/kde-i18n/koffice-l10n-sv-1.5.1.tar.bz2) = 5970774 +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 diff --git a/misc/koffice-i18n-ta/Makefile b/misc/koffice-i18n-ta/Makefile index ff5c6dc34189..2de79fb19713 100644 --- a/misc/koffice-i18n-ta/Makefile +++ b/misc/koffice-i18n-ta/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-ta/distinfo b/misc/koffice-i18n-ta/distinfo index b8944f16ef57..4f696a6a844e 100644 --- a/misc/koffice-i18n-ta/distinfo +++ b/misc/koffice-i18n-ta/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 536e66f3b85923771f2af964b51a465e -SHA256 (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 8073f64014c36eb397e7ed1e7f7f9626298a5fb6299cf76f296d8eb829b3c6da -SIZE (KDE/kde-i18n/koffice-l10n-ta-1.5.1.tar.bz2) = 342666 +MD5 (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = 3f0ce9e790415b90daf43c35736a62e7 +SHA256 (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = e75b7bfcf37b5fde61403d63edd11ceea4bf0f0fe9f5d05339025945596e99bf +SIZE (KDE/kde-i18n/koffice-l10n-ta-1.5.2.tar.bz2) = 344532 diff --git a/misc/koffice-i18n-tg/Makefile b/misc/koffice-i18n-tg/Makefile index 48f51350eb0b..53952441adfe 100644 --- a/misc/koffice-i18n-tg/Makefile +++ b/misc/koffice-i18n-tg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-tg/distinfo b/misc/koffice-i18n-tg/distinfo index 6a9ae797c5ee..fb21b9be91a2 100644 --- a/misc/koffice-i18n-tg/distinfo +++ b/misc/koffice-i18n-tg/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = a38ec98b0f6437ddb93196f369a09485 -SHA256 (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = 7427e8f9574206981cae0908be6c158e48ad1b1a7fabd2282bd51bf79ef0212f -SIZE (KDE/kde-i18n/koffice-l10n-tg-1.5.1.tar.bz2) = 349226 +MD5 (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = add764f98fd61d74bf0886f4bfe7808f +SHA256 (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = 0005bfc05c6757d4a3f70bde4a50787ab271f9530e2de13ba043020957fdb301 +SIZE (KDE/kde-i18n/koffice-l10n-tg-1.5.2.tar.bz2) = 345197 diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile index 66a6cfb2c532..7e3333a820b6 100644 --- a/misc/koffice-i18n-tr/Makefile +++ b/misc/koffice-i18n-tr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 a974be35fac9..58c8a1243afa 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.1.tar.bz2) = 0026e7f0b40b76a700792bf3a8a40427 -SHA256 (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = f6e4ee1799cca65a8238b3bf5ab911503095480494bc61c4135e5eae1ab55d65 -SIZE (KDE/kde-i18n/koffice-l10n-tr-1.5.1.tar.bz2) = 352993 +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 diff --git a/misc/koffice-i18n-uz/Makefile b/misc/koffice-i18n-uz/Makefile index 81c12972788b..b68dddb6bbc6 100644 --- a/misc/koffice-i18n-uz/Makefile +++ b/misc/koffice-i18n-uz/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/koffice-${PORTVERSION}/src/koffice-l10n diff --git a/misc/koffice-i18n-uz/distinfo b/misc/koffice-i18n-uz/distinfo index 44694bb05025..a03a5a0ba22a 100644 --- a/misc/koffice-i18n-uz/distinfo +++ b/misc/koffice-i18n-uz/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = b4ce57436f31a2c5b63572b27b1c3582 -SHA256 (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = 15e068a5d81666276105a27ff841b4b42be3fec259fd4db6a7d89e614dae159a -SIZE (KDE/kde-i18n/koffice-l10n-uz-1.5.1.tar.bz2) = 289164 +MD5 (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 259739c2bde6d4fb890915cf7f3358c9 +SHA256 (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 50bcdda58b6f4ddc4cd229bf3a3bf057badb2e1022457665da992355e61a8b18 +SIZE (KDE/kde-i18n/koffice-l10n-uz-1.5.2.tar.bz2) = 298853 diff --git a/misc/koffice-i18n/Makefile b/misc/koffice-i18n/Makefile index 0b8845efdb0d..4df487a14bda 100644 --- a/misc/koffice-i18n/Makefile +++ b/misc/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 CATEGORIES= misc kde MASTER_SITES= # none DISTFILES= # none diff --git a/misc/konq-plugins-kde4/distinfo b/misc/konq-plugins-kde4/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/misc/konq-plugins-kde4/distinfo +++ b/misc/konq-plugins-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/konq-plugins-kde4/pkg-plist b/misc/konq-plugins-kde4/pkg-plist index 681119727ac6..251bb8db087a 100644 --- a/misc/konq-plugins-kde4/pkg-plist +++ b/misc/konq-plugins-kde4/pkg-plist @@ -1,8 +1,6 @@ -bin/exif.py bin/fsview bin/jpegorient bin/kio_media_realfolder -bin/orient.py lib/kde3/kcm_kuick.a lib/kde3/kcm_kuick.la lib/kde3/kcm_kuick.so @@ -78,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.3 +share/applications/kdeaddons-konq-plugins-3.5.4 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop @@ -86,6 +84,8 @@ share/applnk/.hidden/mediaplayerplugin.desktop share/apps/akregator/pics/rss.png share/apps/domtreeviewer/domtreeviewerui.rc share/apps/fsview/fsview_part.rc +share/apps/imagerotation/exif.py +share/apps/imagerotation/orient.py share/apps/khtml/kpartplugins/akregator_konqfeedicon.desktop share/apps/khtml/kpartplugins/akregator_konqfeedicon.rc share/apps/khtml/kpartplugins/autorefresh.desktop @@ -240,6 +240,7 @@ share/services/webarchivethumbnail.desktop @dirrm share/apps/metabar/themes @dirrm share/apps/metabar @dirrm share/apps/konqueror/kpartplugins +@dirrm share/apps/imagerotation @dirrm share/apps/fsview @dirrm share/apps/domtreeviewer @dirrm share/apps/akregator/pics diff --git a/misc/konq-plugins/distinfo b/misc/konq-plugins/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/misc/konq-plugins/distinfo +++ b/misc/konq-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/konq-plugins/pkg-plist b/misc/konq-plugins/pkg-plist index 681119727ac6..251bb8db087a 100644 --- a/misc/konq-plugins/pkg-plist +++ b/misc/konq-plugins/pkg-plist @@ -1,8 +1,6 @@ -bin/exif.py bin/fsview bin/jpegorient bin/kio_media_realfolder -bin/orient.py lib/kde3/kcm_kuick.a lib/kde3/kcm_kuick.la lib/kde3/kcm_kuick.so @@ -78,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.3 +share/applications/kdeaddons-konq-plugins-3.5.4 share/applnk/.hidden/arkplugin.desktop share/applnk/.hidden/kcmkuick.desktop share/applnk/.hidden/kuickplugin.desktop @@ -86,6 +84,8 @@ share/applnk/.hidden/mediaplayerplugin.desktop share/apps/akregator/pics/rss.png share/apps/domtreeviewer/domtreeviewerui.rc share/apps/fsview/fsview_part.rc +share/apps/imagerotation/exif.py +share/apps/imagerotation/orient.py share/apps/khtml/kpartplugins/akregator_konqfeedicon.desktop share/apps/khtml/kpartplugins/akregator_konqfeedicon.rc share/apps/khtml/kpartplugins/autorefresh.desktop @@ -240,6 +240,7 @@ share/services/webarchivethumbnail.desktop @dirrm share/apps/metabar/themes @dirrm share/apps/metabar @dirrm share/apps/konqueror/kpartplugins +@dirrm share/apps/imagerotation @dirrm share/apps/fsview @dirrm share/apps/domtreeviewer @dirrm share/apps/akregator/pics diff --git a/misc/ksig/distinfo b/misc/ksig/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/misc/ksig/distinfo +++ b/misc/ksig/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/ksig/pkg-plist b/misc/ksig/pkg-plist index 5b0c08815a1f..94eea5f7f2e3 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.3 +share/applications/kdeaddons-ksig-3.5.4 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 5488a4e522d4..4f56fe634057 100644 --- a/misc/renamedlgplugins/distinfo +++ b/misc/renamedlgplugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/misc/renamedlgplugins/pkg-plist b/misc/renamedlgplugins/pkg-plist index ecdc2de80738..ab3f2f45c068 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.3 +share/applications/kdeaddons-renamedlg-plugins-3.5.4 share/services/renaudiodlg.desktop share/services/renimagedlg.desktop diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 859e159c612b..c64189e81f68 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 @@ -25,7 +24,6 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ ogg:${PORTSDIR}/audio/libogg \ tag:${PORTSDIR}/audio/taglib \ - theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 @@ -50,6 +48,13 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} > 500035 +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +PLIST_SUB+= THEORA="" +.else +PLIST_SUB+= THEORA="@comment " +.endif + .if !defined(WITHOUT_AKODE) RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode .endif diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 51232e3eeb35..a3c9dfa3cb96 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b -SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f -SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838 +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 diff --git a/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp b/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp deleted file mode 100644 index cf6e40c60d1c..000000000000 --- a/multimedia/kdemultimedia3/files/patch-akode_artsplugin_akodePlayObject_impl.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- akode_artsplugin/akodePlayObject_impl.cpp.orig Fri Jul 21 22:10:02 2006 -+++ akode_artsplugin/akodePlayObject_impl.cpp Fri Jul 21 22:13:13 2006 -@@ -82,6 +82,8 @@ - - akodePlayObject_impl::~akodePlayObject_impl() - { -+ delete m_packetQueue; -+ - unload(); - } - -@@ -219,10 +221,9 @@ - delete bufferedDecoder; - bufferedDecoder = 0; - } --#else -- delete frameDecoder -- frameDecoder = 0; - #endif -+ delete frameDecoder; -+ frameDecoder = 0; - decoder = 0; - if (buffer != inBuffer) - delete inBuffer; -@@ -301,7 +302,7 @@ - { - arts_debug("akode: readFrame"); - -- if (!buffer || !decoder) return false; -+ if (!inBuffer || !decoder) return false; - if (m_bytebuffer) processQueue(); - if(!decoder->readFrame(inBuffer)) { - if (decoder->eof()) {
\ No newline at end of file diff --git a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp deleted file mode 100644 index 32f3f1f33d70..000000000000 --- a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd-audiocd.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- kioslave/audiocd/audiocd.cpp.orig Fri May 26 21:28:16 2006 -+++ kioslave/audiocd/audiocd.cpp Fri May 26 21:29:42 2006 -@@ -213,7 +213,11 @@ - return 0; - - // Update our knowledge of the disc -+#if defined(Q_OS_LINUX) - d->cd.setDevice(drive->ioctl_device_name, 50, false); -+#elif defined(Q_OS_FREEBSD) -+ d->cd.setDevice(drive->cdda_device_name, 50, false); -+#endif - #if 0 - // FreeBSD's cdparanoia as of january 5th 2006 has rather broken - // support for non-SCSI devices. Although it finds ATA cdroms just diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist index ef21594fa8e2..f70efa92cd89 100644 --- a/multimedia/kdemultimedia3/pkg-plist +++ b/multimedia/kdemultimedia3/pkg-plist @@ -105,9 +105,9 @@ lib/kde3/kfile_ogg.so lib/kde3/kfile_sid.a lib/kde3/kfile_sid.la lib/kde3/kfile_sid.so -lib/kde3/kfile_theora.a -lib/kde3/kfile_theora.la -lib/kde3/kfile_theora.so +%%THEORA%%lib/kde3/kfile_theora.a +%%THEORA%%lib/kde3/kfile_theora.la +%%THEORA%%lib/kde3/kfile_theora.so lib/kde3/kfile_wav.a lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so @@ -207,6 +207,11 @@ lib/kde3/noatunsimple.so lib/libarts_akode.a lib/libarts_akode.la lib/libarts_akode.so +lib/libarts_akode.so.0 +lib/libarts_audiofile.a +lib/libarts_audiofile.la +lib/libarts_audiofile.so +lib/libarts_audiofile.so.0 lib/libartsbuilder.a lib/libartsbuilder.la lib/libartsbuilder.so @@ -266,9 +271,6 @@ lib/libaudiocdplugins.a lib/libaudiocdplugins.la lib/libaudiocdplugins.so lib/libaudiocdplugins.so.1 -lib/libaudiofilearts.a -lib/libaudiofilearts.la -lib/libaudiofilearts.so lib/libkcddb.a lib/libkcddb.la lib/libkcddb.so @@ -1126,7 +1128,7 @@ share/services/kfile_mpc.desktop share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop -share/services/kfile_theora.desktop +%%THEORA%%share/services/kfile_theora.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile index 859e159c612b..c64189e81f68 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 @@ -25,7 +24,6 @@ LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile \ cdda_paranoia:${PORTSDIR}/audio/cdparanoia \ ogg:${PORTSDIR}/audio/libogg \ tag:${PORTSDIR}/audio/taglib \ - theora:${PORTSDIR}/multimedia/libtheora \ vorbis:${PORTSDIR}/audio/libvorbis USE_KDELIBS_VER=3 @@ -50,6 +48,13 @@ OPTIONS= AKODE "Use akode for audio playback" on \ .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if ${OSVERSION} > 500035 +LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora +PLIST_SUB+= THEORA="" +.else +PLIST_SUB+= THEORA="@comment " +.endif + .if !defined(WITHOUT_AKODE) RUN_DEPENDS+= ${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode .endif diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo index 51232e3eeb35..a3c9dfa3cb96 100644 --- a/multimedia/kdemultimedia4/distinfo +++ b/multimedia/kdemultimedia4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b -SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f -SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838 +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 diff --git a/multimedia/kdemultimedia4/files/patch-akode_artsplugin_akodePlayObject_impl.cpp b/multimedia/kdemultimedia4/files/patch-akode_artsplugin_akodePlayObject_impl.cpp deleted file mode 100644 index cf6e40c60d1c..000000000000 --- a/multimedia/kdemultimedia4/files/patch-akode_artsplugin_akodePlayObject_impl.cpp +++ /dev/null @@ -1,33 +0,0 @@ ---- akode_artsplugin/akodePlayObject_impl.cpp.orig Fri Jul 21 22:10:02 2006 -+++ akode_artsplugin/akodePlayObject_impl.cpp Fri Jul 21 22:13:13 2006 -@@ -82,6 +82,8 @@ - - akodePlayObject_impl::~akodePlayObject_impl() - { -+ delete m_packetQueue; -+ - unload(); - } - -@@ -219,10 +221,9 @@ - delete bufferedDecoder; - bufferedDecoder = 0; - } --#else -- delete frameDecoder -- frameDecoder = 0; - #endif -+ delete frameDecoder; -+ frameDecoder = 0; - decoder = 0; - if (buffer != inBuffer) - delete inBuffer; -@@ -301,7 +302,7 @@ - { - arts_debug("akode: readFrame"); - -- if (!buffer || !decoder) return false; -+ if (!inBuffer || !decoder) return false; - if (m_bytebuffer) processQueue(); - if(!decoder->readFrame(inBuffer)) { - if (decoder->eof()) {
\ No newline at end of file diff --git a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd-audiocd.cpp b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd-audiocd.cpp deleted file mode 100644 index 32f3f1f33d70..000000000000 --- a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd-audiocd.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- kioslave/audiocd/audiocd.cpp.orig Fri May 26 21:28:16 2006 -+++ kioslave/audiocd/audiocd.cpp Fri May 26 21:29:42 2006 -@@ -213,7 +213,11 @@ - return 0; - - // Update our knowledge of the disc -+#if defined(Q_OS_LINUX) - d->cd.setDevice(drive->ioctl_device_name, 50, false); -+#elif defined(Q_OS_FREEBSD) -+ d->cd.setDevice(drive->cdda_device_name, 50, false); -+#endif - #if 0 - // FreeBSD's cdparanoia as of january 5th 2006 has rather broken - // support for non-SCSI devices. Although it finds ATA cdroms just diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist index ef21594fa8e2..f70efa92cd89 100644 --- a/multimedia/kdemultimedia4/pkg-plist +++ b/multimedia/kdemultimedia4/pkg-plist @@ -105,9 +105,9 @@ lib/kde3/kfile_ogg.so lib/kde3/kfile_sid.a lib/kde3/kfile_sid.la lib/kde3/kfile_sid.so -lib/kde3/kfile_theora.a -lib/kde3/kfile_theora.la -lib/kde3/kfile_theora.so +%%THEORA%%lib/kde3/kfile_theora.a +%%THEORA%%lib/kde3/kfile_theora.la +%%THEORA%%lib/kde3/kfile_theora.so lib/kde3/kfile_wav.a lib/kde3/kfile_wav.la lib/kde3/kfile_wav.so @@ -207,6 +207,11 @@ lib/kde3/noatunsimple.so lib/libarts_akode.a lib/libarts_akode.la lib/libarts_akode.so +lib/libarts_akode.so.0 +lib/libarts_audiofile.a +lib/libarts_audiofile.la +lib/libarts_audiofile.so +lib/libarts_audiofile.so.0 lib/libartsbuilder.a lib/libartsbuilder.la lib/libartsbuilder.so @@ -266,9 +271,6 @@ lib/libaudiocdplugins.a lib/libaudiocdplugins.la lib/libaudiocdplugins.so lib/libaudiocdplugins.so.1 -lib/libaudiofilearts.a -lib/libaudiofilearts.la -lib/libaudiofilearts.so lib/libkcddb.a lib/libkcddb.la lib/libkcddb.so @@ -1126,7 +1128,7 @@ share/services/kfile_mpc.desktop share/services/kfile_mpeg.desktop share/services/kfile_ogg.desktop share/services/kfile_sid.desktop -share/services/kfile_theora.desktop +%%THEORA%%share/services/kfile_theora.desktop share/services/kfile_wav.desktop share/services/kmixctrl_restore.desktop share/services/krec_exportogg.desktop diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo index 5488a4e522d4..4f56fe634057 100644 --- a/multimedia/noatun-plugins/distinfo +++ b/multimedia/noatun-plugins/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeaddons-3.5.3.tar.bz2) = ea25326c6a775bbfa40d0efabed34c0d -SHA256 (KDE/kdeaddons-3.5.3.tar.bz2) = a78e407820e7734b6374fd008560a7d3c0b22518cc29264560fa9df4239d6329 -SIZE (KDE/kdeaddons-3.5.3.tar.bz2) = 1646490 +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 diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist index 09262e6e1dec..ca220a6c9d4c 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.3 +share/applications/kdeaddons-noatun-plugins-3.5.4 share/apps/noatun/alsaplayerui.plugin share/apps/noatun/blurscope.plugin share/apps/noatun/charlatanui.plugin diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo index 51232e3eeb35..a3c9dfa3cb96 100644 --- a/multimedia/xine_artsplugin/distinfo +++ b/multimedia/xine_artsplugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdemultimedia-3.5.3.tar.bz2) = 61bd938c564e3280034944338955712b -SHA256 (KDE/kdemultimedia-3.5.3.tar.bz2) = 4e976190f71b4a86feb2350d014bb775d230feee0013ac92b40e4b0aaf23a12f -SIZE (KDE/kdemultimedia-3.5.3.tar.bz2) = 6276838 +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 diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index 47dd936595b6..a7fbd97fd8a8 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -8,11 +8,12 @@ PORTNAME= kopete PORTVERSION= 0.11 +PORTREVISION= 1 CATEGORIES?= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/3.5.3/src +MASTER_SITE_SUBDIR= stable/3.5.4/src PKGNAMEPREFIX= kdenetwork- -DISTNAME= kdenetwork-3.5.3 +DISTNAME= kdenetwork-3.5.4 DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org diff --git a/net-im/kopete/distinfo b/net-im/kopete/distinfo index 1da023f8a0b5..ac4de7a39c3c 100644 --- a/net-im/kopete/distinfo +++ b/net-im/kopete/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.3.tar.bz2) = 119af91a048c34d9a917a1898f215554 -SHA256 (KDE/kdenetwork-3.5.3.tar.bz2) = f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c -SIZE (KDE/kdenetwork-3.5.3.tar.bz2) = 7524718 +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 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 new file mode 100644 index 000000000000..98cf48d8dd43 --- /dev/null +++ b/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h @@ -0,0 +1,11 @@ +--- 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/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 2ea7c8318182..ffc7dfa837d8 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES?= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 1da023f8a0b5..ac4de7a39c3c 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.3.tar.bz2) = 119af91a048c34d9a917a1898f215554 -SHA256 (KDE/kdenetwork-3.5.3.tar.bz2) = f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c -SIZE (KDE/kdenetwork-3.5.3.tar.bz2) = 7524718 +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 diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 2ea7c8318182..ffc7dfa837d8 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE_VERSION} -PORTREVISION= 2 CATEGORIES?= net kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 1da023f8a0b5..ac4de7a39c3c 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.3.tar.bz2) = 119af91a048c34d9a917a1898f215554 -SHA256 (KDE/kdenetwork-3.5.3.tar.bz2) = f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c -SIZE (KDE/kdenetwork-3.5.3.tar.bz2) = 7524718 +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 diff --git a/net/lanbrowsing/distinfo b/net/lanbrowsing/distinfo index 1da023f8a0b5..ac4de7a39c3c 100644 --- a/net/lanbrowsing/distinfo +++ b/net/lanbrowsing/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdenetwork-3.5.3.tar.bz2) = 119af91a048c34d9a917a1898f215554 -SHA256 (KDE/kdenetwork-3.5.3.tar.bz2) = f0323e33226b30ca30bfee05a9b6da8a1de964c9593d134294f83a54db0f4f3c -SIZE (KDE/kdenetwork-3.5.3.tar.bz2) = 7524718 +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 diff --git a/net/lanbrowsing/files/lisa.sh b/net/lanbrowsing/files/lisa.sh index a2a4a55110d6..4f609cc04bdb 100644 --- a/net/lanbrowsing/files/lisa.sh +++ b/net/lanbrowsing/files/lisa.sh @@ -5,6 +5,7 @@ # PROVIDE: lisa # REQUIRE: LOGIN +# KEYWORD: FreeBSD lisa_enable="NO" lisa_conffile="%%PREFIX%%/etc/lisarc" diff --git a/polish/calligra-l10n/Makefile b/polish/calligra-l10n/Makefile index cc27ee84a339..f5413624c8c6 100644 --- a/polish/calligra-l10n/Makefile +++ b/polish/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 ff1a163aae3a..25544ebdff6b 100644 --- a/polish/calligra-l10n/distinfo +++ b/polish/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 5580950ba10229b65563ae8b9c29e8c4 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 9d10436826d4ff8ad9e871b7259a55f6b01544fb0c48ee1421d96136cb27bc21 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 380625 +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 diff --git a/polish/kde3-i18n/distinfo b/polish/kde3-i18n/distinfo index 5d05ebef1621..85980a3ecbc6 100644 --- a/polish/kde3-i18n/distinfo +++ b/polish/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 7a57d7bf02a2700c71cb495894e08f81 -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 898d45bcb8b6240c97680958396c8f1dbe2f384b0361ac6f93c32f47ef6c1a20 -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 7771545 +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 diff --git a/polish/kde3-i18n/pkg-plist b/polish/kde3-i18n/pkg-plist index bd314b0faecd..0b2a16221cd5 100644 --- a/polish/kde3-i18n/pkg-plist +++ b/polish/kde3-i18n/pkg-plist @@ -49,6 +49,9 @@ 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/kbattleship/common +share/doc/HTML/pl/kbattleship/index.cache.bz2 +share/doc/HTML/pl/kbattleship/index.docbook share/doc/HTML/pl/kbruch/checked.png share/doc/HTML/pl/kbruch/common share/doc/HTML/pl/kbruch/compare.png @@ -84,6 +87,9 @@ share/doc/HTML/pl/kdesu/common share/doc/HTML/pl/kdesu/index.cache.bz2 share/doc/HTML/pl/kdesu/index.docbook 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/keduca/common share/doc/HTML/pl/keduca/index.cache.bz2 share/doc/HTML/pl/keduca/index.docbook @@ -149,6 +155,9 @@ share/doc/HTML/pl/khelpcenter/faq/winmng.docbook share/doc/HTML/pl/khelpcenter/help.docbook share/doc/HTML/pl/khelpcenter/index.cache.bz2 share/doc/HTML/pl/khelpcenter/index.docbook +share/doc/HTML/pl/khelpcenter/quickstart/common +share/doc/HTML/pl/khelpcenter/quickstart/index.cache.bz2 +share/doc/HTML/pl/khelpcenter/quickstart/index.docbook share/doc/HTML/pl/khelpcenter/support.docbook share/doc/HTML/pl/khelpcenter/userguide/a-window.png share/doc/HTML/pl/khelpcenter/userguide/accessibility.docbook @@ -235,6 +244,74 @@ share/doc/HTML/pl/kicker/index.docbook share/doc/HTML/pl/kig/common share/doc/HTML/pl/kig/index.cache.bz2 share/doc/HTML/pl/kig/index.docbook +share/doc/HTML/pl/kinfocenter/blockdevices/common +share/doc/HTML/pl/kinfocenter/blockdevices/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pl/kinfocenter/cdinfo/common +share/doc/HTML/pl/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/cdinfo/index.docbook +share/doc/HTML/pl/kinfocenter/common +share/doc/HTML/pl/kinfocenter/devices/common +share/doc/HTML/pl/kinfocenter/devices/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/devices/index.docbook +share/doc/HTML/pl/kinfocenter/dma/common +share/doc/HTML/pl/kinfocenter/dma/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/dma/index.docbook +share/doc/HTML/pl/kinfocenter/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/index.docbook +share/doc/HTML/pl/kinfocenter/interrupts/common +share/doc/HTML/pl/kinfocenter/interrupts/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/interrupts/index.docbook +share/doc/HTML/pl/kinfocenter/ioports/common +share/doc/HTML/pl/kinfocenter/ioports/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/ioports/index.docbook +share/doc/HTML/pl/kinfocenter/memory/common +share/doc/HTML/pl/kinfocenter/memory/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/memory/index.docbook +share/doc/HTML/pl/kinfocenter/nics/common +share/doc/HTML/pl/kinfocenter/nics/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/nics/index.docbook +share/doc/HTML/pl/kinfocenter/opengl/common +share/doc/HTML/pl/kinfocenter/opengl/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/opengl/index.docbook +share/doc/HTML/pl/kinfocenter/partitions/common +share/doc/HTML/pl/kinfocenter/partitions/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/partitions/index.docbook +share/doc/HTML/pl/kinfocenter/pci/common +share/doc/HTML/pl/kinfocenter/pci/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/pci/index.docbook +share/doc/HTML/pl/kinfocenter/pcmcia/common +share/doc/HTML/pl/kinfocenter/pcmcia/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/pcmcia/index.docbook +share/doc/HTML/pl/kinfocenter/processor/common +share/doc/HTML/pl/kinfocenter/processor/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/processor/index.docbook +share/doc/HTML/pl/kinfocenter/protocols/common +share/doc/HTML/pl/kinfocenter/protocols/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/protocols/index.docbook +share/doc/HTML/pl/kinfocenter/samba/common +share/doc/HTML/pl/kinfocenter/samba/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/samba/index.docbook +share/doc/HTML/pl/kinfocenter/scsi/common +share/doc/HTML/pl/kinfocenter/scsi/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/scsi/index.docbook +share/doc/HTML/pl/kinfocenter/sound/common +share/doc/HTML/pl/kinfocenter/sound/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/sound/index.docbook +share/doc/HTML/pl/kinfocenter/usb/common +share/doc/HTML/pl/kinfocenter/usb/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/usb/index.docbook +share/doc/HTML/pl/kinfocenter/xserver/common +share/doc/HTML/pl/kinfocenter/xserver/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/xserver/index.docbook +share/doc/HTML/pl/kiten/common +share/doc/HTML/pl/kiten/index.cache.bz2 +share/doc/HTML/pl/kiten/index.docbook +share/doc/HTML/pl/kiten/kiten1.png +share/doc/HTML/pl/kiten/kiten2.png +share/doc/HTML/pl/kjots/common +share/doc/HTML/pl/kjots/index.cache.bz2 +share/doc/HTML/pl/kjots/index.docbook share/doc/HTML/pl/klettres/common share/doc/HTML/pl/klettres/index.cache.bz2 share/doc/HTML/pl/klettres/index.docbook @@ -275,6 +352,9 @@ share/doc/HTML/pl/kmplot/introduction.docbook share/doc/HTML/pl/kmplot/menu.docbook share/doc/HTML/pl/kmplot/reference.docbook share/doc/HTML/pl/kmplot/using.docbook +share/doc/HTML/pl/knetworkconf/common +share/doc/HTML/pl/knetworkconf/index.cache.bz2 +share/doc/HTML/pl/knetworkconf/index.docbook share/doc/HTML/pl/knotes/common share/doc/HTML/pl/knotes/index.cache.bz2 share/doc/HTML/pl/knotes/index.docbook @@ -311,6 +391,14 @@ 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/korganizer/common +share/doc/HTML/pl/korganizer/index.cache.bz2 +share/doc/HTML/pl/korganizer/index.docbook +share/doc/HTML/pl/korganizer/outlook-to-vcalendar.docbook +share/doc/HTML/pl/korganizer/plugins-chapter.docbook +share/doc/HTML/pl/kpager/common +share/doc/HTML/pl/kpager/index.cache.bz2 +share/doc/HTML/pl/kpager/index.docbook share/doc/HTML/pl/kpat/common share/doc/HTML/pl/kpat/index.cache.bz2 share/doc/HTML/pl/kpat/index.docbook @@ -331,15 +419,126 @@ share/doc/HTML/pl/kpercentage/install.docbook share/doc/HTML/pl/kpercentage/introduction.docbook share/doc/HTML/pl/kpercentage/using.docbook share/doc/HTML/pl/kpercentage/welcome.png +share/doc/HTML/pl/kppp/accounting.docbook +share/doc/HTML/pl/kppp/callback.docbook +share/doc/HTML/pl/kppp/chap.docbook +share/doc/HTML/pl/kppp/common +share/doc/HTML/pl/kppp/costsgraphs.png +share/doc/HTML/pl/kppp/dialog-setup.docbook +share/doc/HTML/pl/kppp/getting-online.docbook +share/doc/HTML/pl/kppp/global-settings.docbook +share/doc/HTML/pl/kppp/hayes.docbook +share/doc/HTML/pl/kppp/index.cache.bz2 +share/doc/HTML/pl/kppp/index.docbook +share/doc/HTML/pl/kppp/kppp-account-accounting-tab.png +share/doc/HTML/pl/kppp/kppp-account-dial-tab.png +share/doc/HTML/pl/kppp/kppp-account-dns-tab.png +share/doc/HTML/pl/kppp/kppp-account-execute-tab.png +share/doc/HTML/pl/kppp/kppp-account-gateway-tab.png +share/doc/HTML/pl/kppp/kppp-account-ip-tab.png +share/doc/HTML/pl/kppp/kppp-account-login-script-tab.png +share/doc/HTML/pl/kppp/kppp-config.png +share/doc/HTML/pl/kppp/kppp-device-tab.png +share/doc/HTML/pl/kppp/kppp-dialler-tab.png +share/doc/HTML/pl/kppp/kppp-faq.docbook +share/doc/HTML/pl/kppp/kppp-graph-tab.png +share/doc/HTML/pl/kppp/kppp-misc-tab.png +share/doc/HTML/pl/kppp/kppp-modem-tab.png +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/ksame/common share/doc/HTML/pl/ksame/index.cache.bz2 share/doc/HTML/pl/ksame/index.docbook +share/doc/HTML/pl/kscd/common +share/doc/HTML/pl/kscd/index.cache.bz2 +share/doc/HTML/pl/kscd/index.docbook share/doc/HTML/pl/ksirc/common share/doc/HTML/pl/ksirc/index.cache.bz2 share/doc/HTML/pl/ksirc/index.docbook +share/doc/HTML/pl/ksnake/common +share/doc/HTML/pl/ksnake/index.cache.bz2 +share/doc/HTML/pl/ksnake/index.docbook share/doc/HTML/pl/kspell/common share/doc/HTML/pl/kspell/index.cache.bz2 share/doc/HTML/pl/kspell/index.docbook +share/doc/HTML/pl/kstars/ai-contents.docbook +share/doc/HTML/pl/kstars/altvstime.docbook +share/doc/HTML/pl/kstars/astroinfo.docbook +share/doc/HTML/pl/kstars/blackbody.docbook +share/doc/HTML/pl/kstars/calc-angdist.docbook +share/doc/HTML/pl/kstars/calc-apcoords.docbook +share/doc/HTML/pl/kstars/calc-dayduration.docbook +share/doc/HTML/pl/kstars/calc-ecliptic.docbook +share/doc/HTML/pl/kstars/calc-eqgal.docbook +share/doc/HTML/pl/kstars/calc-equinox.docbook +share/doc/HTML/pl/kstars/calc-geodetic.docbook +share/doc/HTML/pl/kstars/calc-horizontal.docbook +share/doc/HTML/pl/kstars/calc-julianday.docbook +share/doc/HTML/pl/kstars/calc-planetcoords.docbook +share/doc/HTML/pl/kstars/calc-precess.docbook +share/doc/HTML/pl/kstars/calc-sidereal.docbook +share/doc/HTML/pl/kstars/calculator.docbook +share/doc/HTML/pl/kstars/cequator.docbook +share/doc/HTML/pl/kstars/colorandtemp.docbook +share/doc/HTML/pl/kstars/commands.docbook +share/doc/HTML/pl/kstars/common +share/doc/HTML/pl/kstars/config.docbook +share/doc/HTML/pl/kstars/cpoles.docbook +share/doc/HTML/pl/kstars/credits.docbook +share/doc/HTML/pl/kstars/csphere.docbook +share/doc/HTML/pl/kstars/darkmatter.docbook +share/doc/HTML/pl/kstars/dcop.docbook +share/doc/HTML/pl/kstars/details.docbook +share/doc/HTML/pl/kstars/dumpmode.docbook +share/doc/HTML/pl/kstars/ecliptic.docbook +share/doc/HTML/pl/kstars/ellipticalgalaxies.docbook +share/doc/HTML/pl/kstars/equinox.docbook +share/doc/HTML/pl/kstars/faq.docbook +share/doc/HTML/pl/kstars/fitsviewer.docbook +share/doc/HTML/pl/kstars/flux.docbook +share/doc/HTML/pl/kstars/geocoords.docbook +share/doc/HTML/pl/kstars/greatcircle.docbook +share/doc/HTML/pl/kstars/horizon.docbook +share/doc/HTML/pl/kstars/hourangle.docbook +share/doc/HTML/pl/kstars/index.cache.bz2 +share/doc/HTML/pl/kstars/index.docbook +share/doc/HTML/pl/kstars/indi.docbook +share/doc/HTML/pl/kstars/install.docbook +share/doc/HTML/pl/kstars/jmoons.docbook +share/doc/HTML/pl/kstars/julianday.docbook +share/doc/HTML/pl/kstars/leapyear.docbook +share/doc/HTML/pl/kstars/lightcurves.docbook +share/doc/HTML/pl/kstars/luminosity.docbook +share/doc/HTML/pl/kstars/magnitude.docbook +share/doc/HTML/pl/kstars/man-celestrongps.1.docbook +share/doc/HTML/pl/kstars/man-fliccd.1.docbook +share/doc/HTML/pl/kstars/man-indiserver.1.docbook +share/doc/HTML/pl/kstars/man-lx200_16.1.docbook +share/doc/HTML/pl/kstars/man-lx200autostar.1.docbook +share/doc/HTML/pl/kstars/man-lx200classic.1.docbook +share/doc/HTML/pl/kstars/man-lx200generic.1.docbook +share/doc/HTML/pl/kstars/man-temma.1.docbook +share/doc/HTML/pl/kstars/man-v4ldriver.1.docbook +share/doc/HTML/pl/kstars/man-v4lphilips.1.docbook +share/doc/HTML/pl/kstars/meridian.docbook +share/doc/HTML/pl/kstars/observinglist.docbook +share/doc/HTML/pl/kstars/parallax.docbook +share/doc/HTML/pl/kstars/precession.docbook +share/doc/HTML/pl/kstars/quicktour.docbook +share/doc/HTML/pl/kstars/retrograde.docbook +share/doc/HTML/pl/kstars/scriptbuilder.docbook +share/doc/HTML/pl/kstars/sidereal.docbook +share/doc/HTML/pl/kstars/skycoords.docbook +share/doc/HTML/pl/kstars/solarsys.docbook +share/doc/HTML/pl/kstars/spiralgalaxies.docbook +share/doc/HTML/pl/kstars/stars.docbook +share/doc/HTML/pl/kstars/timezones.docbook +share/doc/HTML/pl/kstars/tools.docbook +share/doc/HTML/pl/kstars/utime.docbook +share/doc/HTML/pl/kstars/wut.docbook +share/doc/HTML/pl/kstars/zenith.docbook share/doc/HTML/pl/ksysguard/common share/doc/HTML/pl/ksysguard/index.cache.bz2 share/doc/HTML/pl/ksysguard/index.docbook @@ -935,25 +1134,55 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/ktuberling @dirrm share/doc/HTML/pl/ktouch @dirrm share/doc/HTML/pl/ksysguard +@dirrm share/doc/HTML/pl/kstars @dirrm share/doc/HTML/pl/kspell +@dirrm share/doc/HTML/pl/ksnake @dirrm share/doc/HTML/pl/ksirc +@dirrm share/doc/HTML/pl/kscd @dirrm share/doc/HTML/pl/ksame +@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/kontact @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @dirrm share/doc/HTML/pl/konqueror @dirrm share/doc/HTML/pl/knotes +@dirrm share/doc/HTML/pl/knetworkconf @dirrm share/doc/HTML/pl/kmplot @dirrm share/doc/HTML/pl/kmines @dirrm share/doc/HTML/pl/kmenuedit @dirrm share/doc/HTML/pl/kmail @dirrm share/doc/HTML/pl/klettres +@dirrm share/doc/HTML/pl/kjots +@dirrm share/doc/HTML/pl/kiten +@dirrm share/doc/HTML/pl/kinfocenter/xserver +@dirrm share/doc/HTML/pl/kinfocenter/usb +@dirrm share/doc/HTML/pl/kinfocenter/sound +@dirrm share/doc/HTML/pl/kinfocenter/scsi +@dirrm share/doc/HTML/pl/kinfocenter/samba +@dirrm share/doc/HTML/pl/kinfocenter/protocols +@dirrm share/doc/HTML/pl/kinfocenter/processor +@dirrm share/doc/HTML/pl/kinfocenter/pcmcia +@dirrm share/doc/HTML/pl/kinfocenter/pci +@dirrm share/doc/HTML/pl/kinfocenter/partitions +@dirrm share/doc/HTML/pl/kinfocenter/opengl +@dirrm share/doc/HTML/pl/kinfocenter/nics +@dirrm share/doc/HTML/pl/kinfocenter/memory +@dirrm share/doc/HTML/pl/kinfocenter/ioports +@dirrm share/doc/HTML/pl/kinfocenter/interrupts +@dirrm share/doc/HTML/pl/kinfocenter/dma +@dirrm share/doc/HTML/pl/kinfocenter/devices +@dirrm share/doc/HTML/pl/kinfocenter/cdinfo +@dirrm share/doc/HTML/pl/kinfocenter/blockdevices +@dirrm share/doc/HTML/pl/kinfocenter @dirrm share/doc/HTML/pl/kig @dirrm share/doc/HTML/pl/kicker @dirrm share/doc/HTML/pl/khelpcenter/userguide +@dirrm share/doc/HTML/pl/khelpcenter/quickstart @dirrm share/doc/HTML/pl/khelpcenter/faq @dirrm share/doc/HTML/pl/khelpcenter @dirrm share/doc/HTML/pl/khangman @@ -961,11 +1190,13 @@ 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/kdf @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch +@dirrm share/doc/HTML/pl/kbattleship @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 5d05ebef1621..85980a3ecbc6 100644 --- a/polish/kde4-l10n/distinfo +++ b/polish/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 7a57d7bf02a2700c71cb495894e08f81 -SHA256 (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 898d45bcb8b6240c97680958396c8f1dbe2f384b0361ac6f93c32f47ef6c1a20 -SIZE (KDE/kde-i18n/kde-i18n-pl-3.5.3.tar.bz2) = 7771545 +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 diff --git a/polish/kde4-l10n/pkg-plist b/polish/kde4-l10n/pkg-plist index bd314b0faecd..0b2a16221cd5 100644 --- a/polish/kde4-l10n/pkg-plist +++ b/polish/kde4-l10n/pkg-plist @@ -49,6 +49,9 @@ 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/kbattleship/common +share/doc/HTML/pl/kbattleship/index.cache.bz2 +share/doc/HTML/pl/kbattleship/index.docbook share/doc/HTML/pl/kbruch/checked.png share/doc/HTML/pl/kbruch/common share/doc/HTML/pl/kbruch/compare.png @@ -84,6 +87,9 @@ share/doc/HTML/pl/kdesu/common share/doc/HTML/pl/kdesu/index.cache.bz2 share/doc/HTML/pl/kdesu/index.docbook 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/keduca/common share/doc/HTML/pl/keduca/index.cache.bz2 share/doc/HTML/pl/keduca/index.docbook @@ -149,6 +155,9 @@ share/doc/HTML/pl/khelpcenter/faq/winmng.docbook share/doc/HTML/pl/khelpcenter/help.docbook share/doc/HTML/pl/khelpcenter/index.cache.bz2 share/doc/HTML/pl/khelpcenter/index.docbook +share/doc/HTML/pl/khelpcenter/quickstart/common +share/doc/HTML/pl/khelpcenter/quickstart/index.cache.bz2 +share/doc/HTML/pl/khelpcenter/quickstart/index.docbook share/doc/HTML/pl/khelpcenter/support.docbook share/doc/HTML/pl/khelpcenter/userguide/a-window.png share/doc/HTML/pl/khelpcenter/userguide/accessibility.docbook @@ -235,6 +244,74 @@ share/doc/HTML/pl/kicker/index.docbook share/doc/HTML/pl/kig/common share/doc/HTML/pl/kig/index.cache.bz2 share/doc/HTML/pl/kig/index.docbook +share/doc/HTML/pl/kinfocenter/blockdevices/common +share/doc/HTML/pl/kinfocenter/blockdevices/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/blockdevices/index.docbook +share/doc/HTML/pl/kinfocenter/cdinfo/common +share/doc/HTML/pl/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/cdinfo/index.docbook +share/doc/HTML/pl/kinfocenter/common +share/doc/HTML/pl/kinfocenter/devices/common +share/doc/HTML/pl/kinfocenter/devices/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/devices/index.docbook +share/doc/HTML/pl/kinfocenter/dma/common +share/doc/HTML/pl/kinfocenter/dma/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/dma/index.docbook +share/doc/HTML/pl/kinfocenter/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/index.docbook +share/doc/HTML/pl/kinfocenter/interrupts/common +share/doc/HTML/pl/kinfocenter/interrupts/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/interrupts/index.docbook +share/doc/HTML/pl/kinfocenter/ioports/common +share/doc/HTML/pl/kinfocenter/ioports/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/ioports/index.docbook +share/doc/HTML/pl/kinfocenter/memory/common +share/doc/HTML/pl/kinfocenter/memory/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/memory/index.docbook +share/doc/HTML/pl/kinfocenter/nics/common +share/doc/HTML/pl/kinfocenter/nics/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/nics/index.docbook +share/doc/HTML/pl/kinfocenter/opengl/common +share/doc/HTML/pl/kinfocenter/opengl/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/opengl/index.docbook +share/doc/HTML/pl/kinfocenter/partitions/common +share/doc/HTML/pl/kinfocenter/partitions/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/partitions/index.docbook +share/doc/HTML/pl/kinfocenter/pci/common +share/doc/HTML/pl/kinfocenter/pci/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/pci/index.docbook +share/doc/HTML/pl/kinfocenter/pcmcia/common +share/doc/HTML/pl/kinfocenter/pcmcia/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/pcmcia/index.docbook +share/doc/HTML/pl/kinfocenter/processor/common +share/doc/HTML/pl/kinfocenter/processor/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/processor/index.docbook +share/doc/HTML/pl/kinfocenter/protocols/common +share/doc/HTML/pl/kinfocenter/protocols/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/protocols/index.docbook +share/doc/HTML/pl/kinfocenter/samba/common +share/doc/HTML/pl/kinfocenter/samba/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/samba/index.docbook +share/doc/HTML/pl/kinfocenter/scsi/common +share/doc/HTML/pl/kinfocenter/scsi/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/scsi/index.docbook +share/doc/HTML/pl/kinfocenter/sound/common +share/doc/HTML/pl/kinfocenter/sound/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/sound/index.docbook +share/doc/HTML/pl/kinfocenter/usb/common +share/doc/HTML/pl/kinfocenter/usb/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/usb/index.docbook +share/doc/HTML/pl/kinfocenter/xserver/common +share/doc/HTML/pl/kinfocenter/xserver/index.cache.bz2 +share/doc/HTML/pl/kinfocenter/xserver/index.docbook +share/doc/HTML/pl/kiten/common +share/doc/HTML/pl/kiten/index.cache.bz2 +share/doc/HTML/pl/kiten/index.docbook +share/doc/HTML/pl/kiten/kiten1.png +share/doc/HTML/pl/kiten/kiten2.png +share/doc/HTML/pl/kjots/common +share/doc/HTML/pl/kjots/index.cache.bz2 +share/doc/HTML/pl/kjots/index.docbook share/doc/HTML/pl/klettres/common share/doc/HTML/pl/klettres/index.cache.bz2 share/doc/HTML/pl/klettres/index.docbook @@ -275,6 +352,9 @@ share/doc/HTML/pl/kmplot/introduction.docbook share/doc/HTML/pl/kmplot/menu.docbook share/doc/HTML/pl/kmplot/reference.docbook share/doc/HTML/pl/kmplot/using.docbook +share/doc/HTML/pl/knetworkconf/common +share/doc/HTML/pl/knetworkconf/index.cache.bz2 +share/doc/HTML/pl/knetworkconf/index.docbook share/doc/HTML/pl/knotes/common share/doc/HTML/pl/knotes/index.cache.bz2 share/doc/HTML/pl/knotes/index.docbook @@ -311,6 +391,14 @@ 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/korganizer/common +share/doc/HTML/pl/korganizer/index.cache.bz2 +share/doc/HTML/pl/korganizer/index.docbook +share/doc/HTML/pl/korganizer/outlook-to-vcalendar.docbook +share/doc/HTML/pl/korganizer/plugins-chapter.docbook +share/doc/HTML/pl/kpager/common +share/doc/HTML/pl/kpager/index.cache.bz2 +share/doc/HTML/pl/kpager/index.docbook share/doc/HTML/pl/kpat/common share/doc/HTML/pl/kpat/index.cache.bz2 share/doc/HTML/pl/kpat/index.docbook @@ -331,15 +419,126 @@ share/doc/HTML/pl/kpercentage/install.docbook share/doc/HTML/pl/kpercentage/introduction.docbook share/doc/HTML/pl/kpercentage/using.docbook share/doc/HTML/pl/kpercentage/welcome.png +share/doc/HTML/pl/kppp/accounting.docbook +share/doc/HTML/pl/kppp/callback.docbook +share/doc/HTML/pl/kppp/chap.docbook +share/doc/HTML/pl/kppp/common +share/doc/HTML/pl/kppp/costsgraphs.png +share/doc/HTML/pl/kppp/dialog-setup.docbook +share/doc/HTML/pl/kppp/getting-online.docbook +share/doc/HTML/pl/kppp/global-settings.docbook +share/doc/HTML/pl/kppp/hayes.docbook +share/doc/HTML/pl/kppp/index.cache.bz2 +share/doc/HTML/pl/kppp/index.docbook +share/doc/HTML/pl/kppp/kppp-account-accounting-tab.png +share/doc/HTML/pl/kppp/kppp-account-dial-tab.png +share/doc/HTML/pl/kppp/kppp-account-dns-tab.png +share/doc/HTML/pl/kppp/kppp-account-execute-tab.png +share/doc/HTML/pl/kppp/kppp-account-gateway-tab.png +share/doc/HTML/pl/kppp/kppp-account-ip-tab.png +share/doc/HTML/pl/kppp/kppp-account-login-script-tab.png +share/doc/HTML/pl/kppp/kppp-config.png +share/doc/HTML/pl/kppp/kppp-device-tab.png +share/doc/HTML/pl/kppp/kppp-dialler-tab.png +share/doc/HTML/pl/kppp/kppp-faq.docbook +share/doc/HTML/pl/kppp/kppp-graph-tab.png +share/doc/HTML/pl/kppp/kppp-misc-tab.png +share/doc/HTML/pl/kppp/kppp-modem-tab.png +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/ksame/common share/doc/HTML/pl/ksame/index.cache.bz2 share/doc/HTML/pl/ksame/index.docbook +share/doc/HTML/pl/kscd/common +share/doc/HTML/pl/kscd/index.cache.bz2 +share/doc/HTML/pl/kscd/index.docbook share/doc/HTML/pl/ksirc/common share/doc/HTML/pl/ksirc/index.cache.bz2 share/doc/HTML/pl/ksirc/index.docbook +share/doc/HTML/pl/ksnake/common +share/doc/HTML/pl/ksnake/index.cache.bz2 +share/doc/HTML/pl/ksnake/index.docbook share/doc/HTML/pl/kspell/common share/doc/HTML/pl/kspell/index.cache.bz2 share/doc/HTML/pl/kspell/index.docbook +share/doc/HTML/pl/kstars/ai-contents.docbook +share/doc/HTML/pl/kstars/altvstime.docbook +share/doc/HTML/pl/kstars/astroinfo.docbook +share/doc/HTML/pl/kstars/blackbody.docbook +share/doc/HTML/pl/kstars/calc-angdist.docbook +share/doc/HTML/pl/kstars/calc-apcoords.docbook +share/doc/HTML/pl/kstars/calc-dayduration.docbook +share/doc/HTML/pl/kstars/calc-ecliptic.docbook +share/doc/HTML/pl/kstars/calc-eqgal.docbook +share/doc/HTML/pl/kstars/calc-equinox.docbook +share/doc/HTML/pl/kstars/calc-geodetic.docbook +share/doc/HTML/pl/kstars/calc-horizontal.docbook +share/doc/HTML/pl/kstars/calc-julianday.docbook +share/doc/HTML/pl/kstars/calc-planetcoords.docbook +share/doc/HTML/pl/kstars/calc-precess.docbook +share/doc/HTML/pl/kstars/calc-sidereal.docbook +share/doc/HTML/pl/kstars/calculator.docbook +share/doc/HTML/pl/kstars/cequator.docbook +share/doc/HTML/pl/kstars/colorandtemp.docbook +share/doc/HTML/pl/kstars/commands.docbook +share/doc/HTML/pl/kstars/common +share/doc/HTML/pl/kstars/config.docbook +share/doc/HTML/pl/kstars/cpoles.docbook +share/doc/HTML/pl/kstars/credits.docbook +share/doc/HTML/pl/kstars/csphere.docbook +share/doc/HTML/pl/kstars/darkmatter.docbook +share/doc/HTML/pl/kstars/dcop.docbook +share/doc/HTML/pl/kstars/details.docbook +share/doc/HTML/pl/kstars/dumpmode.docbook +share/doc/HTML/pl/kstars/ecliptic.docbook +share/doc/HTML/pl/kstars/ellipticalgalaxies.docbook +share/doc/HTML/pl/kstars/equinox.docbook +share/doc/HTML/pl/kstars/faq.docbook +share/doc/HTML/pl/kstars/fitsviewer.docbook +share/doc/HTML/pl/kstars/flux.docbook +share/doc/HTML/pl/kstars/geocoords.docbook +share/doc/HTML/pl/kstars/greatcircle.docbook +share/doc/HTML/pl/kstars/horizon.docbook +share/doc/HTML/pl/kstars/hourangle.docbook +share/doc/HTML/pl/kstars/index.cache.bz2 +share/doc/HTML/pl/kstars/index.docbook +share/doc/HTML/pl/kstars/indi.docbook +share/doc/HTML/pl/kstars/install.docbook +share/doc/HTML/pl/kstars/jmoons.docbook +share/doc/HTML/pl/kstars/julianday.docbook +share/doc/HTML/pl/kstars/leapyear.docbook +share/doc/HTML/pl/kstars/lightcurves.docbook +share/doc/HTML/pl/kstars/luminosity.docbook +share/doc/HTML/pl/kstars/magnitude.docbook +share/doc/HTML/pl/kstars/man-celestrongps.1.docbook +share/doc/HTML/pl/kstars/man-fliccd.1.docbook +share/doc/HTML/pl/kstars/man-indiserver.1.docbook +share/doc/HTML/pl/kstars/man-lx200_16.1.docbook +share/doc/HTML/pl/kstars/man-lx200autostar.1.docbook +share/doc/HTML/pl/kstars/man-lx200classic.1.docbook +share/doc/HTML/pl/kstars/man-lx200generic.1.docbook +share/doc/HTML/pl/kstars/man-temma.1.docbook +share/doc/HTML/pl/kstars/man-v4ldriver.1.docbook +share/doc/HTML/pl/kstars/man-v4lphilips.1.docbook +share/doc/HTML/pl/kstars/meridian.docbook +share/doc/HTML/pl/kstars/observinglist.docbook +share/doc/HTML/pl/kstars/parallax.docbook +share/doc/HTML/pl/kstars/precession.docbook +share/doc/HTML/pl/kstars/quicktour.docbook +share/doc/HTML/pl/kstars/retrograde.docbook +share/doc/HTML/pl/kstars/scriptbuilder.docbook +share/doc/HTML/pl/kstars/sidereal.docbook +share/doc/HTML/pl/kstars/skycoords.docbook +share/doc/HTML/pl/kstars/solarsys.docbook +share/doc/HTML/pl/kstars/spiralgalaxies.docbook +share/doc/HTML/pl/kstars/stars.docbook +share/doc/HTML/pl/kstars/timezones.docbook +share/doc/HTML/pl/kstars/tools.docbook +share/doc/HTML/pl/kstars/utime.docbook +share/doc/HTML/pl/kstars/wut.docbook +share/doc/HTML/pl/kstars/zenith.docbook share/doc/HTML/pl/ksysguard/common share/doc/HTML/pl/ksysguard/index.cache.bz2 share/doc/HTML/pl/ksysguard/index.docbook @@ -935,25 +1134,55 @@ share/locale/pl/flag.png @dirrm share/doc/HTML/pl/ktuberling @dirrm share/doc/HTML/pl/ktouch @dirrm share/doc/HTML/pl/ksysguard +@dirrm share/doc/HTML/pl/kstars @dirrm share/doc/HTML/pl/kspell +@dirrm share/doc/HTML/pl/ksnake @dirrm share/doc/HTML/pl/ksirc +@dirrm share/doc/HTML/pl/kscd @dirrm share/doc/HTML/pl/ksame +@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/kontact @dirrm share/doc/HTML/pl/konsole @dirrm share/doc/HTML/pl/konquest @dirrm share/doc/HTML/pl/konqueror @dirrm share/doc/HTML/pl/knotes +@dirrm share/doc/HTML/pl/knetworkconf @dirrm share/doc/HTML/pl/kmplot @dirrm share/doc/HTML/pl/kmines @dirrm share/doc/HTML/pl/kmenuedit @dirrm share/doc/HTML/pl/kmail @dirrm share/doc/HTML/pl/klettres +@dirrm share/doc/HTML/pl/kjots +@dirrm share/doc/HTML/pl/kiten +@dirrm share/doc/HTML/pl/kinfocenter/xserver +@dirrm share/doc/HTML/pl/kinfocenter/usb +@dirrm share/doc/HTML/pl/kinfocenter/sound +@dirrm share/doc/HTML/pl/kinfocenter/scsi +@dirrm share/doc/HTML/pl/kinfocenter/samba +@dirrm share/doc/HTML/pl/kinfocenter/protocols +@dirrm share/doc/HTML/pl/kinfocenter/processor +@dirrm share/doc/HTML/pl/kinfocenter/pcmcia +@dirrm share/doc/HTML/pl/kinfocenter/pci +@dirrm share/doc/HTML/pl/kinfocenter/partitions +@dirrm share/doc/HTML/pl/kinfocenter/opengl +@dirrm share/doc/HTML/pl/kinfocenter/nics +@dirrm share/doc/HTML/pl/kinfocenter/memory +@dirrm share/doc/HTML/pl/kinfocenter/ioports +@dirrm share/doc/HTML/pl/kinfocenter/interrupts +@dirrm share/doc/HTML/pl/kinfocenter/dma +@dirrm share/doc/HTML/pl/kinfocenter/devices +@dirrm share/doc/HTML/pl/kinfocenter/cdinfo +@dirrm share/doc/HTML/pl/kinfocenter/blockdevices +@dirrm share/doc/HTML/pl/kinfocenter @dirrm share/doc/HTML/pl/kig @dirrm share/doc/HTML/pl/kicker @dirrm share/doc/HTML/pl/khelpcenter/userguide +@dirrm share/doc/HTML/pl/khelpcenter/quickstart @dirrm share/doc/HTML/pl/khelpcenter/faq @dirrm share/doc/HTML/pl/khelpcenter @dirrm share/doc/HTML/pl/khangman @@ -961,11 +1190,13 @@ 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/kdf @dirrm share/doc/HTML/pl/kdevelop @dirrm share/doc/HTML/pl/kdesu @dirrm share/doc/HTML/pl/kdeprint @dirrm share/doc/HTML/pl/kcalc @dirrm share/doc/HTML/pl/kbruch +@dirrm share/doc/HTML/pl/kbattleship @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 cc27ee84a339..f5413624c8c6 100644 --- a/polish/koffice-i18n/Makefile +++ b/polish/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 ff1a163aae3a..25544ebdff6b 100644 --- a/polish/koffice-i18n/distinfo +++ b/polish/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 5580950ba10229b65563ae8b9c29e8c4 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 9d10436826d4ff8ad9e871b7259a55f6b01544fb0c48ee1421d96136cb27bc21 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 380625 +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 diff --git a/polish/koffice-kde4-l10n/Makefile b/polish/koffice-kde4-l10n/Makefile index cc27ee84a339..f5413624c8c6 100644 --- a/polish/koffice-kde4-l10n/Makefile +++ b/polish/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 ff1a163aae3a..25544ebdff6b 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.1.tar.bz2) = 5580950ba10229b65563ae8b9c29e8c4 -SHA256 (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 9d10436826d4ff8ad9e871b7259a55f6b01544fb0c48ee1421d96136cb27bc21 -SIZE (KDE/kde-i18n/koffice-l10n-pl-1.5.1.tar.bz2) = 380625 +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 diff --git a/portuguese/calligra-l10n-pt_BR/Makefile b/portuguese/calligra-l10n-pt_BR/Makefile index fbc6e3f1add6..f69f7dd8331b 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.1 +PORTVERSION= 1.5.2 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 c73ca051da2b..f14b00651338 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.1.tar.bz2) = 5882aeae172ccfebbf68bad8f4dc0ced -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 58f024cf14336c489ee723006f8b89bd5649c494f76a09aa67bcd5128b126787 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 1988904 +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 diff --git a/portuguese/calligra-l10n-pt_BR/pkg-plist b/portuguese/calligra-l10n-pt_BR/pkg-plist index 7731078e553b..b54dc6ddf7a2 100644 --- a/portuguese/calligra-l10n-pt_BR/pkg-plist +++ b/portuguese/calligra-l10n-pt_BR/pkg-plist @@ -249,6 +249,8 @@ 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/kexi.mo +share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo +share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo share/locale/pt_BR/LC_MESSAGES/kfile_koffice.mo share/locale/pt_BR/LC_MESSAGES/kfile_ooo.mo share/locale/pt_BR/LC_MESSAGES/kformdesigner.mo @@ -257,8 +259,10 @@ share/locale/pt_BR/LC_MESSAGES/kivio.mo share/locale/pt_BR/LC_MESSAGES/koconverter.mo share/locale/pt_BR/LC_MESSAGES/koffice.mo share/locale/pt_BR/LC_MESSAGES/kofficefilters.mo +share/locale/pt_BR/LC_MESSAGES/koproperty.mo share/locale/pt_BR/LC_MESSAGES/koshell.mo share/locale/pt_BR/LC_MESSAGES/kounavail.mo +share/locale/pt_BR/LC_MESSAGES/kplato.mo share/locale/pt_BR/LC_MESSAGES/kpresenter.mo share/locale/pt_BR/LC_MESSAGES/krita.mo share/locale/pt_BR/LC_MESSAGES/kscan_plugin.mo diff --git a/portuguese/calligra-l10n/Makefile b/portuguese/calligra-l10n/Makefile index 86dde0bd1050..69dcf6a80b7d 100644 --- a/portuguese/calligra-l10n/Makefile +++ b/portuguese/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 b98dadb925f9..5c71fbe9ab87 100644 --- a/portuguese/calligra-l10n/distinfo +++ b/portuguese/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = 549c4668a4ec2fbc71a2fadb9597ea8f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = af3b2721a2fbbddc91a09fc742d9d34a596570c756d18ddd3dbc1b1cc44ef388 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = 1038506 +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 diff --git a/portuguese/kde3-i18n-pt_BR/distinfo b/portuguese/kde3-i18n-pt_BR/distinfo index 8092fd49ddc6..cafc623d4982 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.3.tar.bz2) = d76371a7a63cd728bfc6ff26c8f059bc -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.3.tar.bz2) = 62703ad6d0083c66fc738044bfd6d50dc4ad49da1d2188d497c4474930ba6d35 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.3.tar.bz2) = 11702488 +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 diff --git a/portuguese/kde3-i18n-pt_BR/pkg-plist b/portuguese/kde3-i18n-pt_BR/pkg-plist index d974f87aa8f3..39e770a1805b 100644 --- a/portuguese/kde3-i18n-pt_BR/pkg-plist +++ b/portuguese/kde3-i18n-pt_BR/pkg-plist @@ -1654,7 +1654,6 @@ 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 diff --git a/portuguese/kde3-i18n/distinfo b/portuguese/kde3-i18n/distinfo index 051d4007e6af..a9179112802c 100644 --- a/portuguese/kde3-i18n/distinfo +++ b/portuguese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 31017190b2d125f4b072b84e6f8752f4 -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 4dda1b86827b903d4965bc9549e92bb3bdedb5b80d3c447f8dbc95c143d09608 -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 7700416 +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 diff --git a/portuguese/kde4-l10n-pt_BR/distinfo b/portuguese/kde4-l10n-pt_BR/distinfo index 8092fd49ddc6..cafc623d4982 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.3.tar.bz2) = d76371a7a63cd728bfc6ff26c8f059bc -SHA256 (KDE/kde-i18n/kde-i18n-pt_BR-3.5.3.tar.bz2) = 62703ad6d0083c66fc738044bfd6d50dc4ad49da1d2188d497c4474930ba6d35 -SIZE (KDE/kde-i18n/kde-i18n-pt_BR-3.5.3.tar.bz2) = 11702488 +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 diff --git a/portuguese/kde4-l10n-pt_BR/pkg-plist b/portuguese/kde4-l10n-pt_BR/pkg-plist index d974f87aa8f3..39e770a1805b 100644 --- a/portuguese/kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/kde4-l10n-pt_BR/pkg-plist @@ -1654,7 +1654,6 @@ 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 diff --git a/portuguese/kde4-l10n/distinfo b/portuguese/kde4-l10n/distinfo index 051d4007e6af..a9179112802c 100644 --- a/portuguese/kde4-l10n/distinfo +++ b/portuguese/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 31017190b2d125f4b072b84e6f8752f4 -SHA256 (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 4dda1b86827b903d4965bc9549e92bb3bdedb5b80d3c447f8dbc95c143d09608 -SIZE (KDE/kde-i18n/kde-i18n-pt-3.5.3.tar.bz2) = 7700416 +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 diff --git a/portuguese/koffice-i18n-pt_BR/Makefile b/portuguese/koffice-i18n-pt_BR/Makefile index fbc6e3f1add6..f69f7dd8331b 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.1 +PORTVERSION= 1.5.2 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 c73ca051da2b..f14b00651338 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.1.tar.bz2) = 5882aeae172ccfebbf68bad8f4dc0ced -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 58f024cf14336c489ee723006f8b89bd5649c494f76a09aa67bcd5128b126787 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 1988904 +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 diff --git a/portuguese/koffice-i18n-pt_BR/pkg-plist b/portuguese/koffice-i18n-pt_BR/pkg-plist index 7731078e553b..b54dc6ddf7a2 100644 --- a/portuguese/koffice-i18n-pt_BR/pkg-plist +++ b/portuguese/koffice-i18n-pt_BR/pkg-plist @@ -249,6 +249,8 @@ 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/kexi.mo +share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo +share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo share/locale/pt_BR/LC_MESSAGES/kfile_koffice.mo share/locale/pt_BR/LC_MESSAGES/kfile_ooo.mo share/locale/pt_BR/LC_MESSAGES/kformdesigner.mo @@ -257,8 +259,10 @@ share/locale/pt_BR/LC_MESSAGES/kivio.mo share/locale/pt_BR/LC_MESSAGES/koconverter.mo share/locale/pt_BR/LC_MESSAGES/koffice.mo share/locale/pt_BR/LC_MESSAGES/kofficefilters.mo +share/locale/pt_BR/LC_MESSAGES/koproperty.mo share/locale/pt_BR/LC_MESSAGES/koshell.mo share/locale/pt_BR/LC_MESSAGES/kounavail.mo +share/locale/pt_BR/LC_MESSAGES/kplato.mo share/locale/pt_BR/LC_MESSAGES/kpresenter.mo share/locale/pt_BR/LC_MESSAGES/krita.mo share/locale/pt_BR/LC_MESSAGES/kscan_plugin.mo diff --git a/portuguese/koffice-i18n/Makefile b/portuguese/koffice-i18n/Makefile index 86dde0bd1050..69dcf6a80b7d 100644 --- a/portuguese/koffice-i18n/Makefile +++ b/portuguese/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 b98dadb925f9..5c71fbe9ab87 100644 --- a/portuguese/koffice-i18n/distinfo +++ b/portuguese/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = 549c4668a4ec2fbc71a2fadb9597ea8f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = af3b2721a2fbbddc91a09fc742d9d34a596570c756d18ddd3dbc1b1cc44ef388 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = 1038506 +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 diff --git a/portuguese/koffice-kde4-l10n-pt_BR/Makefile b/portuguese/koffice-kde4-l10n-pt_BR/Makefile index fbc6e3f1add6..f69f7dd8331b 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.1 +PORTVERSION= 1.5.2 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 c73ca051da2b..f14b00651338 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.1.tar.bz2) = 5882aeae172ccfebbf68bad8f4dc0ced -SHA256 (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 58f024cf14336c489ee723006f8b89bd5649c494f76a09aa67bcd5128b126787 -SIZE (KDE/kde-i18n/koffice-l10n-pt_BR-1.5.1.tar.bz2) = 1988904 +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 diff --git a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist index 7731078e553b..b54dc6ddf7a2 100644 --- a/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist +++ b/portuguese/koffice-kde4-l10n-pt_BR/pkg-plist @@ -249,6 +249,8 @@ 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/kexi.mo +share/locale/pt_BR/LC_MESSAGES/kfile_abiword.mo +share/locale/pt_BR/LC_MESSAGES/kfile_gnumeric.mo share/locale/pt_BR/LC_MESSAGES/kfile_koffice.mo share/locale/pt_BR/LC_MESSAGES/kfile_ooo.mo share/locale/pt_BR/LC_MESSAGES/kformdesigner.mo @@ -257,8 +259,10 @@ share/locale/pt_BR/LC_MESSAGES/kivio.mo share/locale/pt_BR/LC_MESSAGES/koconverter.mo share/locale/pt_BR/LC_MESSAGES/koffice.mo share/locale/pt_BR/LC_MESSAGES/kofficefilters.mo +share/locale/pt_BR/LC_MESSAGES/koproperty.mo share/locale/pt_BR/LC_MESSAGES/koshell.mo share/locale/pt_BR/LC_MESSAGES/kounavail.mo +share/locale/pt_BR/LC_MESSAGES/kplato.mo share/locale/pt_BR/LC_MESSAGES/kpresenter.mo share/locale/pt_BR/LC_MESSAGES/krita.mo share/locale/pt_BR/LC_MESSAGES/kscan_plugin.mo diff --git a/portuguese/koffice-kde4-l10n/Makefile b/portuguese/koffice-kde4-l10n/Makefile index 86dde0bd1050..69dcf6a80b7d 100644 --- a/portuguese/koffice-kde4-l10n/Makefile +++ b/portuguese/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 b98dadb925f9..5c71fbe9ab87 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.1.tar.bz2) = 549c4668a4ec2fbc71a2fadb9597ea8f -SHA256 (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = af3b2721a2fbbddc91a09fc742d9d34a596570c756d18ddd3dbc1b1cc44ef388 -SIZE (KDE/kde-i18n/koffice-l10n-pt-1.5.1.tar.bz2) = 1038506 +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 diff --git a/russian/calligra-l10n/Makefile b/russian/calligra-l10n/Makefile index 38adc9e63550..cdaaa1a80fc6 100644 --- a/russian/calligra-l10n/Makefile +++ b/russian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 aa08528f618f..92187c97d3f7 100644 --- a/russian/calligra-l10n/distinfo +++ b/russian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 7a484f7d54125398516cf54a2139e84d -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 16951d5b79d034abdb94610f5ca60d1b9ff94d2007da633d195165390a8f7419 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 827060 +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 diff --git a/russian/kde3-i18n/distinfo b/russian/kde3-i18n/distinfo index f854e53dfe36..db40267fbafc 100644 --- a/russian/kde3-i18n/distinfo +++ b/russian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = a30e44b4dcaf0ff2937eb870903f3a47 -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = 1e32c27fc4cb1e855f542dcca862e66e0379760ca2eab596efaa43e0c47e0bd8 -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = 7308081 +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 diff --git a/russian/kde3-i18n/pkg-plist b/russian/kde3-i18n/pkg-plist index ba4039fbb6c8..99b00da939df 100644 --- a/russian/kde3-i18n/pkg-plist +++ b/russian/kde3-i18n/pkg-plist @@ -485,7 +485,6 @@ share/doc/HTML/ru/khelpcenter/quickstart/common share/doc/HTML/ru/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/ru/khelpcenter/quickstart/index.docbook share/doc/HTML/ru/khelpcenter/support.docbook -share/doc/HTML/ru/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/ru/khelpcenter/userguide/accessibility.docbook share/doc/HTML/ru/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/browser-fine-tuning.docbook @@ -497,41 +496,23 @@ share/doc/HTML/ru/khelpcenter/userguide/credits-and-license.docbook share/doc/HTML/ru/khelpcenter/userguide/email.docbook share/doc/HTML/ru/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/file-sharing.docbook -share/doc/HTML/ru/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/ru/khelpcenter/userguide/font-installation.docbook share/doc/HTML/ru/khelpcenter/userguide/getting-help.docbook -share/doc/HTML/ru/khelpcenter/userguide/getting-started.docbook share/doc/HTML/ru/khelpcenter/userguide/glossary.docbook share/doc/HTML/ru/khelpcenter/userguide/groupware-kontact.docbook -share/doc/HTML/ru/khelpcenter/userguide/history.docbook share/doc/HTML/ru/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/ru/khelpcenter/userguide/index.docbook -share/doc/HTML/ru/khelpcenter/userguide/installation.docbook share/doc/HTML/ru/khelpcenter/userguide/internet-shortcuts.docbook -share/doc/HTML/ru/khelpcenter/userguide/intro.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-office.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeadmin-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdebase-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeedu-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdegames-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdegraphics-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdemultimedia-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdenetwork-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdepim-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdetoys-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeutils-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/ru/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/ru/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/ru/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/migrator-dictionary.docbook -share/doc/HTML/ru/khelpcenter/userguide/more-help.docbook share/doc/HTML/ru/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/ru/khelpcenter/userguide/networking-with-windows.docbook -share/doc/HTML/ru/khelpcenter/userguide/notices-trademarks.docbook share/doc/HTML/ru/khelpcenter/userguide/panel-and-desktop.docbook share/doc/HTML/ru/khelpcenter/userguide/pdf-files.docbook share/doc/HTML/ru/khelpcenter/userguide/playing-audiocds.docbook @@ -544,14 +525,11 @@ share/doc/HTML/ru/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/ru/khelpcenter/userguide/removable-disks.docbook share/doc/HTML/ru/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/ru/khelpcenter/userguide/shared-sessions.docbook -share/doc/HTML/ru/khelpcenter/userguide/shortcuts.docbook -share/doc/HTML/ru/khelpcenter/userguide/staff.docbook share/doc/HTML/ru/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/ru/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/ru/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/ru/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/ru/khelpcenter/userguide/troubleshooting-no-open.docbook -share/doc/HTML/ru/khelpcenter/userguide/ug-faq.docbook share/doc/HTML/ru/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/ru/khelpcenter/userguide/usenet.docbook share/doc/HTML/ru/khelpcenter/userguide/where-next.docbook diff --git a/russian/kde4-l10n/distinfo b/russian/kde4-l10n/distinfo index f854e53dfe36..db40267fbafc 100644 --- a/russian/kde4-l10n/distinfo +++ b/russian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = a30e44b4dcaf0ff2937eb870903f3a47 -SHA256 (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = 1e32c27fc4cb1e855f542dcca862e66e0379760ca2eab596efaa43e0c47e0bd8 -SIZE (KDE/kde-i18n/kde-i18n-ru-3.5.3.tar.bz2) = 7308081 +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 diff --git a/russian/kde4-l10n/pkg-plist b/russian/kde4-l10n/pkg-plist index ba4039fbb6c8..99b00da939df 100644 --- a/russian/kde4-l10n/pkg-plist +++ b/russian/kde4-l10n/pkg-plist @@ -485,7 +485,6 @@ share/doc/HTML/ru/khelpcenter/quickstart/common share/doc/HTML/ru/khelpcenter/quickstart/index.cache.bz2 share/doc/HTML/ru/khelpcenter/quickstart/index.docbook share/doc/HTML/ru/khelpcenter/support.docbook -share/doc/HTML/ru/khelpcenter/userguide/about-desktop.docbook share/doc/HTML/ru/khelpcenter/userguide/accessibility.docbook share/doc/HTML/ru/khelpcenter/userguide/base-kde-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/browser-fine-tuning.docbook @@ -497,41 +496,23 @@ share/doc/HTML/ru/khelpcenter/userguide/credits-and-license.docbook share/doc/HTML/ru/khelpcenter/userguide/email.docbook share/doc/HTML/ru/khelpcenter/userguide/extragear-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/file-sharing.docbook -share/doc/HTML/ru/khelpcenter/userguide/first-impressions.docbook share/doc/HTML/ru/khelpcenter/userguide/font-installation.docbook share/doc/HTML/ru/khelpcenter/userguide/getting-help.docbook -share/doc/HTML/ru/khelpcenter/userguide/getting-started.docbook share/doc/HTML/ru/khelpcenter/userguide/glossary.docbook share/doc/HTML/ru/khelpcenter/userguide/groupware-kontact.docbook -share/doc/HTML/ru/khelpcenter/userguide/history.docbook share/doc/HTML/ru/khelpcenter/userguide/index.cache.bz2 share/doc/HTML/ru/khelpcenter/userguide/index.docbook -share/doc/HTML/ru/khelpcenter/userguide/installation.docbook share/doc/HTML/ru/khelpcenter/userguide/internet-shortcuts.docbook -share/doc/HTML/ru/khelpcenter/userguide/intro.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-as-root.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-edutainment.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-for-admins.docbook share/doc/HTML/ru/khelpcenter/userguide/kde-office.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeadmin-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdebase-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeedu-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdegames-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdegraphics-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdemultimedia-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdenetwork-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdepim-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdetoys-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/kdeutils-apps.docbook -share/doc/HTML/ru/khelpcenter/userguide/koffice-apps.docbook share/doc/HTML/ru/khelpcenter/userguide/konsole-intro.docbook share/doc/HTML/ru/khelpcenter/userguide/messaging-intro.docbook share/doc/HTML/ru/khelpcenter/userguide/migrator-applications.docbook share/doc/HTML/ru/khelpcenter/userguide/migrator-dictionary.docbook -share/doc/HTML/ru/khelpcenter/userguide/more-help.docbook share/doc/HTML/ru/khelpcenter/userguide/net-connection-setup.docbook share/doc/HTML/ru/khelpcenter/userguide/networking-with-windows.docbook -share/doc/HTML/ru/khelpcenter/userguide/notices-trademarks.docbook share/doc/HTML/ru/khelpcenter/userguide/panel-and-desktop.docbook share/doc/HTML/ru/khelpcenter/userguide/pdf-files.docbook share/doc/HTML/ru/khelpcenter/userguide/playing-audiocds.docbook @@ -544,14 +525,11 @@ share/doc/HTML/ru/khelpcenter/userguide/programs-controlling.docbook share/doc/HTML/ru/khelpcenter/userguide/removable-disks.docbook share/doc/HTML/ru/khelpcenter/userguide/screen-captures.docbook share/doc/HTML/ru/khelpcenter/userguide/shared-sessions.docbook -share/doc/HTML/ru/khelpcenter/userguide/shortcuts.docbook -share/doc/HTML/ru/khelpcenter/userguide/staff.docbook share/doc/HTML/ru/khelpcenter/userguide/standard-menu-entries.docbook share/doc/HTML/ru/khelpcenter/userguide/switching-sessions.docbook share/doc/HTML/ru/khelpcenter/userguide/the-filemanager.docbook share/doc/HTML/ru/khelpcenter/userguide/troubleshooting-network-x.docbook share/doc/HTML/ru/khelpcenter/userguide/troubleshooting-no-open.docbook -share/doc/HTML/ru/khelpcenter/userguide/ug-faq.docbook share/doc/HTML/ru/khelpcenter/userguide/under-the-hood.docbook share/doc/HTML/ru/khelpcenter/userguide/usenet.docbook share/doc/HTML/ru/khelpcenter/userguide/where-next.docbook diff --git a/russian/koffice-i18n/Makefile b/russian/koffice-i18n/Makefile index 38adc9e63550..cdaaa1a80fc6 100644 --- a/russian/koffice-i18n/Makefile +++ b/russian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 aa08528f618f..92187c97d3f7 100644 --- a/russian/koffice-i18n/distinfo +++ b/russian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 7a484f7d54125398516cf54a2139e84d -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 16951d5b79d034abdb94610f5ca60d1b9ff94d2007da633d195165390a8f7419 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 827060 +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 diff --git a/russian/koffice-kde4-l10n/Makefile b/russian/koffice-kde4-l10n/Makefile index 38adc9e63550..cdaaa1a80fc6 100644 --- a/russian/koffice-kde4-l10n/Makefile +++ b/russian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 aa08528f618f..92187c97d3f7 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.1.tar.bz2) = 7a484f7d54125398516cf54a2139e84d -SHA256 (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 16951d5b79d034abdb94610f5ca60d1b9ff94d2007da633d195165390a8f7419 -SIZE (KDE/kde-i18n/koffice-l10n-ru-1.5.1.tar.bz2) = 827060 +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 diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/security/kgpg-kde4/distinfo +++ b/security/kgpg-kde4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/security/kwallet/distinfo +++ b/security/kwallet/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/sysutils/kdeadmin3/distinfo b/sysutils/kdeadmin3/distinfo index 3d7f870dc964..cdb6f26f6448 100644 --- a/sysutils/kdeadmin3/distinfo +++ b/sysutils/kdeadmin3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.3.tar.bz2) = 842e74881c89a719423bbd5cc1f4e226 -SHA256 (KDE/kdeadmin-3.5.3.tar.bz2) = 77ae2a10bbe2669a9125865c4f0edf53c46e8cf8cde53899cfaed895c3401172 -SIZE (KDE/kdeadmin-3.5.3.tar.bz2) = 2114019 +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 diff --git a/sysutils/kdeadmin3/files/patch-knetworkconf_backends-Makefile.in b/sysutils/kdeadmin3/files/patch-knetworkconf_backends-Makefile.in new file mode 100644 index 000000000000..cd8d5d0ad7ca --- /dev/null +++ b/sysutils/kdeadmin3/files/patch-knetworkconf_backends-Makefile.in @@ -0,0 +1,10 @@ +--- knetworkconf/backends/Makefile.in.orig Sat Aug 5 18:14:28 2006 ++++ knetworkconf/backends/Makefile.in Sat Aug 5 18:15:45 2006 +@@ -369,7 +369,6 @@ + + CLEANFILES = $(backends) $(perl_libs) system-tools-backends.pc + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = system-tools-backends.pc + #>- all: all-am + #>+ 1 + all: docs-am all-am diff --git a/sysutils/kdeadmin3/pkg-plist b/sysutils/kdeadmin3/pkg-plist index 883a6d3529e9..1967e5b102a0 100644 --- a/sysutils/kdeadmin3/pkg-plist +++ b/sysutils/kdeadmin3/pkg-plist @@ -11,7 +11,6 @@ lib/kde3/kfile_deb.so lib/kde3/kfile_rpm.a lib/kde3/kfile_rpm.la lib/kde3/kfile_rpm.so -libdata/pkgconfig/system-tools-backends.pc share/applications/kde/kcm_knetworkconfmodule.desktop share/applications/kde/kcron.desktop share/applications/kde/kpackage.desktop diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo index 3d7f870dc964..cdb6f26f6448 100644 --- a/sysutils/kdeadmin4/distinfo +++ b/sysutils/kdeadmin4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeadmin-3.5.3.tar.bz2) = 842e74881c89a719423bbd5cc1f4e226 -SHA256 (KDE/kdeadmin-3.5.3.tar.bz2) = 77ae2a10bbe2669a9125865c4f0edf53c46e8cf8cde53899cfaed895c3401172 -SIZE (KDE/kdeadmin-3.5.3.tar.bz2) = 2114019 +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 diff --git a/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in b/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in new file mode 100644 index 000000000000..cd8d5d0ad7ca --- /dev/null +++ b/sysutils/kdeadmin4/files/patch-knetworkconf_backends-Makefile.in @@ -0,0 +1,10 @@ +--- knetworkconf/backends/Makefile.in.orig Sat Aug 5 18:14:28 2006 ++++ knetworkconf/backends/Makefile.in Sat Aug 5 18:15:45 2006 +@@ -369,7 +369,6 @@ + + CLEANFILES = $(backends) $(perl_libs) system-tools-backends.pc + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = system-tools-backends.pc + #>- all: all-am + #>+ 1 + all: docs-am all-am diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist index 883a6d3529e9..1967e5b102a0 100644 --- a/sysutils/kdeadmin4/pkg-plist +++ b/sysutils/kdeadmin4/pkg-plist @@ -11,7 +11,6 @@ lib/kde3/kfile_deb.so lib/kde3/kfile_rpm.a lib/kde3/kfile_rpm.la lib/kde3/kfile_rpm.so -libdata/pkgconfig/system-tools-backends.pc share/applications/kde/kcm_knetworkconfmodule.desktop share/applications/kde/kcron.desktop share/applications/kde/kpackage.desktop diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/sysutils/kdf/distinfo +++ b/sysutils/kdf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/sysutils/kfloppy/distinfo +++ b/sysutils/kfloppy/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/sysutils/klaptopdaemon/distinfo b/sysutils/klaptopdaemon/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/sysutils/klaptopdaemon/distinfo +++ b/sysutils/klaptopdaemon/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/sysutils/kmilo/distinfo b/sysutils/kmilo/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/sysutils/kmilo/distinfo +++ b/sysutils/kmilo/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo index a8cefc5e236c..fd884f93e5aa 100644 --- a/sysutils/sweeper/distinfo +++ b/sysutils/sweeper/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeutils-3.5.3.tar.bz2) = b3d792c21e9a72bf8a82c5756fcd742d -SHA256 (KDE/kdeutils-3.5.3.tar.bz2) = 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b -SIZE (KDE/kdeutils-3.5.3.tar.bz2) = 2979916 +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 diff --git a/ukrainian/calligra-l10n/Makefile b/ukrainian/calligra-l10n/Makefile index 0510be3b25b3..b5ef85937841 100644 --- a/ukrainian/calligra-l10n/Makefile +++ b/ukrainian/calligra-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 404aa604bc12..cb01393d41bc 100644 --- a/ukrainian/calligra-l10n/distinfo +++ b/ukrainian/calligra-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 114018e8d5e5935c8d47c717dbb3523c -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 0260d57ef721f100259472fd1d15cfbf3a24f490068381582954df1c21cda406 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 349259 +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 diff --git a/ukrainian/kde3-i18n/distinfo b/ukrainian/kde3-i18n/distinfo index 3f19cc2d43a2..b88a76181f16 100644 --- a/ukrainian/kde3-i18n/distinfo +++ b/ukrainian/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = a852a8e6f9ee1c807e16f511ba4981a3 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = 313475d0afad1610d47c8a09ae24bd97356d8f4550ed5352f26c9c9acf4c7403 -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = 2087617 +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 diff --git a/ukrainian/kde3-i18n/pkg-plist b/ukrainian/kde3-i18n/pkg-plist index 785ce0b61c1b..cdda549a7aed 100644 --- a/ukrainian/kde3-i18n/pkg-plist +++ b/ukrainian/kde3-i18n/pkg-plist @@ -14,6 +14,9 @@ share/doc/HTML/uk/kioslave/bzip2.docbook share/doc/HTML/uk/kioslave/file.docbook share/doc/HTML/uk/kioslave/finger.docbook share/doc/HTML/uk/kioslave/floppy.docbook +share/doc/HTML/uk/kioslave/imaps.docbook +share/doc/HTML/uk/kioslave/smb.docbook +share/doc/HTML/uk/kioslave/tar.docbook share/doc/HTML/uk/knotes/common share/doc/HTML/uk/knotes/index.cache.bz2 share/doc/HTML/uk/knotes/index.docbook @@ -202,8 +205,6 @@ share/locale/uk/LC_MESSAGES/kdessh.mo share/locale/uk/LC_MESSAGES/kdesu.mo share/locale/uk/LC_MESSAGES/kdesud.mo share/locale/uk/LC_MESSAGES/kdevdesigner.mo -share/locale/uk/LC_MESSAGES/kdevelop.mo -share/locale/uk/LC_MESSAGES/kdevtipofday.mo share/locale/uk/LC_MESSAGES/kdf.mo share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kdialog.mo @@ -277,7 +278,6 @@ share/locale/uk/LC_MESSAGES/kfontinst.mo share/locale/uk/LC_MESSAGES/kfouleggs.mo share/locale/uk/LC_MESSAGES/kgamma.mo share/locale/uk/LC_MESSAGES/kgantt.mo -share/locale/uk/LC_MESSAGES/kgeography.mo share/locale/uk/LC_MESSAGES/kget.mo share/locale/uk/LC_MESSAGES/kghostview.mo share/locale/uk/LC_MESSAGES/kgpg.mo @@ -291,7 +291,6 @@ share/locale/uk/LC_MESSAGES/khtmlkttsd.mo share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/uk/LC_MESSAGES/kicker.mo share/locale/uk/LC_MESSAGES/kiconedit.mo -share/locale/uk/LC_MESSAGES/kig.mo share/locale/uk/LC_MESSAGES/kimagemapeditor.mo share/locale/uk/LC_MESSAGES/kinetd.mo share/locale/uk/LC_MESSAGES/kio.mo @@ -362,7 +361,6 @@ share/locale/uk/LC_MESSAGES/kmobile.mo share/locale/uk/LC_MESSAGES/kmoon.mo share/locale/uk/LC_MESSAGES/kmousetool.mo share/locale/uk/LC_MESSAGES/kmouth.mo -share/locale/uk/LC_MESSAGES/kmplot.mo share/locale/uk/LC_MESSAGES/kmrml.mo share/locale/uk/LC_MESSAGES/knetattach.mo share/locale/uk/LC_MESSAGES/knetwalk.mo @@ -447,7 +445,6 @@ share/locale/uk/LC_MESSAGES/ksokoban.mo share/locale/uk/LC_MESSAGES/kspaceduel.mo share/locale/uk/LC_MESSAGES/ksplash.mo share/locale/uk/LC_MESSAGES/ksplashthemes.mo -share/locale/uk/LC_MESSAGES/kstars.mo share/locale/uk/LC_MESSAGES/kstart.mo share/locale/uk/LC_MESSAGES/kstartperf.mo share/locale/uk/LC_MESSAGES/kstyle_highcontrast_config.mo diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo index 3f19cc2d43a2..b88a76181f16 100644 --- a/ukrainian/kde4-l10n/distinfo +++ b/ukrainian/kde4-l10n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = a852a8e6f9ee1c807e16f511ba4981a3 -SHA256 (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = 313475d0afad1610d47c8a09ae24bd97356d8f4550ed5352f26c9c9acf4c7403 -SIZE (KDE/kde-i18n/kde-i18n-uk-3.5.3.tar.bz2) = 2087617 +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 diff --git a/ukrainian/kde4-l10n/pkg-plist b/ukrainian/kde4-l10n/pkg-plist index 785ce0b61c1b..cdda549a7aed 100644 --- a/ukrainian/kde4-l10n/pkg-plist +++ b/ukrainian/kde4-l10n/pkg-plist @@ -14,6 +14,9 @@ share/doc/HTML/uk/kioslave/bzip2.docbook share/doc/HTML/uk/kioslave/file.docbook share/doc/HTML/uk/kioslave/finger.docbook share/doc/HTML/uk/kioslave/floppy.docbook +share/doc/HTML/uk/kioslave/imaps.docbook +share/doc/HTML/uk/kioslave/smb.docbook +share/doc/HTML/uk/kioslave/tar.docbook share/doc/HTML/uk/knotes/common share/doc/HTML/uk/knotes/index.cache.bz2 share/doc/HTML/uk/knotes/index.docbook @@ -202,8 +205,6 @@ share/locale/uk/LC_MESSAGES/kdessh.mo share/locale/uk/LC_MESSAGES/kdesu.mo share/locale/uk/LC_MESSAGES/kdesud.mo share/locale/uk/LC_MESSAGES/kdevdesigner.mo -share/locale/uk/LC_MESSAGES/kdevelop.mo -share/locale/uk/LC_MESSAGES/kdevtipofday.mo share/locale/uk/LC_MESSAGES/kdf.mo share/locale/uk/LC_MESSAGES/kdgantt.mo share/locale/uk/LC_MESSAGES/kdialog.mo @@ -277,7 +278,6 @@ share/locale/uk/LC_MESSAGES/kfontinst.mo share/locale/uk/LC_MESSAGES/kfouleggs.mo share/locale/uk/LC_MESSAGES/kgamma.mo share/locale/uk/LC_MESSAGES/kgantt.mo -share/locale/uk/LC_MESSAGES/kgeography.mo share/locale/uk/LC_MESSAGES/kget.mo share/locale/uk/LC_MESSAGES/kghostview.mo share/locale/uk/LC_MESSAGES/kgpg.mo @@ -291,7 +291,6 @@ share/locale/uk/LC_MESSAGES/khtmlkttsd.mo share/locale/uk/LC_MESSAGES/khtmlsettingsplugin.mo share/locale/uk/LC_MESSAGES/kicker.mo share/locale/uk/LC_MESSAGES/kiconedit.mo -share/locale/uk/LC_MESSAGES/kig.mo share/locale/uk/LC_MESSAGES/kimagemapeditor.mo share/locale/uk/LC_MESSAGES/kinetd.mo share/locale/uk/LC_MESSAGES/kio.mo @@ -362,7 +361,6 @@ share/locale/uk/LC_MESSAGES/kmobile.mo share/locale/uk/LC_MESSAGES/kmoon.mo share/locale/uk/LC_MESSAGES/kmousetool.mo share/locale/uk/LC_MESSAGES/kmouth.mo -share/locale/uk/LC_MESSAGES/kmplot.mo share/locale/uk/LC_MESSAGES/kmrml.mo share/locale/uk/LC_MESSAGES/knetattach.mo share/locale/uk/LC_MESSAGES/knetwalk.mo @@ -447,7 +445,6 @@ share/locale/uk/LC_MESSAGES/ksokoban.mo share/locale/uk/LC_MESSAGES/kspaceduel.mo share/locale/uk/LC_MESSAGES/ksplash.mo share/locale/uk/LC_MESSAGES/ksplashthemes.mo -share/locale/uk/LC_MESSAGES/kstars.mo share/locale/uk/LC_MESSAGES/kstart.mo share/locale/uk/LC_MESSAGES/kstartperf.mo share/locale/uk/LC_MESSAGES/kstyle_highcontrast_config.mo diff --git a/ukrainian/koffice-i18n/Makefile b/ukrainian/koffice-i18n/Makefile index 0510be3b25b3..b5ef85937841 100644 --- a/ukrainian/koffice-i18n/Makefile +++ b/ukrainian/koffice-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 404aa604bc12..cb01393d41bc 100644 --- a/ukrainian/koffice-i18n/distinfo +++ b/ukrainian/koffice-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 114018e8d5e5935c8d47c717dbb3523c -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 0260d57ef721f100259472fd1d15cfbf3a24f490068381582954df1c21cda406 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 349259 +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 diff --git a/ukrainian/koffice-kde4-l10n/Makefile b/ukrainian/koffice-kde4-l10n/Makefile index 0510be3b25b3..b5ef85937841 100644 --- a/ukrainian/koffice-kde4-l10n/Makefile +++ b/ukrainian/koffice-kde4-l10n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= koffice-i18n -PORTVERSION= 1.5.1 +PORTVERSION= 1.5.2 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 404aa604bc12..cb01393d41bc 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.1.tar.bz2) = 114018e8d5e5935c8d47c717dbb3523c -SHA256 (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 0260d57ef721f100259472fd1d15cfbf3a24f490068381582954df1c21cda406 -SIZE (KDE/kde-i18n/koffice-l10n-uk-1.5.1.tar.bz2) = 349259 +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 diff --git a/vietnamese/kde3-i18n/distinfo b/vietnamese/kde3-i18n/distinfo index 451400f1e07d..0672667a1410 100644 --- a/vietnamese/kde3-i18n/distinfo +++ b/vietnamese/kde3-i18n/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kde-i18n/kde-i18n-vi-3.5.3.tar.bz2) = 5ae29e708362dd10fb08e44dfaa3a070 -SHA256 (KDE/kde-i18n/kde-i18n-vi-3.5.3.tar.bz2) = 12ce91e2103f5eb6658734bc1620adb94b53aa1f11a3c1c3ddef8409d7717162 -SIZE (KDE/kde-i18n/kde-i18n-vi-3.5.3.tar.bz2) = 880070 +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 diff --git a/vietnamese/kde3-i18n/pkg-plist b/vietnamese/kde3-i18n/pkg-plist index 2eaf8fc4f35f..69d1beddc3f2 100644 --- a/vietnamese/kde3-i18n/pkg-plist +++ b/vietnamese/kde3-i18n/pkg-plist @@ -119,6 +119,7 @@ share/locale/vi/LC_MESSAGES/kdmconfig.mo share/locale/vi/LC_MESSAGES/kdmgreet.mo share/locale/vi/LC_MESSAGES/kdvi.mo share/locale/vi/LC_MESSAGES/kedit.mo +share/locale/vi/LC_MESSAGES/keduca.mo share/locale/vi/LC_MESSAGES/kenolaba.mo share/locale/vi/LC_MESSAGES/kfax.mo share/locale/vi/LC_MESSAGES/kfile_drgeo.mo @@ -170,6 +171,7 @@ share/locale/vi/LC_MESSAGES/kio_trash.mo share/locale/vi/LC_MESSAGES/kioexec.mo share/locale/vi/LC_MESSAGES/kjobviewer.mo share/locale/vi/LC_MESSAGES/kjumpingcube.mo +share/locale/vi/LC_MESSAGES/klettres.mo share/locale/vi/LC_MESSAGES/klipper.mo share/locale/vi/LC_MESSAGES/klock.mo share/locale/vi/LC_MESSAGES/kmag.mo @@ -179,6 +181,7 @@ share/locale/vi/LC_MESSAGES/kmenuedit.mo share/locale/vi/LC_MESSAGES/kminipagerapplet.mo share/locale/vi/LC_MESSAGES/kmousetool.mo share/locale/vi/LC_MESSAGES/kmouth.mo +share/locale/vi/LC_MESSAGES/kmplot.mo share/locale/vi/LC_MESSAGES/knetattach.mo share/locale/vi/LC_MESSAGES/knewsticker.mo share/locale/vi/LC_MESSAGES/knotify.mo diff --git a/www/kdewebdev/distinfo b/www/kdewebdev/distinfo index 8a402f0d01fd..b412b28f2598 100644 --- a/www/kdewebdev/distinfo +++ b/www/kdewebdev/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.3.tar.bz2) = 0eeaac8992c4b473caefcc32d49b79a2 -SHA256 (KDE/kdewebdev-3.5.3.tar.bz2) = e1a4698390305e6246458f0403619ac6a4dda2b3364a28b8aebe2b954c705560 -SIZE (KDE/kdewebdev-3.5.3.tar.bz2) = 6013831 +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 diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo index 8a402f0d01fd..b412b28f2598 100644 --- a/www/kdewebdev4/distinfo +++ b/www/kdewebdev4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdewebdev-3.5.3.tar.bz2) = 0eeaac8992c4b473caefcc32d49b79a2 -SHA256 (KDE/kdewebdev-3.5.3.tar.bz2) = e1a4698390305e6246458f0403619ac6a4dda2b3364a28b8aebe2b954c705560 -SIZE (KDE/kdewebdev-3.5.3.tar.bz2) = 6013831 +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 diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo index 5608693c4f97..810dc3cc14dc 100644 --- a/x11-clocks/kdetoys3/distinfo +++ b/x11-clocks/kdetoys3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.3.tar.bz2) = dbce8029253a6151546e3016f299f4ef -SHA256 (KDE/kdetoys-3.5.3.tar.bz2) = 72eaa626ae255fd6eea1f902314f2729c59d075a04edb862f21513f16c2f8d6f -SIZE (KDE/kdetoys-3.5.3.tar.bz2) = 3168944 +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 diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo index 5608693c4f97..810dc3cc14dc 100644 --- a/x11-clocks/kdetoys4/distinfo +++ b/x11-clocks/kdetoys4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdetoys-3.5.3.tar.bz2) = dbce8029253a6151546e3016f299f4ef -SHA256 (KDE/kdetoys-3.5.3.tar.bz2) = 72eaa626ae255fd6eea1f902314f2729c59d075a04edb862f21513f16c2f8d6f -SIZE (KDE/kdetoys-3.5.3.tar.bz2) = 3168944 +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 diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo index a3cc92b73be0..02d405956dc0 100644 --- a/x11-themes/kdeartwork3/distinfo +++ b/x11-themes/kdeartwork3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.3.tar.bz2) = e0fc78bee18d81b4595c98964227a06c -SHA256 (KDE/kdeartwork-3.5.3.tar.bz2) = 92d78c09e960f99a6c0f6b026470e096b88357fd7c5646494f3beced6ac22d53 -SIZE (KDE/kdeartwork-3.5.3.tar.bz2) = 16599096 +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 diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist index 9c1561ab7737..e881e5595d07 100644 --- a/x11-themes/kdeartwork3/pkg-plist +++ b/x11-themes/kdeartwork3/pkg-plist @@ -3028,6 +3028,7 @@ share/icons/kdeclassic/22x22/actions/kalarm_disabled.png share/icons/kdeclassic/22x22/actions/kalarmdgui.png share/icons/kdeclassic/22x22/actions/kalarmdgui_disabled.png share/icons/kdeclassic/22x22/actions/kanjidic.png +share/icons/kdeclassic/22x22/actions/kde.png share/icons/kdeclassic/22x22/actions/kdeprint_addprinter.png share/icons/kdeclassic/22x22/actions/kdeprint_addpseudo.png share/icons/kdeclassic/22x22/actions/kdeprint_configmgr.png @@ -3571,6 +3572,7 @@ share/icons/kdeclassic/32x32/actions/insert_table_col.png share/icons/kdeclassic/32x32/actions/insert_table_row.png share/icons/kdeclassic/32x32/actions/int.png share/icons/kdeclassic/32x32/actions/jail_pay.png +share/icons/kdeclassic/32x32/actions/kde.png share/icons/kdeclassic/32x32/actions/kdeprint_inklevel.png share/icons/kdeclassic/32x32/actions/krec_record.png share/icons/kdeclassic/32x32/actions/ktip.png diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo index a3cc92b73be0..02d405956dc0 100644 --- a/x11-themes/kdeartwork4/distinfo +++ b/x11-themes/kdeartwork4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.3.tar.bz2) = e0fc78bee18d81b4595c98964227a06c -SHA256 (KDE/kdeartwork-3.5.3.tar.bz2) = 92d78c09e960f99a6c0f6b026470e096b88357fd7c5646494f3beced6ac22d53 -SIZE (KDE/kdeartwork-3.5.3.tar.bz2) = 16599096 +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 diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist index 9c1561ab7737..e881e5595d07 100644 --- a/x11-themes/kdeartwork4/pkg-plist +++ b/x11-themes/kdeartwork4/pkg-plist @@ -3028,6 +3028,7 @@ share/icons/kdeclassic/22x22/actions/kalarm_disabled.png share/icons/kdeclassic/22x22/actions/kalarmdgui.png share/icons/kdeclassic/22x22/actions/kalarmdgui_disabled.png share/icons/kdeclassic/22x22/actions/kanjidic.png +share/icons/kdeclassic/22x22/actions/kde.png share/icons/kdeclassic/22x22/actions/kdeprint_addprinter.png share/icons/kdeclassic/22x22/actions/kdeprint_addpseudo.png share/icons/kdeclassic/22x22/actions/kdeprint_configmgr.png @@ -3571,6 +3572,7 @@ share/icons/kdeclassic/32x32/actions/insert_table_col.png share/icons/kdeclassic/32x32/actions/insert_table_row.png share/icons/kdeclassic/32x32/actions/int.png share/icons/kdeclassic/32x32/actions/jail_pay.png +share/icons/kdeclassic/32x32/actions/kde.png share/icons/kdeclassic/32x32/actions/kdeprint_inklevel.png share/icons/kdeclassic/32x32/actions/krec_record.png share/icons/kdeclassic/32x32/actions/ktip.png diff --git a/x11-wm/kompmgr/distinfo b/x11-wm/kompmgr/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11-wm/kompmgr/distinfo +++ b/x11-wm/kompmgr/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff b/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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-kio_media b/x11/kde4-baseapps/files/patch-kio_media new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-kio_media @@ -0,0 +1,6118 @@ +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/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kde4-baseapps/files/patch-kpager-windowdrag.cpp b/x11/kde4-baseapps/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kde4-baseapps/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff b/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kde4-baseapps/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kde4-baseapps/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kde4-baseapps/files/patch-post-3.5.3-screensavers b/x11/kde4-baseapps/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kde4-baseapps/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kde4-baseapps/pkg-plist +++ b/x11/kde4-baseapps/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff b/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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-kio_media b/x11/kde4-runtime/files/patch-kio_media new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kio_media @@ -0,0 +1,6118 @@ +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/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kde4-runtime/files/patch-kpager-windowdrag.cpp b/x11/kde4-runtime/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kde4-runtime/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff b/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kde4-runtime/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kde4-runtime/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kde4-runtime/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kde4-runtime/files/patch-post-3.5.3-screensavers b/x11/kde4-runtime/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kde4-runtime/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff b/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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-kio_media b/x11/kde4-workspace/files/patch-kio_media new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kio_media @@ -0,0 +1,6118 @@ +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/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kde4-workspace/files/patch-kpager-windowdrag.cpp b/x11/kde4-workspace/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kde4-workspace/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff b/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kde4-workspace/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kde4-workspace/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kde4-workspace/files/patch-post-3.5.3-screensavers b/x11/kde4-workspace/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kde4-workspace/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kdebase3/files/patch-kicker-taskbar-resize.diff b/x11/kdebase3/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kdebase3/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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-kio_media b/x11/kdebase3/files/patch-kio_media new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kdebase3/files/patch-kio_media @@ -0,0 +1,6118 @@ +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/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kdebase3/files/patch-kpager-windowdrag.cpp b/x11/kdebase3/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kdebase3/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kdebase3/files/patch-ksystraycmd-quoting.diff b/x11/kdebase3/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kdebase3/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kdebase3/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kdebase3/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kdebase3/files/patch-post-3.5.3-screensavers b/x11/kdebase3/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kdebase3/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kdebase3/pkg-plist +++ b/x11/kdebase3/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kio_media @@ -0,0 +1,6118 @@ +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-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kdebase4-runtime/files/patch-kpager-windowdrag.cpp b/x11/kdebase4-runtime/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kdebase4-runtime/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kdebase4-runtime/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kdebase4-runtime/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kdebase4-runtime/files/patch-post-3.5.3-screensavers b/x11/kdebase4-runtime/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kdebase4-runtime/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-workspace/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kio_media @@ -0,0 +1,6118 @@ +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-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kdebase4-workspace/files/patch-kpager-windowdrag.cpp b/x11/kdebase4-workspace/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kdebase4-workspace/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kdebase4-workspace/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kdebase4-workspace/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kdebase4-workspace/files/patch-post-3.5.3-screensavers b/x11/kdebase4-workspace/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kdebase4-workspace/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-workspace/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 365e19c65795..4709ac92c1f4 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 diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 11898bee3260..656400d81aed 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-3.5.3.tar.bz2) = 9cb6b8291c4f3f986e16f72129e8fcd0 -SHA256 (KDE/kdebase-3.5.3.tar.bz2) = 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8 -SIZE (KDE/kdebase-3.5.3.tar.bz2) = 23634194 +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 diff --git a/x11/kdebase4/files/patch-kicker-taskbar-resize.diff b/x11/kdebase4/files/patch-kicker-taskbar-resize.diff new file mode 100644 index 000000000000..de1dbb73cc30 --- /dev/null +++ b/x11/kdebase4/files/patch-kicker-taskbar-resize.diff @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..144c7914a0e5 --- /dev/null +++ b/x11/kdebase4/files/patch-kio_media @@ -0,0 +1,6118 @@ +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-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp index 5fb2c123a6c2..5a6937d40f75 100644 --- a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp +++ b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -8,55 +8,3 @@ || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" || mount->mountType().contains( "proc" ) -@@ -144,7 +145,7 @@ - - void FstabBackend::handleMtabChange(bool allowNotification) - { -- QStringList new_mtabIds, new_mtabEntries; -+ QStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); - - KMountPoint::List::iterator it = mtab.begin(); -@@ -162,18 +163,19 @@ - nothing has changed, do not stat the mount point. Avoids - hang if network shares are stalling */ - QString mtabEntry = dev + "*" + mp + "*" + fs; -- bool isOldEntry = m_mtabEntries.contains(mtabEntry); -- new_mtabEntries+=mtabEntry; -- if (isOldEntry) continue; -+ 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); - } -@@ -211,6 +213,10 @@ - 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); - -@@ -226,7 +232,6 @@ - } - - m_mtabIds = new_mtabIds; -- m_mtabEntries = new_mtabEntries; - } - - void FstabBackend::handleFstabChange(bool allowNotification) diff --git a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.h b/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.h deleted file mode 100644 index 5a6ac43ebad8..000000000000 --- a/x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kioslave/media/mediamanager/fstabbackend.h 2006/03/23 09:19:38 521680 -+++ kioslave/media/mediamanager/fstabbackend.h 2006/06/14 09:11:46 551306 -@@ -23,6 +23,7 @@ - - #include <qobject.h> - #include <qstringlist.h> -+#include <qmap.h> - - #ifdef Q_OS_FREEBSD - #include <qtimer.h> -@@ -53,7 +54,7 @@ - - bool m_networkSharesOnly; - QStringList m_mtabIds; -- QStringList m_mtabEntries; -+ QMap<QString, QString> m_mtabEntries; - QStringList m_fstabIds; - #ifdef Q_OS_FREEBSD - QTimer m_mtabTimer; diff --git a/x11/kdebase4/files/patch-kpager-windowdrag.cpp b/x11/kdebase4/files/patch-kpager-windowdrag.cpp deleted file mode 100644 index c09bb7c8f3af..000000000000 --- a/x11/kdebase4/files/patch-kpager-windowdrag.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kpager/windowdrag.cpp 2006/05/23 12:51:36 544025 -+++ kpager/windowdrag.cpp 2006/06/05 19:55:59 548525 -@@ -31,7 +31,7 @@ - QString tmp; - tmp.sprintf("%d %d %d %d", static_cast<int>(w), deltax, deltay, origdesk); - QByteArray data(tmp.length()+1); -- data.assign(tmp.latin1(),tmp.length()+1); -+ data.duplicate(tmp.latin1(),tmp.length()+1); - - setEncodedData(data); - } diff --git a/x11/kdebase4/files/patch-ksystraycmd-quoting.diff b/x11/kdebase4/files/patch-ksystraycmd-quoting.diff new file mode 100644 index 000000000000..8543f7254a95 --- /dev/null +++ b/x11/kdebase4/files/patch-ksystraycmd-quoting.diff @@ -0,0 +1,19 @@ +--- 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-post-3.5.0-kdebase-kdm b/x11/kdebase4/files/patch-post-3.5.0-kdebase-kdm deleted file mode 100644 index 129a10594be4..000000000000 --- a/x11/kdebase4/files/patch-post-3.5.0-kdebase-kdm +++ /dev/null @@ -1,21 +0,0 @@ -Index: kdm/backend/client.c -=================================================================== ---- kdm/backend/client.c (revision 547560) -+++ kdm/backend/client.c (working copy) -@@ -1537,16 +1542,6 @@ ReadDmrc() - - if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 )) - return GE_Error; -- if ((curdmrc = iniLoad( fname ))) { -- free( fname ); -- return GE_Ok; -- } -- -- if (errno != EACCES) { -- free( fname ); -- return GE_NoFile; -- } -- - if (pipe( pfd )) - return GE_Error; - if ((pid = Fork()) < 0) { diff --git a/x11/kdebase4/files/patch-post-3.5.3-screensavers b/x11/kdebase4/files/patch-post-3.5.3-screensavers deleted file mode 100644 index 1182c861986c..000000000000 --- a/x11/kdebase4/files/patch-post-3.5.3-screensavers +++ /dev/null @@ -1,97 +0,0 @@ ---- kdesktop/xautolock.cc 2006/05/18 13:18:28 542149 -+++ kdesktop/xautolock.cc 2006/06/04 12:42:03 548008 -@@ -192,6 +192,7 @@ - - bool activate = false; - -+ kdDebug() << now << " " << mTrigger << endl; - if (now >= mTrigger) - { - resetTrigger(); -@@ -202,6 +203,8 @@ - BOOL on; - CARD16 state; - DPMSInfo( qt_xdisplay(), &state, &on ); -+ -+ kdDebug() << "DPMSInfo " << state << " " << on << endl; - // If DPMS is active, it makes XScreenSaverQueryInfo() report idle time - // that is always smaller than DPMS timeout (X bug I guess). So if DPMS - // saving is active, simply always activate our saving too, otherwise -@@ -217,9 +220,11 @@ - #ifdef HAVE_XSCREENSAVER - static XScreenSaverInfo* mitInfo = 0; - if (!mitInfo) mitInfo = XScreenSaverAllocInfo (); -- XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo); -- if (mitInfo->state == ScreenSaverDisabled) -- activate = false; -+ if (XScreenSaverQueryInfo (qt_xdisplay(), DefaultRootWindow (qt_xdisplay()), mitInfo)) { -+ kdDebug() << "XScreenSaverQueryInfo " << mitInfo->state << " " << ScreenSaverDisabled << endl; -+ if (mitInfo->state == ScreenSaverDisabled) -+ activate = false; -+ } - #endif - - if(mActive && activate) ---- kdesktop/lockeng.cc 2006/02/06 13:25:11 506297 -+++ kdesktop/lockeng.cc 2006/06/04 12:42:03 548008 -@@ -42,9 +42,6 @@ - XGetScreenSaver(qt_xdisplay(), &mXTimeout, &mXInterval, - &mXBlanking, &mXExposures); - -- // We'll handle blanking -- XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); -- - mState = Waiting; - mXAutoLock = 0; - mEnabled = false; -@@ -158,6 +155,9 @@ - mXAutoLock->setDPMS(mDPMS); - //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); - -+ // We'll handle blanking -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); -+ - mXAutoLock->start(); - - kdDebug(1204) << "Saver Engine started, timeout: " << mTimeout << endl; -@@ -170,6 +170,7 @@ - mXAutoLock = 0; - } - -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - kdDebug(1204) << "Saver Engine disabled" << endl; - } - -@@ -291,7 +292,6 @@ - kdDebug(1204) << "SaverEngine: stopping lock" << endl; - emitDCOPSignal("KDE_stop_screensaver()", QByteArray()); - -- - mLockProcess.kill(); - - if (mXAutoLock) -@@ -300,6 +300,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - void SaverEngine::lockProcessExited() -@@ -314,6 +315,7 @@ - } - processLockTransactions(); - mState = Waiting; -+ XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, mXBlanking, mXExposures); - } - - //--------------------------------------------------------------------------- -@@ -322,6 +324,8 @@ - // - void SaverEngine::idleTimeout() - { -+ // disable X screensaver -+ XSetScreenSaver(qt_xdisplay(), 0, mXInterval, mXBlanking, mXExposures); - startLockProcess( DefaultLock ); - } - diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist index dc2cf8dced61..b415fcad34d2 100644 --- a/x11/kdebase4/pkg-plist +++ b/x11/kdebase4/pkg-plist @@ -878,6 +878,7 @@ share/applications/kde/arts.desktop share/applications/kde/background.desktop share/applications/kde/bell.desktop share/applications/kde/cache.desktop +share/applications/kde/cdinfo.desktop share/applications/kde/clock.desktop share/applications/kde/colors.desktop share/applications/kde/componentchooser.desktop @@ -1288,6 +1289,7 @@ share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/kfmclient_3_2.upd share/apps/kconf_update/kfmclient_3_2_update.sh share/apps/kconf_update/khotkeys_32b1_update.upd +share/apps/kconf_update/khotkeys_printscreen.upd share/apps/kconf_update/kicker-3.1-properSizeSetting.pl share/apps/kconf_update/kicker-3.5-kconfigXTize.pl share/apps/kconf_update/kicker-3.5-taskbarEnums.pl @@ -1590,6 +1592,7 @@ share/apps/khelpcenter/searchhandlers/man.desktop share/apps/khelpcenter/table-of-contents.xslt share/apps/khotkeys/kde32b1.khotkeys share/apps/khotkeys/konqueror_gestures_kde321.khotkeys +share/apps/khotkeys/printscreen.khotkeys share/apps/khtml/kpartplugins/khtmlkttsd.desktop share/apps/khtml/kpartplugins/khtmlkttsd.rc share/apps/kicker/applets/clockapplet.desktop @@ -2526,6 +2529,9 @@ share/doc/HTML/en/kicker/screenshot_right.png share/doc/HTML/en/kicker/taskbar_group.png share/doc/HTML/en/kicker/terminals_icon.png share/doc/HTML/en/kicker/windowlist_icon.png +share/doc/HTML/en/kinfocenter/cdinfo/common +share/doc/HTML/en/kinfocenter/cdinfo/index.cache.bz2 +share/doc/HTML/en/kinfocenter/cdinfo/index.docbook share/doc/HTML/en/kinfocenter/common share/doc/HTML/en/kinfocenter/devices/common share/doc/HTML/en/kinfocenter/devices/index.cache.bz2 @@ -4218,7 +4224,8 @@ share/services/tar.protocol share/services/textthumbnail.desktop share/services/thumbnail.protocol share/services/trash.protocol -share/services/useragentstrings/firefoxoncurrent.desktop +share/services/useragentstrings/firefox10oncurrent.desktop +share/services/useragentstrings/firefox15oncurrent.desktop share/services/useragentstrings/googlebot.desktop share/services/useragentstrings/ie401onwinnt4.desktop share/services/useragentstrings/ie45onwinnt5.desktop @@ -4242,7 +4249,8 @@ share/services/useragentstrings/ns71oncurrent.desktop share/services/useragentstrings/ns71onwinnt51.desktop share/services/useragentstrings/op403onwinnt4.desktop share/services/useragentstrings/op75oncurrent.desktop -share/services/useragentstrings/safari.desktop +share/services/useragentstrings/safari12.desktop +share/services/useragentstrings/safari20.desktop share/services/useragentstrings/w3moncurrent.desktop share/services/useragentstrings/wgetoncurrent.desktop share/services/zip.protocol @@ -4720,6 +4728,7 @@ share/wallpapers/triplegears.jpg.desktop @dirrm share/doc/HTML/en/kinfocenter/interrupts @dirrm share/doc/HTML/en/kinfocenter/dma @dirrm share/doc/HTML/en/kinfocenter/devices +@dirrm share/doc/HTML/en/kinfocenter/cdinfo @dirrm share/doc/HTML/en/kinfocenter @dirrm share/doc/HTML/en/kicker @dirrm share/doc/HTML/en/khelpcenter/visualdict diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist index eb59e35ceac4..e7ac7cce19c7 100644 --- a/x11/kdelibs3-nocups/pkg-plist +++ b/x11/kdelibs3-nocups/pkg-plist @@ -3177,6 +3177,7 @@ share/icons/crystalsvg/128x128/filesystems/zip_overlay.png share/icons/crystalsvg/128x128/mimetypes/applix.png share/icons/crystalsvg/128x128/mimetypes/ascii.png share/icons/crystalsvg/128x128/mimetypes/binary.png +share/icons/crystalsvg/128x128/mimetypes/bt.png share/icons/crystalsvg/128x128/mimetypes/cdimage.png share/icons/crystalsvg/128x128/mimetypes/cdr.png share/icons/crystalsvg/128x128/mimetypes/cdtrack.png @@ -3594,6 +3595,7 @@ share/icons/crystalsvg/16x16/filesystems/zip_overlay.png share/icons/crystalsvg/16x16/mimetypes/applix.png share/icons/crystalsvg/16x16/mimetypes/ascii.png share/icons/crystalsvg/16x16/mimetypes/binary.png +share/icons/crystalsvg/16x16/mimetypes/bt.png share/icons/crystalsvg/16x16/mimetypes/cdimage.png share/icons/crystalsvg/16x16/mimetypes/cdr.png share/icons/crystalsvg/16x16/mimetypes/cdtrack.png @@ -3956,6 +3958,7 @@ share/icons/crystalsvg/22x22/filesystems/zip_overlay.png share/icons/crystalsvg/22x22/mimetypes/applix.png share/icons/crystalsvg/22x22/mimetypes/ascii.png share/icons/crystalsvg/22x22/mimetypes/binary.png +share/icons/crystalsvg/22x22/mimetypes/bt.png share/icons/crystalsvg/22x22/mimetypes/cdimage.png share/icons/crystalsvg/22x22/mimetypes/cdtrack.png share/icons/crystalsvg/22x22/mimetypes/colorscm.png @@ -4326,6 +4329,7 @@ share/icons/crystalsvg/32x32/filesystems/zip_overlay.png share/icons/crystalsvg/32x32/mimetypes/applix.png share/icons/crystalsvg/32x32/mimetypes/ascii.png share/icons/crystalsvg/32x32/mimetypes/binary.png +share/icons/crystalsvg/32x32/mimetypes/bt.png share/icons/crystalsvg/32x32/mimetypes/cdimage.png share/icons/crystalsvg/32x32/mimetypes/cdr.png share/icons/crystalsvg/32x32/mimetypes/cdtrack.png @@ -4549,6 +4553,7 @@ share/icons/crystalsvg/48x48/filesystems/zip_overlay.png share/icons/crystalsvg/48x48/mimetypes/applix.png share/icons/crystalsvg/48x48/mimetypes/ascii.png share/icons/crystalsvg/48x48/mimetypes/binary.png +share/icons/crystalsvg/48x48/mimetypes/bt.png share/icons/crystalsvg/48x48/mimetypes/cdimage.png share/icons/crystalsvg/48x48/mimetypes/cdr.png share/icons/crystalsvg/48x48/mimetypes/cdtrack.png @@ -4731,6 +4736,7 @@ share/icons/crystalsvg/64x64/filesystems/zip_overlay.png share/icons/crystalsvg/64x64/mimetypes/applix.png share/icons/crystalsvg/64x64/mimetypes/ascii.png share/icons/crystalsvg/64x64/mimetypes/binary.png +share/icons/crystalsvg/64x64/mimetypes/bt.png share/icons/crystalsvg/64x64/mimetypes/cdimage.png share/icons/crystalsvg/64x64/mimetypes/cdr.png share/icons/crystalsvg/64x64/mimetypes/cdtrack.png @@ -5114,7 +5120,6 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop share/mimelnk/application/vnd.sun.xml.writer.master.desktop share/mimelnk/application/vnd.sun.xml.writer.template.desktop share/mimelnk/application/wordperfect.desktop -share/mimelnk/application/x-7z.desktop share/mimelnk/application/x-abiword.desktop share/mimelnk/application/x-ace.desktop share/mimelnk/application/x-afm.desktop @@ -5187,6 +5192,7 @@ share/mimelnk/application/x-lyx.desktop share/mimelnk/application/x-lzop.desktop share/mimelnk/application/x-magicpoint.desktop share/mimelnk/application/x-mimearchive.desktop +share/mimelnk/application/x-mplayer2.desktop share/mimelnk/application/x-msaccess.desktop share/mimelnk/application/x-msdos-program.desktop share/mimelnk/application/x-msmetafile.desktop diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 5ebd57592748..baf10175e129 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -83,6 +83,9 @@ pre-configure: ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp ${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \ -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ + ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp + ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 1c7be9bf5bbe..2097cf54e7e3 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.3.tar.bz2) = 972c2c6855f912179bd7830bf2ed91d8 -SHA256 (KDE/kdelibs-3.5.3.tar.bz2) = ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 -SIZE (KDE/kdelibs-3.5.3.tar.bz2) = 15424888 +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 diff --git a/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in new file mode 100644 index 000000000000..cfc259a470c7 --- /dev/null +++ b/x11/kdelibs3/files/patch-mimetypes_application-Makefile.in @@ -0,0 +1,20 @@ +--- mimetypes/application/Makefile.in.orig Tue Aug 15 18:56:01 2006 ++++ mimetypes/application/Makefile.in Tue Aug 15 18:56:32 2006 +@@ -525,7 +525,7 @@ + vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \ + vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \ + vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \ +- x-xliff.desktop x-7z.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \ ++ x-xliff.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \ + xsd.desktop relaxng.desktop \ + vnd.oasis.opendocument.graphics-template.desktop \ + vnd.oasis.opendocument.graphics.desktop \ +@@ -757,7 +757,7 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop ++KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop + + #>+ 2 + docs-am: diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist index 86be34220818..6f2655702458 100644 --- a/x11/kdelibs3/pkg-plist +++ b/x11/kdelibs3/pkg-plist @@ -60,7 +60,7 @@ bin/makekdewidgets bin/meinproc bin/preparetips etc/rc.d/kdelibs.sh -etc/xdg/menus/applications.menu +etc/xdg/menus/kde-applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h include/arts/kartsfloatwatch.h @@ -3196,6 +3196,7 @@ share/icons/crystalsvg/128x128/filesystems/zip_overlay.png share/icons/crystalsvg/128x128/mimetypes/applix.png share/icons/crystalsvg/128x128/mimetypes/ascii.png share/icons/crystalsvg/128x128/mimetypes/binary.png +share/icons/crystalsvg/128x128/mimetypes/bt.png share/icons/crystalsvg/128x128/mimetypes/cdimage.png share/icons/crystalsvg/128x128/mimetypes/cdr.png share/icons/crystalsvg/128x128/mimetypes/cdtrack.png @@ -3613,6 +3614,7 @@ share/icons/crystalsvg/16x16/filesystems/zip_overlay.png share/icons/crystalsvg/16x16/mimetypes/applix.png share/icons/crystalsvg/16x16/mimetypes/ascii.png share/icons/crystalsvg/16x16/mimetypes/binary.png +share/icons/crystalsvg/16x16/mimetypes/bt.png share/icons/crystalsvg/16x16/mimetypes/cdimage.png share/icons/crystalsvg/16x16/mimetypes/cdr.png share/icons/crystalsvg/16x16/mimetypes/cdtrack.png @@ -3975,6 +3977,7 @@ share/icons/crystalsvg/22x22/filesystems/zip_overlay.png share/icons/crystalsvg/22x22/mimetypes/applix.png share/icons/crystalsvg/22x22/mimetypes/ascii.png share/icons/crystalsvg/22x22/mimetypes/binary.png +share/icons/crystalsvg/22x22/mimetypes/bt.png share/icons/crystalsvg/22x22/mimetypes/cdimage.png share/icons/crystalsvg/22x22/mimetypes/cdtrack.png share/icons/crystalsvg/22x22/mimetypes/colorscm.png @@ -4345,6 +4348,7 @@ share/icons/crystalsvg/32x32/filesystems/zip_overlay.png share/icons/crystalsvg/32x32/mimetypes/applix.png share/icons/crystalsvg/32x32/mimetypes/ascii.png share/icons/crystalsvg/32x32/mimetypes/binary.png +share/icons/crystalsvg/32x32/mimetypes/bt.png share/icons/crystalsvg/32x32/mimetypes/cdimage.png share/icons/crystalsvg/32x32/mimetypes/cdr.png share/icons/crystalsvg/32x32/mimetypes/cdtrack.png @@ -4568,6 +4572,7 @@ share/icons/crystalsvg/48x48/filesystems/zip_overlay.png share/icons/crystalsvg/48x48/mimetypes/applix.png share/icons/crystalsvg/48x48/mimetypes/ascii.png share/icons/crystalsvg/48x48/mimetypes/binary.png +share/icons/crystalsvg/48x48/mimetypes/bt.png share/icons/crystalsvg/48x48/mimetypes/cdimage.png share/icons/crystalsvg/48x48/mimetypes/cdr.png share/icons/crystalsvg/48x48/mimetypes/cdtrack.png @@ -4750,6 +4755,7 @@ share/icons/crystalsvg/64x64/filesystems/zip_overlay.png share/icons/crystalsvg/64x64/mimetypes/applix.png share/icons/crystalsvg/64x64/mimetypes/ascii.png share/icons/crystalsvg/64x64/mimetypes/binary.png +share/icons/crystalsvg/64x64/mimetypes/bt.png share/icons/crystalsvg/64x64/mimetypes/cdimage.png share/icons/crystalsvg/64x64/mimetypes/cdr.png share/icons/crystalsvg/64x64/mimetypes/cdtrack.png @@ -5133,7 +5139,6 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop share/mimelnk/application/vnd.sun.xml.writer.master.desktop share/mimelnk/application/vnd.sun.xml.writer.template.desktop share/mimelnk/application/wordperfect.desktop -share/mimelnk/application/x-7z.desktop share/mimelnk/application/x-abiword.desktop share/mimelnk/application/x-ace.desktop share/mimelnk/application/x-afm.desktop @@ -5206,6 +5211,7 @@ share/mimelnk/application/x-lyx.desktop share/mimelnk/application/x-lzop.desktop share/mimelnk/application/x-magicpoint.desktop share/mimelnk/application/x-mimearchive.desktop +share/mimelnk/application/x-mplayer2.desktop share/mimelnk/application/x-msaccess.desktop share/mimelnk/application/x-msdos-program.desktop share/mimelnk/application/x-msmetafile.desktop diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 5ebd57592748..baf10175e129 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -83,6 +83,9 @@ pre-configure: ${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp ${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \ -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure + ${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \ + ${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp + ${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu post-configure: ${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 1c7be9bf5bbe..2097cf54e7e3 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-3.5.3.tar.bz2) = 972c2c6855f912179bd7830bf2ed91d8 -SHA256 (KDE/kdelibs-3.5.3.tar.bz2) = ff394fba46b353e3a1c27175788f428fa3561849b18ef744a1252c34bf09fdb9 -SIZE (KDE/kdelibs-3.5.3.tar.bz2) = 15424888 +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 diff --git a/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in b/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in new file mode 100644 index 000000000000..cfc259a470c7 --- /dev/null +++ b/x11/kdelibs4/files/patch-mimetypes_application-Makefile.in @@ -0,0 +1,20 @@ +--- mimetypes/application/Makefile.in.orig Tue Aug 15 18:56:01 2006 ++++ mimetypes/application/Makefile.in Tue Aug 15 18:56:32 2006 +@@ -525,7 +525,7 @@ + vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \ + vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \ + vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \ +- x-xliff.desktop x-7z.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \ ++ x-xliff.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \ + xsd.desktop relaxng.desktop \ + vnd.oasis.opendocument.graphics-template.desktop \ + vnd.oasis.opendocument.graphics.desktop \ +@@ -757,7 +757,7 @@ + .NOEXPORT: + + #>+ 2 +-KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop ++KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop + + #>+ 2 + docs-am: diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index 86be34220818..6f2655702458 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -60,7 +60,7 @@ bin/makekdewidgets bin/meinproc bin/preparetips etc/rc.d/kdelibs.sh -etc/xdg/menus/applications.menu +etc/xdg/menus/kde-applications.menu include/arts/artskde.h include/arts/kartsdispatcher.h include/arts/kartsfloatwatch.h @@ -3196,6 +3196,7 @@ share/icons/crystalsvg/128x128/filesystems/zip_overlay.png share/icons/crystalsvg/128x128/mimetypes/applix.png share/icons/crystalsvg/128x128/mimetypes/ascii.png share/icons/crystalsvg/128x128/mimetypes/binary.png +share/icons/crystalsvg/128x128/mimetypes/bt.png share/icons/crystalsvg/128x128/mimetypes/cdimage.png share/icons/crystalsvg/128x128/mimetypes/cdr.png share/icons/crystalsvg/128x128/mimetypes/cdtrack.png @@ -3613,6 +3614,7 @@ share/icons/crystalsvg/16x16/filesystems/zip_overlay.png share/icons/crystalsvg/16x16/mimetypes/applix.png share/icons/crystalsvg/16x16/mimetypes/ascii.png share/icons/crystalsvg/16x16/mimetypes/binary.png +share/icons/crystalsvg/16x16/mimetypes/bt.png share/icons/crystalsvg/16x16/mimetypes/cdimage.png share/icons/crystalsvg/16x16/mimetypes/cdr.png share/icons/crystalsvg/16x16/mimetypes/cdtrack.png @@ -3975,6 +3977,7 @@ share/icons/crystalsvg/22x22/filesystems/zip_overlay.png share/icons/crystalsvg/22x22/mimetypes/applix.png share/icons/crystalsvg/22x22/mimetypes/ascii.png share/icons/crystalsvg/22x22/mimetypes/binary.png +share/icons/crystalsvg/22x22/mimetypes/bt.png share/icons/crystalsvg/22x22/mimetypes/cdimage.png share/icons/crystalsvg/22x22/mimetypes/cdtrack.png share/icons/crystalsvg/22x22/mimetypes/colorscm.png @@ -4345,6 +4348,7 @@ share/icons/crystalsvg/32x32/filesystems/zip_overlay.png share/icons/crystalsvg/32x32/mimetypes/applix.png share/icons/crystalsvg/32x32/mimetypes/ascii.png share/icons/crystalsvg/32x32/mimetypes/binary.png +share/icons/crystalsvg/32x32/mimetypes/bt.png share/icons/crystalsvg/32x32/mimetypes/cdimage.png share/icons/crystalsvg/32x32/mimetypes/cdr.png share/icons/crystalsvg/32x32/mimetypes/cdtrack.png @@ -4568,6 +4572,7 @@ share/icons/crystalsvg/48x48/filesystems/zip_overlay.png share/icons/crystalsvg/48x48/mimetypes/applix.png share/icons/crystalsvg/48x48/mimetypes/ascii.png share/icons/crystalsvg/48x48/mimetypes/binary.png +share/icons/crystalsvg/48x48/mimetypes/bt.png share/icons/crystalsvg/48x48/mimetypes/cdimage.png share/icons/crystalsvg/48x48/mimetypes/cdr.png share/icons/crystalsvg/48x48/mimetypes/cdtrack.png @@ -4750,6 +4755,7 @@ share/icons/crystalsvg/64x64/filesystems/zip_overlay.png share/icons/crystalsvg/64x64/mimetypes/applix.png share/icons/crystalsvg/64x64/mimetypes/ascii.png share/icons/crystalsvg/64x64/mimetypes/binary.png +share/icons/crystalsvg/64x64/mimetypes/bt.png share/icons/crystalsvg/64x64/mimetypes/cdimage.png share/icons/crystalsvg/64x64/mimetypes/cdr.png share/icons/crystalsvg/64x64/mimetypes/cdtrack.png @@ -5133,7 +5139,6 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop share/mimelnk/application/vnd.sun.xml.writer.master.desktop share/mimelnk/application/vnd.sun.xml.writer.template.desktop share/mimelnk/application/wordperfect.desktop -share/mimelnk/application/x-7z.desktop share/mimelnk/application/x-abiword.desktop share/mimelnk/application/x-ace.desktop share/mimelnk/application/x-afm.desktop @@ -5206,6 +5211,7 @@ share/mimelnk/application/x-lyx.desktop share/mimelnk/application/x-lzop.desktop share/mimelnk/application/x-magicpoint.desktop share/mimelnk/application/x-mimearchive.desktop +share/mimelnk/application/x-mplayer2.desktop share/mimelnk/application/x-msaccess.desktop share/mimelnk/application/x-msdos-program.desktop share/mimelnk/application/x-msmetafile.desktop diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index 883e46cdb598..0ef5ba1c64d9 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -7,7 +7,6 @@ PORTNAME= xscreensaver-kde PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo index a3cc92b73be0..02d405956dc0 100644 --- a/x11/xscreensaver-kde/distinfo +++ b/x11/xscreensaver-kde/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdeartwork-3.5.3.tar.bz2) = e0fc78bee18d81b4595c98964227a06c -SHA256 (KDE/kdeartwork-3.5.3.tar.bz2) = 92d78c09e960f99a6c0f6b026470e096b88357fd7c5646494f3beced6ac22d53 -SIZE (KDE/kdeartwork-3.5.3.tar.bz2) = 16599096 +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 |