fixed some redundant translation strings across UIs

tempura-san · tempura-san · commit 6a2f1fffccb6 · 2015-03-22T11:55:22.000+01:00
diff --git a/apps/generic/generic.pro b/apps/generic/generic.pro
@@ -39,15 +39,15 @@ maemo5: {
 SOURCES += main.cpp \
             ui/mainwindow.cpp \
             ui/settingsdialog.cpp \
-            ui/connectdialog.cpp \
             ui/aboutdialog.cpp \
             ui/authenticationdialog.cpp \
             qmlapplicationviewer/qmlapplicationviewer.cpp \
+    ui/connectiondialog.cpp
 
 
 HEADERS += ui/mainwindow.h \
             ui/settingsdialog.h \
-            ui/connectdialog.h \
             ui/aboutdialog.h \
             ui/authenticationdialog.h \
             qmlapplicationviewer/qmlapplicationviewer.h \
+    ui/connectiondialog.h
diff --git a/apps/generic/ui/connectiondialog.cpp b/apps/generic/ui/connectiondialog.cpp
@@ -18,7 +18,7 @@
  *                                                                           *
  ****************************************************************************/
 
-#include "connectdialog.h"
+#include "connectiondialog.h"
 
 #include <QGridLayout>
 #include <QDialogButtonBox>
@@ -33,7 +33,7 @@
 #include "libkodimote/kodihostmodel.h"
 #include "libkodimote/kodidiscovery.h"
 
-ConnectDialog::ConnectDialog(QWidget *parent) :
+ConnectionDialog::ConnectionDialog(QWidget *parent) :
     QDialog(parent)
 {
 
@@ -135,7 +135,7 @@ ConnectDialog::ConnectDialog(QWidget *parent) :
 #endif
 }
 
-void ConnectDialog::accept()
+void ConnectionDialog::accept()
 {
     if(m_stackedLayout->currentIndex() == 0) {
         KodiHost *host = Kodi::instance()->hostModel()->host(m_hostView->currentIndex().row());
@@ -153,7 +153,7 @@ void ConnectDialog::accept()
     QDialog::accept();
 }
 
-void ConnectDialog::showManualLayout()
+void ConnectionDialog::showManualLayout()
 {
     if(m_stackedLayout->currentIndex() != 2) {
         m_stackedLayout->setCurrentIndex(2);
@@ -169,12 +169,12 @@ void ConnectDialog::showManualLayout()
     enableOkButton();
 }
 
-void ConnectDialog::showHostList()
+void ConnectionDialog::showHostList()
 {
     m_stackedLayout->setCurrentIndex(0);
 }
 
-void ConnectDialog::enableOkButton()
+void ConnectionDialog::enableOkButton()
 {
     switch(m_stackedLayout->currentIndex()) {
     case 0:
@@ -193,7 +193,7 @@ void ConnectDialog::enableOkButton()
     }
 }
 
-void ConnectDialog::removeHost()
+void ConnectionDialog::removeHost()
 {
     Kodi::instance()->hostModel()->removeHost(m_hostView->currentIndex().row());
     enableOkButton();
diff --git a/apps/generic/ui/connectiondialog.h b/apps/generic/ui/connectiondialog.h
@@ -29,12 +29,12 @@ class QGridLayout;
 class QListView;
 class QDialogButtonBox;
 
-class ConnectDialog : public QDialog
+class ConnectionDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit ConnectDialog(QWidget *parent = 0);
+    explicit ConnectionDialog(QWidget *parent = 0);
 
     void setHostname(const QString &hostname);
     QString hostname();
diff --git a/apps/generic/ui/mainwindow.cpp b/apps/generic/ui/mainwindow.cpp
@@ -20,7 +20,7 @@
 
 #include "mainwindow.h"
 #include "settingsdialog.h"
-#include "connectdialog.h"
+#include "connectiondialog.h"
 #include "aboutdialog.h"
 #include "authenticationdialog.h"
 
@@ -81,8 +81,8 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent) :
 
     QMenuBar *menuBar = new QMenuBar();
     QMenu *menu = menuBar->addMenu("Kodi");
-    menu->addAction(tr("Connect..."), this, SLOT(openConnectDialog()));
-    menu->addAction(tr("Settings"), this, SLOT(openSettingsDialog()));
+    menu->addAction(tr("Connect..."), this, SLOT(openConnectionDialog()));
+    menu->addAction(SettingsDialog::tr("Settings"), this, SLOT(openSettingsDialog()));
 
     QAction *quitAction = menu->addAction("Quit Kodi", Kodi::instance(), SLOT(quit()));
     Kodi::instance()->connect(Kodi::instance(), SIGNAL(connectedChanged(bool)), quitAction, SLOT(setEnabled(bool)));
@@ -101,7 +101,7 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent) :
     connect(Kodi::instance(), SIGNAL(authenticationRequired(QString,QString)), SLOT(authenticationRequired(QString,QString)), Qt::QueuedConnection);
 
     if(!Kodi::instance()->connecting()) {
-        openConnectDialog();
+        openConnectionDialog();
     }
 }
 
@@ -134,10 +134,10 @@ void MainWindow::openSettingsDialog()
     settings->exec();
 }
 
