Changeset 982d556d90595247ada3b5eb2883f48c4d791ca5

Timestamp:

14/02/10 22:41:40 (2 years ago)

Author:

Benjamin Herr <ben@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2010-02-14T22:35:45Z+0100

Parents:

dd8543c6808bb28cfc8420e6816e9654fbe3134d

Children:

3aa7aa1180d71fdf093336f873b1dfedbda41455

git-committer:

Benjamin Herr <ben@0x539.de> / 2010-02-14T22:41:40Z+0100

Message:

More translation changes, added quotation marks to strings.

Files:

• ChangeLog (modified) (1 diff)
• code/commands/help-commands.cpp (modified) (2 diffs)
• code/dialogs/password-dialog.cpp (modified) (1 diff)
• code/operations/operation-delete.cpp (modified) (2 diffs)
• code/operations/operation-export-html.cpp (modified) (4 diffs)
• code/operations/operation-new.cpp (modified) (2 diffs)
• code/operations/operation-open.cpp (modified) (1 diff)
• code/operations/operation-save.cpp (modified) (2 diffs)
• po/ChangeLog (modified) (1 diff)
• po/de.po (modified) (11 diffs)
• po/en_GB.po (modified) (18 diffs)
• po/gobby05.pot (modified) (13 diffs)

ChangeLog

@@ +1 @@
+2010-02-14  Benjamin Herr  <ben@0x539.de>
+
+        * code/dialogs/password-dialog.cpp:
+        * code/operations/operation-delete.cpp:
+        * code/operations/operation-new.cpp:
+        * code/operations/operation-open.cpp:
+        * code/operations/operation-save.cpp: Added quotation marks in
+        messages including file paths or document names.
+
+        * code/operations/operation-export-html.cpp: Quotations marks as
+        above, also moved a comment so it shows up in .po files.
+
+        * code/commands/help-commands.cpp: Updated FSF address in GPL, added
+        Michael Frey to translation credits.
+
+
 2010-02-13  Armin Burgmeier  <armin@arbur.net>
 

code/commands/help-commands.cpp

@@ -98 +98 @@
                 translators.push_back(_("British English:"));
                 translators.push_back("\tGabríel A. Pétursson <gabrielp@simnet.is>");
+                translators.push_back(_("German:"));
+                translators.push_back("\tMichael Frey <michael.frey@gmx.ch>");
 
                 Glib::ustring transl = "";
@@ -127 +129 @@
                         "You should have received a copy of the GNU General "
                         "Public License along with this program; if not, "
-                        "write to the Free Software Foundation, Inc., 675 "
-                        "Mass Ave, Cambridge, MA 02139, USA."));
+                        "write to the Free Software Foundation, Inc., 51 "
+                        "Franklin Street, Fifth Floor, Boston, MA  "
+                        "02110-1301, USA"));
                 m_about_dialog->set_logo_icon_name("gobby-0.5");
                 m_about_dialog->set_program_name("Gobby");

code/dialogs/password-dialog.cpp

@@ -25 +25 @@
                                 const Glib::ustring& remote_id,
                                 unsigned int retry_counter):
-        Gtk::Dialog(_("Password required"), parent), m_box(false, 12),
+        Gtk::Dialog(_("Password Required"), parent), m_box(false, 12),
         m_rightbox(false, 6),
         m_promptbox(false, 12),

code/operations/operation-delete.cpp

@@ -40 +40 @@
 
         m_message_handle = get_status_bar().add_info_message(
-                Glib::ustring::compose(_("Removing node %1..."), m_name));
+                Glib::ustring::compose(_("Removing node \"%1\"..."), m_name));
 }
 
@@ -55 +55 @@
 {
         get_status_bar().add_error_message(
-                Glib::ustring::compose(_("Failed to delete node %1"), m_name),
+                Glib::ustring::compose(_("Failed to delete node \"%1\""),
+                                       m_name),
                 error->message);
 

code/operations/operation-export-html.cpp

@@ -243 +243 @@
                 char const* path     = view.get_path().c_str();
 
+                char const* translated =
                 // %1$s is session name/hostname
                 // %2$s is path within the session
@@ -249 +250 @@
                 //   we need to handle that manually to insert a hyperlink
                 //   instead of just printf'ing it.
-                char const* translated =
                         _("Document generated from %1$s:%2$s at %3$s by %4$s");
                 char const* p = std::strstr(translated, "%4$s");
@@ -452 +452 @@
         m_message_handle = get_status_bar().add_info_message(
                 Glib::ustring::compose(
-                        _("Exporting document %1 to %2 in HTML..."),
+                        _("Exporting document \"%1\" to \"%2\" in HTML..."),
                         view.get_title(), uri));
 }
@@ -524 +524 @@
         get_status_bar().add_error_message(
                 Glib::ustring::compose(
-                        _("Failed to export document %1 to HTML"), m_file->get_uri()),
+                        _("Failed to export document \"%1\" to HTML"), m_file->get_uri()),
                 message);
 

code/operations/operation-new.cpp

@@ -54 +54 @@
         m_message_handle = get_status_bar().add_info_message(
                 Glib::ustring::compose(
-                        directory ? _("Creating directory %1...")
-                                  : _("Creating document %1..."), name));
+                        directory ? _("Creating directory \"%1\"...")
+                                  : _("Creating document \"%1\"..."), name));
 }
 
@@ -71 +71 @@
         get_status_bar().add_error_message(
                 Glib::ustring::compose(
-                        m_directory ? _("Failed to create directory %1")
-                                    : _("Failed to create document %1"),
+                        m_directory ? _("Failed to create directory \"%1\"")
+                                    : _("Failed to create document \"%1\""),
                         m_name),
                 error->message);

code/operations/operation-open.cpp

