Russian and Ukrainian translation updates (Sergey A. Ribalchenko).

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

ChangeLog

@@ -39,6 +39,8 @@ CVS code -
 	- French translation updates (Jean-Philippe Guérard).
 - po/gl.po:
 	- Galician translation updates (Jacobo Tarrio).
+- po/uk.po, po/ru.po:
+	- Russian and Ukrainian translation updates (Sergey A. Ribalchenko).
 	  
 GNU nano 1.1.7 - 03/05/2002
 - General

po/ChangeLog

+2002-03-12  Jordi Mallach  <jordi@sindominio.net>
+
+	* uk.po, ru.po: Updated translations by Sergey A.
+	Ribalchenko.
+
 2002-03-12  Jordi Mallach  <jordi@sindominio.net>
 
 	* ca.po: Updated to current CVS.
@@ -49,7 +54,7 @@
 
 2002-02-07  Jordi Mallach  <jordi@sindominio.net>
 
-	* uk.po, ru.po: Updated translations by Sergei A.
+	* uk.po, ru.po: Updated translations by Sergey A.
 	Ribalchenko.
 
 2002-02-06  Jordi Mallach  <jordi@sindominio.net>

po/ru.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.6\n"
+"Project-Id-Version: nano 1.1.7\n"
 "POT-Creation-Date: 2002-03-05 18:20-0500\n"
-"PO-Revision-Date: 2002-02-06 11:10+0300\n"
+"PO-Revision-Date: 2002-03-14 11:10+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -67,16 +67,15 @@ msgid "Reading File"
 msgstr " "
 
 #: files.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "File to insert [from %s] "
-msgstr "   [ ./]"
+msgstr "   [ %s]"
 
 #: files.c:375
 msgid "File to insert [from ./] "
 msgstr "   [ ./]"
 
-#: files.c:383 files.c:529 files.c:577 files.c:675 files.c:687 files.c:740
-#: files.c:751 files.c:1469
+#: files.c:383 files.c:529 files.c:577 files.c:675 files.c:687 files.c:740 files.c:751 files.c:1469
 #, c-format
 msgid "filename is %s"
 msgstr "  %s"
@@ -101,15 +100,14 @@ msgstr "
 #: files.c:695 files.c:759
 #, c-format
 msgid "Switched to %s"
-msgstr ""
+msgstr "  %s"
 
 #: files.c:1201
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "    %s"
 
-#: files.c:1238 files.c:1254 files.c:1268 files.c:1291 files.c:1300
-#: files.c:1312
+#: files.c:1238 files.c:1254 files.c:1268 files.c:1291 files.c:1300 files.c:1312
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "     : %s"
@@ -142,11 +140,11 @@ msgstr "
 
 #: files.c:1414
 msgid " [Mac Format]"
-msgstr ""
+msgstr " [ Mac]"
 
 #: files.c:1416
 msgid " [DOS Format]"
-msgstr ""
+msgstr " [ DOS]"
 
 #: files.c:1424
 msgid "Append Selection to File"
@@ -236,13 +234,12 @@ msgid "Case sensitive search"
 msgstr "- "
 
 #: global.c:216
-#, fuzzy
 msgid "Regular expression search"
-msgstr "  (regexp)"
+msgstr "    (regexp)"
 
 #: global.c:219
 msgid "No conversion from DOS/Mac format"
-msgstr ""
+msgstr "   DOS/Mac "
 
 #: global.c:220
 msgid "Writing file in DOS format"
@@ -405,12 +402,10 @@ msgid "Search backwards"
 msgstr " "
 
 #: global.c:324
-#, fuzzy
 msgid "Write file out in DOS format"
 msgstr "    DOS"
 
 #: global.c:325
-#, fuzzy
 msgid "Write file out in Mac format"
 msgstr "    Mac"
 
@@ -430,8 +425,7 @@ msgstr "
 msgid "Open next loaded file"
 msgstr "  "
 
-#: global.c:339 global.c:492 global.c:527 global.c:562 global.c:577
-#: global.c:606 global.c:632 global.c:643 global.c:655 global.c:676
+#: global.c:339 global.c:492 global.c:527 global.c:562 global.c:577 global.c:606 global.c:632 global.c:643 global.c:655 global.c:676
 msgid "Get Help"
 msgstr ""
 
@@ -550,15 +544,13 @@ msgstr "
 
 #: global.c:480
 msgid "Previous File"
