German translation update (Michael Piefel).

Ukrainian translation update (Sergey A. Ribalchenko).


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@957 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

ChangeLog

@@ -24,8 +24,8 @@ CVS code -
 	- Typo fixes (David Lawrence Ramsey).
 - po/sv.po:
 	- Swedish translation update (Christian Rose).
-- po/ru.po:
-	- Russian translation update (Sergey A. Ribalchenko).
+- po/ru.po, uk.po:
+	- Russian and Ukrainian translations updates (Sergey A. Ribalchenko).
 - po/ca.po, es.po:
 	- Catalan and Spanish translations updates (Jordi).
 - po/pl.po:
@@ -36,6 +36,8 @@ CVS code -
 	- Galician translation update (Jacobo Tarro).
 - po/it.po:
 	- Italian translation update (Marco Colombo).
+- po/de.po:
+	- German translation update (Michael Piefel).
 
 nano-1.1.4 - 12/11/2001
 - General

THANKS

@@ -10,6 +10,7 @@ Szabolcs Horvath <horvaths@janus.gimsz.sulinet.hu>
 Eivind Kjrstad <ekj@vestdata.no>		Norwegian (Bokml) Translator
 Florian Knig <floki@bigfoot.com>		German Translator
 Clement Laforet <clem_laf@wanadoo.fr>		French Translator
+Michael Piefel <piefel@informatik.hu-berlin.de> German Translator
 Sergey A. Ribalchenko <fisher@obu.ck.ua>	Russian, Ukrainian Translator
 Michel Robitaille <robitail@IRO.UMontreal.CA>	French Translator
 Christian Rose <menthos@menthos.com>		Swedish Translator

po/uk.po

-# Ukrainian translation of GNU nano.
+# Ukrainian messages for GNU nano.
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Sergey A. Ribalchenko <fisher@obu.ck.ua>, 2001.
 # $Id$
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.2\n"
+"Project-Id-Version: nano 1.1.4\n"
 "POT-Creation-Date: 2001-12-11 21:21-0500\n"
-"PO-Revision-Date: 2001-10-08 18:41+0300\n"
+"PO-Revision-Date: 2001-12-28 18:41+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <kick@renome.rovno.ua>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 #: cut.c:43
 #, c-format
 msgid "add_to_cutbuffer called with inptr->data = %s\n"
-msgstr "add_to_cutbuffer   inptr->data = %s\n"
+msgstr "add_to_cutbuffer   inptr->data = %s\n"
 
 #: cut.c:215
 msgid "Blew away cutbuffer =)\n"
-msgstr "cutbuffer  צ =)\n"
+msgstr "cutbuffer  צ =)\n"
 
 #: files.c:67
 msgid "File already loaded"
-msgstr ""
+msgstr "  "
 
 #: files.c:168
 msgid "read_line: not on first line and prev is NULL"
@@ -39,12 +39,12 @@ msgstr "
 #: files.c:262
 #, c-format
 msgid "Read %d lines (Converted Mac format)"
-msgstr ""
+msgstr " %d ˦ (   Mac)"
 
 #: files.c:264
 #, c-format
 msgid "Read %d lines (Converted DOS format)"
-msgstr ""
+msgstr " %d ˦ (   DOS)"
 
 #: files.c:286 search.c:217
 #, c-format
@@ -65,7 +65,7 @@ msgstr "
 #: files.c:306
 #, c-format
 msgid "File \"%s\" is a device file"
-msgstr " \"%s\"   "
+msgstr " \"%s\"   Ҧ"
 
 #: files.c:314
 msgid "Reading File"
@@ -260,7 +260,7 @@ msgstr "
 
 #: global.c:261
 msgid "Close currently loaded file/Exit from nano"
-msgstr "   /  nano"
+msgstr "   /  nano"
 
 #: global.c:263
 msgid "Exit from nano"
@@ -292,7 +292,7 @@ msgstr "
 
 #: global.c:272
 msgid "Move to the previous screen"
-msgstr "   "
+msgstr "   "
 
 #: global.c:273
 msgid "Move to the next screen"
@@ -326,27 +326,27 @@ msgstr "
 
 #: global.c:280
 msgid "Move forward one character"
-msgstr "   i"
+msgstr "   ̦"
 
 #: global.c:281
 msgid "Move back one character"
