Merge from BRANCH_1_0

1 files changed, 3 insertions, 5 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 6f96574..1c95a97 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -571,3 +571,2 @@ void TextEdit::fileOpen() {
     cfg. setGroup ( "View" );
-    QString dir = cfg.readEntry("LastOpenDirectory", QPEApplication::documentDir());
     QMap<QString, QStringList> map;
@@ -580,3 +579,3 @@ void TextEdit::fileOpen() {
     QString str = OFileDialog::getOpenFileName( 2,
-                                                dir ,
+                                                QString::null ,
                                                 QString::null, map);
@@ -584,3 +583,2 @@ void TextEdit::fileOpen() {
     {
-       cfg.writeEntry("LastOpenDirectory",  QFileInfo(str).dirPath(false));
        openFile( str );
@@ -978,3 +976,3 @@ void TextEdit::updateCaption( const QString &name ) {
 //             s = s.right(s.length()-1);
-        setCaption( s + " - " + tr("Text Editor") );
+        setCaption( tr("%1 - Text Editor").arg( s ) );
     }
@@ -1024,3 +1022,3 @@ void TextEdit::editDelete() {
                                      "the current file\nfrom the disk?<BR>This is "
-                                     "<B>irreversable!!</B>"),
+                                     "<B>irreversable!</B>"),
                                   tr("Yes"),tr("No"),0,0,1) ) {