Changeset bcad27a6caecc31f87bcde04dac825b19e24d3f8

Timestamp:

01/06/07 23:54:06 (6 years ago)

Author:

Philipp Kern <phil@…>

Parents:

31c05ba12156363c5cdcc8545e750f85e38e08d3

Children:

845162fa2421b7edb7f6de673122df7011c0a778

git-committer:

Philipp Kern <phil@0x539.de> / 2007-01-06T22:54:06Z+0000

Message:

[project @ Translation roundup]

Original author: Philipp Kern <phil@…>
Date: 2005-11-15 22:22:12+00:00

Files:

• configure.in (modified) (1 diff)
• po/ca.po (added)
• po/de.po (modified) (12 diffs)
• po/es.po (modified) (11 diffs)
• po/fr.po (modified) (12 diffs)
• po/gobby.pot (modified) (9 diffs)
• po/sv.po (modified) (15 diffs)
• po/zh_CN.po (added)

configure.in

@@ -66 +66 @@
 
 # Glib i18n/gettext support.
-ALL_LINGUAS="de fr es sv"
+ALL_LINGUAS="de fr es sv ca zh_CN"
 AM_GLIB_GNU_GETTEXT
 

po/de.po

@@ -5 +5 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Gobby 0.2.0\n"
+"Project-Id-Version: Gobby 0.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-02 17:13+0100\n"
-"PO-Revision-Date: 2005-07-28 21:07+0200\n"
+"POT-Creation-Date: 2005-11-15 23:12+0100\n"
+"PO-Revision-Date: 2005-11-14 10:58+0200\n"
 "Last-Translator: Philipp Kern <phil@0x539.de>\n"
 "Language-Team: German Translation Team <crew@0x539.de>\n"
@@ -14 +14 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: src/encoding.cpp:104
@@ -21 +20 @@
 "binary input."
 msgstr ""
-"UTF-8 Kovertierung fehlgeschlagen: Entweder ist die Kodierung unbekannt oder "
-"es sind binÀre Daten."
-
-#: src/chat.cpp:28
+"Konvertierung nach UTF-8 fehlgeschlagen: Entweder ist die Kodierung "
+"unbekannt oder es sind binÀre Daten."
+
+#: src/chat.cpp:69
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/chat.cpp:86
-#, c-format
-msgid "%0% has joined"
-msgstr "%0% hat die Sitzung betreten"
-
-#: src/chat.cpp:93
-#, c-format
-msgid "%0% has left"
-msgstr "%0% hat die Sitzung verlassen"
-
-#. App menu
-#: src/header.cpp:135
-msgid "Gobby"
-msgstr "Gobby"
-
-#: src/header.cpp:142
+#: src/header.cpp:175
 msgid "Create session..."
 msgstr "Sitzung eröffnen..."
 
-#: src/header.cpp:143
+#: src/header.cpp:176
 msgid "Opens a new obby session"
 msgstr "Eröffnet eine neue Sitzung"
 
-#: src/header.cpp:156
+#: src/header.cpp:184
 msgid "Join session..."
 msgstr "Sitzung beitreten..."
 
-#: src/header.cpp:157
-msgid "Join an existing obby session"
+#: src/header.cpp:185
+msgid "Joins an existing obby session"
 msgstr "Einer bestehenden Sitzung beitreten"
 
-#. Gtk::Stock::SAVE automatically assigns a Ctrl+S
-#. shortcut which is already in use by Save Document
-#. I currently don't know how to remove the shortcut
-#. from this action
-#. - Armin, 10-21-2005
-#. Gtk::Stock::SAVE,
-#: src/header.cpp:175
-#, fuzzy
-msgid "Save session"
-msgstr "Sitzung"
-
-#: src/header.cpp:176
-msgid "Saves the complete session tobe able to restore it later"
-msgstr ""
-
-#: src/header.cpp:190
+#: src/header.cpp:193
+msgid "Save session..."
+msgstr "Sitzung speichern..."
+
+#: src/header.cpp:194
+msgid "Saves the complete session for a later restore"
+msgstr "Speichert die komplette Sitzung zur spÀteren Wiederherstellung"
+
+#: src/header.cpp:202
 msgid "Quit session"
 msgstr "Sitzung verlassen"
 
-#: src/header.cpp:191
+#: src/header.cpp:203
 msgid "Leaves the currently running obby session"
 msgstr "VerlÀsst die aktuell laufende Sitzung"
 
-#: src/header.cpp:204
+#: src/header.cpp:211
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/header.cpp:205
+#: src/header.cpp:212
 msgid "Quits the application"
 msgstr "Beendet die Anwendung"
 
-#. Session menu
-#: src/header.cpp:214
+#: src/header.cpp:216
 msgid "Session"
 msgstr "Sitzung"
 
-#: src/header.cpp:221
+#: src/header.cpp:222
 msgid "Create document..."
 msgstr "Dokument erstellen..."
 
-#: src/header.cpp:222
+#: src/header.cpp:223
 msgid "Creates a new document"
 msgstr "Erstellt ein neues Dokument"
 
-#: src/header.cpp:235
+#: src/header.cpp:231
 msgid "Open document..."
 msgstr "Dokument öffnen..."
 
-#: src/header.cpp:236
+#: src/header.cpp:232
 msgid "Loads a file into a new document"
 msgstr "LÀdt eine Datei in ein neues Dokument"
 
-#: src/header.cpp:249
+#: src/header.cpp:240
 msgid "Save document"
 msgstr "Dokument speichern"
 
-#: src/header.cpp:250
+#: src/header.cpp:241
 msgid "Saves a document into a file"
 msgstr "Speichert ein Dokument in eine Datei"
 
-#: src/header.cpp:263
+#: src/header.cpp:249
 msgid "Save document as..."
 msgstr "Dokument speichern..."
 
-#: src/header.cpp:264
+#: src/header.cpp:250
 msgid "Saves a document to another location"
 msgstr "Speichert ein Dokument in eine andere Datei"
 
-#: src/header.cpp:277
+#: src/header.cpp:258
 msgid "Close document"
 msgstr "Dokument schließen"
 
-#: src/header.cpp:278
-msgid "Closes an open document"
+#: src/header.cpp:259
+msgid "Closes an opened document"
 msgstr "Schließt ein geöffnetes Dokument"
 
-#. Edit menu
-#: src/header.cpp:287
+#: src/header.cpp:263
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: src/header.cpp:294
+#: src/header.cpp:269
+msgid "Find..."
+msgstr "Suchen..."
+
+#: src/header.cpp:270
+#, fuzzy
+msgid "Search for a text in the current document"
+msgstr "Aktuelles Dokument speichern"
+
+#: src/header.cpp:278
+msgid "Find and replace..."
+msgstr "Suchen und Ersetzen..."
+
+#: src/header.cpp:279
+msgid "Search for a text and replace it with another one"
+msgstr ""
+
+#: src/header.cpp:287
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: src/header.cpp:295
+#: src/header.cpp:288
 msgid "Shows up a dialog to customise Gobby for your needs"
 msgstr "VerÀndert Gobby nach deinen WÌnschen"
 
-#. User menu
-#: src/header.cpp:304 src/joindialog.cpp:101
+#: src/header.cpp:292 src/joindialog.cpp:101
 msgid "User"
 msgstr "Benutzer"
 
-#: src/header.cpp:311
+#: src/header.cpp:298
 msgid "Set password..."
 msgstr "Passwort setzen..."
 
-#: src/header.cpp:312
+#: src/header.cpp:299
 msgid "Sets a password for this user"
 msgstr "Setzt ein Passwort fÃŒr diesen Benutzer"
 
-#: src/header.cpp:325
+#: src/header.cpp:307
 msgid "Set colour..."
 msgstr "Farbe setzen..."
 
-#: src/header.cpp:326
+#: src/header.cpp:308
 msgid "Sets a new colour for this user"
 msgstr "Setzt eine neue Farbe fÃŒr diesen Benutzer"
 
-#. View menu
-#: src/header.cpp:335 src/preferencesdialog.cpp:297
+#: src/header.cpp:312 src/preferencesdialog.cpp:313
 msgid "View"
 msgstr "Ansicht"
 
-#: src/header.cpp:342
+#: src/header.cpp:318
 msgid "Document preferences..."
 msgstr "Dokumenten Einstellungen"
 
-#: src/header.cpp:343
+#: src/header.cpp:319
 msgid "Shows a preferences dialog that is just applied to this document"
 msgstr ""
 "Zeigt einen Einstellungsdialog der sich nur auf dieses Dokument bezieht"
 
-#. Syntax submenu
-#: src/header.cpp:353
+#: src/header.cpp:324
 msgid "Syntax"
 msgstr "Syntax"
 
-#: src/header.cpp:378
+#: src/header.cpp:326
+msgid "Window"
+msgstr "Fenster"
+
+#: src/header.cpp:332 src/userlist.cpp:68
+msgid "User list"
+msgstr "Benutzerliste"
+
+#: src/header.cpp:333
+msgid "Shows up a list of users that are currently joined"
+msgstr ""
+
+#: src/header.cpp:341
+msgid "Document list"
+msgstr "Dokumentenliste"
+
+#: src/header.cpp:342
+msgid "Shows up a list of documents within the current session"
+msgstr "Zeigt eine Liste der Dokumente in der aktuellen Sitzung"
+
+#: src/header.cpp:347
+msgid "Help"
+msgstr "Hilfe"
+
+#: src/header.cpp:353
+msgid "About"
+msgstr "Info"
+
+#: src/header.cpp:354
+msgid "Shows Gobby's copyright and credits"
+msgstr "Zeigt Informationen zu Gobbys Copyright und den Mitwirkenden an"
+
+#: src/header.cpp:416
 msgid "None"
 msgstr "Keine"
 
-#: src/header.cpp:379
+#: src/header.cpp:417
 msgid "Unselects the current language"
 msgstr "Sprachauswahl aufheben"
 
 #. Build description string
-#: src/header.cpp:399
+#: src/header.cpp:439
 #, c-format
 msgid "Selects %0% as language"
 msgstr "WÀhlt %0% als Sprache aus"
-
-#. Help menu
-#: src/header.cpp:437
-msgid "Help"
-msgstr "Hilfe"
-
-#: src/header.cpp:444
-msgid "About"
-msgstr "Info"
-
-#: src/header.cpp:445
-msgid "Shows Gobby's copyright and credits"
-msgstr "Zeigt Informationen zu Gobbys Copyright und den Mitwirkenden an"
 
 #: src/preferencesdialog.cpp:32
@@ -303 +311 @@
 msgstr "Werkzeugleiste"
 
-#: src/preferencesdialog.cpp:241
+#: src/preferencesdialog.cpp:238
+msgid "Windows"
+msgstr "Fenster"
+
+#: src/preferencesdialog.cpp:239
+msgid "Remember the positions and states"
+msgstr "Positionen und ZustÀnde merken"
+
+#: src/preferencesdialog.cpp:244
 msgid "Show text only"
 msgstr "Nur Text anzeigen"
 
-#: src/preferencesdialog.cpp:242
+#: src/preferencesdialog.cpp:245
 msgid "Show icons only"
 msgstr "Nur Symbole anzeigen"
 
-#: src/preferencesdialog.cpp:243
+#: src/preferencesdialog.cpp:246
 msgid "Show both icons and text"
 msgstr "Symbole und Text anzeigen"
 
-#: src/preferencesdialog.cpp:292
+#: src/preferencesdialog.cpp:308
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/preferencesdialog.cpp:296
+#: src/preferencesdialog.cpp:312
 msgid "Editor"
 msgstr "Editor"
 
 #. Appearance only affects the global Gobby window
-#: src/preferencesdialog.cpp:300
+#: src/preferencesdialog.cpp:316
 msgid "Appearance"
 msgstr "Aussehen"
@@ -349 +365 @@
 
 #: src/hostdialog.cpp:31
-#, fuzzy
 msgid "Restore session:"
-msgstr "Sitzung eröffnen..."
+msgstr "Sitzungungsdatei:"
 
 #: src/hostdialog.cpp:32
-#, fuzzy
 msgid "Restore session"
-msgstr "Sitzung eröffnen..."
+msgstr "Sitzung wiederherstellen"
 
 #: src/joindialog.cpp:39
@@ -378 +392 @@
 msgstr "Port"
 
