diff options
-rw-r--r-- | desktop-widgets/divelistview.cpp | 4 | ||||
-rw-r--r-- | desktop-widgets/findmovedimagesdialog.cpp | 8 | ||||
-rw-r--r-- | desktop-widgets/findmovedimagesdialog.ui | 6 | ||||
-rw-r--r-- | desktop-widgets/mainwindow.ui | 4 | ||||
-rw-r--r-- | desktop-widgets/preferences/preferences_graph.ui | 2 | ||||
-rw-r--r-- | desktop-widgets/shiftimagetimes.ui | 4 | ||||
-rw-r--r-- | desktop-widgets/tab-widgets/TabDivePhotos.cpp | 10 | ||||
-rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 2 | ||||
-rw-r--r-- | desktop-widgets/urldialog.ui | 2 | ||||
-rw-r--r-- | qt-models/divetripmodel.cpp | 6 |
10 files changed, 24 insertions, 24 deletions
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index bf4a5d8cf..647a7fdcc 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -924,9 +924,9 @@ void DiveListView::loadImages() { QStringList filters = imageExtensionFilters(); QStringList fileNames = QFileDialog::getOpenFileNames(this, - tr("Open image files"), + tr("Open media files"), lastUsedImageDir(), - tr("Image files (%1)").arg(filters.join(" "))); + tr("Media files (%1)").arg(filters.join(" "))); if (fileNames.isEmpty()) return; diff --git a/desktop-widgets/findmovedimagesdialog.cpp b/desktop-widgets/findmovedimagesdialog.cpp index 18a9565b1..32f885fca 100644 --- a/desktop-widgets/findmovedimagesdialog.cpp +++ b/desktop-widgets/findmovedimagesdialog.cpp @@ -170,7 +170,7 @@ void FindMovedImagesDialog::on_scanButton_clicked() // TODO: is lastUsedImageDir really well-placed in DiveListView? QString dirName = QFileDialog::getExistingDirectory(this, - tr("Traverse image directories"), + tr("Traverse media directories"), DiveListView::lastUsedImageDir(), QFileDialog::ShowDirsOnly); if (dirName.isEmpty()) @@ -251,7 +251,7 @@ void FindMovedImagesDialog::searchDone() stopScanning = 0; } if (matches.isEmpty()) { - text += "<i>" + tr("No matching images found") + "</i>"; + text += "<i>" + tr("No matching media files found") + "</i>"; } else { QString matchesText; for (const Match &match: matches) { @@ -263,9 +263,9 @@ void FindMovedImagesDialog::searchDone() } int numUnchanged = matches.size() - numChanged; if (numUnchanged > 0) - text += tr("Found <b>%1</b> images at their current place.").arg(numUnchanged) + "<br/>"; + text += tr("Found <b>%1</b> media files at their current place.").arg(numUnchanged) + "<br/>"; if (numChanged > 0) { - text += tr("Found <b>%1</b> images at new locations:").arg(numChanged) + "<br/>"; + text += tr("Found <b>%1</b> media files at new locations:").arg(numChanged) + "<br/>"; text += matchesText; } } diff --git a/desktop-widgets/findmovedimagesdialog.ui b/desktop-widgets/findmovedimagesdialog.ui index b558feec8..200d34bff 100644 --- a/desktop-widgets/findmovedimagesdialog.ui +++ b/desktop-widgets/findmovedimagesdialog.ui @@ -20,7 +20,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Find moved images</string> + <string>Find moved media files</string> </property> <property name="windowIcon"> <iconset> @@ -34,7 +34,7 @@ <item> <widget class="QGroupBox" name="groupBox"> <property name="title"> - <string>Found images</string> + <string>Found media files</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> @@ -68,7 +68,7 @@ </sizepolicy> </property> <property name="text"> - <string>Match only images in selected dive(s)</string> + <string>Match only media files in selected dive(s)</string> </property> <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> diff --git a/desktop-widgets/mainwindow.ui b/desktop-widgets/mainwindow.ui index 5cd897971..51d334969 100644 --- a/desktop-widgets/mainwindow.ui +++ b/desktop-widgets/mainwindow.ui @@ -625,7 +625,7 @@ <normaloff>:photo-icon</normaloff>:photo-icon</iconset> </property> <property name="text"> - <string>Toggle pictures</string> + <string>Toggle media</string> </property> </action> <action name="profTankbar"> @@ -686,7 +686,7 @@ </action> <action name="actionHash_images"> <property name="text"> - <string>&Find moved images</string> + <string>&Find moved media files</string> </property> </action> <action name="actionCloudstorageopen"> diff --git a/desktop-widgets/preferences/preferences_graph.ui b/desktop-widgets/preferences/preferences_graph.ui index a7553c990..b70a5ff29 100644 --- a/desktop-widgets/preferences/preferences_graph.ui +++ b/desktop-widgets/preferences/preferences_graph.ui @@ -371,7 +371,7 @@ <item row="2" column="0" colspan="2"> <widget class="QCheckBox" name="auto_recalculate_thumbnails"> <property name="text"> - <string>Recalculate thumbnails if older than image</string> + <string>Recalculate thumbnails if older than media file</string> </property> </widget> </item> diff --git a/desktop-widgets/shiftimagetimes.ui b/desktop-widgets/shiftimagetimes.ui index a2ba0b8b1..72863ee81 100644 --- a/desktop-widgets/shiftimagetimes.ui +++ b/desktop-widgets/shiftimagetimes.ui @@ -126,7 +126,7 @@ </property> <property name="text"> <string>Warning! -Not all images have timestamps in the range between +Not all media files have timestamps in the range between 30 minutes before the start and 30 minutes after the end of any selected dive.</string> </property> </widget> @@ -134,7 +134,7 @@ Not all images have timestamps in the range between <item> <widget class="QCheckBox" name="matchAllImages"> <property name="text"> - <string>Load images even if the time does not match the dive time</string> + <string>Load media files even if the time does not match the dive time</string> </property> </widget> </item> diff --git a/desktop-widgets/tab-widgets/TabDivePhotos.cpp b/desktop-widgets/tab-widgets/TabDivePhotos.cpp index c01820777..adac7bf29 100644 --- a/desktop-widgets/tab-widgets/TabDivePhotos.cpp +++ b/desktop-widgets/tab-widgets/TabDivePhotos.cpp @@ -49,11 +49,11 @@ void TabDivePhotos::clear() void TabDivePhotos::contextMenuEvent(QContextMenuEvent *event) { QMenu popup(this); - popup.addAction(tr("Load image(s) from file(s)"), this, SLOT(addPhotosFromFile())); - popup.addAction(tr("Load image(s) from web"), this, SLOT(addPhotosFromURL())); + popup.addAction(tr("Load media from file(s)"), this, SLOT(addPhotosFromFile())); + popup.addAction(tr("Load media file(s) from web"), this, SLOT(addPhotosFromURL())); popup.addSeparator(); - popup.addAction(tr("Delete selected images"), this, SLOT(removeSelectedPhotos())); - popup.addAction(tr("Delete all images"), this, SLOT(removeAllPhotos())); + popup.addAction(tr("Delete selected media files"), this, SLOT(removeSelectedPhotos())); + popup.addAction(tr("Delete all media files"), this, SLOT(removeAllPhotos())); popup.addAction(tr("Recalculate selected thumbnails"), this, SLOT(recalculateSelectedThumbnails())); popup.exec(event->globalPos()); event->accept(); @@ -101,7 +101,7 @@ void TabDivePhotos::addPhotosFromURL() void TabDivePhotos::removeAllPhotos() { - if (QMessageBox::warning(this, tr("Deleting Images"), tr("Are you sure you want to delete all images?"), QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Cancel ) { + if (QMessageBox::warning(this, tr("Deleting media files"), tr("Are you sure you want to delete all media files?"), QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Cancel ) { ui->photosView->selectAll(); removeSelectedPhotos(); } diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index 931f12862..0f95e15ac 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -57,7 +57,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent), extraWidgets << new TabDiveStatistics(); ui.tabWidget->addTab(extraWidgets.last(), tr("Statistics")); extraWidgets << new TabDivePhotos(); - ui.tabWidget->addTab(extraWidgets.last(), tr("Photos")); + ui.tabWidget->addTab(extraWidgets.last(), tr("Media")); extraWidgets << new TabDiveExtraInfo(); ui.tabWidget->addTab(extraWidgets.last(), tr("Extra Info")); diff --git a/desktop-widgets/urldialog.ui b/desktop-widgets/urldialog.ui index bb0426315..a136d1a9e 100644 --- a/desktop-widgets/urldialog.ui +++ b/desktop-widgets/urldialog.ui @@ -49,7 +49,7 @@ </rect> </property> <property name="text"> - <string>Enter URL for images</string> + <string>Enter URL for media files</string> </property> </widget> </widget> diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index 329858b34..3dcfb7517 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -276,7 +276,7 @@ QVariant DiveItem::data(int column, int role) const retVal = tr("Tags"); break; case PHOTOS: - retVal = tr("Photos before/during/after dive"); + retVal = tr("Media before/during/after dive"); break; case COUNTRY: retVal = tr("Country"); @@ -518,7 +518,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int ret = tr("Tags"); break; case PHOTOS: - ret = tr("Photos"); + ret = tr("Media"); break; case COUNTRY: ret = tr("Country"); @@ -575,7 +575,7 @@ QVariant DiveTripModel::headerData(int section, Qt::Orientation orientation, int ret = tr("Tags"); break; case PHOTOS: - ret = tr("Photos before/during/after dive"); + ret = tr("Media before/during/after dive"); break; case LOCATION: ret = tr("Location"); |