-msgstr "   i"
+msgstr "   ̦"
 
 #: global.c:282
 msgid "Move to the beginning of the current line"
-msgstr "i    "
+msgstr "ͦ    "
 
 #: global.c:283
 msgid "Move to the end of the current line"
-msgstr "i  i  "
+msgstr "ͦ  ˦  "
 
 #: global.c:284
 msgid "Go to the first line of the file"
-msgstr "i    "
+msgstr "ͦ    "
 
 #: global.c:285
 msgid "Go to the last line of the file"
-msgstr "i    "
+msgstr "ͦ    "
 
 #: global.c:286
 msgid "Refresh (redraw) the current screen"
@@ -366,15 +366,15 @@ msgstr "
 
 #: global.c:291
 msgid "Insert a tab character"
-msgstr "  i"
+msgstr "  æ"
 
 #: global.c:292
 msgid "Insert a carriage return at the cursor position"
-msgstr "  CR ( ̦)  . "
+msgstr "  CR ( ̦)  . "
 
 #: global.c:294
 msgid "Make the current search or replace case (in)sensitive"
-msgstr "    ͦ () צ  ̦"
+msgstr "    ͦ () צ Ǧ ̦"
 
 #: global.c:295
 msgid "Go to file browser"
@@ -382,7 +382,7 @@ msgstr "
 
 #: global.c:297
 msgid "Cancel the current function"
-msgstr "  i"
+msgstr "  æ"
 
 #: global.c:298
 msgid "Append to the current file"
@@ -411,7 +411,7 @@ msgstr "
 
 #: global.c:315 global.c:531 global.c:571
 msgid "Exit"
-msgstr "i"
+msgstr "Ȧ"
 
 #: global.c:318
 msgid "WriteOut"
@@ -560,21 +560,13 @@ msgstr "
 
 #: nano.c:177
 #, c-format
-msgid ""
-"\n"
-"Buffer written to %s\n"
-msgstr ""
-"\n"
-"   %s\n"
+msgid "\nBuffer written to %s\n"
+msgstr "\n   %s\n"
 
 #: nano.c:179
 #, c-format
-msgid ""
-"\n"
-"No %s written (file exists?)\n"
-msgstr ""
-"\n"
-"%s   ( դ?)\n"
+msgid "\nNo %s written (file exists?)\n"
+msgstr "\n%s   ( դ?)\n"
 
 #: nano.c:186
 msgid "Window size is too small for Nano..."
@@ -588,37 +580,16 @@ msgstr "
 msgid ""
 " nano help text\n"
 "\n"
-" The nano editor is designed to emulate the functionality and ease-of-use of "
-"the UW Pico text editor.  There are four main sections of the editor: The "
-"top line shows the program version, the current filename being edited, and "
-"whether or not the file has been modified.  Next is the main editor window "
-"showing the file being edited.  The status line is the third line from the "
-"bottom and shows important messages. The bottom two lines show the most "
-"commonly used shortcuts in the editor.\n"
+" The nano editor is designed to emulate the functionality and ease-of-use of the UW Pico text editor.  There are four main sections of the editor: The top line shows the program version, the current filename being edited, and whether or not the file has been modified.  Next is the main editor window showing the file being edited.  The status line is the third line from the bottom and shows important messages. The bottom two lines show the most commonly used shortcuts in the editor.\n"
 "\n"
-" The notation for shortcuts is as follows: Control-key sequences are notated "
-"with a caret (^) symbol and are entered with the Control (Ctrl) key.  "
-"Escape-key sequences are notated with the Meta (M) symbol and can be entered "
-"using either the Esc, Alt or Meta key depending on your keyboard setup.  The "
-"following keystrokes are available in the main editor window. Optional keys "
-"are shown in parentheses:\n"
+" The notation for shortcuts is as follows: Control-key sequences are notated with a caret (^) symbol and are entered with the Control (Ctrl) key.  Escape-key sequences are notated with the Meta (M) symbol and can be entered using either the Esc, Alt or Meta key depending on your keyboard setup.  The following keystrokes are available in the main editor window. Optional keys are shown in parentheses:\n"
 "\n"
 msgstr ""
 "   nano\n"
 "\n"
