Author: arekm Date: Sun Jun 24 16:57:59 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated
---- Files affected: SOURCES: kdeutils-branch.diff (1.3 -> 1.4) ---- Diffs: ================================================================ Index: SOURCES/kdeutils-branch.diff diff -u SOURCES/kdeutils-branch.diff:1.3 SOURCES/kdeutils-branch.diff:1.4 --- SOURCES/kdeutils-branch.diff:1.3 Sat Apr 2 13:47:50 2005 +++ SOURCES/kdeutils-branch.diff Sun Jun 24 18:57:53 2007 @@ -1,1885 +1,1190 @@ -diff -urN -x CVS kdeutils.orig/admin/acinclude.m4.in kdeutils/admin/acinclude.m4.in ---- kdeutils.orig/admin/acinclude.m4.in 2005-02-09 23:21:09.000000000 +0100 -+++ kdeutils/admin/acinclude.m4.in 2005-03-24 20:18:09.000000000 +0100 -@@ -1644,7 +1644,15 @@ - - AC_MSG_RESULT([$kde_cv_uic_plugins]) - if test "$kde_cv_uic_plugins" != yes; then -- AC_MSG_ERROR([you need to install kdelibs first.]) -+ AC_MSG_ERROR([ -+you need to install kdelibs first. -+ -+If you did install kdelibs, then the Qt version that is picked up by -+this configure is not the same version you used to compile kdelibs. -+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the -+same Qt version, compiled with the same compiler and the same Qt -+configuration settings. -+]) - fi - fi - ]) -@@ -3104,8 +3112,8 @@ - fi - rm -f conftest.h conftest.h.gch - fi -- AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - fi -+ AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes") - if test "$CXX" = "KCC"; then - dnl unfortunately we currently cannot disable exception support in KCC - dnl because doing so is binary incompatible and Qt by default links with exceptions :-( -@@ -3194,6 +3202,51 @@ - ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), []) - ]) - -+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG], -+ [ -+ AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug, -+ [ -+ AC_LANG_SAVE -+ AC_LANG_CPLUSPLUS -+ -+ safe_CXXFLAGS=$CXXFLAGS -+ safe_LDFLAGS=$LDFLAGS -+ CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0" -+ LDFLAGS="$LDFLAGS -shared -fPIC" -+ -+ AC_TRY_LINK( -+ [ -+ /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */ -+ template<typename CharT> -+ struct VisTest -+ { -+ inline VisTest (); -+ }; -+ template<typename CharT> -+ inline VisTest<CharT>::VisTest() -+ {} -+ extern template class VisTest<char>; // It works if we drop that line -+ int some_function( int do_something ) __attribute__ ((visibility("default"))); -+ int some_function( int ) -+ { -+ VisTest<char> a; -+ return 0; -+ } -+ ], [/* elvis is alive */], -+ kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes) -+ -+ CXXFLAGS=$safe_CXXFLAGS -+ LDFLAGS=$safe_LDFLAGS -+ AC_LANG_RESTORE -+ ] -+ ) -+ -+ if test x$kde_cv_val_gcc_visibility_bug = xno; then -+ CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" -+ fi -+ ] -+) -+ - AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY], - [ - if test "$GXX" = "yes"; then -@@ -3202,7 +3255,9 @@ - KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"]) - KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, - [ -- CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden" -+ KDE_CHECK_VISIBILITY_GCC_BUG -+ - HAVE_GCC_VISIBILITY=1 - AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported]) - ]) -diff -urN -x CVS kdeutils.orig/admin/am_edit kdeutils/admin/am_edit ---- kdeutils.orig/admin/am_edit 2004-12-17 21:18:28.000000000 +0100 -+++ kdeutils/admin/am_edit 2005-03-29 11:15:16.000000000 +0200 -@@ -483,6 +483,7 @@ - $MakefileData =~ s/$lookup/$replacement/; - $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/; - $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after"; -+ next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/); - substituteLine($lookup, $replacement); - } else { - $found = 0; -@@ -634,7 +635,7 @@ - if ($pre eq '' && exists($varcontent{$variable})) { - my @addlist = split(/[\034\s]+/, $varcontent{$variable}); - push(@objlist, @addlist); -- } elsif ($variable !~ 'OBJEXT') { -+ } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) { - $ocv = 1; - } - } -@@ -2276,7 +2277,7 @@ - "\t echo \"\$\$i\"; \\\n" . - "\t if ! "; - $t .= $cxxsuffix eq "KKK" ? -- "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " : -+ "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " : - "\$(CXXCOMPILE) "; - $t .= " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" . - "\t rm -f \$\$i.bchecktest.cc; exit 1; \\\n" . -@@ -2352,7 +2353,7 @@ - $MakefileData =~ s/\034/\\\n/g; # Restore continuation lines - # Append our $progId line, _below_ the "generated by automake" line - # because automake-1.6 relies on the first line to be his own. -- my $progIdLine = "\# $progId - " . '$Revision$ '."\n"; -+ my $progIdLine = "\# $progId - " . '$Revision$ '."\n"; - if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) { - warn "automake line not found in $makefile\n"; - # Fallback: first line -diff -urN -x CVS kdeutils.orig/ark/ark.desktop kdeutils/ark/ark.desktop ---- kdeutils.orig/ark/ark.desktop 2005-02-09 05:30:24.000000000 +0100 -+++ kdeutils/ark/ark.desktop 2005-03-07 15:18:31.000000000 +0100 -@@ -56,7 +56,6 @@ - GenericName[vi]=Công cụ nén - GenericName[wa]=Usteye d' årtchivaedje - GenericName[xh]=Isixhobo Sokuphatha i Archive --GenericName[xx]=xxArchiving Toolxx - GenericName[zh_CN]=文件压缩归档工具 - GenericName[zh_TW]=壓縮工具 - GenericName[zu]=Ithuluzi Lomqulu -@@ -66,7 +65,6 @@ - Name[nso]=Areka - Name[ta]=ஆர்க் - Name[th]=อาร์ค --Name[xx]=xxArkxx - Exec=ark -caption "%c" %i %m %U - Icon=ark - Path= -diff -urN -x CVS kdeutils.orig/ark/ark_part.desktop kdeutils/ark/ark_part.desktop ---- kdeutils.orig/ark/ark_part.desktop 2004-12-11 07:38:35.000000000 +0100 -+++ kdeutils/ark/ark_part.desktop 2005-03-07 15:18:31.000000000 +0100 -@@ -58,7 +58,6 @@ - Comment[vi]=Công cụ xử lí các file nén - Comment[wa]=Usteye po-z apougnî les årtchives - Comment[xh]=Isixhobo sokuphatha i Archive --Comment[xx]=xxArchive Handling Toolxx - Comment[zh_CN]=文件压缩归档处理工具 - Comment[zh_TW]=壓縮檔案處理工具 - Comment[zu]=Ithuluzi Lokuphatha Umqulu -@@ -114,7 +113,6 @@ - Name[vi]=Luư trữ - Name[wa]=Årtchiveu - Name[xh]=Umenzi woshicilelo lukawonke-wonke noxwebhu lweMbali --Name[xx]=xxArchiverxx - Name[zh_CN]=压缩存档工具 - Name[zu]=Umqulu - Exec=ark -caption "%c" %i %m %U -diff -urN -x CVS kdeutils.orig/ark/arkwidget.cpp kdeutils/ark/arkwidget.cpp ---- kdeutils.orig/ark/arkwidget.cpp 2005-01-28 12:41:11.000000000 +0100 -+++ kdeutils/ark/arkwidget.cpp 2005-03-21 03:04:45.000000000 +0100 -@@ -2307,7 +2307,7 @@ - { - Arch * newArch = 0; - -- QString type = KMimeType::findByURL( _fileName )->name(); -+ QString type = KMimeType::findByURL( KURL::fromPathOrURL(_fileName) )->name(); - ArchType archtype = ArchiveFormatInfo::self()->archTypeForMimeType(type); - kdDebug( 1601 ) << "archtype is recognised as: " << archtype << endl; - if(0 == (newArch = Arch::archFactory(archtype, this, -diff -urN -x CVS kdeutils.orig/ark/compressedfile.cpp kdeutils/ark/compressedfile.cpp ---- kdeutils.orig/ark/compressedfile.cpp 2004-10-17 21:16:22.000000000 +0200 -+++ kdeutils/ark/compressedfile.cpp 2005-03-21 03:04:45.000000000 +0100 -@@ -270,9 +270,11 @@ - Q_ASSERT(m_gui->getNumFilesInArchive() == 0); - Q_ASSERT(urls.count() == 1); - -- QString file = urls.first(); -- if (file.left(5) == "file:") -- file = file.right(file.length() - 5); -+ KURL url = KURL::fromPathOrURL(urls.first()); -+ Q_ASSERT(url.isLocalFile()); -+ -+ QString file; -+ file = url.path(); - - KProcess proc; - proc << "cp" << file << m_tmpdir; -diff -urN -x CVS kdeutils.orig/charselectapplet/kcharselectapplet.desktop kdeutils/charselectapplet/kcharselectapplet.desktop ---- kdeutils.orig/charselectapplet/kcharselectapplet.desktop 2005-02-23 06:06:17.000000000 +0100 -+++ kdeutils/charselectapplet/kcharselectapplet.desktop 2005-03-30 08:48:10.000000000 +0200 -@@ -9,6 +9,7 @@ - Name[cy]=Dewisydd Nod - Name[da]=Tegnvælger - Name[de]=Tabelle zur Zeichenauswahl -+Name[el]=Επιλογέας χαρακτήρων - Name[es]=Selector de caracteres - Name[et]=Sümbolite valija - Name[fi]=Valitse merkki leikepöydälle -@@ -25,10 +26,12 @@ - Name[pt]=Selector de Caracteres - Name[pt_BR]=Seletor de Caracteres - Name[ru]=Выбор символа -+Name[sl]=Izbiranje znakov -+Name[sr]=Бирач знакова [EMAIL PROTECTED] znakova - Name[sv]=Teckenväljare - Name[ta]= எழுத்து தேர்ந்தெடுப்பான் - Name[uk]=Вибір символів --Name[xx]=xxCharacter Selectorxx - Name[zh_CN]=字符选择器 - Icon=kcharselect - X-KDE-Library=kcharselect_panelapplet -diff -urN -x CVS kdeutils.orig/kcalc/ChangeLog kdeutils/kcalc/ChangeLog ---- kdeutils.orig/kcalc/ChangeLog 2005-02-05 13:42:18.000000000 +0100 -+++ kdeutils/kcalc/ChangeLog 2005-03-31 02:29:52.000000000 +0200 -@@ -1,6 +1,9 @@ -+2005-03-31 Klaus Niederkr�ger <[EMAIL PROTECTED]> -+ * GUI: included last changes from HEAD, which were all minor (Mem-Buttons) -+ - 2005-02-05 Klaus Niederkr�ger <[EMAIL PROTECTED]> -- * fix BUG 98522: M- button did not work at least since KDE-3.2. Shame on me, and thanks to -- Bernd Brandstetter for reporting the bug. -+ * fix BUG 98522: M- button did not work at least since KDE-3.2. -+ Shame on me, and thanks to Bernd Brandstetter for reporting the bug. - - 2004-12-21 Klaus Niederkr�ger <[EMAIL PROTECTED]> - * added some more contants and dropped Pi-button since not needed. -diff -urN -x CVS kdeutils.orig/kcalc/kcalc.cpp kdeutils/kcalc/kcalc.cpp ---- kdeutils.orig/kcalc/kcalc.cpp 2005-02-05 13:42:18.000000000 +0100 -+++ kdeutils/kcalc/kcalc.cpp 2005-03-31 02:29:52.000000000 +0200 -@@ -311,9 +311,10 @@ - largeBtnLayout->addWidget(pbParenOpen, 1, 0); - largeBtnLayout->addWidget(pbParenClose, 1, 1); - -- largeBtnLayout->addWidget(pbMR, 2, 0); -+ largeBtnLayout->addWidget(pbMemRecall, 2, 0); -+ largeBtnLayout->addWidget(pbMemStore, 2, 1); - -- largeBtnLayout->addWidget(pbMPlusMinus, 3, 0); -+ largeBtnLayout->addWidget(pbMemPlusMinus, 3, 0); - largeBtnLayout->addWidget(pbPercent, 3, 1); - - largeBtnLayout->addWidget(pbMC, 4, 0); -@@ -340,8 +341,9 @@ - mFunctionButtonList.append(pbPower); - - mMemButtonList.append(pbEE); -- mMemButtonList.append(pbMR); -- mMemButtonList.append(pbMPlusMinus); -+ mMemButtonList.append(pbMemRecall); -+ mMemButtonList.append(pbMemPlusMinus); -+ mMemButtonList.append(pbMemStore); - mMemButtonList.append(pbMC); - mMemButtonList.append(pbClear); - mMemButtonList.append(pbAC); -@@ -648,16 +650,29 @@ - thisLayout->addColSpacing(4,10); - - -- pbMR = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall")); -+ pbMemRecall = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall")); - connect(this, SIGNAL(switchShowAccels(bool)), -- pbMR, SLOT(slotSetAccelDisplayMode(bool))); -- connect(pbMR, SIGNAL(clicked(void)), SLOT(slotMRclicked(void))); -- pbMR->setDisabled(true); // At start, there is nothing in memory -+ pbMemRecall, SLOT(slotSetAccelDisplayMode(bool))); -+ connect(pbMemRecall, SIGNAL(clicked(void)), -+ SLOT(slotMemRecallclicked(void))); -+ pbMemRecall->setDisabled(true); // At start, there is nothing in memory -+ -+ pbMemPlusMinus = new KCalcButton(mLargePage, "MPlusMinus-Button"); -+ pbMemPlusMinus->addMode(ModeNormal, "M+", i18n("Add display to memory")); -+ pbMemPlusMinus->addMode(ModeInverse, "M-", i18n("Subtract from memory")); -+ connect(this, SIGNAL(switchMode(ButtonModeFlags,bool)), -+ pbMemPlusMinus, SLOT(slotSetMode(ButtonModeFlags,bool))); -+ connect(this, SIGNAL(switchShowAccels(bool)), -+ pbMemPlusMinus, SLOT(slotSetAccelDisplayMode(bool))); -+ connect(pbMemPlusMinus,SIGNAL(clicked(void)), -+ SLOT(slotMemPlusMinusclicked(void))); - -- pbMPlusMinus = new KCalcButton("M" "\xb1", mLargePage, "MPlusMinus-Button"); -+ pbMemStore = new KCalcButton("MS", mLargePage, "MemStore-Button", -+ i18n("Memory store")); - connect(this, SIGNAL(switchShowAccels(bool)), -- pbMPlusMinus, SLOT(slotSetAccelDisplayMode(bool))); -- connect(pbMPlusMinus,SIGNAL(clicked(void)),SLOT(slotMPlusMinusclicked(void))); -+ pbMemStore, SLOT(slotSetAccelDisplayMode(bool))); -+ connect(pbMemStore, SIGNAL(clicked(void)), SLOT(slotMemStoreclicked(void))); -+ +Index: charselectapplet/kcharselectapplet.desktop +=================================================================== +--- charselectapplet/kcharselectapplet.desktop (.../tags/KDE/3.5.7/kdeutils) (wersja 679692) ++++ charselectapplet/kcharselectapplet.desktop (.../branches/KDE/3.5/kdeutils) (wersja 679692) +@@ -89,6 +89,7 @@ + Comment[sr]=Бира стране и специјалне знакове за клипборд + [EMAIL PROTECTED] strane i specijalne znakove za klipbord + Comment[sv]=Välj främmande tecken och specialtecken för klippbordet ++Comment[tr]=Yabancı ve özel karakterleri panoya kopyalar + Comment[uk]=Вибрати і вставити в кишеню іноземні та спеціальні символи + Comment[uz]=Ҳарф ва махсус белгиларни хотирага олиш воситаси + Comment[zh_CN]=将外语和特殊字符拾取到剪贴板 +Index: kfloppy/floppy_format.desktop +=================================================================== +--- kfloppy/floppy_format.desktop (.../tags/KDE/3.5.7/kdeutils) (wersja 679692) ++++ kfloppy/floppy_format.desktop (.../branches/KDE/3.5/kdeutils) (wersja 679692) +@@ -38,6 +38,7 @@ + Name[sl]=Formatiraj + Name[sr]=Форматирај + [EMAIL PROTECTED] ++Name[tr]=Biçimlendir + Name[uk]=Форматування + Name[uz]=Форматлаш + Name[zh_CN]=格式化 +Index: kfloppy/floppy.cpp +=================================================================== +--- kfloppy/floppy.cpp (.../tags/KDE/3.5.7/kdeutils) (wersja 679692) ++++ kfloppy/floppy.cpp (.../branches/KDE/3.5/kdeutils) (wersja 679692) +@@ -702,7 +702,11 @@ + labelnameconfig = config->readEntry( "Label", i18n("Volume label, maximal 11 characters", "KDE Floppy") ); + quickformatconfig = config->readNumEntry("QuickFormat",0); + driveconfig = config->readEntry( "FloppyDrive", i18n("Primary") ); ++#if defined(ANY_LINUX) ++ densityconfig = config->readEntry( "Density", i18n( "Auto-Detect" ) ); ++#else + densityconfig = config->readEntry( "Density", i18n("3.5\" 1.44MB") ); ++#endif + filesystemconfig = config->readEntry( "Filesystem", i18n("DOS") ); - pbMC = new KCalcButton("MC", mLargePage, "MemClear-Button", i18n("Clear memory")); - connect(this, SIGNAL(switchShowAccels(bool)), -@@ -1268,7 +1283,7 @@ - - - --void KCalculator::slotMRclicked(void) -+void KCalculator::slotMemRecallclicked(void) - { - // temp. work-around - calc_display->sendEvent(KCalcDisplay::EventReset); -@@ -1277,6 +1292,16 @@ - UpdateDisplay(false); } - -+void KCalculator::slotMemStoreclicked(void) -+{ -+ EnterEqual(); -+ -+ memory_num = calc_display->getAmount(); -+ //calc_display->setStatusText(3, "M"); -+ statusBar()->changeItem("M",3); -+ pbMemRecall->setEnabled(true); -+} +Index: kfloppy/format.cpp +=================================================================== +--- kfloppy/format.cpp (.../tags/KDE/3.5.7/kdeutils) (wersja 679692) ++++ kfloppy/format.cpp (.../branches/KDE/3.5/kdeutils) (wersja 679692) +@@ -269,14 +269,20 @@ + emit status(i18n("Unexpected drive number %1.").arg(drive),-1); + return false; + } +- if (!( /* (2880==de) || */ (1440==density) || (720==density) || +- (1200==density) || (360==density))) + - void KCalculator::slotNumberclicked(int number_clicked) - { - calc_display->EnterDigit(number_clicked); -@@ -1337,7 +1362,7 @@ ++ fdinfo *deviceinfo = fdtable; ++ for ( ; deviceinfo && (deviceinfo->devices) ; deviceinfo++) + { ++ if (deviceinfo->blocks != density) ++ continue; ++ } ++ if (!deviceinfo) ++ { + emit status(i18n("Unexpected density number %1.").arg(density),-1); + return false; } - } - --void KCalculator::slotMPlusMinusclicked(void) -+void KCalculator::slotMemPlusMinusclicked(void) - { - bool tmp_inverse = inverse; // store this, because next command deletes inverse - EnterEqual(); // finish calculation so far, to store result into MEM -@@ -1347,7 +1372,7 @@ - - pbInv->setOn(false); - statusBar()->changeItem("M",3); -- pbMR->setEnabled(true); -+ pbMemRecall->setEnabled(true); - } - - void KCalculator::slotCosclicked(void) -@@ -1516,7 +1541,7 @@ - { - memory_num = 0; - statusBar()->changeItem(" \xa0\xa0 ",3); -- pbMR->setDisabled(true); -+ pbMemRecall->setDisabled(true); - } - - void KCalculator::slotClearclicked(void) -@@ -2277,14 +2302,14 @@ - "(c) 2000-2003, The KDE Team"), - precisionStatement.latin1()); - -+ /* Klaus Niederkrueger */ -+ aboutData.addAuthor("Klaus Niederkr" "\xc3\xbc" "ger", 0, "[EMAIL PROTECTED]"); - aboutData.addAuthor("Bernd Johannes Wuebben", 0, "[EMAIL PROTECTED]"); -- aboutData.addAuthor("Evan Teran", 0, "[EMAIL PROTECTED]"); -+ aboutData.addAuthor("Evan Teran", 0, "[EMAIL PROTECTED]"); - aboutData.addAuthor("Espen Sand", 0, "[EMAIL PROTECTED]"); - aboutData.addAuthor("Chris Howells", 0, "[EMAIL PROTECTED]"); - aboutData.addAuthor("Aaron J. Seigo", 0, "[EMAIL PROTECTED]"); - aboutData.addAuthor("Charles Samuels", 0, "[EMAIL PROTECTED]"); -- /* Klaus Niederkrueger */ -- aboutData.addAuthor("Klaus Niederkr" "\xc3\xbc" "ger", 0, "[EMAIL PROTECTED]"); - /* Rene Merou */ - aboutData.addAuthor("Ren" "\xc3\xa9" " M" "\xc3\xa9" "rou", 0, "[EMAIL PROTECTED]"); - KCmdLineArgs::init(argc, argv, &aboutData); -diff -urN -x CVS kdeutils.orig/kcalc/kcalc.desktop kdeutils/kcalc/kcalc.desktop ---- kdeutils.orig/kcalc/kcalc.desktop 2004-12-11 07:38:35.000000000 +0100 -+++ kdeutils/kcalc/kcalc.desktop 2005-03-15 09:23:36.000000000 +0100 -@@ -13,7 +13,6 @@ - Name[th]=เครื่องคิดเลข - Name[tr]=Hesap Makinesi - Name[uz]=Калкулятор --Name[xx]=xxKCalcxx - Name[zh_TW]=KDE 計算機 - Exec=kcalc -caption "%c" %i %m - Icon=kcalc -@@ -22,6 +21,7 @@ - GenericName[af]=Wetenskaplike Sakrekenaar - GenericName[ar]=آلة حاسبة علمية - GenericName[bg]=Калкулатор -+GenericName[br]=Ur jederez skiantel - GenericName[bs]=Znanstveni kalkulator - GenericName[ca]=Calculadora científica - GenericName[cs]=Vědecká kalkulačka -@@ -71,7 +71,6 @@ - GenericName[vi]=Máy tính khoa học - GenericName[wa]=Carculete syintifike - GenericName[xh]=Umatshini Wokubala Ezenzululwazi --GenericName[xx]=xxScientific Calculatorxx - GenericName[zh_CN]=科学计算器 - GenericName[zh_TW]=科學計算機 - GenericName[zu]=Umshini wokubala ezenzululwazi -diff -urN -x CVS kdeutils.orig/kcalc/kcalc.h kdeutils/kcalc/kcalc.h ---- kdeutils.orig/kcalc/kcalc.h 2004-12-21 02:40:47.000000000 +0100 -+++ kdeutils/kcalc/kcalc.h 2005-03-31 02:29:52.000000000 +0200 -@@ -109,10 +109,11 @@ - void slotNumberclicked(int number_clicked); - void slotEEclicked(void); - void slotInvtoggled(bool myboolean); -- void slotMRclicked(void); -+ void slotMemRecallclicked(void); -+ void slotMemStoreclicked(void); - void slotSinclicked(void); - void slotPlusMinusclicked(void); -- void slotMPlusMinusclicked(void); -+ void slotMemPlusMinusclicked(void); - void slotCosclicked(void); - void slotReciclicked(void); - void slotTanclicked(void); -@@ -196,8 +197,9 @@ - KCalcButton* pbMC; - KCalcButton* pbMinus; - KCalcButton* pbMod; -- KCalcButton* pbMPlusMinus; -- KCalcButton* pbMR; -+ KCalcButton* pbMemPlusMinus; -+ KCalcButton* pbMemRecall; -+ KCalcButton* pbMemStore; - KCalcButton* pbOR; - KCalcButton* pbParenClose; - KCalcButton* pbParenOpen; -diff -urN -x CVS kdeutils.orig/kcharselect/KCharSelect.desktop kdeutils/kcharselect/KCharSelect.desktop ---- kdeutils.orig/kcharselect/KCharSelect.desktop 2004-12-29 18:52:59.000000000 +0100 -+++ kdeutils/kcharselect/KCharSelect.desktop 2005-03-07 15:18:32.000000000 +0100 -@@ -56,7 +56,6 @@ - GenericName[vi]=Trình chọn kí tự - GenericName[wa]=Tchoezixheu di caracteres - GenericName[xh]=Umkhethi womsebenzi --GenericName[xx]=xxCharacter Selectorxx - GenericName[zh_CN]=字符选择器 - GenericName[zh_TW]=字元選擇器 - GenericName[zu]=Umkhethi Womsebenzi -@@ -84,7 +83,6 @@ - Name[tr]=Karakter Seçici - Name[ven]=U nanga muanewa wa K - Name[xh]=Itshati yokukheta i K --Name[xx]=xxKCharSelectxx - Name[zh_TW]=KDE 字元選擇 - X-KDE-StartupNotify=true - X-DCOP-ServiceType=Multi -diff -urN -x CVS kdeutils.orig/kdelirc/irkick/irkick.desktop kdeutils/kdelirc/irkick/irkick.desktop ---- kdeutils.orig/kdelirc/irkick/irkick.desktop 2005-02-23 06:06:17.000000000 +0100 -+++ kdeutils/kdelirc/irkick/irkick.desktop 2005-03-30 08:48:10.000000000 +0200 -@@ -2,15 +2,17 @@ - Type=Service - Name=IRKick - Name[sv]=IRkick --Name[xx]=xxIRKickxx - GenericName=KDE LIRC Server - GenericName[bg]=Сървър LIRC - GenericName[br]=Servijer LIRC KDE - GenericName[ca]=Servidor LIRC de KDE -+GenericName[cs]=LIRC server pro KDE - GenericName[cy]=Gweinydd LIRC KDE - GenericName[da]=KDE LIRC-server -+GenericName[el]=Εξυπηρετητής LIRC του KDE - GenericName[es]=Servidor LIRC de KDE - GenericName[et]=KDE LIRC server -+GenericName[eu]=KDE LIRC Zerbitzaria - GenericName[fi]=KDE:n LIRC-palvelin - GenericName[fr]=Serveur KDE LIRC - GenericName[ga]=Freastalaí LIRC KDE -@@ -23,9 +25,11 @@ - GenericName[pt]=Servidor de LIRC do KDE - GenericName[pt_BR]=Servidor LIRC do KDE - GenericName[ru]=Сервер LIRC для KDE -+GenericName[sl]=Strežnik KDE LIRC -+GenericName[sr]=KDE-ов LIRC сервер [EMAIL PROTECTED] LIRC server - GenericName[sv]=KDE:s LIRC-server - GenericName[uk]=Сервер LIRC для KDE --GenericName[xx]=xxKDE LIRC Serverxx - GenericName[zh_CN]=KDE LIRC 服务器 - - X-KDE-Library=irkick -@@ -46,7 +50,7 @@ - Comment[cy]=Gweinydd rheolydd pell isgoch Linux KDE - Comment[da]=KDE Linux infrarød fjernbetjeningsserver. - Comment[de]=KDE Linux Infrarot Fernsteuerungsserver. --Comment[el]=Εξυπηρετητής τηλεχειριστηρίου υπερύθρων του Linux για το KDE. -+Comment[el]=Εξυπηρετητ�ς τηλεχειριστηρίου υπερύθρων του Linux για το KDE. - Comment[es]=Servidor de control remoto por infrarrojos de KDE - Comment[et]=KDE Linuxi infrapuna kaugjuhtimise server. - Comment[eu]=KDE Linux infrasare urruneko aginte zerbitzaria. -@@ -68,15 +72,14 @@ - Comment[ru]=Сервер управления KDE через инфракрасный порт. - Comment[sk]=KDE server pre infračervené vzdialené ovládanie pre Linux. - Comment[sl]=Strežnik KDE Linux za infrardeči daljninski upravljalnik --Comment[sr]=KDE-ов Linux сервер за контролу инфрацрвених даљинских управљача. [EMAIL PROTECTED] Linux server za kontrolu infracrvenih daljinskih upravljača. -+Comment[sr]=KDE-ов сервер за контролу инфрацрвених даљинских управљача у Linux-у. [EMAIL PROTECTED] server za kontrolu infracrvenih daljinskih upravljača u Linux-u. - Comment[sv]=Infraröd fjärrkontrollserver - Comment[ta]=கேடிஇ லினக்ஸ் அகச்சிவப்பு கதிர் தொலைதூர கட்டுப்பாட்டு சேவகன் - Comment[tg]=Хидматрасони идоракунии дурдасти инфрасурхи KDE Linux. - Comment[tr]=KDE Linux kızılötesi uzaktan kontrol sunucusu. - Comment[uk]=Сервер дистанційного керування інфрачервоними пристроями для Linux та KDE. - Comment[uz]=Инфрақизил нур билан масофадан бошқариш сервери --Comment[xx]=xxKDE Linux infrared remote control server.xx - Comment[zh_CN]=KDE Linux 红外远程控制服务器。 - Encoding=UTF-8 -diff -urN -x CVS kdeutils.orig/kdelirc/kcmlirc/kcmlirc.desktop kdeutils/kdelirc/kcmlirc/kcmlirc.desktop ---- kdeutils.orig/kdelirc/kcmlirc/kcmlirc.desktop 2005-01-20 05:59:55.000000000 +0100 -+++ kdeutils/kdelirc/kcmlirc/kcmlirc.desktop 2005-03-28 09:02:37.000000000 +0200 -@@ -6,6 +6,7 @@ - Comment[bg]=Настройки на дистанционно управление - Comment[bs]=Podesite vaš daljinski upravljač za upotrebu sa programima - Comment[ca]=Configura els teus controls remots per usar amb aplicacions -+Comment[cs]=Nastavení dálkových ovladačů - Comment[cy]=Ffurfweddu eich rheolyddion pell ar gyfer ddefnydd efo cymhwysiadau - Comment[da]=Indstil dine fjernbetjeninger til brug for programmer - Comment[de]=Einrichtung diverser Applikationen zur Bedienung mit einer Fernsteuerung -@@ -39,7 +40,6 @@ - Comment[tg]=Ба воситаи замимаҳо танзимкунии идоракунии дурдасти шумо - Comment[tr]=Uzaktan kontrol ayarlarınızı uygulamalarla kullanmak için ayarla - Comment[uk]=Налаштувати елементи дистанційного керування для використання з програмами --Comment[xx]=xxConfigure your remote controls for use with applicationsxx - Comment[zh_CN]=配置您的远程控制以供应用程序使用 - Exec=kcmshell kcmlirc - Keywords=KCMLirc,kcmlirc -@@ -49,7 +49,6 @@ - Keywords[pt]=kcmlirc <<Diff was trimmed, longer than 597 lines>> ---- CVS-web: http://cvs.pld-linux.org/SOURCES/kdeutils-branch.diff?r1=1.3&r2=1.4&f=u
_______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
