Merge from BRANCH_1_0

3 files changed, 19 insertions, 9 deletions

diff --git a/noncore/net/ubrowser/httpfactory.cpp b/noncore/net/ubrowser/httpfactory.cpp
index b57149f..369f206 100644
--- a/noncore/net/ubrowser/httpfactory.cpp
+++ b/noncore/net/ubrowser/httpfactory.cpp
@@ -95,8 +95,8 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
         
         if( serverInfo == NULL )
         {
-                QMessageBox *mb = new QMessageBox("Error!",
-                        "couldnt find ip address",
+                QMessageBox *mb = new QMessageBox(QObject::tr("Error!"),
+                        QObject::tr("IP-Address not found"),
                         QMessageBox::NoIcon,
                         QMessageBox::Ok,
                         QMessageBox::NoButton,
@@ -114,8 +114,8 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
         con = socket( AF_INET, SOCK_STREAM, 0 );
         if( con == -1 )
         {
-                QMessageBox *mb = new QMessageBox("Error!",
-                        "couldnt create socket",
+                QMessageBox *mb = new QMessageBox(QObject::tr("Error!"),
+                        QObject::tr("Error creating socket"),
                         QMessageBox::NoIcon,
                         QMessageBox::Ok,
                         QMessageBox::NoButton,
@@ -132,8 +132,8 @@ const QMimeSource * HttpFactory::data(const QString &abs_name) const
         
         if(::connect( con, (struct sockaddr *)&serverAddr, sizeof(struct sockaddr)) == -1 )
         {
-                QMessageBox *mb = new QMessageBox("Error!",
-                        "couldnt connect to socket",
+                QMessageBox *mb = new QMessageBox(QObject::tr("Error!"),
+                        QObject::tr("Error connecting to socket"),
                         QMessageBox::NoIcon,
                         QMessageBox::Ok,
                         QMessageBox::NoButton,
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index f68c5db..9302f05 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -20,7 +20,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 MainView::MainView(QWidget *parent, const char *name) : QMainWindow(parent, name)
 {
         setIcon( Resource::loadPixmap( "remote" ) );
-        setCaption("uBrowser");
+        setCaption(tr("uBrowser"));
         
         setToolBarsMovable( false );
 
@@ -102,11 +102,11 @@ void MainView::textChanged()
 {
         if(browser->documentTitle().isNull())
         {
-                setCaption(browser->source() + " - uBrowser");
+                setCaption( tr("%1 - uBrowser").arg( browser->source() ) );
         }
         else
         {
-                setCaption(browser->documentTitle() + " - uBrowser");
+                setCaption(tr(" - uBrowser").arg( browser->documentTitle() ));
         }
 
         location->setEditText(browser->source());
diff --git a/noncore/net/ubrowser/opie-ubrowser.control b/noncore/net/ubrowser/opie-ubrowser.control
new file mode 100644
index 0000000..61a6cde
--- a/dev/null
+++ b/noncore/net/ubrowser/opie-ubrowser.control
@@ -0,0 +1,10 @@
+Package: opie-ubrowser
+Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png
+Priority: optional
+Section: opie/applications
+Maintainer: Thomas Stephens <spiralman@softhome.net>
+Architecture: arm
+Version: 0.1-$SUB_VERSION
+Depends: task-opie-minimal
+License: GPL
+Description: a very small web browser