diff --git a/debian/copyright b/debian/copyright index f055cdfe..73f6e989 100644 --- a/debian/copyright +++ b/debian/copyright @@ -171,12 +171,12 @@ Files: src/core/main.cpp src/settings/shortcutssettingspage.h src/settings/appearancesettingspage.cpp src/settings/appearancesettingspage.h - src/organise/organise.cpp - src/organise/organise.h - src/organise/organisedialog.cpp - src/organise/organisedialog.h - src/organise/organiseerrordialog.cpp - src/organise/organiseerrordialog.h + src/organize/organize.cpp + src/organize/organize.h + src/organize/organizedialog.cpp + src/organize/organizedialog.h + src/organize/organizeerrordialog.cpp + src/organize/organizeerrordialog.h src/transcoder/transcoder.cpp src/transcoder/transcoder.h src/musicbrainz/musicbrainzclient.cpp diff --git a/dist/unix/strawberry.spec.in b/dist/unix/strawberry.spec.in index 02b1abba..04082102 100644 --- a/dist/unix/strawberry.spec.in +++ b/dist/unix/strawberry.spec.in @@ -1,7 +1,7 @@ Name: strawberry Version: @STRAWBERRY_VERSION_RPM_V@ Release: @STRAWBERRY_VERSION_RPM_R@.@RPM_DISTRO@ -Summary: A music player and music collection organiser +Summary: A music player and music collection organizer Group: Applications/Multimedia License: GPL-3.0+ URL: https://www.strawberrymusicplayer.org/ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 05dc7c68..c9451c4b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -221,10 +221,10 @@ set(SOURCES scrobbler/librefmscrobbler.cpp scrobbler/listenbrainzscrobbler.cpp - organise/organise.cpp - organise/organiseformat.cpp - organise/organisedialog.cpp - organise/organiseerrordialog.cpp + organize/organize.cpp + organize/organizeformat.cpp + organize/organizedialog.cpp + organize/organizeerrordialog.cpp ) @@ -415,9 +415,9 @@ set(HEADERS scrobbler/librefmscrobbler.h scrobbler/listenbrainzscrobbler.h - organise/organise.h - organise/organisedialog.h - organise/organiseerrordialog.h + organize/organize.h + organize/organizedialog.h + organize/organizeerrordialog.h ) @@ -475,8 +475,8 @@ set(UI internet/internetcollectionviewcontainer.ui internet/internetsearchview.ui - organise/organisedialog.ui - organise/organiseerrordialog.ui + organize/organizedialog.ui + organize/organizeerrordialog.ui ) diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index 4cbc8155..ef6e31c3 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -61,7 +61,7 @@ # include "device/devicestatefiltermodel.h" #endif #include "dialogs/edittagdialog.h" -#include "organise/organisedialog.h" +#include "organize/organizedialog.h" #include "settings/collectionsettingspage.h" CollectionView::CollectionView(QWidget *parent) @@ -325,7 +325,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) { add_to_playlist_enqueue_next_ = context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue to play next"), this, SLOT(AddToPlaylistEnqueueNext())); context_menu_->addSeparator(); - organise_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(Organise())); + organize_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, SLOT(Organize())); #ifndef Q_OS_WIN copy_to_device_ = context_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, SLOT(CopyToDevice())); #endif @@ -389,7 +389,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) { rescan_songs_->setVisible(edit_track_->isVisible()); rescan_songs_->setEnabled(true); - organise_->setVisible(regular_elements_only); + organize_->setVisible(regular_elements_only); #ifndef Q_OS_WIN copy_to_device_->setVisible(regular_elements_only); #endif @@ -398,7 +398,7 @@ void CollectionView::contextMenuEvent(QContextMenuEvent *e) { no_show_in_various_->setVisible(regular_elements_only); // only when all selected items are editable - organise_->setEnabled(regular_elements == regular_editable); + organize_->setEnabled(regular_elements == regular_editable); #ifndef Q_OS_WIN copy_to_device_->setEnabled(regular_elements == regular_editable); #endif @@ -529,15 +529,15 @@ SongList CollectionView::GetSelectedSongs() const { } -void CollectionView::Organise() { +void CollectionView::Organize() { - if (!organise_dialog_) - organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), app_->collection_backend(), this)); + if (!organize_dialog_) + organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), app_->collection_backend(), this)); - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); - organise_dialog_->SetCopy(false); - if (organise_dialog_->SetSongs(GetSelectedSongs())) - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_->SetCopy(false); + if (organize_dialog_->SetSongs(GetSelectedSongs())) + organize_dialog_->show(); else { QMessageBox::warning(this, tr("Error"), tr("None of the selected songs were suitable for copying to a device")); } @@ -568,13 +568,13 @@ void CollectionView::RescanSongs() { void CollectionView::CopyToDevice() { #ifndef Q_OS_WIN - if (!organise_dialog_) - organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), nullptr, this)); + if (!organize_dialog_) + organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), nullptr, this)); - organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); - organise_dialog_->SetCopy(true); - organise_dialog_->SetSongs(GetSelectedSongs()); - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); + organize_dialog_->SetCopy(true); + organize_dialog_->SetSongs(GetSelectedSongs()); + organize_dialog_->show(); #endif } diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index 24675699..eb3319b3 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -45,7 +45,7 @@ class QPaintEvent; class Application; class CollectionFilterWidget; class EditTagDialog; -class OrganiseDialog; +class OrganizeDialog; class CollectionView : public AutoExpandingTreeView { Q_OBJECT @@ -102,7 +102,7 @@ class CollectionView : public AutoExpandingTreeView { void AddToPlaylistEnqueue(); void AddToPlaylistEnqueueNext(); void OpenInNewPlaylist(); - void Organise(); + void Organize(); void CopyToDevice(); void EditTracks(); void RescanSongs(); @@ -133,7 +133,7 @@ class CollectionView : public AutoExpandingTreeView { QAction *add_to_playlist_enqueue_; QAction *add_to_playlist_enqueue_next_; QAction *open_in_new_playlist_; - QAction *organise_; + QAction *organize_; #ifndef Q_OS_WIN QAction *copy_to_device_; #endif @@ -145,7 +145,7 @@ class CollectionView : public AutoExpandingTreeView { QAction *show_in_various_; QAction *no_show_in_various_; - std::unique_ptr organise_dialog_; + std::unique_ptr organize_dialog_; std::unique_ptr edit_tag_dialog_; bool is_in_keyboard_search_; diff --git a/src/collection/groupbydialog.ui b/src/collection/groupbydialog.ui index 00e1941b..aae23dfa 100644 --- a/src/collection/groupbydialog.ui +++ b/src/collection/groupbydialog.ui @@ -21,7 +21,7 @@ - You can change the way the songs in the collection are organised. + You can change the way the songs in the collection are organized. true diff --git a/src/context/contextalbumsview.cpp b/src/context/contextalbumsview.cpp index b7916219..02bc90ed 100644 --- a/src/context/contextalbumsview.cpp +++ b/src/context/contextalbumsview.cpp @@ -56,7 +56,7 @@ # include "device/devicestatefiltermodel.h" #endif #include "dialogs/edittagdialog.h" -#include "organise/organisedialog.h" +#include "organize/organizedialog.h" #include "contextalbumsmodel.h" #include "contextalbumsview.h" @@ -257,7 +257,7 @@ void ContextAlbumsView::contextMenuEvent(QContextMenuEvent *e) { add_to_playlist_enqueue_ = context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, SLOT(AddToPlaylistEnqueue())); context_menu_->addSeparator(); - organise_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(Organise())); + organize_ = context_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, SLOT(Organize())); #ifndef Q_OS_WIN copy_to_device_ = context_menu_->addAction(IconLoader::Load("device"), tr("Copy to device..."), this, SLOT(CopyToDevice())); #endif @@ -304,13 +304,13 @@ void ContextAlbumsView::contextMenuEvent(QContextMenuEvent *e) { edit_track_->setVisible(regular_editable <= 1); edit_track_->setEnabled(regular_editable == 1); - organise_->setVisible(regular_elements_only); + organize_->setVisible(regular_elements_only); #ifndef Q_OS_WIN copy_to_device_->setVisible(regular_elements_only); #endif // only when all selected items are editable - organise_->setEnabled(regular_elements == regular_editable); + organize_->setEnabled(regular_elements == regular_editable); #ifndef Q_OS_WIN copy_to_device_->setEnabled(regular_elements == regular_editable); #endif @@ -369,15 +369,15 @@ SongList ContextAlbumsView::GetSelectedSongs() const { return model_->GetChildSongs(selected_indexes); } -void ContextAlbumsView::Organise() { +void ContextAlbumsView::Organize() { - if (!organise_dialog_) - organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), app_->collection_backend(), this)); + if (!organize_dialog_) + organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), app_->collection_backend(), this)); - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); - organise_dialog_->SetCopy(false); - if (organise_dialog_->SetSongs(GetSelectedSongs())) - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_->SetCopy(false); + if (organize_dialog_->SetSongs(GetSelectedSongs())) + organize_dialog_->show(); else { QMessageBox::warning(this, tr("Error"), tr("None of the selected songs were suitable for copying to a device")); } @@ -396,13 +396,13 @@ void ContextAlbumsView::EditTracks() { void ContextAlbumsView::CopyToDevice() { #ifndef Q_OS_WIN - if (!organise_dialog_) - organise_dialog_.reset(new OrganiseDialog(app_->task_manager())); + if (!organize_dialog_) + organize_dialog_.reset(new OrganizeDialog(app_->task_manager())); - organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); - organise_dialog_->SetCopy(true); - organise_dialog_->SetSongs(GetSelectedSongs()); - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); + organize_dialog_->SetCopy(true); + organize_dialog_->SetSongs(GetSelectedSongs()); + organize_dialog_->show(); #endif } diff --git a/src/context/contextalbumsview.h b/src/context/contextalbumsview.h index 50b6268c..72d384ad 100644 --- a/src/context/contextalbumsview.h +++ b/src/context/contextalbumsview.h @@ -48,7 +48,7 @@ class QPaintEvent; class Application; class ContextAlbumsModel; class EditTagDialog; -class OrganiseDialog; +class OrganizeDialog; class ContextItemDelegate : public QStyledItemDelegate { Q_OBJECT @@ -93,7 +93,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { void AddToPlaylist(); void AddToPlaylistEnqueue(); void OpenInNewPlaylist(); - void Organise(); + void Organize(); void CopyToDevice(); void EditTracks(); void ShowInBrowser(); @@ -112,7 +112,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { QAction *add_to_playlist_; QAction *add_to_playlist_enqueue_; QAction *open_in_new_playlist_; - QAction *organise_; + QAction *organize_; #ifndef Q_OS_WIN QAction *copy_to_device_; #endif @@ -120,7 +120,7 @@ class ContextAlbumsView : public AutoExpandingTreeView { QAction *edit_tracks_; QAction *show_in_browser_; - std::unique_ptr organise_dialog_; + std::unique_ptr organize_dialog_; std::unique_ptr edit_tag_dialog_; bool is_in_keyboard_search_; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 59f4af92..9334317e 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -99,7 +99,7 @@ #include "dialogs/trackselectiondialog.h" #include "dialogs/edittagdialog.h" #include "dialogs/addstreamdialog.h" -#include "organise/organisedialog.h" +#include "organize/organizedialog.h" #include "widgets/fancytabwidget.h" #include "widgets/playingwidget.h" #include "widgets/volumeslider.h" @@ -231,8 +231,8 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co return cover_manager; }), equalizer_(new Equalizer), - organise_dialog_([=]() { - OrganiseDialog *dialog = new OrganiseDialog(app->task_manager(), app->collection_backend(), this); + organize_dialog_([=]() { + OrganizeDialog *dialog = new OrganizeDialog(app->task_manager(), app->collection_backend(), this); dialog->SetDestinationModel(app->collection()->model()->directory_model()); return dialog; }), @@ -345,7 +345,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co #endif playlist_list_->SetApplication(app_); - organise_dialog_->SetDestinationModel(app_->collection()->model()->directory_model()); + organize_dialog_->SetDestinationModel(app_->collection()->model()->directory_model()); // Icons qLog(Debug) << "Creating UI"; @@ -642,7 +642,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co #endif playlist_copy_to_collection_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, SLOT(PlaylistCopyToCollection())); playlist_move_to_collection_ = playlist_menu_->addAction(IconLoader::Load("go-jump"), tr("Move to collection..."), this, SLOT(PlaylistMoveToCollection())); - playlist_organise_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organise files..."), this, SLOT(PlaylistMoveToCollection())); + playlist_organize_ = playlist_menu_->addAction(IconLoader::Load("edit-copy"), tr("Organize files..."), this, SLOT(PlaylistMoveToCollection())); playlist_open_in_browser_ = playlist_menu_->addAction(IconLoader::Load("document-open-folder"), tr("Show in file browser..."), this, SLOT(PlaylistOpenInBrowser())); playlist_open_in_browser_->setVisible(false); playlist_show_in_collection_ = playlist_menu_->addAction(IconLoader::Load("edit-find"), tr("Show in collection..."), this, SLOT(ShowInCollection())); @@ -1703,7 +1703,7 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex #if defined(HAVE_GSTREAMER) && !defined(Q_OS_WIN) playlist_copy_to_device_->setVisible(false); #endif - playlist_organise_->setVisible(false); + playlist_organize_->setVisible(false); if (selected < 1) { playlist_queue_->setVisible(false); @@ -1761,7 +1761,7 @@ void MainWindow::PlaylistRightClick(const QPoint &global_pos, const QModelIndex // Is it a collection item? PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row()); if (item && item->IsLocalCollectionItem() && item->Metadata().id() != -1) { - playlist_organise_->setVisible(editable); + playlist_organize_->setVisible(editable); playlist_show_in_collection_->setVisible(editable); playlist_open_in_browser_->setVisible(true); } @@ -2283,29 +2283,29 @@ void MainWindow::PlayingWidgetPositionChanged(const bool above_status_bar) { void MainWindow::CopyFilesToCollection(const QList &urls) { - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); - organise_dialog_->SetUrls(urls); - organise_dialog_->SetCopy(true); - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_->SetUrls(urls); + organize_dialog_->SetCopy(true); + organize_dialog_->show(); } void MainWindow::MoveFilesToCollection(const QList &urls) { - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); - organise_dialog_->SetUrls(urls); - organise_dialog_->SetCopy(false); - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_->SetUrls(urls); + organize_dialog_->SetCopy(false); + organize_dialog_->show(); } void MainWindow::CopyFilesToDevice(const QList &urls) { #if defined(HAVE_GSTREAMER) && !defined(Q_OS_WIN) - organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); - organise_dialog_->SetCopy(true); - if (organise_dialog_->SetUrls(urls)) - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); + organize_dialog_->SetCopy(true); + if (organize_dialog_->SetUrls(urls)) + organize_dialog_->show(); else { QMessageBox::warning(this, tr("Error"), tr("None of the selected songs were suitable for copying to a device")); } @@ -2332,14 +2332,14 @@ void MainWindow::EditFileTags(const QList &urls) { } void MainWindow::PlaylistCopyToCollection() { - PlaylistOrganiseSelected(true); + PlaylistOrganizeSelected(true); } void MainWindow::PlaylistMoveToCollection() { - PlaylistOrganiseSelected(false); + PlaylistOrganizeSelected(false); } -void MainWindow::PlaylistOrganiseSelected(const bool copy) { +void MainWindow::PlaylistOrganizeSelected(const bool copy) { SongList songs; for (const QModelIndex &proxy_index : ui_->playlist->view()->selectionModel()->selectedRows()) { @@ -2353,10 +2353,10 @@ void MainWindow::PlaylistOrganiseSelected(const bool copy) { } if (songs.isEmpty()) return; - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); - organise_dialog_->SetSongs(songs); - organise_dialog_->SetCopy(copy); - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_->SetSongs(songs); + organize_dialog_->SetCopy(copy); + organize_dialog_->show(); } @@ -2424,10 +2424,10 @@ void MainWindow::PlaylistCopyToDevice() { } if (songs.isEmpty()) return; - organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); - organise_dialog_->SetCopy(true); - if (organise_dialog_->SetSongs(songs)) - organise_dialog_->show(); + organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); + organize_dialog_->SetCopy(true); + if (organize_dialog_->SetSongs(songs)) + organize_dialog_->show(); else { QMessageBox::warning(this, tr("Error"), tr("None of the selected songs were suitable for copying to a device")); } diff --git a/src/core/mainwindow.h b/src/core/mainwindow.h index e67b75e4..7f316415 100644 --- a/src/core/mainwindow.h +++ b/src/core/mainwindow.h @@ -77,7 +77,7 @@ class ErrorDialog; class FileView; class GlobalShortcuts; class MimeData; -class OrganiseDialog; +class OrganizeDialog; class PlaylistListContainer; class QueueView; class SystemTrayIcon; @@ -168,7 +168,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { void PlaylistCopyToCollection(); void PlaylistMoveToCollection(); void PlaylistCopyToDevice(); - void PlaylistOrganiseSelected(const bool copy); + void PlaylistOrganizeSelected(const bool copy); void PlaylistOpenInBrowser(); void ShowInCollection(); @@ -307,7 +307,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { Lazy settings_dialog_; Lazy cover_manager_; std::unique_ptr equalizer_; - Lazy organise_dialog_; + Lazy organize_dialog_; #ifdef HAVE_GSTREAMER Lazy transcode_dialog_; #endif @@ -330,7 +330,7 @@ class MainWindow : public QMainWindow, public PlatformInterface { QAction *playlist_play_pause_; QAction *playlist_stop_after_; QAction *playlist_undoredo_; - QAction *playlist_organise_; + QAction *playlist_organize_; QAction *playlist_show_in_collection_; QAction *playlist_copy_to_collection_; QAction *playlist_move_to_collection_; diff --git a/src/covermanager/albumcoverchoicecontroller.cpp b/src/covermanager/albumcoverchoicecontroller.cpp index b88766a6..6672a677 100644 --- a/src/covermanager/albumcoverchoicecontroller.cpp +++ b/src/covermanager/albumcoverchoicecontroller.cpp @@ -54,7 +54,7 @@ #include "collection/collectionbackend.h" #include "settings/collectionsettingspage.h" -#include "organise/organiseformat.h" +#include "organize/organizeformat.h" #include "internet/internetservices.h" #include "internet/internetservice.h" #include "albumcoverchoicecontroller.h" @@ -164,7 +164,7 @@ void AlbumCoverChoiceController::SaveCoverToFileManual(const Song &song, const Q initial_file_name = initial_file_name + "-" + (song.effective_album().isEmpty() ? tr("unknown") : song.effective_album()) + ".jpg"; initial_file_name = initial_file_name.toLower(); initial_file_name.replace(QRegularExpression("\\s"), "-"); - initial_file_name.remove(OrganiseFormat::kInvalidFatCharacters); + initial_file_name.remove(OrganizeFormat::kInvalidFatCharacters); QString save_filename = QFileDialog::getSaveFileName(this, tr("Save album cover"), GetInitialPathForFileDialog(song, initial_file_name), tr(kSaveImageFileFilter) + ";;" + tr(kAllFilesFilter)); diff --git a/src/covermanager/albumcoverloader.cpp b/src/covermanager/albumcoverloader.cpp index 0f638f64..ae3b1c9a 100644 --- a/src/covermanager/albumcoverloader.cpp +++ b/src/covermanager/albumcoverloader.cpp @@ -47,7 +47,7 @@ #include "core/tagreaderclient.h" #include "core/utilities.h" #include "settings/collectionsettingspage.h" -#include "organise/organiseformat.h" +#include "organize/organizeformat.h" #include "albumcoverloader.h" #include "albumcoverloaderoptions.h" #include "albumcoverloaderresult.h" @@ -108,7 +108,7 @@ QString AlbumCoverLoader::AlbumCoverFilename(QString artist, QString album, cons filename = Utilities::UnicodeToAscii(filename.toLower()); filename = filename.replace(' ', '-'); filename = filename.replace("--", "-"); - filename = filename.remove(OrganiseFormat::kInvalidFatCharacters); + filename = filename.remove(OrganizeFormat::kInvalidFatCharacters); filename = filename.simplified(); if (!extension.isEmpty()) { @@ -149,7 +149,7 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString QString filename; if (source == Song::Source_Collection && cover_album_dir_ && cover_filename_ == CollectionSettingsPage::SaveCover_Pattern && !cover_pattern_.isEmpty()) { filename = CoverFilenameFromVariable(artist, album); - filename.remove(OrganiseFormat::kInvalidFatCharacters); + filename.remove(OrganizeFormat::kInvalidFatCharacters); if (cover_lowercase_) filename = filename.toLower(); if (cover_replace_spaces_) filename.replace(QRegularExpression("\\s"), "-"); if (!extension.isEmpty()) { diff --git a/src/device/afcdevice.cpp b/src/device/afcdevice.cpp index e91a4c72..91693030 100644 --- a/src/device/afcdevice.cpp +++ b/src/device/afcdevice.cpp @@ -180,7 +180,7 @@ void AfcDevice::FinaliseDatabase() { itdb_device_set_sysinfo(db_->device, "FirewireGuid", url_.host().toUtf8().constData()); // Copy the files back to the iPod - // No need to start another thread since we're already in the organiser thread + // No need to start another thread since we're already in the organizer thread AfcTransfer transfer(url_.host(), local_path_, nullptr, shared_from_this()); itdb_start_sync(db_); diff --git a/src/device/deviceview.cpp b/src/device/deviceview.cpp index 47ad224d..c4247e06 100644 --- a/src/device/deviceview.cpp +++ b/src/device/deviceview.cpp @@ -57,8 +57,8 @@ #include "core/mimedata.h" #include "core/musicstorage.h" #include "core/utilities.h" -#include "organise/organisedialog.h" -#include "organise/organiseerrordialog.h" +#include "organize/organizedialog.h" +#include "organize/organizeerrordialog.h" #include "collection/collectiondirectorymodel.h" #include "collection/collectionmodel.h" #include "collection/collectionitemdelegate.h" @@ -213,8 +213,8 @@ void DeviceView::SetApplication(Application *app) { properties_dialog_->SetDeviceManager(app_->device_manager()); - organise_dialog_.reset(new OrganiseDialog(app_->task_manager(), nullptr, this)); - organise_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); + organize_dialog_.reset(new OrganizeDialog(app_->task_manager(), nullptr, this)); + organize_dialog_->SetDestinationModel(app_->collection_model()->directory_model()); } @@ -236,7 +236,7 @@ void DeviceView::contextMenuEvent(QContextMenuEvent *e) { open_in_new_playlist_ = collection_menu_->addAction(IconLoader::Load("document-new"), tr("Open in new playlist"), this, SLOT(OpenInNewPlaylist())); collection_menu_->addSeparator(); - organise_action_ = collection_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, SLOT(Organise())); + organize_action_ = collection_menu_->addAction(IconLoader::Load("edit-copy"), tr("Copy to collection..."), this, SLOT(Organize())); delete_action_ = collection_menu_->addAction(IconLoader::Load("edit-delete"), tr("Delete from device..."), this, SLOT(Delete())); } @@ -263,7 +263,7 @@ void DeviceView::contextMenuEvent(QContextMenuEvent *e) { if (device && !device->LocalPath().isEmpty()) is_filesystem_device = true; } - organise_action_->setEnabled(is_filesystem_device); + organize_action_->setEnabled(is_filesystem_device); collection_menu_->popup(e->globalPos()); } @@ -427,7 +427,7 @@ void DeviceView::Delete() { } -void DeviceView::Organise() { +void DeviceView::Organize() { SongList songs = GetSelectedSongs(); QStringList filenames; @@ -435,9 +435,9 @@ void DeviceView::Organise() { filenames << song.url().toLocalFile(); } - organise_dialog_->SetCopy(true); - organise_dialog_->SetFilenames(filenames); - organise_dialog_->show(); + organize_dialog_->SetCopy(true); + organize_dialog_->SetFilenames(filenames); + organize_dialog_->show(); } @@ -450,8 +450,8 @@ void DeviceView::DeleteFinished(const SongList &songs_with_errors) { if (songs_with_errors.isEmpty()) return; - OrganiseErrorDialog *dialog = new OrganiseErrorDialog(this); - dialog->Show(OrganiseErrorDialog::Type_Delete, songs_with_errors); + OrganizeErrorDialog *dialog = new OrganizeErrorDialog(this); + dialog->Show(OrganizeErrorDialog::Type_Delete, songs_with_errors); // It deletes itself when the user closes it } diff --git a/src/device/deviceview.h b/src/device/deviceview.h index c43b5576..454969f7 100644 --- a/src/device/deviceview.h +++ b/src/device/deviceview.h @@ -47,7 +47,7 @@ class QContextMenuEvent; class Application; class DeviceProperties; class MergedProxyModel; -class OrganiseDialog; +class OrganizeDialog; class DeviceItemDelegate : public CollectionItemDelegate { Q_OBJECT @@ -85,7 +85,7 @@ class DeviceView : public AutoExpandingTreeView { void Load(); void AddToPlaylist(); void OpenInNewPlaylist(); - void Organise(); + void Organize(); void Delete(); void DeviceConnected(QModelIndex idx); @@ -108,7 +108,7 @@ class DeviceView : public AutoExpandingTreeView { QSortFilterProxyModel *sort_model_; std::unique_ptr properties_dialog_; - std::unique_ptr organise_dialog_; + std::unique_ptr organize_dialog_; QMenu *device_menu_; QAction *eject_action_; @@ -119,7 +119,7 @@ class DeviceView : public AutoExpandingTreeView { QAction *load_action_; QAction *add_to_playlist_action_; QAction *open_in_new_playlist_; - QAction *organise_action_; + QAction *organize_action_; QAction *delete_action_; QModelIndex menu_index_; diff --git a/src/device/gpoddevice.cpp b/src/device/gpoddevice.cpp index 146ca405..1bc37f75 100644 --- a/src/device/gpoddevice.cpp +++ b/src/device/gpoddevice.cpp @@ -137,7 +137,7 @@ bool GPodDevice::StartCopy(QList *supported_filetypes) { if (!db_) db_wait_cond_.wait(&db_mutex_); } - // Ensure only one "organise files" can be active at any one time + // Ensure only one "organize files" can be active at any one time db_busy_.lock(); if (supported_filetypes) GetSupportedFiletypes(supported_filetypes); @@ -257,7 +257,7 @@ void GPodDevice::WriteDatabase(bool success) { } } - // This is done in the organise thread so close the unique DB connection. + // This is done in the organize thread so close the unique DB connection. backend_->Close(); songs_to_add_.clear(); diff --git a/src/device/mtpdevice.cpp b/src/device/mtpdevice.cpp index 5893cda0..21eb66a0 100644 --- a/src/device/mtpdevice.cpp +++ b/src/device/mtpdevice.cpp @@ -135,7 +135,7 @@ void MtpDevice::LoaderError(const QString& message) { bool MtpDevice::StartCopy(QList *supported_types) { - // Ensure only one "organise files" can be active at any one time + // Ensure only one "organize files" can be active at any one time db_busy_.lock(); if (!connection_ || !connection_->is_valid()) return false; @@ -200,7 +200,7 @@ void MtpDevice::FinishCopy(bool success) { songs_to_add_.clear(); songs_to_remove_.clear(); - // This is done in the organise thread so close the unique DB connection. + // This is done in the organize thread so close the unique DB connection. backend_->Close(); db_busy_.unlock(); diff --git a/src/organise/organise.cpp b/src/organize/organize.cpp similarity index 93% rename from src/organise/organise.cpp rename to src/organize/organize.cpp index 608afc9f..73ac6a38 100644 --- a/src/organise/organise.cpp +++ b/src/organize/organize.cpp @@ -38,21 +38,21 @@ #include "core/musicstorage.h" #include "core/tagreaderclient.h" #include "core/song.h" -#include "organise.h" +#include "organize.h" #ifdef HAVE_GSTREAMER # include "transcoder/transcoder.h" #endif -class OrganiseFormat; +class OrganizeFormat; using std::placeholders::_1; -const int Organise::kBatchSize = 10; +const int Organize::kBatchSize = 10; #ifdef HAVE_GSTREAMER -const int Organise::kTranscodeProgressInterval = 500; +const int Organize::kTranscodeProgressInterval = 500; #endif -Organise::Organise(TaskManager *task_manager, std::shared_ptr destination, const OrganiseFormat &format, bool copy, bool overwrite, bool mark_as_listened, bool albumcover, const NewSongInfoList &songs_info, bool eject_after, const QString &playlist) +Organize::Organize(TaskManager *task_manager, std::shared_ptr destination, const OrganizeFormat &format, bool copy, bool overwrite, bool mark_as_listened, bool albumcover, const NewSongInfoList &songs_info, bool eject_after, const QString &playlist) : thread_(nullptr), task_manager_(task_manager), #ifdef HAVE_GSTREAMER @@ -80,18 +80,18 @@ Organise::Organise(TaskManager *task_manager, std::shared_ptr dest } -Organise::~Organise() { +Organize::~Organize() { if (thread_) { thread_->quit(); thread_->deleteLater(); } } -void Organise::Start() { +void Organize::Start() { if (thread_) return; - task_id_ = task_manager_->StartTask(tr("Organising files")); + task_id_ = task_manager_->StartTask(tr("Organizing files")); task_manager_->SetTaskBlocksCollectionScans(true); thread_ = new QThread; @@ -106,7 +106,7 @@ void Organise::Start() { } -void Organise::ProcessSomeFiles() { +void Organize::ProcessSomeFiles() { if (!started_) { if (!destination_->StartCopy(&supported_filetypes_)) { @@ -231,7 +231,7 @@ void Organise::ProcessSomeFiles() { job.cover_dest_ = QFileInfo(job.destination_).path() + "/" + QFileInfo(job.cover_source_).fileName(); } - job.progress_ = std::bind(&Organise::SetSongProgress, this, _1, !task.transcoded_filename_.isEmpty()); + job.progress_ = std::bind(&Organize::SetSongProgress, this, _1, !task.transcoded_filename_.isEmpty()); if (!destination_->CopyToStorage(job)) { files_with_errors_ << task.song_info_.song_.basefilename(); @@ -261,7 +261,7 @@ void Organise::ProcessSomeFiles() { } #ifdef HAVE_GSTREAMER -Song::FileType Organise::CheckTranscode(Song::FileType original_type) const { +Song::FileType Organize::CheckTranscode(Song::FileType original_type) const { if (original_type == Song::FileType_Stream) return Song::FileType_Unknown; @@ -289,7 +289,7 @@ Song::FileType Organise::CheckTranscode(Song::FileType original_type) const { } #endif -void Organise::SetSongProgress(float progress, bool transcoded) { +void Organize::SetSongProgress(float progress, bool transcoded) { const int max = transcoded ? 50 : 100; current_copy_progress_ = (transcoded ? 50 : 0) + qBound(0, static_cast(progress * max), max - 1); @@ -297,7 +297,7 @@ void Organise::SetSongProgress(float progress, bool transcoded) { } -void Organise::UpdateProgress() { +void Organize::UpdateProgress() { const int total = task_count_ * 100; @@ -330,7 +330,7 @@ void Organise::UpdateProgress() { } -void Organise::FileTranscoded(const QString &input, const QString &output, bool success) { +void Organize::FileTranscoded(const QString &input, const QString &output, bool success) { Q_UNUSED(output); @@ -348,7 +348,7 @@ void Organise::FileTranscoded(const QString &input, const QString &output, bool } -void Organise::timerEvent(QTimerEvent *e) { +void Organize::timerEvent(QTimerEvent *e) { QObject::timerEvent(e); @@ -360,7 +360,7 @@ void Organise::timerEvent(QTimerEvent *e) { } -void Organise::LogLine(const QString message) { +void Organize::LogLine(const QString message) { QString date(QDateTime::currentDateTime().toString(Qt::TextDate)); log_.append(QString("%1: %2").arg(date, message)); diff --git a/src/organise/organise.h b/src/organize/organize.h similarity index 93% rename from src/organise/organise.h rename to src/organize/organize.h index 2a40bfa5..1983609b 100644 --- a/src/organise/organise.h +++ b/src/organize/organize.h @@ -36,7 +36,7 @@ #include #include "core/song.h" -#include "organiseformat.h" +#include "organizeformat.h" class QThread; class QTimerEvent; @@ -47,7 +47,7 @@ class TaskManager; class Transcoder; #endif -class Organise : public QObject { +class Organize : public QObject { Q_OBJECT public: @@ -58,8 +58,8 @@ class Organise : public QObject { }; typedef QList NewSongInfoList; - explicit Organise(TaskManager *task_manager, std::shared_ptr destination, const OrganiseFormat &format, bool copy, bool overwrite, bool mark_as_listened, bool albumcover, const NewSongInfoList &songs, bool eject_after, const QString &playlist = QString()); - ~Organise() override; + explicit Organize(TaskManager *task_manager, std::shared_ptr destination, const OrganizeFormat &format, bool copy, bool overwrite, bool mark_as_listened, bool albumcover, const NewSongInfoList &songs, bool eject_after, const QString &playlist = QString()); + ~Organize() override; static const int kBatchSize; #ifdef HAVE_GSTREAMER @@ -111,7 +111,7 @@ class Organise : public QObject { std::shared_ptr destination_; QList supported_filetypes_; - const OrganiseFormat format_; + const OrganizeFormat format_; const bool copy_; const bool overwrite_; const bool mark_as_listened_; diff --git a/src/organise/organisedialog.cpp b/src/organize/organizedialog.cpp similarity index 84% rename from src/organise/organisedialog.cpp rename to src/organize/organizedialog.cpp index 44d55ccc..04a0854c 100644 --- a/src/organise/organisedialog.cpp +++ b/src/organize/organizedialog.cpp @@ -63,20 +63,20 @@ #include "widgets/freespacebar.h" #include "widgets/linetextedit.h" #include "collection/collectionbackend.h" -#include "organise.h" -#include "organiseformat.h" -#include "organisedialog.h" -#include "organiseerrordialog.h" -#include "ui_organisedialog.h" +#include "organize.h" +#include "organizeformat.h" +#include "organizedialog.h" +#include "organizeerrordialog.h" +#include "ui_organizedialog.h" -const char *OrganiseDialog::kDefaultFormat = "%albumartist/%album{ (Disc %disc)}/{%track - }{%albumartist - }%album{ (Disc %disc)} - %title.%extension"; +const char *OrganizeDialog::kDefaultFormat = "%albumartist/%album{ (Disc %disc)}/{%track - }{%albumartist - }%album{ (Disc %disc)} - %title.%extension"; -const char *OrganiseDialog::kSettingsGroup = "OrganiseDialog"; +const char *OrganizeDialog::kSettingsGroup = "OrganizeDialog"; -OrganiseDialog::OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend, QWidget *parentwindow, QWidget *parent) +OrganizeDialog::OrganizeDialog(TaskManager *task_manager, CollectionBackend *backend, QWidget *parentwindow, QWidget *parent) : QDialog(parent), parentwindow_(parentwindow), - ui_(new Ui_OrganiseDialog), + ui_(new Ui_OrganizeDialog), task_manager_(task_manager), backend_(backend), total_size_(0) { @@ -110,13 +110,13 @@ OrganiseDialog::OrganiseDialog(TaskManager *task_manager, CollectionBackend *bac tags[tr("Genre")] = "genre"; tags[tr("Comment")] = "comment"; tags[tr("Length")] = "length"; - tags[tr("Bitrate", "Refers to bitrate in file organise dialog.")] = "bitrate"; + tags[tr("Bitrate", "Refers to bitrate in file organize dialog.")] = "bitrate"; tags[tr("Sample rate")] = "samplerate"; tags[tr("Bit depth")] = "bitdepth"; tags[tr("File extension")] = "extension"; // Naming scheme input field - new OrganiseFormat::SyntaxHighlighter(ui_->naming); + new OrganizeFormat::SyntaxHighlighter(ui_->naming); connect(ui_->destination, SIGNAL(currentIndexChanged(int)), SLOT(UpdatePreviews())); connect(ui_->naming, SIGNAL(textChanged()), SLOT(UpdatePreviews())); @@ -143,11 +143,11 @@ OrganiseDialog::OrganiseDialog(TaskManager *task_manager, CollectionBackend *bac } -OrganiseDialog::~OrganiseDialog() { +OrganizeDialog::~OrganizeDialog() { delete ui_; } -void OrganiseDialog::SetDestinationModel(QAbstractItemModel *model, bool devices) { +void OrganizeDialog::SetDestinationModel(QAbstractItemModel *model, bool devices) { ui_->destination->setModel(model); @@ -155,20 +155,20 @@ void OrganiseDialog::SetDestinationModel(QAbstractItemModel *model, bool devices } -void OrganiseDialog::showEvent(QShowEvent*) { +void OrganizeDialog::showEvent(QShowEvent*) { LoadGeometry(); LoadSettings(); } -void OrganiseDialog::closeEvent(QCloseEvent*) { +void OrganizeDialog::closeEvent(QCloseEvent*) { SaveGeometry(); } -void OrganiseDialog::accept() { +void OrganizeDialog::accept() { SaveGeometry(); SaveSettings(); @@ -180,26 +180,26 @@ void OrganiseDialog::accept() { // It deletes itself when it's finished. const bool copy = ui_->aftercopying->currentIndex() == 0; - Organise *organise = new Organise(task_manager_, storage, format_, copy, ui_->overwrite->isChecked(), ui_->mark_as_listened->isChecked(), ui_->albumcover->isChecked(), new_songs_info_, ui_->eject_after->isChecked(), playlist_); - connect(organise, SIGNAL(Finished(QStringList, QStringList)), SLOT(OrganiseFinished(QStringList, QStringList))); - connect(organise, SIGNAL(FileCopied(int)), this, SIGNAL(FileCopied(int))); + Organize *organize = new Organize(task_manager_, storage, format_, copy, ui_->overwrite->isChecked(), ui_->mark_as_listened->isChecked(), ui_->albumcover->isChecked(), new_songs_info_, ui_->eject_after->isChecked(), playlist_); + connect(organize, SIGNAL(Finished(QStringList, QStringList)), SLOT(OrganizeFinished(QStringList, QStringList))); + connect(organize, SIGNAL(FileCopied(int)), this, SIGNAL(FileCopied(int))); if (backend_) - connect(organise, SIGNAL(SongPathChanged(Song, QFileInfo)), backend_, SLOT(SongPathChanged(Song, QFileInfo))); + connect(organize, SIGNAL(SongPathChanged(Song, QFileInfo)), backend_, SLOT(SongPathChanged(Song, QFileInfo))); - organise->Start(); + organize->Start(); QDialog::accept(); } -void OrganiseDialog::reject() { +void OrganizeDialog::reject() { SaveGeometry(); QDialog::reject(); } -void OrganiseDialog::LoadGeometry() { +void OrganizeDialog::LoadGeometry() { if (parentwindow_) { @@ -226,7 +226,7 @@ void OrganiseDialog::LoadGeometry() { } -void OrganiseDialog::SaveGeometry() { +void OrganizeDialog::SaveGeometry() { if (parentwindow_) { QSettings s; @@ -237,7 +237,7 @@ void OrganiseDialog::SaveGeometry() { } -void OrganiseDialog::RestoreDefaults() { +void OrganizeDialog::RestoreDefaults() { ui_->naming->setPlainText(kDefaultFormat); ui_->remove_problematic->setChecked(true); @@ -254,7 +254,7 @@ void OrganiseDialog::RestoreDefaults() { } -void OrganiseDialog::LoadSettings() { +void OrganizeDialog::LoadSettings() { QSettings s; s.beginGroup(kSettingsGroup); @@ -281,7 +281,7 @@ void OrganiseDialog::LoadSettings() { } -void OrganiseDialog::SaveSettings() { +void OrganizeDialog::SaveSettings() { QSettings s; s.beginGroup(kSettingsGroup); @@ -300,7 +300,7 @@ void OrganiseDialog::SaveSettings() { } -bool OrganiseDialog::SetSongs(const SongList &songs) { +bool OrganizeDialog::SetSongs(const SongList &songs) { total_size_ = 0; songs_.clear(); @@ -328,7 +328,7 @@ bool OrganiseDialog::SetSongs(const SongList &songs) { } -bool OrganiseDialog::SetUrls(const QList &urls) { +bool OrganizeDialog::SetUrls(const QList &urls) { QStringList filenames; @@ -343,9 +343,9 @@ bool OrganiseDialog::SetUrls(const QList &urls) { } -bool OrganiseDialog::SetFilenames(const QStringList &filenames) { +bool OrganizeDialog::SetFilenames(const QStringList &filenames) { - songs_future_ = QtConcurrent::run(std::bind(&OrganiseDialog::LoadSongsBlocking, this, filenames)); + songs_future_ = QtConcurrent::run(std::bind(&OrganizeDialog::LoadSongsBlocking, this, filenames)); NewClosure(songs_future_, [=]() { SetSongs(songs_future_.result()); }); SetLoadingSongs(true); @@ -353,7 +353,7 @@ bool OrganiseDialog::SetFilenames(const QStringList &filenames) { } -void OrganiseDialog::SetLoadingSongs(bool loading) { +void OrganizeDialog::SetLoadingSongs(bool loading) { if (loading) { ui_->preview_stack->setCurrentWidget(ui_->loading_page); @@ -366,7 +366,7 @@ void OrganiseDialog::SetLoadingSongs(bool loading) { } -SongList OrganiseDialog::LoadSongsBlocking(const QStringList &filenames) { +SongList OrganizeDialog::LoadSongsBlocking(const QStringList &filenames) { SongList songs; Song song; @@ -392,26 +392,26 @@ SongList OrganiseDialog::LoadSongsBlocking(const QStringList &filenames) { } -void OrganiseDialog::SetCopy(bool copy) { +void OrganizeDialog::SetCopy(bool copy) { ui_->aftercopying->setCurrentIndex(copy ? 0 : 1); } -void OrganiseDialog::SetPlaylist(const QString &playlist) +void OrganizeDialog::SetPlaylist(const QString &playlist) { playlist_ = playlist; } -void OrganiseDialog::InsertTag(const QString &tag) { +void OrganizeDialog::InsertTag(const QString &tag) { ui_->naming->insertPlainText("%" + tag); } -Organise::NewSongInfoList OrganiseDialog::ComputeNewSongsFilenames(const SongList &songs, const OrganiseFormat &format) { +Organize::NewSongInfoList OrganizeDialog::ComputeNewSongsFilenames(const SongList &songs, const OrganizeFormat &format) { // Check if we will have multiple files with the same name. // If so, they will erase each other if the overwrite flag is set. // Better to rename them: e.g. foo.bar -> foo(2).bar QHash filenames; - Organise::NewSongInfoList new_songs_info; + Organize::NewSongInfoList new_songs_info; for (const Song &song : songs) { QString new_filename = format.GetFilenameForSong(song); @@ -420,13 +420,13 @@ Organise::NewSongInfoList OrganiseDialog::ComputeNewSongsFilenames(const SongLis new_filename = Utilities::PathWithoutFilenameExtension(new_filename) + "(" + song_number + ")." + QFileInfo(new_filename).suffix(); } filenames.insert(new_filename, 1); - new_songs_info << Organise::NewSongInfo(song, new_filename); + new_songs_info << Organize::NewSongInfo(song, new_filename); } return new_songs_info; } -void OrganiseDialog::UpdatePreviews() { +void OrganizeDialog::UpdatePreviews() { if (songs_future_.isRunning()) { return; @@ -480,7 +480,7 @@ void OrganiseDialog::UpdatePreviews() { ui_->groupbox_preview->setVisible(has_local_destination); ui_->groupbox_naming->setVisible(has_local_destination); if (has_local_destination) { - for (const Organise::NewSongInfo &song_info : new_songs_info_) { + for (const Organize::NewSongInfo &song_info : new_songs_info_) { QString filename = storage->LocalPath() + "/" + song_info.new_filename_; ui_->preview->addItem(QDir::toNativeSeparators(filename)); } @@ -488,15 +488,15 @@ void OrganiseDialog::UpdatePreviews() { } -QSize OrganiseDialog::sizeHint() const { return QSize(650, 0); } +QSize OrganizeDialog::sizeHint() const { return QSize(650, 0); } -void OrganiseDialog::OrganiseFinished(const QStringList files_with_errors, const QStringList log) { +void OrganizeDialog::OrganizeFinished(const QStringList files_with_errors, const QStringList log) { if (files_with_errors.isEmpty()) return; - error_dialog_.reset(new OrganiseErrorDialog); - error_dialog_->Show(OrganiseErrorDialog::Type_Copy, files_with_errors, log); + error_dialog_.reset(new OrganizeErrorDialog); + error_dialog_->Show(OrganizeErrorDialog::Type_Copy, files_with_errors, log); } -void OrganiseDialog::AllowExtASCII(bool checked) { +void OrganizeDialog::AllowExtASCII(bool checked) { ui_->allow_ascii_ext->setEnabled(checked); } diff --git a/src/organise/organisedialog.h b/src/organize/organizedialog.h similarity index 83% rename from src/organise/organisedialog.h rename to src/organize/organizedialog.h index b74b3885..4fb74284 100644 --- a/src/organise/organisedialog.h +++ b/src/organize/organizedialog.h @@ -38,8 +38,8 @@ #include #include "core/song.h" -#include "organise.h" -#include "organiseformat.h" +#include "organize.h" +#include "organizeformat.h" class QAbstractItemModel; class QWidget; @@ -49,15 +49,15 @@ class QCloseEvent; class TaskManager; class CollectionBackend; -class OrganiseErrorDialog; -class Ui_OrganiseDialog; +class OrganizeErrorDialog; +class Ui_OrganizeDialog; -class OrganiseDialog : public QDialog { +class OrganizeDialog : public QDialog { Q_OBJECT public: - explicit OrganiseDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parentwindow = nullptr, QWidget *parent = nullptr); - ~OrganiseDialog() override; + explicit OrganizeDialog(TaskManager *task_manager, CollectionBackend *backend = nullptr, QWidget *parentwindow = nullptr, QWidget *parent = nullptr); + ~OrganizeDialog() override; static const char *kDefaultFormat; @@ -73,7 +73,7 @@ class OrganiseDialog : public QDialog { void SetCopy(bool copy); - static Organise::NewSongInfoList ComputeNewSongsFilenames(const SongList &songs, const OrganiseFormat &format); + static Organize::NewSongInfoList ComputeNewSongsFilenames(const SongList &songs, const OrganizeFormat &format); void SetPlaylist(const QString &playlist); @@ -103,7 +103,7 @@ class OrganiseDialog : public QDialog { void InsertTag(const QString &tag); void UpdatePreviews(); - void OrganiseFinished(const QStringList files_with_errors, const QStringList log); + void OrganizeFinished(const QStringList files_with_errors, const QStringList log); void AllowExtASCII(bool checked); @@ -111,19 +111,19 @@ class OrganiseDialog : public QDialog { static const char *kSettingsGroup; QWidget *parentwindow_; - Ui_OrganiseDialog *ui_; + Ui_OrganizeDialog *ui_; TaskManager *task_manager_; CollectionBackend *backend_; - OrganiseFormat format_; + OrganizeFormat format_; QFuture songs_future_; SongList songs_; - Organise::NewSongInfoList new_songs_info_; + Organize::NewSongInfoList new_songs_info_; quint64 total_size_; QString playlist_; - std::unique_ptr error_dialog_; + std::unique_ptr error_dialog_; }; diff --git a/src/organise/organisedialog.ui b/src/organize/organizedialog.ui similarity index 97% rename from src/organise/organisedialog.ui rename to src/organize/organizedialog.ui index 1256cb86..51da7926 100644 --- a/src/organise/organisedialog.ui +++ b/src/organize/organizedialog.ui @@ -1,7 +1,7 @@ - OrganiseDialog - + OrganizeDialog + 0 @@ -11,13 +11,13 @@ - Organise Files + Organize Files :/icons/64x64/strawberry.png:/icons/64x64/strawberry.png - + @@ -298,7 +298,7 @@ button_box accepted() - OrganiseDialog + OrganizeDialog accept() @@ -314,7 +314,7 @@ button_box rejected() - OrganiseDialog + OrganizeDialog reject() diff --git a/src/organise/organiseerrordialog.cpp b/src/organize/organizeerrordialog.cpp similarity index 85% rename from src/organise/organiseerrordialog.cpp rename to src/organize/organizeerrordialog.cpp index 8d031e3c..87154b6b 100644 --- a/src/organise/organiseerrordialog.cpp +++ b/src/organize/organizeerrordialog.cpp @@ -33,10 +33,10 @@ #include #include -#include "organiseerrordialog.h" -#include "ui_organiseerrordialog.h" +#include "organizeerrordialog.h" +#include "ui_organizeerrordialog.h" -OrganiseErrorDialog::OrganiseErrorDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_OrganiseErrorDialog) { +OrganizeErrorDialog::OrganizeErrorDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_OrganizeErrorDialog) { ui_->setupUi(this); @@ -47,11 +47,11 @@ OrganiseErrorDialog::OrganiseErrorDialog(QWidget *parent) : QDialog(parent), ui_ } -OrganiseErrorDialog::~OrganiseErrorDialog() { +OrganizeErrorDialog::~OrganizeErrorDialog() { delete ui_; } -void OrganiseErrorDialog::Show(OperationType type, const SongList &songs_with_errors, const QStringList &log) { +void OrganizeErrorDialog::Show(OperationType type, const SongList &songs_with_errors, const QStringList &log) { QStringList files; for (const Song &song : songs_with_errors) { @@ -61,7 +61,7 @@ void OrganiseErrorDialog::Show(OperationType type, const SongList &songs_with_er } -void OrganiseErrorDialog::Show(OperationType type, const QStringList &files_with_errors, const QStringList &log) { +void OrganizeErrorDialog::Show(OperationType type, const QStringList &files_with_errors, const QStringList &log) { QStringList sorted_files = files_with_errors; std::stable_sort(sorted_files.begin(), sorted_files.end()); diff --git a/src/organise/organiseerrordialog.h b/src/organize/organizeerrordialog.h similarity index 87% rename from src/organise/organiseerrordialog.h rename to src/organize/organizeerrordialog.h index 286dcbb0..353afdc2 100644 --- a/src/organise/organiseerrordialog.h +++ b/src/organize/organizeerrordialog.h @@ -32,14 +32,14 @@ #include "core/song.h" -class Ui_OrganiseErrorDialog; +class Ui_OrganizeErrorDialog; -class OrganiseErrorDialog : public QDialog { +class OrganizeErrorDialog : public QDialog { Q_OBJECT public: - explicit OrganiseErrorDialog(QWidget *parent = nullptr); - ~OrganiseErrorDialog() override; + explicit OrganizeErrorDialog(QWidget *parent = nullptr); + ~OrganizeErrorDialog() override; enum OperationType { Type_Copy, @@ -50,7 +50,7 @@ class OrganiseErrorDialog : public QDialog { void Show(OperationType type, const QStringList &files_with_errors, const QStringList &log = QStringList()); private: - Ui_OrganiseErrorDialog *ui_; + Ui_OrganizeErrorDialog *ui_; }; #endif // ORGANISEERRORDIALOG_H diff --git a/src/organise/organiseerrordialog.ui b/src/organize/organizeerrordialog.ui similarity index 92% rename from src/organise/organiseerrordialog.ui rename to src/organize/organizeerrordialog.ui index 4ec8bd89..5e13ccc5 100644 --- a/src/organise/organiseerrordialog.ui +++ b/src/organize/organizeerrordialog.ui @@ -1,7 +1,7 @@ - OrganiseErrorDialog - + OrganizeErrorDialog + 0 @@ -74,7 +74,7 @@ buttonBox accepted() - OrganiseErrorDialog + OrganizeErrorDialog accept() @@ -90,7 +90,7 @@ buttonBox rejected() - OrganiseErrorDialog + OrganizeErrorDialog reject() diff --git a/src/organise/organiseformat.cpp b/src/organize/organizeformat.cpp similarity index 85% rename from src/organise/organiseformat.cpp rename to src/organize/organizeformat.cpp index e9cd273b..7b1cdb6e 100644 --- a/src/organise/organiseformat.cpp +++ b/src/organize/organizeformat.cpp @@ -44,11 +44,11 @@ #include "core/utilities.h" #include "core/song.h" -#include "organiseformat.h" +#include "organizeformat.h" -const char *OrganiseFormat::kTagPattern = "\\%([a-zA-Z]*)"; -const char *OrganiseFormat::kBlockPattern = "\\{([^{}]+)\\}"; -const QStringList OrganiseFormat::kKnownTags = QStringList() << "title" +const char *OrganizeFormat::kTagPattern = "\\%([a-zA-Z]*)"; +const char *OrganizeFormat::kBlockPattern = "\\{([^{}]+)\\}"; +const QStringList OrganizeFormat::kKnownTags = QStringList() << "title" << "album" << "artist" << "artistinitial" @@ -69,23 +69,23 @@ const QStringList OrganiseFormat::kKnownTags = QStringList() << "title" << "grouping" << "lyrics"; -const QRegularExpression OrganiseFormat::kInvalidDirCharacters("[/\\\\]"); -const QRegularExpression OrganiseFormat::kProblematicCharacters("[:?*\"<>|]"); +const QRegularExpression OrganizeFormat::kInvalidDirCharacters("[/\\\\]"); +const QRegularExpression OrganizeFormat::kProblematicCharacters("[:?*\"<>|]"); // From http://en.wikipedia.org/wiki/8.3_filename#Directory_table -const QRegularExpression OrganiseFormat::kInvalidFatCharacters("[^a-zA-Z0-9!#\\$%&'()\\-@\\^_`{}~/. ]"); +const QRegularExpression OrganizeFormat::kInvalidFatCharacters("[^a-zA-Z0-9!#\\$%&'()\\-@\\^_`{}~/. ]"); -const char OrganiseFormat::kInvalidPrefixCharacters[] = "."; -const int OrganiseFormat::kInvalidPrefixCharactersCount = arraysize(OrganiseFormat::kInvalidPrefixCharacters) - 1; +const char OrganizeFormat::kInvalidPrefixCharacters[] = "."; +const int OrganizeFormat::kInvalidPrefixCharactersCount = arraysize(OrganizeFormat::kInvalidPrefixCharacters) - 1; -const QRgb OrganiseFormat::SyntaxHighlighter::kValidTagColorLight = qRgb(64, 64, 255); -const QRgb OrganiseFormat::SyntaxHighlighter::kInvalidTagColorLight = qRgb(255, 64, 64); -const QRgb OrganiseFormat::SyntaxHighlighter::kBlockColorLight = qRgb(230, 230, 230); +const QRgb OrganizeFormat::SyntaxHighlighter::kValidTagColorLight = qRgb(64, 64, 255); +const QRgb OrganizeFormat::SyntaxHighlighter::kInvalidTagColorLight = qRgb(255, 64, 64); +const QRgb OrganizeFormat::SyntaxHighlighter::kBlockColorLight = qRgb(230, 230, 230); -const QRgb OrganiseFormat::SyntaxHighlighter::kValidTagColorDark = qRgb(128, 128, 255); -const QRgb OrganiseFormat::SyntaxHighlighter::kInvalidTagColorDark = qRgb(255, 128, 128); -const QRgb OrganiseFormat::SyntaxHighlighter::kBlockColorDark = qRgb(64, 64, 64); +const QRgb OrganizeFormat::SyntaxHighlighter::kValidTagColorDark = qRgb(128, 128, 255); +const QRgb OrganizeFormat::SyntaxHighlighter::kInvalidTagColorDark = qRgb(255, 128, 128); +const QRgb OrganizeFormat::SyntaxHighlighter::kBlockColorDark = qRgb(64, 64, 64); -OrganiseFormat::OrganiseFormat(const QString &format) +OrganizeFormat::OrganizeFormat(const QString &format) : format_(format), remove_problematic_(false), remove_non_fat_(false), @@ -93,12 +93,12 @@ OrganiseFormat::OrganiseFormat(const QString &format) allow_ascii_ext_(false), replace_spaces_(true) {} -void OrganiseFormat::set_format(const QString &v) { +void OrganizeFormat::set_format(const QString &v) { format_ = v; format_.replace('\\', '/'); } -bool OrganiseFormat::IsValid() const { +bool OrganizeFormat::IsValid() const { int pos = 0; QString format_copy(format_); @@ -108,7 +108,7 @@ bool OrganiseFormat::IsValid() const { } -QString OrganiseFormat::GetFilenameForSong(const Song &song) const { +QString OrganizeFormat::GetFilenameForSong(const Song &song) const { QString filename = ParseBlock(format_, song); @@ -178,7 +178,7 @@ QString OrganiseFormat::GetFilenameForSong(const Song &song) const { } -QString OrganiseFormat::ParseBlock(QString block, const Song &song, bool *any_empty) const { +QString OrganizeFormat::ParseBlock(QString block, const Song &song, bool *any_empty) const { QRegularExpression tag_regexp(kTagPattern); QRegularExpression block_regexp(kBlockPattern); @@ -215,7 +215,7 @@ QString OrganiseFormat::ParseBlock(QString block, const Song &song, bool *any_em } -QString OrganiseFormat::TagValue(const QString &tag, const Song &song) const { +QString OrganizeFormat::TagValue(const QString &tag, const Song &song) const { QString value; @@ -280,9 +280,9 @@ QString OrganiseFormat::TagValue(const QString &tag, const Song &song) const { } -OrganiseFormat::Validator::Validator(QObject *parent) : QValidator(parent) {} +OrganizeFormat::Validator::Validator(QObject *parent) : QValidator(parent) {} -QValidator::State OrganiseFormat::Validator::validate(QString &input, int&) const { +QValidator::State OrganizeFormat::Validator::validate(QString &input, int&) const { QRegularExpression tag_regexp(kTagPattern); @@ -304,7 +304,7 @@ QValidator::State OrganiseFormat::Validator::validate(QString &input, int&) cons int pos = 0; for (re_match = tag_regexp.match(input, pos) ; re_match.hasMatch() ; re_match = tag_regexp.match(input, pos)) { pos = re_match.capturedStart(); - if (!OrganiseFormat::kKnownTags.contains(re_match.captured(1))) + if (!OrganizeFormat::kKnownTags.contains(re_match.captured(1))) return QValidator::Invalid; pos += re_match.capturedLength(); @@ -314,16 +314,16 @@ QValidator::State OrganiseFormat::Validator::validate(QString &input, int&) cons } -OrganiseFormat::SyntaxHighlighter::SyntaxHighlighter(QObject *parent) +OrganizeFormat::SyntaxHighlighter::SyntaxHighlighter(QObject *parent) : QSyntaxHighlighter(parent) {} -OrganiseFormat::SyntaxHighlighter::SyntaxHighlighter(QTextEdit *parent) +OrganizeFormat::SyntaxHighlighter::SyntaxHighlighter(QTextEdit *parent) : QSyntaxHighlighter(parent) {} -OrganiseFormat::SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent) +OrganizeFormat::SyntaxHighlighter::SyntaxHighlighter(QTextDocument *parent) : QSyntaxHighlighter(parent) {} -void OrganiseFormat::SyntaxHighlighter::highlightBlock(const QString &text) { +void OrganizeFormat::SyntaxHighlighter::highlightBlock(const QString &text) { const bool light = QApplication::palette().color(QPalette::Base).value() > 128; const QRgb block_color = light ? kBlockColorLight : kBlockColorDark; @@ -353,7 +353,7 @@ void OrganiseFormat::SyntaxHighlighter::highlightBlock(const QString &text) { for (re_match = tag_regexp.match(text, pos) ; re_match.hasMatch() ; re_match = tag_regexp.match(text, pos)) { pos = re_match.capturedStart(); QTextCharFormat f = format(pos); - f.setForeground(QColor(OrganiseFormat::kKnownTags.contains(re_match.captured(1)) ? valid_tag_color : invalid_tag_color)); + f.setForeground(QColor(OrganizeFormat::kKnownTags.contains(re_match.captured(1)) ? valid_tag_color : invalid_tag_color)); setFormat(pos, re_match.capturedLength(), f); pos += re_match.capturedLength(); diff --git a/src/organise/organiseformat.h b/src/organize/organizeformat.h similarity index 97% rename from src/organise/organiseformat.h rename to src/organize/organizeformat.h index 85d63b26..e98f20a7 100644 --- a/src/organise/organiseformat.h +++ b/src/organize/organizeformat.h @@ -35,10 +35,10 @@ class QTextDocument; class QTextEdit; class Song; -class OrganiseFormat { +class OrganizeFormat { public: - explicit OrganiseFormat(const QString &format = QString()); + explicit OrganizeFormat(const QString &format = QString()); static const char *kTagPattern; static const char *kBlockPattern; diff --git a/src/playlist/playlistlistcontainer.cpp b/src/playlist/playlistlistcontainer.cpp index 06386a79..3c082a2a 100644 --- a/src/playlist/playlistlistcontainer.cpp +++ b/src/playlist/playlistlistcontainer.cpp @@ -53,7 +53,7 @@ #include "playlistlistmodel.h" #include "playlistmanager.h" #include "ui_playlistlistcontainer.h" -#include "organise/organisedialog.h" +#include "organize/organizedialog.h" #include "settings/appearancesettingspage.h" #ifndef Q_OS_WIN # include "device/devicemanager.h" @@ -345,12 +345,12 @@ void PlaylistListContainer::ItemDoubleClicked(const QModelIndex &proxy_index) { void PlaylistListContainer::CopyToDevice() { #ifndef Q_OS_WIN - // Reuse the organise dialog, but set the detail about the playlist name - if (!organise_dialog_) { - organise_dialog_.reset(new OrganiseDialog {app_->task_manager()}); + // Reuse the organize dialog, but set the detail about the playlist name + if (!organize_dialog_) { + organize_dialog_.reset(new OrganizeDialog {app_->task_manager()}); } - organise_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); - organise_dialog_->SetCopy(true); + organize_dialog_->SetDestinationModel(app_->device_manager()->connected_devices_model(), true); + organize_dialog_->SetCopy(true); const QModelIndex ¤t_index = proxy_->mapToSource(ui_->tree->currentIndex()); @@ -360,11 +360,11 @@ void PlaylistListContainer::CopyToDevice() QStandardItem *item = model_->PlaylistById(playlist_id); QString playlist_name = item ? item->text() : tr("Playlist"); - organise_dialog_->SetPlaylist(playlist_name); + organize_dialog_->SetPlaylist(playlist_name); // Get the songs in the playlist - organise_dialog_->SetSongs(app_->playlist_manager()->playlist(playlist_id)->GetAllSongs()); - organise_dialog_->show(); + organize_dialog_->SetSongs(app_->playlist_manager()->playlist(playlist_id)->GetAllSongs()); + organize_dialog_->show(); } #endif } diff --git a/src/playlist/playlistlistcontainer.h b/src/playlist/playlistlistcontainer.h index acbb327f..bf17560b 100644 --- a/src/playlist/playlistlistcontainer.h +++ b/src/playlist/playlistlistcontainer.h @@ -42,7 +42,7 @@ class Application; class Playlist; class PlaylistListModel; class Ui_PlaylistListContainer; -class OrganiseDialog; +class OrganizeDialog; class PlaylistListContainer : public QWidget { Q_OBJECT @@ -109,7 +109,7 @@ private: int active_playlist_id_; - std::unique_ptr organise_dialog_; + std::unique_ptr organize_dialog_; }; #endif // PLAYLISTLISTCONTAINER_H diff --git a/src/translations/cs.po b/src/translations/cs.po index 34ca63ec..579e8ab7 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -427,7 +427,7 @@ msgstr "1 stopa" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -684,7 +684,7 @@ msgstr "Přidána během tří měsíců" msgid "Advanced grouping..." msgstr "Pokročilé seskupování..." -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Po zkopírování..." @@ -693,7 +693,7 @@ msgid "Albu&m cover" msgstr "Obal alb&a" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -713,7 +713,7 @@ msgid "Album - Disc" msgstr "Album - Disk" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -774,7 +774,7 @@ msgstr "Všechny soubory (*)" msgid "All playlists (%1)" msgstr "Všechny seznamy skladeb (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Povolit rozšířené ASCII znaky" @@ -844,7 +844,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Opravdu chcete nastavit statistiku této písně znovu?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -852,7 +852,7 @@ msgstr "Opravdu chcete nastavit statistiku této písně znovu?" msgid "Artist" msgstr "Umělec" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Začáteční písmena umělce" @@ -982,7 +982,7 @@ msgid "Best" msgstr "Nejlepší" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 #, fuzzy @@ -1004,8 +1004,8 @@ msgstr "Datový tok" msgid "Bitrate" msgstr "Datový tok" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Datový tok" @@ -1200,7 +1200,7 @@ msgstr "Barvy" msgid "Comma separated list of class:level, level is 0-3" msgstr "Čárkou oddělený seznam class:level, level je 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Poznámka" @@ -1214,7 +1214,7 @@ msgid "Complete tags automatically..." msgstr "Doplnit značky automaticky..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1275,7 +1275,7 @@ msgstr "Převést všechnu hudbu" msgid "Convert any music that the device can't play" msgstr "Převést veškerou hudbu, kterou zařízení nedokáže přehrát" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Kopírovat obrázek alba" @@ -1530,7 +1530,7 @@ msgstr "Smazat z disku..." msgid "Delete preset" msgstr "Smazat předvolbu" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Smazat původní soubory" @@ -1546,7 +1546,7 @@ msgstr "Odstranit vybrané skladby z řady" msgid "Dequeue track" msgstr "Odstranit skladbu z řady" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Cíl" @@ -1589,7 +1589,7 @@ msgid "Disabled" msgstr "Zakázáno" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1812,11 +1812,11 @@ msgstr "Chyba" msgid "Error connecting MTP device %1" msgstr "Chyba při připojování k MTP zařízení %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Chyba při kopírování písní" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Chyba při mazání písní" @@ -1956,7 +1956,7 @@ msgstr "Chyba při stahování obalu" msgid "File %1 is not recognized as a valid audio file." msgstr "Soubor %1 nebyl rozpoznán jako platný zvukový soubor." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Přípona souboru" @@ -2118,7 +2118,7 @@ msgid "Genius Authentication" msgstr "Ověření Genius" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2215,7 +2215,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Seskupovat podle žánru/umělce/alba" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2340,7 +2340,7 @@ msgstr "Zvýšit hlasitost o procent" msgid "Information" msgstr "Informace" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Vložit..." @@ -2387,7 +2387,7 @@ msgstr "Zachovat poměr stran" msgid "Keep running in the background when the window is closed" msgstr "Při zavření okna nechat běžet na pozadí" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Zachovat původní soubory" @@ -2429,7 +2429,7 @@ msgid "Left" msgstr "Vlevo" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Délka" @@ -2494,7 +2494,7 @@ msgstr "Nahrávají se skladby" msgid "Loading tracks info" msgstr "Nahrávají se informace o skladbě" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Nahrává se..." @@ -2556,7 +2556,7 @@ msgstr "Spravovat uložená seskupení" msgid "Manufacturer" msgstr "Výrobce" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Označit jako poslechnuté" @@ -2687,7 +2687,7 @@ msgstr "Ztlumit" msgid "Name" msgstr "Název" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Volby pro pojmenování" @@ -2882,17 +2882,17 @@ msgstr "Volby..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Uspořádat soubory" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Uspořádat soubory..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Uspořádávají se soubory" #: dialogs/trackselectiondialog.cpp:195 @@ -2900,7 +2900,7 @@ msgid "Original tags" msgstr "Původní značky" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Původní rok" @@ -2927,7 +2927,7 @@ msgstr "Možnosti výstupu" msgid "Overwrite existing file" msgstr "Přepsat existující soubor" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Přepsat existující soubory" @@ -2971,7 +2971,7 @@ msgid "Paused" msgstr "Pozastaveno" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3139,7 +3139,7 @@ msgstr "Možnosti vzhledu OSD" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Náhled" @@ -3293,7 +3293,7 @@ msgstr "Odstranit seznam skladeb" msgid "Remove playlists" msgstr "Odstranit seznamy skladeb" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Odstranit problémové znaky z názvů souborů" @@ -3335,7 +3335,7 @@ msgstr "Nahradit současný seznam skladeb" msgid "Replace spaces with dashes" msgstr "Nahradit mezery pomlčkami" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Nahradit mezery podtržítky" @@ -3384,11 +3384,11 @@ msgstr "" "Spustit znovu přehrávání skladby, nebo přehrávat předchozí skladbu, jestliže " "ještě neuběhlo osm sekund od začátku skladby." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Omezit na ASCII znaky" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Omezit na znaky dostupné na FAT systémech souborů" @@ -3466,12 +3466,12 @@ msgstr "Proxy SOCKS" msgid "Safely remove device" msgstr "Bezpečně odebrat zařízení" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Po dokončení kopírování bezpečně odebrat zařízení" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4172,7 +4172,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Na tomto albu jsou další písně" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4180,7 +4180,7 @@ msgstr "" "Při kopírování některých písní nastaly potíže. Nepodařilo se zkopírovat " "následující soubory:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4288,7 +4288,7 @@ msgid "Timezone" msgstr "Časová zóna" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4335,7 +4335,7 @@ msgstr "Celkem přeneseno bajtů" msgid "Total network requests made" msgstr "Celkem uskutečněno síťových požadavků" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4632,7 +4632,7 @@ msgid "Write metadata when saving playlists" msgstr "Zapisovat metadata při ukládání seznamů skladeb" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4685,7 +4685,7 @@ msgid "You are signed in." msgstr "Jste přihlášen." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Můžete změnit způsob uspořádání písní v hudební sbírce." #: dialogs/about.cpp:128 diff --git a/src/translations/de.po b/src/translations/de.po index 9d6353c0..36be122e 100644 --- a/src/translations/de.po +++ b/src/translations/de.po @@ -455,7 +455,7 @@ msgstr "1 Titel" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -714,7 +714,7 @@ msgstr "In den letzten drei Monaten hinzugefügt" msgid "Advanced grouping..." msgstr "Erweiterte Sortierung …" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Nach dem Kopieren …" @@ -723,7 +723,7 @@ msgid "Albu&m cover" msgstr "Albu&m cover" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -743,7 +743,7 @@ msgid "Album - Disc" msgstr "Album - Disc" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -803,7 +803,7 @@ msgstr "Alle Dateien (*)" msgid "All playlists (%1)" msgstr "Alle Wiedergabelisten (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Erlaube erweiterete ASCII Zeichen" @@ -878,7 +878,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Wollen Sie die Statistiken dieses Titels wirklich zurücksetzen?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -886,7 +886,7 @@ msgstr "Wollen Sie die Statistiken dieses Titels wirklich zurücksetzen?" msgid "Artist" msgstr "Interpret" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Initialen des Interpreten" @@ -1015,7 +1015,7 @@ msgid "Best" msgstr "Optimal" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1036,8 +1036,8 @@ msgstr "Bitrate" msgid "Bitrate" msgstr "Bitrate" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Bitrate" @@ -1232,7 +1232,7 @@ msgstr "Farben" msgid "Comma separated list of class:level, level is 0-3" msgstr "Komma getrennte Liste mit »class:level« (Level ist 0-3)" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Kommentar" @@ -1246,7 +1246,7 @@ msgid "Complete tags automatically..." msgstr "Schlagworte automatisch vervollständigen …" #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1309,7 +1309,7 @@ msgstr "Gesamte Musik umwandeln" msgid "Convert any music that the device can't play" msgstr "Musik umwandeln, die das Gerät nicht wiedergeben kann" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Kopiere Album Cover " @@ -1563,7 +1563,7 @@ msgstr "Vom Datenträger löschen …" msgid "Delete preset" msgstr "Voreinstellung löschen" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Ursprüngliche Dateien löschen" @@ -1579,7 +1579,7 @@ msgstr "Titel aus der Warteschlange nehmen" msgid "Dequeue track" msgstr "Titel aus der Warteschlange nehmen" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Ziel:" @@ -1622,7 +1622,7 @@ msgid "Disabled" msgstr "Deaktiviert" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1847,11 +1847,11 @@ msgstr "Fehler" msgid "Error connecting MTP device %1" msgstr "Fehler beim Verbinden zu MTP Gerät %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Fehler beim Kopieren der Titel" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Fehler beim Löschen der Titel" @@ -1991,7 +1991,7 @@ msgstr "Abrufen des Titelbildes ist fehlgeschlagen" msgid "File %1 is not recognized as a valid audio file." msgstr "Datei %1 kann nicht als korrekte Audiodatei erkannt werden." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Dateiendung" @@ -2151,7 +2151,7 @@ msgid "Genius Authentication" msgstr "Genius Authentifizierung" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2246,7 +2246,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Genre/Interpret/Album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2373,7 +2373,7 @@ msgstr "Lautstärke um Prozent erhöhen" msgid "Information" msgstr "Information" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Einfügen …" @@ -2418,7 +2418,7 @@ msgid "Keep running in the background when the window is closed" msgstr "" "Im Hintergrund weiterlaufen lassen, wenn das Fenster geschlossen wurde" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Ursprüngliche Dateien behalten" @@ -2460,7 +2460,7 @@ msgid "Left" msgstr "Links" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Länge" @@ -2525,7 +2525,7 @@ msgstr "Titel werden geladen" msgid "Loading tracks info" msgstr "Titelinfo wird geladen" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Wird geladen …" @@ -2587,7 +2587,7 @@ msgstr "Gespeicherte Sortierungen verwalten" msgid "Manufacturer" msgstr "Hersteller" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Als gehört markieren" @@ -2718,7 +2718,7 @@ msgstr "Stumm" msgid "Name" msgstr "Name" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Benennungsoptionen" @@ -2915,17 +2915,17 @@ msgstr "Optionen …" msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Dateien organisieren" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Dateien organisieren …" -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Dateien organisieren" #: dialogs/trackselectiondialog.cpp:195 @@ -2933,7 +2933,7 @@ msgid "Original tags" msgstr "Ursprüngliche Schlagworte" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Ursprüngliches Jahr" @@ -2960,7 +2960,7 @@ msgstr "Ausgabeoptionen" msgid "Overwrite existing file" msgstr "Überschreibe bestehende Datei" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Bestehende Dateien überschreiben" @@ -3004,7 +3004,7 @@ msgid "Paused" msgstr "Pausiert" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3173,7 +3173,7 @@ msgstr "Einstellungen für die Strawberry-Bildschirmanzeige" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Vorschau" @@ -3330,7 +3330,7 @@ msgstr "Wiedergabeliste entfernen" msgid "Remove playlists" msgstr "Wiedergabeliste entfernen" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Entferne problematische Zeichen von Dateinamen" @@ -3372,7 +3372,7 @@ msgstr "Wiedergabeliste ersetzen" msgid "Replace spaces with dashes" msgstr "Leerzeichen durch Bindestriche ersetzen" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Leerzeichen mit Unterstrichen ersetzen" @@ -3420,11 +3420,11 @@ msgstr "" "Starten Sie den Titel oder den vorherigen Titel, wenn sie innerhalb von 8 " "Sekunden nach Beginn." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Begrenze Zeichen auf ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Beschränkung auf die in FAT-Dateisystemen erlaubten Zeichen" @@ -3502,12 +3502,12 @@ msgstr "SOCKS-Proxy" msgid "Safely remove device" msgstr "Gerät sicher entfernen" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Das Gerät nach dem Kopiervorgang sicher entfernen" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4204,7 +4204,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Dieses Album enthält auch andere Titel" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4212,7 +4212,7 @@ msgstr "" "Beim Kopieren einiger Titel ist ein Fehler aufgetreten. Die folgenden " "Dateien konnten nicht kopiert werden:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4327,7 +4327,7 @@ msgid "Timezone" msgstr "Zeitzone" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4373,7 +4373,7 @@ msgstr "Insgesamt übertragene Bytes" msgid "Total network requests made" msgstr "Insgesamt gestellte Netzwerkanfragen" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4672,7 +4672,7 @@ msgid "Write metadata when saving playlists" msgstr "Metadaten schreiben, wenn Wiedergabelisten gespeichert werden" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4723,7 +4723,7 @@ msgid "You are signed in." msgstr "Sie sind angemeldet." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Sie können hier einstellen, wie Ihre Bibliothek sortiert wird." #: dialogs/about.cpp:128 diff --git a/src/translations/es.po b/src/translations/es.po index 62b7b011..45537708 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -449,7 +449,7 @@ msgstr "1 pista" msgid "40%" msgstr "40 %" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -706,7 +706,7 @@ msgstr "Añadidas en los últimos tres meses" msgid "Advanced grouping..." msgstr "Agrupamiento avanzado…" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Después de copiar…" @@ -715,7 +715,7 @@ msgid "Albu&m cover" msgstr "&Portada del álbum" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -735,7 +735,7 @@ msgid "Album - Disc" msgstr "Álbum - Disco" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -795,7 +795,7 @@ msgstr "Todos los archivos (*)" msgid "All playlists (%1)" msgstr "Todas las listas de reproducción (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Admitir caracteres ASCII extendidos" @@ -866,7 +866,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "¿Seguro que deseas restablecer las estadísticas de esta canción?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -874,7 +874,7 @@ msgstr "¿Seguro que deseas restablecer las estadísticas de esta canción?" msgid "Artist" msgstr "Artista" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Iniciales del artista" @@ -1003,7 +1003,7 @@ msgid "Best" msgstr "Mejor" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1024,8 +1024,8 @@ msgstr "Bit_rate" msgid "Bitrate" msgstr "Tasa bits" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Tasa bits" @@ -1221,7 +1221,7 @@ msgstr "Colores" msgid "Comma separated list of class:level, level is 0-3" msgstr "Lista separada por comas de la clase:nivel, el nivel es 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Comentario" @@ -1235,7 +1235,7 @@ msgid "Complete tags automatically..." msgstr "Completar etiquetas automáticamente" #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1298,7 +1298,7 @@ msgstr "Convertir todas las pistas" msgid "Convert any music that the device can't play" msgstr "Convertir las pistas que el dispositivo no pueda reproducir" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Copiar la portada del álbum" @@ -1552,7 +1552,7 @@ msgstr "Eliminar del disco…" msgid "Delete preset" msgstr "Eliminar ajuste predefinido" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Eliminar los archivos originales" @@ -1568,7 +1568,7 @@ msgstr "Quitar las pistas seleccionadas de la cola" msgid "Dequeue track" msgstr "Quitar la pista de la cola" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Destino" @@ -1611,7 +1611,7 @@ msgid "Disabled" msgstr "Desactivado" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1835,11 +1835,11 @@ msgstr "Error" msgid "Error connecting MTP device %1" msgstr "Error al conectar al dispositivo MTP %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Error al copiar pistas" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Error al eliminar pistas" @@ -1979,7 +1979,7 @@ msgstr "Error al obtener la portada" msgid "File %1 is not recognized as a valid audio file." msgstr "El archivo de audio %1 no parece válido." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Extensión del archivo" @@ -2139,7 +2139,7 @@ msgid "Genius Authentication" msgstr "Autentificación Genius" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2238,7 +2238,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Agrupar por Género/Artista/Álbum" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2366,7 +2366,7 @@ msgstr "Aumentar el volumen en %" msgid "Information" msgstr "Información" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Insertar…" @@ -2410,7 +2410,7 @@ msgstr "Mantener proporción" msgid "Keep running in the background when the window is closed" msgstr "Seguir ejecutando el programa en segundo plano al cerrar la ventana" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Mantener los archivos originales" @@ -2452,7 +2452,7 @@ msgid "Left" msgstr "Izquierda" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Duración" @@ -2517,7 +2517,7 @@ msgstr "Cargando pistas" msgid "Loading tracks info" msgstr "Cargando información de pistas" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Cargando…" @@ -2579,7 +2579,7 @@ msgstr "Gestionar agrupamientos guardados" msgid "Manufacturer" msgstr "Fabricante" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Marcar como escuchado" @@ -2710,7 +2710,7 @@ msgstr "Silenciar" msgid "Name" msgstr "Nombre" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Opciones de nomenclatura" @@ -2907,17 +2907,17 @@ msgstr "Opciones…" msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Organizar archivos" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Organizar archivos…" -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Organizando archivos" #: dialogs/trackselectiondialog.cpp:195 @@ -2925,7 +2925,7 @@ msgid "Original tags" msgstr "Etiquetas originales" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Año original" @@ -2952,7 +2952,7 @@ msgstr "Opciones de salida" msgid "Overwrite existing file" msgstr "Sobrescribir archivo existente" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Sobreescribir los archivos existentes" @@ -2996,7 +2996,7 @@ msgid "Paused" msgstr "En pausa" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3165,7 +3165,7 @@ msgstr "Panel de información en pantalla chulo" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Previsualización" @@ -3319,7 +3319,7 @@ msgstr "Eliminar lista de reproducción" msgid "Remove playlists" msgstr "Eliminar listas de reproducción" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Elimina caracteres especiales de nombres de archivo" @@ -3361,7 +3361,7 @@ msgstr "Reemplazar lista de reproducción actual" msgid "Replace spaces with dashes" msgstr "Sustituir espacios por guiones" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Sustituir espacios pòr caracteres de subrayado" @@ -3408,11 +3408,11 @@ msgstr "" "Reiniciar la pista o saltar a la anterior si no han transcurrido 8 segundos " "desde su inicio." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Limitar caracteres a conjunto ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Limitar a caracteres permitidos en sistemas de archivos FAT" @@ -3490,12 +3490,12 @@ msgstr "Proxy SOCKS" msgid "Safely remove device" msgstr "Quitar dispositivo con seguridad" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Quitar dispositivo con seguridad después de copiar" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4188,7 +4188,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Hay otras pistas en este álbum" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4196,7 +4196,7 @@ msgstr "" "Hubo problemas al copiar algunas pistas. No se pudieron copiar los " "siguientes archivos:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4310,7 +4310,7 @@ msgid "Timezone" msgstr "Zona horaria" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4356,7 +4356,7 @@ msgstr "Total de bytes transferidos" msgid "Total network requests made" msgstr "Total de solicitudes hechas a la red" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4654,7 +4654,7 @@ msgid "Write metadata when saving playlists" msgstr "Escribir los metadatos al guardar las listas de reproducción" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4706,7 +4706,7 @@ msgid "You are signed in." msgstr "Has iniciado sesión en tu cuenta." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "" "Puedes modificar el modo en que se organizan los temas de la colección." diff --git a/src/translations/fr.po b/src/translations/fr.po index 82ecf408..9681350a 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -454,7 +454,7 @@ msgstr "Une piste" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -714,7 +714,7 @@ msgstr "Ajouté au cours des 3 derniers mois" msgid "Advanced grouping..." msgstr "Groupement avancé..." -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Après avoir copié..." @@ -723,7 +723,7 @@ msgid "Albu&m cover" msgstr "&Pochette de l'album" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -743,7 +743,7 @@ msgid "Album - Disc" msgstr "Album - CD" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -803,7 +803,7 @@ msgstr "Tous les fichiers (*)" msgid "All playlists (%1)" msgstr "Toutes les listes de lecture (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Autoriser le jeu étendu des caractères ASCII" @@ -880,7 +880,7 @@ msgstr "" "Êtes vous sûr(e) de vouloir réinitialiser les statistiques de ce morceau ?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -888,7 +888,7 @@ msgstr "" msgid "Artist" msgstr "Artiste" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Initiale de l'artiste" @@ -1018,7 +1018,7 @@ msgid "Best" msgstr "Meilleur" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1039,8 +1039,8 @@ msgstr "Débit" msgid "Bitrate" msgstr "Débit" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Débit binaire" @@ -1239,7 +1239,7 @@ msgstr "" "Liste séparée par une virgule des classes:niveau, le niveau étant entre 1 et " "3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Commentaire" @@ -1253,7 +1253,7 @@ msgid "Complete tags automatically..." msgstr "Compléter les tags automatiquement..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1316,7 +1316,7 @@ msgstr "Convertir toutes les musiques" msgid "Convert any music that the device can't play" msgstr "Convertir la musique que le périphérique ne peut pas lire" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Copier la pochette de l'album" @@ -1571,7 +1571,7 @@ msgstr "Supprimer du disque..." msgid "Delete preset" msgstr "Effacer le pré-réglage" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Supprimer les fichiers originaux" @@ -1587,7 +1587,7 @@ msgstr "Enlever les pistes sélectionnées de la file d'attente" msgid "Dequeue track" msgstr "Enlever cette piste de la file d'attente" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Destination" @@ -1630,7 +1630,7 @@ msgid "Disabled" msgstr "Désactivé" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1858,11 +1858,11 @@ msgstr "Erreur" msgid "Error connecting MTP device %1" msgstr "Erreur lors de la connexion au périphérique MTP %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Erreur lors de la copie des morceaux" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Erreur lors de la suppression des morceaux" @@ -2002,7 +2002,7 @@ msgstr "Erreur lors de la récupération de la pochette" msgid "File %1 is not recognized as a valid audio file." msgstr "Le fichier %1 n'est pas un fichier audio valide." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Extension de fichier" @@ -2163,7 +2163,7 @@ msgid "Genius Authentication" msgstr "Authentification Genius" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2258,7 +2258,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Grouper par Genre/Artiste/Album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2385,7 +2385,7 @@ msgstr "Augmenter le volume de pour-cent" msgid "Information" msgstr "Information" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Insérer..." @@ -2429,7 +2429,7 @@ msgstr "Conserver les proportions" msgid "Keep running in the background when the window is closed" msgstr "Laisser tourner en arrière plan lorsque la fenêtre est fermée" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Conserver les fichiers originaux" @@ -2471,7 +2471,7 @@ msgid "Left" msgstr "Gauche" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Durée" @@ -2536,7 +2536,7 @@ msgstr "Chargement des pistes" msgid "Loading tracks info" msgstr "Chargement des info des pistes" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Chargement..." @@ -2598,7 +2598,7 @@ msgstr "Gérer les regroupement enregistrés" msgid "Manufacturer" msgstr "Fabricant" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Marquer comme lu" @@ -2733,7 +2733,7 @@ msgstr "Sourdine" msgid "Name" msgstr "Nom" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Options de nommage" @@ -2931,17 +2931,17 @@ msgstr "Options..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" -msgstr "Organiser les fichiers" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" +msgstr "Organizer les fichiers" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Organisation des fichiers..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Organisation des fichiers" #: dialogs/trackselectiondialog.cpp:195 @@ -2949,7 +2949,7 @@ msgid "Original tags" msgstr "Tags originaux" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Année d'origine" @@ -2976,7 +2976,7 @@ msgstr "Options de sortie" msgid "Overwrite existing file" msgstr "Écraser le fichier existant" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Écraser les fichiers existants" @@ -3020,7 +3020,7 @@ msgid "Paused" msgstr "En pause" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3189,7 +3189,7 @@ msgstr "Options de l'affichage à l'écran (OSD)" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Aperçu" @@ -3346,7 +3346,7 @@ msgstr "Supprimer la liste de lecture" msgid "Remove playlists" msgstr "Supprimer les listes de lecture" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Supprimer les caractères problématiques des noms de fichiers" @@ -3388,7 +3388,7 @@ msgstr "Remplacer la liste de lecture actuelle" msgid "Replace spaces with dashes" msgstr "Remplacer les espaces par des tirets" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Remplacer les espaces par des traits de soulignement" @@ -3435,11 +3435,11 @@ msgstr "" "Redémarre le morceau ou lit le morceau précédent si utilisé durant les 8 " "premières secondes." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Limiter aux caractères ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Limiter aux caractères autorisés sur les systèmes FAT" @@ -3517,12 +3517,12 @@ msgstr "Serveur mandataire SOCKS" msgid "Safely remove device" msgstr "Enlever le périphérique en toute sécurité" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Enlever le périphérique en toute sécurité à la fin de la copie" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4217,7 +4217,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Il y a d'autres morceaux dans cet album" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4225,7 +4225,7 @@ msgstr "" "Il y a eu un problème pour copier certains morceaux. Les fichiers suivant " "n'ont pas pu être copiés :" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4344,7 +4344,7 @@ msgid "Timezone" msgstr "Fuseau horaire" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4390,7 +4390,7 @@ msgstr "Nombre total d'octets transférés" msgid "Total network requests made" msgstr "Nombre total de requêtes réseau effectuées" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4690,7 +4690,7 @@ msgid "Write metadata when saving playlists" msgstr "Écrire des métadonnées lors de la sauvegarde des listes de lecture" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4743,7 +4743,7 @@ msgid "You are signed in." msgstr "Vous êtes connecté." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "" "Vous pouvez changer la manière dont les morceaux de la bibliothèque sont " "organisés." diff --git a/src/translations/hu.po b/src/translations/hu.po index 2b38172d..1b2103eb 100644 --- a/src/translations/hu.po +++ b/src/translations/hu.po @@ -431,7 +431,7 @@ msgstr "1 szám" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -691,7 +691,7 @@ msgstr "Hozzáadva három hónapon belül" msgid "Advanced grouping..." msgstr "Egyedi csoportosítás…" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Másolás után…" @@ -700,7 +700,7 @@ msgid "Albu&m cover" msgstr "&Albumborító" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -720,7 +720,7 @@ msgid "Album - Disc" msgstr "Album - Lemez" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -780,7 +780,7 @@ msgstr "Minden fájl (*)" msgid "All playlists (%1)" msgstr "Összes lejátszólista (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Bővített ASCII karakterek engedélyezése" @@ -850,7 +850,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Biztos benne, hogy visszaállítja ennek a dalnak a statisztikáit?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -858,7 +858,7 @@ msgstr "Biztos benne, hogy visszaállítja ennek a dalnak a statisztikáit?" msgid "Artist" msgstr "Előadó" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Előadó kezdése" @@ -987,7 +987,7 @@ msgid "Best" msgstr "Legjobb" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1008,8 +1008,8 @@ msgstr "Bitráta" msgid "Bitrate" msgstr "Bitráta" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Bitráta" @@ -1208,7 +1208,7 @@ msgstr "" "Vesszővel elválasztott lista az osztály:szint pároknak, a szintek 0-3 " "értékeket vehetnek fel" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Megjegyzés" @@ -1222,7 +1222,7 @@ msgid "Complete tags automatically..." msgstr "Címkék automatikus kiegészítése" #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1284,7 +1284,7 @@ msgstr "Összes zene konvertálása" msgid "Convert any music that the device can't play" msgstr "Az eszköz által nem támogatott zenék konvertálása" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Albumborító másolása" @@ -1538,7 +1538,7 @@ msgstr "Törlés a lemezről..." msgid "Delete preset" msgstr "Beállítás törlése" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Az eredeti fájlok törlése" @@ -1554,7 +1554,7 @@ msgstr "Kijelölt számok eltávolítása a lejátszási sorból" msgid "Dequeue track" msgstr "Szám eltávolítása a lejátszási sorból" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Cél" @@ -1597,7 +1597,7 @@ msgid "Disabled" msgstr "Letiltva" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1820,11 +1820,11 @@ msgstr "Hiba" msgid "Error connecting MTP device %1" msgstr "Hiba az MTP eszközre való csatlakozáskor: %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Hiba történt a dalok másolása közben" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Hiba történt a dalok törlése közben" @@ -1964,7 +1964,7 @@ msgstr "Hiba a borító betöltése közben" msgid "File %1 is not recognized as a valid audio file." msgstr "A (z)% 1 fájl nem ismerhető fel érvényes hangfájlként." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Fájlkiterjesztés" @@ -2124,7 +2124,7 @@ msgid "Genius Authentication" msgstr "Genius hitelesítés" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2219,7 +2219,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Csoportosítás műfaj/előadó/album szerint" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2345,7 +2345,7 @@ msgstr "Hangerő növelése százalékkal" msgid "Information" msgstr "Információ" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Beszúrás..." @@ -2389,7 +2389,7 @@ msgstr "Képarány megtartása" msgid "Keep running in the background when the window is closed" msgstr "Bezárt ablak esetén futás a háttérben" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Eredeti fájlok megőrzése" @@ -2431,7 +2431,7 @@ msgid "Left" msgstr "Bal" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Időtartam" @@ -2496,7 +2496,7 @@ msgstr "Számok betöltése" msgid "Loading tracks info" msgstr "Száminformációk betöltése" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Betöltés..." @@ -2558,7 +2558,7 @@ msgstr "Mentett csoportosítások kezelése" msgid "Manufacturer" msgstr "Gyártó" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Megjelölés meghallgatottként" @@ -2689,7 +2689,7 @@ msgstr "Némítás" msgid "Name" msgstr "Név" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Elnevezési opciók" @@ -2885,17 +2885,17 @@ msgstr "Beállítások..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Fájlok rendezése" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Fájlok rendezése..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Fájlok rendezés alatt" #: dialogs/trackselectiondialog.cpp:195 @@ -2903,7 +2903,7 @@ msgid "Original tags" msgstr "Eredeti címkék" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Eredeti megjelenés" @@ -2930,7 +2930,7 @@ msgstr "Kimenet beállításai" msgid "Overwrite existing file" msgstr "Létező fájl felülírása" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Létező fájlok felülírása" @@ -2974,7 +2974,7 @@ msgid "Paused" msgstr "Szüneteltetve" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3144,7 +3144,7 @@ msgstr "Saját OSD beállítások" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Előnézet" @@ -3302,7 +3302,7 @@ msgstr "Lejátszólista eltávolítása" msgid "Remove playlists" msgstr "Lejátszólisták eltávolítása" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Problémás karakterek eltávolítása a fájlnevekből" @@ -3344,7 +3344,7 @@ msgstr "Aktuális lejátszólista cseréje" msgid "Replace spaces with dashes" msgstr "Szóközök lecserélése kötőjelekkel" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Szóközök lecserélése aláhúzásjelekkel" @@ -3390,11 +3390,11 @@ msgid "" msgstr "" "Szám újraindítása, vagy az előző szám lejátszása, ha 8 mp-en belül tartott." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Csak az ASCII-ban engedélyezett karakterek használata" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Csak a FAT fájlrendszerekben engedélyezett karakterek használata" @@ -3472,12 +3472,12 @@ msgstr "SOCKS proxy" msgid "Safely remove device" msgstr "Eszköz biztonságos eltávolítása" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Eszköz biztonságos eltávolítása másolás után" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4170,7 +4170,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Vannak más dalok is ebben az albumban" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4178,7 +4178,7 @@ msgstr "" "Néhány dal másolása közben hiba lépett fel. Az alábbi fájlokat nem sikerült " "másolni:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4290,7 +4290,7 @@ msgid "Timezone" msgstr "Időzóna" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4337,7 +4337,7 @@ msgstr "Összes átküldött bájt" msgid "Total network requests made" msgstr "Összes hálózati kérelem" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4633,7 +4633,7 @@ msgid "Write metadata when saving playlists" msgstr "Lejátszólisták mentésekor metaadatok írása" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4685,7 +4685,7 @@ msgid "You are signed in." msgstr "Be van jelentkezve." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Megváltoztathatja a dalok gyűjteményben való rendezésének módját." #: dialogs/about.cpp:128 diff --git a/src/translations/id.po b/src/translations/id.po index 1d368921..e73303c5 100644 --- a/src/translations/id.po +++ b/src/translations/id.po @@ -427,7 +427,7 @@ msgstr "1 trek" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -685,7 +685,7 @@ msgstr "Ditambahkan pada tiga bulan terakhir" msgid "Advanced grouping..." msgstr "Pengelompokkan lanjut..." -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Setelah menyalin..." @@ -694,7 +694,7 @@ msgid "Albu&m cover" msgstr "Sa&mpul album" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -714,7 +714,7 @@ msgid "Album - Disc" msgstr "Album - Cakram" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -774,7 +774,7 @@ msgstr "Semua berkas (*)" msgid "All playlists (%1)" msgstr "Semua daftar putar (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Perbolehkan karakter ASCII diperpanjang" @@ -844,7 +844,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Apakah Anda yakin ingin mengeset-ulang statistik lagu ini?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -852,7 +852,7 @@ msgstr "Apakah Anda yakin ingin mengeset-ulang statistik lagu ini?" msgid "Artist" msgstr "Artis" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Inisial artis" @@ -981,7 +981,7 @@ msgid "Best" msgstr "Terbaik" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1002,8 +1002,8 @@ msgstr "Laju bit" msgid "Bitrate" msgstr "Lajubit" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Lajubit" @@ -1196,7 +1196,7 @@ msgstr "Warna" msgid "Comma separated list of class:level, level is 0-3" msgstr "Daftar yang dipisahkan koma dari kelas:level, level adalah 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Komentar" @@ -1210,7 +1210,7 @@ msgid "Complete tags automatically..." msgstr "Lengkapi tag secara otomatis..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1272,7 +1272,7 @@ msgstr "Konversi semua musik" msgid "Convert any music that the device can't play" msgstr "Konversi semua musik yang tidak dapat diputar oleh perangkat." -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Salin sampul album" @@ -1526,7 +1526,7 @@ msgstr "Hapus dari diska..." msgid "Delete preset" msgstr "Hapus prasetel" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Hapus berkas yang asli" @@ -1542,7 +1542,7 @@ msgstr "Buang antrean trek terpilih" msgid "Dequeue track" msgstr "Buang antrean trek" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Tujuan" @@ -1585,7 +1585,7 @@ msgid "Disabled" msgstr "Nonfungsi" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1807,11 +1807,11 @@ msgstr "Kesalahan" msgid "Error connecting MTP device %1" msgstr "Terjadi kesalahan saat menyambungkan perangkat MTP %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Terjadi kesalahan saat menyalin lagu" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Terjadi kesalahan saat menghapus lagu" @@ -1951,7 +1951,7 @@ msgstr "Terjadi kesalahan saat mengambil sampul" msgid "File %1 is not recognized as a valid audio file." msgstr "Berkas %1 bukanlah berkas audio yang benar." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Ekstensi berkas" @@ -2111,7 +2111,7 @@ msgid "Genius Authentication" msgstr "" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2206,7 +2206,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Grup berdasarkan Genre/Artis/Album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2329,7 +2329,7 @@ msgstr "Naikkan volume persen" msgid "Information" msgstr "Informasi" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Sisipkan..." @@ -2371,7 +2371,7 @@ msgstr "Jaga aspek ratio" msgid "Keep running in the background when the window is closed" msgstr "Tetap jalankan di belakang layar ketika jendela ditutup" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Simpan berkas yang asli" @@ -2413,7 +2413,7 @@ msgid "Left" msgstr "Kiri" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Durasi" @@ -2478,7 +2478,7 @@ msgstr "Memuat trek" msgid "Loading tracks info" msgstr "Memuat info trek" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Memuat..." @@ -2540,7 +2540,7 @@ msgstr "Kelola pengelompokan tersimpan" msgid "Manufacturer" msgstr "Produsen" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Tandai sudah didengar" @@ -2671,7 +2671,7 @@ msgstr "Bisu" msgid "Name" msgstr "Nama" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Opsi penamaan" @@ -2867,17 +2867,17 @@ msgstr "Opsi..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Atur Berkas" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Atur berkas..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Mengatur berkas" #: dialogs/trackselectiondialog.cpp:195 @@ -2885,7 +2885,7 @@ msgid "Original tags" msgstr "Tag asli" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Tahun asli" @@ -2912,7 +2912,7 @@ msgstr "Opsi keluaran" msgid "Overwrite existing file" msgstr "Timpa berkas yang sudah ada" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Timpa berkas yang ada" @@ -2956,7 +2956,7 @@ msgid "Paused" msgstr "Jeda" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3118,7 +3118,7 @@ msgstr "Opsi Pretty OSD" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Pratinjau" @@ -3271,7 +3271,7 @@ msgstr "Buang daftar putar" msgid "Remove playlists" msgstr "Buang daftar putar" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "" @@ -3313,7 +3313,7 @@ msgstr "Ganti daftar putar saat ini" msgid "Replace spaces with dashes" msgstr "Ganti spasi dengan garis strip" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Ganti spasi dengan garis bawah" @@ -3360,11 +3360,11 @@ msgstr "" "Mulai ulang trek, atau putar trek sebelumnya jika masih dalam 8 detik sejak " "mulai." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Bataskan ke karakter ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Bataskan ke karakter yang diperbolehkan oleh sistem file FAT" @@ -3442,12 +3442,12 @@ msgstr "Proxy SOCKS" msgid "Safely remove device" msgstr "Secara aman melepas perangkat" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Secara aman melepas perangkat setelah menyalin" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4138,7 +4138,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Ada lagu lainnya di dalam album ini" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4146,7 +4146,7 @@ msgstr "" "Ada masalah penyalinan pada beberapa lagu. Berkas-berkas berikut tidak " "dapat disalin:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4257,7 +4257,7 @@ msgid "Timezone" msgstr "Zona waktu" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4303,7 +4303,7 @@ msgstr "Jumlah byte yang ditransfer" msgid "Total network requests made" msgstr "Total permintaan jaringan yang dibuat" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4601,7 +4601,7 @@ msgid "Write metadata when saving playlists" msgstr "Tulis metadata saat menyimpan daftar putar" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4653,7 +4653,7 @@ msgid "You are signed in." msgstr "Anda sudah masuk." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Anda dapat mengubah cara pengaturan lagu dalam pustaka." #: dialogs/about.cpp:128 diff --git a/src/translations/it.po b/src/translations/it.po index c140059c..10713fdb 100644 --- a/src/translations/it.po +++ b/src/translations/it.po @@ -423,7 +423,7 @@ msgstr "una traccia" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -682,7 +682,7 @@ msgstr "Aggiunti negli ultimi tre mesi" msgid "Advanced grouping..." msgstr "Raggruppamento avanzato..." -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Dopo la copia..." @@ -691,7 +691,7 @@ msgid "Albu&m cover" msgstr "Copertina dell'albu&m" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -711,7 +711,7 @@ msgid "Album - Disc" msgstr "Album - Disco" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -771,7 +771,7 @@ msgstr "Tutti i file (*)" msgid "All playlists (%1)" msgstr "Tutte le scalette (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Consenti i caratteri ASCII estesi" @@ -842,7 +842,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Sei sicuro di voler azzerare le statistiche del brano?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -850,7 +850,7 @@ msgstr "Sei sicuro di voler azzerare le statistiche del brano?" msgid "Artist" msgstr "Artista" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Iniziale dell'artista" @@ -979,7 +979,7 @@ msgid "Best" msgstr "Migliore" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1000,8 +1000,8 @@ msgstr "Bitrate" msgid "Bitrate" msgstr "Bitrate" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Bitrate" @@ -1196,7 +1196,7 @@ msgstr "Colori" msgid "Comma separated list of class:level, level is 0-3" msgstr "Elenco separato da virgole di classe:livello, livello è 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Commento" @@ -1210,7 +1210,7 @@ msgid "Complete tags automatically..." msgstr "Completa automaticamente i tag..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1273,7 +1273,7 @@ msgstr "Converti tutta la musica" msgid "Convert any music that the device can't play" msgstr "Converti qualsiasi musica che il dispositivo non può riprodurre" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Copia la copertina dell'album" @@ -1527,7 +1527,7 @@ msgstr "Elimina dal disco..." msgid "Delete preset" msgstr "Elimina la preimpostazione" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Elimina i file originali" @@ -1543,7 +1543,7 @@ msgstr "Rimuovi le tracce selezionate dalla coda" msgid "Dequeue track" msgstr "Rimuovi tracce dalla coda" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Destinazione" @@ -1586,7 +1586,7 @@ msgid "Disabled" msgstr "Disabilitata" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1810,11 +1810,11 @@ msgstr "Errore" msgid "Error connecting MTP device %1" msgstr "Errore durante la connessione MTP al dispositivo %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Errore durante la copia dei brani" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Errore durante l'eliminazione dei brani" @@ -1954,7 +1954,7 @@ msgstr "Errore di scaricamento della copertina" msgid "File %1 is not recognized as a valid audio file." msgstr "Il file %1 non è stato riconosciuto come un file audio valido." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Estensione file" @@ -2115,7 +2115,7 @@ msgid "Genius Authentication" msgstr "" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2211,7 +2211,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Raggruppa per genere/artista/album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2337,7 +2337,7 @@ msgstr "Aumenta il volume del percento" msgid "Information" msgstr "Informazioni" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Inserisci..." @@ -2379,7 +2379,7 @@ msgstr "Mantieni le proporzioni" msgid "Keep running in the background when the window is closed" msgstr "Mantieni l'esecuzione sullo sfondo quando la finestra è chiusa" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Mantieni i file originali" @@ -2421,7 +2421,7 @@ msgid "Left" msgstr "Sinistra" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Durata" @@ -2486,7 +2486,7 @@ msgstr "Caricamento delle tracce" msgid "Loading tracks info" msgstr "Caricamento informazioni della traccia" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Caricamento in corso..." @@ -2548,7 +2548,7 @@ msgstr "Gestisci raggruppamenti salvati" msgid "Manufacturer" msgstr "Produttore" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Marca come ascoltata" @@ -2679,7 +2679,7 @@ msgstr "Silenzia" msgid "Name" msgstr "Nome" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Opzioni di assegnazione dei nomi" @@ -2876,17 +2876,17 @@ msgstr "Opzioni..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Organizza file" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Organizza file..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Organizzazione file" #: dialogs/trackselectiondialog.cpp:195 @@ -2894,7 +2894,7 @@ msgid "Original tags" msgstr "Tag originali" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Anno originale" @@ -2921,7 +2921,7 @@ msgstr "Opzioni di uscita" msgid "Overwrite existing file" msgstr "Sovrascrivi un file esistente" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Sovrascrivi i file esistenti" @@ -2965,7 +2965,7 @@ msgid "Paused" msgstr "In pausa" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3133,7 +3133,7 @@ msgstr "Opzioni OSD gradevole" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Anteprima" @@ -3286,7 +3286,7 @@ msgstr "Rimuovi la scaletta" msgid "Remove playlists" msgstr "Rimuovi scalette" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "" @@ -3328,7 +3328,7 @@ msgstr "Sostituisci la scaletta attuale" msgid "Replace spaces with dashes" msgstr "Sostituisci gli spazi con dei trattini" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Sostituisci gli spazzi con dei trattini bassi" @@ -3375,11 +3375,11 @@ msgstr "" "Riavvia la traccia, o riproduci la traccia precedente se entro 8 secondi " "dall'avvio." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Restringi i caratteri ad ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Restringi i caratteri a quelli permessi dal filesystem FAT" @@ -3457,12 +3457,12 @@ msgstr "Proxy SOCKS" msgid "Safely remove device" msgstr "Rimuovi il dispositivo in sicurezza" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Rimuovi il dispositivo in sicurezza al termine della copia" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4159,7 +4159,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Ci sono altri brani in questo album" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4167,7 +4167,7 @@ msgstr "" "Si sono verificati dei problemi durante la copia di alcuni brani. I seguenti " "file potrebbero non essere copiati:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4281,7 +4281,7 @@ msgid "Timezone" msgstr "Fuso orario" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4327,7 +4327,7 @@ msgstr "Totale byte trasferiti" msgid "Total network requests made" msgstr "Totale richieste di rete effettuate" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4623,7 +4623,7 @@ msgid "Write metadata when saving playlists" msgstr "Scrivi i metadata quando si salvano le playlist" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4675,7 +4675,7 @@ msgid "You are signed in." msgstr "Sei registrato." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Puoi modificare l'organizzazione dei brani nella raccolta." #: dialogs/about.cpp:128 diff --git a/src/translations/ko.po b/src/translations/ko.po index bd290459..1861ae7a 100644 --- a/src/translations/ko.po +++ b/src/translations/ko.po @@ -420,7 +420,7 @@ msgstr "트랙 1개" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -676,7 +676,7 @@ msgstr "3개월 이내에 추가됨" msgid "Advanced grouping..." msgstr "고급 그룹..." -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "복사한 후..." @@ -685,7 +685,7 @@ msgid "Albu&m cover" msgstr "앨범아트(&M)" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -705,7 +705,7 @@ msgid "Album - Disc" msgstr "앨범 - 디스크" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -765,7 +765,7 @@ msgstr "모든 파일 (*)" msgid "All playlists (%1)" msgstr "모든 재생 목록(%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "확장 ASCII 글자 허용" @@ -835,7 +835,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "이 곡의 통계를 초기화하시겠습니까?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -843,7 +843,7 @@ msgstr "이 곡의 통계를 초기화하시겠습니까?" msgid "Artist" msgstr "아티스트" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "아티스트 이니셜" @@ -972,7 +972,7 @@ msgid "Best" msgstr "최고" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -993,8 +993,8 @@ msgstr "비트 전송률" msgid "Bitrate" msgstr "비트 전송률" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "비트 전송률" @@ -1186,7 +1186,7 @@ msgstr "색상" msgid "Comma separated list of class:level, level is 0-3" msgstr "쉼표로 구분된 class:level 목록, level은 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "설명" @@ -1200,7 +1200,7 @@ msgid "Complete tags automatically..." msgstr "자동으로 태그 완성..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1261,7 +1261,7 @@ msgstr "모든 곡 변환" msgid "Convert any music that the device can't play" msgstr "장치에서 재생할 수 없는 곡 변환" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "앨범아트 복사" @@ -1510,7 +1510,7 @@ msgstr "디스크에서 삭제..." msgid "Delete preset" msgstr "사전 설정 삭제" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "원본 파일 삭제" @@ -1526,7 +1526,7 @@ msgstr "선택한 트랙을 대기열에서 삭제" msgid "Dequeue track" msgstr "대기열에서 트랙 삭제" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "대상" @@ -1569,7 +1569,7 @@ msgid "Disabled" msgstr "사용 안 함" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1791,11 +1791,11 @@ msgstr "오류" msgid "Error connecting MTP device %1" msgstr "MTP 장치 %1 연결 오류" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "노래 복사 오류" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "노래 삭제 오류" @@ -1935,7 +1935,7 @@ msgstr "표지 가져오기 오류" msgid "File %1 is not recognized as a valid audio file." msgstr "%1 파일은 올바른 오디오 파일이 아닌 것 같습니다." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "파일 확장자" @@ -2094,7 +2094,7 @@ msgid "Genius Authentication" msgstr "" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2189,7 +2189,7 @@ msgid "Group by Genre/Artist/Album" msgstr "장르/아티스트/앨범으로 그룹" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2308,7 +2308,7 @@ msgstr "%만큼 음량 올리기" msgid "Information" msgstr "정보" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "삽입..." @@ -2350,7 +2350,7 @@ msgstr "종횡비 유지" msgid "Keep running in the background when the window is closed" msgstr "창을 닫아도 백그라운드에서 계속 실행" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "원본 파일 유지" @@ -2392,7 +2392,7 @@ msgid "Left" msgstr "왼쪽" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "길이" @@ -2457,7 +2457,7 @@ msgstr "트랙 불러오는 중" msgid "Loading tracks info" msgstr "트랙 정보 불러오는 중" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "불러오는 중..." @@ -2519,7 +2519,7 @@ msgstr "저장한 그룹 관리" msgid "Manufacturer" msgstr "제조사" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "들었음으로 표시" @@ -2650,7 +2650,7 @@ msgstr "음소거" msgid "Name" msgstr "이름" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "이름 짓기 옵션" @@ -2842,17 +2842,17 @@ msgstr "옵션..." msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "파일 정리" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "파일 정리..." -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "파일 정리 중" #: dialogs/trackselectiondialog.cpp:195 @@ -2860,7 +2860,7 @@ msgid "Original tags" msgstr "원본 태그" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "원본 년도" @@ -2887,7 +2887,7 @@ msgstr "저장 옵션" msgid "Overwrite existing file" msgstr "기존 파일 덮어쓰기" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "기존 파일 덮어쓰기" @@ -2931,7 +2931,7 @@ msgid "Paused" msgstr "일시 정지됨" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3093,7 +3093,7 @@ msgstr "예쁜 OSD 옵션" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "미리 보기" @@ -3246,7 +3246,7 @@ msgstr "재생 목록 삭제" msgid "Remove playlists" msgstr "재생 목록 삭제" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "" @@ -3288,7 +3288,7 @@ msgstr "현재 재생 목록 대체" msgid "Replace spaces with dashes" msgstr "공백을 줄표로 대체" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "공백을 밑줄로 대체" @@ -3333,11 +3333,11 @@ msgid "" "Restart the track, or play the previous track if within 8 seconds of start." msgstr "트랙을 다시 시작하거나, 재생한 지 8초 이내라면 이전 트랙을 재생합니다." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "ASCII로 글자 제한" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "FAT 파일 시스템에서 사용할 수 있는 글자로 제한" @@ -3415,12 +3415,12 @@ msgstr "SOCKS 프록시" msgid "Safely remove device" msgstr "안전하게 장치 제거" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "복사 후 안전하게 장치 제거" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4106,13 +4106,13 @@ msgstr "Strawberry의 업데이트한 버전에 다음 기능이 추가되어 msgid "There are other songs in this album" msgstr "이 앨범에 다른 곡이 있습니다" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" msgstr "일부 곡을 복사하는 중 문제가 발생했습니다. 다음 파일을 복사할 수 없습니다: " -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4208,7 +4208,7 @@ msgid "Timezone" msgstr "시간대" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4254,7 +4254,7 @@ msgstr "전송된 총 바이트" msgid "Total network requests made" msgstr "총 네트워크 요청 수" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4546,7 +4546,7 @@ msgid "Write metadata when saving playlists" msgstr "재생 목록을 저장할 때 메타데이터 쓰기" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4595,7 +4595,7 @@ msgid "You are signed in." msgstr "로그인했습니다." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "라이브러리의 곡을 정리하는 방법을 변경할 수 있습니다." #: dialogs/about.cpp:128 diff --git a/src/translations/nb.po b/src/translations/nb.po index cd9811f6..1295b6e8 100644 --- a/src/translations/nb.po +++ b/src/translations/nb.po @@ -422,7 +422,7 @@ msgstr "1 spor" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -679,7 +679,7 @@ msgstr "Lagt til innen tre måneder" msgid "Advanced grouping..." msgstr "Avansert gruppering…" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Etter kopiering…" @@ -688,7 +688,7 @@ msgid "Albu&m cover" msgstr "Albu&m kover" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -708,7 +708,7 @@ msgid "Album - Disc" msgstr "Album - Disc" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -768,7 +768,7 @@ msgstr "Alle filer (*)" msgid "All playlists (%1)" msgstr "Alle spillelister (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Tillat utvidet ASCII tegn" @@ -839,7 +839,7 @@ msgstr "" "Er du sikker på at du ønsker å nullstille statistikk for denne sangen?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -847,7 +847,7 @@ msgstr "" msgid "Artist" msgstr "Artist" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Artistens initialer" @@ -976,7 +976,7 @@ msgid "Best" msgstr "Best" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -997,8 +997,8 @@ msgstr "Bitrate" msgid "Bitrate" msgstr "Bitrate" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Bitrate" @@ -1191,7 +1191,7 @@ msgstr "Farger" msgid "Comma separated list of class:level, level is 0-3" msgstr "Komma-separert liste av klasse:level, level er 0-3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Kommentar" @@ -1205,7 +1205,7 @@ msgid "Complete tags automatically..." msgstr "Full ut etiketter automatisk…" #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1267,7 +1267,7 @@ msgstr "Konverter all musikk" msgid "Convert any music that the device can't play" msgstr "Konverter all musikk som enheten ikke kan spille" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Kopier album omslaggrafikk" @@ -1521,7 +1521,7 @@ msgstr "Slett fra disk…" msgid "Delete preset" msgstr "Slett forhåndsinnstilling" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Slett de originale filene" @@ -1537,7 +1537,7 @@ msgstr "Fjern valgte spor fra avspillingskøen" msgid "Dequeue track" msgstr "Fjern sporet fra avspillingskøen" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Mål" @@ -1580,7 +1580,7 @@ msgid "Disabled" msgstr "Avskrudd" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1802,11 +1802,11 @@ msgstr "Feil" msgid "Error connecting MTP device %1" msgstr "Feil ved tilkobling til MTP enhet %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Kunne ikke kopiere sanger" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Kunne ikke slette sanger" @@ -1946,7 +1946,7 @@ msgstr "Kunne ikke hente albumgrafikk" msgid "File %1 is not recognized as a valid audio file." msgstr "Fil %1 er ikke gjenkjent som en lydfil" -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Fil etternavn" @@ -2106,7 +2106,7 @@ msgid "Genius Authentication" msgstr "" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2201,7 +2201,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Grupper etter sjanger/artist/album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2323,7 +2323,7 @@ msgstr "Øk lydstyrken prosent" msgid "Information" msgstr "Informasjon" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Sett inn…" @@ -2365,7 +2365,7 @@ msgstr "Keep aspect ratio" msgid "Keep running in the background when the window is closed" msgstr "Fortsett i bakgrunnen selv om vinduet lukkes" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Behold originalfilene" @@ -2407,7 +2407,7 @@ msgid "Left" msgstr "Venstre" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Lengde" @@ -2472,7 +2472,7 @@ msgstr "Åpner spor" msgid "Loading tracks info" msgstr "Henter informasjon om spor" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Åpner…" @@ -2534,7 +2534,7 @@ msgstr "Behandle lagrede grupperinger" msgid "Manufacturer" msgstr "Fabrikant" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Merk som hørt" @@ -2665,7 +2665,7 @@ msgstr "Demp" msgid "Name" msgstr "Navn" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Navnevalg" @@ -2857,25 +2857,25 @@ msgstr "Innstillinger…" msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" -msgstr "Organiser filer" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" +msgstr "Organizer filer" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." -msgstr "Organiser filer…" +msgid "Organize files..." +msgstr "Organizer filer…" -#: organise/organise.cpp:94 -msgid "Organising files" -msgstr "Organiserer filer" +#: organize/organize.cpp:94 +msgid "Organizing files" +msgstr "Organizerer filer" #: dialogs/trackselectiondialog.cpp:195 msgid "Original tags" msgstr "Opprinnelige tagger" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Opprinnelig år" @@ -2902,7 +2902,7 @@ msgstr "Utgangsinnstillinger" msgid "Overwrite existing file" msgstr "Overskriv eksisterende fil" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Overskriv eksisterende filer" @@ -2946,7 +2946,7 @@ msgid "Paused" msgstr "På pause" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3109,7 +3109,7 @@ msgstr "Pene skjermbildeoverleggsvalg" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Forhåndsvisning" @@ -3262,7 +3262,7 @@ msgstr "Fjern spilleliste" msgid "Remove playlists" msgstr "Fjern spillelister" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "" @@ -3304,7 +3304,7 @@ msgstr "Erstatt gjeldende spilleliste" msgid "Replace spaces with dashes" msgstr "Erstatt mellomrom med streker" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Erstatt mellomrom med understrek" @@ -3351,11 +3351,11 @@ msgstr "" "Start sporet igjen, eller spill forrige spor hvis du er innen de første 8 " "sekundene av sporet" -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Begrens til tegn i ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Begrens til tegn tillat på FAT filsystem" @@ -3433,12 +3433,12 @@ msgstr "Mellomtjener for SOCKS" msgid "Safely remove device" msgstr "Trygg fjerning av enhet" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Kjør trygg fjerning av enhet etter kopiering" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4129,7 +4129,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Det er andre sanger i dette albumet" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4137,7 +4137,7 @@ msgstr "" "Fikk problemer med å kopiere enkelte sanger. Følgende filer kunne ikke " "kopieres:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4244,7 +4244,7 @@ msgid "Timezone" msgstr "Tidssone" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4290,7 +4290,7 @@ msgstr "Antall byte overført totalt" msgid "Total network requests made" msgstr "Antall nettverkforespørsler totalt" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4585,7 +4585,7 @@ msgid "Write metadata when saving playlists" msgstr "Skrev metadata når spilleliste lagres" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4636,8 +4636,8 @@ msgid "You are signed in." msgstr "Du er innlogget" #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." -msgstr "Du kan velge hvordan sangene i biblioteket er organisert." +msgid "You can change the way the songs in the collection are organized." +msgstr "Du kan velge hvordan sangene i biblioteket er organizert." #: dialogs/about.cpp:128 #, qt-format diff --git a/src/translations/pl.po b/src/translations/pl.po index c9226eb7..ad7f3389 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -438,7 +438,7 @@ msgstr "1 ścieżka" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -697,7 +697,7 @@ msgstr "Dodane w ciągu ostatnich trzech miesięcy" msgid "Advanced grouping..." msgstr "Zaawansowane grupowanie…" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "Po skopiowaniu…" @@ -706,7 +706,7 @@ msgid "Albu&m cover" msgstr "Okładka albu&mu" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -726,7 +726,7 @@ msgid "Album - Disc" msgstr "Album - Płyta" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -786,7 +786,7 @@ msgstr "Wszystkie pliki (*)" msgid "All playlists (%1)" msgstr "Wszystkie listy odtwarzania (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Pozwól na rozszerzony zestaw znaków ASCII" @@ -856,7 +856,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Na pewno wyzerować statystyki tego utworu?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -864,7 +864,7 @@ msgstr "Na pewno wyzerować statystyki tego utworu?" msgid "Artist" msgstr "Artysta" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Inicjały artysty" @@ -993,7 +993,7 @@ msgid "Best" msgstr "Najlepsza" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1014,8 +1014,8 @@ msgstr "Przepływność" msgid "Bitrate" msgstr "Przepływność" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Przepływność" @@ -1212,7 +1212,7 @@ msgstr "" "Rozdzielona przecinkami lista „klasa:poziom”, gdzie poziom ma wartość od 0 " "do 3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Komentarz" @@ -1226,7 +1226,7 @@ msgid "Complete tags automatically..." msgstr "Automatycznie uzupełnij znaczniki…" #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1287,7 +1287,7 @@ msgstr "Przekonwertuj całą muzykę" msgid "Convert any music that the device can't play" msgstr "Przekonwertuj muzykę, której nie może odtworzyć urządzenie" -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Skopiuj okładki albumów" @@ -1543,7 +1543,7 @@ msgstr "Usuń z dysku…" msgid "Delete preset" msgstr "Usuń ustawienie korektora" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Usuń oryginalne pliki" @@ -1559,7 +1559,7 @@ msgstr "Usuń zaznaczone ścieżki z kolejki" msgid "Dequeue track" msgstr "Usuń ścieżkę z kolejki" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Miejsce docelowe" @@ -1602,7 +1602,7 @@ msgid "Disabled" msgstr "Wyłączone" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1826,11 +1826,11 @@ msgstr "Błąd" msgid "Error connecting MTP device %1" msgstr "Błąd połączenia z urządzeniem MTP „%1”" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Błąd przy kopiowaniu utworów" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Błąd przy usuwaniu utworów" @@ -1970,7 +1970,7 @@ msgstr "Błąd podczas pobierania okładki" msgid "File %1 is not recognized as a valid audio file." msgstr "Plik „%1” nie jest rozpoznany jako plik dźwiękowy." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Rozszerzenie pliku" @@ -2131,7 +2131,7 @@ msgid "Genius Authentication" msgstr "Uwierzytelnianie Geniusa" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2228,7 +2228,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Gatunek/Artysta/Album" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2355,7 +2355,7 @@ msgstr "Zwiększ głośność o n-punktów procentowych" msgid "Information" msgstr "Informacje" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Wstaw…" @@ -2399,7 +2399,7 @@ msgstr "Zachowaj proporcje" msgid "Keep running in the background when the window is closed" msgstr "Działaj w tle po zamknięciu okna" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Zachowaj oryginalne pliki" @@ -2441,7 +2441,7 @@ msgid "Left" msgstr "Lewy" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Długość" @@ -2506,7 +2506,7 @@ msgstr "Wczytywanie ścieżek" msgid "Loading tracks info" msgstr "Wczytywanie informacji o utworze" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Wczytywanie…" @@ -2568,7 +2568,7 @@ msgstr "Zarządzaj zapisanymi grupowaniami" msgid "Manufacturer" msgstr "Wytwórca" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Oznacz jako przesłuchany" @@ -2699,7 +2699,7 @@ msgstr "Wycisz" msgid "Name" msgstr "Nazwa" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Opcje nazewnictwa" @@ -2895,17 +2895,17 @@ msgstr "Opcje…" msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Uporządkuj pliki" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Uporządkuj pliki…" -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Porządkowanie plików" #: dialogs/trackselectiondialog.cpp:195 @@ -2913,7 +2913,7 @@ msgid "Original tags" msgstr "Oryginalne znaczniki" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Oryginalny rok" @@ -2940,7 +2940,7 @@ msgstr "Opcje wyjścia" msgid "Overwrite existing file" msgstr "Nadpisz istniejący plik" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Nadpisz istniejące pliki" @@ -2984,7 +2984,7 @@ msgid "Paused" msgstr "Wstrzymane" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3154,7 +3154,7 @@ msgstr "Opcje ładnego menu ekranowego (OSD)" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Podgląd" @@ -3309,7 +3309,7 @@ msgstr "Usuń listę odtwrzania" msgid "Remove playlists" msgstr "Usuń listy odtwarzania" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "Usuń problematyczne znaki z nazw plików" @@ -3351,7 +3351,7 @@ msgstr "Zastąp aktualną listę odtwarzania" msgid "Replace spaces with dashes" msgstr "Zamień znaki odstępu na myślniki" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Zamień znaki odstępu na podkreślniki" @@ -3398,11 +3398,11 @@ msgstr "" "Odtwarzaj od początku, a jeżeli nie minęło 8 sekund aktualnego utworu - " "przeskocz do poprzedniego." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Ogranicz zestaw znaków do ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Ogranicz do znaków dozwolonych na systemach plików FAT" @@ -3480,12 +3480,12 @@ msgstr "Serwer pośredniczący SOCKS" msgid "Safely remove device" msgstr "Bezpiecznie usuń urządzenie" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Bezpiecznie usuń urządzenie po skopiowaniu" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4179,7 +4179,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "Na tym albumie są inne utwory" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4187,7 +4187,7 @@ msgstr "" "Wystąpiły problemy podczas kopiowania utworów. Nie można było skopiować " "następujących plików:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4295,7 +4295,7 @@ msgid "Timezone" msgstr "Strefa czasowa" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4341,7 +4341,7 @@ msgstr "Całkowita liczba przesłanych bajtów" msgid "Total network requests made" msgstr "Całkowita liczba wykonanych zapytań sieciowych" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4639,7 +4639,7 @@ msgid "Write metadata when saving playlists" msgstr "Zapisuj medatane podczas zapisywania list odtwarzania" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4690,7 +4690,7 @@ msgid "You are signed in." msgstr "Zalogowano." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Możesz zmienić sposób, w jaki prezentowane są utwory w kolekcji." #: dialogs/about.cpp:128 diff --git a/src/translations/ru.po b/src/translations/ru.po index a6ab9c79..456b448e 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -446,7 +446,7 @@ msgstr "1 трек" msgid "40%" msgstr "40%" -#: ../build/src/ui_organisedialog.h:269 +#: ../build/src/ui_organizedialog.h:269 msgid "" "

