Fix cardmon applet visibility (now visible is some card is plugged) and added

popup on succesfull ejection or insertion of a card.

17 files changed, 672 insertions, 70 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 9522b88..ac2aea2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -51,8 +51,8 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
              this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
 
-
     setFixedSize( pm.size() );
-    hide();
-    getStatusPcmcia();
+    getStatusPcmcia(TRUE);
+    getStatusSd(TRUE);
+    repaint(FALSE);
 }
 
@@ -66,18 +66,22 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 
     if ( cardInSd ) {
-        menu->insertItem( tr("Eject SD/ MMC card"), 0 );
+        menu->insertItem( tr("Eject SD/MMC card"), 0 );
     }
 
     if ( cardInPcmcia0 ) {
-        menu->insertItem( tr("Eject card (0) %1").arg(cardInPcmcia0Name), 1 );
+        menu->insertItem( tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
     }
 
     if ( cardInPcmcia1 ) {
-        menu->insertItem( tr("Eject card (1) %1").arg(cardInPcmcia1Name), 2 );
+        menu->insertItem( tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
     }
 
-    QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
+    QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
+    QSize s = menu->sizeHint ( );
+    int opt = menu->exec( QPoint (
+	p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
+	p. y ( ) - s. height ( ) ), 0);
 
-    if ( menu->exec( p, 1 ) == 1 ) {
+    if ( opt == 1 ) {
 
         cmd = "/sbin/cardctl eject 0";
@@ -87,6 +91,6 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 	    QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"),
 	    			  tr("&OK") );
-	}
-    } else if ( menu->exec( p, 1 ) == 0 ) {
+	} 
+    } else if ( opt == 0 ) {
         cmd = "/etc/sdcontrol compeject";
         err = system( (const char *) cmd );
@@ -95,6 +99,6 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
             QMessageBox::warning( this, tr("CardMonitor"), tr("SD/MMC card eject failed!"),
                                   tr("&OK") );
-        }
-    } else if ( menu->exec( p, 1 ) == 2 ) {
+	} 
+    } else if ( opt == 2 ) {
         cmd = "/sbin/cardctl eject 1";
         err = system( (const char *) cmd );
@@ -103,5 +107,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 	    QMessageBox::warning( this, tr("CardMonitor"), tr("CF/PCMCIA card eject failed!"),
 	    			  tr("&OK") );
-	}
+	} 
     }
 