-"   nano      æ  æԦ     "
-"   UW Pico.   ĦѤ  4 Φ æ: "
-"Φ  ͦ Ӧ , '  ,  դ, "
-" æ  ,   -˦ ͦ  .  æ - "
-"  צ ,     ͦ  . "
-"   3    ͦ צ צ. Φ  "
-" ͦ ¦ Φ ¦æ צ .\n"
+"   nano      æ  æԦ        UW Pico.   ĦѤ  4 Φ æ: Φ  ͦ Ӧ , '  ,  դ,  æ  ,   -˦ ͦ  .  æ -   צ ,     ͦ  .    3    ͦ צ צ. Φ   ͦ ¦ Φ ¦æ צ .\n"
 "\n"
-"  æ  ¦æ: ¦æ  צ Control    "
-"'^'         צ  Control (Ctrl).   Esc-¦æ "
-"  'M'     צ Esc, Alt  Meta "
-" Ԧ צ  ϧ צ. Φ ¦æ Φ   "
-"צΦ . צ ¦æ Φ  :\n"
+"    ¦æ: ¦æ  צ Control Φ   '^'         צ  Control (Ctrl).   Esc-¦æ Φ  'M'     צۦ Esc, Alt  Meta  Ԧ צ  ϧ צ. Φ ¦æ Φ   צΦ . צ ¦æ Φ  :\n"
 "\n"
 
 #: nano.c:345
@@ -630,12 +601,8 @@ msgid "delete_node(): free'd last node.\n"
 msgstr "delete_node(): צ  .\n"
 
 #: nano.c:407
-msgid ""
-"Usage: nano [GNU long option] [option] +LINE <file>\n"
-"\n"
-msgstr ""
-": nano [Ǧ æ GNU] [æ] + <>\n"
-"\n"
+msgid "Usage: nano [GNU long option] [option] +LINE <file>\n\n"
+msgstr ": nano [Ǧ æ GNU] [æ] + <>\n\n"
 
 #: nano.c:408
 msgid "Option\t\tLong option\t\tMeaning\n"
@@ -704,10 +671,8 @@ msgid " -p \t\t--pico\t\t\tEmulate Pico as closely as possible\n"
 msgstr " -p\t \t--pico\t\t\t Pico ˦  \n"
 
 #: nano.c:465
-msgid ""
-" -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
-msgstr ""
-" -r [#]\t--fill=[#]\t\t   æ  #\n"
+msgid " -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\n"
+msgstr " -r [#]\t--fill=[#]\t\t   æ  #\n"
 
 #: nano.c:469
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
@@ -738,12 +703,8 @@ msgid " +LINE\t\t\t\t\tStart at line number LINE\n"
 msgstr " +\t\t\t\t\t    \n"
 
 #: nano.c:486
-msgid ""
-"Usage: nano [option] +LINE <file>\n"
-"\n"
-msgstr ""
-": nano [æ] + <>\n"
-"\n"
+msgid "Usage: nano [option] +LINE <file>\n\n"
+msgstr ": nano [æ] + <>\n\n"
 
 #: nano.c:487
 msgid "Option\t\tMeaning\n"
@@ -844,19 +805,15 @@ msgstr " +
 #: nano.c:542
 #, c-format
 msgid " GNU nano version %s (compiled %s, %s)\n"
-msgstr " GNU nano Ӧ %s (ڦ %s, %s)\n"
+msgstr " GNU nano Ӧ %s (ڦ %s, %s)\n"
 
 #: nano.c:545
 msgid " Email: nano@nano-editor.org\tWeb: http://www.nano-editor.org"
 msgstr " -: nano@nano-editor.org\t: http://www.nano-editor.org"
 
 #: nano.c:546
-msgid ""
-"\n"
-" Compiled options:"
-msgstr ""
-"\n"
-"   æ:"
+msgid "\n Compiled options:"
+msgstr "\n   æ:"
 
 #: nano.c:635
 msgid "Mark Set"
@@ -942,77 +899,93 @@ msgstr "
 msgid ""
 "Search Command Help Text\n"
 "\n"
-" Enter the words or characters you would like to search for, then hit enter. "
-" If there is a match for the text you entered, the screen will be updated to "
-"the location of the nearest match for the search string.\n"
+" Enter the words or characters you would like to search for, then hit enter.  If there is a match for the text you entered, the screen will be updated to the location of the nearest match for the search string.\n"
 "\n"
