Catalan, French, Ukrainian and German updates.

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

ChangeLog

 CVS code 
+- General:
+	- Translation updates (see po/ChangeLog for details).
 
 GNU nano 1.1.99pre2 - 2003.02.03
-- General
+- General:
 	- Changed some translatable debug messages to use %s 
 	  instead of the function name, and removed gettext from 
 	  two strings that had no actual words in them that

po/ChangeLog

+2003-02-04  Jordi Mallach  <jordi@gnu.org>
+
+	* ca.po: Updated Catalan translation.
+	* fr.po: Updated French translation by Jean-Philippe Gurard.
+	* uk.po: Updated Ukrainian translation by Sergey A. Ribalchenko.
+	* de.po: Updated German translation by Michael Piefel.
+
 2003-01-27  Jordi Mallach  <jordi@gnu.org>
 
 	* es.po: Updated translation by Ricardo Javier Crdenes Medina.

po/uk.po

@@ -4,16 +4,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.99pre1\n"
+"Project-Id-Version: nano 1.1.99pre2\n"
 "POT-Creation-Date: 2003-02-03 08:00-0500\n"
-"PO-Revision-Date: 2003-01-21 10:51+0300\n"
+"PO-Revision-Date: 2003-02-04 10:51+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #: cut.c:43
 #, c-format
@@ -72,7 +71,6 @@ msgid "filename is %s\n"
 msgstr "' : %s\n"
 
 #: files.c:493
-#, fuzzy
 msgid "Command to execute"
 msgstr "   "
 
@@ -90,14 +88,14 @@ msgid "Key illegal in non-multibuffer mode"
 msgstr "צ   - ͦ"
 
 #: files.c:702 nano.c:565
-#, fuzzy, c-format
+#, c-format
 msgid "%s: free'd a node, YAY!\n"
-msgstr "delete_node(): O..  צ!\n"
+msgstr "%s: ..  צ!\n"
 
 #: files.c:707 nano.c:570
-#, fuzzy, c-format
+#, c-format
 msgid "%s: free'd last node.\n"
-msgstr "delete_node(): צ  .\n"
+msgstr "%s: צ  .\n"
 
 #: files.c:871 files.c:934
 msgid "No more open files"
@@ -141,8 +139,7 @@ msgstr "
 #: files.c:1422
 #, c-format
 msgid "Could not set access/modification time on backup %s: %s"
-msgstr ""
-"    ϧ ͦ/    %s: %s"
+msgstr "    ϧ ͦ/    %s: %s"
 
 #: files.c:1457 files.c:1473 files.c:1485 files.c:1507 files.c:1540
 #: files.c:1547 files.c:1559
@@ -500,7 +497,7 @@ msgstr "
 
 #: global.c:400
 msgid "Toggle insert into new buffer"
-msgstr ""
+msgstr "     "
 
 #: global.c:415 global.c:563 global.c:603 global.c:639 global.c:658
 #: global.c:688 global.c:720 global.c:742 global.c:752 global.c:762
@@ -744,26 +741,18 @@ 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"
-" The previous search string will be shown in brackets after the Search: "
-"prompt.  Hitting Enter without entering any text will perform the previous "
-"search.\n"
+" The previous search string will be shown in brackets after the Search: prompt.  Hitting Enter without entering any text will perform the previous search.\n"
 "\n"
 " The following function keys are available in Search mode:\n"
 "\n"
 msgstr ""
 "   \n"
 "\n"
-" Ħ   ̦ ˦  ,  Φ Enter.   "
-"ϧ    צצ ¦,  ͦ  "
-"   ¦.\n"
+" Ħ   ̦ ˦  ,  Φ Enter.   ϧ    צצ ¦,  ͦ     ¦.\n"
 "\n"
-"   ¦ '    Ц  "
-"\":\".  Enter   -    "
-" ϧ  ¦.\n"
+"   ¦ '    Ц  \":\".  Enter   -     ϧ  ¦.\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ :\n"
 "\n"
@@ -772,18 +761,14 @@ msgstr ""
 msgid ""
 "Go To 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 function keys are available in Go To Line mode:\n"
 "\n"
 msgstr ""
 "   _\n"
 "\n"
-" Ħ       Ħ  Φ Enter.  "
-"˦˦ ˦  ̦      ,    "
-"Φ  .\n"
+" Ħ       Ħ  Φ Enter.  ˦˦ ˦  ̦      ,    Φ  .\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ _:\n"
 "\n"
@@ -792,34 +777,22 @@ msgstr ""
 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 a nanorc file, inserting a file will cause it to be loaded into a "
-"separate buffer (use Meta-< 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 a nanorc file, inserting a file will cause it to be loaded into a separate buffer (use Meta-< and > to switch between file buffers).\n"
 "\n"
-" If you need another blank buffer, do not enter any filename, or type in a "
-"nonexistent filename at the prompt and press Enter.\n"
+" If you need another blank buffer, do not enter any filename, or type in a nonexistent filename at the prompt and press Enter.\n"
 "\n"
 " The following function keys are available in Insert File mode:\n"
 "\n"
 msgstr ""
 "    \n"
 "\n"