-#: src/userlist.cpp:74
-msgid "Colour"
-msgstr "Farbe"
-
-#: src/userlist.cpp:75
-msgid "Name"
-msgstr "Name"
-
-#: src/userlist.cpp:76
-msgid "Connected"
-msgstr "Verbunden"
-
-#: src/userlist.cpp:77
-msgid "Subscribed"
-msgstr "Abonniert"
-
-#: src/window.cpp:144
+#: src/userlist.cpp:84
+msgid "Online"
+msgstr "Angemeldet"
+
+#: src/userlist.cpp:85
+msgid "Offline"
+msgstr "Abgemeldet"
+
+#: src/window.cpp:156
 msgid ""
 "Howl initialisation failed. Probably you need to run mDNSResponder as root "
@@ -403 +409 @@
 "diese Sitzung deaktiviert."
 
-#: src/window.cpp:288
+#: src/window.cpp:240
+msgid "You are still connected to a session"
+msgstr ""
+
+#: src/window.cpp:248
+msgid "Do you want to close Gobby nevertheless?"
+msgstr ""
+
+#: src/window.cpp:401
 #, c-format
 msgid "Serving on port %0%"
-msgstr ""
-
-#: src/window.cpp:330
-#, fuzzy, c-format
+msgstr "Dienst auf Port %0% aktiv"
+
+#: src/window.cpp:446
+#, c-format
 msgid "Connected to %0%:%1%"
-msgstr "Verbunden"
-
-#: src/window.cpp:345
-#, fuzzy
+msgstr "Mit %0%:%1% verbunden"
+
+#: src/window.cpp:460
+msgid "Use default .obby extension if none is given"
+msgstr ""
+
+#: src/window.cpp:465
 msgid "Save obby session"
-msgstr "obby Sitzung eröffnen"
-
-#: src/window.cpp:378
+msgstr "obby Sitzung speichern"
+
+#: src/window.cpp:528
 msgid "A collaborative text editor"
 msgstr "Ein Gemeinschaftseditor"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Create document"
 msgstr "Dokument erstellen"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Enter document name"
 msgstr "Geben Sie bitte einen Namen fÃŒr das Dokument ein"
 
 #. Create FileChooser
-#: src/window.cpp:453
+#: src/window.cpp:664
 msgid "Open new document"
 msgstr "Neues Dokument öffnen"
 
 #. Setup dialog
-#: src/window.cpp:500
+#: src/window.cpp:715
 msgid "Save current document"
 msgstr "Aktuelles Dokument speichern"
 
-#: src/window.cpp:545
+#: src/window.cpp:778
 msgid ""
 "Click on \"Apply\" to apply the new settings to documents that are currently "
@@ -451 +468 @@
 
 #. Build password dialog with info
-#: src/window.cpp:585
+#: src/window.cpp:818
 msgid "Set user password"
 msgstr "Benutzerpasswort setzen"
 
-#: src/window.cpp:587
+#: src/window.cpp:820
 msgid ""
 "Set a user password for your user account. When you try to login next time "
@@ -464 +481 @@
 "werden."
 
-#: src/window.cpp:635
+#: src/window.cpp:872
 #, c-format
 msgid ""
@@ -476 +493 @@
 
 #. Connection closed by remote site
-#: src/window.cpp:720 src/joinprogressdialog.cpp:224
+#: src/window.cpp:958 src/joinprogressdialog.cpp:544
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
-#: src/window.cpp:765
+#: src/window.cpp:991
 msgid "Colour change failed: Colour already in use"
 msgstr "Farbwechsel fehlgeschlagen: Farbe wird bereits verwendet."
 
-#: src/window.cpp:940
-#, c-format
-msgid ""
-"The document \"%0%\" has been changed since it was saved to disk. Are you "
-"sure that you want to close it?"
-msgstr ""
-"Das Dokument \"%0%\" wurde verÀndert seit es das letzte Mal auf Platte "
-"gespeichert wurde. Bist du sicher das du es schliessen willst?"
-
-#: src/statusbar.cpp:59
+#: src/window.cpp:1128
+#, c-format
+msgid "Could not open file '%0%' for writing"
+msgstr "Die Datei '%0%' kann nicht zum Schreiben geöffnet werden"
+
+#: src/window.cpp:1142
+#, c-format
+msgid "Could not save file '%0%': %1%"
+msgstr "Fehler beim Speichern der Datei '%0%': %1%"
+
+#: src/window.cpp:1168
+#, c-format
+msgid "Save changes to document \"%0%\" before closing?"
+msgstr ""
+"Sollen die Änderungen im Dokument \"%0%\" vor dem Schließen gespeichert "
+"werden?"
+
+#: src/window.cpp:1172
+msgid ""
+"If you don't save, changes will be discarded, but may still be retrieved if "
+"you re-subscribe to the document."
+msgstr ""
+"Wenn das Dokument nicht gespeichert wird, werden die Änderungen zwar "
+"verworfen, können aber wieder durch ein Abonnement des Dokumentes "
+"wiederhergestellt werden."
+
+#: src/statusbar.cpp:60
 #, c-format
 msgid "Selected language: %0%"
 msgstr "AusgewÀhlte Sprache: %0%"
 
-#: src/statusbar.cpp:65
+#: src/statusbar.cpp:66
 msgid "No language selected"
 msgstr "Keine Sprache ausgewÀhlt"
-
-#: src/document.cpp:30
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#: src/document.cpp:694
-#, c-format
-msgid ""
-"You are not subscribed to the document \"%0%\".\n"
-"\n"
-"To view changes that others make or to edit the document yourself, you have "
-"to subscribe to this document. Use the following button to perform this.\n"
-"\n"
-msgstr ""
-"Du hast das Dokument \"%0%\" nicht abonniert.\n"
-"\n"
-"Um Änderungen von Anderen zu sehen oder das Dokument selbst zu Àndern, musst "
-"du es abonnieren. Benutze dafÃŒr den folgenden Knopf.\n"
-"\n"
 
 #: src/hostprogressdialog.cpp:30
@@ -525 +540 @@
 msgstr "Eröffne neue Sitzung..."
 
-#: src/joinprogressdialog.cpp:32
+#: src/joinprogressdialog.cpp:92
 msgid "Joining obby session..."
 msgstr "Trete der Sitzung bei..."
 
 #. Thread has established connection, wait for welcome packet
-#: src/joinprogressdialog.cpp:152
+#: src/joinprogressdialog.cpp:186
 msgid "Waiting for welcome packet..."
 msgstr "Warte auf Willkommenspaket..."
 
 #. Update status message
-#: src/joinprogressdialog.cpp:182
+#: src/joinprogressdialog.cpp:246
 msgid "Login packet sent, waiting for response..."
 msgstr "Anmeldepaket gesendet, warte auf Antwort..."
 
-#: src/joinprogressdialog.cpp:195
-msgid "Enter session password"
-msgstr "Sitzungspasswort eingeben"
-
-#: src/joinprogressdialog.cpp:202
-msgid "Enter user password"
-msgstr "Benutzerpasswort eingeben"
-
-#: src/joinprogressdialog.cpp:211
+#: src/joinprogressdialog.cpp:260 src/joinprogressdialog.cpp:423
+msgid "New name:"
+msgstr "Neuer Name:"
+
+#: src/joinprogressdialog.cpp:271
+msgid ""
+"Name is already in use. You may choose another name or cancel the connection."
+msgstr ""
+"Der Name ist bereits vergeben. Du kannst einen anderen wÀhlen oder die "
+"Verbindung trennen."
+
+#: src/joinprogressdialog.cpp:341
+msgid ""
+"Colour is already in use. You may choose another colour or cancel the "
+"connection."
+msgstr ""
+"Die Farbe wird bereits benutzt. Du kannst eine andere wÀhlen oder die "
+"Verbindung trennen."
+
+#: src/joinprogressdialog.cpp:364
+msgid "Session password:"
+msgstr "Sitzungspasswort:"
+
+#: src/joinprogressdialog.cpp:377
+msgid ""
+"Session password required. You have to type in the password to be able to "
+"join the obby session."
+msgstr ""
+"Sitzungspasswort erforderlich. Du musst das Passwort eingeben, um die obby "
+"Sitzung bereten zu können."
+
+#: src/joinprogressdialog.cpp:424
+msgid "User password:"
+msgstr "Benutzerpasswort:"
+
+#: src/joinprogressdialog.cpp:441
+#, c-format
+msgid ""
+"User password for user '%0%' required. You may either choose another user "
+"name, type in your user password or cancel the connection."
+msgstr ""
+"FÃŒr den Benutzer '%0%' ist ein Passwort hinterlegt. Du kannst entweder einen "
+"anderen Benutzernamen wÀhlen, dein Benutzerpasswort eingeben oder die "
+"Verbindung trennen."
+
+#: src/joinprogressdialog.cpp:531
 msgid "Logged in successfully, synchronising session..."
 msgstr "Erfolgreich angemeldet, synchronisiere Sitzung..."
@@ -554 +606 @@
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht Ìberein"
+
+#~ msgid "%0% has joined"
+#~ msgstr "%0% hat die Sitzung betreten"
+
+#~ msgid "%0% has left"
+#~ msgstr "%0% hat die Sitzung verlassen"
+
+#~ msgid "Gobby"
+#~ msgstr "Gobby"
+
+#~ msgid "Colour"
+#~ msgstr "Farbe"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Connected"
+#~ msgstr "Verbunden"
+
+#~ msgid "Subscribed"
+#~ msgstr "Abonniert"
+
+#~ msgid ""
+#~ "The document \"%0%\" has been changed since it was saved to disk. Are you "
+#~ "sure that you want to close it?"
+#~ msgstr ""
+#~ "Das Dokument \"%0%\" wurde verÀndert seit es das letzte Mal auf Platte "
+#~ "gespeichert wurde. Bist du sicher das du es schliessen willst?"
+
+#~ msgid "Subscribe"
+#~ msgstr "Abonnieren"
+
+#~ msgid ""
+#~ "You are not subscribed to the document \"%0%\".\n"
+#~ "\n"
+#~ "To view changes that others make or to edit the document yourself, you "
+#~ "have to subscribe to this document. Use the following button to perform "
+#~ "this.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Du hast das Dokument \"%0%\" nicht abonniert.\n"
+#~ "\n"
+#~ "Um Änderungen von Anderen zu sehen oder das Dokument selbst zu Àndern, "
+#~ "musst du es abonnieren. Benutze dafÃŒr den folgenden Knopf.\n"
+#~ "\n"
+
+#~ msgid "Enter user password"
+#~ msgstr "Benutzerpasswort eingeben"
 
 #~ msgid "%0% pending change"

po/es.po

@@ -8 +8 @@
 "Project-Id-Version: Gobby 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-02 17:13+0100\n"
+"POT-Creation-Date: 2005-11-15 23:12+0100\n"
 "PO-Revision-Date: 2005-08-14 17:39+0200\n"
 "Last-Translator: Mario Palomo Torrero <mpalomo@ihman.com>\n"
@@ -15 +15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: src/encoding.cpp:104
@@ -25 +24 @@
 "trata de datos binarios."
 
-#: src/chat.cpp:28
+#: src/chat.cpp:69
 msgid "Send"
 msgstr "Enviar"
 
-#: src/chat.cpp:86
-#, c-format
-msgid "%0% has joined"
-msgstr "%0% conectado"
-
-#: src/chat.cpp:93
-#, c-format
-msgid "%0% has left"
-msgstr "%0% desconectado"
-
-#. App menu
-#: src/header.cpp:135
-msgid "Gobby"
-msgstr "Gobby"
-
-#: src/header.cpp:142
+#: src/header.cpp:175
 msgid "Create session..."
 msgstr "Crear sesión..."
 
-#: src/header.cpp:143
+#: src/header.cpp:176
 msgid "Opens a new obby session"
 msgstr "Abrir una nueva sesión obby"
 
-#: src/header.cpp:156
+#: src/header.cpp:184
 msgid "Join session..."
 msgstr "Unirse a una sesión"
 
-#: src/header.cpp:157
-msgid "Join an existing obby session"
+#: src/header.cpp:185
+#, fuzzy
+msgid "Joins an existing obby session"
 msgstr "Unirse a una sesión obby existente"
 
-#. Gtk::Stock::SAVE automatically assigns a Ctrl+S
-#. shortcut which is already in use by Save Document
-#. I currently don't know how to remove the shortcut
-#. from this action
-#. - Armin, 10-21-2005
-#. Gtk::Stock::SAVE,
-#: src/header.cpp:175
-#, fuzzy
-msgid "Save session"
-msgstr "Sesión"
-
-#: src/header.cpp:176
-msgid "Saves the complete session tobe able to restore it later"
-msgstr ""
-
-#: src/header.cpp:190
+#: src/header.cpp:193
+#, fuzzy
+msgid "Save session..."
+msgstr "Crear sesión..."
+
+#: src/header.cpp:194
+msgid "Saves the complete session for a later restore"
+msgstr ""
+
+#: src/header.cpp:202
 msgid "Quit session"
 msgstr "Cerrar sesión"
 
