diff --git a/.gitignore b/.gitignore
index 25532869..a7aff5cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,10 +27,14 @@ autom4te.cache
 *.o
 *.m4
 *.exe
+*.gmo
+*.mo
 
 # Binaries
 git/bibledit-git
 shutdown/bibledit-shutdown
+src/bibledit-desktop
+# Old name:
 src/bibledit-gtk
 src/bibledit-rdwrt
 src/concordance
diff --git a/src/Makefile.am b/src/Makefile.am
index 8effd6a7..dfe7dfc4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
-bin_PROGRAMS = bibledit-gtk bibledit-rdwrt concordance
+bin_PROGRAMS = bibledit-desktop bibledit-rdwrt concordance
 
-bibledit_gtk_SOURCES = \
+bibledit_desktop_SOURCES = \
   bibledit.cpp \
   options.cpp \
   chapterview.cpp \
diff --git a/src/assistantexport.cpp b/src/assistantexport.cpp
index 0802c808..227cdc20 100644
--- a/src/assistantexport.cpp
+++ b/src/assistantexport.cpp
@@ -397,7 +397,7 @@ radiobutton_select_type_references = gtk_radio_button_new_with_mnemonic (NULL, _
 
   GSList *radiobutton_stylesheet_export_type_group = NULL;
 
-  radiobutton_stylesheet_format_bibledit = gtk_radio_button_new_with_mnemonic (NULL, _("Standard Bibledit-Gtk format"));
+  radiobutton_stylesheet_format_bibledit = gtk_radio_button_new_with_mnemonic (NULL, _("Standard Bibledit-Desktop format"));
   gtk_widget_show (radiobutton_stylesheet_format_bibledit);
   gtk_box_pack_start (GTK_BOX (vbox_stylesheet_format), radiobutton_stylesheet_format_bibledit, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton_stylesheet_format_bibledit), radiobutton_stylesheet_export_type_group);
diff --git a/src/dialogbooknames.cpp b/src/dialogbooknames.cpp
index 766cce10..ae3d6c13 100644
--- a/src/dialogbooknames.cpp
+++ b/src/dialogbooknames.cpp
@@ -104,7 +104,7 @@ BooknamesDialog::BooknamesDialog(const map <unsigned int, ustring>& books, const
   gtk_tree_view_set_model(GTK_TREE_VIEW(treeview1), GTK_TREE_MODEL(model));
   g_object_unref(model);
   GtkCellRenderer *renderer1 = gtk_cell_renderer_text_new();
-  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, "Book in Bibledit-Gtk", renderer1, "text", COLUMN_BIBLEDIT, NULL);
+  gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, "Book in Bibledit-Desktop", renderer1, "text", COLUMN_BIBLEDIT, NULL);
   GtkCellRenderer *renderer2 = gtk_cell_renderer_text_new();
   g_signal_connect(renderer2, "edited", G_CALLBACK(cell_edited), gpointer(this));
   gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(treeview1), -1, heading2, renderer2, "text", COLUMN_URL, "editable", COLUMN_EDITABLE, NULL);
diff --git a/src/dialogcheck.cpp b/src/dialogcheck.cpp
index a1f49bbd..21422036 100644
--- a/src/dialogcheck.cpp
+++ b/src/dialogcheck.cpp
@@ -1138,7 +1138,7 @@ void CheckDialog::word_count_setup()
   gtk_widget_show(wordcount_label2);
   gtk_box_pack_start(GTK_BOX(wordcount_hbox1), wordcount_label2, FALSE, FALSE, 0);
 
-  wordcount_label1 = gtk_label_new_with_mnemonic(_("Bibledit-Gtk normally knows the right word boundaries, but if this is not done satisfactorily, you can enter _extra characters that should be part of a word"));
+  wordcount_label1 = gtk_label_new_with_mnemonic(_("Bibledit-Desktop normally knows the right word boundaries, but if this is not done satisfactorily, you can enter _extra characters that should be part of a word"));
   gtk_widget_show(wordcount_label1);
   gtk_box_pack_start(GTK_BOX(vbox1), wordcount_label1, FALSE, FALSE, 0);
   gtk_label_set_line_wrap(GTK_LABEL(wordcount_label1), TRUE);
@@ -1186,7 +1186,7 @@ void CheckDialog::on_wordcount_entry1()
   ustring non_alphas = get_non_alphanumericals(chars);
   if (chars != non_alphas) {
     gtk_entry_set_text(GTK_ENTRY(wordcount_entry1), non_alphas.c_str());
-    gtkw_dialog_info(checkdialog, _("Bibledit-Gtk already recognizes this character as part of a word.\nIt has been removed as superfluous.\nThere is no need to enter your alphabet.\nEntering the special cases is enough."));
+    gtkw_dialog_info(checkdialog, _("Bibledit-Desktop already recognizes this character as part of a word.\nIt has been removed as superfluous.\nThere is no need to enter your alphabet.\nEntering the special cases is enough."));
   }
 }
 