@@ -112,8 +116,10 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
 void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
     if ( msg == "stabChanged()" ) {
+	// qDebug("Pcmcia: stabchanged");
 	if ( getStatusPcmcia() ) {
             repaint(FALSE);
         }
     } else if ( msg == "mtabChanged()" ) {
+	// qDebug("Pcmcia: mtabchanged");
         if ( getStatusSd() ) {
             repaint(FALSE);
@@ -122,5 +128,5 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
 }
 
-bool CardMonitor::getStatusPcmcia( void ) {
+bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
 
     bool cardWas0 = cardInPcmcia0; // remember last state
@@ -148,10 +154,9 @@ bool CardMonitor::getStatusPcmcia( void ) {
         for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
             if( (*line).startsWith("Socket 0:") ){
-                // extendable, maybe read out card name
                 if( (*line).startsWith("Socket 0: empty") && cardInPcmcia0  ){
                     cardInPcmcia0 = FALSE;
-                    hide();
                 } else if ( !(*line).startsWith("Socket 0: empty") && !cardInPcmcia0 ){
                     cardInPcmcia0Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 );
+		    cardInPcmcia0Name.stripWhiteSpace();
                     cardInPcmcia0 = TRUE;
                     show();
@@ -161,7 +166,7 @@ bool CardMonitor::getStatusPcmcia( void ) {
                 if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){
                     cardInPcmcia1 = FALSE;
-                    hide();
                 } else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){
                     cardInPcmcia1Name = (*line).mid(((*line).find(':')+1), (*line).length()-9  );
+		    cardInPcmcia1Name.stripWhiteSpace();
                     cardInPcmcia1 = TRUE;
                     show();
@@ -174,9 +179,31 @@ bool CardMonitor::getStatusPcmcia( void ) {
         cardInPcmcia0 = FALSE;
         cardInPcmcia1 = FALSE;
-     	hide();
 	return FALSE;
 
     }
 
+    if(!cardInPcmcia0 && !cardInPcmcia1) { 
+	qDebug("Pcmcia: no cards");
+    } 
+
+    if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
+	QString text = "";
+	if(cardWas0 != cardInPcmcia0) {
+	    if(cardInPcmcia0) { text += tr("New card: "); }
+	    else { text += tr("Ejected: "); }
+	    text += cardInPcmcia0Name;
+	}
+	if(cardWas0 != cardInPcmcia0 && cardWas1 != cardInPcmcia1) {
+	    text += "\n";
+	}
+	if(cardWas1 != cardInPcmcia1) {
+	    if(cardInPcmcia1) { text += tr("New card: "); }
+	    else { text += tr("Ejected: "); }
+	    text += cardInPcmcia1Name;
+	}
+	QMessageBox::warning( this, tr("CardMonitor"), text,
+	    			  tr("&OK") );
+    }
+
     f.close();
 
@@ -185,5 +212,5 @@ bool CardMonitor::getStatusPcmcia( void ) {
 
 
-bool CardMonitor::getStatusSd( void ) {
+bool CardMonitor::getStatusSd( int showPopUp = FALSE ) {
 
     bool cardWas=cardInSd; // remember last state
@@ -202,14 +229,13 @@ bool CardMonitor::getStatusSd( void ) {
         }
         endmntent( mntfp );
-        if (cardInSd!=cardWas) {
-            if (cardInSd) {
-                show();
-            } else {
-                hide();
-            }
-        }
-    } else {
-        hide();
     }
+    if(!showPopUp && cardWas != cardInSd) {
+	QString text = "";
+	if(cardInSd) { text += "SD Inserted"; }
+	else { text += "SD Removed"; }
+	QMessageBox::warning( this, tr("CardMonitor"), text,
+	    			  tr("&OK") );
+    }
+
 #else
 #error "Not on Linux"
@@ -223,6 +249,8 @@ void CardMonitor::paintEvent( QPaintEvent * ) {
     if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
 	p.drawPixmap( 0, 0, pm );
+	show();
     } else {
 	p.eraseRect( rect() );
+	hide();
     }
 }
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 2a90c90..f9e3819 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -28,6 +28,6 @@ public:
     CardMonitor( QWidget *parent = 0 );
     ~CardMonitor();
-    bool getStatusPcmcia( void );
-    bool getStatusSd( void );
+    bool getStatusPcmcia( int showPopUp = FALSE );
+    bool getStatusSd( int showPopUp = FALSE );
 
 private slots:
@@ -46,4 +46,5 @@ private:
     QString cardInPcmcia1Name;
     bool cardInSd;
+    void iconShow();
 
 };
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index ff3463c..e79e91a 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -10,16 +10,16 @@ LIBS            += -lqpe
 VERSION		= 1.0.0
 
-TRANSLATIONS = ../i18n/de/libcardmonapplet.ts
-TRANSLATIONS += ../i18n/es/libcardmonapplet.ts
-TRANSLATIONS += ../i18n/pt/libcardmonapplet.ts
-TRANSLATIONS += ../i18n/pt_BR/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/en/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/hu/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/sl/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/pl/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/ja/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/fr/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/ko/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/no/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/zh_CN/libcardmonapplet.ts
-TRANSLATIONS   += ../i18n/zh_TW/libcardmonapplet.ts
+TRANSLATIONS = ../../i18n/de/libcardmonapplet.ts
+TRANSLATIONS += ../../i18n/es/libcardmonapplet.ts
+TRANSLATIONS += ../../i18n/pt/libcardmonapplet.ts
+TRANSLATIONS += ../../i18n/pt_BR/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/en/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/hu/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/sl/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/pl/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/ja/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/fr/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/ko/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/no/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/zh_CN/libcardmonapplet.ts
+TRANSLATIONS   += ../../i18n/zh_TW/libcardmonapplet.ts
diff --git a/i18n/de/libcardmonapplet.ts b/i18n/de/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/de/libcardmonapplet.ts
+++ b/i18n/de/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/libcardmonapplet.ts b/i18n/en/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/en/libcardmonapplet.ts
+++ b/i18n/en/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/libcardmonapplet.ts b/i18n/es/libcardmonapplet.ts
new file mode 100644
index 0000000..4882e21
--- a/dev/null
+++ b/i18n/es/libcardmonapplet.ts
@@ -0,0 +1,53 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>CardMonitor</name>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CardMonitor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libcardmonapplet.ts b/i18n/fr/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/fr/libcardmonapplet.ts
+++ b/i18n/fr/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/libcardmonapplet.ts b/i18n/hu/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/hu/libcardmonapplet.ts
+++ b/i18n/hu/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ja/libcardmonapplet.ts b/i18n/ja/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/ja/libcardmonapplet.ts
+++ b/i18n/ja/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/ko/libcardmonapplet.ts b/i18n/ko/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/ko/libcardmonapplet.ts
+++ b/i18n/ko/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/libcardmonapplet.ts b/i18n/no/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/no/libcardmonapplet.ts
+++ b/i18n/no/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/libcardmonapplet.ts b/i18n/pl/libcardmonapplet.ts
index 89d8876..d3732e0 100644
--- a/i18n/pl/libcardmonapplet.ts
+++ b/i18n/pl/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation>Wyjmij karte</translation>
+        <translation type="obsolete">Wyjmij karte</translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation>Wyjmowanie karty nie powiodlo sie!</translation>
+        <translation type="obsolete">Wyjmowanie karty nie powiodlo sie!</translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/libcardmonapplet.ts b/i18n/pt/libcardmonapplet.ts
index edc52e8..4ec1872 100644
--- a/i18n/pt/libcardmonapplet.ts
+++ b/i18n/pt/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation>Ejectar cartão</translation>
+        <translation type="obsolete">Ejectar cartão</translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation>Falhou a ejeção do cartão!</translation>
+        <translation type="obsolete">Falhou a ejeção do cartão!</translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation>&amp;Ok</translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete">Ejectar SD/MMC</translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete">Ejectar %1 (0)</translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete">Ejectar %1 (1)</translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation>Ejecção do cartão CF/PCMCIA falhou!</translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation>Ejecção do cartão SD/MMC falhou!</translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation>Novo cartão:</translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation>Removido:</translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation>Ejectar SD/MMC</translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation>Ejectar cartão 0: %1</translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation>Ejectar cartão 1: %1</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libcardmonapplet.ts b/i18n/pt_BR/libcardmonapplet.ts
index f2aee65..38dd9b8 100644
--- a/i18n/pt_BR/libcardmonapplet.ts
+++ b/i18n/pt_BR/libcardmonapplet.ts
@@ -13,9 +13,49 @@
     <message>
         <source>Eject card</source>
-        <translation>Desativar cartão</translation>
+        <translation type="obsolete">Desativar cartão</translation>
     </message>
     <message>
         <source>Card eject failed!</source>
-        <translation>Falhou ao desativar o cartão!</translation>
+        <translation type="obsolete">Falhou ao desativar o cartão!</translation>
+    </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libcardmonapplet.ts b/i18n/sl/libcardmonapplet.ts
index 1dd8995..5dd8592 100644
--- a/i18n/sl/libcardmonapplet.ts
+++ b/i18n/sl/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation>Vstavite kartico</translation>
+        <translation type="obsolete">Vstavite kartico</translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation>Vstavitev kartice je spodletela!</translation>
+        <translation type="obsolete">Vstavitev kartice je spodletela!</translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation>&amp;Vredu</translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_CN/libcardmonapplet.ts b/i18n/zh_CN/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/zh_CN/libcardmonapplet.ts
+++ b/i18n/zh_CN/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libcardmonapplet.ts b/i18n/zh_TW/libcardmonapplet.ts
index 67c09b9..687958e 100644
--- a/i18n/zh_TW/libcardmonapplet.ts
+++ b/i18n/zh_TW/libcardmonapplet.ts
@@ -4,5 +4,5 @@
     <message>
         <source>Eject card</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -12,5 +12,5 @@
     <message>
         <source>Card eject failed!</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete"></translation>
     </message>
     <message>
@@ -18,4 +18,44 @@
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Eject SD/ MMC card</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (0)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>Eject %1 (1)</source>
+        <translation type="obsolete"></translation>
+    </message>
+    <message>
+        <source>CF/PCMCIA card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD/MMC card eject failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New card: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ejected: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject SD/MMC card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 0: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Eject card 1: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>