-" Ħ '          æ "
-".\n"
+" Ħ '          æ .\n"
 "\n"
-"   nano ڦ  Ц ˦  Ҧ,   "
-"צ צ  æ   -F  --multibuffer,  "
-" ¦æ Meta-F,     nanorc,    "
-"   ( Meta-<  >   ͦ "
-").\n"
+"   nano ڦ  Ц ˦  Ҧ,   צ צ  æ   -F  --multibuffer,   ¦æ Meta-F,     nanorc,       ( Meta-<  >   ͦ ).\n"
 "\n"
-"   Ҧ   ,  ͦ Enter   "
-"   Φ ,  ۦ ' Ŧ   "
-"Φ Enter.\n"
+"   Ҧ   ,  ͦ Enter      Φ ,  ۦ ' Ŧ   Φ Enter.\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ  :\n"
 "\n"
@@ -828,26 +801,18 @@ msgstr ""
 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 have selected text with Ctrl-^, 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 have selected text with Ctrl-^, 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"
+" Ħ ' Ц        Φ Enter.\n"
 "\n"
-"   դ  צͦ  Ctrl-^  ͦ  , "
-"'   Ц,       .  "
-"        , ' "
-"    '     ͦ.\n"
+"   դ  צͦ  Ctrl-^  ͦ  , '   Ц,       .          , '     '     ͦ.\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ  \n"
 "\n"
@@ -856,23 +821,14 @@ msgstr ""
 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 function keys are available in the file browser:\n"
 "\n"
 msgstr ""
 "    ̦\n"
 "\n"
-"  ̦ դ  צ  ͦ "
-"Ҧ   Ҧ     .   "
-" צ    PageUp/PageDown  "
-" Ҧ ,   Ҧ     ϧ "
-"Ҧ צ S  Enter.  ͦ  Ҧ , "
-"Ҧ Ҧ \"..\"    ̦.\n"
+"  ̦ դ  צ  ͦ Ҧ   Ҧ     .    צ    PageUp/PageDown   Ҧ ,   Ҧ     ϧ Ҧ צ S  Enter.  ͦ  Ҧ , Ҧ Ҧ \"..\"    ̦.\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ  ̦:\n"
 "\n"
@@ -883,8 +839,7 @@ 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.\n"
+" If tab completion has not been disabled, you can use the TAB key to (attempt to) automatically complete the directory name.\n"
 "\n"
 " The following function keys are available in Browser Go To Directory mode:\n"
 "\n"
@@ -893,31 +848,23 @@ msgstr ""
 "\n"
 " Ħ ' Ҧ,    .\n"
 "\n"
-"  tab-  ,    צ TAB  "
-"()    Ҧ.\n"
+"  tab-  ,    צ TAB  ()    Ҧ.\n"
 "\n"
-" Φ æΦ צۦ Φ  ͦ  ̦ "
-"_Ҧ:\n"
+" Φ æΦ צۦ Φ  ͦ  ̦ _Ҧ:\n"
 "\n"
 
 #: nano.c:345
 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"
 "\n"
@@ -926,16 +873,14 @@ msgstr ""
 msgid ""
 "External Command Help Text\n"
 "\n"
-" This menu allows you to insert the output of a command run by the shell "
-"into the current buffer (or a new buffer in multibuffer mode).\n"
+" This menu allows you to insert the output of a command run by the shell into the current buffer (or a new buffer in multibuffer mode).\n"
 "\n"
 " The following keys are available in this mode:\n"
 "\n"
 msgstr ""
 "   Φ \n"
 "\n"
-"   Ѥ   צ ,    "
-"æ,    (     - ͦ).\n"
+"   Ѥ   צ ,    æ,    (     - ͦ).\n"
 "\n"
 " Φ צۦ Φ   ͦ:\n"
 "\n"
@@ -944,37 +889,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"
-"\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.  Alternative "
-"keys are shown in parentheses:\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.  Alternative 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:415 nano.c:418
@@ -1035,7 +959,6 @@ msgid "Enable multiple file buffers"
 msgstr " ˦  Ҧ"
 
 #: nano.c:639
-#, fuzzy
 msgid "Log & read search/replace string history"
 msgstr "    Ҧ  /ͦ"
 
@@ -1214,6 +1137,13 @@ msgid ""
 "\n"
 "Press return to continue\n"
 msgstr ""
+"\n"
+"æ -p   æ \"preserve\"  Pico.\n"
+"æ ͦԦ  Pico  , ˦ nano  Φ\n"
+"ͦ  Pico.    FAQ  ¦ ϧ צ\n"
+" æ ͦ.\n"
+"\n"
+"Φ - Enter\n"
 
 #: nano.c:816
 msgid "Could not pipe"
@@ -1310,9 +1240,8 @@ msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr " ͦ  (צ \"\"   ) ? "
 
 #: nano.c:2805
-#, fuzzy
 msgid "Received SIGHUP or SIGTERM\n"
-msgstr " SIGHUP  SIGTERM"
+msgstr " SIGHUP  SIGTERM\n"
 
 #: nano.c:2884
 msgid "Cannot resize top win"