diff --git a/src/dialoggui.cpp b/src/dialoggui.cpp
index 832ca67c..9f0ee117 100644
--- a/src/dialoggui.cpp
+++ b/src/dialoggui.cpp
@@ -143,7 +143,7 @@ void GuiDialog::on_okbutton()
 
   // Restart needed if there was a change in the features.
   if ((old_mode != new_mode) || (old_list != new_list)) {
-    gtkw_dialog_info(featuresdialog, "The changes will take effect after Bibledit-Gtk has been restarted");
+    gtkw_dialog_info(featuresdialog, "The changes will take effect after Bibledit-Desktop has been restarted");
   }
 }
 
diff --git a/src/dialogmaintenance.cpp b/src/dialogmaintenance.cpp
index df04efae..2cecc7c6 100644
--- a/src/dialogmaintenance.cpp
+++ b/src/dialogmaintenance.cpp
@@ -154,7 +154,7 @@ void MaintenanceDialog::load_webview (const gchar * url)
     htmlwriter.text_add ("Maintenance");
     htmlwriter.heading_close ();
     htmlwriter.paragraph_open();
-    htmlwriter.text_add (_("Some actions may have great impact on Bibledit-Gtk. Use with care."));
+    htmlwriter.text_add (_("Some actions may have great impact on Bibledit-Desktop. Use with care."));
     htmlwriter.paragraph_close();
 
     // Mechon Mamre Hebrew text link.
diff --git a/src/directories.cpp b/src/directories.cpp
index 6d963eea..7dd81613 100644
--- a/src/directories.cpp
+++ b/src/directories.cpp
@@ -76,11 +76,11 @@ directories::directories(char *argv0)
   // answer we have pre-computed.
 #ifdef WIN32
   // A clever way to take a path like C:\Program
-  // Files\Bibledit-Gtk\editor\bin\ and chop the
-  // last component to get back to <something>\Bibledit-Gtk\editor...
+  // Files\Bibledit-Desktop\editor\bin\ and chop the
+  // last component to get back to <something>\Bibledit-Desktop\editor...
   package_data = gw_path_get_dirname(rundir);
   // ... Then add two more dirs back on, resulting in
-  // <something>Bibledit-Gtk\editor\share\bibledit
+  // <something>Bibledit-Desktop\editor\share\bibledit
   package_data = gw_build_filename(package_data, "share", "bibledit");
 #else
   // For Linux, this is hard-coded to match the variable set in config.h