-msgstr ""
+msgstr " "
 
 #: global.c:483
-#, fuzzy
 msgid "Next File"
-msgstr " "
+msgstr " "
 
-#: global.c:495 global.c:530 global.c:565 global.c:579 global.c:626
-#: global.c:634 global.c:645 global.c:678 winio.c:1419
+#: global.c:495 global.c:530 global.c:565 global.c:579 global.c:626 global.c:634 global.c:645 global.c:678 winio.c:1419
 msgid "Cancel"
 msgstr ""
 
@@ -592,11 +584,11 @@ msgstr "
 
 #: global.c:615
 msgid "DOS Format"
-msgstr ""
+msgstr " DOS"
 
 #: global.c:618
 msgid "Mac Format"
-msgstr ""
+msgstr " Mac"
 
 #: global.c:622
 msgid "Append"
@@ -616,13 +608,13 @@ msgstr ""
 "   %s\n"
 
 #: nano.c:188
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "No %s written (too many backup files?)\n"
 msgstr ""
 "\n"
-"%s   ( ?)\n"
+"%s   (   ?)\n"
 
 #: nano.c:197
 msgid "Window size is too small for Nano..."
@@ -636,39 +628,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. Optional 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. 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"
-"     : 1.   Control' "
-"  '^'       Ctrl; 2. "
-"  Esc (Esc-)   M    "
-"    Esc, Alt  Meta,     "
-".       . "
-"    :\n"
+"     : 1.   Control'   '^'       Ctrl; 2.   Esc (Esc-)   M        Esc, Alt  Meta,     .       .     :\n"
 "\n"
 
 #: nano.c:356
@@ -708,13 +677,12 @@ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
 msgstr " -M \t\t--mac\t\t\t    Mac\n"
 
 #: nano.c:439
-#, fuzzy
 msgid " -N \t\t--noconvert\t\tDon't convert files from DOS/Mac format\n"
-msgstr " -D \t\t--dos\t\t\t    DOS\n"
+msgstr " -N \t\t--noconvert\t\t    DOS/Mac \n"
 
 #: nano.c:444
 msgid " -Q [str]\t--quotestr [str]\tQuoting string, default \"> \"\n"
-msgstr ""
+msgstr " -Q [str]\t--quotestr [str]\t ,   \"> \"\n"
 
 #: nano.c:448
 msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
@@ -761,8 +729,7 @@ 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:482
-msgid ""
-" -r [#cols] \t--fill=[#cols]\t\tSet fill cols to (wrap lines at) #cols\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:486
@@ -825,7 +792,7 @@ msgstr " -M \t\t
 
 #: nano.c:516
 msgid " -Q [str] \tQuoting string, default \"> \"\n"
-msgstr ""
+msgstr " -Q [str] \t ,   \"> \"\n"
 
 #: nano.c:518
 msgid " -R\t\tUse regular expressions for search\n"
@@ -1009,31 +976,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"
-" 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 "
-"perform 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 perform 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"
+"    ,    ,   Enter.      ,        .\n"
 "\n"
-"    Pico   -p  --pico,   "
-" Meta-P,    nanorc,      "
-"     ':'.  Enter   "
-"   . ,    "
-"            "
-"Enter.\n"
+"    Pico   -p  --pico,    Meta-P,    nanorc,           ':'.  Enter      . ,                Enter.\n"
 "\n"
 "       :\n"
 "\n"
@@ -1042,52 +996,38 @@ msgstr ""
 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"
+"           Enter.        ,   ,      .\n"
 "\n"
 "       __:\n"
 "\n"
 
 #: nano.c:2511
-#, fuzzy
 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 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 using 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, just press Enter at the prompt without "
-"typing in a filename, or type in a nonexistent filename at the prompt and "
-"press Enter.\n"
+" If you need another blank buffer, just press Enter at the prompt without typing in a 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"
 "\n"
-"   nano      ,  "
-"    -F  --multibuffer,    Meta-"
-"F,     nanorc,        "
-"    ( Meta-<  >    "
-" ).\n"
+"       ,   Enter       ,           Enter.\n"
 "\n"
 "       _:\n"
 "\n"
@@ -1096,13 +1036,9 @@ 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 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"
@@ -1111,10 +1047,7 @@ msgstr ""
 "\n"
 "            Enter.\n"
 "\n"