-#: src/header.cpp:191
+#: src/header.cpp:203
 msgid "Leaves the currently running obby session"
 msgstr "Dejar la sesión obby actualmente abierta"
 
-#: src/header.cpp:204
+#: src/header.cpp:211
 msgid "Quit"
 msgstr "Salir"
 
-#: src/header.cpp:205
+#: src/header.cpp:212
 msgid "Quits the application"
 msgstr "Cierra la aplicación"
 
-#. Session menu
-#: src/header.cpp:214
+#: src/header.cpp:216
 msgid "Session"
 msgstr "Sesión"
 
-#: src/header.cpp:221
+#: src/header.cpp:222
 msgid "Create document..."
 msgstr "Crear documento..."
 
-#: src/header.cpp:222
+#: src/header.cpp:223
 msgid "Creates a new document"
 msgstr "Crea un nuevo documento"
 
-#: src/header.cpp:235
+#: src/header.cpp:231
 msgid "Open document..."
 msgstr "Abrir documento..."
 
-#: src/header.cpp:236
+#: src/header.cpp:232
 msgid "Loads a file into a new document"
 msgstr "Carga un fichero en un nuevo documento"
 
-#: src/header.cpp:249
+#: src/header.cpp:240
 msgid "Save document"
 msgstr "Guardar documento"
 
-#: src/header.cpp:250
+#: src/header.cpp:241
 msgid "Saves a document into a file"
 msgstr "Guarda un documento en un fichero"
 
-#: src/header.cpp:263
+#: src/header.cpp:249
 msgid "Save document as..."
 msgstr "Guardar documento como..."
 
-#: src/header.cpp:264
+#: src/header.cpp:250
 msgid "Saves a document to another location"
 msgstr "Guarda un documento en otra localización"
 
-#: src/header.cpp:277
+#: src/header.cpp:258
 msgid "Close document"
 msgstr "Cerrar documento"
 
-#: src/header.cpp:278
-msgid "Closes an open document"
+#: src/header.cpp:259
+#, fuzzy
+msgid "Closes an opened document"
 msgstr "Cierra un documento abierto"
 
-#. Edit menu
-#: src/header.cpp:287
+#: src/header.cpp:263
 msgid "Edit"
 msgstr "Editar"
 
-#: src/header.cpp:294
+#: src/header.cpp:269
+msgid "Find..."
+msgstr ""
+
+#: src/header.cpp:270
+#, fuzzy
+msgid "Search for a text in the current document"
+msgstr "Guardar documento actual"
+
+#: src/header.cpp:278
+msgid "Find and replace..."
+msgstr ""
+
+#: src/header.cpp:279
+msgid "Search for a text and replace it with another one"
+msgstr ""
+
+#: src/header.cpp:287
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: src/header.cpp:295
+#: src/header.cpp:288
 msgid "Shows up a dialog to customise Gobby for your needs"
 msgstr "Muestra un diálogo para configurar Gobby con sus preferencias"
 
-#. User menu
-#: src/header.cpp:304 src/joindialog.cpp:101
+#: src/header.cpp:292 src/joindialog.cpp:101
 msgid "User"
 msgstr "Usuario"
 
-#: src/header.cpp:311
+#: src/header.cpp:298
 msgid "Set password..."
 msgstr "Establecer contraseña..."
 
-#: src/header.cpp:312
+#: src/header.cpp:299
 msgid "Sets a password for this user"
 msgstr "Establece una contraseña para este usuario"
 
-#: src/header.cpp:325
+#: src/header.cpp:307
 msgid "Set colour..."
 msgstr "Establecer color..."
 
-#: src/header.cpp:326
+#: src/header.cpp:308
+#, fuzzy
 msgid "Sets a new colour for this user"
 msgstr "Establece un nuevo color para este usuario"
 
-#. View menu
-#: src/header.cpp:335 src/preferencesdialog.cpp:297
+#: src/header.cpp:312 src/preferencesdialog.cpp:313
 msgid "View"
 msgstr "Vista"
 
-#: src/header.cpp:342
+#: src/header.cpp:318
 msgid "Document preferences..."
 msgstr "Preferencias del documento..."
 
-#: src/header.cpp:343
+#: src/header.cpp:319
 msgid "Shows a preferences dialog that is just applied to this document"
 msgstr ""
 "Muestra un diálogo de preferencias que se aplicarán sólo a este documento"
 
-#. Syntax submenu
-#: src/header.cpp:353
+#: src/header.cpp:324
 msgid "Syntax"
 msgstr "Sintaxis"
 
-#: src/header.cpp:378
+#: src/header.cpp:326
+msgid "Window"
+msgstr ""
+
+#: src/header.cpp:332 src/userlist.cpp:68
+#, fuzzy
+msgid "User list"
+msgstr "Usuario"
+
+#: src/header.cpp:333
+msgid "Shows up a list of users that are currently joined"
+msgstr ""
+
+#: src/header.cpp:341
+msgid "Document list"
+msgstr ""
+
+#: src/header.cpp:342
+msgid "Shows up a list of documents within the current session"
+msgstr ""
+
+#: src/header.cpp:347
+msgid "Help"
+msgstr "Ayuda"
+
+#: src/header.cpp:353
+msgid "About"
+msgstr "Acerca de"
+
+#: src/header.cpp:354
+msgid "Shows Gobby's copyright and credits"
+msgstr "Muestra el copyright y los créditos de Gobby"
+
+#: src/header.cpp:416
 msgid "None"
 msgstr "Ninguna"
 
-#: src/header.cpp:379
+#: src/header.cpp:417
 msgid "Unselects the current language"
 msgstr "Desactiva el lenguaje actual"
 
 #. Build description string
-#: src/header.cpp:399
+#: src/header.cpp:439
 #, c-format
 msgid "Selects %0% as language"
 msgstr "Selecciona el lenguaje %0%"
 
-#. Help menu
-#: src/header.cpp:437
-msgid "Help"
-msgstr "Ayuda"
-
-#: src/header.cpp:444
-msgid "About"
-msgstr "Acerca de"
-
-#: src/header.cpp:445
-msgid "Shows Gobby's copyright and credits"
-msgstr "Muestra el copyright y los créditos de Gobby"
-
 #: src/preferencesdialog.cpp:32
 msgid "Tab Stops"
@@ -304 +317 @@
 msgstr "Barra de Herramientas"
 
-#: src/preferencesdialog.cpp:241
+#: src/preferencesdialog.cpp:238
+msgid "Windows"
+msgstr ""
+
+#: src/preferencesdialog.cpp:239
+msgid "Remember the positions and states"
+msgstr ""
+
+#: src/preferencesdialog.cpp:244
 msgid "Show text only"
 msgstr "Mostrar sólo texto"
 
-#: src/preferencesdialog.cpp:242
+#: src/preferencesdialog.cpp:245
 msgid "Show icons only"
 msgstr "Mostrar sólo iconos"
 
-#: src/preferencesdialog.cpp:243
+#: src/preferencesdialog.cpp:246
 msgid "Show both icons and text"
 msgstr "Mostrar texto e iconos"
 
-#: src/preferencesdialog.cpp:292
+#: src/preferencesdialog.cpp:308
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/preferencesdialog.cpp:296
+#: src/preferencesdialog.cpp:312
 msgid "Editor"
 msgstr "Editor"
 
 #. Appearance only affects the global Gobby window
-#: src/preferencesdialog.cpp:300
+#: src/preferencesdialog.cpp:316
 msgid "Appearance"
 msgstr "Apariencia"
@@ -379 +400 @@
 msgstr "Puerto"
 
-#: src/userlist.cpp:74
-msgid "Colour"
-msgstr "Color"
-
-#: src/userlist.cpp:75
-msgid "Name"
-msgstr "Nombre"
-
-#: src/userlist.cpp:76
-msgid "Connected"
-msgstr "Conectado"
-
-#: src/userlist.cpp:77
-msgid "Subscribed"
-msgstr "Subscrito"
-
-#: src/window.cpp:144
+#: src/userlist.cpp:84
+msgid "Online"
+msgstr ""
+
+#: src/userlist.cpp:85
+msgid "Offline"
+msgstr ""
+
+#: src/window.cpp:156
 msgid ""
 "Howl initialisation failed. Probably you need to run mDNSResponder as root "
@@ -404 +417 @@
 "desactivado para esta sesión."
 
-#: src/window.cpp:288
-#, c-format
+#: src/window.cpp:240
+msgid "You are still connected to a session"
+msgstr ""
+
+#: src/window.cpp:248
+msgid "Do you want to close Gobby nevertheless?"
+msgstr ""
+
+#: src/window.cpp:401
+#, fuzzy, c-format
 msgid "Serving on port %0%"
-msgstr ""
-
-#: src/window.cpp:330
+msgstr "Servidor escuchando en el puerto %0%:%1%"
+
+#: src/window.cpp:446
 #, fuzzy, c-format
 msgid "Connected to %0%:%1%"
-msgstr "Conectado"
-
-#: src/window.cpp:345
+msgstr "Conectado a %0%:%1%"
+
+#: src/window.cpp:460
+msgid "Use default .obby extension if none is given"
+msgstr ""
+
+#: src/window.cpp:465
 #, fuzzy
 msgid "Save obby session"
 msgstr "Crear sesión obby"
 
-#: src/window.cpp:378
+#: src/window.cpp:528
 msgid "A collaborative text editor"
 msgstr "Un editor de texto colaborativo"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Create document"
 msgstr "Crear documento"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Enter document name"
 msgstr "Introduce el nombre del documento"
 
 #. Create FileChooser
-#: src/window.cpp:453
+#: src/window.cpp:664
 msgid "Open new document"
 msgstr "Abrir nuevo documento"
 
 #. Setup dialog
-#: src/window.cpp:500
+#: src/window.cpp:715
 msgid "Save current document"
 msgstr "Guardar documento actual"
 
-#: src/window.cpp:545
+#: src/window.cpp:778
 msgid ""
 "Click on \"Apply\" to apply the new settings to documents that are currently "
@@ -452 +477 @@
 
 #. Build password dialog with info
-#: src/window.cpp:585
+#: src/window.cpp:818
 msgid "Set user password"
 msgstr "Establecer contraseña de usuario"
 
-#: src/window.cpp:587
+#: src/window.cpp:820
 msgid ""
 "Set a user password for your user account. When you try to login next time "
@@ -464 +489 @@
 "de nuevo con este usuario se le preguntará por su contraseña."
 
-#: src/window.cpp:635
+#: src/window.cpp:872
 #, c-format
 msgid ""
@@ -476 +501 @@
 
 #. Connection closed by remote site
-#: src/window.cpp:720 src/joinprogressdialog.cpp:224
+#: src/window.cpp:958 src/joinprogressdialog.cpp:544
 msgid "Connection lost"
 msgstr "Conexión perdida"
 
-#: src/window.cpp:765
+#: src/window.cpp:991
 msgid "Colour change failed: Colour already in use"
 msgstr "Error al cambiar de color: ese color ya se está usando"
 
-#: src/window.cpp:940
+#: src/window.cpp:1128
 #, c-format
-msgid ""
-"The document \"%0%\" has been changed since it was saved to disk. Are you "
-"sure that you want to close it?"
-msgstr ""
-"El documento \"%0%\" ha cambiado desde la última vez que se guardó. ¿Seguro "
-"que quiere cerrarlo?"
-
-#: src/statusbar.cpp:59
+msgid "Could not open file '%0%' for writing"
+msgstr ""
+
+#: src/window.cpp:1142
+#, c-format
+msgid "Could not save file '%0%': %1%"
+msgstr ""
+
+#: src/window.cpp:1168
+#, c-format
+msgid "Save changes to document \"%0%\" before closing?"
+msgstr ""
+
+#: src/window.cpp:1172
+msgid ""
+"If you don't save, changes will be discarded, but may still be retrieved if "
+"you re-subscribe to the document."
+msgstr ""
+
+#: src/statusbar.cpp:60
 #, c-format
 msgid "Selected language: %0%"
 msgstr "Lenguaje seleccionado: %0%"
 
-#: src/statusbar.cpp:65
+#: src/statusbar.cpp:66
 msgid "No language selected"
 msgstr "Ningún lenguaje seleccionado"
