Nico Golde:

- updated legal notes
- checked and updated line numbers in translation file
- updated TODO list
- name changes in manual

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@245 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/TODO.mutt-ng b/TODO.mutt-ng
index 13c29c6..9525aa1 100644 (file)
--- a/TODO.mutt-ng
+++ b/TODO.mutt-ng
@@ -16,3 +16,5 @@ Here's a list of all mutt-ng specific TODOs (not in priority order):
   protos.h
 
 - Convert all the names in manual.sgml.head/tail
   protos.h
 
 - Convert all the names in manual.sgml.head/tail

+
+- Check line numbers in translation files

diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 3705c60..287c13a 100644 (file)
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -2,8 +2,8 @@
 
 <article>
 
 
 <article>
 

-<title>The Mutt E-Mail Client
-<author>by Michael Elkins <htmlurl url="mailto:me@cs.hmc.edu" name="&lt;me@cs.hmc.edu&gt;">
+<title>The Mutt-ng E-Mail Client
+<author>by Michael Elkins <htmlurl url="mailto:me@cs.hmc.edu" name="&lt;me@cs.hmc.edu&gt;"> and others.

 <date>version @VERSION@
 <abstract>
 ``All mail clients suck.  This one just sucks less.'' -me, circa 1995
 <date>version @VERSION@
 <abstract>
 ``All mail clients suck.  This one just sucks less.'' -me, circa 1995


@@ -310,7 +310,7 @@ Colors are
 7    white
 </verb></tscreen>
 
 7    white
 </verb></tscreen>
 

-Mutt uses these attributes for handling text/enriched messages, and they
+Mutt-ng uses these attributes for handling text/enriched messages, and they

 can also be used by an external <ref id="auto_view" name="autoview">
 script for highlighting purposes.  <bf/Note:/ If you change the colors for your
 display, for example by changing the color associated with color2 for
 can also be used by an external <ref id="auto_view" name="autoview">
 script for highlighting purposes.  <bf/Note:/ If you change the colors for your
 display, for example by changing the color associated with color2 for


@@ -453,7 +453,7 @@ as a message/rfc822 body part.
 
 Asks for an external Unix command and executes it.  The <ref
 id="wait_key" name="&dollar;wait&lowbar;key"> can be used to control
 
 Asks for an external Unix command and executes it.  The <ref
 id="wait_key" name="&dollar;wait&lowbar;key"> can be used to control

-whether Mutt will wait for a key to be pressed when the command returns
+whether Mutt-ng will wait for a key to be pressed when the command returns

 (presumably to let the user read the output of the command), based on
 the return status of the named command.
 
 (presumably to let the user read the output of the command), based on
 the return status of the named command.
 


@@ -493,7 +493,7 @@ modify the message you are forwarding.  These items are discussed
 in greater detail in the next chapter <ref id="forwarding_mail"
 name="``Forwarding and Bouncing Mail''">.
 
 in greater detail in the next chapter <ref id="forwarding_mail"
 name="``Forwarding and Bouncing Mail''">.
 

-Mutt will then enter the <em/compose/ menu and prompt you for the
+Mutt-ng will then enter the <em/compose/ menu and prompt you for the

 recipients to place on the ``To:'' header field.  Next, it will ask
 you for the ``Subject:'' field for the message, providing a default if
 you are replying to or forwarding a message.  See also <ref id="askcc"
 recipients to place on the ``To:'' header field.  Next, it will ask
 you for the ``Subject:'' field for the message, providing a default if
 you are replying to or forwarding a message.  See also <ref id="askcc"

diff --git a/doc/manual.sgml.tail b/doc/manual.sgml.tail
index bea1ae6..0a0a1c4 100644 (file)
--- a/doc/manual.sgml.tail
+++ b/doc/manual.sgml.tail
@@ -19,7 +19,7 @@ bottom-page                L   move to the bottom of the page
 current-bottom     not bound   move current entry to bottom of page
 current-middle     not bound   move current entry to middle of page
 current-top        not bound   move current entry to top of page
 current-bottom     not bound   move current entry to bottom of page
 current-middle     not bound   move current entry to middle of page
 current-top        not bound   move current entry to top of page

-enter-command              :   enter a muttrc command
+enter-command              :   enter a muttngrc command

 exit                       q   exit this menu
 first-entry                =   move to the first entry
 half-down                  ]   scroll down 1/2 page
 exit                       q   exit this menu
 first-entry                =   move to the first entry
 half-down                  ]   scroll down 1/2 page


@@ -102,7 +102,7 @@ reply                      r   reply to a message
 resend-message         ESC e   resend message and preserve MIME structure
 save-message               s   save message/attachment to a file
 set-flag                   w   set a status flag on a message
 resend-message         ESC e   resend message and preserve MIME structure
 save-message               s   save message/attachment to a file
 set-flag                   w   set a status flag on a message

-show-version               V   show the Mutt version number and date
+show-version               V   show the Mutt-ng version number and date

 show-limit             ESC l   show currently active limit pattern, if any
 sort-mailbox               o   sort messages
 sort-reverse               O   sort messages in reverse order
 show-limit             ESC l   show currently active limit pattern, if any
 sort-mailbox               o   sort messages
 sort-reverse               O   sort messages in reverse order