-"      (Ctrl-^)   ,   "
-"      .    "
-"     ,      "
-"     .\n"
+"      (Ctrl-^)   ,         .         ,           .\n"
 "\n"
 "       :\n"
 "\n"
@@ -1123,23 +1056,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 functions 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"
@@ -1150,39 +1074,28 @@ 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"
+"  tab-   ,     TAB     .       __ :\n"
 "\n"
 
 #: nano.c:2556
 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"
@@ -1273,8 +1186,7 @@ msgstr "
 
 #: rcfile.c:226 rcfile.c:280
 msgid "regex strings must begin and end with a \" character\n"
-msgstr ""
-"        '\"'\n"
+msgstr "        '\"'\n"
 
 #: rcfile.c:272
 msgid ""
@@ -1525,9 +1437,9 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1639
-#, fuzzy, c-format
+#, c-format
 msgid "line %d/%d (%.0f%%), col %ld/%ld (%.0f%%), char %ld/%ld (%.0f%%)"
-msgstr " %d  %d (%.0f%%),  %ld  %ld (%.0f%%)"
+msgstr " %d/%d (%.0f%%),  %ld/%ld (%.0f%%),  %ld/%ld (%.0f%%)"
 
 #: winio.c:1800
 msgid "Dumping file buffer to stderr...\n"
@@ -1559,8 +1471,7 @@ msgstr "
 
 #: winio.c:1884
 msgid "The Free Software Foundation"
-msgstr ""
-"The Free Software Foundation (   )"
+msgstr "The Free Software Foundation (   )"
 
 #: winio.c:1886
 msgid "Pavel Curtis, Zeyd Ben-Halim and Eric S. Raymond for ncurses"

po/uk.po

@@ -4,11 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: nano 1.1.6\n"
+"Project-Id-Version: nano 1.1.7\n"
 "POT-Creation-Date: 2002-03-05 18:20-0500\n"
-"PO-Revision-Date: 2002-02-07 11:41+0300\n"
+"PO-Revision-Date: 2002-03-14 11:41+0300\n"
 "Last-Translator: Sergey A. Ribalchenko <fisher@obu.ck.ua>\n"
-"Language-Team: Ukrainian <kick@renome.rovno.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"
@@ -60,23 +60,22 @@ msgstr "
 #: files.c:311
 #, c-format
 msgid "File \"%s\" is a device file"
-msgstr " \"%s\"   Ҧ"
+msgstr " \"%s\"   "
 
 #: files.c:319
 msgid "Reading File"
 msgstr " .."
 
 #: files.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "File to insert [from %s] "
-msgstr "   [צ ./] "
+msgstr "   [צ %s] "
 
 #: files.c:375
 msgid "File to insert [from ./] "
 msgstr "   [צ ./] "
 
-#: files.c:383 files.c:529 files.c:577 files.c:675 files.c:687 files.c:740
-#: files.c:751 files.c:1469
+#: files.c:383 files.c:529 files.c:577 files.c:675 files.c:687 files.c:740 files.c:751 files.c:1469
 #, c-format
 msgid "filename is %s"
 msgstr "'   %s"
@@ -101,15 +100,14 @@ msgstr "
 #: files.c:695 files.c:759
 #, c-format
 msgid "Switched to %s"
-msgstr ""
+msgstr "  %s"
 
 #: files.c:1201
 #, c-format
 msgid "Can't write outside of %s"
 msgstr "    %s"
 
-#: files.c:1238 files.c:1254 files.c:1268 files.c:1291 files.c:1300
-#: files.c:1312
+#: files.c:1238 files.c:1254 files.c:1268 files.c:1291 files.c:1300 files.c:1312
 #, c-format
 msgid "Could not open file for writing: %s"
 msgstr "  צ   : %s"
@@ -142,11 +140,11 @@ msgstr "
 
 #: files.c:1414
 msgid " [Mac Format]"
-msgstr ""
+msgstr " [ Mac]"
 
 #: files.c:1416
 msgid " [DOS Format]"
-msgstr ""
+msgstr " [ DOS]"
 
 #: files.c:1424
 msgid "Append Selection to File"
@@ -235,14 +233,14 @@ msgstr "
 msgid "Case sensitive search"
 msgstr " "
 
+#
 #: global.c:216
-#, fuzzy
 msgid "Regular expression search"
-msgstr "Φ  (regexp)"
+msgstr "    (regexp)"
 
 #: global.c:219
 msgid "No conversion from DOS/Mac format"