-
-#: src/document.cpp:30
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#: src/document.cpp:694
-#, c-format
-msgid ""
-"You are not subscribed to the document \"%0%\".\n"
-"\n"
-"To view changes that others make or to edit the document yourself, you have "
-"to subscribe to this document. Use the following button to perform this.\n"
-"\n"
-msgstr ""
-"No está suscrito al documento \"%0%\".\n"
-"\n"
-"Para ver los cambios que otros hacen o para editar el documento, es "
-"necesario suscribirse a este documento. Utilice el siguiente botón para "
-"hacer esto.\n"
-"\n"
 
 #: src/hostprogressdialog.cpp:30
@@ -526 +543 @@
 msgstr "Abriendo sesión obby..."
 
-#: src/joinprogressdialog.cpp:32
+#: src/joinprogressdialog.cpp:92
 msgid "Joining obby session..."
 msgstr "Uniéndose a sesión obby..."
 
 #. Thread has established connection, wait for welcome packet
-#: src/joinprogressdialog.cpp:152
+#: src/joinprogressdialog.cpp:186
 msgid "Waiting for welcome packet..."
 msgstr "Esperando paquete de bienvenida..."
 
 #. Update status message
-#: src/joinprogressdialog.cpp:182
+#: src/joinprogressdialog.cpp:246
 msgid "Login packet sent, waiting for response..."
 msgstr "Paquete de ingreso enviado, esperando respuesta..."
 
-#: src/joinprogressdialog.cpp:195
-msgid "Enter session password"
+#: src/joinprogressdialog.cpp:260 src/joinprogressdialog.cpp:423
+#, fuzzy
+msgid "New name:"
+msgstr "Nombre:"
+
+#: src/joinprogressdialog.cpp:271
+msgid ""
+"Name is already in use. You may choose another name or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:341
+msgid ""
+"Colour is already in use. You may choose another colour or cancel the "
+"connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:364
+#, fuzzy
+msgid "Session password:"
 msgstr "Introducir contraseña de sesión"
 
-#: src/joinprogressdialog.cpp:202
-msgid "Enter user password"
-msgstr "Introducir contraseña de usuario"
-
-#: src/joinprogressdialog.cpp:211
+#: src/joinprogressdialog.cpp:377
+msgid ""
+"Session password required. You have to type in the password to be able to "
+"join the obby session."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:424
+#, fuzzy
+msgid "User password:"
+msgstr "Establecer contraseña de usuario"
+
+#: src/joinprogressdialog.cpp:441
+#, c-format
+msgid ""
+"User password for user '%0%' required. You may either choose another user "
+"name, type in your user password or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:531
 msgid "Logged in successfully, synchronising session..."
 msgstr "Ingreso correcto, sincronizando sesión..."
@@ -555 +603 @@
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
+
+#~ msgid "%0% has joined"
+#~ msgstr "%0% conectado"
+
+#~ msgid "%0% has left"
+#~ msgstr "%0% desconectado"
+
+#~ msgid "Gobby"
+#~ msgstr "Gobby"
+
+#~ msgid "Colour"
+#~ msgstr "Color"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "Connected"
+#~ msgstr "Conectado"
+
+#~ msgid "Subscribed"
+#~ msgstr "Subscrito"
+
+#~ msgid ""
+#~ "The document \"%0%\" has been changed since it was saved to disk. Are you "
+#~ "sure that you want to close it?"
+#~ msgstr ""
+#~ "El documento \"%0%\" ha cambiado desde la última vez que se guardó. "
+#~ "¿Seguro que quiere cerrarlo?"
+
+#~ msgid "Subscribe"
+#~ msgstr "Suscribir"
+
+#~ msgid ""
+#~ "You are not subscribed to the document \"%0%\".\n"
+#~ "\n"
+#~ "To view changes that others make or to edit the document yourself, you "
+#~ "have to subscribe to this document. Use the following button to perform "
+#~ "this.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "No está suscrito al documento \"%0%\".\n"
+#~ "\n"
+#~ "Para ver los cambios que otros hacen o para editar el documento, es "
+#~ "necesario suscribirse a este documento. Utilice el siguiente botón para "
+#~ "hacer esto.\n"
+#~ "\n"
+
+#~ msgid "Enter user password"
+#~ msgstr "Introducir contraseña de usuario"
 
 #~ msgid "%0% pending change"

po/fr.po

@@ -9 +9 @@
 "Project-Id-Version: Gobby 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-02 17:13+0100\n"
+"POT-Creation-Date: 2005-11-15 23:12+0100\n"
 "PO-Revision-Date: 2005-07-27 18:15+0200\n"
 "Last-Translator: Peer Janssen <peer@baden-online.de>\n"
@@ -16 +16 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: src/encoding.cpp:104
@@ -26 +25 @@
 "soit il s'agit de « données binaires »."
 
-#: src/chat.cpp:28
+#: src/chat.cpp:69
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/chat.cpp:86
-#, c-format
-msgid "%0% has joined"
-msgstr "%0% est arrivé(e)"
-
-#: src/chat.cpp:93
-#, c-format
-msgid "%0% has left"
-msgstr "%0% est parti(e)"
-
-#. App menu
-#: src/header.cpp:135
-msgid "Gobby"
-msgstr "Gobby"
-
-#: src/header.cpp:142
+#: src/header.cpp:175
 msgid "Create session..."
 msgstr "Créer une séance..."
 
-#: src/header.cpp:143
+#: src/header.cpp:176
 msgid "Opens a new obby session"
 msgstr "Ouvrir une nouvelle séance « obby »"
 
-#: src/header.cpp:156
+#: src/header.cpp:184
 msgid "Join session..."
 msgstr "Rejoindre séance..."
 
-#: src/header.cpp:157
-msgid "Join an existing obby session"
+#: src/header.cpp:185
+#, fuzzy
+msgid "Joins an existing obby session"
 msgstr "Participer à une séance « obby » déjà en cours"
 
-#. Gtk::Stock::SAVE automatically assigns a Ctrl+S
-#. shortcut which is already in use by Save Document
-#. I currently don't know how to remove the shortcut
-#. from this action
-#. - Armin, 10-21-2005
-#. Gtk::Stock::SAVE,
-#: src/header.cpp:175
-#, fuzzy
-msgid "Save session"
-msgstr "Séance"
-
-#: src/header.cpp:176
-msgid "Saves the complete session tobe able to restore it later"
-msgstr ""
-
-#: src/header.cpp:190
+#: src/header.cpp:193
+#, fuzzy
+msgid "Save session..."
+msgstr "Créer une séance..."
+
+#: src/header.cpp:194
+msgid "Saves the complete session for a later restore"
+msgstr ""
+
+#: src/header.cpp:202
 msgid "Quit session"
 msgstr "Quitter la séance"
 
-#: src/header.cpp:191
+#: src/header.cpp:203
 msgid "Leaves the currently running obby session"
 msgstr "Quitter la séance « obby » en cours"
 
-#: src/header.cpp:204
+#: src/header.cpp:211
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/header.cpp:205
+#: src/header.cpp:212
 msgid "Quits the application"
 msgstr "Quitter l'application"
 
-#. Session menu
-#: src/header.cpp:214
+#: src/header.cpp:216
 msgid "Session"
 msgstr "Séance"
 
-#: src/header.cpp:221
+#: src/header.cpp:222
 msgid "Create document..."
 msgstr "Créer document..."
 
-#: src/header.cpp:222
+#: src/header.cpp:223
 msgid "Creates a new document"
 msgstr "Créer un nouveau document"
 
-#: src/header.cpp:235
+#: src/header.cpp:231
 msgid "Open document..."
 msgstr "Ouvrir document..."
 
-#: src/header.cpp:236
+#: src/header.cpp:232
 msgid "Loads a file into a new document"
 msgstr "Charger un fichier dans un nouveau document"
 
-#: src/header.cpp:249
+#: src/header.cpp:240
 msgid "Save document"
 msgstr "Enregistrer document"
 
-#: src/header.cpp:250
+#: src/header.cpp:241
 msgid "Saves a document into a file"
 msgstr "Sauvegarde du document dans un fichier"
 
-#: src/header.cpp:263
+#: src/header.cpp:249
 msgid "Save document as..."
 msgstr "Enregistrer document sous..."
 
-#: src/header.cpp:264
+#: src/header.cpp:250
 msgid "Saves a document to another location"
 msgstr "Sauvegarde du document dans un autre fichier"
 
-#: src/header.cpp:277
+#: src/header.cpp:258
 msgid "Close document"
 msgstr "Fermer document"
 
-#: src/header.cpp:278
-msgid "Closes an open document"
+#: src/header.cpp:259
+#, fuzzy
+msgid "Closes an opened document"
 msgstr "Fermer un document actuellement ouvert"
 
-#. Edit menu
-#: src/header.cpp:287
+#: src/header.cpp:263
 msgid "Edit"
 msgstr "Éditer"
 
-#: src/header.cpp:294
+#: src/header.cpp:269
+msgid "Find..."
+msgstr ""
+
+#: src/header.cpp:270
+#, fuzzy
+msgid "Search for a text in the current document"
+msgstr "Enregistrer le document actuel"
+
+#: src/header.cpp:278
+msgid "Find and replace..."
+msgstr ""
+
+#: src/header.cpp:279
+msgid "Search for a text and replace it with another one"
+msgstr ""
+
+#: src/header.cpp:287
 msgid "Preferences..."
 msgstr "Préférences..."
 
-#: src/header.cpp:295
+#: src/header.cpp:288
 msgid "Shows up a dialog to customise Gobby for your needs"
 msgstr "Afficher un dialogue pour personnaliser Gobby"
 
-#. User menu
-#: src/header.cpp:304 src/joindialog.cpp:101
+#: src/header.cpp:292 src/joindialog.cpp:101
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/header.cpp:311
+#: src/header.cpp:298
 msgid "Set password..."
 msgstr "Mettre un mot de passe..."
 
-#: src/header.cpp:312
+#: src/header.cpp:299
 msgid "Sets a password for this user"
 msgstr "Mettre un mot de passe pour cet utilisateur"
 
-#: src/header.cpp:325
+#: src/header.cpp:307
 msgid "Set colour..."
 msgstr "Choisir une couleur..."
 
-#: src/header.cpp:326
+#: src/header.cpp:308
+#, fuzzy
 msgid "Sets a new colour for this user"
 msgstr "Choisir une nouvelle couleur pour cet utilisateur"
 
-#. View menu
-#: src/header.cpp:335 src/preferencesdialog.cpp:297
+#: src/header.cpp:312 src/preferencesdialog.cpp:313
 msgid "View"
 msgstr "Affichage"
 
-#: src/header.cpp:342
+#: src/header.cpp:318
 msgid "Document preferences..."
 msgstr "Préférences document..."
 
-#: src/header.cpp:343
+#: src/header.cpp:319
 msgid "Shows a preferences dialog that is just applied to this document"
 msgstr ""
 "Afficher un dialogue de préférences qui s'appliquent uniquement à ce document"
 
-#. Syntax submenu
-#: src/header.cpp:353
+#: src/header.cpp:324
 msgid "Syntax"
 msgstr "Syntaxe"
 
-#: src/header.cpp:378
+#: src/header.cpp:326
+msgid "Window"
+msgstr ""
+
+#: src/header.cpp:332 src/userlist.cpp:68
+#, fuzzy
+msgid "User list"
+msgstr "Utilisateur"
+
+#: src/header.cpp:333
+msgid "Shows up a list of users that are currently joined"
+msgstr ""
+
+#: src/header.cpp:341
+msgid "Document list"
+msgstr ""
+
+#: src/header.cpp:342
+msgid "Shows up a list of documents within the current session"
+msgstr ""
+
+#: src/header.cpp:347
+msgid "Help"
+msgstr "Aide"
+
+#: src/header.cpp:353
+msgid "About"
+msgstr "Information"
+
+#: src/header.cpp:354
+msgid "Shows Gobby's copyright and credits"
+msgstr "Afficher les infos de copyright et les remerciements concernant Gobby"
+
+#: src/header.cpp:416
 msgid "None"
 msgstr "Aucune"
 
-#: src/header.cpp:379
+#: src/header.cpp:417
 msgid "Unselects the current language"
 msgstr "Déselectionner la langue actuelle"
 
 #. Build description string
-#: src/header.cpp:399
+#: src/header.cpp:439
 #, c-format
 msgid "Selects %0% as language"
 msgstr "Selectionner la langue %0%"