@@ -137,7 +137,7 @@ display-address            @   display full address of sender
 display-toggle-weed        h   display message and toggle header weeding
 edit                       e   edit the current message
 edit-type                 ^E   edit the current message's Content-Type
 display-toggle-weed        h   display message and toggle header weeding
 edit                       e   edit the current message
 edit-type                 ^E   edit the current message's Content-Type

-enter-command              :   enter a muttrc command
+enter-command              :   enter a muttngrc command

 exit                       i   return to the main-menu
 extract-keys              ^K   extract PGP public keys
 flag-message               F   toggle a message's 'important' flag
 exit                       i   return to the main-menu
 extract-keys              ^K   extract PGP public keys
 flag-message               F   toggle a message's 'important' flag


@@ -183,7 +183,7 @@ search-opposite    not bound   search for next match in opposite direction
 search-reverse         ESC /   search backwards for a regular expression
 search-toggle              \   toggle search pattern coloring
 shell-escape               !   invoke a command in a subshell
 search-reverse         ESC /   search backwards for a regular expression
 search-toggle              \   toggle search pattern coloring
 shell-escape               !   invoke a command in a subshell

-show-version               V   show the Mutt version number and date
+show-version               V   show the Mutt-ng version number and date

 skip-quoted                S   skip beyond quoted text
 sync-mailbox               $   save changes to mailbox
 tag-message                t   tag a message
 skip-quoted                S   skip beyond quoted text
 sync-mailbox               $   save changes to mailbox
 tag-message                t   tag a message


@@ -338,7 +338,7 @@ Kari Hurtta
 <htmlurl url="mailto:kari.hurtta@fmi.fi" name="&lt;kari.hurtta@fmi.fi&gt;">
 co-developed the original MIME parsing code back in the ELM-ME days.
 
 <htmlurl url="mailto:kari.hurtta@fmi.fi" name="&lt;kari.hurtta@fmi.fi&gt;">
 co-developed the original MIME parsing code back in the ELM-ME days.
 

-The following people have been very helpful to the development of Mutt:
+The following people have been very helpful to the development of Mutt-ng:

 
 Vikas Agnihotri <htmlurl url="mailto:vikasa@writeme.com" name="&lt;vikasa@writeme.com&gt;">,<newline>
 Francois Berjon <htmlurl url="mailto:Francois.Berjon@aar.alcatel-alsthom.fr" name="&lt;Francois.Berjon@aar.alcatel-alsthom.fr&gt;">,<newline>
 
 Vikas Agnihotri <htmlurl url="mailto:vikasa@writeme.com" name="&lt;vikasa@writeme.com&gt;">,<newline>
 Francois Berjon <htmlurl url="mailto:Francois.Berjon@aar.alcatel-alsthom.fr" name="&lt;Francois.Berjon@aar.alcatel-alsthom.fr&gt;">,<newline>


@@ -381,6 +381,11 @@ Allain Thivillon <htmlurl url="mailto:Allain.Thivillon@alma.fr" name="&lt;Allain
 Gero Treuner <htmlurl url="mailto:gero@faveve.uni-stuttgart.de" name="&lt;gero@faveve.uni-stuttgart.de&gt;">,<newline>
 Vsevolod Volkov <htmlurl url="mailto:vvv@lucky.net" name="&lt;vvv@lucky.net&gt;">,<newline>
 Ken Weinert <htmlurl url="mailto:kenw@ihs.com" name="&lt;kenw@ihs.com&gt;">
 Gero Treuner <htmlurl url="mailto:gero@faveve.uni-stuttgart.de" name="&lt;gero@faveve.uni-stuttgart.de&gt;">,<newline>
 Vsevolod Volkov <htmlurl url="mailto:vvv@lucky.net" name="&lt;vvv@lucky.net&gt;">,<newline>
 Ken Weinert <htmlurl url="mailto:kenw@ihs.com" name="&lt;kenw@ihs.com&gt;">

+Andreas Krennmair <htmlurl url="mailto:ak@synflood.at" name="&lt;ak@synflood.at&gt;">
+Nico Golde <htmlurl url="mailto:nico@ngolde.de" name="&lt;nico@ngolde.de&gt;">
+Rocco Rutte <htmlurl url="mailto:pdmef@cs.tu-berlin.de" name="&lt;pdmef@cs.tu-berlin.de&gt;">
+
+

 
 <sect1>About this document
 <p>
 
 <sect1>About this document
 <p>

diff --git a/po/de.po b/po/de.po
index df738f6..241dfb4 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,89 +10,97 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: account.c:148
+#: account.c:155

 #, c-format
 msgid "Username at %s: "
 msgstr "Benutzername bei %s: "
 
 #, c-format
 msgid "Username at %s: "
 msgstr "Benutzername bei %s: "
 

-#: account.c:176
+#: account.c:186

 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passwort für %s@%s: "
 
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "Passwort für %s@%s: "
 