-msgstr ""
+msgstr "   DOS/Mac "
 
 #: global.c:220
 msgid "Writing file in DOS format"
@@ -407,12 +405,10 @@ msgid "Search backwards"
 msgstr " "
 
 #: global.c:324
-#, fuzzy
 msgid "Write file out in DOS format"
 msgstr "   Ԧ DOS"
 
 #: global.c:325
-#, fuzzy
 msgid "Write file out in Mac format"
 msgstr "   Ԧ Mac"
 
@@ -432,8 +428,7 @@ msgstr "
 msgid "Open next loaded file"
 msgstr "  "
 
-#: global.c:339 global.c:492 global.c:527 global.c:562 global.c:577
-#: global.c:606 global.c:632 global.c:643 global.c:655 global.c:676
+#: global.c:339 global.c:492 global.c:527 global.c:562 global.c:577 global.c:606 global.c:632 global.c:643 global.c:655 global.c:676
 msgid "Get Help"
 msgstr ""
 
@@ -552,15 +547,13 @@ msgstr "
 
 #: global.c:480
 msgid "Previous File"
-msgstr ""
+msgstr "Φ "
 
 #: global.c:483
-#, fuzzy
 msgid "Next File"
-msgstr " "
+msgstr " "
 
-#: global.c:495 global.c:530 global.c:565 global.c:579 global.c:626
-#: global.c:634 global.c:645 global.c:678 winio.c:1419
+#: global.c:495 global.c:530 global.c:565 global.c:579 global.c:626 global.c:634 global.c:645 global.c:678 winio.c:1419
 msgid "Cancel"
 msgstr ""
 
@@ -594,11 +587,11 @@ msgstr "
 
 #: global.c:615
 msgid "DOS Format"
-msgstr ""
+msgstr " DOS"
 
 #: global.c:618
 msgid "Mac Format"
-msgstr ""
+msgstr " Mac"
 
 #: global.c:622
 msgid "Append"
@@ -618,13 +611,13 @@ msgstr ""
 "   %s\n"
 
 #: nano.c:188
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "No %s written (too many backup files?)\n"
 msgstr ""
 "\n"
-"%s   ( դ?)\n"
+"%s   (   ̦?)\n"
 
 #: nano.c:197
 msgid "Window size is too small for Nano..."
@@ -638,37 +631,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. Optional 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. 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:356
@@ -708,13 +680,12 @@ msgid " -M \t\t--mac\t\t\tWrite file in Mac format\n"
 msgstr " -M \t\t--mac\t\t\t   Ԧ Mac\n"
 
 #: nano.c:439
-#, fuzzy
 msgid " -N \t\t--noconvert\t\tDon't convert files from DOS/Mac format\n"
-msgstr " -D \t\t--dos\t\t\t   Ԧ DOS\n"
+msgstr " -N \t\t--noconvert\t\t    Ԧ DOS/Mac\n"
 
 #: nano.c:444
 msgid " -Q [str]\t--quotestr [str]\tQuoting string, default \"> \"\n"
-msgstr ""
+msgstr " -Q [str]\t--quotestr [str]\t ,   \"> \"\n"
 
 #: nano.c:448
 msgid " -S\t\t--smooth\t\tSmooth scrolling\n"
@@ -763,10 +734,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:482
-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:486
 msgid " -s [prog] \t--speller=[prog]\tEnable alternate speller\n"
@@ -828,7 +797,7 @@ msgstr " -M \t\t
 
 #: nano.c:516
 msgid " -Q [str] \tQuoting string, default \"> \"\n"
-msgstr ""
+msgstr " -Q [str] \t ,   \"> \"\n"
 
 #: nano.c:518
 msgid " -R\t\tUse regular expressions for search\n"
@@ -1012,31 +981,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"
-" 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 "
-"perform 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 perform 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"
+" Ħ   ̦ ˦  ,  Φ Enter.   ϧ    צצ ¦,  ͦ     ¦.\n"
 "\n"
-"    Pico   æ -p  --pico,   "
-"¦æ Meta-P,    nanorc,   ¦ "
-"'    Ц  \":\".  Enter "
-"  -     ϧ  "
-"¦. ,       ͦ  "
-"           Enter.\n"
+"    Pico   æ -p  --pico,   ¦æ Meta-P,    nanorc,   ¦ '    Ц  \":\".  Enter   -     ϧ  ¦. ,       ͦ      צ       Enter.\n"
 "\n"
 " Φ æΦ צۦ Φ  ͦ :\n"
 "\n"