-" If using Pico Mode via the -p or --pico flags, using the Meta-P toggle or "
-"using a nanorc file, the previous search string will be shown in brackets "
-"after the Search: prompt.  Hitting enter without entering any text will "
-"preform the previous search. Otherwise, the previous string will be placed "
-"in front of the cursor, and can be edited or deleted before hitting enter.\n"
+" If using Pico Mode via the -p or --pico flags, using the Meta-P toggle or using a nanorc file, the previous search string will be shown in brackets after the Search: prompt.  Hitting enter without entering any text will preform the previous search. Otherwise, the previous string will be placed in front of the cursor, and can be edited or deleted before hitting enter.\n"
 "\n"
 " The following functions keys are available in Search mode:\n"
 "\n"
 msgstr ""
+"   \n"
+"\n"
+" Ħ   ̦ ˦  ,  Φ Enter.   ϧ    צצ ¦,  ͦ     ¦.\n"
+"\n"
+"    Pico   æ -p  --pico,   ¦æ Meta-P,    nanorc,   ¦ '    Ц  \":\".  Enter   -     ϧ  ¦. ,       ͦ             Enter.\n"
+"\n"
+" Φ æΦ צۦ Φ  ͦ :\n"
+"\n"
 
 #: nano.c:2391
 msgid ""
 "Goto Line Help Text\n"
 "\n"
-" Enter the line number that you wish to go to and hit Enter.  If there are "
-"fewer lines of text than the number you entered, you will be brought to the "
-"last line of the file.\n"
+" Enter the line number that you wish to go to and hit Enter.  If there are fewer lines of text than the number you entered, you will be brought to the last line of the file.\n"
 "\n"
 " The following functions keys are available in Goto Line mode:\n"
 "\n"
 msgstr ""
+"   _\n"
+"\n"
+" Ħ       Ħ  Φ Enter.  ˦˦ ˦  ̦      ,    Φ  .\n"
+"\n"
+" Φ æΦ צ Φ  ͦ _:\n"
+"\n"
 
 #: nano.c:2398
 msgid ""
 "Insert File Help Text\n"
 "\n"
-" Type in the name of a file to be inserted into the current file buffer at "
-"the current cursor location.\n"
+" Type in the name of a file to be inserted into the current file buffer at the current cursor location.\n"
 "\n"
-" If you have compiled nano with multiple file buffer support, and enable "
-"multiple buffers with the -F or --multibuffer command line flags, the Meta-F "
-"toggle or using a nanorc file, inserting a file will cause it to be loaded "
-"into a separate buffer (use Ctrl-< and > to switch between file buffers).\n"
+" If you have compiled nano with multiple file buffer support, and enable multiple buffers with the -F or --multibuffer command line flags, the Meta-F toggle or using a nanorc file, inserting a file will cause it to be loaded into a separate buffer (use Ctrl-< and > to switch between file buffers).\n"
 "\n"
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
+"    \n"
+"\n"
+" Ħ '          æ .\n"
+"\n"
+"   nano ڦ  Ц ˦  Ҧ,   צ צ  æ   -F  --multibuffer,   ¦æ Meta-F,     nanorc,       ( Ctrl-<  >   ͦ ).\n"
+"\n"
+" Φ æΦ צ Φ  ͦ  :\n"
+"\n"
 
 #: nano.c:2409
 msgid ""
 "Write File Help Text\n"
 "\n"
-" Type the name that you wish to save the current file as and hit enter to "
-"save the file.\n"
+" Type the name that you wish to save the current file as and hit enter to save the file.\n"
 "\n"
-" If you are using the marker code with Ctrl-^ and have selected text, you "
-"will be prompted to save only the selected portion to a separate file.  To "
-"reduce the chance of overwriting the current file with just a portion of it, "
-"the current filename is not the default in this mode.\n"
+" If you are using the marker code with Ctrl-^ and have selected text, you will be prompted to save only the selected portion to a separate file.  To reduce the chance of overwriting the current file with just a portion of it, the current filename is not the default in this mode.\n"
 "\n"
 " The following function keys are available in Write File mode:\n"
 "\n"
 msgstr ""
+"    \n"
+"\n"
+" Ħ ' Ц        Φ Enter.\n"
+"\n"
+"   դ  צͦ  Ctrl-^  ͦ  , '   Ц,       .          , '     '     ͦ.\n"
+"\n"
+" Φ æΦ צ Φ  ͦ  \n"
+"\n"
 
 #: nano.c:2421
 msgid ""
 "File Browser Help Text\n"
 "\n"