-
-#. Help menu
-#: src/header.cpp:437
-msgid "Help"
-msgstr "Aide"
-
-#: src/header.cpp:444
-msgid "About"
-msgstr "Information"
-
-#: src/header.cpp:445
-msgid "Shows Gobby's copyright and credits"
-msgstr "Afficher les infos de copyright et les remerciements concernant Gobby"
 
 #: src/preferencesdialog.cpp:32
@@ -305 +318 @@
 msgstr "Barre d'outils"
 
-#: src/preferencesdialog.cpp:241
+#: src/preferencesdialog.cpp:238
+msgid "Windows"
+msgstr ""
+
+#: src/preferencesdialog.cpp:239
+msgid "Remember the positions and states"
+msgstr ""
+
+#: src/preferencesdialog.cpp:244
 msgid "Show text only"
 msgstr "Afficher uniquement le texte"
 
-#: src/preferencesdialog.cpp:242
+#: src/preferencesdialog.cpp:245
 msgid "Show icons only"
 msgstr "Afficher uniquement les symboles"
 
-#: src/preferencesdialog.cpp:243
+#: src/preferencesdialog.cpp:246
 msgid "Show both icons and text"
 msgstr "Afficher les symboles et le texte"
 
-#: src/preferencesdialog.cpp:292
+#: src/preferencesdialog.cpp:308
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/preferencesdialog.cpp:296
+#: src/preferencesdialog.cpp:312
 msgid "Editor"
 msgstr "Editeur"
 
 #. Appearance only affects the global Gobby window
-#: src/preferencesdialog.cpp:300
+#: src/preferencesdialog.cpp:316
 msgid "Appearance"
 msgstr "La tête qu'a la fenêtre"
@@ -380 +401 @@
 msgstr "Port"
 
-#: src/userlist.cpp:74
-msgid "Colour"
-msgstr "Couleur"
-
-#: src/userlist.cpp:75
-msgid "Name"
-msgstr "Nom"
-
-#: src/userlist.cpp:76
-msgid "Connected"
-msgstr ""
-
-#: src/userlist.cpp:77
-msgid "Subscribed"
-msgstr "S'abonner"
-
-#: src/window.cpp:144
+#: src/userlist.cpp:84
+msgid "Online"
+msgstr ""
+
+#: src/userlist.cpp:85
+msgid "Offline"
+msgstr ""
+
+#: src/window.cpp:156
 msgid ""
 "Howl initialisation failed. Probably you need to run mDNSResponder as root "
@@ -405 +418 @@
 "« Zeroconf » est déactivé pour cette séance."
 
-#: src/window.cpp:288
+#: src/window.cpp:240
+msgid "You are still connected to a session"
+msgstr ""
+
+#: src/window.cpp:248
+msgid "Do you want to close Gobby nevertheless?"
+msgstr ""
+
+#: src/window.cpp:401
 #, c-format
 msgid "Serving on port %0%"
 msgstr ""
 
-#: src/window.cpp:330
+#: src/window.cpp:446
 #, c-format
 msgid "Connected to %0%:%1%"
 msgstr ""
 
-#: src/window.cpp:345
+#: src/window.cpp:460
+msgid "Use default .obby extension if none is given"
+msgstr ""
+
+#: src/window.cpp:465
 #, fuzzy
 msgid "Save obby session"
 msgstr "Créer une séance « obby »"
 
-#: src/window.cpp:378
+#: src/window.cpp:528
 msgid "A collaborative text editor"
 msgstr "Un éditeur texte collaboratif"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Create document"
 msgstr "Créer un document"
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Enter document name"
 msgstr "Entrer le nom du document"
 
 #. Create FileChooser
-#: src/window.cpp:453
+#: src/window.cpp:664
 msgid "Open new document"
 msgstr "Ouvrir un nouveau document"
 
 #. Setup dialog
-#: src/window.cpp:500
+#: src/window.cpp:715
 msgid "Save current document"
 msgstr "Enregistrer le document actuel"
 
-#: src/window.cpp:545
+#: src/window.cpp:778
 msgid ""
 "Click on \"Apply\" to apply the new settings to documents that are currently "
@@ -453 +478 @@
 
 #. Build password dialog with info
-#: src/window.cpp:585
+#: src/window.cpp:818
 msgid "Set user password"
 msgstr "Mettre un mot de passe utilisateur"
 
-#: src/window.cpp:587
+#: src/window.cpp:820
 msgid ""
 "Set a user password for your user account. When you try to login next time "
@@ -465 +490 @@
 "de vous connecter la prochaine fois, votre mot de passe vous sera demandé."
 
-#: src/window.cpp:635
+#: src/window.cpp:872
 #, c-format
 msgid ""
@@ -477 +502 @@
 
 #. Connection closed by remote site
-#: src/window.cpp:720 src/joinprogressdialog.cpp:224
+#: src/window.cpp:958 src/joinprogressdialog.cpp:544
 msgid "Connection lost"
 msgstr "Perte de la connexion"
 
-#: src/window.cpp:765
+#: src/window.cpp:991
 msgid "Colour change failed: Colour already in use"
 msgstr "Changement de couleur raté : la couleur est déjà utilisée"
 
-#: src/window.cpp:940
-#, c-format
-msgid ""
-"The document \"%0%\" has been changed since it was saved to disk. Are you "
-"sure that you want to close it?"
-msgstr ""
-
-#: src/statusbar.cpp:59
+#: src/window.cpp:1128
+#, c-format
+msgid "Could not open file '%0%' for writing"
+msgstr ""
+
+#: src/window.cpp:1142
+#, c-format
+msgid "Could not save file '%0%': %1%"
+msgstr ""
+
+#: src/window.cpp:1168
+#, c-format
+msgid "Save changes to document \"%0%\" before closing?"
+msgstr ""
+
+#: src/window.cpp:1172
+msgid ""
+"If you don't save, changes will be discarded, but may still be retrieved if "
+"you re-subscribe to the document."
+msgstr ""
+
+#: src/statusbar.cpp:60
 #, c-format
 msgid "Selected language: %0%"
 msgstr "Langue selectionnée : %0%"
 
-#: src/statusbar.cpp:65
+#: src/statusbar.cpp:66
 msgid "No language selected"
 msgstr "Aucune langue selectionnée"
-
-#: src/document.cpp:30
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#: src/document.cpp:694
-#, c-format
-msgid ""
-"You are not subscribed to the document \"%0%\".\n"
-"\n"
-"To view changes that others make or to edit the document yourself, you have "
-"to subscribe to this document. Use the following button to perform this.\n"
-"\n"
-msgstr ""
-"Vous n'êtes pas abonné au document « %0% ».\n"
-"\n"
-"Pour voir les modifications des autres ou pour modifier vous-mêmes le "
-"document, vous devez vous abonner à ce document. À cet effet, utilisez le "
-"bouton suivant.\n"
-"\n"
 
 #: src/hostprogressdialog.cpp:30
@@ -525 +544 @@
 msgstr "Ouvrir une nouvelle séance « obby »..."
 
-#: src/joinprogressdialog.cpp:32
+#: src/joinprogressdialog.cpp:92
 msgid "Joining obby session..."
 msgstr "Joindre une séance « obby »..."
 
 #. Thread has established connection, wait for welcome packet
-#: src/joinprogressdialog.cpp:152
+#: src/joinprogressdialog.cpp:186
 msgid "Waiting for welcome packet..."
 msgstr "Attendre le paquet de bonjour..."
 
 #. Update status message
-#: src/joinprogressdialog.cpp:182
+#: src/joinprogressdialog.cpp:246
 msgid "Login packet sent, waiting for response..."
 msgstr "Paquet « login » envoyé, attendre la réponse..."
 
-#: src/joinprogressdialog.cpp:195
-msgid "Enter session password"
+#: src/joinprogressdialog.cpp:260 src/joinprogressdialog.cpp:423
+#, fuzzy
+msgid "New name:"
+msgstr "Nom :"
+
+#: src/joinprogressdialog.cpp:271
+msgid ""
+"Name is already in use. You may choose another name or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:341
+msgid ""
+"Colour is already in use. You may choose another colour or cancel the "
+"connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:364
+#, fuzzy
+msgid "Session password:"
 msgstr "Entrer le mot de passe de séance"
 
-#: src/joinprogressdialog.cpp:202
-msgid "Enter user password"
-msgstr "Entrer le mot de passe utilisateur"
-
-#: src/joinprogressdialog.cpp:211
+#: src/joinprogressdialog.cpp:377
+msgid ""
+"Session password required. You have to type in the password to be able to "
+"join the obby session."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:424
+#, fuzzy
+msgid "User password:"
+msgstr "Mettre un mot de passe utilisateur"
+
+#: src/joinprogressdialog.cpp:441
+#, c-format
+msgid ""
+"User password for user '%0%' required. You may either choose another user "
+"name, type in your user password or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:531
 msgid "Logged in successfully, synchronising session..."
 msgstr "Login réussi. Synchronisation de la séance..."
@@ -554 +604 @@
 msgid "Passwords do not match"
 msgstr "Le mot de passe n'est pas correct"
+
+#~ msgid "%0% has joined"
+#~ msgstr "%0% est arrivé(e)"
+
+#~ msgid "%0% has left"
+#~ msgstr "%0% est parti(e)"
+
+#~ msgid "Gobby"
+#~ msgstr "Gobby"
+
+#~ msgid "Colour"
+#~ msgstr "Couleur"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Subscribed"
+#~ msgstr "S'abonner"
+
+#~ msgid "Subscribe"
+#~ msgstr "S'abonner"
+
+#~ msgid ""
+#~ "You are not subscribed to the document \"%0%\".\n"
+#~ "\n"
+#~ "To view changes that others make or to edit the document yourself, you "
+#~ "have to subscribe to this document. Use the following button to perform "
+#~ "this.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Vous n'êtes pas abonné au document « %0% ».\n"
+#~ "\n"
+#~ "Pour voir les modifications des autres ou pour modifier vous-mêmes le "
+#~ "document, vous devez vous abonner à ce document. À cet effet, utilisez le "
+#~ "bouton suivant.\n"
+#~ "\n"
+
+#~ msgid "Enter user password"
+#~ msgstr "Entrer le mot de passe utilisateur"
 
 #~ msgid "%0% pending change"
@@ -559 +648 @@
 #~ msgstr[0] "%0% modification en attente"
 #~ msgstr[1] "%0% modification en attente"
-#~ msgstr[2] "%0% modifications en attente"
 
 #~ msgid "Revision: %0%"

po/gobby.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-02 17:13+0100\n"
+"POT-Creation-Date: 2005-11-15 23:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -23 +23 @@
 msgstr ""
 
-#: src/chat.cpp:28
+#: src/chat.cpp:69
 msgid "Send"
 msgstr ""
 
-#: src/chat.cpp:86
-#, c-format
-msgid "%0% has joined"
-msgstr ""
-
-#: src/chat.cpp:93
-#, c-format
-msgid "%0% has left"
-msgstr ""
-
-#. App menu
-#: src/header.cpp:135
-msgid "Gobby"
-msgstr ""
-
-#: src/header.cpp:142
+#: src/header.cpp:175
 msgid "Create session..."
 msgstr ""
 
-#: src/header.cpp:143
+#: src/header.cpp:176
 msgid "Opens a new obby session"
 msgstr ""
 
-#: src/header.cpp:156
+#: src/header.cpp:184
 msgid "Join session..."
 msgstr ""
 
-#: src/header.cpp:157
-msgid "Join an existing obby session"
-msgstr ""
-
-#. Gtk::Stock::SAVE automatically assigns a Ctrl+S
-#. shortcut which is already in use by Save Document
-#. I currently don't know how to remove the shortcut
-#. from this action
-#. - Armin, 10-21-2005
-#. Gtk::Stock::SAVE,
-#: src/header.cpp:175
-msgid "Save session"
-msgstr ""
-
-#: src/header.cpp:176
-msgid "Saves the complete session tobe able to restore it later"
-msgstr ""
-
-#: src/header.cpp:190
+#: src/header.cpp:185
+msgid "Joins an existing obby session"
+msgstr ""
+
+#: src/header.cpp:193
+msgid "Save session..."
+msgstr ""
+
+#: src/header.cpp:194
+msgid "Saves the complete session for a later restore"
+msgstr ""
+
+#: src/header.cpp:202
 msgid "Quit session"
 msgstr ""
 
-#: src/header.cpp:191
+#: src/header.cpp:203
 msgid "Leaves the currently running obby session"
 msgstr ""
 
-#: src/header.cpp:204
+#: src/header.cpp:211
 msgid "Quit"
 msgstr ""
 