@@ -1045,107 +1001,76 @@ msgstr ""
 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"
+" Ħ       Ħ  Φ Enter.  ˦˦ ˦  ̦      ,    Φ  .\n"
 "\n"
-" Φ æΦ צ Φ  ͦ _:\n"
+" Φ æΦ צۦ Φ  ͦ _:\n"
 "\n"
 
 #: nano.c:2511
-#, fuzzy
 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 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 using 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, just press Enter at the prompt without "
-"typing in a filename, or type in a nonexistent filename at the prompt and "
-"press Enter.\n"
+" If you need another blank buffer, just press Enter at the prompt without typing in a 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"
 "\n"
-"   nano ڦ  Ц ˦  Ҧ,   "
-"צ צ  æ   -F  --multibuffer,  "
-" ¦æ Meta-F,     nanorc,    "
-"   ( Meta-<  >   ͦ "
-").\n"
+"   Ҧ   ,  ͦ Enter      Φ ,  ۦ ' Ŧ   Φ Enter.\n"
 "\n"
-" Φ æΦ צ Φ  ͦ  :\n"
+" Φ æΦ צۦ Φ  ͦ  :\n"
 "\n"
 
 #: nano.c:2525
 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"
+" Ħ ' Ц        Φ Enter.\n"
 "\n"
-"   դ  צͦ  Ctrl-^  ͦ  , "
-"'   Ц,       .  "
-"        , ' "
-"    '     ͦ.\n"
+"   դ  צͦ  Ctrl-^  ͦ  , '   Ц,       .          , '     '     ͦ.\n"
 "\n"
-" Φ æΦ צ Φ  ͦ  \n"
+" Φ æΦ צۦ Φ  ͦ  \n"
 "\n"
 
 #: nano.c:2537
 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"
+"  ̦ դ  צ  ͦ Ҧ   Ҧ     .    צ    PageUp/PageDown   Ҧ ,   Ҧ     ϧ Ҧ צ S  Enter.  ͦ  Ҧ , Ҧ Ҧ \"..\"    ̦.\n"
 "\n"
-" Φ æΦ צ Φ  ͦ  ̦:\n"
+" Φ æΦ צۦ Φ  ͦ  ̦:\n"
 "\n"
 
 #: nano.c:2548
@@ -1154,38 +1079,28 @@ 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"
+"  tab-  ,    צ TAB  ()   ' Ҧ. Φ æΦ צۦ Φ  ͦ  ̦ _Ҧ:\n"
 "\n"
 
 #: nano.c:2556
 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"
@@ -1265,8 +1180,8 @@ msgid ""
 "\"white\", \"yellow\", \"cyan\", \"magenta\" and \n"
 "\"black\", with the optional prefix \"bright\".\n"
 msgstr ""
-" %s  ͦ.\n"
-"Φ  - \"green\", \"red\", \"blue\", \n"
+"̦ %s  ͦ.\n"
+"Φ  - \"green\", \"red\", \"blue\", \n"
 "\"white\", \"yellow\", \"cyan\", \"magenta\"  \n"
 "\"black\",  æ Ʀ \"bright\".\n"
 
@@ -1276,8 +1191,7 @@ msgstr "
 
 #: rcfile.c:226 rcfile.c:280
 msgid "regex strings must begin and end with a \" character\n"
-msgstr ""
-"  ڦ Φ   ˦  '\"'\n"
+msgstr "  ڦ Φ   ˦  '\"'\n"
 
 #: rcfile.c:272
 msgid ""
@@ -1528,9 +1442,9 @@ msgid "do_cursorpos: linepct = %f, bytepct = %f\n"
 msgstr "do_cursorpos: linepct = %f, bytepct = %f\n"
 
 #: winio.c:1639
-#, fuzzy, c-format
+#, c-format
 msgid "line %d/%d (%.0f%%), col %ld/%ld (%.0f%%), char %ld/%ld (%.0f%%)"
-msgstr " %d  %d (%.0f%%), ̦ %ld  %ld (%.0f%%)"
+msgstr " %d/%d (%.0f%%),  %ld/%ld (%.0f%%, ̦ %ld/%ld (%.0f%%)"
 
 #: winio.c:1800
 msgid "Dumping file buffer to stderr...\n"