-void MainWindow::openConnectDialog()
+void MainWindow::openConnectionDialog()
 {
-    ConnectDialog *settings = new ConnectDialog();
-    settings->exec();
+    ConnectionDialog *connection = new ConnectionDialog();
+    connection->exec();
 }
 
 void MainWindow::openAboutDialog()
diff --git a/apps/generic/ui/mainwindow.h b/apps/generic/ui/mainwindow.h
@@ -45,7 +45,7 @@ class MainWindow : public QMainWindow
 private slots:
     void orientationChanged();
     void openSettingsDialog();
-    void openConnectDialog();
+    void openConnectionDialog();
     void openAboutDialog();
 
 #ifdef Q_WS_MAEMO_5
diff --git a/apps/harmattan/qml/AuthenticationDialog.qml b/apps/harmattan/qml/AuthenticationDialog.qml
@@ -23,7 +23,7 @@ import com.nokia.meego 1.0
 import Xbmc 1.0
 
 Sheet {
-    id: connectionSheet
+    id: authenticationDialog
     acceptButtonText: qsTr("OK")
     rejectButtonText: qsTr("Cancel")
 
diff --git a/apps/harmattan/qml/ConnectionDialog.qml b/apps/harmattan/qml/ConnectionDialog.qml
@@ -25,7 +25,7 @@ import QtMobility.connectivity 1.2
 import Xbmc 1.0
 
 Sheet {
-    id: connectionSheet
+    id: connectionDialog
     acceptButtonText: qsTr("Connect")
     rejectButtonText: qsTr("Cancel")
     acceptButton.enabled: itemView.currentIndex == 0 && hostList.currentIndex >= 0 || hostnameTextField.text != ""
@@ -39,7 +39,7 @@ Sheet {
         target: xbmc
         onConnectedChanged: {
             if(connected)
-                connectionSheet.reject();
+                connectionDialog.reject();
         }
     }
 
@@ -254,11 +254,11 @@ Sheet {
             var newIndex = xbmc.hostModel().createHost(hostnameTextField.text, hostnameTextField.text, portTextField.text, macTextField.text);
             xbmc.hostModel().connectToHost(newIndex);
         }
-        connectionSheet.destroy();
+        connectionDialog.destroy();
     }
 
     onRejected: {
         print("rejected");
-        connectionSheet.destroy();
+        connectionDialog.destroy();
     }
 }