-" The file browser is used to visually browse the directory structure to "
-"select a file for reading or writing.  You may use the arrow keys or Page "
-"Up/Down to browse through the files, and S or Enter to choose the selected "
-"file or enter the selected directory. To move up one level, select the "
-"directory called \"..\" at the top of the file list.\n"
+" The file browser is used to visually browse the directory structure to select a file for reading or writing.  You may use the arrow keys or Page Up/Down to browse through the files, and S or Enter to choose the selected file or enter the selected directory. To move up one level, select the directory called \"..\" at the top of the file list.\n"
 "\n"
 " The following functions keys are available in the file browser:\n"
 "\n"
 msgstr ""
+"    ̦\n"
+"\n"
+"  ̦ դ  צ  ͦ Ҧ   Ҧ     .    צ    PageUp/PageDown   Ҧ ,   Ҧ     ϧ Ҧ צ S  Enter.  ͦ  Ҧ , Ҧ Ҧ \"..\"    ̦.\n"
+"\n"
+" Φ æΦ צ Φ  ͦ  ̦:\n"
+"\n"
 
 #: nano.c:2432
 msgid ""
@@ -1020,24 +993,31 @@ msgid ""
 "\n"
 " Enter the name of the directory you would like to browse to.\n"
 "\n"
-" If tab completion has not been disabled, you can use the TAB key to "
-"(attempt to) automatically complete the directory name.  The following "
-"function keys are available in Browser GotoDir mode:\n"
+" If tab completion has not been disabled, you can use the TAB key to (attempt to) automatically complete the directory name.  The following function keys are available in Browser GotoDir mode:\n"
 "\n"
 msgstr ""
+"    ̦ _Ҧ\n"
+"\n"
+" Ħ ' Ҧ,    .\n"
+"\n"
+"  tab-  ,    צ TAB  ()   ' Ҧ. Φ æΦ צ Φ  ͦ  ̦ _Ҧ:\n"
+"\n"
 
 #: nano.c:2440
 msgid ""
 "Spell Check Help Text\n"
 "\n"
-" The spell checker checks the spelling of all text in the current file.  "
-"When an unknown word is encountered, it is highlighted and a replacement can "
-"be edited.  It will then prompt to replace every instance of the given "
-"misspelled word in the current file.\n"
+" The spell checker checks the spelling of all text in the current file.  When an unknown word is encountered, it is highlighted and a replacement can be edited.  It will then prompt to replace every instance of the given misspelled word in the current file.\n"
 "\n"
 " The following other functions are available in Spell Check mode:\n"
 "\n"
 msgstr ""
+"   \n"
+"\n"
+"  צ  צѤ Ʀ     ̦.  Ҧ  ,  ĦѤ  'Ѥ צ צ  ͦ. Ԧ '   ͦ        ̦.\n"
+"\n"
+" Φ ۦ æ Φ  ͦ :\n"
+"\n"
 
 #: nano.c:2524
 #, c-format
@@ -1094,16 +1074,12 @@ msgid "I got Alt-%c! (%d)\n"
 msgstr " Ц Alt-%c! (%d)\n"
 
 #: rcfile.c:84
-msgid ""
-"\n"
-"Press return to continue starting nano\n"
-msgstr ""
-"\n"
-"ͦ Enter    nano\n"
+msgid "\nPress return to continue starting nano\n"
+msgstr "\nͦ Enter    nano\n"
 
 #: rcfile.c:281
 msgid "parse_rcfile: Read a comment\n"
-msgstr "parse_rcfile:  Ҧ\n"
+msgstr "parse_rcfile:  \n"
 
 #: rcfile.c:302
 #, c-format
@@ -1138,7 +1114,7 @@ msgstr "
 #: rcfile.c:372
 #, c-format
 msgid "unset flag %d!\n"
-msgstr "Ҧ  %d!\n"
+msgstr "  %d!\n"
 
 #: rcfile.c:381
 msgid "Errors found in .nanorc file"
@@ -1387,4 +1363,4 @@ msgstr "
 #~ msgstr "  %s%s"
 
 #~ msgid "Only %d lines available, skipping to last line"
-#~ msgstr " %d ˦  Ԧ, ˦   "
+#~ msgstr " %d ˦  Ԧ,    "