@@ -87 +87 @@
                 m_message_handle = get_status_bar().add_info_message(
                         Glib::ustring::compose(
-                                _("Opening document %1..."), uri));
+                                _("Opening document \"%1\"..."), uri));
 
                 m_parent.signal_node_removed().connect(

code/operations/operation-save.cpp

@@ -71 +71 @@
 
         m_message_handle = get_status_bar().add_info_message(
-                Glib::ustring::compose(_("Saving document %1 to %2..."),
+                Glib::ustring::compose(
+                        _("Saving document \"%1\" to \"%2\"..."),
                         view.get_title(), uri));
 
@@ -285 +286 @@
 {
         get_status_bar().add_error_message(
-                Glib::ustring::compose(_("Failed to save document %1"),
+                Glib::ustring::compose(_("Failed to save document \"%1\""),
                                          m_file->get_uri()),
                 message);

po/ChangeLog

@@ +1 @@
+2010-02-14  Benjamin Herr  <ben@0x539.de>
+
+        * en_GB.po:
+        * de.po: Brought up to date
+
 2010-02-14  Armin Burgmeier  <armin@arbur.net>, Benjamin Herr <ben@0x539.de>, Michael Frey <michael.frey@gmx.ch>
 

po/de.po

@@ -6 +6 @@
 msgstr ""
 "Project-Id-Version: 0.4.93\n"
-"Report-Msgid-Bugs-To: http://gobby.0x539.de/trac/newticket\n"
-"POT-Creation-Date: 2009-08-29 17:46-0400\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-02-14 22:31+0100\n"
 "PO-Revision-Date: 2010-02-07 09:40+0100\n"
 "Last-Translator: Michael Frey <michael.frey@gmx.ch>\n"
@@ -16 +16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. Document cannot be used if an error happened
-#. during synchronization.
-#: ../code/commands/browser-commands.cpp:54
-msgid "This document cannot be used."
-msgstr "Dieses Dokument kann nicht verwendet werden."
-
-#: ../code/commands/browser-commands.cpp:57
-msgid "You can still watch others editing the document, but you cannot edit it yourself."
-msgstr "Sie können anderen beim Bearbeiten des Dokuments zusehen, aber nicht selbst Änderungen vornehmen."
-
-#: ../code/commands/browser-commands.cpp:64
-msgid "If you have an idea what could have caused the problem, then you may attempt to solve it and try again (after having closed this document). Otherwise it is most likely a bug in the software. In that case, please file a bug report at http://gobby.0x539.de/trac/newticket and provide as much information as you can, including what you did when the problem occurred and how to reproduce the problem (if possible) so that we can fix the problem in a later version. Thank you."
-msgstr "Falls Sie eine Möglichkeit zur Behebung des Problems sehen, können Sie das Dokument schließen und es erneut versuchen. Ansonsten handelt es sich wahrscheinlich um einen Programmfehler. In diesem Fall können Sie einen Fehlerbericht unter http://gobby.0x539.de/trac/newticket einreichen mit möglichst vielen zusÀtzlichen Informationen, insbesondere, was Sie gerade taten, als das Problem auftrat, und, wenn möglich, wie man es reproduzieren kann, so dass wir den Fehler fÃŒr die nÀchste Version beheben können. Vielen Dank."
-
-#: ../code/commands/browser-commands.cpp:255
+#: ../code/commands/browser-commands.cpp:109
 msgid "Subscribing to %1..."
 msgstr "Anmeldung bei %1
"
 
-#: ../code/commands/browser-commands.cpp:272
-msgid "Subscription already in progress"
-msgstr "Anmeldung lÀuft bereits"
-
-#: ../code/commands/browser-commands.cpp:350
-#: ../code/commands/browser-commands.cpp:461
-msgid "Synchronization in progress... %1%%"
-msgstr "Abgleich in Arbeit
 %1%%"
-
-#: ../code/commands/browser-commands.cpp:371
-msgid "Subscription failed: %1"
-msgstr "Anmeldung fehlgeschlagen: %1"
-
-#: ../code/commands/browser-commands.cpp:487
-msgid ""
-"The connection to the publisher of this document has been lost. Further changes to the document could not be synchronized to others anymore, therefore the document cannot be edited anymore.\n"
-"\n"
-"Please note also that it is possible that not all of your latest changes have reached the publisher before the connection was lost."
-msgstr  ""
-"Die Verbindung zum Verteiler dieses Dokumentes wurde verloren. Änderungen am Dokument können nicht mehr mit anderen abgeglichen werden, daher kann dieses Dokument nicht mehr bearbeitet werden.\n"
-"\n"
-"Bitte beachten Sie, dass ihre letzten Änderungen möglicherweise nicht mehr den Verteiler erreichen konnten, bevor die Verbindung verloren ging."
-
-#: ../code/commands/browser-commands.cpp:575
-msgid "User Join in progress..."
-msgstr "Benutzerbeitritt wird bearbeitet
"
-
-#: ../code/commands/browser-context-commands.cpp:92
+#: ../code/commands/browser-commands.cpp:122
+msgid "Subscribing to chat on %1..."
+msgstr "Anmeldung zum Chat bei %1
"
+
+#: ../code/commands/browser-commands.cpp:307
+msgid "Subscription failed"
+msgstr "Anmeldung fehlgeschlagen"
+
+#: ../code/commands/browser-context-commands.cpp:94
 msgid "Create Do_cument..."
 msgstr "Dokument erstellen
"
 
-#: ../code/commands/browser-context-commands.cpp:127
+#: ../code/commands/browser-context-commands.cpp:129
 msgid "Create Directory..."
 msgstr "Verzeichnis erstellen
"
 
-#: ../code/commands/browser-context-commands.cpp:140
+#: ../code/commands/browser-context-commands.cpp:142
 msgid "_Open Document..."
 msgstr "Dokument ö_ffnen
"
 
-#: ../code/commands/browser-context-commands.cpp:159
+#: ../code/commands/browser-context-commands.cpp:161
 msgid "D_elete"
 msgstr "_Löschen"
 
-#: ../code/commands/browser-context-commands.cpp:183
+#: ../code/commands/browser-context-commands.cpp:197
 msgid "Choose a name for the directory"
 msgstr "WÀhlen Sie einen Namen fÌr das Verzeichnis"
 
-#: ../code/commands/browser-context-commands.cpp:184
+#: ../code/commands/browser-context-commands.cpp:198
 msgid "Choose a name for the document"
 msgstr "WÀhlen Sie einen Namen fÌr das Dokument:"
 
-#: ../code/commands/browser-context-commands.cpp:185
+#: ../code/commands/browser-context-commands.cpp:199
 msgid "_Directory Name:"
 msgstr "_Verzeichnisname:"
 
-#: ../code/commands/browser-context-commands.cpp:186
+#: ../code/commands/browser-context-commands.cpp:200
 msgid "_Document Name:"
 msgstr "_Dokumentname:"
 
-#: ../code/commands/browser-context-commands.cpp:189
+#: ../code/commands/browser-context-commands.cpp:203
 msgid "C_reate"
 msgstr "E_rstellen"
 
-#: ../code/commands/browser-context-commands.cpp:193
+#: ../code/commands/browser-context-commands.cpp:207
 msgid "New Directory"
 msgstr "Neues Verzeichnis"
 
-#: ../code/commands/browser-context-commands.cpp:194
+#: ../code/commands/browser-context-commands.cpp:208
 #: ../code/commands/file-tasks/task-new.cpp:38
 msgid "New Document"
 msgstr "Neues Dokument"
 
-#: ../code/commands/browser-context-commands.cpp:210
+#: ../code/commands/browser-context-commands.cpp:224
 #: ../code/commands/file-tasks/task-open-file.cpp:24
 msgid "Choose a text file to open"
 msgstr "Dateien öffnen"
 
+#: ../code/commands/file-tasks/task-export-html.cpp:29
+msgid "Choose a location to export document \"%1\" to"
+msgstr "WÀhlen Sie ein Verzeichnis zum Exportieren der Datei »%1«"
+
 #: ../code/commands/file-tasks/task-open.cpp:48
 msgid "Querying \"%1\"..."
@@ -116 +87 @@
 
 #: ../code/commands/file-tasks/task-open.cpp:105
-#: ../code/operations/operation-open.cpp:435
+#: ../code/operations/operation-open.cpp:437
 #: ../code/operations/operation-open-multiple.cpp:159
-msgid "Failed to open document \"%1\": %2"
-msgstr "Öffnen des Dokuments fehlschlagen »%1«: %2"
+msgid "Failed to open document \"%1\""
+msgstr "Öffnen des Dokuments fehlschlagen »%1«"
 
 #: ../code/commands/file-tasks/task-save.cpp:26
@@ -130 +101 @@
 msgstr "Beim Anzeigen der Hilfe ist ein Fehler aufgetreten."
 
-#: ../code/commands/help-commands.cpp:96
+#: ../code/commands/help-commands.cpp:92
+msgid "Contributors:"
+msgstr "Mitwirkende:"
+
+#: ../code/commands/help-commands.cpp:98
+msgid "British English:"
+msgstr "Britisches Englisch:"
+
+#: ../code/commands/help-commands.cpp:100
+msgid "German:"
+msgstr "Deutsch:"
+
+#: ../code/commands/help-commands.cpp:117
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful,  but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA."
-msgstr ""
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemÀß Version 2 der Lizenz oder (nach Ihrer Option) jeder spÀteren Version.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
+msgstr ""
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemÀß Version 2 "
+"der Lizenz oder (nach Ihrer Option) jeder spÀteren Version.\n"
 "\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
 "\n"
-"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.\n"
-
-#: ../code/core/browser.cpp:41
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
+
+#: ../code/commands/subscription-commands.cpp:259
+msgid ""
+"The connection to the publisher of this document has been lost. Further "
+"changes to the document could not be synchronized to others anymore, "
+"therefore the document cannot be edited anymore.\n"
+"\n"
+"Please note also that it is possible that not all of your latest changes "
+"have reached the publisher before the connection was lost."
+msgstr ""
+"Die Verbindung zum Verteiler dieses Dokumentes wurde verloren. Änderungen am "
+"Dokument können nicht mehr mit anderen abgeglichen werden, daher kann dieses "
+"Dokument nicht mehr bearbeitet werden.\n"
+"\n"
+"Bitte beachten Sie, dass ihre letzten Änderungen möglicherweise nicht mehr "
+"den Verteiler erreichen konnten, bevor die Verbindung verloren ging."
+
+#: ../code/commands/synchronization-commands.cpp:32
+msgid "Synchronization in progress... %1%%"
+msgstr "Abgleich in Arbeit
 %1%%"
+
+#. Document cannot be used if an error happened
+#. during synchronization.
+#: ../code/commands/synchronization-commands.cpp:44
+msgid "This document cannot be used."
+msgstr "Dieses Dokument kann nicht verwendet werden."
+
+#: ../code/commands/synchronization-commands.cpp:47
+#: ../code/commands/user-join-commands.cpp:40
+msgid ""
+"If you have an idea what could have caused the problem, then you may attempt "
+"to solve it and try again (after having closed this document). Otherwise it "
+"is most likely a bug in the software. In that case, please file a bug report "
+"at http://gobby.0x539.de/trac/newticket and provide as much information as "
+"you can, including what you did when the problem occurred and how to "
+"reproduce the problem (if possible) so that we can fix the problem in a "
+"later version. Thank you."
+msgstr ""
+"Falls Sie eine Möglichkeit zur Behebung des Problems sehen, können Sie das "
+"Dokument schließen und es erneut versuchen. Ansonsten handelt es sich "
+"wahrscheinlich um einen Programmfehler. In diesem Fall können Sie einen "
+"Fehlerbericht unter http://gobby.0x539.de/trac/newticket einreichen mit "
+"möglichst vielen zusÀtzlichen Informationen, insbesondere, was Sie gerade "
+"taten, als das Problem auftrat, und, wenn möglich, wie man es reproduzieren "
+"kann, so dass wir den Fehler fÌr die nÀchste Version beheben können. Vielen "
+"Dank."
+
+#: ../code/commands/synchronization-commands.cpp:61
+msgid "Synchronization failed: %1"
+msgstr "Abgleich fehlgeschlagen: %1"
+
+#. TODO: Adjust this for chat sessions
+#: ../code/commands/user-join-commands.cpp:35
+msgid ""
+"You can still watch others editing the document, but you cannot edit it "
+"yourself."
+msgstr ""
+"Sie können anderen beim Bearbeiten des Dokuments zusehen, aber nicht selbst "
+"Änderungen vornehmen."
+
+#: ../code/commands/user-join-commands.cpp:54
+msgid "User Join failed: %1"
+msgstr "Anmeldung fehlgeschlagen: %1"
+
+#: ../code/commands/user-join-commands.cpp:283
+msgid "User Join in progress..."
+msgstr "Benutzerbeitritt wird bearbeitet
"
+
+#: ../code/core/browser.cpp:113
 msgid "_Direct Connection"
 msgstr "_Direktverbindung"
 
-#: ../code/core/browser.cpp:43
+#: ../code/core/browser.cpp:115
 msgid "Host Name:"
 msgstr "Servername:"
 
-#: ../code/core/browser.cpp:208
+#: ../code/core/browser.cpp:301 ../code/core/browser.cpp:425
+msgid "Connection to \"%1\" failed"
+msgstr "Verbindung zu »%1« fehlgeschlagen"
+
+#: ../code/core/browser.cpp:354
+msgid "Could not resolve \"%1\""
+msgstr "Auflösung von »%1« fehlgeschlagen"
+
+#: ../code/core/browser.cpp:428
 msgid "Device \"%1\" does not exist"
 msgstr "Schnittstelle »%1« existiert nicht"
 
-#: ../code/core/browser.cpp:246
-msgid "Resolving %1..."
-msgstr "Löse %1
 auf"
-
-#: ../code/core/docwindow.cpp:253
+#: ../code/core/browser.cpp:464
+msgid "Resolving \"%1\"..."
+msgstr "Löse »%1« auf
"
+
+#: ../code/core/header.cpp:198
+msgid "_None"
+msgstr "_Keine"
+
+#: ../code/core/header.cpp:222
+msgid "_File"
+msgstr "_Datei"
+
+#: ../code/core/header.cpp:225
+msgid "_Open..."
+msgstr "Ö_ffnen
"
+
+#: ../code/core/header.cpp:228
+msgid "Open _Location..."
+msgstr "_Ort öffnen
"
+
+#: ../code/core/header.cpp:232
+msgid "Save _As..."
+msgstr "Speichern _als
"
+
+#: ../code/core/header.cpp:236 ../code/core/iconmanager.cpp:40
+msgid "Save All"
+msgstr "Alle speichern"
+
+#: ../code/core/header.cpp:236
+msgid "Save all open files locally"
+msgstr "Alle offenen Dateien lokal speichern"
+
+#: ../code/core/header.cpp:238
+msgid "Export As _HTML..."
+msgstr "Als _HTML exportieren..."
+
+#: ../code/core/header.cpp:241
+msgid "Connect _to Server..."
+msgstr "_Zu Server verbinden
"
+
+#: ../code/core/header.cpp:246
+msgid "_Edit"
+msgstr "_Bearbeiten"
+
+#: ../code/core/header.cpp:254
+msgid "_Find..."
+msgstr "_Suchen
"
+
+#: ../code/core/header.cpp:256
+msgid "Find Ne_xt"
+msgstr "_Weitersuchen"
+
+#: ../code/core/header.cpp:257
+msgid "Find next match of phrase searched for"
+msgstr "Suche nach nÀchstem Vorkommen des Suchbegriffs"
+
+#: ../code/core/header.cpp:260
+msgid "Find Pre_vious"
+msgstr "_RÌckwÀrts suchen"
+
+#: ../code/core/header.cpp:261
+msgid "Find previous match of phrase searched for"
+msgstr "Suche nach vorigem Vorkommen des Suchbegriffs"
+
+#: ../code/core/header.cpp:266
+msgid "Find and Rep_lace..."
+msgstr "Suchen und _Ersetzen
"
+
+#: ../code/core/header.cpp:270
+msgid "Go to _Line..."
+msgstr "Gehe zu _Zeile
"
+
+#: ../code/core/header.cpp:274
+msgid "Pr_eferences..."
+msgstr "_Einstellungen
"
+
+#: ../code/core/header.cpp:276
+msgid "_View"
+msgstr "_Ansicht"
+
+#: ../code/core/header.cpp:279
+msgid "Reset User Colors"
+msgstr "Benutzerfarben zurÃŒcksetzen"
+
+#: ../code/core/header.cpp:280
+msgid "Hide user colors in current document"
+msgstr "Benutzerfarben im aktuellen Dokument nicht anzeigen"
+
+#: ../code/core/header.cpp:283
+msgid "View Toolbar"
+msgstr "Zeige Werkzeugleiste"
+
+#: ../code/core/header.cpp:284
+msgid "Whether to show the toolbar"
+msgstr "Ob die Werkzeugleiste angezeigt werden soll"
+
+#: ../code/core/header.cpp:288
+msgid "View Statusbar"
+msgstr "Zeige Statusleiste"
+
+#: ../code/core/header.cpp:289
+msgid "Whether to show the statusbar"
+msgstr "Ob die Statusleiste angezeigt werden soll"
+
+#: ../code/core/header.cpp:293
+msgid "View Document Browser"
+msgstr "Zeige Dokumentenliste"
+
+#: ../code/core/header.cpp:294
+msgid "Whether to show the document browser"
+msgstr "Ob die Dokumentenliste angezeigt werden soll"
+
+#: ../code/core/header.cpp:298
+msgid "View Chat"
+msgstr "Chat anzeigen"
+
+#: ../code/core/header.cpp:299
+msgid "Whether to show the chat pane"
+msgstr "Ob das Chatfenster angezeigt werden soll"
+
+#: ../code/core/header.cpp:303
+msgid "View Document User List"
+msgstr "Zeige Dokument-Benutzerliste"
+
+#: ../code/core/header.cpp:304
+msgid "Whether to show the user list for documents"
+msgstr "Ob die Benutzerliste fÃŒr Dokumente angezeigt werden soll"
+
+#: ../code/core/header.cpp:308
+msgid "View Chat User List"
+msgstr "Zeige Chat-Benutzerliste"
+
+#: ../code/core/header.cpp:309
+msgid "Whether to show the user list for the chat"
+msgstr "Ob die Benutzerliste des Chats angezeigt werden soll"
+
+#: ../code/core/header.cpp:313
+msgid "_Highlight Mode"
+msgstr "_Syntaxhervorhebung"
+
+#: ../code/core/header.cpp:319
+msgid "_Help"
+msgstr "_Hilfe"
+
+#: ../code/core/header.cpp:322
+msgid "_Contents"
+msgstr "_Inhalt"
+
+#: ../code/core/header.cpp:323
+msgid "Opens the Gobby manual"
+msgstr "Öffnet die Gobby-Anleitung"
+
+#: ../code/core/header.cpp:326
+msgid "_About..."
+msgstr "Ü_ber
"
+
+#: ../code/core/header.cpp:327
+msgid "Shows Gobby's copyright and credits"
+msgstr "Zeigt Gobbys Lizenz und Autoren"
+
+#: ../code/core/iconmanager.cpp:46
+msgid "User list"
+msgstr "Benutzerliste:"
+
+#: ../code/core/iconmanager.cpp:52
+msgid "Document list"
+msgstr "Dokumentenliste"
+
+#: ../code/core/iconmanager.cpp:58 ../code/window.cpp:49
+msgid "Chat"
+msgstr "Chat"
+
+#: ../code/core/iconmanager.cpp:65
+msgid "User Color Indicator"
+msgstr "Benutzerfarbenindikator"
+
+#: ../code/core/sessionuserview.cpp:41
 msgid "User List"
 msgstr "Benutzerliste"
 
-#: ../code/core/docwindow.cpp:576
+#: ../code/core/statusbar.cpp:395
+msgid "Ln %1, Col %2\t%3"
+msgstr "Z. %1, Sp. %2\t%3"
+
+#: ../code/core/statusbar.cpp:398
+msgid "OVR"
+msgstr "ÜBS"
+
+#: ../code/core/statusbar.cpp:398
+msgid "INS"
+msgstr "EIN"
+
+#: ../code/core/textsessionview.cpp:515
 msgid "Text written by <b>%1</b>"
 msgstr "Text geschrieben von <b>%1</b>"
 
-#: ../code/core/docwindow.cpp:582
+#: ../code/core/textsessionview.cpp:521
 msgid "Unowned text"
 msgstr "Kein Verfasser"
 
-#: ../code/core/header.cpp:191
-#: ../code/core/header.cpp.orig:191
-msgid "_None"
-msgstr "_Keine"
-
-#: ../code/core/header.cpp:213
-#: ../code/core/header.cpp.orig:213
-msgid "_File"
-msgstr "_Datei"
-
-#: ../code/core/header.cpp:216
-#: ../code/core/header.cpp.orig:216
-msgid "_Open..."
-msgstr "Ö_ffnen
"
-
-#: ../code/core/header.cpp:219
-#: ../code/core/header.cpp.orig:219
-msgid "Open _Location..."
-msgstr "_Ort öffnen
"
-
-#: ../code/core/header.cpp:223
-#: ../code/core/header.cpp.orig:223
-msgid "Save _As..."
-msgstr "Speichern _als
"
-
-#: ../code/core/header.cpp:227
-#: ../code/core/header.cpp.orig:227
-#: ../code/core/iconmanager.cpp:48
-msgid "Save All"
-msgstr "Alle speichern"
-
-#: ../code/core/header.cpp:227
-#: ../code/core/header.cpp.orig:227
-msgid "Save all open files locally"
-msgstr "Alle offenen Dateien lokal speichern"
-
-#: ../code/core/header.cpp:232
-#: ../code/core/header.cpp.orig:232
-msgid "_Edit"
-msgstr "_Bearbeiten"
-
-#: ../code/core/header.cpp:240
-#: ../code/core/header.cpp.orig:240
-msgid "_Find..."
-msgstr "_Suchen
"
-
-#: ../code/core/header.cpp:242
-#: ../code/core/header.cpp.orig:242
-msgid "Find Ne_xt"
-msgstr "_Weitersuchen"
-
-#: ../code/core/header.cpp:243
-#: ../code/core/header.cpp.orig:243
-msgid "Find next match of phrase searched for"
-msgstr "Suche nach nÀchstem Vorkommen des Suchbegriffs"
-
-#: ../code/core/header.cpp:246
-#: ../code/core/header.cpp.orig:246
-msgid "Find Pre_vious"
-msgstr "_RÌckwÀrts suchen"
-
-#: ../code/core/header.cpp:247
-#: ../code/core/header.cpp.orig:247
-msgid "Find previous match of phrase searched for"
-msgstr "Suche nach vorigem Vorkommen des Suchbegriffs"
-
-#: ../code/core/header.cpp:252
-#: ../code/core/header.cpp.orig:252
-msgid "Find and Rep_lace..."
-msgstr "Suchen und _Ersetzen
"
-
-#: ../code/core/header.cpp:256
-#: ../code/core/header.cpp.orig:256
-msgid "Go to _Line..."
-msgstr "Gehe zu _Zeile
"
-
-#: ../code/core/header.cpp:260
-#: ../code/core/header.cpp.orig:260
-msgid "Pr_eferences..."
-msgstr "_Einstellungen
"
-
-#: ../code/core/header.cpp:262
-#: ../code/core/header.cpp.orig:262
-msgid "_View"
-msgstr "_Ansicht"
-
-#: ../code/core/header.cpp:265
-#: ../code/core/header.cpp.orig:265
-msgid "View Toolbar"
-msgstr "Zeige Werkzeugleiste"
-
-#: ../code/core/header.cpp:266
-#: ../code/core/header.cpp.orig:266
-msgid "Whether to show the toolbar"
-msgstr "Ob die Werkzeugleiste angezeigt werden soll"
-
-#: ../code/core/header.cpp:270
-#: ../code/core/header.cpp.orig:270
-msgid "View Statusbar"
-msgstr "Zeige Statusleiste"
-
-#: ../code/core/header.cpp:271
-#: ../code/core/header.cpp.orig:271
-msgid "Whether to show the statusbar"
-msgstr "Ob die Statusleiste angezeigt werden soll"
-
-#: ../code/core/header.cpp:275
-#: ../code/core/header.cpp.orig:275
-msgid "View Document Browser"
-msgstr "Zeige Dokumentenliste"
-
-#: ../code/core/header.cpp:276
-#: ../code/core/header.cpp.orig:276
-msgid "Whether to show the document browser"
-msgstr "Ob die Dokumentenliste angezeigt werden soll"
-
-#: ../code/core/header.cpp:280
-#: ../code/core/header.cpp.orig:280
-msgid "View User List"
-msgstr "Zeige Benutzerliste"
-
-#: ../code/core/header.cpp:281
-#: ../code/core/header.cpp.orig:281
-msgid "Whether to show the user list"
-msgstr "Ob die Benutzerliste angezeigt werden soll"
-
-#: ../code/core/header.cpp:285
-#: ../code/core/header.cpp.orig:285
-msgid "_Highlight Mode"
-msgstr "_Syntaxhervorhebung"
-
-#: ../code/core/header.cpp:291
-#: ../code/core/header.cpp.orig:291
-msgid "_Help"
-msgstr "_Hilfe"
-
-#: ../code/core/header.cpp:294
-#: ../code/core/header.cpp.orig:294
-msgid "_Contents"
-msgstr "_Inhalt"
-
-#: ../code/core/header.cpp:295
-#: ../code/core/header.cpp.orig:295
-msgid "Opens the Gobby manual"
-msgstr "Öffnet die Gobby-Anleitung"
-
-#: ../code/core/header.cpp:298
-#: ../code/core/header.cpp.orig:298
-msgid "_About..."
-msgstr "Ü_ber
"
-
-#: ../code/core/header.cpp:299
-#: ../code/core/header.cpp.orig:299
-msgid "Shows Gobby's copyright and credits"
-msgstr "Zeigt Gobbys Lizenz und Autoren"
-
-#: ../code/core/iconmanager.cpp:39
-msgid "User list"
-msgstr "Benutzerliste:"
-
-#: ../code/core/iconmanager.cpp:45
-msgid "Document list"
-msgstr "Dokumentenliste"
-
-#: ../code/core/statusbar.cpp:246
-msgid "Ln %1, Col %2"
-msgstr "Z. %1, Sp. %2"
-
-#: ../code/core/userlist.cpp:126
+#: ../code/core/userlist.cpp:105
 msgid "Users"
 msgstr "Benutzer"
+
+#: ../code/dialogs/connection-dialog.cpp:28
+msgid "Connect to Server"
+msgstr "Zu Server verbinden"
+
+#: ../code/dialogs/connection-dialog.cpp:32
+msgid "Please enter a host name with which to establish a connection."
+msgstr ""
+"Bitte geben sie den Namen des Servers ein, zu dem Sie verbinden wollen."
+
+#: ../code/dialogs/connection-dialog.cpp:34
+msgid "_Remote Endpoint:"
+msgstr "Servername:"
 
 #: ../code/dialogs/document-location-dialog.cpp:29
@@ -362 +465 @@
 #: ../code/dialogs/document-location-dialog.cpp:166
 msgid "Choose a directory to create the documents into:"
-msgstr "WÀhlen Sie das Verzeichnis, in dem die Dokumente erstellt werden sollen:"
-
-#: ../code/dialogs/find-dialog.cpp:46
-#: ../code/dialogs/find-dialog.cpp:144
+msgstr ""
+"WÀhlen Sie das Verzeichnis, in dem die Dokumente erstellt werden sollen:"
+
+#: ../code/dialogs/find-dialog.cpp:46 ../code/dialogs/find-dialog.cpp:144
 msgid "Find"
 msgstr "Suche"
@@ -405 +508 @@
 msgstr "Ersetzen"
 
-#: ../code/dialogs/find-dialog.cpp:163
-#: ../code/dialogs/find-dialog.cpp:179
+#: ../code/dialogs/find-dialog.cpp:163 ../code/dialogs/find-dialog.cpp:179
 msgid "Phrase \"%1\" has not been found"
 msgstr "Der Ausdruck »%1« wurde nicht gefunden"
 
-#: ../code/dialogs/find-dialog.cpp:332
-msgid "No occurence has been replaced"
+#: ../code/dialogs/find-dialog.cpp:337
+msgid "No occurrence has been replaced"
 msgstr "Es wurde keine Ersetzung vorgenommen"
 
-#: ../code/dialogs/find-dialog.cpp:338
-msgid "%1 occurence has been replaced"
-msgid_plural "%1 occurences have been replaced"
+#: ../code/dialogs/find-dialog.cpp:343
+msgid "%1 occurrence has been replaced"
+msgid_plural "%1 occurrences have been replaced"
 msgstr[0] "%1 Treffer wurde ersetzt"
 msgstr[1] "%1 Treffer wurden ersetzt"
@@ -441 +543 @@
 
 #: ../code/dialogs/initial-dialog.cpp:62
-msgid "Before we start, a few options need to be configured. You can later change them by choosing Edit ▾ Preferences from the menu."
-msgstr "Bevor Sie loslegen können, mÃŒssen noch einige Einstellungen vorgenommen werden. Sie können diese Einstellungen spÀter unter Bearbeiten ▾ Einstellungen im HauptmenÃŒ verÀndern."
+msgid ""
+"Before we start, a few options need to be configured. You can later change "
+"them by choosing Edit ▾ Preferences from the menu."
+msgstr ""
+"Bevor Sie loslegen können, mÌssen noch einige Einstellungen vorgenommen "
+"werden. Sie können diese Einstellungen spÀter unter Bearbeiten ▾ "
+"Einstellungen im HauptmenÌ verÀndern."
 
 #: ../code/dialogs/initial-dialog.cpp:69
@@ -468 +575 @@
 msgstr "Geben Sie den Ort (URI) der Datei ein, die Sie öffnen möchten:"
 
-#: ../code/dialogs/preferences-dialog.cpp:229
+#: ../code/dialogs/password-dialog.cpp:27
+msgid "Password Required"
+msgstr "Passwort benötigt"
+
+#: ../code/dialogs/password-dialog.cpp:33
+msgid "Connection to host \"%1\" requires a password."
+msgstr "Die Verbindung zum Server »%1« erfordert ein Passwort."
+
+#: ../code/dialogs/password-dialog.cpp:34
+msgid "Invalid password for host \"%1\". Please try again."
+msgstr "UngÌltiges Password fÌr Server »%1«. Bitte versuchen Sie es erneut."
+
+#: ../code/dialogs/password-dialog.cpp:37
+msgid "Server _Password:"
+msgstr "Server-Passwort:"
+
+#: ../code/dialogs/preferences-dialog.cpp:232
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../code/dialogs/preferences-dialog.cpp:230
+#: ../code/dialogs/preferences-dialog.cpp:233
 msgid "Paths"
 msgstr "Pfade"
 
-#: ../code/dialogs/preferences-dialog.cpp:232
+#: ../code/dialogs/preferences-dialog.cpp:235
 msgid "User name:"
 msgstr "Benutzername:"
 
-#: ../code/dialogs/preferences-dialog.cpp:234
+#: ../code/dialogs/preferences-dialog.cpp:237
 msgid "User color:"
 msgstr "Benutzerfarbe:"
 
-#: ../code/dialogs/preferences-dialog.cpp:235
+#: ../code/dialogs/preferences-dialog.cpp:238
 msgid "Choose a new user color"
 msgstr "Neue Benutzerfarbe wÀhlen"
 
-#: ../code/dialogs/preferences-dialog.cpp:238
+#: ../code/dialogs/preferences-dialog.cpp:241
 msgid "Host directory:"
 msgstr "Sitzungsverzeichnis"
 
-#: ../code/dialogs/preferences-dialog.cpp:280
+#: ../code/dialogs/preferences-dialog.cpp:283
 msgid "The directory into which locally hosted sessions are permanently stored"
 msgstr "Verzeichnis zur permanenten Aufbewahrung veröffentlichter Dokuemente"
 
-#: ../code/dialogs/preferences-dialog.cpp:297
+#: ../code/dialogs/preferences-dialog.cpp:300
 msgid "Tab Stops"
 msgstr "Tabulatoren"
 
-#: ../code/dialogs/preferences-dialog.cpp:298
+#: ../code/dialogs/preferences-dialog.cpp:301
 msgid "Indentation"
 msgstr "ZeileneinrÃŒckung"
 
-#: ../code/dialogs/preferences-dialog.cpp:299
-msgid "Home/End Behaviour"
+#: ../code/dialogs/preferences-dialog.cpp:302
+msgid "Home/End Behavior"
 msgstr "Pos1/Ende-Verhalten"
 
-#: ../code/dialogs/preferences-dialog.cpp:300
+#: ../code/dialogs/preferences-dialog.cpp:303
 msgid "File Saving"
 msgstr "Datei speichern"
 
-#: ../code/dialogs/preferences-dialog.cpp:301
+#: ../code/dialogs/preferences-dialog.cpp:304
 msgid "_Tab width:"
 msgstr "_Tabulatorbreite"
 
-#: ../code/dialogs/preferences-dialog.cpp:303
+#: ../code/dialogs/preferences-dialog.cpp:306
 msgid "Insert _spaces instead of tabs"
 msgstr "_Leerzeichen statt Tabulatoren einfÃŒgen"
 
-#: ../code/dialogs/preferences-dialog.cpp:304
+#: ../code/dialogs/preferences-dialog.cpp:307
 msgid "Enable automatic _indentation"
 msgstr "Automatische ZeileneinrÃŒckung aktivieren"
 
-#: ../code/dialogs/preferences-dialog.cpp:305
+#: ../code/dialogs/preferences-dialog.cpp:308
 msgid "Smart _home/end"
 msgstr "Intelligentes Pos1/Ende"
 
-#: ../code/dialogs/preferences-dialog.cpp:306
+#: ../code/dialogs/preferences-dialog.cpp:309
 msgid "Enable _automatic saving of documents"
 msgstr "Dokumente _automatische speichern"
 
-#: ../code/dialogs/preferences-dialog.cpp:308
+#: ../code/dialogs/preferences-dialog.cpp:311
 msgid "Autosave interval in _minutes:"
 msgstr "Abstand in Minuten zwischen automatischem Speichern:"
 
-#: ../code/dialogs/preferences-dialog.cpp:329
-msgid "With this option enabled, Home/End keys move to first/last character before going to the start/end of the line."
-msgstr "Ist diese Option aktiviert, bewegen die Pos1-/Ende-Taste den Cursor zum ersten/letzten Zeichen, bevor sie bis an den Zeilenanfang/das Zeilenende gehen."
-
-#: ../code/dialogs/preferences-dialog.cpp:399
+#: ../code/dialogs/preferences-dialog.cpp:332
+msgid ""
+"With this option enabled, Home/End keys move to first/last character before "
+"going to the start/end of the line."
+msgstr ""
+"Ist diese Option aktiviert, bewegen die Pos1-/Ende-Taste den Cursor zum "
+"ersten/letzten Zeichen, bevor sie bis an den Zeilenanfang/das Zeilenende "
+"gehen."
+
+#: ../code/dialogs/preferences-dialog.cpp:402
 msgid "Text Wrapping"
 msgstr "Textumbruch"
 
-#: ../code/dialogs/preferences-dialog.cpp:400
+#: ../code/dialogs/preferences-dialog.cpp:403
 msgid "Line Numbers"
 msgstr "Zeilennummern"
 
-#: ../code/dialogs/preferences-dialog.cpp:401
+#: ../code/dialogs/preferences-dialog.cpp:404
 msgid "Current Line"
 msgstr "Aktuelle Zeile"
 
-#: ../code/dialogs/preferences-dialog.cpp:402
+#: ../code/dialogs/preferences-dialog.cpp:405
 msgid "Right Margin"
 msgstr "Rechter Rand"
 
-#: ../code/dialogs/preferences-dialog.cpp:403
+#: ../code/dialogs/preferences-dialog.cpp:406
 msgid "Bracket Matching"
 msgstr "Klammernpaare"
 
-#: ../code/dialogs/preferences-dialog.cpp:404
+#: ../code/dialogs/preferences-dialog.cpp:407
+msgid "Whitespace Display"
+msgstr "Leerraum"
+
+#: ../code/dialogs/preferences-dialog.cpp:408
 msgid "Enable text wrapping"
 msgstr "Zeilenumbruch aktivieren"
 
-#: ../code/dialogs/preferences-dialog.cpp:405
+#: ../code/dialogs/preferences-dialog.cpp:409
 msgid "Do not split words over two lines"
 msgstr "Wörter nicht getrennt Ìber zwei Zeilen schreiben"
 
-#: ../code/dialogs/preferences-dialog.cpp:406
+#: ../code/dialogs/preferences-dialog.cpp:410
 msgid "Display line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: ../code/dialogs/preferences-dialog.cpp:407
+#: ../code/dialogs/preferences-dialog.cpp:411
 msgid "Highlight current line"
 msgstr "Aktuelle Zeile hervorheben"
 
-#: ../code/dialogs/preferences-dialog.cpp:408
+#: ../code/dialogs/preferences-dialog.cpp:412
 msgid "Display right margin"
 msgstr "Rechter Rand anzeigen"
 
-#: ../code/dialogs/preferences-dialog.cpp:409
+#: ../code/dialogs/preferences-dialog.cpp:413
 msgid "Right margin at column:"
 msgstr "Rechter Rand in Spalte:"
 
-#: ../code/dialogs/preferences-dialog.cpp:410
+#: ../code/dialogs/preferences-dialog.cpp:414
 msgid "Highlight matching bracket"
 msgstr "Klammernpaare hervorheben"
 
-#: ../code/dialogs/preferences-dialog.cpp:496
+#: ../code/dialogs/preferences-dialog.cpp:465
+msgid "Display no whitespace"
+msgstr "LeerrÀume nicht anzeigen"
+
+#: ../code/dialogs/preferences-dialog.cpp:468
+msgid "Display spaces"
+msgstr "Leerzeichen anzeigen"
+
+#: ../code/dialogs/preferences-dialog.cpp:472
+msgid "Display tabs"
+msgstr "Tabulatoren anzeigen"
+
+#: ../code/dialogs/preferences-dialog.cpp:476
+msgid "Display tabs and spaces"
+msgstr "Tabulatoren und Leerzeichen anzeigen"
+
+#: ../code/dialogs/preferences-dialog.cpp:526
 msgid "Toolbar"
 msgstr "Werkzeugleiste"
 
-#: ../code/dialogs/preferences-dialog.cpp:497
+#: ../code/dialogs/preferences-dialog.cpp:527
 msgid "Font"
 msgstr "Schrift"
 
-#: ../code/dialogs/preferences-dialog.cpp:502
+#: ../code/dialogs/preferences-dialog.cpp:528
+msgid "Color Scheme"
+msgstr "Farbschema"
+
+#: ../code/dialogs/preferences-dialog.cpp:535
 msgid "Show text only"
 msgstr "Nur Text anzeigen"
 
-#: ../code/dialogs/preferences-dialog.cpp:504
+#: ../code/dialogs/preferences-dialog.cpp:537
 msgid "Show icons only"
 msgstr "Nur Symbole anzeigen"
 
-#: ../code/dialogs/preferences-dialog.cpp:506
+#: ../code/dialogs/preferences-dialog.cpp:539
 msgid "Show both icons and text"
 msgstr "Zeige Symbol und Text"
 
-#: ../code/dialogs/preferences-dialog.cpp:508
+#: ../code/dialogs/preferences-dialog.cpp:541
 msgid "Show text besides icons"
 msgstr "Zeige Text neben dem Symbol"
 
-#: ../code/dialogs/preferences-dialog.cpp:527
+#: ../code/dialogs/preferences-dialog.cpp:620
 msgid "Trusted CAs"
 msgstr "VertrauenswÃŒrdige Zertifizierungsstellen"
 
-#: ../code/dialogs/preferences-dialog.cpp:528
+#: ../code/dialogs/preferences-dialog.cpp:621
 msgid "Secure Connection"
 msgstr "Sichere Verbindung"
 
-#: ../code/dialogs/preferences-dialog.cpp:529
+#: ../code/dialogs/preferences-dialog.cpp:622
 msgid "Select a file containing trusted CAs"
-msgstr "WÀhlen Sie eine Datei, die vertrauenswÌrdige Zertifizierungsstellen enthÀlt"
-
-#: ../code/dialogs/preferences-dialog.cpp:546
+msgstr ""
+"WÀhlen Sie eine Datei, die vertrauenswÌrdige Zertifizierungsstellen enthÀlt"
+
+#: ../code/dialogs/preferences-dialog.cpp:639
 msgid "Use TLS if possible"
 msgstr "Wenn möglich TLS-VerschlÌsselung verwenden"
 
-#: ../code/dialogs/preferences-dialog.cpp:549
+#: ../code/dialogs/preferences-dialog.cpp:642
 msgid "Always use TLS"
 msgstr "Immer TLS-VerschlÃŒsselung verwenden"
 
-#: ../code/dialogs/preferences-dialog.cpp:561
+#: ../code/dialogs/preferences-dialog.cpp:654
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../code/dialogs/preferences-dialog.cpp:566
+#: ../code/dialogs/preferences-dialog.cpp:659
 msgid "User"
 msgstr "Benutzer"
 
-#: ../code/dialogs/preferences-dialog.cpp:567
+#: ../code/dialogs/preferences-dialog.cpp:660
 msgid "Editor"
 msgstr "Textbearbeitung"
 
-#: ../code/dialogs/preferences-dialog.cpp:568
+#: ../code/dialogs/preferences-dialog.cpp:661
 msgid "View"
 msgstr "Ansicht"
 
-#: ../code/dialogs/preferences-dialog.cpp:569
+#: ../code/dialogs/preferences-dialog.cpp:662
 msgid "Appearance"
 msgstr "Erscheinungsbild"
 
-#: ../code/dialogs/preferences-dialog.cpp:570
+#: ../code/dialogs/preferences-dialog.cpp:663
 msgid "Security"
 msgstr "Sicherheit"
 
-#: ../code/main.cpp:96
+#: ../code/main.cpp:196
 msgid "Gobby options"
 msgstr "Gobby-Optionen"
 
-#: ../code/main.cpp:96
+#: ../code/main.cpp:196
 msgid "Options related to Gobby"
 msgstr "Optionen bezÃŒglich Gobby"
 
-#: ../code/main.cpp:101
+#: ../code/main.cpp:201
 msgid "Display version information and exit"
 msgstr "Zeige Version von Gobby an"
 
-#: ../code/main.cpp:108
+#: ../code/main.cpp:208
 msgid "Also start a new Gobby instance when there is one running already"
 msgstr "Auch neue Gobby-Instanz starten, wenn bereits eine Instanz lÀuft"
 
-#: ../code/operations/operation-delete.cpp:43
-msgid "Removing node %1..."
-msgstr "Eintrag %1 wird entfernt"
-
-#: ../code/operations/operation-delete.cpp:59
-msgid "Failed to delete node %1: %2"
-msgstr "Entfernen des Eintrags %1 fehlgeschlagen: %2"
+#: ../code/main.cpp:216
+msgid "Connect to given host on startup, can be given multiple times"
+msgstr ""
+"Beim Programmstart zum angegebenen Server verbinden, Mehrfachnennung möglich"
+
+#: ../code/main.cpp:217
+msgid "HOSTNAME"
+msgstr "SERVER"
+
+#: ../code/operations/operation-delete.cpp:42
+msgid "Removing node \"%1\"..."
+msgstr "Eintrag »%1« wird entfernt
"
+
+#: ../code/operations/operation-delete.cpp:57
+msgid "Failed to delete node \"%1\""
+msgstr "Entfernen des Eintrags »%1« fehlgeschlagen"
+
+#: ../code/operations/operation-export-html.cpp:166
+#, c-format
+msgid "written by: %s"
+msgstr "geschrieben von: %s"
+
+#: ../code/operations/operation-export-html.cpp:239
+msgid "<unable to print date>"
+msgstr "<Datum nicht verfÃŒgbar>"
+
+#. %1$s is session name/hostname
+#. %2$s is path within the session
+#. %3$s is current date as formatted by %c,
+#. %4$s is a link to the gobby site, it must be present because
+#. we need to handle that manually to insert a hyperlink
+#. instead of just printf'ing it.
+#: ../code/operations/operation-export-html.cpp:252
+#, c-format
+msgid "Document generated from %1$s:%2$s at %3$s by %4$s"
+msgstr "Dokument erstellt aus %1$s:%2$s am %3$s durch %4$s"
+
+#: ../code/operations/operation-export-html.cpp:393
+msgid "Participants"
+msgstr "Teilnehmer"
+
+#: ../code/operations/operation-export-html.cpp:454
+msgid "Exporting document \"%1\" to \"%2\" in HTML..."
+msgstr "Exportiere Dokument »%1« nach »%2« als HTML
"
+
+#: ../code/operations/operation-export-html.cpp:526
+msgid "Failed to export document \"%1\" to HTML"
+msgstr "Exportieren des Dokuments »%1« zu HTML fehlgeschlagen"
+
+#: ../code/operations/operation-new.cpp:56
+msgid "Creating directory \"%1\"..."
+msgstr "Erstelle Verzeichnis »%1« "
 
 #: ../code/operations/operation-new.cpp:57
-msgid "Creating directory %1..."
-msgstr "Erstelle Verzeichnis %1
"
-
-#: ../code/operations/operation-new.cpp:58
-msgid "Creating document %1..."
-msgstr "Erstelle Dokument %1
"
-
-#: ../code/operations/operation-new.cpp:75
-msgid "Failed to create directory %1: %2"
-msgstr "Erstellen des Verzeichnisses %1 fehlgeschlagen: %2"
-
-#: ../code/operations/operation-new.cpp:76
-msgid "Failed to create document %1: %2"
-msgstr "Erstellen des Dokuments %1 fehlgeschlagen: %2"
+msgid "Creating document \"%1\"..."
+msgstr "Erstelle Dokument »%1« "
+
+#: ../code/operations/operation-new.cpp:73
+msgid "Failed to create directory \"%1\""
+msgstr "Erstellen des Verzeichnisses »%1« fehlgeschlagen"
+
+#: ../code/operations/operation-new.cpp:74
+msgid "Failed to create document \"%1\""
+msgstr "Erstellen des Dokuments »%1« fehlgeschlagen"
 
 #. Translators: This is the 8 bit encoding that is tried when
@@ -702 +896 @@
 msgstr "ISO-8859-15"
 
-#: ../code/operations/operation-open.cpp:90
-msgid "Opening document %1..."
-msgstr "Dokument %1 wird geöffnet
"
-
-#: ../code/operations/operation-open.cpp:121
-msgid "The directory into which the new document was supposed to be inserted has been removed"
-msgstr "Das Verzeichnis, in das das neue Dokument eingefÃŒgt werden sollte, wurde entfernt"
-
-#: ../code/operations/operation-open.cpp:310
+#: ../code/operations/operation-open.cpp:89
+msgid "Opening document \"%1\"..."
+msgstr "Dokument »%1« wird geöffnet
"
+
+#: ../code/operations/operation-open.cpp:124
+msgid ""
+"The directory into which the new document was supposed to be inserted has "
+"been removed"
+msgstr ""
+"Das Verzeichnis, in das das neue Dokument eingefÃŒgt werden sollte, wurde "
+"entfernt"
+
+#: ../code/operations/operation-open.cpp:313
 msgid "The file contains data not in the specified encoding"
-msgstr "Die Datei enthÀlt Daten, die nicht dem angegebenen Zeichensatz entsprechen"
-
-#: ../code/operations/operation-open.cpp:321
-msgid "The file either contains data in an unknown encoding, or it contains binary data."
-msgstr "Die Datei enthÀlt entweder Text aus einem unbekannten Zeichensatz oder BinÀrdaten"
+msgstr ""
+"Die Datei enthÀlt Daten, die nicht dem angegebenen Zeichensatz entsprechen"
+
+#: ../code/operations/operation-open.cpp:324
+msgid ""
+"The file either contains data in an unknown encoding, or it contains binary "
+"data."
+msgstr ""
+"Die Datei enthÀlt entweder Text aus einem unbekannten Zeichensatz oder "
+"BinÀrdaten"
 
 #: ../code/operations/operation-open-multiple.cpp:84
@@ -722 +925 @@
 msgstr "Enthaltender Ordner wurde entfernt"
 
-#: ../code/operations/operation-open-multiple.cpp:173
-msgid "Failed to open multiple documents: %1"
-msgstr "Öffnen mehrerer Dokumente fehlgeschlagen: %1"
+#: ../code/operations/operation-open-multiple.cpp:172
+msgid "Failed to open multiple documents"
+msgstr "Öffnen mehrerer Dokumente fehlgeschlagen"
 
 #: ../code/operations/operation-save.cpp:74
-msgid "Saving document %1 to %2..."
-msgstr "Speichere Dokument %1 nach %2
"
-
-#: ../code/operations/operation-save.cpp:228
-msgid "The document contains one or more characters that cannot be encoded in the specified character coding."
-msgstr "Das Dokument enthÀlt ein oder mehrere Zeichen, die mit dem aktuellen Zeichensatz nicht dargestellt werden können."
-
-#: ../code/operations/operation-save.cpp:290
-msgid "Failed to save document %1: %2"
-msgstr "Speichern des Dokuments %1 fehlgeschlagen: %2"
-
-#: ../code/util/file.cpp:67
-#: ../code/util/file.cpp:76
+msgid "Saving document \"%1\" to \"%2\"..."
+msgstr "Speichere Dokument »%1« nach »%2« "
+
+#: ../code/operations/operation-save.cpp:227
+msgid ""
+"The document contains one or more characters that cannot be encoded in the "
+"specified character coding."
+msgstr ""
+"Das Dokument enthÀlt ein oder mehrere Zeichen, die mit dem aktuellen "
+"Zeichensatz nicht dargestellt werden können."
+
+#: ../code/operations/operation-save.cpp:288
+msgid "Failed to save document \"%1\""
+msgstr "Speichern des Dokuments »%1« fehlgeschlagen"
+
+#: ../code/util/file.cpp:67 ../code/util/file.cpp:76
 msgid "Could not create directory \"%1\": %2"
 msgstr "Erstellen des Verzeichnisses »%1« fehlgeschlagen: %2"
 
-#: ../code/window.cpp:85
+#: ../code/window.cpp:112
 msgid "Document Browser"
 msgstr "Dokumentenliste"
 
-#: ../code/window.cpp:133
+#: ../code/window.cpp:168
 msgid "You are still connected to a session"
 msgstr "Sie sind noch in einer Sitzung"
 
-#: ../code/window.cpp:141
+#: ../code/window.cpp:176
 msgid "Do you want to close Gobby nevertheless?"
 msgstr "Wollen Sie Gobby dennoch schließen?"
 
-#: ../code/window.cpp:147
+#: ../code/window.cpp:182
 msgid "C_ancel"
 msgstr "_Abbrechen"
@@ -766 +972 @@
 msgid "Gobby Collaborative Editor (0.5)"
 msgstr "Gobby Gemeinschaftlicher Editor (0.5)"
+
+#~ msgid "Subscription already in progress"
+#~ msgstr "Anmeldung lÀuft bereits"

po/en_GB.po

@@ -9 +9 @@
 "Project-Id-Version: gobby-0.4.93~dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-19 20:29+0100\n"
+"POT-Creation-Date: 2010-02-14 22:31+0100\n"
 "PO-Revision-Date: 2009-12-03 19:26-0000\n"
 "Last-Translator: Gabríel A. Pétursson <gabrielp@simnet.is>\n"
@@ -111 +111 @@
 msgstr "British English:"
 
-#: ../code/commands/help-commands.cpp:115
+#: ../code/commands/help-commands.cpp:100
+msgid "German:"
+msgstr "German:"
+
+#: ../code/commands/help-commands.cpp:117
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -124 +128 @@
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
 msgstr ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -138 +142 @@
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
 
 #: ../code/commands/subscription-commands.cpp:259
@@ -207 +211 @@
 msgstr "User Join in progress..."
 
-#: ../code/core/browser.cpp:116
+#: ../code/core/browser.cpp:113
 msgid "_Direct Connection"
 msgstr "_Direct Connection"
 
-#: ../code/core/browser.cpp:118
+#: ../code/core/browser.cpp:115
 msgid "Host Name:"
 msgstr "Host Name:"
 
-#: ../code/core/browser.cpp:304 ../code/core/browser.cpp:428
+#: ../code/core/browser.cpp:301 ../code/core/browser.cpp:425
 msgid "Connection to \"%1\" failed"
 msgstr "Connection to \"%1\" failed"
 
-#: ../code/core/browser.cpp:357
+#: ../code/core/browser.cpp:354
 msgid "Could not resolve \"%1\""
 msgstr "Could not resolve \"%1\""
 
-#: ../code/core/browser.cpp:431
+#: ../code/core/browser.cpp:428
 msgid "Device \"%1\" does not exist"
 msgstr "Device \"%1\" does not exist"
 
-#: ../code/core/browser.cpp:467
+#: ../code/core/browser.cpp:464
 msgid "Resolving \"%1\"..."
 msgstr "Resolving \"%1\"..."
@@ -396 +400 @@
 
 #: ../code/core/iconmanager.cpp:58 ../code/window.cpp:49
-#: ../code/window.cpp.orig:49
 msgid "Chat"
 msgstr "Chat"
@@ -408 +411 @@
 msgstr "User List"
 
-#: ../code/core/statusbar.cpp:395 ../code/core/statusbar.cpp.orig:401
+#: ../code/core/statusbar.cpp:395
 msgid "Ln %1, Col %2\t%3"
 msgstr "Ln %1, Col %2\t%3"
 
-#: ../code/core/statusbar.cpp:398 ../code/core/statusbar.cpp.orig:404
+#: ../code/core/statusbar.cpp:398
 msgid "OVR"
 msgstr "OVR"
 
-#: ../code/core/statusbar.cpp:398 ../code/core/statusbar.cpp.orig:404
+#: ../code/core/statusbar.cpp:398
 msgid "INS"
 msgstr "INS"
 
-#: ../code/core/textsessionview.cpp:497
+#: ../code/core/textsessionview.cpp:515
 msgid "Text written by <b>%1</b>"
 msgstr "Text written by <b>%1</b>"
 
-#: ../code/core/textsessionview.cpp:503
+#: ../code/core/textsessionview.cpp:521
 msgid "Unowned text"
 msgstr "Ownerless text"
@@ -571 +574 @@
 
 #: ../code/dialogs/password-dialog.cpp:27
-msgid "Password required"
-msgstr "Password required"
+msgid "Password Required"
+msgstr "Password Required"
 
 #: ../code/dialogs/password-dialog.cpp:33
@@ -625 +628 @@
 #: ../code/dialogs/preferences-dialog.cpp:302
 msgid "Home/End Behavior"
-msgstr "Home/End Behavior"
+msgstr "Home/End Behaviour"
 
 #: ../code/dialogs/preferences-dialog.cpp:303
@@ -715 +718 @@
 msgstr "Highlight matching bracket"
 
-#: ../code/dialogs/preferences-dialog.cpp:461
+#: ../code/dialogs/preferences-dialog.cpp:465
 msgid "Display no whitespace"
 msgstr "Display no whitespace"
 
-#: ../code/dialogs/preferences-dialog.cpp:464
+#: ../code/dialogs/preferences-dialog.cpp:468
 msgid "Display spaces"
 msgstr "Display spaces"
 
-#: ../code/dialogs/preferences-dialog.cpp:469
+#: ../code/dialogs/preferences-dialog.cpp:472
 msgid "Display tabs"
 msgstr "Display tabs"
 
-#: ../code/dialogs/preferences-dialog.cpp:473
+#: ../code/dialogs/preferences-dialog.cpp:476
 msgid "Display tabs and spaces"
 msgstr "Display tabs and spaces"
 
-#: ../code/dialogs/preferences-dialog.cpp:525
+#: ../code/dialogs/preferences-dialog.cpp:526
 msgid "Toolbar"
 msgstr "Toolbar"
 
-#: ../code/dialogs/preferences-dialog.cpp:526
+#: ../code/dialogs/preferences-dialog.cpp:527
 msgid "Font"
 msgstr "Font"
 
-#: ../code/dialogs/preferences-dialog.cpp:527
+#: ../code/dialogs/preferences-dialog.cpp:528
 msgid "Color Scheme"
 msgstr "Colour Scheme"
 
-#: ../code/dialogs/preferences-dialog.cpp:534
+#: ../code/dialogs/preferences-dialog.cpp:535
 msgid "Show text only"
 msgstr "Show text only"
 
-#: ../code/dialogs/preferences-dialog.cpp:536
+#: ../code/dialogs/preferences-dialog.cpp:537
 msgid "Show icons only"
 msgstr "Show icons only"
 
-#: ../code/dialogs/preferences-dialog.cpp:538
+#: ../code/dialogs/preferences-dialog.cpp:539
 msgid "Show both icons and text"
 msgstr "Show both icons and text"
 
-#: ../code/dialogs/preferences-dialog.cpp:540
+#: ../code/dialogs/preferences-dialog.cpp:541
 msgid "Show text besides icons"
 msgstr "Show text besides icons"
 
-#: ../code/dialogs/preferences-dialog.cpp:619
+#: ../code/dialogs/preferences-dialog.cpp:620
 msgid "Trusted CAs"
 msgstr "Trusted CAs"
 
-#: ../code/dialogs/preferences-dialog.cpp:620
+#: ../code/dialogs/preferences-dialog.cpp:621
 msgid "Secure Connection"
 msgstr "Secure Connection"
 
-#: ../code/dialogs/preferences-dialog.cpp:621
+#: ../code/dialogs/preferences-dialog.cpp:622
 msgid "Select a file containing trusted CAs"
 msgstr "Select a file containing trusted CAs"
 
-#: ../code/dialogs/preferences-dialog.cpp:638
+#: ../code/dialogs/preferences-dialog.cpp:639
 msgid "Use TLS if possible"
 msgstr "Use TLS where possible"
 
-#: ../code/dialogs/preferences-dialog.cpp:641
+#: ../code/dialogs/preferences-dialog.cpp:642
 msgid "Always use TLS"
 msgstr "Always use TLS"
 
-#: ../code/dialogs/preferences-dialog.cpp:653
+#: ../code/dialogs/preferences-dialog.cpp:654
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../code/dialogs/preferences-dialog.cpp:658
+#: ../code/dialogs/preferences-dialog.cpp:659
 msgid "User"
 msgstr "User"
 
-#: ../code/dialogs/preferences-dialog.cpp:659
+#: ../code/dialogs/preferences-dialog.cpp:660
 msgid "Editor"
 msgstr "Editor"
 
-#: ../code/dialogs/preferences-dialog.cpp:660
+#: ../code/dialogs/preferences-dialog.cpp:661
 msgid "View"
 msgstr "View"
 
-#: ../code/dialogs/preferences-dialog.cpp:661
+#: ../code/dialogs/preferences-dialog.cpp:662
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../code/dialogs/preferences-dialog.cpp:662
+#: ../code/dialogs/preferences-dialog.cpp:663
 msgid "Security"
 msgstr "Security"
@@ -828 +831 @@
 
 #: ../code/operations/operation-delete.cpp:42
-msgid "Removing node %1..."
-msgstr "Removing node %1..."
+msgid "Removing node \"%1\"..."
+msgstr "Removing node \"%1\"..."
 
 #: ../code/operations/operation-delete.cpp:57
-msgid "Failed to delete node %1"
-msgstr "Failed to delete node %1"
+msgid "Failed to delete node \"%1\""
+msgstr "Failed to delete node \"%1\""
 
 #: ../code/operations/operation-export-html.cpp:166
@@ -844 +847 @@
 msgstr "<unable to print date>"
 
+#. %1$s is session name/hostname
+#. %2$s is path within the session
+#. %3$s is current date as formatted by %c,
+#. %4$s is a link to the gobby site, it must be present because
+#. we need to handle that manually to insert a hyperlink
+#. instead of just printf'ing it.
 #: ../code/operations/operation-export-html.cpp:252
 #, c-format
@@ -854 +863 @@
 
 #: ../code/operations/operation-export-html.cpp:454
-msgid "Exporting document %1 to %2 in HTML..."
-msgstr "Exporting document %1 to %2 in HTML..."
+msgid "Exporting document \"%1\" to \"%2\" in HTML..."
+msgstr "Exporting document \"%1\" to \"%2\" in HTML..."
 
 #: ../code/operations/operation-export-html.cpp:526
-msgid "Failed to export document %1 to HTML"
-msgstr "Failed to export document %1 to HTML"
+msgid "Failed to export document \"%1\" to HTML"
+msgstr "Failed to export document \"%1\" to HTML"
 
 #: ../code/operations/operation-new.cpp:56
-msgid "Creating directory %1..."
-msgstr "Creating directory %1..."
+msgid "Creating directory \"%1\"..."
+msgstr "Creating directory \"%1\"..."
 
 #: ../code/operations/operation-new.cpp:57
-msgid "Creating document %1..."
-msgstr "Creating document %1..."
+msgid "Creating document \"%1\"..."
+msgstr "Creating document \"%1\"..."
 
 #: ../code/operations/operation-new.cpp:73
-msgid "Failed to create directory %1"
-msgstr "Failed to create directory %1"
+msgid "Failed to create directory \"%1\""
+msgstr "Failed to create directory \"%1\""
 
 #: ../code/operations/operation-new.cpp:74
-msgid "Failed to create document %1"
-msgstr "Failed to create document %1"
+msgid "Failed to create document \"%1\""
+msgstr "Failed to create document \"%1\""
 
 #. Translators: This is the 8 bit encoding that is tried when
@@ -884 +893 @@
 
 #: ../code/operations/operation-open.cpp:89
-msgid "Opening document %1..."
-msgstr "Opening document %1..."
+msgid "Opening document \"%1\"..."
+msgstr "Opening document \"%1\"..."
 
 #: ../code/operations/operation-open.cpp:124
@@ -915 +924 @@
 msgstr "Failed to open multiple documents"
 
-#: ../code/operations/operation-save.cpp:73
-msgid "Saving document %1 to %2..."
-msgstr "Saving document %1 to %2..."
-
-#: ../code/operations/operation-save.cpp:226
+#: ../code/operations/operation-save.cpp:74
+msgid "Saving document \"%1\" to \"%2\"..."
+msgstr "Saving document \"%1\" to \"%2\"..."
+
+#: ../code/operations/operation-save.cpp:227
 msgid ""
 "The document contains one or more characters that cannot be encoded in the "
@@ -927 +936 @@
 "specified character coding."
 
-#: ../code/operations/operation-save.cpp:287
-msgid "Failed to save document %1"
-msgstr "Failed to save document %1"
+#: ../code/operations/operation-save.cpp:288
+msgid "Failed to save document \"%1\""
+msgstr "Failed to save document \"%1\""
 
 #: ../code/util/file.cpp:67 ../code/util/file.cpp:76
@@ -935 +944 @@
 msgstr "Could not create directory \"%1\": %2"
 
-#: ../code/window.cpp:112 ../code/window.cpp.orig:111
+#: ../code/window.cpp:112
 msgid "Document Browser"
 msgstr "Document Browser"
 
-#: ../code/window.cpp:168 ../code/window.cpp.orig:167
+#: ../code/window.cpp:168
 msgid "You are still connected to a session"
 msgstr "You are still connected to a session"
 
-#: ../code/window.cpp:176 ../code/window.cpp.orig:175
+#: ../code/window.cpp:176
 msgid "Do you want to close Gobby nevertheless?"
 msgstr "Do you want to close Gobby nevertheless?"
 
-#: ../code/window.cpp:182 ../code/window.cpp.orig:181
+#: ../code/window.cpp:182
 msgid "C_ancel"
 msgstr "C_ancel"
@@ -958 +967 @@
 msgid "Gobby Collaborative Editor (0.5)"
 msgstr "Gobby Collaborative Editor (0.5)"
+
+#, fuzzy
+#~ msgid "Subscription already in progress"
+#~ msgstr "Subscription failed"
+
+#, fuzzy
+#~ msgid "Whether to show the user list"
+#~ msgstr "Whether to show the user list for the chat"

po/gobby05.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 17:46-0400\n"
+"POT-Creation-Date: 2010-02-14 22:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -18 +18 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#. Document cannot be used if an error happened
-#. during synchronization.
-#: ../code/commands/browser-commands.cpp:54
-msgid "This document cannot be used."
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:57
-msgid ""
-"You can still watch others editing the document, but you cannot edit it "
-"yourself."
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:64
-msgid ""
-"If you have an idea what could have caused the problem, then you may attempt "
-"to solve it and try again (after having closed this document). Otherwise it "
-"is most likely a bug in the software. In that case, please file a bug report "
-"at http://gobby.0x539.de/trac/newticket and provide as much information as "
-"you can, including what you did when the problem occurred and how to "
-"reproduce the problem (if possible) so that we can fix the problem in a "
-"later version. Thank you."
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:255
+#: ../code/commands/browser-commands.cpp:109
 msgid "Subscribing to %1..."
 msgstr ""
 
-#: ../code/commands/browser-commands.cpp:272
-msgid "Subscription already in progress"
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:350
-#: ../code/commands/browser-commands.cpp:461
-msgid "Synchronization in progress... %1%%"
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:371
-msgid "Subscription failed: %1"
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:487
-msgid ""
-"The connection to the publisher of this document has been lost. Further "
-"changes to the document could not be synchronized to others anymore, "
-"therefore the document cannot be edited anymore.\n"
-"\n"
-"Please note also that it is possible that not all of your latest changes "
-"have reached the publisher before the connection was lost."
-msgstr ""
-
-#: ../code/commands/browser-commands.cpp:575
-msgid "User Join in progress..."
-msgstr ""
-
-#: ../code/commands/browser-context-commands.cpp:92
+#: ../code/commands/browser-commands.cpp:122
+msgid "Subscribing to chat on %1..."
+msgstr ""
+
+#: ../code/commands/browser-commands.cpp:307
+msgid "Subscription failed"
+msgstr ""
+
+#: ../code/commands/browser-context-commands.cpp:94
 msgid "Create Do_cument..."
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:127
+#: ../code/commands/browser-context-commands.cpp:129
 msgid "Create Directory..."
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:140
+#: ../code/commands/browser-context-commands.cpp:142
 msgid "_Open Document..."
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:159
+#: ../code/commands/browser-context-commands.cpp:161
 msgid "D_elete"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:183
+#: ../code/commands/browser-context-commands.cpp:197
 msgid "Choose a name for the directory"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:184
+#: ../code/commands/browser-context-commands.cpp:198
 msgid "Choose a name for the document"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:185
+#: ../code/commands/browser-context-commands.cpp:199
 msgid "_Directory Name:"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:186
+#: ../code/commands/browser-context-commands.cpp:200
 msgid "_Document Name:"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:189
+#: ../code/commands/browser-context-commands.cpp:203
 msgid "C_reate"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:193
+#: ../code/commands/browser-context-commands.cpp:207
 msgid "New Directory"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:194
+#: ../code/commands/browser-context-commands.cpp:208
 #: ../code/commands/file-tasks/task-new.cpp:38
 msgid "New Document"
 msgstr ""
 
-#: ../code/commands/browser-context-commands.cpp:210
+#: ../code/commands/browser-context-commands.cpp:224
 #: ../code/commands/file-tasks/task-open-file.cpp:24
 msgid "Choose a text file to open"
 msgstr ""
 
+#: ../code/commands/file-tasks/task-export-html.cpp:29
+msgid "Choose a location to export document \"%1\" to"
+msgstr ""
+
 #: ../code/commands/file-tasks/task-open.cpp:48
 msgid "Querying \"%1\"..."
@@ -127 +89 @@
 
 #: ../code/commands/file-tasks/task-open.cpp:105
-#: ../code/operations/operation-open.cpp:435
+#: ../code/operations/operation-open.cpp:437
 #: ../code/operations/operation-open-multiple.cpp:159
-msgid "Failed to open document \"%1\": %2"
+msgid "Failed to open document \"%1\""
 msgstr ""
 
@@ -141 +103 @@
 msgstr ""
 
-#: ../code/commands/help-commands.cpp:96
+#: ../code/commands/help-commands.cpp:92
+msgid "Contributors:"
+msgstr ""
+
+#: ../code/commands/help-commands.cpp:98
+msgid "British English:"
+msgstr ""
+
+#: ../code/commands/help-commands.cpp:100
+msgid "German:"
+msgstr ""
+
+#: ../code/commands/help-commands.cpp:117
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -154 +128 @@
 "\n"
 "You should have received a copy of the GNU General Public License along with "
-"this program; if not, write to the Free Software Foundation, Inc., 675 Mass "
-"Ave, Cambridge, MA 02139, USA."
-msgstr ""
-
-#: ../code/core/browser.cpp:41
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA"
+msgstr ""
+
+#: ../code/commands/subscription-commands.cpp:259
+msgid ""
+"The connection to the publisher of this document has been lost. Further "
+"changes to the document could not be synchronized to others anymore, "
+"therefore the document cannot be edited anymore.\n"
+"\n"
+"Please note also that it is possible that not all of your latest changes "
+"have reached the publisher before the connection was lost."
+msgstr ""
+
+#: ../code/commands/synchronization-commands.cpp:32
+msgid "Synchronization in progress... %1%%"
+msgstr ""
+
+#. Document cannot be used if an error happened
+#. during synchronization.
+#: ../code/commands/synchronization-commands.cpp:44
+msgid "This document cannot be used."
+msgstr ""
+
+#: ../code/commands/synchronization-commands.cpp:47
+#: ../code/commands/user-join-commands.cpp:40
+msgid ""
+"If you have an idea what could have caused the problem, then you may attempt "
+"to solve it and try again (after having closed this document). Otherwise it "
+"is most likely a bug in the software. In that case, please file a bug report "
+"at http://gobby.0x539.de/trac/newticket and provide as much information as "
+"you can, including what you did when the problem occurred and how to "
+"reproduce the problem (if possible) so that we can fix the problem in a "
+"later version. Thank you."
+msgstr ""
+
+#: ../code/commands/synchronization-commands.cpp:61
+msgid "Synchronization failed: %1"
+msgstr ""
+
+#. TODO: Adjust this for chat sessions
+#: ../code/commands/user-join-commands.cpp:35
+msgid ""
+"You can still watch others editing the document, but you cannot edit it "
+"yourself."
+msgstr ""
+
+#: ../code/commands/user-join-commands.cpp:54
+msgid "User Join failed: %1"
+msgstr ""
+
+#: ../code/commands/user-join-commands.cpp:283
+msgid "User Join in progress..."
+msgstr ""
+
+#: ../code/core/browser.cpp:113
 msgid "_Direct Connection"
 msgstr ""
 
-#: ../code/core/browser.cpp:43
+#: ../code/core/browser.cpp:115
 msgid "Host Name:"
 msgstr ""
 
-#: ../code/core/browser.cpp:208
+#: ../code/core/browser.cpp:301 ../code/core/browser.cpp:425
+msgid "Connection to \"%1\" failed"
+msgstr ""
+
+#: ../code/core/browser.cpp:354
+msgid "Could not resolve \"%1\""
+msgstr ""
+
+#: ../code/core/browser.cpp:428
 msgid "Device \"%1\" does not exist"
 msgstr ""
 
-#: ../code/core/browser.cpp:246
-msgid "Resolving %1..."
-msgstr ""
-
-#: ../code/core/docwindow.cpp:253
+#: ../code/core/browser.cpp:464
+msgid "Resolving \"%1\"..."
+msgstr ""
+
+#: ../code/core/header.cpp:198
+msgid "_None"
+msgstr ""
+
+#: ../code/core/header.cpp:222
+msgid "_File"
+msgstr ""
+
+#: ../code/core/header.cpp:225
+msgid "_Open..."
+msgstr ""
+
+#: ../code/core/header.cpp:228
+msgid "Open _Location..."
+msgstr ""
+
+#: ../code/core/header.cpp:232
+msgid "Save _As..."
+msgstr ""
+
+#: ../code/core/header.cpp:236 ../code/core/iconmanager.cpp:40
+msgid "Save All"
+msgstr ""
+
+#: ../code/core/header.cpp:236
+msgid "Save all open files locally"
+msgstr ""
+
+#: ../code/core/header.cpp:238
+msgid "Export As _HTML..."
+msgstr ""
+
+#: ../code/core/header.cpp:241
+msgid "Connect _to Server..."
+msgstr ""
+
+#: ../code/core/header.cpp:246
+msgid "_Edit"
+msgstr ""
+
+#: ../code/core/header.cpp:254
+msgid "_Find..."
+msgstr ""
+
+#: ../code/core/header.cpp:256
+msgid "Find Ne_xt"
+msgstr ""
+
+#: ../code/core/header.cpp:257
+msgid "Find next match of phrase searched for"
+msgstr ""
+
+#: ../code/core/header.cpp:260
+msgid "Find Pre_vious"
+msgstr ""
+
+#: ../code/core/header.cpp:261
+msgid "Find previous match of phrase searched for"
+msgstr ""
+
+#: ../code/core/header.cpp:266
+msgid "Find and Rep_lace..."
+msgstr ""
+
+#: ../code/core/header.cpp:270
+msgid "Go to _Line..."
+msgstr ""
+
+#: ../code/core/header.cpp:274
+msgid "Pr_eferences..."
+msgstr ""
+
+#: ../code/core/header.cpp:276
+msgid "_View"
+msgstr ""
+
+#: ../code/core/header.cpp:279
+msgid "Reset User Colors"
+msgstr ""
+
+#: ../code/core/header.cpp:280
+msgid "Hide user colors in current document"
+msgstr ""
+
+#: ../code/core/header.cpp:283
+msgid "View Toolbar"
+msgstr ""
+
+#: ../code/core/header.cpp:284
+msgid "Whether to show the toolbar"
+msgstr ""
+
+#: ../code/core/header.cpp:288
+msgid "View Statusbar"
+msgstr ""
+
+#: ../code/core/header.cpp:289
+msgid "Whether to show the statusbar"
+msgstr ""
+
+#: ../code/core/header.cpp:293
+msgid "View Document Browser"
+msgstr ""
+
+#: ../code/core/header.cpp:294
+msgid "Whether to show the document browser"
+msgstr ""
+
+#: ../code/core/header.cpp:298
+msgid "View Chat"
+msgstr ""
+
+#: ../code/core/header.cpp:299
+msgid "Whether to show the chat pane"
+msgstr ""
+
+#: ../code/core/header.cpp:303
+msgid "View Document User List"
+msgstr ""
+
+#: ../code/core/header.cpp:304
+msgid "Whether to show the user list for documents"
+msgstr ""
+
+#: ../code/core/header.cpp:308
+msgid "View Chat User List"
+msgstr ""
+
+#: ../code/core/header.cpp:309
+msgid "Whether to show the user list for the chat"
+msgstr ""
+
+#: ../code/core/header.cpp:313
+msgid "_Highlight Mode"
+msgstr ""
+
+#: ../code/core/header.cpp:319
+msgid "_Help"
+msgstr ""
+
+#: ../code/core/header.cpp:322
+msgid "_Contents"
+msgstr ""
+
+#: ../code/core/header.cpp:323
+msgid "Opens the Gobby manual"
+msgstr ""
+
+#: ../code/core/header.cpp:326
+msgid "_About..."
+msgstr ""
+
+#: ../code/core/header.cpp:327
+msgid "Shows Gobby's copyright and credits"
+msgstr ""
+
+#: ../code/core/iconmanager.cpp:46
+msgid "User list"
+msgstr ""
+
+#: ../code/core/iconmanager.cpp:52
+msgid "Document list"
+msgstr ""
+
+#: ../code/core/iconmanager.cpp:58 ../code/window.cpp:49
+msgid "Chat"
+msgstr ""
+
+#: ../code/core/iconmanager.cpp:65
+msgid "User Color Indicator"
+msgstr ""
+
+#: ../code/core/sessionuserview.cpp:41
 msgid "User List"
 msgstr ""
 
-#: ../code/core/docwindow.cpp:576
+#: ../code/core/statusbar.cpp:395
+msgid "Ln %1, Col %2\t%3"
+msgstr ""
+
+#: ../code/core/statusbar.cpp:398
+msgid "OVR"
+msgstr ""
+
+#: ../code/core/statusbar.cpp:398
+msgid "INS"
+msgstr ""
+
+#: ../code/core/textsessionview.cpp:515
 msgid "Text written by <b>%1</b>"
 msgstr ""
 
-#: ../code/core/docwindow.cpp:582
+#: ../code/core/textsessionview.cpp:521
 msgid "Unowned text"
 msgstr ""
 
-#: ../code/core/header.cpp:191 ../code/core/header.cpp.orig:191
-msgid "_None"
-msgstr ""
-
-#: ../code/core/header.cpp:213 ../code/core/header.cpp.orig:213
-msgid "_File"
-msgstr ""
-
-#: ../code/core/header.cpp:216 ../code/core/header.cpp.orig:216
-msgid "_Open..."
-msgstr ""
-
-#: ../code/core/header.cpp:219 ../code/core/header.cpp.orig:219
-msgid "Open _Location..."
-msgstr ""
-
-#: ../code/core/header.cpp:223 ../code/core/header.cpp.orig:223
-msgid "Save _As..."
-msgstr ""
-
-#: ../code/core/header.cpp:227 ../code/core/header.cpp.orig:227
-#: ../code/core/iconmanager.cpp:48
-msgid "Save All"
-msgstr ""
-
-#: ../code/core/header.cpp:227 ../code/core/header.cpp.orig:227
-msgid "Save all open files locally"
-msgstr ""
-
-#: ../code/core/header.cpp:232 ../code/core/header.cpp.orig:232
-msgid "_Edit"
-msgstr ""
-
-#: ../code/core/header.cpp:240 ../code/core/header.cpp.orig:240
-msgid "_Find..."
-msgstr ""
-
-#: ../code/core/header.cpp:242 ../code/core/header.cpp.orig:242
-msgid "Find Ne_xt"
-msgstr ""
-
-#: ../code/core/header.cpp:243 ../code/core/header.cpp.orig:243
-msgid "Find next match of phrase searched for"
-msgstr ""
-
-#: ../code/core/header.cpp:246 ../code/core/header.cpp.orig:246
-msgid "Find Pre_vious"
-msgstr ""
-
-#: ../code/core/header.cpp:247 ../code/core/header.cpp.orig:247
-msgid "Find previous match of phrase searched for"
-msgstr ""
-
-#: ../code/core/header.cpp:252 ../code/core/header.cpp.orig:252
-msgid "Find and Rep_lace..."
-msgstr ""
-
-#: ../code/core/header.cpp:256 ../code/core/header.cpp.orig:256
-msgid "Go to _Line..."
-msgstr ""
-
-#: ../code/core/header.cpp:260 ../code/core/header.cpp.orig:260
-msgid "Pr_eferences..."
-msgstr ""
-
-#: ../code/core/header.cpp:262 ../code/core/header.cpp.orig:262
-msgid "_View"
-msgstr ""
-
-#: ../code/core/header.cpp:265 ../code/core/header.cpp.orig:265
-msgid "View Toolbar"
-msgstr ""
-
-#: ../code/core/header.cpp:266 ../code/core/header.cpp.orig:266
-msgid "Whether to show the toolbar"
-msgstr ""
-
-#: ../code/core/header.cpp:270 ../code/core/header.cpp.orig:270
-msgid "View Statusbar"
-msgstr ""
-
-#: ../code/core/header.cpp:271 ../code/core/header.cpp.orig:271
-msgid "Whether to show the statusbar"
-msgstr ""
-
-#: ../code/core/header.cpp:275 ../code/core/header.cpp.orig:275
-msgid "View Document Browser"
-msgstr ""
-
-#: ../code/core/header.cpp:276 ../code/core/header.cpp.orig:276
-msgid "Whether to show the document browser"
-msgstr ""
-
-#: ../code/core/header.cpp:280 ../code/core/header.cpp.orig:280
-msgid "View User List"
-msgstr ""
-
-#: ../code/core/header.cpp:281 ../code/core/header.cpp.orig:281
-msgid "Whether to show the user list"
-msgstr ""
-
-#: ../code/core/header.cpp:285 ../code/core/header.cpp.orig:285
-msgid "_Highlight Mode"
-msgstr ""
-
-#: ../code/core/header.cpp:291 ../code/core/header.cpp.orig:291
-msgid "_Help"
-msgstr ""
-
-#: ../code/core/header.cpp:294 ../code/core/header.cpp.orig:294
-msgid "_Contents"
-msgstr ""
-
-#: ../code/core/header.cpp:295 ../code/core/header.cpp.orig:295
-msgid "Opens the Gobby manual"
-msgstr ""
-
-#: ../code/core/header.cpp:298 ../code/core/header.cpp.orig:298
-msgid "_About..."
-msgstr ""
-
-#: ../code/core/header.cpp:299 ../code/core/header.cpp.orig:299
-msgid "Shows Gobby's copyright and credits"
-msgstr ""
-
-#: ../code/core/iconmanager.cpp:39
-msgid "User list"
-msgstr ""
-
-#: ../code/core/iconmanager.cpp:45
-msgid "Document list"
-msgstr ""
-
-#: ../code/core/statusbar.cpp:246
-msgid "Ln %1, Col %2"
-msgstr ""
-
-#: ../code/core/userlist.cpp:126
+#: ../code/core/userlist.cpp:105
 msgid "Users"
+msgstr ""
+
+#: ../code/dialogs/connection-dialog.cpp:28
+msgid "Connect to Server"
+msgstr ""
+
+#: ../code/dialogs/connection-dialog.cpp:32
+msgid "Please enter a host name with which to establish a connection."
+msgstr ""
+
+#: ../code/dialogs/connection-dialog.cpp:34
+msgid "_Remote Endpoint:"
 msgstr ""
 
@@ -391 +483 @@
 msgstr ""
 
-#: ../code/dialogs/find-dialog.cpp:332
-msgid "No occurence has been replaced"
-msgstr ""
-
-#: ../code/dialogs/find-dialog.cpp:338
-msgid "%1 occurence has been replaced"
-msgid_plural "%1 occurences have been replaced"
+#: ../code/dialogs/find-dialog.cpp:337
+msgid "No occurrence has been replaced"
+msgstr ""
+
+#: ../code/dialogs/find-dialog.cpp:343
+msgid "%1 occurrence has been replaced"
+msgid_plural "%1 occurrences have been replaced"
 msgstr[0] ""
 msgstr[1] ""
@@ -451 +543 @@
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:229
+#: ../code/dialogs/password-dialog.cpp:27
+msgid "Password Required"
+msgstr ""
+
+#: ../code/dialogs/password-dialog.cpp:33
+msgid "Connection to host \"%1\" requires a password."
+msgstr ""
+
+#: ../code/dialogs/password-dialog.cpp:34
+msgid "Invalid password for host \"%1\". Please try again."
+msgstr ""
+
+#: ../code/dialogs/password-dialog.cpp:37
+msgid "Server _Password:"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:232
 msgid "Settings"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:230
+#: ../code/dialogs/preferences-dialog.cpp:233
 msgid "Paths"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:232
+#: ../code/dialogs/preferences-dialog.cpp:235
 msgid "User name:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:234
+#: ../code/dialogs/preferences-dialog.cpp:237
 msgid "User color:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:235
+#: ../code/dialogs/preferences-dialog.cpp:238
 msgid "Choose a new user color"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:238
+#: ../code/dialogs/preferences-dialog.cpp:241
 msgid "Host directory:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:280
+#: ../code/dialogs/preferences-dialog.cpp:283
 msgid "The directory into which locally hosted sessions are permanently stored"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:297
+#: ../code/dialogs/preferences-dialog.cpp:300
 msgid "Tab Stops"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:298
+#: ../code/dialogs/preferences-dialog.cpp:301
 msgid "Indentation"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:299
-msgid "Home/End Behaviour"
-msgstr ""
-
-#: ../code/dialogs/preferences-dialog.cpp:300
+#: ../code/dialogs/preferences-dialog.cpp:302
+msgid "Home/End Behavior"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:303
 msgid "File Saving"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:301
+#: ../code/dialogs/preferences-dialog.cpp:304
 msgid "_Tab width:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:303
+#: ../code/dialogs/preferences-dialog.cpp:306
 msgid "Insert _spaces instead of tabs"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:304
+#: ../code/dialogs/preferences-dialog.cpp:307
 msgid "Enable automatic _indentation"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:305
+#: ../code/dialogs/preferences-dialog.cpp:308
 msgid "Smart _home/end"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:306
+#: ../code/dialogs/preferences-dialog.cpp:309
 msgid "Enable _automatic saving of documents"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:308
+#: ../code/dialogs/preferences-dialog.cpp:311
 msgid "Autosave interval in _minutes:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:329
+#: ../code/dialogs/preferences-dialog.cpp:332
 msgid ""
 "With this option enabled, Home/End keys move to first/last character before "
@@ -525 +633 @@
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:399
+#: ../code/dialogs/preferences-dialog.cpp:402
 msgid "Text Wrapping"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:400
+#: ../code/dialogs/preferences-dialog.cpp:403
 msgid "Line Numbers"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:401
+#: ../code/dialogs/preferences-dialog.cpp:404
 msgid "Current Line"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:402
+#: ../code/dialogs/preferences-dialog.cpp:405
 msgid "Right Margin"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:403
+#: ../code/dialogs/preferences-dialog.cpp:406
 msgid "Bracket Matching"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:404
+#: ../code/dialogs/preferences-dialog.cpp:407
+msgid "Whitespace Display"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:408
 msgid "Enable text wrapping"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:405
+#: ../code/dialogs/preferences-dialog.cpp:409
 msgid "Do not split words over two lines"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:406
+#: ../code/dialogs/preferences-dialog.cpp:410
 msgid "Display line numbers"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:407
+#: ../code/dialogs/preferences-dialog.cpp:411
 msgid "Highlight current line"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:408
+#: ../code/dialogs/preferences-dialog.cpp:412
 msgid "Display right margin"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:409
+#: ../code/dialogs/preferences-dialog.cpp:413
 msgid "Right margin at column:"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:410
+#: ../code/dialogs/preferences-dialog.cpp:414
 msgid "Highlight matching bracket"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:496
+#: ../code/dialogs/preferences-dialog.cpp:465
+msgid "Display no whitespace"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:468
+msgid "Display spaces"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:472
+msgid "Display tabs"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:476
+msgid "Display tabs and spaces"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:526
 msgid "Toolbar"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:497
+#: ../code/dialogs/preferences-dialog.cpp:527
 msgid "Font"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:502
+#: ../code/dialogs/preferences-dialog.cpp:528
+msgid "Color Scheme"
+msgstr ""
+
+#: ../code/dialogs/preferences-dialog.cpp:535
 msgid "Show text only"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:504
+#: ../code/dialogs/preferences-dialog.cpp:537
 msgid "Show icons only"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:506
+#: ../code/dialogs/preferences-dialog.cpp:539
 msgid "Show both icons and text"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:508
+#: ../code/dialogs/preferences-dialog.cpp:541
 msgid "Show text besides icons"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:527
+#: ../code/dialogs/preferences-dialog.cpp:620
 msgid "Trusted CAs"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:528
+#: ../code/dialogs/preferences-dialog.cpp:621
 msgid "Secure Connection"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:529
+#: ../code/dialogs/preferences-dialog.cpp:622
 msgid "Select a file containing trusted CAs"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:546
+#: ../code/dialogs/preferences-dialog.cpp:639
 msgid "Use TLS if possible"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:549
+#: ../code/dialogs/preferences-dialog.cpp:642
 msgid "Always use TLS"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:561
+#: ../code/dialogs/preferences-dialog.cpp:654
 msgid "Preferences"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:566
+#: ../code/dialogs/preferences-dialog.cpp:659
 msgid "User"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:567
+#: ../code/dialogs/preferences-dialog.cpp:660
 msgid "Editor"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:568
+#: ../code/dialogs/preferences-dialog.cpp:661
 msgid "View"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:569
+#: ../code/dialogs/preferences-dialog.cpp:662
 msgid "Appearance"
 msgstr ""
 
-#: ../code/dialogs/preferences-dialog.cpp:570
+#: ../code/dialogs/preferences-dialog.cpp:663
 msgid "Security"
 msgstr ""
 
-#: ../code/main.cpp:96
+#: ../code/main.cpp:196
 msgid "Gobby options"
 msgstr ""
 
-#: ../code/main.cpp:96
+#: ../code/main.cpp:196
 msgid "Options related to Gobby"
 msgstr ""
 
-#: ../code/main.cpp:101
+#: ../code/main.cpp:201
 msgid "Display version information and exit"
 msgstr ""
 
-#: ../code/main.cpp:108
+#: ../code/main.cpp:208
 msgid "Also start a new Gobby instance when there is one running already"
 msgstr ""
 
-#: ../code/operations/operation-delete.cpp:43
-msgid "Removing node %1..."
-msgstr ""
-
-#: ../code/operations/operation-delete.cpp:59
-msgid "Failed to delete node %1: %2"
+#: ../code/main.cpp:216
+msgid "Connect to given host on startup, can be given multiple times"
+msgstr ""
+
+#: ../code/main.cpp:217
+msgid "HOSTNAME"
+msgstr ""
+
+#: ../code/operations/operation-delete.cpp:42
+msgid "Removing node \"%1\"..."
+msgstr ""
+
+#: ../code/operations/operation-delete.cpp:57
+msgid "Failed to delete node \"%1\""
+msgstr ""
+
+#: ../code/operations/operation-export-html.cpp:166
+#, c-format
+msgid "written by: %s"
+msgstr ""
+
+#: ../code/operations/operation-export-html.cpp:239
+msgid "<unable to print date>"
+msgstr ""
+
+#. %1$s is session name/hostname
+#. %2$s is path within the session
+#. %3$s is current date as formatted by %c,
+#. %4$s is a link to the gobby site, it must be present because
+#. we need to handle that manually to insert a hyperlink
+#. instead of just printf'ing it.
+#: ../code/operations/operation-export-html.cpp:252
+#, c-format
+msgid "Document generated from %1$s:%2$s at %3$s by %4$s"
+msgstr ""
+
+#: ../code/operations/operation-export-html.cpp:393
+msgid "Participants"
+msgstr ""
+
+#: ../code/operations/operation-export-html.cpp:454
+msgid "Exporting document \"%1\" to \"%2\" in HTML..."
+msgstr ""
+
+#: ../code/operations/operation-export-html.cpp:526
+msgid "Failed to export document \"%1\" to HTML"
+msgstr ""
+
+#: ../code/operations/operation-new.cpp:56
+msgid "Creating directory \"%1\"..."
 msgstr ""
 
 #: ../code/operations/operation-new.cpp:57
-msgid "Creating directory %1..."
-msgstr ""
-
-#: ../code/operations/operation-new.cpp:58
-msgid "Creating document %1..."
-msgstr ""
-
-#: ../code/operations/operation-new.cpp:75
-msgid "Failed to create directory %1: %2"
-msgstr ""
-
-#: ../code/operations/operation-new.cpp:76
-msgid "Failed to create document %1: %2"
+msgid "Creating document \"%1\"..."
+msgstr ""
+
+#: ../code/operations/operation-new.cpp:73
+msgid "Failed to create directory \"%1\""
+msgstr ""
+
+#: ../code/operations/operation-new.cpp:74
+msgid "Failed to create document \"%1\""
 msgstr ""
 
@@ -687 +859 @@
 msgstr ""
 
-#: ../code/operations/operation-open.cpp:90
-msgid "Opening document %1..."
-msgstr ""
-
-#: ../code/operations/operation-open.cpp:121
+#: ../code/operations/operation-open.cpp:89
+msgid "Opening document \"%1\"..."
+msgstr ""
+
+#: ../code/operations/operation-open.cpp:124
 msgid ""
 "The directory into which the new document was supposed to be inserted has "
@@ -697 +869 @@
 msgstr ""
 
-#: ../code/operations/operation-open.cpp:310
+#: ../code/operations/operation-open.cpp:313
 msgid "The file contains data not in the specified encoding"
 msgstr ""
 
-#: ../code/operations/operation-open.cpp:321
+#: ../code/operations/operation-open.cpp:324
 msgid ""
 "The file either contains data in an unknown encoding, or it contains binary "
@@ -711 +883 @@
 msgstr ""
 
-#: ../code/operations/operation-open-multiple.cpp:173
-msgid "Failed to open multiple documents: %1"
+#: ../code/operations/operation-open-multiple.cpp:172
+msgid "Failed to open multiple documents"
 msgstr ""
 
 #: ../code/operations/operation-save.cpp:74
-msgid "Saving document %1 to %2..."
-msgstr ""
-
-#: ../code/operations/operation-save.cpp:228
+msgid "Saving document \"%1\" to \"%2\"..."
+msgstr ""
+
+#: ../code/operations/operation-save.cpp:227
 msgid ""
 "The document contains one or more characters that cannot be encoded in the "
@@ -725 +897 @@
 msgstr ""
 
-#: ../code/operations/operation-save.cpp:290
-msgid "Failed to save document %1: %2"
+#: ../code/operations/operation-save.cpp:288
+msgid "Failed to save document \"%1\""
 msgstr ""
 
@@ -733 +905 @@
 msgstr ""
 
-#: ../code/window.cpp:85
+#: ../code/window.cpp:112
 msgid "Document Browser"
 msgstr ""
 
-#: ../code/window.cpp:133
+#: ../code/window.cpp:168
 msgid "You are still connected to a session"
 msgstr ""
 
-#: ../code/window.cpp:141
+#: ../code/window.cpp:176
 msgid "Do you want to close Gobby nevertheless?"
 msgstr ""
 
-#: ../code/window.cpp:147
+#: ../code/window.cpp:182
 msgid "C_ancel"
 msgstr ""