diff --git a/src/directories.h b/src/directories.h
index 77fa773d..d3a648ef 100644
--- a/src/directories.h
+++ b/src/directories.h
@@ -38,9 +38,9 @@ class directories {
   // Directory bibledit is run from (e.g. /usr/bin or
   // C:\Program Files\Bibledit\editor\bin)
   ustring rundir;
-  // Executable name (e.g. bibledit-gtk)
+  // Executable name (e.g. bibledit-desktop)
   ustring exename;
-  // Package data directory (e.g. /usr/share/bibledit-gtk or
+  // Package data directory (e.g. /usr/share/bibledit-desktop or
   // C:\Program Files\Bibledit\editor\share\bibledit)
   ustring package_data;
   ustring home;
diff --git a/src/kjv.cpp b/src/kjv.cpp
index 4e62bf7f..bf6e11fe 100644
--- a/src/kjv.cpp
+++ b/src/kjv.cpp
@@ -51,7 +51,7 @@ void kjv_detailed_page (HtmlWriter2& htmlwriter)
   htmlwriter.text_add (_("Sword King James Bible with Strong's lemmata"));
   htmlwriter.heading_close ();
   htmlwriter.paragraph_open();
-  htmlwriter.text_add (_("The King James Bible from the Sword project is useful for its Strong's numbers tagged in the text. Bibledit-Gtk uses this to find related verses, among other things. Importing consists of two steps: exporting it from Sword and creating a database out of it."));
+  htmlwriter.text_add (_("The King James Bible from the Sword project is useful for its Strong's numbers tagged in the text. Bibledit-Desktop uses this to find related verses, among other things. Importing consists of two steps: exporting it from Sword and creating a database out of it."));
   htmlwriter.paragraph_close();
   htmlwriter.heading_open (4);
   htmlwriter.text_add (_("1. Exporting the text from Sword"));
@@ -125,7 +125,7 @@ void kjv_action_page (HtmlWriter2& htmlwriter)
   htmlwriter.heading_close ();
   if (keep_going) {
     htmlwriter.paragraph_open ();
-    htmlwriter.text_add (_("To use the database, copy the file kjv.sql into the Bibledit-Gtk package and re-install."));
+    htmlwriter.text_add (_("To use the database, copy the file kjv.sql into the Bibledit-Desktop package and re-install."));
     htmlwriter.paragraph_close ();
   }
   for (unsigned int i = 0; i < messages.size(); i++) {
diff --git a/src/layout.cpp b/src/layout.cpp
index f77f91d2..fc16dc89 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -147,7 +147,7 @@ void ScreenLayoutDimensions::timeout()
         // gtk_window_resize (mywindow, width, height);
 #ifndef DARWIN
         // Function gtk_window_move crashes on some version of Mac OS X 
-        // when bibledit-gtk is installed through macports.
+        // when bibledit-desktop is installed through macports.
         gtk_window_move (mywindow, x, y);
 #endif
       }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 14d77381..4b3317b4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -190,7 +190,7 @@ navigation(0), httpd(0)
   interprocess_communications_initiate_listener_message_id = 0;
   
   // Application name.
-  g_set_application_name("Bibledit-Gtk");
+  g_set_application_name("Bibledit-Desktop");
 
   // Gui Features object.
   GuiFeatures guifeatures(0);
@@ -5274,7 +5274,7 @@ void MainWindow::handle_editor_focus()
   check_usfm_window_ping ();
   
   // Set the title of the main window to include the project.
-  ustring title = "Bibledit-Gtk";
+  ustring title = "Bibledit-Desktop";
   if (!project.empty()) {
     title.append (" - ");
     title.append (project);
diff --git a/src/mechonmamre.cpp b/src/mechonmamre.cpp
index 6599104c..8c1576aa 100644
--- a/src/mechonmamre.cpp
+++ b/src/mechonmamre.cpp
@@ -67,7 +67,7 @@ void mechon_mamre_detailed_page (HtmlWriter2& htmlwriter)
   htmlwriter.text_add ("Hebrew Bible with cantillation marks from Mechon Mamre");
   htmlwriter.heading_close ();
   htmlwriter.paragraph_open();
-  htmlwriter.text_add ("The Hebrew Bible from Mechon Mamre provides a Hebrew text that can be useful for translating the Bible. Bibledit-Gtk can import this text. This consists of two steps: downloading it and importing it.");
+  htmlwriter.text_add ("The Hebrew Bible from Mechon Mamre provides a Hebrew text that can be useful for translating the Bible. Bibledit-Desktop can import this text. This consists of two steps: downloading it and importing it.");
   htmlwriter.paragraph_close();
   htmlwriter.heading_open (4);
   htmlwriter.text_add ("1. Downloading the text");
diff --git a/src/merge_utils.cpp b/src/merge_utils.cpp
index 1a521849..f2e3b077 100644
--- a/src/merge_utils.cpp
+++ b/src/merge_utils.cpp
@@ -234,7 +234,7 @@ void merge_editor_and_file (vector <ustring> merge_base,
   // If PHP is not available, skip running the filter to avoid complete data loss.
   if (!gw_find_program_in_path ("php")) {
     gw_message (_("Cannot find PHP."));
-    gw_message (_("Bibledit-Gtk needs PHP for improved collaboration and merging."));
+    gw_message (_("Bibledit-Desktop needs PHP for improved collaboration and merging."));
     gw_message (_("Some changes were lost."));
     gw_message (_("Install package php5-cli."));
     return;
diff --git a/src/paratext.cpp b/src/paratext.cpp
index 9916797d..19fa0406 100644
--- a/src/paratext.cpp
+++ b/src/paratext.cpp
@@ -34,7 +34,7 @@ ExportParatextStylesheet::ExportParatextStylesheet (int dummy)
   }
   // Indicate it was exported from bibledit.
   if (!stylesheet_lines.empty()) {
-    stylesheet_lines[0].append (_("# Exported from Bibledit-Gtk"));
+    stylesheet_lines[0].append (_("# Exported from Bibledit-Desktop"));
   }
 }
 
diff --git a/src/readwrite.cpp b/src/readwrite.cpp
index 15d437a4..200674b8 100644
--- a/src/readwrite.cpp
+++ b/src/readwrite.cpp
@@ -39,10 +39,10 @@ Breaking the syntax down we have:
 
 First parameter: -r|-w 
 This can be either -r or -w which determines whether the remaining arguments are going to do a "read" operation 
-from the specified Bibledit-Gtk Bible / project, or do a "write" operation to that Bible / project.
+from the specified Bibledit-Desktop Bible / project, or do a "write" operation to that Bible / project.
 
 Second parameter: project 
-This gives the name of the Bibledit-Gtk Bible / project. 
+This gives the name of the Bibledit-Desktop Bible / project. 
 All we have to do is ensure that the project name we want to access is a valid/existing one.
 
 Third parameter: book
@@ -57,7 +57,7 @@ Fifth parameter: fileName
 This is a temporary file name that we assign for our use with bibledit-rdwrt. 
 For a read (-r) operation this fileName argument is the name of the file that will be created by bibledit-rdwrt
 containing a copy of the whole book (corresponding to the 3-letter code), 
-or that contains the individual chapter contents (of a designated chapter) of an existing Bibledit-Gtk book file
+or that contains the individual chapter contents (of a designated chapter) of an existing Bibledit-Desktop book file
 in the Bible / project. It should be prefixed with a path us. 
 Since bibledit-rdwrt is a console operation, after AdaptIt calls it using ::wxExecute, 
 it would need to read the resulting temporary file to grab the contents for its use. 
@@ -98,7 +98,7 @@ It may write to stdout or stderr, as it sees fit.
   }
   
   // Fourth parameter: chapter | 0.
-  // Bibledit-Gtk supports chapter 0.
+  // Bibledit-Desktop supports chapter 0.
   // But here it is different. Chapter 0 means to read/write the whole book, not chapter 0.
   // A chapter number other than 0 refers to that particular chapter.
   int chapter = ABS (convert_to_int (argv[4]));
diff --git a/src/restore.cpp b/src/restore.cpp
index 9b4bde0f..01a02be3 100644
--- a/src/restore.cpp
+++ b/src/restore.cpp
@@ -60,7 +60,7 @@ void restore_notes (const ustring& unpack_directory, vector <ustring>& feedback)
   unsigned int current_count = notes_count ();
   feedback.push_back (_("Notes available before restore: ") + convert_to_string (current_count));
   if (current_count > 0) {
-    ustring question = _("Currently Bibledit-Gtk has ") + convert_to_string (current_count) + _(" notes. Would you like to overwrite these?");
+    ustring question = _("Currently Bibledit-Desktop has ") + convert_to_string (current_count) + _(" notes. Would you like to overwrite these?");
     if (gtkw_dialog_question(NULL, question, GTK_RESPONSE_NO) == GTK_RESPONSE_YES) {
       feedback.push_back (_("Restore has overwritten the existing notes"));
     } else {
diff --git a/src/startup.cpp b/src/startup.cpp
index ab9ae827..4ccb371f 100644
--- a/src/startup.cpp
+++ b/src/startup.cpp
@@ -35,7 +35,7 @@ bool check_bibledit_startup_okay (int argc, char *argv[])
 #ifndef WIN32
   bool root = (getuid() == 0);
   if (root) {
-    gtkw_dialog_error(NULL, _("Bibledit-Gtk has not been designed to run as user root.\nPlease run it as a standard user."));
+    gtkw_dialog_error(NULL, _("Bibledit-Desktop has not been designed to run as user root.\nPlease run it as a standard user."));
     return false;
   }
 #endif
@@ -49,14 +49,14 @@ bool check_bibledit_startup_okay (int argc, char *argv[])
   }
 
   // See whether Bibledit itself is running already.
-  if (programs_running_count("bibledit-gtk") > 1) {
-    gtkw_dialog_error(NULL, _("Bibledit-Gtk is already running."));
+  if (programs_running_count("bibledit-desktop") > 1) {
+    gtkw_dialog_error(NULL, _("bibledit-besktop is already running."));
     return false;
   }
   
   // See whether Bibledit is shutting down.
   if (program_is_running ("bibledit-shutdown")) {
-    gtkw_dialog_error(NULL, _("The previous instance of Bibledit-Gtk is still optimizing its data while shutting down.\nPlease wait till that has been done, and try again."));
+    gtkw_dialog_error(NULL, _("The previous instance of bibledit-desktop is still optimizing its data while shutting down.\nPlease wait till that has been done, and try again."));
     return false;
   }
 
diff --git a/src/xetex.cpp b/src/xetex.cpp
index 11649106..3114ce76 100644
--- a/src/xetex.cpp
+++ b/src/xetex.cpp
@@ -86,7 +86,7 @@ void XeTeX::write_document_tex_file ()
   extern Styles * styles;
   Stylesheet * sheet = styles->stylesheet (stylesheet_get_actual ());
   
-  document_tex.push_back (_("% Configuration file created by Bibledit-Gtk"));
+  document_tex.push_back (_("% Configuration file created by Bibledit-Desktop"));
   document_tex.push_back (_("% You can modify it to suit your needs"));
   document_tex.push_back (_("% After modification, run the following command in this directory:"));
   document_tex.push_back (_("%   xetex document.tex"));