Hello community,
here is the log from the commit of package kdebase3-SuSE
checked in at Wed Oct 3 00:59:15 CEST 2007.
--------
--- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-09-23 11:58:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-09-26 16:12:20.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Sep 26 16:06:44 CEST 2007 - tpatzig@suse.de
+
+- kryptomedia searches now for volumes, which are not yet decrypted (#278801)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3-SuSE.spec ++++++
--- /var/tmp/diff_new_pack.d20720/_old 2007-10-03 00:58:45.000000000 +0200
+++ /var/tmp/diff_new_pack.d20720/_new 2007-10-03 00:58:45.000000000 +0200
@@ -32,7 +32,7 @@
PreReq: %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 10.3
-Release: 151
+Release: 153
Source0: kdebase-SuSE-%{version}.tar.bz2
Source2: kdebase3-SuSE-displaymanager.fillup
Source3: kdebase3-SuSE-windowmanager.fillup
@@ -205,6 +205,8 @@
/opt/kde3/%_lib/kde3/kio_sysinfo.*
/opt/kde3/share/services/sysinfo.protocol
%changelog
+* Wed Sep 26 2007 - tpatzig@suse.de
+- kryptomedia searches now for volumes, which are not yet decrypted (#278801)
* Sun Sep 23 2007 - stbinner@suse.de
- fix Kickoff showing "_Medien" instead of "Medien" (#327525)
* Fri Sep 21 2007 - dmueller@suse.de
++++++ kdebase-SuSE-10.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/decryptdialog.ui new/kdebase-SuSE/kryptomedia/decryptdialog.ui
--- old/kdebase-SuSE/kryptomedia/decryptdialog.ui 2007-01-15 11:04:04.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/decryptdialog.ui 2007-09-26 15:54:06.000000000 +0200
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>207</width>
- <height>172</height>
+ <width>268</width>
+ <height>290</height>
</rect>
</property>
<property name="sizePolicy">
@@ -23,11 +23,11 @@
<property name="caption">
<string>Decrypting Storage Device</string>
</property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
<cstring>layout5</cstring>
</property>
@@ -87,7 +87,7 @@
<property name="sizeHint">
<size>
<width>31</width>
- <height>41</height>
+ <height>30</height>
</size>
</property>
</spacer>
@@ -115,7 +115,71 @@
</widget>
</hbox>
</widget>
- <widget class="QLayoutWidget" row="1" column="0">
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>mediaBox</cstring>
+ </property>
+ <property name="title">
+ <string>Media</string>
+ </property>
+ <widget class="QListView">
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ <property name="clickable">
+ <bool>true</bool>
+ </property>
+ <property name="resizable">
+ <bool>true</bool>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Device</string>
+ </property>
+ <property name="clickable">
+ <bool>true</bool>
+ </property>
+ <property name="resizable">
+ <bool>true</bool>
+ </property>
+ </column>
+ <property name="name">
+ <cstring>mediaListView</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>15</y>
+ <width>220</width>
+ <height>56</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="paletteBackgroundColor">
+ <color>
+ <red>238</red>
+ <green>238</green>
+ <blue>238</blue>
+ </color>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <property name="allColumnsShowFocus">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QLayoutWidget">
<property name="name">
<cstring>layout4</cstring>
</property>
@@ -155,7 +219,7 @@
</widget>
</hbox>
</widget>
- <widget class="QGroupBox" row="2" column="0">
+ <widget class="QGroupBox">
<property name="name">
<cstring>errorBox</cstring>
</property>
@@ -195,7 +259,7 @@
</widget>
</grid>
</widget>
- </grid>
+ </vbox>
</widget>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/dialog.cpp new/kdebase-SuSE/kryptomedia/dialog.cpp
--- old/kdebase-SuSE/kryptomedia/dialog.cpp 2007-01-15 11:04:04.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/dialog.cpp 2007-09-26 15:54:06.000000000 +0200
@@ -27,29 +27,44 @@
Dialog *Dialog::_ctx = NULL;
-Dialog::Dialog(QString vendor, QString product, QString device, QString deviceType) :
+Dialog::Dialog(QValueVector *devices) :
KDialogBase(NULL, "Dialog", true, "Decrypt Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Decrypt"), "decrypted" ))
{
_ctx = this;
-
- mDevice = device;
+ mDevices = devices;
+ mDevice = devices->at(0)->DeviceNode;
decryptDialog = new DecryptDialog(this);
decryptDialog->errorBox->hide();
- decryptDialog->descLabel->setText(decryptDialog->descLabel->text().arg(vendor).arg(product).arg(device));
+ decryptDialog->descLabel->setText(decryptDialog->descLabel->text().arg(devices->at(0)->Vendor)
+ .arg(devices->at(0)->Product)
+ .arg(devices->at(0)->DeviceNode));
decryptDialog->descLabel->adjustSize();
- decryptDialog->adjustSize();
- setDeviceIcon( deviceType );
+
+ setDeviceIcon( devices->at(0)->DeviceType );
enableButton( User1, false );
+ if (devices->size() > 1) {
+ for (unsigned int i=0; i < devices->size(); i++) {
+ QListViewItem *tmp = new QListViewItem(decryptDialog->mediaListView, devices->at(i)->Vendor + devices->at(i)->Product,devices->at(i)->DeviceNode);
+ decryptDialog->mediaListView->insertItem(tmp);
+ }
+ decryptDialog->mediaListView->setSelected(decryptDialog->mediaListView->firstChild(), true);
+ decryptDialog->mediaListView->setCurrentItem(decryptDialog->mediaListView->firstChild());
+ setCurrentDevice(decryptDialog->mediaListView->firstChild());
+ connect(decryptDialog->mediaListView, SIGNAL (selectionChanged(QListViewItem*)), SLOT (setCurrentDevice(QListViewItem*)));
+ } else
+ decryptDialog->mediaBox->hide();
connect(decryptDialog->passwordEdit, SIGNAL (textChanged(const QString &)), this, SLOT (slotPasswordChanged(const QString &)));
setMainWidget(decryptDialog);
+ decryptDialog->mediaListView->header()->hide();
+ decryptDialog->adjustSize();
}
Dialog::~Dialog()
@@ -57,6 +72,26 @@
delete decryptDialog;
}
+void Dialog::setCurrentDevice(QListViewItem* cur)
+{
+ QString devNode = cur->text(1);
+ for (unsigned int i=0; i <= mDevices->size(); i++) {
+ if (mDevices->at(i)->DeviceNode == devNode) {
+ decryptDialog->descLabel->setText(tr2i18n( "<p><b>%1 %2</b> (<b>%3</b>) is an encrypted storage device.</p>\n"
+ "<p>Please enter the password to decrypt the storage device.</p>" )
+ .arg(mDevices->at(i)->Vendor)
+ .arg(mDevices->at(i)->Product)
+ .arg(mDevices->at(i)->DeviceNode));
+ setDeviceIcon( mDevices->at(i)->DeviceType );
+ mDevice = mDevices->at(i)->DeviceNode;
+ emit udiChanged(mDevices->at(i)->UDI);
+ break;
+ }
+ }
+
+}
+
+
void Dialog::setDeviceIcon(QString deviceType)
{
QString deviceIcon;
@@ -100,9 +135,9 @@
decryptDialog->errorLabel->setText(QString("<b>%1</b>").arg(error));
decryptDialog->errorBox->show();
-// decryptDialog->adjustSize();
-// decryptDialog->errorBox->adjustSize();
-
+ adjustSize();
+ decryptDialog->errorBox->adjustSize();
+ resize(width(),height() + 2);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/dialog.h new/kdebase-SuSE/kryptomedia/dialog.h
--- old/kdebase-SuSE/kryptomedia/dialog.h 2007-01-15 11:04:04.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/dialog.h 2007-09-25 19:04:10.000000000 +0200
@@ -36,8 +36,12 @@
#include
#include
#include
+#include
+#include
+#include
#include "decryptdialog.h"
+#include "kryptomediadevice.h"
class KryptoMedia;
@@ -47,7 +51,7 @@
Q_OBJECT
public:
- Dialog(QString vendor, QString product, QString device, QString deviceType);
+ Dialog(QValueVector *devices);
~Dialog();
QString getPassword();
@@ -55,6 +59,7 @@
public slots:
void slotDialogError(QString errorName, QString errorMsg);
void slotPasswordChanged(const QString &text);
+ void setCurrentDevice(QListViewItem* cur);
private:
@@ -64,6 +69,11 @@
static Dialog *_ctx;
QString mDevice;
+ QValueVector *mDevices;
+
+signals:
+ void udiChanged(QString&);
+
};
#endif // DIALOG_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/kryptomedia.cpp new/kdebase-SuSE/kryptomedia/kryptomedia.cpp
--- old/kdebase-SuSE/kryptomedia/kryptomedia.cpp 2007-01-15 11:04:04.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/kryptomedia.cpp 2007-09-26 15:54:06.000000000 +0200
@@ -27,44 +27,34 @@
KryptoMedia *KryptoMedia::_ctx = NULL;
-KryptoMedia::KryptoMedia(const QString &udi) :
- KApplication(), mUDI(udi)
+KryptoMedia::KryptoMedia(const QString &udi) : mUDI(udi)
{
_ctx = this;
- if (!initDBus())
- goto error;
-
- if (!initHAL())
- goto error;
-
- mUDIparent = getHalPropertyString(mUDI, "info.parent");
- mProduct = getHalPropertyString(mUDIparent, "info.product");
- mVendor = getHalPropertyString(mUDIparent, "info.vendor");
- mDeviceNode = getHalPropertyString(mUDI, "block.device");
- mDeviceType = getHalPropertyString(mUDIparent, "storage.drive_type");
-
- dialog = new Dialog(mVendor, mProduct, mDeviceNode, mDeviceType);
- dialog->show();
+ if (!(initDBus() && initHAL())) {
+ kdDebug() << __func__ << "Init of HAL or DBus failed." << endl;
+ return;
+ }
+ QStringList devs;
+ if (udi.isEmpty()) {
+ devs = getDevicesNeedDecrypt();
+ if (devs.size() < 1) {
+ KMessageBox::information(NULL,i18n("No Device found, which needs to be decrypted."));
+ exit(0);
+ }
+ } else
+ devs.append(mUDI);
- connect(dialog, SIGNAL (user1Clicked()), this, SLOT (slotSendPassword()));
- connect(dialog, SIGNAL (cancelClicked()), this, SLOT (slotCancel()));
-
-// connect(this, SIGNAL (signalDecrypted()), dialog, SLOT (slotDialogDecrypted()));
- connect(this, SIGNAL (signalPasswordError(QString, QString)), dialog, SLOT (slotDialogError(QString, QString)));
-
- return;
-error:
- kdDebug() << __func__ << "Init of HAL or DBus failed." << endl;
- return;
+ initUi(devs);
}
KryptoMedia::~KryptoMedia()
{
kdDebug() << __func__ << "()" << endl;
-
+ if (devices)
+ delete devices;
deinitHAL();
}
@@ -90,6 +80,41 @@
return true;
}
+void KryptoMedia::initUi(QStringList &mUDIs)
+{
+ devices = new QValueVector;
+ for (unsigned int i=0;i < mUDIs.size(); i++) {
+ mUDI = *(mUDIs.at(i));
+ mUDIparent = getHalPropertyString(mUDI, "info.parent");
+ mProduct = getHalPropertyString(mUDIparent, "info.product");
+ mVendor = getHalPropertyString(mUDIparent, "info.vendor");
+ mDeviceNode = getHalPropertyString(mUDI, "block.device");
+ mDeviceType = getHalPropertyString(mUDIparent, "storage.drive_type");
+
+ KryptoMediaDevice *tmp = new KryptoMediaDevice(mVendor,mProduct,mDeviceNode,mDeviceType,mUDI);
+ devices->push_back(tmp);
+ }
+
+ dialog = new Dialog(devices);
+ dialog->show();
+
+ connect(dialog, SIGNAL (udiChanged(QString&)), SLOT (setNewUDI(QString&)));
+
+ connect(dialog, SIGNAL (user1Clicked()), this, SLOT (slotSendPassword()));
+ connect(dialog, SIGNAL (cancelClicked()), this, SLOT (slotCancel()));
+
+ // connect(this, SIGNAL (signalDecrypted()), dialog, SLOT (slotDialogDecrypted()));
+ connect(this, SIGNAL (signalPasswordError(QString, QString)), dialog, SLOT (slotDialogError(QString, QString)));
+
+}
+
+void KryptoMedia::setNewUDI(QString &udi)
+{
+
+ mUDI = udi;
+
+}
+
void KryptoMedia::deinitDBus()
{
kdDebug() << __func__ << endl;
@@ -163,6 +188,28 @@
return value;
}
+QStringList KryptoMedia::getDevicesNeedDecrypt()
+{
+// kdDebug() << __func__ << "(" << udi << ", " << prop << ")" << endl;
+
+ QStringList devList;
+
+ int num, dm_num;
+ char **dmList = 0;
+ char **blockList = libhal_manager_find_device_string_match(mHALctx, "volume.fstype","crypto_LUKS",&num,NULL);
+ for (int i=0; i < num; i++) {
+ dmList = libhal_manager_find_device_string_match(mHALctx, "volume.crypto_luks.clear.backing_volume",blockList[i],&dm_num,NULL);
+ if (dm_num == 0)
+ devList.append(blockList[i]);
+ }
+ if (blockList != NULL)
+ libhal_free_string_array (blockList);
+ if (dmList != NULL)
+ libhal_free_string_array (dmList);
+
+
+ return devList;
+}
/*
void KryptoMedia::slotSendPassword()
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/kryptomediadevice.h new/kdebase-SuSE/kryptomedia/kryptomediadevice.h
--- old/kdebase-SuSE/kryptomedia/kryptomediadevice.h 1970-01-01 01:00:00.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/kryptomediadevice.h 2007-09-25 19:04:10.000000000 +0200
@@ -0,0 +1,47 @@
+/*
+ *
+ * kryptomedia- Another KDE cryto media application.
+ *
+ * Copyright (C) 2007 Tom Patzig
+ *
+ *
+ * This file is part of kryptomedia.
+ *
+ * kbluetooth 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.
+ *
+ * libkbluetooth 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 libkbluetooth; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifndef KRYPTOMEDIADEVICE_H_
+#define KRYPTOMEDIADEVICE_H_
+
+#include
+
+class KryptoMediaDevice
+{
+ public:
+
+ KryptoMediaDevice(QString &mVendor, QString &mProduct, QString &mDeviceNode, QString &mDeviceType, QString &mUDI)
+ : Vendor(mVendor), Product(mProduct), DeviceNode(mDeviceNode), DeviceType(mDeviceType),
+ UDI(mUDI) {};
+
+ QString Vendor;
+ QString Product;
+ QString DeviceNode;
+ QString DeviceType;
+ QString UDI;
+
+};
+#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/kryptomedia.h new/kdebase-SuSE/kryptomedia/kryptomedia.h
--- old/kdebase-SuSE/kryptomedia/kryptomedia.h 2007-01-15 11:04:04.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/kryptomedia.h 2007-09-26 15:54:06.000000000 +0200
@@ -32,16 +32,18 @@
#include
#include
#include
+#include
#include
#include
#include
#include "dialog.h"
+#include "kryptomediadevice.h"
class Dialog;
-class KryptoMedia : public KApplication
+class KryptoMedia : public QWidget
{
Q_OBJECT
@@ -49,10 +51,12 @@
public:
KryptoMedia(const QString &udi);
~KryptoMedia();
+ QStringList getDevicesNeedDecrypt();
public slots:
void slotSendPassword();
void slotCancel();
+ void setNewUDI(QString&);
signals:
@@ -80,6 +84,8 @@
QString mProduct;
QString mDeviceNode;
QString mDeviceType;
+ void initUi(QStringList&);
+ QValueVector *devices;
static KryptoMedia *_ctx;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/kryptomedia/main.cpp new/kdebase-SuSE/kryptomedia/main.cpp
--- old/kdebase-SuSE/kryptomedia/main.cpp 2007-01-16 12:01:19.000000000 +0100
+++ new/kdebase-SuSE/kryptomedia/main.cpp 2007-09-26 15:54:06.000000000 +0200
@@ -23,12 +23,10 @@
*
*/
-#include
#include
#include
#include
#include
-
#include "kryptomedia.h"
#define VERSION "0.01"
@@ -48,13 +46,18 @@
KCmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions( options );
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
+ KApplication a;
+
if (args->count() < 1) {
- KCmdLineArgs::usage();
- // exit got called()
+ KryptoMedia c("");
+ a.setMainWidget(&c);
+ return a.exec();
+ } else {
+ KryptoMedia c(args->arg(0));
+ a.setMainWidget(&c);
+ return a.exec();
}
- KryptoMedia a(args->arg(0));
- return a.exec();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/krpmview/fr.po new/kdebase-SuSE/po/krpmview/fr.po
--- old/kdebase-SuSE/po/krpmview/fr.po 2007-09-23 11:46:20.000000000 +0200
+++ new/kdebase-SuSE/po/krpmview/fr.po 2007-09-26 16:05:28.000000000 +0200
@@ -7,8 +7,8 @@
"Project-Id-Version: krpmview\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-07-20 11:57+0200\n"
-"PO-Revision-Date: 2005-03-14 13:18+0100\n"
-"Last-Translator: Novell Language \n"
+"PO-Revision-Date: 2007-09-25 15:11+0100\n"
+"Last-Translator: Guillaume GARDET \n"
"Language-Team: Novell Language \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,8 @@
msgstr "Description"
#: krpmview.cpp:84
-#, fuzzy
msgid "Technical Data"
-msgstr "Détails techniques"
+msgstr "Données techniques"
# TLABEL packages_2002_03_14_2340__36
#: krpmview.cpp:85
@@ -47,20 +46,17 @@
msgstr "Changelog"
#: krpmview.cpp:235
-#, fuzzy
msgid "License: %1\n"
-msgstr "Système de fichiers : %1"
+msgstr "Licence : %1\n"
# TLABEL partitioning_2002_01_04_0147__409
#: krpmview.cpp:238
-#, fuzzy
msgid "RPM group: %1\n"
-msgstr "Groupe PFS :"
+msgstr "Groupe RPM : %1\n"
#: krpmview.cpp:241
-#, fuzzy
msgid "Distribution: %1\n"
-msgstr "Description : "
+msgstr "Distribution: %1\n"
#: krpmview.cpp:244
#, fuzzy
@@ -70,7 +66,7 @@
#: krpmview.cpp:247
#, fuzzy
msgid "Vendor: %1\n"
-msgstr "Fabricant : %s"
+msgstr "Fabricant : %1\n"
#: krpmview.cpp:253
#, fuzzy
@@ -84,9 +80,8 @@
# TLABEL storage_2002_08_07_0216__50
#: krpmview.cpp:262
-#, fuzzy
msgid "Size: %1\n"
-msgstr "Taille : %s"
+msgstr "Taille : %1\n"
#: krpmview.cpp:265
#, fuzzy
@@ -152,3 +147,4 @@
#: krpmview.cpp:340
msgid "Current Maintainer"
msgstr "Mainteneur actuel"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/de.po new/kdebase-SuSE/po/SUSEgreeter/de.po
--- old/kdebase-SuSE/po/SUSEgreeter/de.po 2007-09-23 11:46:20.000000000 +0200
+++ new/kdebase-SuSE/po/SUSEgreeter/de.po 2007-09-26 16:05:28.000000000 +0200
@@ -102,9 +102,8 @@
#~ msgid "Register Now to Access Your Free Installation Support"
#~ msgstr "Registrieren Sie sich nun für kostenlosen Installations-Support"
-#, fuzzy
#~ msgid "If you have purchased a physical box of openSUSE 10.3, you have access to free installation support. For full access to the openSUSE installation support, register now at:"
-#~ msgstr "Wenn Sie eine Version von openSUSE 10.2 im Karton erworben haben, erhalten Sie kostenlosen Installations-Support. Registrieren Sie sich dafür jetzt unter:"
+#~ msgstr "Wenn Sie eine Version von openSUSE 10.3 im Karton erworben haben, erhalten Sie kostenlosen Installations-Support. Registrieren Sie sich dafür jetzt unter:"
#~ msgid "The portal provides you access to your free installation support, important information, and access to additional services that support your copy of openSUSE. Your support registration code can be found on your media cover."
#~ msgstr "Über das Portal erhalten Sie Zugang zum kostenlosen Installations-Support sowie zu wichtigen Informationen und zusätzlichen Diensten speziell für Ihre Version von openSUSE. Den Registrierungscode für den Support finden Sie auf der Datenträgerhülle."
@@ -127,6 +126,5 @@
#~ msgid "Welcome to openSUSE Beta"
#~ msgstr "Willkommen bei der openSUSE-Betaversion"
-#, fuzzy
#~ msgid "In the final version of openSUSE 10.3, this is where you'll register for support. Because we don't provide formal technical support for test builds of openSUSE, we will simply thank you for your support and participation in the openSUSE community. As you use this development version, you will encounter things that don't work correctly. Please let us know what you discover that we should fix by submitting a bug in our bugzilla database. To learn how you can participate more fully in the openSUSE community, please visit opensuse.org."
-#~ msgstr "In der endgültigen Version von openSUSE 10.2 registrieren Sie sich hier für den Support. Da wir keinen formalen technischen Support für Testversionen von openSUSE zur Verfügung stellen, möchten wir Ihnen für Ihre Unterstützung und Teilnahme an der openSUSE-Community danken. In dieser Entwicklungsversion werden Ihnen einige Dinge auffallen, die nicht richtig funktionieren. Bitte melden Sie uns Fehler, die wir beheben sollten, in unserer bugzilla-Datenbank. Informationen zu einer noch umfassenderen Teilnahme an der openSUSE-Community erhalten Sie auf opensuse.org."
+#~ msgstr "In der endgültigen Version von openSUSE 10.3 registrieren Sie sich hier für den Support. Da wir keinen formalen technischen Support für Testversionen von openSUSE zur Verfügung stellen, möchten wir Ihnen für Ihre Unterstützung und Teilnahme an der openSUSE-Community danken. In dieser Entwicklungsversion werden Ihnen einige Dinge auffallen, die nicht richtig funktionieren. Bitte melden Sie uns Fehler, die wir beheben sollten, in unserer bugzilla-Datenbank. Informationen zu einer noch umfassenderen Teilnahme an der openSUSE-Community erhalten Sie auf opensuse.org."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/SUSEgreeter/hu.po new/kdebase-SuSE/po/SUSEgreeter/hu.po
--- old/kdebase-SuSE/po/SUSEgreeter/hu.po 2007-09-23 11:46:20.000000000 +0200
+++ new/kdebase-SuSE/po/SUSEgreeter/hu.po 2007-09-26 16:05:28.000000000 +0200
@@ -11,10 +11,10 @@
# Kalman Kemenczy , 2006, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: SUSEgreeter.hu.new\n"
+"Project-Id-Version: SUSEgreeter\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-02 18:26+0200\n"
-"PO-Revision-Date: 2007-08-03 08:58+0200\n"
+"PO-Revision-Date: 2007-09-25 10:35+0200\n"
"Last-Translator: Kalman Kemenczy \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -100,7 +100,7 @@
"Service</a> egy nyílt és átfogó disztribúciófejlesztő platform, amely "
"segítséget nyújt a fejlesztők számára a szoftverek fordításában, kiadásában "
"és széles körben történő publikálásában. A felhasználók számára pedig egy "
-"hatalmas, könnyen telepíthető csomagtárat biztosít. Látogassa meg a <a "
+"hatalmas, könnyen telepíthető csomagtárat biztosít. Látogassa meg az <a "
"href=\"http://software.opensuse.org/\">openSUSE szoftveroldalt</a>."
#: greet.xml:19(title)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/fr.po new/kdebase-SuSE/po/susetranslations/fr.po
--- old/kdebase-SuSE/po/susetranslations/fr.po 2007-09-23 11:46:21.000000000 +0200
+++ new/kdebase-SuSE/po/susetranslations/fr.po 2007-09-26 16:05:29.000000000 +0200
@@ -1,25 +1,25 @@
# translation of susetranslations.po to
# This file is put in the public domain.
# Patricia Vaz , 2005.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: susetranslations\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-07-20 15:59+0200\n"
-"PO-Revision-Date: 2005-03-14 13:11+0100\n"
-"Last-Translator: Novell Language \n"
-"Language-Team: Novell Language \n"
+"PO-Revision-Date: 2007-09-25 14:43+0100\n"
+"Last-Translator: Guillaume GARDET \n"
+"Language-Team: French Team \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9\n"
#: china.cpp:2
msgid "Country or region:"
msgstr "Pays ou région :"
-#: china.cpp:3 china.cpp:13
+#: china.cpp:3
+#: china.cpp:13
msgid "Here you can choose your country or region. The settings for languages, numbers etc. will automatically switch to the corresponding values."
msgstr "Choisissez ici votre pays ou région. Les paramètres de langue, nombres, etc. prennent alors automatiquement les valeurs correspondantes."
@@ -45,20 +45,23 @@
msgid "This is where you live. KDE will use the defaults for this country or region."
msgstr "Vous habitez ici. KDE utilise les valeurs par défaut de ce pays ou cette région."
-#: dirfilter.cpp:1 kdeaddons3.spec.cpp:3
+#: dirfilter.cpp:1
+#: kdeaddons3.spec.cpp:3
msgid "Filter This Folder"
msgstr "Filtrer ce dossier"
-#: dirfilter.cpp:2 kdeaddons3.spec.cpp:7 kdebase3.spec.cpp:310
+#: dirfilter.cpp:2
+#: kdeaddons3.spec.cpp:7
+#: kdebase3.spec.cpp:310
msgid "Search Index"
msgstr "Rechercher dans l'index"
-#: dirfilter.cpp:3 kdeaddons3.spec.cpp:10
+#: dirfilter.cpp:3
+#: kdeaddons3.spec.cpp:10
msgid "Enter here a text which shall be searched on the whole system in the Beagle index."
msgstr "Saisissez ici le texte qui sera recherché dans tout l'index Beagle."
#: kaffeine.spec.cpp:2
-#, fuzzy
msgid ""
"This version of Xine (used by Kaffeine) has only a reduced\n"
"set of supported codecs. It is not able to play DVDs.\n"
@@ -66,7 +69,7 @@
msgstr ""
"Cette version de Xine (utilisé par Kaffeine) ne\n"
"possède qu'un jeu limité de codecs pris en charge. Elle n'est pas capable\n"
-"de lire des DVD. Pour plus de détails, consultez la page http://portal.suse.com/sdb/en/2003/09/xine_dvd.html."
+"de lire des DVD. Consultez la page http://fr.opensuse.org/XINE pour plus de détails."
#: kaffeine.spec.cpp:5
msgid "No WIN32 codecs found in /usr/lib/win32. You're not able to play Windows Media 9 files, newer Real Media files and some less common formats."
@@ -88,20 +91,24 @@
msgid "Application ready"
msgstr "Application prête"
-#: kdeaddons3.spec.cpp:13 searchbar.cpp:1
+#: kdeaddons3.spec.cpp:13
+#: searchbar.cpp:1
msgid "Use Google Suggest"
msgstr "Utiliser les suggestions de Google"
-#: kdeaddons3.spec.cpp:16 searchbar.cpp:2
+#: kdeaddons3.spec.cpp:16
+#: searchbar.cpp:2
msgid "For Google Only"
msgstr "Pour Google uniquement"
-#: kdeaddons3.spec.cpp:19 searchbar.cpp:3
+#: kdeaddons3.spec.cpp:19
+#: searchbar.cpp:3
msgid "For All Searches"
msgstr "Pour toutes les recherches"
# TLABEL kinternet_2002_02_20_2255__70
-#: kdeaddons3.spec.cpp:22 searchbar.cpp:4
+#: kdeaddons3.spec.cpp:22
+#: searchbar.cpp:4
msgid "Never"
msgstr "Jamais"
@@ -119,11 +126,11 @@
#: kdebase3.spec.cpp:11
msgid "Change settings only for current session"
-msgstr ""
+msgstr "Chnager les paramètres uniquement pour la session actuelle"
#: kdebase3.spec.cpp:14
msgid "If this option is enabled the size and orientation settings will be only changed for the current session."
-msgstr ""
+msgstr "Si cette option est activée, les paramètres de taille et d'orientation seront modifiées uniquement pour la session actuelle."
#: kdebase3.spec.cpp:17
msgid "Please enter the Administrator (root) password to continue."
@@ -349,7 +356,7 @@
#: kdebase3.spec.cpp:202
#, fuzzy
msgid "&Alternate Button Order"
-msgstr "Boutons d'alerte"
+msgstr "&Alternate Button Order"
#: kdebase3.spec.cpp:209
#, c-format
@@ -552,9 +559,8 @@
msgstr "Éteindre l'ordinateur"
#: kdebase3.spec.cpp:362
-#, fuzzy
msgid "Restart and boot the default system"
-msgstr "Redémarrer et amorcer ce système"
+msgstr "Redémarrer et amorcer le système par défaut"
#: kdebase3.spec.cpp:365
msgid "Start Operating System"
@@ -851,91 +857,113 @@
msgid "Unable to start ksplashx."
msgstr "Impossible de lancer ksplashx."
-#: kdebase3.spec.cpp:583 xinerama.cpp:1
+#: kdebase3.spec.cpp:583
+#: xinerama.cpp:1
msgid "S&eparate screen focus"
msgstr "&Focus d'écran distinct"
-#: kdebase3.spec.cpp:586 xinerama.cpp:2
+#: kdebase3.spec.cpp:586
+#: xinerama.cpp:2
msgid "When this option is enabled, focus operations are limited only to the active Xinerama screen"
msgstr "Lorsque cette option est activée, les opérations de focus se limitent à l'écran Xinerama actif"
-#: kdebase3.spec.cpp:589 xinerama.cpp:3
+#: kdebase3.spec.cpp:589
+#: xinerama.cpp:3
msgid "Active &mouse screen"
msgstr "Écran de la &souris actif"
-#: kdebase3.spec.cpp:592 xinerama.cpp:4
+#: kdebase3.spec.cpp:592
+#: xinerama.cpp:4
msgid "When this option is enabled, active Xinerama screen (where for example new windows appear) is the screen with the mouse pointer. When disabled, the active Xinerama screen is the screen with the focused window. This option is by default disabled for Click to focus and enabled for other focus policies."
msgstr "Lorsque cette option est activée, l'écran Xinerama actif (où les nouvelles fenêtres s'affichent, par exemple) est celui où se trouve le pointeur de la souris. Lorsqu'elle est désactivée, l'écran Xinerama actif est celui où se trouve la fenêtre faisant l'objet du focus. Cette option est par défaut désactivée pour Cliquer pour obtenir le focus et activée pour les quatre autre stratégies de focus."
-#: kdebase3.spec.cpp:595 xinerama.cpp:8
+#: kdebase3.spec.cpp:595
+#: xinerama.cpp:8
msgid "Window to Screen 0"
msgstr "Fenêtre à écran 0"
-#: kdebase3.spec.cpp:598 xinerama.cpp:9
+#: kdebase3.spec.cpp:598
+#: xinerama.cpp:9
msgid "Window to Screen 1"
msgstr "Fenêtre à écran 1"
-#: kdebase3.spec.cpp:601 xinerama.cpp:10
+#: kdebase3.spec.cpp:601
+#: xinerama.cpp:10
msgid "Window to Screen 2"
msgstr "Fenêtre à écran 2"
-#: kdebase3.spec.cpp:604 xinerama.cpp:11
+#: kdebase3.spec.cpp:604
+#: xinerama.cpp:11
msgid "Window to Screen 3"
msgstr "Fenêtre à écran 3"
-#: kdebase3.spec.cpp:607 xinerama.cpp:12
+#: kdebase3.spec.cpp:607
+#: xinerama.cpp:12
msgid "Window to Screen 4"
msgstr "Fenêtre à écran 4"
-#: kdebase3.spec.cpp:610 xinerama.cpp:13
+#: kdebase3.spec.cpp:610
+#: xinerama.cpp:13
msgid "Window to Screen 5"
msgstr "Fenêtre à écran 5"
-#: kdebase3.spec.cpp:613 xinerama.cpp:14
+#: kdebase3.spec.cpp:613
+#: xinerama.cpp:14
msgid "Window to Screen 6"
msgstr "Fenêtre à écran 6"
-#: kdebase3.spec.cpp:616 xinerama.cpp:15
+#: kdebase3.spec.cpp:616
+#: xinerama.cpp:15
msgid "Window to Screen 7"
msgstr "Fenêtre à écran 7"
-#: kdebase3.spec.cpp:619 xinerama.cpp:16
+#: kdebase3.spec.cpp:619
+#: xinerama.cpp:16
msgid "Window to Next Screen"
msgstr "Fenêtre à écran suivant"
-#: kdebase3.spec.cpp:622 xinerama.cpp:17
+#: kdebase3.spec.cpp:622
+#: xinerama.cpp:17
msgid "Switch to Screen 0"
msgstr "Passer à l'écran 0"
-#: kdebase3.spec.cpp:625 xinerama.cpp:18
+#: kdebase3.spec.cpp:625
+#: xinerama.cpp:18
msgid "Switch to Screen 1"
msgstr "Passer à l'écran 1"
-#: kdebase3.spec.cpp:628 xinerama.cpp:19
+#: kdebase3.spec.cpp:628
+#: xinerama.cpp:19
msgid "Switch to Screen 2"
msgstr "Passer à l'écran 2"
-#: kdebase3.spec.cpp:631 xinerama.cpp:20
+#: kdebase3.spec.cpp:631
+#: xinerama.cpp:20
msgid "Switch to Screen 3"
msgstr "Passer à l'écran 3"
-#: kdebase3.spec.cpp:634 xinerama.cpp:21
+#: kdebase3.spec.cpp:634
+#: xinerama.cpp:21
msgid "Switch to Screen 4"
msgstr "Passer à l'écran 4"
-#: kdebase3.spec.cpp:637 xinerama.cpp:22
+#: kdebase3.spec.cpp:637
+#: xinerama.cpp:22
msgid "Switch to Screen 5"
msgstr "Passer à l'écran 5"
-#: kdebase3.spec.cpp:640 xinerama.cpp:23
+#: kdebase3.spec.cpp:640
+#: xinerama.cpp:23
msgid "Switch to Screen 6"
msgstr "Passer à l'écran 6"
-#: kdebase3.spec.cpp:643 xinerama.cpp:24
+#: kdebase3.spec.cpp:643
+#: xinerama.cpp:24
msgid "Switch to Screen 7"
msgstr "Passer à l'écran 7"
-#: kdebase3.spec.cpp:646 xinerama.cpp:25
+#: kdebase3.spec.cpp:646
+#: xinerama.cpp:25
msgid "Switch to Next Screen"
msgstr "Passer à l'écran suivant"
@@ -943,11 +971,11 @@
#: kdebase3.spec.cpp:649
#, fuzzy
msgid "Start menu style:"
-msgstr "Démarrer le système de secours"
+msgstr "Style du menu démarrer :"
#: kdebase3.spec.cpp:652
msgid "SUSE"
-msgstr ""
+msgstr "SUSE"
#: kdebase3.spec.cpp:655
msgid "KDE"
@@ -955,17 +983,16 @@
#: kdebase3.spec.cpp:658
msgid "Open menu on mouse hover"
-msgstr ""
+msgstr "Ouverture du menu lorsque la souris passe au dessus"
# TLABEL autoinst_2002_08_07_0216__165
#: kdebase3.spec.cpp:661
-#, fuzzy
msgid "Name (&Description)"
-msgstr "&Description du profil"
+msgstr "Nom (&Description)"
#: kdebase3.spec.cpp:664
msgid "When this option is selected, items in the K Menu will appear with the application's name and a brief description in brackets next to the icon."
-msgstr ""
+msgstr "Lorsque cette option est sélectionnée, les élements du menu K apparaissent avec le nom de l'application et une brève description entre parenthèses à coté de l'icone."
#: kdebase3.spec.cpp:667
msgid "Alt+I"
@@ -1009,8 +1036,9 @@
msgstr "Utilisateur <b>utilisateur</b> sur <b>hôte</b>"
#: kdebase3.spec.cpp:697
+#, fuzzy
msgid "KMenuItemBase"
-msgstr ""
+msgstr "KMenuItemBase"
#: kdebase3.spec.cpp:700
msgid "Would you like to shutdown your computer?"
@@ -1033,26 +1061,22 @@
msgstr "Conversion vers KDEMM"
#: kdelibs3.spec.cpp:6
-#, fuzzy
msgid "&Edit History..."
-msgstr "Modifier la liste noire..."
+msgstr "&Éditer l'historique..."
#: kdelibs3.spec.cpp:9
-#, fuzzy
msgid "History Editor"
-msgstr "Éditeur de texte"
+msgstr "Éditeur d'historique"
#: kdelibs3.spec.cpp:12
-#, fuzzy
msgid "&Delete Entry"
-msgstr "_Effacer un Evènement"
+msgstr "&Supprimer l'entrée"
#: kdelibs3.spec.cpp:15
msgid "This dialog allows you to delete unwanted history items."
-msgstr ""
+msgstr "Cette fenêtre vous permet de supprimer les élements indésirables de l'historique."
#: kdelibs3.spec.cpp:18
-#, fuzzy
msgid "Clear Search"
msgstr "Effacer la recherche"
@@ -1060,11 +1084,13 @@
msgid "&Search:"
msgstr "&Rechercher :"
-#: kdelibs3.spec.cpp:24 kfile-beagle.cpp:2
+#: kdelibs3.spec.cpp:24
+#: kfile-beagle.cpp:2
msgid "search term"
msgstr "rechercher le terme"
-#: kdelibs3.spec.cpp:27 kfile-beagle.cpp:1
+#: kdelibs3.spec.cpp:27
+#: kfile-beagle.cpp:1
msgid "Desktop Search"
msgstr "Moteur de recherche de bureau"
@@ -1077,21 +1103,21 @@
"Mode hors connexion activé."
#: kdepim3.spec.cpp:2
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot open audio file:\n"
"%1"
-msgstr "Impossible d'ouvrir le fichier %1."
+msgstr ""
+"Impossible d'ouvrir le fichier audio :\n"
+"%1"
#: kdepim3.spec.cpp:5
-#, fuzzy
msgid "Stop sound"
-msgstr "Aucun son"
+msgstr "Couper le son"
#: kdepim3.spec.cpp:8
-#, fuzzy
msgid "Stop playing the sound"
-msgstr "_Passer au morceau en cours de lecture"
+msgstr "Arrêter la lecture du son"
#: kdepim3.spec.cpp:11
msgid "<qt><p>KMail does not support attaching files bigger than 30 MB.</p>"
@@ -1099,11 +1125,11 @@
#: kdepim3.spec.cpp:14
msgid "KMail is now offline; all network operations cancelled"
-msgstr ""
+msgstr "KMail est maintenant déconnecté. Toutes les opérations réseau ont été annulées"
#: kdepim3.spec.cpp:17
msgid "KMail is now online; network operations resumed"
-msgstr ""
+msgstr "KMail est maintenant connecté. Toutes les opérations réseau sont reprises"
#: mediamanager.cpp:1
msgid "Access time updates"
@@ -1341,57 +1367,79 @@
" <h3><b>Mode mixte</b></h3>\n"
" Affiche le nom court en l'état. Stocke un nom long si le nom court n'est pas entièrement en haut de casse."
-#: qt3-devel-doc.spec.cpp:2 qt3-extensions.spec.cpp:2 qt3-static.spec.cpp:2
+#: qt3-devel-doc.spec.cpp:2
+#: qt3-extensions.spec.cpp:2
+#: qt3-static.spec.cpp:2
#: qt3.spec.cpp:2
msgid "Select Input &Method"
msgstr "Sélectionner la &méthode de saisie"
-#: qt3-devel-doc.spec.cpp:5 qt3-extensions.spec.cpp:5 qt3-static.spec.cpp:5
+#: qt3-devel-doc.spec.cpp:5
+#: qt3-extensions.spec.cpp:5
+#: qt3-static.spec.cpp:5
#: qt3.spec.cpp:5
msgid "Multiple Input Method Switcher"
msgstr "Commutateur multiple de méthode de saisie"
-#: qt3-devel-doc.spec.cpp:8 qt3-extensions.spec.cpp:8 qt3-static.spec.cpp:8
+#: qt3-devel-doc.spec.cpp:8
+#: qt3-extensions.spec.cpp:8
+#: qt3-static.spec.cpp:8
#: qt3.spec.cpp:8
msgid "Multiple input method switcher that uses the context menu of the text widgets"
msgstr "Commutateur multiple de méthode de saisie qui utilise le menu contextuel des widgets texte"
-#: qt3-devel-doc.spec.cpp:11 qt3-extensions.spec.cpp:11 qt3-static.spec.cpp:11
+#: qt3-devel-doc.spec.cpp:11
+#: qt3-extensions.spec.cpp:11
+#: qt3-static.spec.cpp:11
#: qt3.spec.cpp:11
msgid "Dummy Input Method Switcher"
msgstr "Commutateur de méthode de saisie fictif"
-#: qt3-devel-doc.spec.cpp:14 qt3-extensions.spec.cpp:14 qt3-static.spec.cpp:14
+#: qt3-devel-doc.spec.cpp:14
+#: qt3-extensions.spec.cpp:14
+#: qt3-static.spec.cpp:14
#: qt3.spec.cpp:14
msgid "Dummy input method switcher that uses the context menu of the text widgets"
msgstr "Commutateur de méthode de saisie fictif qui utilise le menu contextuel des widgets texte"
-#: qt3-devel-doc.spec.cpp:17 qt3-extensions.spec.cpp:17 qt3-static.spec.cpp:17
+#: qt3-devel-doc.spec.cpp:17
+#: qt3-extensions.spec.cpp:17
+#: qt3-static.spec.cpp:17
#: qt3.spec.cpp:17
msgid "Simple Composing Input Method"
msgstr "Méthode de saisie avec composition simple"
-#: qt3-devel-doc.spec.cpp:20 qt3-extensions.spec.cpp:20 qt3-static.spec.cpp:20
+#: qt3-devel-doc.spec.cpp:20
+#: qt3-extensions.spec.cpp:20
+#: qt3-static.spec.cpp:20
#: qt3.spec.cpp:20
msgid "Simple composing input method"
msgstr "Méthode de saisie avec composition simple"
-#: qt3-devel-doc.spec.cpp:23 qt3-extensions.spec.cpp:23 qt3-static.spec.cpp:23
+#: qt3-devel-doc.spec.cpp:23
+#: qt3-extensions.spec.cpp:23
+#: qt3-static.spec.cpp:23
#: qt3.spec.cpp:23
msgid "XIM"
msgstr "XIM"
-#: qt3-devel-doc.spec.cpp:26 qt3-extensions.spec.cpp:26 qt3-static.spec.cpp:26
+#: qt3-devel-doc.spec.cpp:26
+#: qt3-extensions.spec.cpp:26
+#: qt3-static.spec.cpp:26
#: qt3.spec.cpp:26
msgid "XIM input method"
msgstr "Méthode de saisie XIM"
-#: qt3-devel-doc.spec.cpp:29 qt3-extensions.spec.cpp:29 qt3-static.spec.cpp:29
+#: qt3-devel-doc.spec.cpp:29
+#: qt3-extensions.spec.cpp:29
+#: qt3-static.spec.cpp:29
#: qt3.spec.cpp:29
msgid "Unknown Input Method"
msgstr "Méthode de saisie inconnue"
-#: qt3-devel-doc.spec.cpp:32 qt3-extensions.spec.cpp:32 qt3-static.spec.cpp:32
+#: qt3-devel-doc.spec.cpp:32
+#: qt3-extensions.spec.cpp:32
+#: qt3-static.spec.cpp:32
#: qt3.spec.cpp:32
msgid "Default Input Method:"
msgstr "Méthode de saisie par défaut :"
@@ -1407,33 +1455,24 @@
#, fuzzy
#~ msgid "No such medium."
#~ msgstr "Support inexistant : %1"
-
#~ msgid "Wor&k Offline"
#~ msgstr "&Travailler hors connexion"
-
#~ msgid "Could not write all link key files. Your complete changes cannot be saved."
#~ msgstr "Écriture des fichiers de clés de liens impossible. Enregistrement de vos modifications impossible."
-
#~ msgid "No Bluetooth device found, disabling interface."
#~ msgstr "Aucun périphérique Bluetooth n'a été détecté. Désactivation de l'interface."
-
#~ msgid "Here you have to specify the correct start/stop commands for BlueZ's <i>hcid</i> and the directory of the BlueZ's <i>link_key</i> files for the distribution you are using."
#~ msgstr "Spécifiez ici les commandes start/stop BlueZ <i>hcid</i> correctes et les fichiers BlueZ <i>link_key</i> pour la version que vous utilisez."
-
#~ msgid "Link key directory:"
#~ msgstr "Répertoire de clés de liens :"
-
#~ msgid "Search for personal files and applications"
#~ msgstr "Rechercher des applications et des fichiers personnels"
-
#~ msgid "System Settings"
#~ msgstr "Paramètres du système"
-
#~ msgid "YaST2"
#~ msgstr "YaST2"
-
#~ msgid "Do you really want to pause the computer without logging out?"
#~ msgstr "Voulez-vous vraiment mettre l'ordinateur en pause sans vous déloguer ?"
-
#~ msgid "Suspend Confirmation"
#~ msgstr "Confirmation de la mise en veille"
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/po/susetranslations/zh_CN.po new/kdebase-SuSE/po/susetranslations/zh_CN.po
--- old/kdebase-SuSE/po/susetranslations/zh_CN.po 2007-09-23 11:46:21.000000000 +0200
+++ new/kdebase-SuSE/po/susetranslations/zh_CN.po 2007-09-26 16:05:29.000000000 +0200
@@ -7,8 +7,8 @@
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-07-20 15:59+0200\n"
-"PO-Revision-Date: 2007-08-26 00:14+0800\n"
-"Last-Translator: Thruth Wang \n"
+"PO-Revision-Date: 2007-09-30 14:22+0800\n"
+"Last-Translator: Thruth Wang \n"
"Language-Team: Novell Language \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -130,7 +130,7 @@
#: kdebase3.spec.cpp:14
msgid "If this option is enabled the size and orientation settings will be only changed for the current session."
-msgstr ""
+msgstr "如果此项被启用,大小和 orientation 的设置将仅仅用于当前会话。"
#: kdebase3.spec.cpp:17
msgid "Please enter the Administrator (root) password to continue."
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org