Rename organise to organize

Prefer US spelling

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_);

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
 
 }

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<DeviceProperties> properties_dialog_;
-  std::unique_ptr<OrganiseDialog> organise_dialog_;
+  std::unique_ptr<OrganizeDialog> 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_;

src/device/gpoddevice.cpp

@@ -137,7 +137,7 @@ bool GPodDevice::StartCopy(QList<Song::FileType> *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();

src/device/mtpdevice.cpp

@@ -135,7 +135,7 @@ void MtpDevice::LoaderError(const QString& message) {
 
 bool MtpDevice::StartCopy(QList<Song::FileType> *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();