Signed-off-by: Tim Wootton <t...@tee-jay.demon.co.uk>
---
 qt-ui/mainwindow.cpp | 18 +++++++++---------
 qt-ui/mainwindow.ui  | 30 +++++++++++++++---------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 6a212ae..c5c0d20 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -188,7 +188,7 @@ void MainWindow::on_actionOpen_triggered()
        if (!okToClose(tr("Please save or cancel the current dive edit before 
opening a new file.")))
                return;
 
-       QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), 
lastUsedDir(), filter());
+       QString filename = QFileDialog::getOpenFileName(this, tr("Open file"), 
lastUsedDir(), filter());
        if (filename.isEmpty())
                return;
        updateLastUsedDir(QFileInfo(filename).dir().path());
@@ -511,7 +511,7 @@ void MainWindow::on_actionYearlyStatistics_triggered()
                yearlyStats = new QTreeView();
                yearlyStats->setWindowModality(Qt::NonModal);
                yearlyStats->setMinimumWidth(600);
-               yearlyStats->setWindowTitle(tr("Yearly Statistics"));
+               yearlyStats->setWindowTitle(tr("Yearly statistics"));
                yearlyStats->setWindowIcon(QIcon(":subsurface-icon"));
                QShortcut *closeKey = new QShortcut(QKeySequence(Qt::CTRL + 
Qt::Key_W), yearlyStats, 0, 0, Qt::WidgetShortcut);
                connect(closeKey, SIGNAL(activated()), yearlyStats, 
SLOT(close()));
@@ -707,14 +707,14 @@ bool MainWindow::askSaveChanges()
        QMessageBox response(MainWindow::instance());
 
        if (existing_filename)
-               message = tr("Do you want to save the changes you made in the 
file %1?").arg(existing_filename);
+               message = tr("Do you want to save the changes that you made in 
the file %1?").arg(existing_filename);
        else
-               message = tr("Do you want to save the changes you made in the 
datafile?");
+               message = tr("Do you want to save the changes that you made in 
the datafile?");
 
        response.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | 
QMessageBox::Cancel);
        response.setDefaultButton(QMessageBox::Save);
        response.setText(message);
-       response.setWindowTitle(tr("Save Changes?")); // Not displayed on 
MacOSX as described in Qt API
+       response.setWindowTitle(tr("Save changes?")); // Not displayed on 
MacOSX as described in Qt API
        response.setInformativeText(tr("Changes will be lost if you don't save 
them."));
        response.setIcon(QMessageBox::Warning);
        response.setWindowModality(Qt::WindowModal);
@@ -1072,7 +1072,7 @@ int MainWindow::file_save_as(void)
 {
        QString filename;
        const char *default_filename = existing_filename;
-       filename = QFileDialog::getSaveFileName(this, tr("Save File as"), 
default_filename,
+       filename = QFileDialog::getSaveFileName(this, tr("Save file as"), 
default_filename,
                                                tr("Subsurface XML files 
(*.ssrf *.xml *.XML)"));
        if (filename.isNull() || filename.isEmpty())
                return report_error("No filename to save into");
@@ -1196,9 +1196,9 @@ void MainWindow::loadFiles(const QStringList fileNames)
 
 void MainWindow::on_actionImportDiveLog_triggered()
 {
-       QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open 
Dive Log File"), lastUsedDir(),
-               tr("Dive Log Files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde 
*.db);;"
-                       "XML Files (*.xml);;UDDF/UDCF Files(*.uddf 
*.udcf);;JDiveLog Files(*.jlb);;"
+       QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open 
dive log file"), lastUsedDir(),
+               tr("Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde 
*.db);;"
+                       "XML files (*.xml);;UDDF/UDCF files(*.uddf 
*.udcf);;JDiveLog files(*.jlb);;"
                        "Suunto Files(*.sde *.db);;CSV Files(*.csv);;All 
Files(*)"));
 
        if (fileNames.isEmpty())
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 2360dd8..cdabc8e 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -815,7 +815,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionDownloadWeb">
    <property name="text">
-    <string>Import &amp;GPS data from Subsurface Service</string>
+    <string>Import &amp;GPS data from Subsurface web-service</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+G</string>
@@ -823,12 +823,12 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionEditDeviceNames">
    <property name="text">
-    <string>&amp;Edit Device Names</string>
+    <string>&amp;Edit device names</string>
    </property>
   </action>
   <action name="actionAddDive">
    <property name="text">
-    <string>&amp;Add Dive</string>
+    <string>&amp;Add dive</string>
    </property>
    <property name="shortcut">
     <string>Ctrl++</string>
@@ -847,12 +847,12 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Auto &amp;Group</string>
+    <string>Auto &amp;group</string>
    </property>
   </action>
   <action name="actionYearlyStatistics">
    <property name="text">
-    <string>&amp;Yearly Statistics</string>
+    <string>&amp;Yearly statistics</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Y</string>
@@ -860,7 +860,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionViewList">
    <property name="text">
-    <string>&amp;Dive List</string>
+    <string>&amp;Dive list</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+2</string>
@@ -892,7 +892,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionPreviousDC">
    <property name="text">
-    <string>P&amp;rev DC</string>
+    <string>P&amp;revious DC</string>
    </property>
    <property name="shortcut">
     <string>Left</string>
@@ -908,7 +908,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionSelectEvents">
    <property name="text">
-    <string>&amp;Select Events</string>
+    <string>&amp;Select events</string>
    </property>
   </action>
   <action name="actionInputPlan">
@@ -926,7 +926,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionUserManual">
    <property name="text">
-    <string>User &amp;Manual</string>
+    <string>User &amp;manual</string>
    </property>
    <property name="shortcut">
     <string>F1</string>
@@ -942,7 +942,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionDivePlanner">
    <property name="text">
-    <string>P&amp;lan Dive</string>
+    <string>P&amp;lan dive</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+L</string>
@@ -950,7 +950,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionImportDiveLog">
    <property name="text">
-    <string>&amp;Import Log Files</string>
+    <string>&amp;Import log files</string>
    </property>
    <property name="toolTip">
     <string>Import divelog files from other applications</string>
@@ -961,7 +961,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="actionDivelogs_de">
    <property name="text">
-    <string>Import &amp;from Divelogs.de</string>
+    <string>Import &amp;from divelogs.de</string>
    </property>
   </action>
   <action name="actionFullScreen">
@@ -969,10 +969,10 @@ p, li { white-space: pre-wrap; }
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Full Screen</string>
+    <string>&amp;Full screen</string>
    </property>
    <property name="toolTip">
-    <string>Toggle Full Screen</string>
+    <string>Toggle full screen</string>
    </property>
    <property name="shortcut">
     <string>F11</string>
@@ -1000,7 +1000,7 @@ p, li { white-space: pre-wrap; }
   </action>
   <action name="action_Check_for_Updates">
    <property name="text">
-    <string>&amp;Check for Updates</string>
+    <string>&amp;Check for updates</string>
    </property>
   </action>
   <action name="actionExport">
-- 
2.0.0

_______________________________________________
subsurface mailing list
subsurface@hohndel.org
http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to