diff --git a/apps/harmattan/qml/NoConnectionPage.qml b/apps/harmattan/qml/NoConnectionPage.qml
@@ -47,7 +47,7 @@ Page {
             text: qsTr("Connect...")
             anchors.horizontalCenter: parent.horizontalCenter
             onClicked: {
-                var component = Qt.createComponent("ConnectionSheet.qml")
+                var component = Qt.createComponent("ConnectionDialog.qml")
                 if (component.status === Component.Ready) {
                     component.createObject(mainPage).open()
                 } else {
diff --git a/apps/harmattan/qml/SettingsDialog.qml b/apps/harmattan/qml/SettingsDialog.qml
@@ -22,7 +22,7 @@ import QtQuick 1.1
 import com.nokia.meego 1.0
 
 Sheet {
-    id: connectionSheet
+    id: settingsDialog
     acceptButtonText: qsTr("Save")
     rejectButtonText: qsTr("Cancel")
 
diff --git a/apps/harmattan/qml/main.qml b/apps/harmattan/qml/main.qml
@@ -35,7 +35,7 @@ PageStackWindow {
 
         print("connecting", xbmc.connecting, "connected", xbmc.connected)
         if(!(xbmc.connecting || xbmc.connected)) {
-            var component = Qt.createComponent("ConnectionSheet.qml")
+            var component = Qt.createComponent("ConnectionDialog.qml")
             if (component.status == Component.Ready) {
                 component.createObject(mainPage).open()
             } else {
@@ -98,7 +98,7 @@ PageStackWindow {
             MenuItem {
                 text: qsTr("Connect...")
                 onClicked: {
-                    var component = Qt.createComponent("ConnectionSheet.qml")
+                    var component = Qt.createComponent("ConnectionDialog.qml")
                     if (component.status == Component.Ready) {
                         component.createObject(mainPage).open()
                     } else {
@@ -129,7 +129,7 @@ PageStackWindow {
                 text: qsTr("Settings")
                 onClicked: {
                     onClicked: {
-                        var component = Qt.createComponent("SettingsSheet.qml")
+                        var component = Qt.createComponent("SettingsDialog.qml")
                         if (component.status == Component.Ready) {
                             component.createObject(mainPage).open()
                         } else {
@@ -171,7 +171,7 @@ PageStackWindow {
         target: xbmc
         onAuthenticationRequired: {
             print("auth required");
-            var component = Qt.createComponent("AuthenticationSheet.qml")
+            var component = Qt.createComponent("AuthenticationDialog.qml")
             if (component.status == Component.Ready) {
                 var authSheet = component.createObject(mainPage);
                 authSheet.hostname = hostname;
diff --git a/apps/sailfish/qml/pages/BrowserPage.qml b/apps/sailfish/qml/pages/BrowserPage.qml
@@ -86,7 +86,7 @@ Page {
             }
 
             MenuItem {
-                text: qsTr("Now playing")
+                text: qsTr("Now Playing")
                 enabled: kodi.activePlayer !== null
                 onClicked: {
                     pageStack.push("NowPlayingPage.qml")
diff --git a/apps/sailfish/qml/pages/Keypad.qml b/apps/sailfish/qml/pages/Keypad.qml
@@ -84,7 +84,7 @@ Page {
             }
 
             MenuItem {
-                text: qsTr("Now playing")
+                text: qsTr("Now Playing")
                 enabled: kodi.activePlayer !== null
                 onClicked: {
                     pageStack.replace("NowPlayingPage.qml")
diff --git a/apps/sailfish/qml/pages/MainPage.qml b/apps/sailfish/qml/pages/MainPage.qml
@@ -111,7 +111,7 @@ Page {
             }
 
             MenuItem {
-                text: qsTr("Now playing")
+                text: qsTr("Now Playing")
                 enabled: kodi.activePlayer !== null
                 onClicked: {
                     pageStack.push("NowPlayingPage.qml")
diff --git a/apps/sailfish/qml/pages/NowPlayingPage.qml b/apps/sailfish/qml/pages/NowPlayingPage.qml
@@ -71,7 +71,7 @@ Page {
             }
 
             MenuItem {
-                text: qsTr("Now playing")
+                text: qsTr("Now Playing")
                 enabled: false
             }
         }
diff --git a/apps/ubuntu/qml/MainPage.qml b/apps/ubuntu/qml/MainPage.qml
@@ -284,7 +284,7 @@ KodiPage {
             text: qsTr("Options")
             Layout.fillWidth: true
             onClicked: {
-                PopupUtils.open(Qt.resolvedUrl("SettingsSheet.qml"), mainPage)
+                PopupUtils.open(Qt.resolvedUrl("SettingsDialog.qml"), mainPage)
             }
         }
         BottomEdgeButton {
diff --git a/apps/ubuntu/qml/SettingsDialog.qml b/apps/ubuntu/qml/SettingsDialog.qml
diff --git a/i18n/kodimote_de_AT.ts b/i18n/kodimote_de_AT.ts

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`* *`
`19`	`19`	`****************************************************************************/`
`20`	`20`
`21`		`-#include "connectdialog.h"`
	`21`	`+#include "connectiondialog.h"`
`22`	`22`
`23`	`23`	`#include <QGridLayout>`
`24`	`24`	`#include <QDialogButtonBox>`
`@@ -33,7 +33,7 @@`
`33`	`33`	`#include "libkodimote/kodihostmodel.h"`
`34`	`34`	`#include "libkodimote/kodidiscovery.h"`
`35`	`35`
`36`		`-ConnectDialog::ConnectDialog(QWidget *parent) :`
	`36`	`+ConnectionDialog::ConnectionDialog(QWidget *parent) :`
`37`	`37`	`QDialog(parent)`
`38`	`38`	`{`
`39`	`39`
`@@ -135,7 +135,7 @@ ConnectDialog::ConnectDialog(QWidget *parent) :`
`135`	`135`	`#endif`
`136`	`136`	`}`
`137`	`137`
`138`		`-void ConnectDialog::accept()`
	`138`	`+void ConnectionDialog::accept()`
`139`	`139`	`{`
`140`	`140`	`if(m_stackedLayout->currentIndex() == 0) {`
`141`	`141`	`KodiHost *host = Kodi::instance()->hostModel()->host(m_hostView->currentIndex().row());`
`@@ -153,7 +153,7 @@ void ConnectDialog::accept()`
`153`	`153`	`QDialog::accept();`
`154`	`154`	`}`
`155`	`155`
`156`		`-void ConnectDialog::showManualLayout()`
	`156`	`+void ConnectionDialog::showManualLayout()`
`157`	`157`	`{`
`158`	`158`	`if(m_stackedLayout->currentIndex() != 2) {`
`159`	`159`	`m_stackedLayout->setCurrentIndex(2);`
`@@ -169,12 +169,12 @@ void ConnectDialog::showManualLayout()`
`169`	`169`	`enableOkButton();`
`170`	`170`	`}`
`171`	`171`
`172`		`-void ConnectDialog::showHostList()`
	`172`	`+void ConnectionDialog::showHostList()`
`173`	`173`	`{`
`174`	`174`	`m_stackedLayout->setCurrentIndex(0);`
`175`	`175`	`}`
`176`	`176`
`177`		`-void ConnectDialog::enableOkButton()`
	`177`	`+void ConnectionDialog::enableOkButton()`
`178`	`178`	`{`
`179`	`179`	`switch(m_stackedLayout->currentIndex()) {`
`180`	`180`	`case 0:`
`@@ -193,7 +193,7 @@ void ConnectDialog::enableOkButton()`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`-void ConnectDialog::removeHost()`
	`196`	`+void ConnectionDialog::removeHost()`
`197`	`197`	`{`
`198`	`198`	`Kodi::instance()->hostModel()->removeHost(m_hostView->currentIndex().row());`
`199`	`199`	`enableOkButton();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import QtMobility.connectivity 1.2`
`25`	`25`	`import Xbmc 1.0`
`26`	`26`
`27`	`27`	`Sheet {`
`28`		`- id: connectionSheet`
	`28`	`+ id: connectionDialog`
`29`	`29`	`acceptButtonText: qsTr("Connect")`
`30`	`30`	`rejectButtonText: qsTr("Cancel")`
`31`	`31`	`acceptButton.enabled: itemView.currentIndex == 0 && hostList.currentIndex >= 0 \|\| hostnameTextField.text != ""`
`@@ -39,7 +39,7 @@ Sheet {`
`39`	`39`	`target: xbmc`
`40`	`40`	`onConnectedChanged: {`
`41`	`41`	`if(connected)`
`42`		`- connectionSheet.reject();`
	`42`	`+ connectionDialog.reject();`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`@@ -254,11 +254,11 @@ Sheet {`
`254`	`254`	`var newIndex = xbmc.hostModel().createHost(hostnameTextField.text, hostnameTextField.text, portTextField.text, macTextField.text);`
`255`	`255`	`xbmc.hostModel().connectToHost(newIndex);`
`256`	`256`	`}`
`257`		`- connectionSheet.destroy();`
	`257`	`+ connectionDialog.destroy();`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`onRejected: {`
`261`	`261`	`print("rejected");`
`262`		`- connectionSheet.destroy();`
	`262`	`+ connectionDialog.destroy();`
`263`	`263`	`}`
`264`	`264`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ Page {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`MenuItem {`
`89`		`- text: qsTr("Now playing")`
	`89`	`+ text: qsTr("Now Playing")`
`90`	`90`	`enabled: kodi.activePlayer !== null`
`91`	`91`	`onClicked: {`
`92`	`92`	`pageStack.push("NowPlayingPage.qml")`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ Page {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`MenuItem {`
`87`		`- text: qsTr("Now playing")`
	`87`	`+ text: qsTr("Now Playing")`
`88`	`88`	`enabled: kodi.activePlayer !== null`
`89`	`89`	`onClicked: {`
`90`	`90`	`pageStack.replace("NowPlayingPage.qml")`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ Page {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`MenuItem {`
`114`		`- text: qsTr("Now playing")`
	`114`	`+ text: qsTr("Now Playing")`
`115`	`115`	`enabled: kodi.activePlayer !== null`
`116`	`116`	`onClicked: {`
`117`	`117`	`pageStack.push("NowPlayingPage.qml")`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ Page {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`MenuItem {`
`74`		`- text: qsTr("Now playing")`
	`74`	`+ text: qsTr("Now Playing")`
`75`	`75`	`enabled: false`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ KodiPage {`
`284`	`284`	`text: qsTr("Options")`
`285`	`285`	`Layout.fillWidth: true`
`286`	`286`	`onClicked: {`
`287`		`- PopupUtils.open(Qt.resolvedUrl("SettingsSheet.qml"), mainPage)`
	`287`	`+ PopupUtils.open(Qt.resolvedUrl("SettingsDialog.qml"), mainPage)`
`288`	`288`	`}`
`289`	`289`	`}`
`290`	`290`	`BottomEdgeButton {`