-#: src/header.cpp:205
+#: src/header.cpp:212
 msgid "Quits the application"
 msgstr ""
 
-#. Session menu
-#: src/header.cpp:214
+#: src/header.cpp:216
 msgid "Session"
 msgstr ""
 
-#: src/header.cpp:221
+#: src/header.cpp:222
 msgid "Create document..."
 msgstr ""
 
-#: src/header.cpp:222
+#: src/header.cpp:223
 msgid "Creates a new document"
 msgstr ""
 
-#: src/header.cpp:235
+#: src/header.cpp:231
 msgid "Open document..."
 msgstr ""
 
-#: src/header.cpp:236
+#: src/header.cpp:232
 msgid "Loads a file into a new document"
 msgstr ""
 
+#: src/header.cpp:240
+msgid "Save document"
+msgstr ""
+
+#: src/header.cpp:241
+msgid "Saves a document into a file"
+msgstr ""
+
 #: src/header.cpp:249
-msgid "Save document"
+msgid "Save document as..."
 msgstr ""
 
 #: src/header.cpp:250
-msgid "Saves a document into a file"
+msgid "Saves a document to another location"
+msgstr ""
+
+#: src/header.cpp:258
+msgid "Close document"
+msgstr ""
+
+#: src/header.cpp:259
+msgid "Closes an opened document"
 msgstr ""
 
 #: src/header.cpp:263
-msgid "Save document as..."
-msgstr ""
-
-#: src/header.cpp:264
-msgid "Saves a document to another location"
-msgstr ""
-
-#: src/header.cpp:277
-msgid "Close document"
+msgid "Edit"
+msgstr ""
+
+#: src/header.cpp:269
+msgid "Find..."
+msgstr ""
+
+#: src/header.cpp:270
+msgid "Search for a text in the current document"
 msgstr ""
 
 #: src/header.cpp:278
-msgid "Closes an open document"
-msgstr ""
-
-#. Edit menu
+msgid "Find and replace..."
+msgstr ""
+
+#: src/header.cpp:279
+msgid "Search for a text and replace it with another one"
+msgstr ""
+
 #: src/header.cpp:287
-msgid "Edit"
-msgstr ""
-
-#: src/header.cpp:294
 msgid "Preferences..."
 msgstr ""
 
-#: src/header.cpp:295
+#: src/header.cpp:288
 msgid "Shows up a dialog to customise Gobby for your needs"
 msgstr ""
 
-#. User menu
-#: src/header.cpp:304 src/joindialog.cpp:101
+#: src/header.cpp:292 src/joindialog.cpp:101
 msgid "User"
 msgstr ""
 
-#: src/header.cpp:311
+#: src/header.cpp:298
 msgid "Set password..."
 msgstr ""
 
-#: src/header.cpp:312
+#: src/header.cpp:299
 msgid "Sets a password for this user"
 msgstr ""
 
-#: src/header.cpp:325
+#: src/header.cpp:307
 msgid "Set colour..."
 msgstr ""
 
+#: src/header.cpp:308
+msgid "Sets a new colour for this user"
+msgstr ""
+
+#: src/header.cpp:312 src/preferencesdialog.cpp:313
+msgid "View"
+msgstr ""
+
+#: src/header.cpp:318
+msgid "Document preferences..."
+msgstr ""
+
+#: src/header.cpp:319
+msgid "Shows a preferences dialog that is just applied to this document"
+msgstr ""
+
+#: src/header.cpp:324
+msgid "Syntax"
+msgstr ""
+
 #: src/header.cpp:326
-msgid "Sets a new colour for this user"
-msgstr ""
-
-#. View menu
-#: src/header.cpp:335 src/preferencesdialog.cpp:297
-msgid "View"
+msgid "Window"
+msgstr ""
+
+#: src/header.cpp:332 src/userlist.cpp:68
+msgid "User list"
+msgstr ""
+
+#: src/header.cpp:333
+msgid "Shows up a list of users that are currently joined"
+msgstr ""
+
+#: src/header.cpp:341
+msgid "Document list"
 msgstr ""
 
 #: src/header.cpp:342
-msgid "Document preferences..."
-msgstr ""
-
-#: src/header.cpp:343
-msgid "Shows a preferences dialog that is just applied to this document"
-msgstr ""
-
-#. Syntax submenu
+msgid "Shows up a list of documents within the current session"
+msgstr ""
+
+#: src/header.cpp:347
+msgid "Help"
+msgstr ""
+
 #: src/header.cpp:353
-msgid "Syntax"
-msgstr ""
-
-#: src/header.cpp:378
+msgid "About"
+msgstr ""
+
+#: src/header.cpp:354
+msgid "Shows Gobby's copyright and credits"
+msgstr ""
+
+#: src/header.cpp:416
 msgid "None"
 msgstr ""
 
-#: src/header.cpp:379
+#: src/header.cpp:417
 msgid "Unselects the current language"
 msgstr ""
 
 #. Build description string
-#: src/header.cpp:399
+#: src/header.cpp:439
 #, c-format
 msgid "Selects %0% as language"
-msgstr ""
-
-#. Help menu
-#: src/header.cpp:437
-msgid "Help"
-msgstr ""
-
-#: src/header.cpp:444
-msgid "About"
-msgstr ""
-
-#: src/header.cpp:445
-msgid "Shows Gobby's copyright and credits"
 msgstr ""
 
@@ -298 +307 @@
 msgstr ""
 
-#: src/preferencesdialog.cpp:241
+#: src/preferencesdialog.cpp:238
+msgid "Windows"
+msgstr ""
+
+#: src/preferencesdialog.cpp:239
+msgid "Remember the positions and states"
+msgstr ""
+
+#: src/preferencesdialog.cpp:244
 msgid "Show text only"
 msgstr ""
 
-#: src/preferencesdialog.cpp:242
+#: src/preferencesdialog.cpp:245
 msgid "Show icons only"
 msgstr ""
 
-#: src/preferencesdialog.cpp:243
+#: src/preferencesdialog.cpp:246
 msgid "Show both icons and text"
 msgstr ""
 
-#: src/preferencesdialog.cpp:292
+#: src/preferencesdialog.cpp:308
 msgid "Preferences"
 msgstr ""
 
-#: src/preferencesdialog.cpp:296
+#: src/preferencesdialog.cpp:312
 msgid "Editor"
 msgstr ""
 
 #. Appearance only affects the global Gobby window
-#: src/preferencesdialog.cpp:300
+#: src/preferencesdialog.cpp:316
 msgid "Appearance"
 msgstr ""
@@ -371 +388 @@
 msgstr ""
 
-#: src/userlist.cpp:74
-msgid "Colour"
-msgstr ""
-
-#: src/userlist.cpp:75
-msgid "Name"
-msgstr ""
-
-#: src/userlist.cpp:76
-msgid "Connected"
-msgstr ""
-
-#: src/userlist.cpp:77
-msgid "Subscribed"
-msgstr ""
-
-#: src/window.cpp:144
+#: src/userlist.cpp:84
+msgid "Online"
+msgstr ""
+
+#: src/userlist.cpp:85
+msgid "Offline"
+msgstr ""
+
+#: src/window.cpp:156
 msgid ""
 "Howl initialisation failed. Probably you need to run mDNSResponder as root "
@@ -393 +402 @@
 msgstr ""
 
-#: src/window.cpp:288
+#: src/window.cpp:240
+msgid "You are still connected to a session"
+msgstr ""
+
+#: src/window.cpp:248
+msgid "Do you want to close Gobby nevertheless?"
+msgstr ""
+
+#: src/window.cpp:401
 #, c-format
 msgid "Serving on port %0%"
 msgstr ""
 
-#: src/window.cpp:330
+#: src/window.cpp:446
 #, c-format
 msgid "Connected to %0%:%1%"
 msgstr ""
 
-#: src/window.cpp:345
+#: src/window.cpp:460
+msgid "Use default .obby extension if none is given"
+msgstr ""
+
+#: src/window.cpp:465
 msgid "Save obby session"
 msgstr ""
 
-#: src/window.cpp:378
+#: src/window.cpp:528
 msgid "A collaborative text editor"
 msgstr ""
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Create document"
 msgstr ""
 
-#: src/window.cpp:438
+#: src/window.cpp:649
 msgid "Enter document name"
 msgstr ""
 
 #. Create FileChooser
-#: src/window.cpp:453
+#: src/window.cpp:664
 msgid "Open new document"
 msgstr ""
 
 #. Setup dialog
-#: src/window.cpp:500
+#: src/window.cpp:715
 msgid "Save current document"
 msgstr ""
 
-#: src/window.cpp:545
+#: src/window.cpp:778
 msgid ""
 "Click on \"Apply\" to apply the new settings to documents that are currently "
@@ -437 +458 @@
 
 #. Build password dialog with info
-#: src/window.cpp:585
+#: src/window.cpp:818
 msgid "Set user password"
 msgstr ""
 
-#: src/window.cpp:587
+#: src/window.cpp:820
 msgid ""
 "Set a user password for your user account. When you try to login next time "
@@ -447 +468 @@
 msgstr ""
 
-#: src/window.cpp:635
+#: src/window.cpp:872
 #, c-format
 msgid ""
@@ -456 +477 @@
 
 #. Connection closed by remote site
-#: src/window.cpp:720 src/joinprogressdialog.cpp:224
+#: src/window.cpp:958 src/joinprogressdialog.cpp:544
 msgid "Connection lost"
 msgstr ""
 
-#: src/window.cpp:765
+#: src/window.cpp:991
 msgid "Colour change failed: Colour already in use"
 msgstr ""
 
-#: src/window.cpp:940
-#, c-format
-msgid ""
-"The document \"%0%\" has been changed since it was saved to disk. Are you "
-"sure that you want to close it?"
-msgstr ""
-
-#: src/statusbar.cpp:59
+#: src/window.cpp:1128
+#, c-format
+msgid "Could not open file '%0%' for writing"
+msgstr ""
+
+#: src/window.cpp:1142
+#, c-format
+msgid "Could not save file '%0%': %1%"
+msgstr ""
+
+#: src/window.cpp:1168
+#, c-format
+msgid "Save changes to document \"%0%\" before closing?"
+msgstr ""
+
+#: src/window.cpp:1172
+msgid ""
+"If you don't save, changes will be discarded, but may still be retrieved if "
+"you re-subscribe to the document."
+msgstr ""
+
+#: src/statusbar.cpp:60
 #, c-format
 msgid "Selected language: %0%"
 msgstr ""
 
-#: src/statusbar.cpp:65
+#: src/statusbar.cpp:66
 msgid "No language selected"
-msgstr ""
-
-#: src/document.cpp:30
-msgid "Subscribe"
-msgstr ""
-
-#: src/document.cpp:694
-#, c-format
-msgid ""
-"You are not subscribed to the document \"%0%\".\n"
-"\n"
-"To view changes that others make or to edit the document yourself, you have "
-"to subscribe to this document. Use the following button to perform this.\n"
-"\n"
 msgstr ""
 
@@ -498 +519 @@
 msgstr ""
 
-#: src/joinprogressdialog.cpp:32
+#: src/joinprogressdialog.cpp:92
 msgid "Joining obby session..."
 msgstr ""
 
 #. Thread has established connection, wait for welcome packet
-#: src/joinprogressdialog.cpp:152
+#: src/joinprogressdialog.cpp:186
 msgid "Waiting for welcome packet..."
 msgstr ""
 
 #. Update status message
-#: src/joinprogressdialog.cpp:182
+#: src/joinprogressdialog.cpp:246
 msgid "Login packet sent, waiting for response..."
 msgstr ""
 
-#: src/joinprogressdialog.cpp:195
-msgid "Enter session password"
-msgstr ""
-
-#: src/joinprogressdialog.cpp:202
-msgid "Enter user password"
-msgstr ""
-
-#: src/joinprogressdialog.cpp:211
+#: src/joinprogressdialog.cpp:260 src/joinprogressdialog.cpp:423
+msgid "New name:"
+msgstr ""
+
+#: src/joinprogressdialog.cpp:271
+msgid ""
+"Name is already in use. You may choose another name or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:341
+msgid ""
+"Colour is already in use. You may choose another colour or cancel the "
+"connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:364
+msgid "Session password:"
+msgstr ""
+
+#: src/joinprogressdialog.cpp:377
+msgid ""
+"Session password required. You have to type in the password to be able to "
+"join the obby session."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:424
+msgid "User password:"
+msgstr ""
+
+#: src/joinprogressdialog.cpp:441
+#, c-format
+msgid ""
+"User password for user '%0%' required. You may either choose another user "
+"name, type in your user password or cancel the connection."
+msgstr ""
+
+#: src/joinprogressdialog.cpp:531
 msgid "Logged in successfully, synchronising session..."
 msgstr ""