@@ -1441,14 +1370,13 @@ msgstr ""
 "\"black\",  æ Ʀ \"bright\".\n"
 
 #: rcfile.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "Bad regex \"%s\": %s"
-msgstr "  צ \"%s\": %s"
+msgstr " צ   \"%s\": %s"
 
 #: rcfile.c:274 rcfile.c:394 rcfile.c:441
 msgid "regex strings must begin and end with a \" character\n"
-msgstr ""
-"  ڦ Φ   ˦  '\"'\n"
+msgstr "  ڦ Φ   ˦  '\"'\n"
 
 #: rcfile.c:283
 msgid "Missing syntax name"
@@ -1485,9 +1413,9 @@ msgid "\"start=\" requires a corresponding \"end=\""
 msgstr "\"start=\" դ צצ \"end=\""
 
 #: rcfile.c:482
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Read a comment\n"
-msgstr "parse_rcfile:  \n"
+msgstr "%s:  \n"
 
 #: rcfile.c:505
 #, c-format
@@ -1495,9 +1423,9 @@ msgid "command %s not understood"
 msgstr " %s  ͦ"
 
 #: rcfile.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "%s: Parsing option %s\n"
-msgstr "parse_rcfile: ڦ æ %s\n"
+msgstr "%s: ڦ æ %s\n"
 
 #: rcfile.c:537
 #, c-format
@@ -1545,7 +1473,7 @@ msgstr "\"%s...\"
 #: search.c:106
 #, c-format
 msgid "Invalid regex \"%s\""
-msgstr ""
+msgstr "צ   \"%s\""
 
 #: search.c:134
 msgid "Search"
@@ -1697,10 +1625,9 @@ msgid "No"
 msgstr ""
 
 #: winio.c:1442
-#, fuzzy, c-format
+#, c-format
 msgid "line %ld/%ld (%d%%), col %lu/%lu (%d%%), char %lu/%ld (%d%%)"
-msgstr ""
-" %d/%d (%.0f%%),  %ld/%ld (%.0f%%, ̦ %ld/%ld (%.0f%%)"
+msgstr " %ld/%ld (%d%%),  %lu/%lu (%d%%, ̦ %lu/%ld (%d%%)"
 
 #: winio.c:1698
 msgid "Dumping file buffer to stderr...\n"
@@ -1746,21 +1673,15 @@ msgstr "
 msgid "Thank you for using nano!\n"
 msgstr "դ   ,   nano!\n"
 
-#~ msgid "Can't visit parent in restricted mode"
-#~ msgstr "  צצ  (cd ./..)   ͦ"
-
-#~ msgid "string val=%s\n"
-#~ msgstr " val=%s\n"
-
-#~ msgid "For end part, beginning = \"%s\"\n"
-#~ msgstr " ˦ϧ ,  = \"%s\"\n"
-
 #~ msgid "delete_opennode(): free'd a node, YAY!\n"
 #~ msgstr "delete_opennode(): O..  צ!\n"
 
 #~ msgid "delete_opennode(): free'd last node.\n"
 #~ msgstr "delete_opennode(): צ  .\n"
 
+#~ msgid "Can't visit parent in restricted mode"
+#~ msgstr "  צצ  (cd ./..)   ͦ"
+
 #~ msgid "-p"
 #~ msgstr "-p"
 
@@ -1787,6 +1708,12 @@ msgstr "
 #~ msgid "Press return to continue\n"
 #~ msgstr "Φ Enter  \n"
 
+#~ msgid "string val=%s\n"
+#~ msgstr " val=%s\n"
+
+#~ msgid "For end part, beginning = \"%s\"\n"
+#~ msgstr " ˦ϧ ,  = \"%s\"\n"
+
 #~ msgid "current->data = \"%s\"\n"
 #~ msgstr "(winio.c) current->data = \"%s\"\n"
 
@@ -1875,8 +1802,7 @@ msgstr "
 #~ msgstr " -N \t\t--noconvert\t\t    Ԧ DOS/Mac\n"
 
 #~ msgid " -Q [str]\t--quotestr [str]\tQuoting string, default \"> \"\n"
-#~ msgstr ""
-#~ " -Q [str]\t--quotestr [str]\t ,   \"> \"\n"
+#~ msgstr " -Q [str]\t--quotestr [str]\t ,   \"> \"\n"
 
 #~ msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
 #~ msgstr " -S\t\t--smooth\t\t \n"
@@ -1913,15 +1839,11 @@ msgstr "
 #~ msgid " -p \t\t--pico\t\t\tEmulate Pico as closely as possible\n"
 #~ msgstr " -p\t \t--pico\t\t\t Pico ˦  \n"
 
-#~ 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"
 
 #~ msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
-#~ msgstr ""
-#~ " -s [] \t--speller=[]\t.  צ \n"
+#~ msgstr " -s [] \t--speller=[]\t.  צ \n"
 
 #~ msgid " -t \t\t--tempfile\t\tAuto save on exit, don't prompt\n"
 #~ msgstr " -t \t\t--tempfile\t\t  Ħ,  \n"