Tokens start with %, for example: %artist %album %title

\n" "\n" @@ -703,7 +703,7 @@ msgstr "Добавлено за три месяца" msgid "Advanced grouping..." msgstr "Расширенная сортировка…" -#: ../build/src/ui_organisedialog.h:261 +#: ../build/src/ui_organizedialog.h:261 msgid "After copying..." msgstr "После копирования…" @@ -712,7 +712,7 @@ msgid "Albu&m cover" msgstr "О&бложка альбома" #: core/qtsystemtrayicon.cpp:259 collection/savedgroupingmanager.cpp:87 -#: playlist/playlist.cpp:1179 organise/organisedialog.cpp:99 +#: playlist/playlist.cpp:1179 organize/organizedialog.cpp:99 #: ../build/src/ui_groupbydialog.h:130 ../build/src/ui_groupbydialog.h:154 #: ../build/src/ui_groupbydialog.h:178 ../build/src/ui_albumcoversearcher.h:110 #: ../build/src/ui_albumcoversearcher.h:112 @@ -732,7 +732,7 @@ msgid "Album - Disc" msgstr "raАльбом - Диск" #: collection/savedgroupingmanager.cpp:84 playlist/playlist.cpp:1186 -#: organise/organisedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 +#: organize/organizedialog.cpp:102 ../build/src/ui_groupbydialog.h:129 #: ../build/src/ui_groupbydialog.h:153 ../build/src/ui_groupbydialog.h:177 #: ../build/src/ui_edittagdialog.h:685 msgid "Album artist" @@ -792,7 +792,7 @@ msgstr "Все файлы (*)" msgid "All playlists (%1)" msgstr "Все плейлисты (%1)" -#: ../build/src/ui_organisedialog.h:277 +#: ../build/src/ui_organizedialog.h:277 msgid "Allow extended ASCII characters" msgstr "Разрешить расширенные символы ASCII" @@ -862,7 +862,7 @@ msgid "Are you sure you want to reset this song's statistics?" msgstr "Вы действительно хотите сбросить статистику этой песни?" #: core/qtsystemtrayicon.cpp:257 collection/savedgroupingmanager.cpp:81 -#: playlist/playlist.cpp:1178 organise/organisedialog.cpp:100 +#: playlist/playlist.cpp:1178 organize/organizedialog.cpp:100 #: ../build/src/ui_groupbydialog.h:128 ../build/src/ui_groupbydialog.h:152 #: ../build/src/ui_groupbydialog.h:176 ../build/src/ui_albumcoversearcher.h:106 #: ../build/src/ui_albumcoversearcher.h:108 ../build/src/ui_edittagdialog.h:689 @@ -870,7 +870,7 @@ msgstr "Вы действительно хотите сбросить стати msgid "Artist" msgstr "Исполнитель" -#: organise/organisedialog.cpp:101 +#: organize/organizedialog.cpp:101 msgid "Artist's initial" msgstr "Инициалы исполнителя" @@ -999,7 +999,7 @@ msgid "Best" msgstr "Лучшее" #: context/contextview.cpp:216 collection/savedgroupingmanager.cpp:132 -#: playlist/playlist.cpp:1196 organise/organisedialog.cpp:115 +#: playlist/playlist.cpp:1196 organize/organizedialog.cpp:115 #: ../build/src/ui_groupbydialog.h:145 ../build/src/ui_groupbydialog.h:169 #: ../build/src/ui_groupbydialog.h:193 ../build/src/ui_edittagdialog.h:671 msgid "Bit depth" @@ -1020,8 +1020,8 @@ msgstr "Битрейт" msgid "Bitrate" msgstr "Битрейт" -#: organise/organisedialog.cpp:113 -msgctxt "Refers to bitrate in file organise dialog." +#: organize/organizedialog.cpp:113 +msgctxt "Refers to bitrate in file organize dialog." msgid "Bitrate" msgstr "Битрейт" @@ -1215,7 +1215,7 @@ msgstr "Цвета" msgid "Comma separated list of class:level, level is 0-3" msgstr "Разделённый запятыми список «класс:уровень», где уровень от 0 до 3" -#: playlist/playlist.cpp:1206 organise/organisedialog.cpp:111 +#: playlist/playlist.cpp:1206 organize/organizedialog.cpp:111 #: ../build/src/ui_edittagdialog.h:687 msgid "Comment" msgstr "Комментарий" @@ -1229,7 +1229,7 @@ msgid "Complete tags automatically..." msgstr "Заполнить теги автоматически..." #: collection/savedgroupingmanager.cpp:117 playlist/playlist.cpp:1187 -#: organise/organisedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 +#: organize/organizedialog.cpp:103 ../build/src/ui_groupbydialog.h:140 #: ../build/src/ui_groupbydialog.h:164 ../build/src/ui_groupbydialog.h:188 #: ../build/src/ui_edittagdialog.h:686 msgid "Composer" @@ -1292,7 +1292,7 @@ msgstr "Конвертировать всю музыку" msgid "Convert any music that the device can't play" msgstr "Конвертировать всю музыку, не поддерживаемую устройством." -#: ../build/src/ui_organisedialog.h:281 +#: ../build/src/ui_organizedialog.h:281 msgid "Copy album cover artwork" msgstr "Копировать обложку альбома" @@ -1546,7 +1546,7 @@ msgstr "Удалить с диска…" msgid "Delete preset" msgstr "Удалить профиль" -#: ../build/src/ui_organisedialog.h:265 +#: ../build/src/ui_organizedialog.h:265 msgid "Delete the original files" msgstr "Удалить оригинальные файлы" @@ -1562,7 +1562,7 @@ msgstr "Убрать выбранные треки из очереди" msgid "Dequeue track" msgstr "Убрать трек из очереди" -#: ../build/src/ui_organisedialog.h:260 ../build/src/ui_transcodedialog.h:229 +#: ../build/src/ui_organizedialog.h:260 ../build/src/ui_transcodedialog.h:229 msgid "Destination" msgstr "Назначение" @@ -1605,7 +1605,7 @@ msgid "Disabled" msgstr "Отключено" #: collection/savedgroupingmanager.cpp:93 playlist/playlist.cpp:1181 -#: organise/organisedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 +#: organize/organizedialog.cpp:107 ../build/src/ui_groupbydialog.h:132 #: ../build/src/ui_groupbydialog.h:156 ../build/src/ui_groupbydialog.h:180 #: ../build/src/ui_edittagdialog.h:684 msgid "Disc" @@ -1827,11 +1827,11 @@ msgstr "Ошибка" msgid "Error connecting MTP device %1" msgstr "Ошибка подключения устройства MTP %1" -#: organise/organiseerrordialog.cpp:71 +#: organize/organizeerrordialog.cpp:71 msgid "Error copying songs" msgstr "Ошибка копирования композиций" -#: organise/organiseerrordialog.cpp:76 +#: organize/organizeerrordialog.cpp:76 msgid "Error deleting songs" msgstr "Ошибка удаления композиций" @@ -1971,7 +1971,7 @@ msgstr "Ошибка получения обложки" msgid "File %1 is not recognized as a valid audio file." msgstr "Файл %1 не распознается как допустимый аудиофайл." -#: organise/organisedialog.cpp:116 +#: organize/organizedialog.cpp:116 msgid "File extension" msgstr "Расширение файла" @@ -2131,7 +2131,7 @@ msgid "Genius Authentication" msgstr "" #: collection/savedgroupingmanager.cpp:99 playlist/playlist.cpp:1185 -#: organise/organisedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 +#: organize/organizedialog.cpp:110 ../build/src/ui_groupbydialog.h:134 #: ../build/src/ui_groupbydialog.h:158 ../build/src/ui_groupbydialog.h:182 #: ../build/src/ui_edittagdialog.h:680 msgid "Genre" @@ -2227,7 +2227,7 @@ msgid "Group by Genre/Artist/Album" msgstr "Группировать по жанр/исполнитель/альбом" #: collection/savedgroupingmanager.cpp:123 playlist/playlist.cpp:1189 -#: organise/organisedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 +#: organize/organizedialog.cpp:105 ../build/src/ui_groupbydialog.h:142 #: ../build/src/ui_groupbydialog.h:166 ../build/src/ui_groupbydialog.h:190 #: ../build/src/ui_edittagdialog.h:682 msgid "Grouping" @@ -2352,7 +2352,7 @@ msgstr "Увеличить громкость на процентов" msgid "Information" msgstr "Информация" -#: ../build/src/ui_organisedialog.h:273 +#: ../build/src/ui_organizedialog.h:273 msgid "Insert..." msgstr "Вставить…" @@ -2394,7 +2394,7 @@ msgstr "Сохранять пропорции" msgid "Keep running in the background when the window is closed" msgstr "Продолжить работу в фоновом режиме при закрытии окна" -#: ../build/src/ui_organisedialog.h:264 +#: ../build/src/ui_organizedialog.h:264 msgid "Keep the original files" msgstr "Сохранять оригинальные файлы" @@ -2436,7 +2436,7 @@ msgid "Left" msgstr "Левый канал" #: core/qtsystemtrayicon.cpp:262 context/contextview.cpp:214 -#: playlist/playlist.cpp:1182 organise/organisedialog.cpp:112 +#: playlist/playlist.cpp:1182 organize/organizedialog.cpp:112 #: ../build/src/ui_edittagdialog.h:665 msgid "Length" msgstr "Длина" @@ -2501,7 +2501,7 @@ msgstr "Загрузка композиций" msgid "Loading tracks info" msgstr "Загрузка информации о треках" -#: collection/collectionmodel.cpp:209 ../build/src/ui_organisedialog.h:283 +#: collection/collectionmodel.cpp:209 ../build/src/ui_organizedialog.h:283 msgid "Loading..." msgstr "Загрузка…" @@ -2563,7 +2563,7 @@ msgstr "Управление сохранёнными группами" msgid "Manufacturer" msgstr "Производитель" -#: ../build/src/ui_organisedialog.h:280 +#: ../build/src/ui_organizedialog.h:280 msgid "Mark as listened" msgstr "Пометить как прослушанное" @@ -2694,7 +2694,7 @@ msgstr "Приглушить звук" msgid "Name" msgstr "Имя" -#: ../build/src/ui_organisedialog.h:267 +#: ../build/src/ui_organizedialog.h:267 msgid "Naming options" msgstr "Настройки названия" @@ -2889,17 +2889,17 @@ msgstr "Настройки…" msgid "Opus" msgstr "Opus" -#: ../build/src/ui_organisedialog.h:259 -msgid "Organise Files" +#: ../build/src/ui_organizedialog.h:259 +msgid "Organize Files" msgstr "Упорядочить файлы" #: core/mainwindow.cpp:645 context/contextalbumsview.cpp:260 #: collection/collectionview.cpp:328 -msgid "Organise files..." +msgid "Organize files..." msgstr "Упорядочить файлы…" -#: organise/organise.cpp:94 -msgid "Organising files" +#: organize/organize.cpp:94 +msgid "Organizing files" msgstr "Упорядочивание файлов" #: dialogs/trackselectiondialog.cpp:195 @@ -2907,7 +2907,7 @@ msgid "Original tags" msgstr "Исходные теги" #: collection/savedgroupingmanager.cpp:111 playlist/playlist.cpp:1184 -#: organise/organisedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 +#: organize/organizedialog.cpp:109 ../build/src/ui_groupbydialog.h:138 #: ../build/src/ui_groupbydialog.h:162 ../build/src/ui_groupbydialog.h:186 msgid "Original year" msgstr "Год выхода оригинала" @@ -2934,7 +2934,7 @@ msgstr "Настройки вывода" msgid "Overwrite existing file" msgstr "Перезаписать существующий файл" -#: ../build/src/ui_organisedialog.h:279 +#: ../build/src/ui_organizedialog.h:279 msgid "Overwrite existing files" msgstr "Перезаписать существующие файлы" @@ -2978,7 +2978,7 @@ msgid "Paused" msgstr "Приостановлен" #: collection/savedgroupingmanager.cpp:120 playlist/playlist.cpp:1188 -#: organise/organisedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 +#: organize/organizedialog.cpp:104 ../build/src/ui_groupbydialog.h:141 #: ../build/src/ui_groupbydialog.h:165 ../build/src/ui_groupbydialog.h:189 #: ../build/src/ui_edittagdialog.h:691 msgid "Performer" @@ -3142,7 +3142,7 @@ msgstr "Настройки OSD" #: ../build/src/ui_contextsettingspage.h:431 #: ../build/src/ui_contextsettingspage.h:436 #: ../build/src/ui_notificationssettingspage.h:480 -#: ../build/src/ui_organisedialog.h:282 +#: ../build/src/ui_organizedialog.h:282 msgid "Preview" msgstr "Предпросмотр" @@ -3295,7 +3295,7 @@ msgstr "Удалить плейлист" msgid "Remove playlists" msgstr "Удалить плейлисты" -#: ../build/src/ui_organisedialog.h:274 +#: ../build/src/ui_organizedialog.h:274 msgid "Remove problematic characters from filenames" msgstr "" @@ -3337,7 +3337,7 @@ msgstr "Заменить текущий плейлист" msgid "Replace spaces with dashes" msgstr "Заменить пробелы на тире" -#: ../build/src/ui_organisedialog.h:278 +#: ../build/src/ui_organizedialog.h:278 msgid "Replace spaces with underscores" msgstr "Заменить пробелы на нижнее подчеркивание" @@ -3384,11 +3384,11 @@ msgstr "" "Перезапустить трек или проиграть предыдущий, если не прошло 8 секунд от " "начала." -#: ../build/src/ui_organisedialog.h:276 +#: ../build/src/ui_organizedialog.h:276 msgid "Restrict characters to ASCII" msgstr "Ограничить символы до ASCII" -#: ../build/src/ui_organisedialog.h:275 +#: ../build/src/ui_organizedialog.h:275 msgid "Restrict to characters allowed on FAT filesystems" msgstr "Ограничить разрешенными символами в файловых системах FAT" @@ -3466,12 +3466,12 @@ msgstr "SOCKS прокси" msgid "Safely remove device" msgstr "Безопасно извлечь устройство" -#: ../build/src/ui_organisedialog.h:284 +#: ../build/src/ui_organizedialog.h:284 msgid "Safely remove the device after copying" msgstr "Безопасно извлечь устройство после копирования" #: collection/savedgroupingmanager.cpp:129 playlist/playlist.cpp:1195 -#: organise/organisedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 +#: organize/organizedialog.cpp:114 ../build/src/ui_groupbydialog.h:144 #: ../build/src/ui_groupbydialog.h:168 ../build/src/ui_groupbydialog.h:192 #: ../build/src/ui_edittagdialog.h:670 msgid "Sample rate" @@ -4163,7 +4163,7 @@ msgstr "" msgid "There are other songs in this album" msgstr "В альбоме присутствуют другие композиции" -#: organise/organiseerrordialog.cpp:72 +#: organize/organizeerrordialog.cpp:72 msgid "" "There were problems copying some songs. The following files could not be " "copied:" @@ -4171,7 +4171,7 @@ msgstr "" "В процессе копирования некоторых композиций возникли проблемы. Следующие " "файлы не могут быть скопированы:" -#: organise/organiseerrordialog.cpp:77 +#: organize/organizeerrordialog.cpp:77 msgid "" "There were problems deleting some songs. The following files could not be " "deleted:" @@ -4279,7 +4279,7 @@ msgid "Timezone" msgstr "Часовой пояс" #: core/qtsystemtrayicon.cpp:255 playlist/playlist.cpp:1177 -#: organise/organisedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 +#: organize/organizedialog.cpp:98 ../build/src/ui_contextsettingspage.h:415 #: ../build/src/ui_edittagdialog.h:681 #: ../build/src/ui_trackselectiondialog.h:210 msgid "Title" @@ -4325,7 +4325,7 @@ msgstr "Всего передано байт" msgid "Total network requests made" msgstr "Всего выполнено сетевых запросов" -#: playlist/playlist.cpp:1180 organise/organisedialog.cpp:106 +#: playlist/playlist.cpp:1180 organize/organizedialog.cpp:106 #: ../build/src/ui_edittagdialog.h:688 #: ../build/src/ui_trackselectiondialog.h:212 msgid "Track" @@ -4623,7 +4623,7 @@ msgid "Write metadata when saving playlists" msgstr "Записывать метаданные при сохранении плейлистов" #: collection/savedgroupingmanager.cpp:102 playlist/playlist.cpp:1183 -#: organise/organisedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 +#: organize/organizedialog.cpp:108 ../build/src/ui_groupbydialog.h:135 #: ../build/src/ui_groupbydialog.h:159 ../build/src/ui_groupbydialog.h:183 #: ../build/src/ui_edittagdialog.h:690 #: ../build/src/ui_trackselectiondialog.h:211 @@ -4674,7 +4674,7 @@ msgid "You are signed in." msgstr "Вы вошли в систему." #: ../build/src/ui_groupbydialog.h:122 -msgid "You can change the way the songs in the collection are organised." +msgid "You can change the way the songs in the collection are organized." msgstr "Можно изменить способ организации композиций в фонотеке." #: dialogs/about.cpp:128 diff --git a/src/widgets/fileview.cpp b/src/widgets/fileview.cpp index 2c0e5e92..6bc9da5e 100644 --- a/src/widgets/fileview.cpp +++ b/src/widgets/fileview.cpp @@ -43,7 +43,7 @@ #include "fileviewlist.h" #include "ui_fileview.h" #ifdef HAVE_GSTREAMER -# include "organise/organiseerrordialog.h" +# include "organize/organizeerrordialog.h" #endif #include "settings/appearancesettingspage.h" @@ -257,8 +257,8 @@ void FileView::DeleteFinished(const SongList &songs_with_errors) { if (songs_with_errors.isEmpty()) return; - OrganiseErrorDialog *dialog = new OrganiseErrorDialog(this); - dialog->Show(OrganiseErrorDialog::Type_Delete, songs_with_errors); + OrganizeErrorDialog *dialog = new OrganizeErrorDialog(this); + dialog->Show(OrganizeErrorDialog::Type_Delete, songs_with_errors); // It deletes itself when the user closes it #else diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 47820675..b528e122 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -163,7 +163,7 @@ add_test_file(src/tagreader_test.cpp false) add_test_file(src/collectionbackend_test.cpp false) add_test_file(src/collectionmodel_test.cpp true) add_test_file(src/songplaylistitem_test.cpp false) -add_test_file(src/organiseformat_test.cpp false) +add_test_file(src/organizeformat_test.cpp false) add_test_file(src/playlist_test.cpp true) add_custom_target(run_strawberry_tests COMMAND ${CMAKE_CTEST_COMMAND} -V DEPENDS strawberry_tests) diff --git a/tests/src/organiseformat_test.cpp b/tests/src/organizeformat_test.cpp similarity index 88% rename from tests/src/organiseformat_test.cpp rename to tests/src/organizeformat_test.cpp index 3f6dc90b..55888e3a 100644 --- a/tests/src/organiseformat_test.cpp +++ b/tests/src/organizeformat_test.cpp @@ -22,21 +22,21 @@ #include #include "test_utils.h" -#include "organise/organiseformat.h" +#include "organize/organizeformat.h" #include "core/timeconstants.h" #include "core/song.h" #include "core/logging.h" #include -class OrganiseFormatTest : public ::testing::Test { +class OrganizeFormatTest : public ::testing::Test { protected: - OrganiseFormat format_; + OrganizeFormat format_; Song song_; }; -TEST_F(OrganiseFormatTest, BasicReplace) { +TEST_F(OrganizeFormatTest, BasicReplace) { song_.set_title("title"); song_.set_album("album"); @@ -64,7 +64,7 @@ TEST_F(OrganiseFormatTest, BasicReplace) { } -TEST_F(OrganiseFormatTest, Extension) { +TEST_F(OrganizeFormatTest, Extension) { song_.set_url(QUrl("file:///some/path/filename.flac")); @@ -74,7 +74,7 @@ TEST_F(OrganiseFormatTest, Extension) { } -TEST_F(OrganiseFormatTest, ArtistInitial) { +TEST_F(OrganizeFormatTest, ArtistInitial) { song_.set_artist("bob"); @@ -84,7 +84,7 @@ TEST_F(OrganiseFormatTest, ArtistInitial) { } -TEST_F(OrganiseFormatTest, AlbumArtistInitial) { +TEST_F(OrganizeFormatTest, AlbumArtistInitial) { song_.set_albumartist("bob"); @@ -94,14 +94,14 @@ TEST_F(OrganiseFormatTest, AlbumArtistInitial) { } -TEST_F(OrganiseFormatTest, InvalidTag) { +TEST_F(OrganizeFormatTest, InvalidTag) { format_.set_format("%invalid"); EXPECT_FALSE(format_.IsValid()); } -TEST_F(OrganiseFormatTest, Blocks) { +TEST_F(OrganizeFormatTest, Blocks) { format_.set_format("Before{Inside%year}After"); ASSERT_TRUE(format_.IsValid()); @@ -117,7 +117,7 @@ TEST_F(OrganiseFormatTest, Blocks) { } -TEST_F(OrganiseFormatTest, ReplaceSpaces) { +TEST_F(OrganizeFormatTest, ReplaceSpaces) { song_.set_title("The Song Title"); format_.set_format("The Format String %title"); @@ -129,7 +129,7 @@ TEST_F(OrganiseFormatTest, ReplaceSpaces) { } -TEST_F(OrganiseFormatTest, ReplaceNonAscii) { +TEST_F(OrganizeFormatTest, ReplaceNonAscii) { song_.set_artist(QString::fromUtf8("Röyksopp")); format_.set_format("%artist"); @@ -145,7 +145,7 @@ TEST_F(OrganiseFormatTest, ReplaceNonAscii) { } -TEST_F(OrganiseFormatTest, TrackNumberPadding) { +TEST_F(OrganizeFormatTest, TrackNumberPadding) { format_.set_format("%track"); @@ -164,7 +164,7 @@ TEST_F(OrganiseFormatTest, TrackNumberPadding) { } #if 0 -TEST_F(OrganiseFormatTest, ReplaceSlashes) { +TEST_F(OrganizeFormatTest, ReplaceSlashes) { format_.set_format("%title"); song_.set_title("foo/bar\\baz");