po/sv.po

@@ -7 +7 @@
 msgstr ""
 "Project-Id-Version: gobby\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2005-10-07 16:12+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-11-15 23:12+0100\n"
 "PO-Revision-Date: 2005-11-02 16:21+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
@@ -25 +25 @@
 "eller indatan binÀr."
 
-#: src/chat.cpp:28
+#: src/chat.cpp:69
 msgid "Send"
 msgstr "Skicka"
 
-#: src/chat.cpp:86
-#, c-format
-msgid "%0% has joined"
-msgstr "%0% har anslutit"
-
-#: src/chat.cpp:93
-#, c-format
-msgid "%0% has left"
-msgstr "%0% har utgått"
-
-#: src/header.cpp:134
-msgid "Gobby"
-msgstr "Gobby"
-
-#: src/header.cpp:141
+#: src/header.cpp:175
 msgid "Create session..."
 msgstr "Skapa session..."
 
-#: src/header.cpp:142
+#: src/header.cpp:176
 msgid "Opens a new obby session"
 msgstr "Öppnar en ny obby-session"
 
-#: src/header.cpp:155
+#: src/header.cpp:184
 msgid "Join session..."
 msgstr "Anslut till session..."
 
-#: src/header.cpp:156
-msgid "Join an existing obby session"
+#: src/header.cpp:185
+#, fuzzy
+msgid "Joins an existing obby session"
 msgstr "Ansluter till en existerande obby-session"
 
-#: src/header.cpp:169
+#: src/header.cpp:193
+#, fuzzy
+msgid "Save session..."
+msgstr "Spara session"
+
+#: src/header.cpp:194
+#, fuzzy
+msgid "Saves the complete session for a later restore"
+msgstr "Sparar den kompletta sessionen för att kunna återstÀlla den senare"
+
+#: src/header.cpp:202
 msgid "Quit session"
 msgstr "Avsluta session"
 
-#: src/header.cpp:170
+#: src/header.cpp:203
 msgid "Leaves the currently running obby session"
 msgstr "LÀmnar den aktiva obby-sessionen"
 
-#: src/header.cpp:183
+#: src/header.cpp:211
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/header.cpp:184
+#: src/header.cpp:212
 msgid "Quits the application"
-msgstr "StÀnger applikationen"
-
-#: src/header.cpp:193
+msgstr "Avslutar programmet"
+
+#: src/header.cpp:216
 msgid "Session"
 msgstr "Session"
 
-#: src/header.cpp:200
+#: src/header.cpp:222
 msgid "Create document..."
 msgstr "Skapa dokument..."
 
-#: src/header.cpp:201
+#: src/header.cpp:223
 msgid "Creates a new document"
 msgstr "Skapar ett nytt dokument"
 
-#: src/header.cpp:214
+#: src/header.cpp:231
 msgid "Open document..."
 msgstr "Öppna dokument..."
 
-#: src/header.cpp:215
+#: src/header.cpp:232
 msgid "Loads a file into a new document"
 msgstr "Laddar in en fil till ett nytt dokument"
 
-#: src/header.cpp:228
+#: src/header.cpp:240
 msgid "Save document"
 msgstr "Spara dokument"
 
-#: src/header.cpp:229
+#: src/header.cpp:241
 msgid "Saves a document into a file"
 msgstr "Sparar dokument till fil"
 
-#: src/header.cpp:242
+#: src/header.cpp:249
 msgid "Save document as..."
 msgstr "Spara dokument som..."
 
-#: src/header.cpp:243
+#: src/header.cpp:250
 msgid "Saves a document to another location"
 msgstr "Sparar dokument till annan plats"
 
-#: src/header.cpp:256
+#: src/header.cpp:258
 msgid "Close document"
 msgstr "StÀng dokument"
 
-#: src/header.cpp:257
-msgid "Closes an open document"
+#: src/header.cpp:259
+#, fuzzy
+msgid "Closes an opened document"
 msgstr "StÀnger ett öppet dokument"
 
-#: src/header.cpp:266
+#: src/header.cpp:263
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/header.cpp:273
+#: src/header.cpp:269
+msgid "Find..."
+msgstr "Sök..."
+
+#: src/header.cpp:270
+#, fuzzy
+msgid "Search for a text in the current document"
+msgstr "Spara aktuellt dokument"
+
+#: src/header.cpp:278
+msgid "Find and replace..."
+msgstr "Sök och ersÀtt..."
+
+#: src/header.cpp:279
+msgid "Search for a text and replace it with another one"
+msgstr ""
+
+#: src/header.cpp:287
 msgid "Preferences..."
-msgstr "Egenskaper..."
-
-#: src/header.cpp:274
+msgstr "InstÀllningar..."
+
+#: src/header.cpp:288
 msgid "Shows up a dialog to customise Gobby for your needs"
-msgstr "Öppnar en dialogruta för att anpassa Gobby till dina behov"
-
-#: src/header.cpp:283 src/joindialog.cpp:101
+msgstr "Öppnar en dialogruta för att anpassa Gobby efter dina behov"
+
+#: src/header.cpp:292 src/joindialog.cpp:101
 msgid "User"
 msgstr "AnvÀndare"
 
-#: src/header.cpp:290
+#: src/header.cpp:298
 msgid "Set password..."
-msgstr "Registrera lösenord..."
-
-#: src/header.cpp:291
+msgstr "SÀtt lösenord..."
+
+#: src/header.cpp:299
 msgid "Sets a password for this user"
-msgstr "SÀtter ett lösenord för den hÀr anvÀndaren"
-
-#: src/header.cpp:304
+msgstr "SÀtter ett lösenord för denna anvÀndare"
+
+#: src/header.cpp:307
 msgid "Set colour..."
 msgstr "VÀlj fÀrg..."
 
-#: src/header.cpp:305
+#: src/header.cpp:308
 msgid "Sets a new colour for this user"
-msgstr "VÀljer en ny fÀrg för denna anvÀndaren"
-
-#: src/header.cpp:314 src/preferencesdialog.cpp:297
+msgstr "VÀljer en ny fÀrg för denna anvÀndare"
+
+#: src/header.cpp:312 src/preferencesdialog.cpp:313
 msgid "View"
 msgstr "Visa"
 
-#: src/header.cpp:321
+#: src/header.cpp:318
 msgid "Document preferences..."
 msgstr "Dokumentegenskaper..."
 
-#: src/header.cpp:322
+#: src/header.cpp:319
 msgid "Shows a preferences dialog that is just applied to this document"
-msgstr "Visar en egenskapsdialog som endast Àr tillÀmpas för detta dokument"
-
-#: src/header.cpp:332
+msgstr "Visar en egenskapsdialog som endast tillÀmpas för detta dokument"
+
+#: src/header.cpp:324
 msgid "Syntax"
 msgstr "Syntax"
 
-#: src/header.cpp:357
+#: src/header.cpp:326
+msgid "Window"
+msgstr "Fönster"
+
+#: src/header.cpp:332 src/userlist.cpp:68
+#, fuzzy
+msgid "User list"
+msgstr "AnvÀndare"
+
+#: src/header.cpp:333
+msgid "Shows up a list of users that are currently joined"
+msgstr "Visar en lista på anvÀndare som Àr anslutna för tillfÀllet"
+
+#: src/header.cpp:341
+msgid "Document list"
+msgstr "Dokumentlista"
+
+#: src/header.cpp:342
+msgid "Shows up a list of documents within the current session"
+msgstr "Visar en lista på dokument i den aktuella sessionen"
+
+#: src/header.cpp:347
+msgid "Help"
+msgstr "HjÀlp"
+
+#: src/header.cpp:353
+msgid "About"
+msgstr "Om"
+
+#: src/header.cpp:354
+msgid "Shows Gobby's copyright and credits"
+msgstr "Visar information om Gobbys copyright och medarbetare"
+
+#: src/header.cpp:416
 msgid "None"
 msgstr "Ingen"
 
-#: src/header.cpp:358
+#: src/header.cpp:417
 msgid "Unselects the current language"
 msgstr "VÀljer bort nuvarande språk"
 
-#: src/header.cpp:378
+#. Build description string
+#: src/header.cpp:439
 #, c-format
 msgid "Selects %0% as language"
 msgstr "VÀljer %0% som språk"
-
-#: src/header.cpp:416
-msgid "Help"
-msgstr "HjÀlp"
-
-#: src/header.cpp:423
-msgid "About"
-msgstr "Om"
-
-#: src/header.cpp:424
-msgid "Shows Gobby's copyright and credits"
-msgstr "Visar Gobby's copyright och medarbetare"
 
 #: src/preferencesdialog.cpp:32
@@ -198 +235 @@
 #: src/preferencesdialog.cpp:33
 msgid "Indentation"
-msgstr "Indragning"
+msgstr "Indrag"
 
 #: src/preferencesdialog.cpp:34
 msgid "Home/End behaviour"
-msgstr "Home/End beteende"
+msgstr "Home/End-beteende"
 
 #: src/preferencesdialog.cpp:35
@@ -214 +251 @@
 #: src/preferencesdialog.cpp:37
 msgid "Enable automatic indentation"
-msgstr "Aktivera automatiskt indragning"
+msgstr "Aktivera automatiskt indrag"
 
 #: src/preferencesdialog.cpp:38
@@ -225 +262 @@
 "going to the start/end of the line."
 msgstr ""
-"Med denna valmöjligheten aktiverad flyttar Home/End-knapparna till "
-"första/sista tecken innan de går till början/slutet av raden."
+"Med denna valmöjlighet aktiverad flyttar Home/End-knapparna markören till "
+"första/sista tecknet innan de går till början/slutet av raden."
 
 #: src/preferencesdialog.cpp:113
@@ -246 +283 @@
 #: src/preferencesdialog.cpp:117
 msgid "Bracket matching"
-msgstr "Klammermatchning"
+msgstr "Hakparentesmatchning"
 
 #: src/preferencesdialog.cpp:118
@@ -280 +317 @@
 msgstr "Verktygsrad"
 
-#: src/preferencesdialog.cpp:241
+#: src/preferencesdialog.cpp:238
+msgid "Windows"
+msgstr "Fönster"
+
+#: src/preferencesdialog.cpp:239
+msgid "Remember the positions and states"
+msgstr "Kom ihåg positioner och egenskaper"
+
+#: src/preferencesdialog.cpp:244
 msgid "Show text only"
 msgstr "Visa endast text"
 
-#: src/preferencesdialog.cpp:242
+#: src/preferencesdialog.cpp:245
 msgid "Show icons only"
 msgstr "Visa endast ikoner"
 
-#: src/preferencesdialog.cpp:243
+#: src/preferencesdialog.cpp:246
 msgid "Show both icons and text"
 msgstr "Visa både ikoner och text"
 
-#: src/preferencesdialog.cpp:292
+#: src/preferencesdialog.cpp:308
 msgid "Preferences"
-msgstr "Egenskaper"
-
-#: src/preferencesdialog.cpp:296
+msgstr "InstÀllningar"
+
+#: src/preferencesdialog.cpp:312
 msgid "Editor"
 msgstr "Redigerare"
 
-#: src/preferencesdialog.cpp:300
+#. Appearance only affects the global Gobby window
+#: src/preferencesdialog.cpp:316
 msgid "Appearance"
 msgstr "Utseende"
@@ -324 +370 @@
 msgstr "Lösenord:"
 
+#: src/hostdialog.cpp:31
+msgid "Restore session:"
+msgstr "Ã
+terstÀll session:"
+
+#: src/hostdialog.cpp:32
+msgid "Restore session"
+msgstr "Ã
+terstÀll session"
+
 #: src/joindialog.cpp:39
 msgid "Join obby session"
@@ -330 +386 @@
 #: src/joindialog.cpp:42
 msgid "Host:"
-msgstr "VÀrd:"
+msgstr "VÀrddator:"
 
 #: src/joindialog.cpp:47
@@ -338 +394 @@
 #: src/joindialog.cpp:102
 msgid "Host"
-msgstr "VÀrd"
+msgstr "VÀrddator"
 
 #: src/joindialog.cpp:103
@@ -344 +400 @@
 msgstr "Port"
 
-#: src/userlist.cpp:74
-msgid "Colour"
-msgstr "FÀrg"
-
-#: src/userlist.cpp:75
-msgid "Name"
-msgstr "Namn"
-
-#: src/userlist.cpp:76
-msgid "Connected"
+#: src/userlist.cpp:84
+#, fuzzy
+msgid "Online"
 msgstr "Ansluten"
 