-#: addrbook.c:37 browser.c:44 pager.c:1449 postpone.c:43 query.c:48
-#: recvattach.c:54
+#: addrbook.c:32 browser.c:44 pager.c:1353 postpone.c:38 query.c:41
+#: recvattach.c:50

 msgid "Exit"
 msgstr "Verlassen"
 
 msgid "Exit"
 msgstr "Verlassen"
 

-#: addrbook.c:38 curs_main.c:402 pager.c:1456 postpone.c:44
+#: addrbook.c:33 curs_main.c:398 pager.c:1360 postpone.c:39

 msgid "Del"
 msgstr "Lösch."
 
 msgid "Del"
 msgstr "Lösch."
 

-#: addrbook.c:39 curs_main.c:403 postpone.c:45
+#: addrbook.c:34 curs_main.c:399 postpone.c:40

 msgid "Undel"
 msgstr "Behalten"
 
 msgid "Undel"
 msgstr "Behalten"
 

-#: addrbook.c:40
+#: addrbook.c:35

 msgid "Select"
 msgstr "Auswählen"
 
 #. __STRCAT_CHECKED__
 msgid "Select"
 msgstr "Auswählen"
 
 #. __STRCAT_CHECKED__

-#: addrbook.c:41 browser.c:47 compose.c:96 curs_main.c:408 mutt_ssl.c:634
-#: pager.c:1548 pgpkey.c:521 postpone.c:46 query.c:53 recvattach.c:58
+#: addrbook.c:36 browser.c:47 compose.c:114 curs_main.c:404 mutt_ssl.c:604
+#: pager.c:1465 pgpkey.c:492 postpone.c:41 query.c:46 recvattach.c:54

 #: smime.c:436
 msgid "Help"
 msgstr "Hilfe"
 
 #: smime.c:436
 msgid "Help"
 msgstr "Hilfe"
 

-#: addrbook.c:145
+#: addrbook.c:140

 msgid "You have no aliases!"
 msgstr "Keine Einträge im Adressbuch!"
 
 msgid "You have no aliases!"
 msgstr "Keine Einträge im Adressbuch!"
 

-#: addrbook.c:156
+#: addrbook.c:152

 msgid "Aliases"
 msgstr "Adressbuch"
 
 #. add a new alias
 msgid "Aliases"
 msgstr "Adressbuch"
 
 #. add a new alias

-#: alias.c:246
+#: alias.c:226

 msgid "Alias as: "
 msgstr "Kurzname für Adressbuch: "
 
 msgid "Alias as: "
 msgstr "Kurzname für Adressbuch: "
 

-#: alias.c:252
+#: alias.c:231

 msgid "You already have an alias defined with that name!"
 msgstr ""
 "Sie haben bereits einen Adressbucheintrag mit diesem Kurznamen definiert."
 
 msgid "You already have an alias defined with that name!"
 msgstr ""
 "Sie haben bereits einen Adressbucheintrag mit diesem Kurznamen definiert."
 

-#: alias.c:258
+#: alias.c:238

 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "Warnung: Dieser Adressbucheintrag könnte Probleme bereiten. Korrigieren?"
 
 msgid "Warning: This alias name may not work.  Fix it?"
 msgstr "Warnung: Dieser Adressbucheintrag könnte Probleme bereiten. Korrigieren?"
 

-#: alias.c:283
+#: alias.c:261

 msgid "Address: "
 msgstr "Adresse: "
 
 msgid "Address: "
 msgstr "Adresse: "
 

-#: alias.c:293 send.c:206
+#: alias.c:269 send.c:192

 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fehler: '%s' ist eine fehlerhafte IDN."
 
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Fehler: '%s' ist eine fehlerhafte IDN."
 

-#: alias.c:305
+#: alias.c:281

 msgid "Personal name: "
 msgstr "Name: "
 
 msgid "Personal name: "
 msgstr "Name: "
 

-#: alias.c:314
+#: alias.c:289

 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Eintragen?"
 
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Eintragen?"
 

-#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430
-#: recvattach.c:443 recvattach.c:471
+#: alias.c:304 recvattach.c:401 recvattach.c:414 recvattach.c:438
+#: recvattach.c:451 recvattach.c:466 recvattach.c:491

 msgid "Save to file: "
 msgstr "Speichern in Datei: "
 
 msgid "Save to file: "
 msgstr "Speichern in Datei: "
 

-#: alias.c:346
+#: alias.c:318

 msgid "Alias added."
 msgstr "Adresse eingetragen."
 
 msgid "Alias added."
 msgstr "Adresse eingetragen."
 

+
+#######################################################
+#                                                     #
+# Until here: line numbers checked                    #
+#                                                     #
+#######################################################
+
+

 #: attach.c:112 attach.c:244 attach.c:472 attach.c:963
 msgid "Can't match nametemplate, continue?"
 msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"
 #: attach.c:112 attach.c:244 attach.c:472 attach.c:963
 msgid "Can't match nametemplate, continue?"
 msgstr "Namensschema kann nicht erfüllt werden, fortfahren?"