-#: src/userlist.cpp:77
-msgid "Subscribed"
-msgstr "Prenumererar"
-
-#: src/window.cpp:142
+#: src/userlist.cpp:85
+msgid "Offline"
+msgstr "Frånkopplad"
+
+#: src/window.cpp:156
 msgid ""
 "Howl initialisation failed. Probably you need to run mDNSResponder as root "
@@ -366 +415 @@
 msgstr ""
 "Initieringen av Howl misslyckades. Du måste antagligen köra mDNSResponder "
-"som root före Gobby. Stöd för Zeroconf Àr deaktiverat för denna session."
-
-#: src/window.cpp:284
+"som root innan du startar Gobby. Stöd för Zeroconf Àr deaktiverat för denna "
+"session."
+
+#: src/window.cpp:240
+msgid "You are still connected to a session"
+msgstr ""
+
+#: src/window.cpp:248
+msgid "Do you want to close Gobby nevertheless?"
+msgstr ""
+
+#: src/window.cpp:401
 #, c-format
 msgid "Serving on port %0%"
-msgstr "TjÀnstgör på port %0%"
-
-#: src/window.cpp:326
+msgstr "Lyssnar på port %0%"
+
+#: src/window.cpp:446
 #, c-format
 msgid "Connected to %0%:%1%"
 msgstr "Ansluten till %0%:%1%"
 
-#: src/window.cpp:347
+#: src/window.cpp:460
+msgid "Use default .obby extension if none is given"
+msgstr "AnvÀnd standard .obby-Àndelse om ingen annan Àr angiven"
+
+#: src/window.cpp:465
+msgid "Save obby session"
+msgstr "Spara obbysession"
+
+#: src/window.cpp:528
 msgid "A collaborative text editor"
 msgstr "En kollaborativ textredigerare"
 
-#: src/window.cpp:407
+#: src/window.cpp:649
 msgid "Create document"
 msgstr "Skapa dokument"
 
-#: src/window.cpp:407
+#: src/window.cpp:649
 msgid "Enter document name"
 msgstr "Ange dokumentnamn"
 
-#: src/window.cpp:422
+#. Create FileChooser
+#: src/window.cpp:664
 msgid "Open new document"
 msgstr "Öppna nytt dokument"
 
-#: src/window.cpp:469
+#. Setup dialog
+#: src/window.cpp:715
 msgid "Save current document"
 msgstr "Spara aktuellt dokument"
 
-#: src/window.cpp:514
+#: src/window.cpp:778
 msgid ""
 "Click on \"Apply\" to apply the new settings to documents that are currently "
@@ -404 +472 @@
 "documents."
 msgstr ""
-"Klicka på \"TillÀmpa\" för att tillÀmpa de nya instÀllningarna på dokument "
-"som för nÀrvarande Àr öppna. \"OK\" sparar bara vÀrdena för att anvÀnda dem "
-"med nyskapade dokument."
-
-#: src/window.cpp:554
+"Klicka på \"VerkstÀll\" för att tillÀmpa de nya instÀllningarna på dokument "
+"som för nÀrvarande Àr öppna. \"OK\" sparar bara instÀllningarna för att "
+"anvÀnda dem med nya dokument."
+
+#. Build password dialog with info
+#: src/window.cpp:818
 msgid "Set user password"
-msgstr "Registrera anvÀndarlösenord"
-
-#: src/window.cpp:556
+msgstr "SÀtt anvÀndarlösenord"
+
+#: src/window.cpp:820
 msgid ""
 "Set a user password for your user account. When you try to login next time "
@@ -418 +487 @@
 msgstr ""
 "SÀtter ett anvÀndarlösenord för ditt anvÀndarkonto. NÀsta gång du försöker "
-"logga in med den hÀr anvÀndaren kommer ditt lösenord att efterfrågas."
-
-#: src/window.cpp:604
+"logga in med denna anvÀndare kommer ditt lösenord att efterfrågas."
+
+#: src/window.cpp:872
 #, c-format
 msgid ""
@@ -428 +497 @@
 msgstr ""
 "De hÀr instÀllningarna påverkar endast det för nÀrvarande aktiva dokumentet "
-"\"%0%\". Om du vill Àndra globala instÀllningar anvÀnd \"InstÀllningar\" i "
-"\"Redigera\" menyn."
-
-#: src/window.cpp:689 src/joinprogressdialog.cpp:224
+"\"%0%\". AnvÀnd \"InstÀllningar\" under \"Redigera\"-menyn om du vill Àndra "
+"globala instÀllningar."
+
+#. Connection closed by remote site
+#: src/window.cpp:958 src/joinprogressdialog.cpp:544
 msgid "Connection lost"
-msgstr "Anslutningen avbruten"
-
-#: src/window.cpp:734
+msgstr "Anslutningen bruten"
+
+#: src/window.cpp:991
 msgid "Colour change failed: Colour already in use"
 msgstr "FÀrgÀndring misslyckades: FÀrgen anvÀnds redan"
 
-#: src/window.cpp:909
-#, c-format
-msgid ""
-"The document \"%0%\" has been changed since it was saved to disk. Are you "
-"sure that you want to close it?"
-msgstr ""
-"Dokumentet \"%0%\" har Àndrats sedan det sparades till disk. Är du sÀker pÃ¥ "
-"att du vill stÀnga det?"
-
-#: src/statusbar.cpp:59
+#: src/window.cpp:1128
+#, c-format
+msgid "Could not open file '%0%' for writing"
+msgstr "Kunde inte öppna filen '%0%' för skrivning"
+
+#: src/window.cpp:1142
+#, c-format
+msgid "Could not save file '%0%': %1%"
+msgstr "Kunde inte spara filen '%0%': %1%"
+
+#: src/window.cpp:1168
+#, c-format
+msgid "Save changes to document \"%0%\" before closing?"
+msgstr "Spara Àndringar till dokument \"%0%\" före stÀngning?"
+
+#: src/window.cpp:1172
+msgid ""
+"If you don't save, changes will be discarded, but may still be retrieved if "
+"you re-subscribe to the document."
+msgstr ""
+"If du inte sparar kommer Àndringar att kastas, men kan fortfarande hÀmtas "
+"tillbaka om du prenumerar på dokumentet igen."
+
+#: src/statusbar.cpp:60
 #, c-format
 msgid "Selected language: %0%"
 msgstr "Valt språk: %0%"
 
-#: src/statusbar.cpp:65
+#: src/statusbar.cpp:66
 msgid "No language selected"
 msgstr "Inget språk valt"
 
-#: src/document.cpp:30
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#: src/document.cpp:687
-#, c-format
-msgid ""
-"You are not subscribed to the document \"%0%\".\n"
-"\n"
-"To view changes that others make or to edit the document yourself, you have "
-"to subscribe to this document. Use the following button to perform this.\n"
-"\n"
-msgstr ""
-"Du prenumererar inte på dokumentet \"%0%\".\n"
-"\n"
-"För att se Àndringar andra gör eller för att Àndra dokumentet sjÀlv måste du "
-"prenumerera på det hÀr dokumentet. AnvÀnd följande knapp för att göra "
-"detta.\n"
-"\n"
-
-#: src/hostprogressdialog.cpp:29
+#: src/hostprogressdialog.cpp:30
 msgid "Opening obby session..."
 msgstr "Öppnar obby-session..."
 
-#: src/joinprogressdialog.cpp:32
+#: src/joinprogressdialog.cpp:92
 msgid "Joining obby session..."
 msgstr "Ansluter till obby-session..."
 
-#: src/joinprogressdialog.cpp:152
+#. Thread has established connection, wait for welcome packet
+#: src/joinprogressdialog.cpp:186
 msgid "Waiting for welcome packet..."
 msgstr "VÀntar på vÀlkomstpaket..."
 
-#: src/joinprogressdialog.cpp:182
+#. Update status message
+#: src/joinprogressdialog.cpp:246
 msgid "Login packet sent, waiting for response..."
 msgstr "Inloggningspaket skickat, vÀntar på svar..."
 
-#: src/joinprogressdialog.cpp:195
-msgid "Enter session password"
+#: src/joinprogressdialog.cpp:260 src/joinprogressdialog.cpp:423
+#, fuzzy
+msgid "New name:"
+msgstr "Nytt namn:"
+
+#: src/joinprogressdialog.cpp:271
+msgid ""
+"Name is already in use. You may choose another name or cancel the connection."
+msgstr ""
+"Namnet anvÀnds redan. Du kan vÀlja ett annat namn eller koppla ner "
+"anslutningen."
+
+#: src/joinprogressdialog.cpp:341
+msgid ""
+"Colour is already in use. You may choose another colour or cancel the "
+"connection."
+msgstr ""
+"FÀrgen anvÀnds redan. Du kan vÀlja en annan fÀrg eller koppla ner "
+"anslutningen."
+
+#: src/joinprogressdialog.cpp:364
+#, fuzzy
+msgid "Session password:"
 msgstr "Ange sessionslösenord"
 
-#: src/joinprogressdialog.cpp:202
-msgid "Enter user password"
-msgstr "Ange anvÀndarlösenord"
-
-#: src/joinprogressdialog.cpp:211
+#: src/joinprogressdialog.cpp:377
+msgid ""
+"Session password required. You have to type in the password to be able to "
+"join the obby session."
+msgstr ""
+"Ett sessionslösenord krÀvs. Du måste ange lösenordet för att kunna ansluta "
+"till obby-sessionen."
+
+#: src/joinprogressdialog.cpp:424
+msgid "User password:"
+msgstr "AnvÀndarlösenord:"
+
+#: src/joinprogressdialog.cpp:441
+#, c-format
+msgid ""
+"User password for user '%0%' required. You may either choose another user "
+"name, type in your user password or cancel the connection."
+msgstr ""
+"Ett anvÀndarlösenord för anvÀnder '%0%' krÀvs. Du kan antingen vÀlja ett "
+"annat anvÀndarnamn, ange ditt lösenord eller avbryta anslutningen."
+
+#: src/joinprogressdialog.cpp:531
 msgid "Logged in successfully, synchronising session..."
-msgstr "Inloggning lyckad, synkroniserar session..."
+msgstr "Inloggning lyckades, synkroniserar session..."
 
 #: src/passworddialog.cpp:99
 msgid "Passwords do not match"
-msgstr "Lösenorden stÀmmer inte överens"
-
-msgid "Save session"
-msgstr "Spara session"
-
-msgid "Saves the complete session tobe able to restore it later"
-msgstr "Sparar den kompletta sessionen för att kunna återstÀlla den senare"
-
-msgid "Restore session:"
-msgstr "Ã
-terstÀll session:"
-
-msgid "Restore session"
-msgstr "Ã
-terstÀll session"
-
-msgid "Save obby session"
-msgstr "Spara obbysession"
+msgstr "Lösenorden stÀmmer ej överens"
+
+#~ msgid "%0% has joined"
+#~ msgstr "%0% har anslutit"
+
+#~ msgid "%0% has left"
+#~ msgstr "%0% har lÀmn<t"
+
+#~ msgid "Gobby"
+#~ msgstr "Gobby"
+
+#~ msgid "Colour"
+#~ msgstr "FÀrg"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
+
+#~ msgid "Connected"
+#~ msgstr "Ansluten"
+
+#~ msgid "Subscribed"
+#~ msgstr "Prenumererar"
+
+#~ msgid ""
+#~ "The document \"%0%\" has been changed since it was saved to disk. Are you "
+#~ "sure that you want to close it?"
+#~ msgstr ""
+#~ "Dokumentet \"%0%\" har Àndrats sedan det sparades till disk. Är du sÀker "
+#~ "på att du vill stÀnga det?"
+
+#~ msgid "Subscribe"
+#~ msgstr "Prenumerera"
+
+#~ msgid ""
+#~ "You are not subscribed to the document \"%0%\".\n"
+#~ "\n"
+#~ "To view changes that others make or to edit the document yourself, you "
+#~ "have to subscribe to this document. Use the following button to perform "
+#~ "this.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Du prenumererar inte på dokumentet \"%0%\".\n"
+#~ "\n"
+#~ "För att se Àndringar andra gör eller för att Àndra dokumentet sjÀlv måste "
+#~ "du prenumerera på det hÀr dokumentet. AnvÀnd följande knapp för att göra "
+#~ "detta.\n"
+#~ "\n"
+
+#~ msgid "Enter user password"
+#~ msgstr "Ange anvÀndarlösenord"