diff --git a/ChangeLog b/ChangeLog index 18a40da43d..0c6b6752f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-01-03 Jean-Marc Lasgouttes + + * Makefile.am (EXTRA_DIST): add autogen.sh + +2001-01-03 Miyata Shigeru + + * development/OS2/quick_fix.patch: + * lib/configure.cmd: update OS/2 support files. + 2001-01-02 Juergen Vigna * src/insets/insettabular.C (pasteSelection): rewritten correctly. diff --git a/Makefile.am b/Makefile.am index 2f016bb9c0..164a9468ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \ SUBDIRS = intl po sigc++ boost src lib EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \ - UPGRADING lyx.man acconfig.h \ + UPGRADING lyx.man acconfig.h autogen.sh \ config development forms images ETAGS_ARGS = --lang=c++ man_MANS = lyx.1 diff --git a/development/OS2/quick_fix.patch b/development/OS2/quick_fix.patch index 298fd99b4c..9814f0c52c 100644 --- a/development/OS2/quick_fix.patch +++ b/development/OS2/quick_fix.patch @@ -4,7 +4,7 @@ RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/progtest.m4,v retrieving revision 1.2 diff -u -r1.2 progtest.m4 --- lyx-devel/config/progtest.m4 2000/01/08 21:02:55 1.2 -+++ lyx-devel/config/progtest.m4 2000/11/12 08:09:08 ++++ lyx-devel/config/progtest.m4 2001/01/01 01:09:00 @@ -11,6 +11,19 @@ dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) @@ -43,10 +43,10 @@ diff -u -r1.2 progtest.m4 Index: lyx-devel/lib/configure.m4 =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/configure.m4,v -retrieving revision 1.15 -diff -u -r1.15 configure.m4 ---- lyx-devel/lib/configure.m4 2000/11/07 12:07:13 1.15 -+++ lyx-devel/lib/configure.m4 2000/11/12 08:09:13 +retrieving revision 1.17 +diff -u -r1.17 configure.m4 +--- lyx-devel/lib/configure.m4 2000/11/21 15:45:42 1.17 ++++ lyx-devel/lib/configure.m4 2001/01/01 01:09:05 @@ -28,6 +28,19 @@ dnl define(SEARCH_PROG,[dnl @@ -100,14 +100,14 @@ diff -u -r1.15 configure.m4 +PATH=${PATH}${PATH_IFS}./reLyX/ SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX) PATH=${save_PATH} - test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$FName" + test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i" Index: lyx-devel/lib/reLyX/acinclude.m4 =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/acinclude.m4,v retrieving revision 1.2 diff -u -r1.2 acinclude.m4 --- lyx-devel/lib/reLyX/acinclude.m4 2000/11/07 12:07:13 1.2 -+++ lyx-devel/lib/reLyX/acinclude.m4 2000/11/12 08:09:15 ++++ lyx-devel/lib/reLyX/acinclude.m4 2001/01/01 01:09:06 @@ -10,15 +10,24 @@ dnl RELYX_SEARCH_PROG(VARIABLE-NAME,PROGRAMS-LIST,ACTION-IF-FOUND) dnl @@ -141,7 +141,7 @@ RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/configure.in,v retrieving revision 1.8 diff -u -r1.8 configure.in --- lyx-devel/lib/reLyX/configure.in 2000/06/26 15:33:12 1.8 -+++ lyx-devel/lib/reLyX/configure.in 2000/11/12 08:09:15 ++++ lyx-devel/lib/reLyX/configure.in 2001/01/01 01:09:06 @@ -2,6 +2,7 @@ AC_INIT(reLyX.in) AC_PREREQ(2.13) dnl We want to use autoconf 2.13 @@ -150,44 +150,13 @@ diff -u -r1.8 configure.in dnl PACKAGE=reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX -Index: lyx-devel/src/lyx_cb.C -=================================================================== -RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_cb.C,v -retrieving revision 1.128 -diff -u -r1.128 lyx_cb.C ---- lyx-devel/src/lyx_cb.C 2000/11/10 17:29:45 1.128 -+++ lyx-devel/src/lyx_cb.C 2000/11/12 08:09:18 -@@ -321,6 +321,7 @@ - #if 0 - void MenuFax(Buffer * buffer) - { -+#ifndef __EMX__ - // Generate postscript file - if (!Exporter::Export(buffer, "ps", true)) - return; -@@ -328,6 +329,15 @@ - // Send fax - string const ps = OnlyFilename(ChangeExtension(buffer->fileName(), - ".ps")); -+#else -+ // Generate tiff file -+ if (!Exporter::Export(buffer, "tiff", true)) -+ return; -+ -+ // Send fax -+ string const ps = OnlyFilename(ChangeExtension(buffer->fileName(), -+ ".tif")); -+#endif - - string path = OnlyPath (buffer->fileName()); - if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) { Index: lyx-devel/src/os2_defines.h =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/os2_defines.h,v retrieving revision 1.5 diff -u -r1.5 os2_defines.h --- lyx-devel/src/os2_defines.h 2000/11/08 09:39:44 1.5 -+++ lyx-devel/src/os2_defines.h 2000/11/12 08:09:18 ++++ lyx-devel/src/os2_defines.h 2001/01/01 01:09:07 @@ -13,16 +13,22 @@ #ifndef OS2_DEFINES_H #define OS2_DEFINES_H @@ -216,10 +185,10 @@ diff -u -r1.5 os2_defines.h Index: lyx-devel/src/support/rename.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/rename.C,v -retrieving revision 1.4 -diff -u -r1.4 rename.C ---- lyx-devel/src/support/rename.C 2000/11/06 11:20:22 1.4 -+++ lyx-devel/src/support/rename.C 2000/11/12 08:09:20 +retrieving revision 1.5 +diff -u -r1.5 rename.C +--- lyx-devel/src/support/rename.C 2000/11/13 10:35:02 1.5 ++++ lyx-devel/src/support/rename.C 2001/01/01 01:09:10 @@ -6,6 +6,9 @@ bool lyx::rename(string const & from, string const & to) @@ -228,15 +197,15 @@ diff -u -r1.4 rename.C + ::unlink(to.c_str()); +#endif if (::rename(from.c_str(), to.c_str()) == -1) - return lyx::copy(from, to); - return true; + if (lyx::copy(from, to)) { + lyx::unlink(from); Index: lyx-devel/src/support/syscall.C =================================================================== RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/syscall.C,v retrieving revision 1.18 diff -u -r1.18 syscall.C --- lyx-devel/src/support/syscall.C 2000/10/11 21:06:43 1.18 -+++ lyx-devel/src/support/syscall.C 2000/11/12 08:09:21 ++++ lyx-devel/src/support/syscall.C 2001/01/01 01:09:10 @@ -15,6 +15,7 @@ #include "syscontr.h" #include "support/lstrings.h" @@ -245,3 +214,44 @@ diff -u -r1.18 syscall.C using std::endl; +Index: lyx-devel/src/support/tempname.C +=================================================================== +RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/tempname.C,v +retrieving revision 1.4 +diff -u -r1.4 tempname.C +--- lyx-devel/src/support/tempname.C 2000/11/15 03:22:08 1.4 ++++ lyx-devel/src/support/tempname.C 2001/01/01 01:09:10 +@@ -12,6 +12,17 @@ + + extern string system_tempdir; + ++#ifdef __EMX__ ++ // EMX mkstemp() behaviour may be problematic, however, ++ // as noted by Lgb in the comment to CreateTmpDir(), ++ // there is no point for using mkstemp() here. ++#undef HAVE_MKSTEMP ++#include ++#include ++#define INCL_DOSFILEMGR ++#include ++#endif ++ + static inline + int make_tempfile(char * templ) + { +@@ -19,9 +30,14 @@ + return ::mkstemp(templ); + #else + #ifdef HAVE_MKTEMP ++#ifdef __EMX__ ++ ULONG cur = 0; ++ LONG req = 1; ++ DosSetRelMaxFH(&req, &cur); // No need to check error code. ++#endif + // This probably just barely works... + ::mktemp(templ); +- return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); ++ return ::open(templ, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); + #else + #warning FIX FIX FIX + #endif diff --git a/lib/configure.cmd b/lib/configure.cmd index f51beddcbf..ee9c95ad45 100755 --- a/lib/configure.cmd +++ b/lib/configure.cmd @@ -58,31 +58,32 @@ end curdir=translate(curdir,'/','\') srcdir=translate(srcdir,'/','\') A_.0=0 -call SEARCH_PROG 'converter latex dvi%latex|latex2e%"latex,disable=linuxdoc&docbook"' -call SEARCH_PROG 'converter latex pdf%pdflatex|pdflatex2e%"latex,disable=linuxdoc&docbook"' -call SEARCH_PROG 'converter latex html%tth -t -e2 -L$$BaseName < $$FName > $$OutName|latex2html -no_subdir -split 0 -show_section_numbers $$FName|hevea -s $$FName%"originaldir,needaux,disable=linuxdoc&docbook"' -call SEARCH_PROG 'converter literate latex%noweave -delay -index $$FName > $$OutName%""' -call SEARCH_PROG 'converter dvi ps%dvips -o $$OutName $$FName%""' -call SEARCH_PROG 'converter ps pdf%ps2pdf $$FName%""' -call SEARCH_PROG 'converter ps tiff%gs -sDEVICE=tiffg3 -sOutputFile=$$OutName -dNOPAUSE $$FName -c quit|gsos2 -sDEVICE=tiffg3 -sOutputFile=$$OutName -dNOPAUSE $$FName -c quit%""' -call SEARCH_PROG 'converter linuxdoc lyx%sgml2lyx $$FName%""' -call SEARCH_PROG 'converter linuxdoc latex%sgml2latex $$FName%""' -call SEARCH_PROG 'converter linuxdoc dvi%sgml2latex -o dvi $$FName%""' -call SEARCH_PROG 'converter linuxdoc html%sgml2html $$FName%""' -call SEARCH_PROG 'converter docbook dvi%sgmltools -b dvi $$FName|db2dvi $$FName%""' -call SEARCH_PROG 'converter docbook html%sgmltools -b html $$FName|db2html $$FName%""' +call SEARCH_PROG 'converter latex dvi%latex $$i|latex2e $$i%"latex"' +call SEARCH_PROG 'converter latex pdf2%pdflatex $$i|pdflatex2e $$i%"latex"' +call SEARCH_PROG 'converter latex html%tth -t -e2 -L$$BaseName < $$i > $$o|latex2html -no_subdir -split 0 -show_section_numbers $$i|hevea -s $$i%"originaldir,needaux"' +call SEARCH_PROG 'converter literate latex%noweave -delay -index $$i > $$o%""' +call SEARCH_PROG 'converter dvi ps%dvips -o $$o $$i%""' +call SEARCH_PROG 'converter ps pdf%ps2pdf $$i%""' +call SEARCH_PROG 'converter ps fax%ksendfax $$i%""' +/* call SEARCH_PROG 'converter ps tiff%gs -sDEVICE=tiffg3 -sOutputFile=$$o -dNOPAUSE $$i -c quit|gsos2 -sDEVICE=tiffg3 -sOutputFile=$$o -dNOPAUSE $$i -c quit%""' */ +call SEARCH_PROG 'converter linuxdoc lyx%sgml2lyx $$i%""' +call SEARCH_PROG 'converter linuxdoc latex%sgml2latex $$i%""' +call SEARCH_PROG 'converter linuxdoc dvi%sgml2latex -o dvi $$i%""' +call SEARCH_PROG 'converter linuxdoc html%sgml2html $$i%""' +call SEARCH_PROG 'converter docbook dvi%sgmltools -b dvi $$i|db2dvi $$i%""' +call SEARCH_PROG 'converter docbook html%sgmltools -b html $$i|db2html $$i%""' A_.0=A_.0+1;i=A_.0 A_.i='' -call SEARCH_PROG 'converter latex lyx%reLyX -f $$FName%"importer"' -call SEARCH_PROG 'converter literate lyx%noweb2lyx $$FName $$OutName%"importer"' -call SEARCH_PROG 'converter html latex%html2latex $$FName%"importer"' -call SEARCH_PROG 'converter word latex%wvCleanLatex $$FName $$OutName|word2x -f latex $$FName%"importer"' +call SEARCH_PROG 'converter latex lyx%reLyX -f $$i%""' +call SEARCH_PROG 'converter literate lyx%noweb2lyx $$i $$o%""' +call SEARCH_PROG 'converter html latex%html2latex $$i%""' +call SEARCH_PROG 'converter word latex%wvCleanLatex $$i $$o|word2x -f latex $$i%""' A_.0=A_.0+1;i=A_.0 A_.i='' -call SEARCH_PROG 'converter gif eps%convert $$FName $$OutName%""' -call SEARCH_PROG 'converter png eps%convert $$FName $$OutName%""' -call SEARCH_PROG 'converter jpg eps%convert $$FName $$OutName%""' -call SEARCH_PROG 'converter gif png%convert $$FName $$OutName%""' +call SEARCH_PROG 'converter gif eps%convert $$i $$o%""' +call SEARCH_PROG 'converter png eps%convert $$i $$o%""' +call SEARCH_PROG 'converter jpg eps%convert $$i $$o%""' +call SEARCH_PROG 'converter gif png%convert $$i $$o%""' A_.0=A_.0+1;i=A_.0 A_.i='' call SEARCH_PROG 'viewer dvi%xdvi' @@ -93,10 +94,10 @@ call SEARCH_PROG 'viewer eps%gv|ghostview|gvpm' A_.0=A_.0+1;i=A_.0 A_.i='' call SEARCH_PROG 'ps_command%gs|gsos2' -call SEARCH_PROG 'ascii_roff_command%groff -t -Tlatin1 $$FName' +call SEARCH_PROG 'ascii_roff_command%groff -t -Tlatin1 $$i' call SEARCH_PROG 'chktex_command%chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38' call SEARCH_PROG 'spell_command%ispell' -/* call SEARCH_PROG 'fax_command%fsend -p$$Phone -i$$FName -d$$Name -m$$Comment' */ +/* call SEARCH_PROG 'fax_command%fsend -p$$Phone -i$$i -d$$Name -m$$Comment' */ call SEARCH_PROG 'print_spool_command%lp|lpr' i=A_.0;A_.0=A_.0+1 if pos('lpr',A_.i)>0 then @@ -174,11 +175,11 @@ do # It contains only default values, since chkconfig.ltx could not be run # for some reason. Run ./configure if you need to update it after a # configuration change. -article article article -report report report -book book book -linuxdoc linuxdoc linuxdoc -letter letter letter +"article" "article" "article" +"report" "report" "report" +"book" "book" "book" +"linuxdoc" "linuxdoc" "linuxdoc" +"letter" "letter" "letter" EOF */ call WRITE_FILE 'textclass.lst' '$TextClass' rc=lineout('chkconfig.sed','s/@.*@/???/g') @@ -227,18 +228,26 @@ rc=SysFileDelete(X11ROOT'\XFree86\bin\fsend2.cmd') # want to customize LyX, make a copy of the file LYXDIR/lyxrc as # ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will # override the values given here. -\Format latex tex LaTeX L -\Format dvi dvi DVI D -\Format ps ps Postscript t -\Format pdf pdf PDF P -\Format html html HTML H -\Format text txt ASCII A -\Format word doc Word W -\Format literate nw NoWeb N -\Format linuxdoc sgml LinuxDoc x -\Format docbook sgml DocBook B -\Format program "" Program "" -\Format fax "" Fax "" +\Format text txt ASCII A +\Format textparagraph txt ASCII(paragraphs) "" +\Format docbook sgml DocBook B +\Format dvi dvi DVI D +\Format eps eps EPS "" +\Format fax "" Fax "" +\Format gif gif GIF "" +\Format html html HTML H +\Format jpg jpg JPEG "" +\Format latex tex LaTeX L +\Format linuxdoc sgml LinuxDoc x +\Format lyx lyx LyX "" +\Format literate nw NoWeb N +\Format pdf pdf PDF P +\Format pdf2 pdf "PDF (pdflatex)" F +\Format png png PNG "" +\Format ps ps Postscript t +\Format program "" Program "" +\Format word doc Word W + EOF */ call WRITE_FILE lyxrc_defaults '$LyXRC_Default' diff --git a/po/ChangeLog b/po/ChangeLog index 484830a6ff..fbcbc94516 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2001-01-03 Jean-Marc Lasgouttes + + * sl.po: update from Roman Maurer + 2000-12-27 Jean-Marc Lasgouttes * ro.po: update from Claudiu Costin diff --git a/po/sl.po b/po/sl.po index 28a59bfbfb..c4e67af2be 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,13 +1,13 @@ # Slovenski prevodi menujev za LyX. -# Copyright (C) 2000, The LyX team. -# Roman Maurer , 2000. -# $Id: sl.po,v 1.34 2000/12/29 22:17:50 larsbj Exp $ +# Copyright (C) 2001, The LyX team. +# Roman Maurer , 2001. +# $Id: sl.po,v 1.35 2001/01/03 15:14:46 lasgouttes Exp $ # msgid "" msgstr "" "Project-Id-Version: LyX 1.1.5\n" "POT-Creation-Date: 2000-12-29 22:25+0100\n" -"PO-Revision-Date: 2000-06-19 23:00+0200\n" +"PO-Revision-Date: 2001-01-01 11:00+0200\n" "Last-Translator: Roman Maurer \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" @@ -47,12 +47,12 @@ msgstr "-- zamenjana privzeta vrednost" #: src/buffer.C:1059 #, fuzzy, c-format msgid "Warning: need lyxformat %.2f but found %.2f" -msgstr "Pozor: potreben format LyXa %.2f, a najden %.2f\n" +msgstr "Pozor: potreben format LyXa %.2f, a najden %.2f" #: src/buffer.C:1063 #, fuzzy, c-format msgid "ERROR: need lyxformat %.2f but found %.2f" -msgstr "NAPAKA: potreben format LyXa %.2f, a najden %.2f\n" +msgstr "NAPAKA: potreben format LyXa %.2f, a najden %.2f" #: src/buffer.C:1074 msgid "Warning!" @@ -146,9 +146,9 @@ msgid "Exit anyway?" msgstr "Želite vseeno izstopiti?" #: src/bufferlist.C:289 -#, fuzzy, c-format +#, c-format msgid "lyx: Attempting to save document %s as..." -msgstr "lyx: Skuša se shraniti spis " +msgstr "lyx: Skuša se shraniti spis %s kot..." #: src/bufferlist.C:302 src/bufferlist.C:315 src/bufferlist.C:329 msgid " Save seems successful. Phew." @@ -283,7 +283,7 @@ msgstr "Vstavljamo opombo ob robu..." #: src/bufferview_funcs.C:100 msgid "Error! unknown language" -msgstr "" +msgstr "Napaka! Neznan jezik" #: src/LyXAction.C:326 src/bufferview_funcs.C:109 msgid "Melt" @@ -311,7 +311,7 @@ msgstr "Enojni" #: src/bufferview_funcs.C:283 msgid "Onehalf" -msgstr "" +msgstr "Polovični" #: src/bufferview_funcs.C:286 msgid "Double" @@ -319,7 +319,7 @@ msgstr "Dvojni" #: src/bufferview_funcs.C:289 msgid "Other (" -msgstr "" +msgstr "Drugi (" #: src/BufferView_pimpl.C:256 msgid "Formatting document..." @@ -335,12 +335,11 @@ msgstr "Opozorilo ChkTeXa #" #: src/ColorHandler.C:83 msgid "LyX: Unknown X11 color " -msgstr "" +msgstr "LyX: Neznana barva v X11 " #: src/ColorHandler.C:84 -#, fuzzy msgid " for " -msgstr " z dne " +msgstr " za " #: src/ColorHandler.C:85 msgid " Using black instead, sorry!." @@ -363,31 +362,28 @@ msgid "LyX: Couldn't allocate '" msgstr "" #: src/ColorHandler.C:140 -#, fuzzy msgid "' for " -msgstr "` po " +msgstr "` za " #: src/ColorHandler.C:141 msgid " with (r,g,b)=(" -msgstr "" +msgstr " z (r,g,b)=(" #: src/ColorHandler.C:144 msgid " Using closest allocated color with (r,g,b)=(" msgstr "" #: src/ColorHandler.C:148 -#, fuzzy msgid ") instead.\n" -msgstr " namesto tega." +msgstr ") namesto tega.\n" #: src/ColorHandler.C:149 msgid "Pixel [" -msgstr "" +msgstr "Pika [" #: src/ColorHandler.C:149 -#, fuzzy msgid "] is used." -msgstr " namesto tega." +msgstr "] se uporablja." #: src/combox.C:502 msgid "Done" @@ -396,7 +392,7 @@ msgstr "Opravljeno" #: src/converter.C:165 src/converter.C:192 #, fuzzy msgid "Can not view file" -msgstr "Ni moč zapisati datoteke" +msgstr "Ni moč pogledati datoteke" #: src/converter.C:166 msgid "No information for viewing " @@ -409,7 +405,7 @@ msgstr "Izvajamo ukaz:" #: src/converter.C:193 #, fuzzy msgid "Error while executing" -msgstr "Napaka med branjem " +msgstr "Napaka med izvajanjem" #: src/converter.C:549 src/converter.C:639 #, fuzzy @@ -423,7 +419,7 @@ msgstr "" #: src/CutAndPaste.C:448 src/CutAndPaste.C:451 src/converter.C:551 #, fuzzy msgid " to " -msgstr " z dne " +msgstr " za " #: src/converter.C:636 msgid "There were errors during the Build process." @@ -436,17 +432,16 @@ msgstr "Morali bi jih poskusiti odpraviti." #: src/converter.C:662 #, fuzzy msgid "Error while trying to move directory:" -msgstr "Napaka! Imenika ni moč odpreti:" +msgstr "Napaka pri poskusu premaknitve imenika:" #: src/converter.C:697 #, fuzzy msgid "Error while trying to move file:" -msgstr "Napaka! Datoteke ni moč odstraniti:" +msgstr "Napaka pri poskusu premaknitve datoteke:" -#: src/converter.C:698 -#, fuzzy +#: src/converter.C:674 msgid "to " -msgstr " z dne " +msgstr "za " #: src/converter.C:777 src/converter.C:847 msgid "One error detected" @@ -460,23 +455,21 @@ msgstr "Morali bi jo poskusiti odpraviti." msgid " errors detected." msgstr " zaznanih napak." -#: src/converter.C:786 -#, fuzzy +#: src/converter.C:763 msgid "There were errors during running of " -msgstr "Med izvajanjem LaTeXa so nastale napake." +msgstr "Nastale so napake med izvajanjem " #: src/converter.C:790 src/converter.C:857 msgid "The operation resulted in" -msgstr "" +msgstr "Rezultat operacije je" -#: src/converter.C:791 src/converter.C:858 -#, fuzzy +#: src/converter.C:768 src/converter.C:835 msgid "an empty file." -msgstr "uvožena." +msgstr "prazna datoteka." #: src/converter.C:792 src/converter.C:859 msgid "Resulting file is empty" -msgstr "" +msgstr "Rezultantna datoteka je prazna" #: src/converter.C:810 msgid "Running LaTeX..." @@ -557,19 +550,16 @@ msgid "Sorry." msgstr "Žal." #: src/debug.C:32 -#, fuzzy msgid "No debugging message" -msgstr "(ni dnevniškega sporočila)" +msgstr "Ni razhroščevalnega sporočila" #: src/debug.C:33 -#, fuzzy msgid "General information" -msgstr "Ni nadaljnjih razveljavitvenih podatkov" +msgstr "Splošni podatki" #: src/debug.C:34 -#, fuzzy msgid "Program initialisation" -msgstr "(ni uvodnega opisa)" +msgstr "Inicializacija programa" #: src/debug.C:35 msgid "Keyboard events handling" @@ -596,23 +586,20 @@ msgid "LaTeX generation/execution" msgstr "" #: src/debug.C:41 -#, fuzzy msgid "Math editor" -msgstr "Način matematičnega urejanja" +msgstr "Matematični urejevalnik" #: src/debug.C:42 msgid "Font handling" msgstr "" #: src/debug.C:43 -#, fuzzy msgid "Textclass files reading" -msgstr "Napaka pri nalaganju besedilnega razreda!" +msgstr "Berejo se datoteke besedilnega razreda" #: src/debug.C:44 -#, fuzzy msgid "Version control" -msgstr "Nadzor različic%t" +msgstr "Nadzor različic" #: src/debug.C:45 msgid "External control interface" @@ -623,23 +610,20 @@ msgid "Keep *roff temporary files" msgstr "" #: src/debug.C:47 -#, fuzzy msgid "User commands" -msgstr "pokončna" +msgstr "Uporabniški ukazi" #: src/debug.C:48 msgid "The LyX Lexxer" msgstr "" #: src/debug.C:49 -#, fuzzy msgid "Dependency information" -msgstr "Okrasek" +msgstr "Podatek o odvisnosti" #: src/debug.C:50 -#, fuzzy msgid "LyX Insets" -msgstr "Stvarno kazalo" +msgstr "Vstavki LyXa" #: src/debug.C:51 msgid "Files used by LyX" @@ -654,153 +638,126 @@ msgid "Debugging `" msgstr "" #: src/exporter.C:47 -#, fuzzy msgid "Can not export file" -msgstr "Datoteke ni moč pretvoriti" +msgstr "Datoteke ni moč izvoziti" #: src/exporter.C:48 msgid "No information for exporting to " msgstr "" #: src/exporter.C:85 -#, fuzzy msgid "Document exported as " -msgstr "Dokument izvožen kot HTML v datoteko ," +msgstr "Dokument izvožen kot " #: src/exporter.C:87 -#, fuzzy msgid " to file `" -msgstr "Datoteka za Noweb " +msgstr " v datoteko ," #: src/MenuBackend.C:436 src/MenuBackend.C:443 src/ext_l10n.h:1 #: src/ext_l10n.h:4 -#, fuzzy msgid "File|F" -msgstr "Datoteko|#D" +msgstr "Datoteka|D" -#: src/MenuBackend.C:437 src/ext_l10n.h:2 src/ext_l10n.h:5 -#, fuzzy +#: src/MenuBackend.C:431 src/ext_l10n.h:2 src/ext_l10n.h:5 msgid "Edit|E" -msgstr "Uredi" +msgstr "Uredi|U" #: src/ext_l10n.h:3 src/ext_l10n.h:11 -#, fuzzy msgid "Help|H" -msgstr "Pomoč" +msgstr "Pomoč|P" #: src/ext_l10n.h:6 -#, fuzzy msgid "Insert|I" -msgstr "Vstavi" +msgstr "Vstavi|V" #: src/ext_l10n.h:7 -#, fuzzy msgid "Layout|L" -msgstr "Videz" +msgstr "Videz|I" #: src/ext_l10n.h:8 -#, fuzzy msgid "View|V" -msgstr "Poglej DVI" +msgstr "Ogled|O" #: src/ext_l10n.h:9 -#, fuzzy msgid "Navigate|N" -msgstr "Negativno|#N" +msgstr "Navigacija|N" -#: src/MenuBackend.C:439 src/ext_l10n.h:10 -#, fuzzy +#: src/MenuBackend.C:433 src/ext_l10n.h:10 msgid "Documents|D" -msgstr "Spisi" +msgstr "Spisi|S" #: src/MenuBackend.C:406 src/ext_l10n.h:12 src/ext_l10n.h:17 msgid "New...|N" -msgstr "" +msgstr "Nov...|N" #: src/ext_l10n.h:13 src/ext_l10n.h:18 -#, fuzzy msgid "New from Template...|T" -msgstr "Nov spis po vzorcu" +msgstr "Nov po vzorcu...|V" -#: src/MenuBackend.C:407 src/ext_l10n.h:14 src/ext_l10n.h:19 -#, fuzzy +#: src/MenuBackend.C:401 src/ext_l10n.h:14 src/ext_l10n.h:19 msgid "Open...|O" -msgstr "Drugo...|#D" +msgstr "Odpri...|O" -#: src/MenuBackend.C:408 src/ext_l10n.h:15 src/ext_l10n.h:25 -#, fuzzy +#: src/MenuBackend.C:402 src/ext_l10n.h:15 src/ext_l10n.h:25 msgid "Import|I" -msgstr "Uvoz%m" +msgstr "Uvoz|U" -#: src/ext_l10n.h:16 src/ext_l10n.h:29 -#, fuzzy +#: src/ext_l10n.h:16 src/ext_l10n.h:30 msgid "Exit|x" -msgstr "Izhod" +msgstr "Izhod|I" #: src/ext_l10n.h:20 -#, fuzzy msgid "Close|C" -msgstr "Zapri" +msgstr "Zapri|Z" #: src/ext_l10n.h:21 -#, fuzzy msgid "Save|S" -msgstr "Shrani" +msgstr "Shrani|S" #: src/ext_l10n.h:22 -#, fuzzy msgid "Save As...|A" -msgstr "Shrani kot" +msgstr "Shrani kot...|K" #: src/ext_l10n.h:23 -#, fuzzy msgid "Revert to Saved|d" -msgstr "Vrni se k shranjenemu" +msgstr "Vrni se k shranjenemu|h" #: src/ext_l10n.h:24 -#, fuzzy msgid "Version Control|V" -msgstr "Nadzor različic%t" +msgstr "Nadzor različic|r" #: src/ext_l10n.h:26 #, fuzzy msgid "Export|E" -msgstr "Izvozi v" - -#: src/ext_l10n.h:27 -#, fuzzy -msgid "Print...|P" -msgstr "Tiskalnik|#T" +msgstr "Izvozi|z" #: src/ext_l10n.h:28 -#, fuzzy -msgid "Fax...|F" -msgstr "Faks št.:|#F" +msgid "Print...|P" +msgstr "Tiskaj...|T" -#: src/ext_l10n.h:30 -#, fuzzy -msgid "Register|R" -msgstr "Prijavi" +#: src/ext_l10n.h:29 +msgid "Fax...|F" +msgstr "Faks...|F" #: src/ext_l10n.h:31 -#, fuzzy -msgid "Check In Changes|I" -msgstr "Zapiši spremembe" +msgid "Register|R" +msgstr "Prijavi|P" #: src/ext_l10n.h:32 -#, fuzzy -msgid "Check Out for Edit|O" -msgstr "Vzemi za urejanje" +msgid "Check In Changes|I" +msgstr "Zapiši spremembe|Z" #: src/ext_l10n.h:33 -#, fuzzy -msgid "Revert to Last Version|L" -msgstr "Vrni zadnjo različico" +msgid "Check Out for Edit|O" +msgstr "Vzemi za urejanje|u" #: src/ext_l10n.h:34 -#, fuzzy +msgid "Revert to Last Version|L" +msgstr "Vrni zadnjo različico|z" + +#: src/ext_l10n.h:35 msgid "Undo Last Check In|U" -msgstr "Razveljavi zadnje spremembe" +msgstr "Razveljavi zadnje spremembe|R" #: src/ext_l10n.h:35 #, fuzzy @@ -811,49 +768,41 @@ msgstr "Prika msgid "Preferences...|P" msgstr "" -#: src/ext_l10n.h:37 src/ext_l10n.h:52 -#, fuzzy +#: src/ext_l10n.h:43 src/ext_l10n.h:57 msgid "Reconfigure|R" -msgstr "Vnovično ukroji" +msgstr "Vnovično ukroji|V" -#: src/ext_l10n.h:38 -#, fuzzy +#: src/ext_l10n.h:44 msgid "Undo|U" -msgstr "Razveljavi" +msgstr "Razveljavi|R" -#: src/ext_l10n.h:39 -#, fuzzy +#: src/ext_l10n.h:45 msgid "Redo|d" -msgstr "Ponovi" +msgstr "Ponovi|o" -#: src/ext_l10n.h:40 -#, fuzzy +#: src/ext_l10n.h:46 msgid "Cut|C" -msgstr "Izreži" +msgstr "Izreži|I" -#: src/ext_l10n.h:41 -#, fuzzy +#: src/ext_l10n.h:47 msgid "Copy|o" -msgstr "Prepiši" +msgstr "Prepiši|P" -#: src/ext_l10n.h:42 -#, fuzzy +#: src/ext_l10n.h:48 msgid "Paste|a" -msgstr "Prilepi" +msgstr "Prilepi|l" #: src/ext_l10n.h:43 msgid "Paste External Selection|x" msgstr "" -#: src/ext_l10n.h:44 -#, fuzzy +#: src/ext_l10n.h:50 msgid "Find & Replace...|F" -msgstr "Poišči in zamenjaj" +msgstr "Poišči in zamenjaj...|P" -#: src/ext_l10n.h:45 -#, fuzzy +#: src/ext_l10n.h:51 msgid "Tabular|T" -msgstr "Načrt tabele" +msgstr "" #: src/ext_l10n.h:46 msgid "Floats & Insets|I" @@ -867,37 +816,31 @@ msgstr "Matemati #: src/ext_l10n.h:48 #, fuzzy msgid "Spellchecker...|S" -msgstr "Črkovalnik" - -#: src/ext_l10n.h:49 -#, fuzzy -msgid "Check TeX|h" -msgstr "Preveri TeX" - -#: src/ext_l10n.h:50 -#, fuzzy -msgid "Remove All Error Boxes|E" -msgstr "Odstrani vse škatle z napakami" - -#: src/ext_l10n.h:53 -#, fuzzy -msgid "as Lines|L" -msgstr "Črte" +msgstr "Črkovalnik...|k" #: src/ext_l10n.h:54 -#, fuzzy -msgid "as Paragraphs|P" -msgstr "Zamaknjen odstavek|#I" +msgid "Check TeX|h" +msgstr "Preveri TeX|T" #: src/ext_l10n.h:55 -#, fuzzy -msgid "Open/Close|O" -msgstr "Odpri/Zapri..." +msgid "Remove All Error Boxes|E" +msgstr "Odstrani vse škatle z napakami|O" -#: src/ext_l10n.h:56 -#, fuzzy +#: src/ext_l10n.h:58 +msgid "as Lines|L" +msgstr "kot črte|k" + +#: src/ext_l10n.h:59 +msgid "as Paragraphs|P" +msgstr "kot odstavke|o" + +#: src/ext_l10n.h:60 +msgid "Open/Close|O" +msgstr "Odpri/Zapri|O" + +#: src/ext_l10n.h:61 msgid "Melt|M" -msgstr "Stopi" +msgstr "Stopi|S" #: src/ext_l10n.h:57 msgid "Open All Figures/Tables|F" @@ -907,88 +850,73 @@ msgstr "" msgid "Close All Figures/Tables|T" msgstr "" -#: src/ext_l10n.h:59 -#, fuzzy +#: src/ext_l10n.h:64 msgid "Open All Footnotes/Marginal Notes|A" -msgstr "Odprta zabeležka" +msgstr "" #: src/ext_l10n.h:60 msgid "Close All Footnotes/Marginal Notes|C" msgstr "" -#: src/ext_l10n.h:61 -#, fuzzy -msgid "Multicolumn|M" -msgstr "Večstolpčna|#M" - -#: src/ext_l10n.h:62 -#, fuzzy -msgid "Line Top|T" -msgstr "Črta zgoraj" - -#: src/ext_l10n.h:63 -#, fuzzy -msgid "Line Bottom|B" -msgstr "Črta spodaj" - -#: src/ext_l10n.h:64 -#, fuzzy -msgid "Line Left|L" -msgstr "Levo|#L" - -#: src/ext_l10n.h:65 -#, fuzzy -msgid "Line Right|R" -msgstr "Desno|#R" - #: src/ext_l10n.h:66 -#, fuzzy -msgid "Align Left|e" -msgstr "Poravnaj levo" +msgid "Multicolumn|M" +msgstr "Večstolpčna|s" #: src/ext_l10n.h:67 -#, fuzzy -msgid "Align Center|C" -msgstr "Poravnava" +msgid "Line Top|T" +msgstr "Črta zgoraj|z" #: src/ext_l10n.h:68 -#, fuzzy +msgid "Line Bottom|B" +msgstr "Črta spodaj|s" + +#: src/ext_l10n.h:69 +msgid "Line Left|L" +msgstr "Črta levo|l" + +#: src/ext_l10n.h:70 +msgid "Line Right|R" +msgstr "Črta desno|d" + +#: src/ext_l10n.h:71 +msgid "Align Left|e" +msgstr "Poravnaj levo|e" + +#: src/ext_l10n.h:72 +msgid "Align Center|C" +msgstr "Usredini|U" + +#: src/ext_l10n.h:73 msgid "Align Right|i" -msgstr "Poravnaj desno" +msgstr "Poravnaj desno|d" #: src/ext_l10n.h:69 msgid "V.Align Top|o" msgstr "" -#: src/ext_l10n.h:70 -#, fuzzy -msgid "V.Align Center|n" -msgstr "Centriraj" - -#: src/ext_l10n.h:71 -#, fuzzy -msgid "V.Align Bottom|V" -msgstr "Črta spodaj" - -#: src/ext_l10n.h:72 -#, fuzzy -msgid "Append Row|A" -msgstr "Dodaj vrsto|#p" - -#: src/ext_l10n.h:73 -#, fuzzy -msgid "Append Column|u" -msgstr "Dodaj stolpec|#A" - -#: src/ext_l10n.h:74 -#, fuzzy -msgid "Delete Row|w" -msgstr "Odstrani vrsto|#w" - #: src/ext_l10n.h:75 -#, fuzzy +msgid "V.Align Center|n" +msgstr "" + +#: src/ext_l10n.h:76 +msgid "V.Align Bottom|V" +msgstr "" + +#: src/ext_l10n.h:77 +msgid "Append Row|A" +msgstr "Dodaj vrsto|D" + +#: src/ext_l10n.h:78 +msgid "Append Column|u" +msgstr "Dodaj stolpec|o" + +#: src/ext_l10n.h:79 +msgid "Delete Row|w" +msgstr "Odstrani vrsto|d" + +#: src/ext_l10n.h:80 msgid "Delete Column|D" -msgstr "Odstrani stolpec|#O" +msgstr "Odstrani stolpec|r" #: src/ext_l10n.h:76 msgid "Math Formula|h" @@ -1002,51 +930,43 @@ msgstr "Prika #: src/ext_l10n.h:78 #, fuzzy msgid "Special Character|S" -msgstr "Posebno:|#S" +msgstr "" -#: src/ext_l10n.h:79 -#, fuzzy +#: src/ext_l10n.h:85 msgid "Citation Reference...|C" -msgstr "Pojdi na referenco|#G" +msgstr "" -#: src/ext_l10n.h:80 -#, fuzzy +#: src/ext_l10n.h:86 msgid "Cross Reference...|R" -msgstr "Vstavi navzkrižno referenco" +msgstr "Navzkrižni sklic...|s" -#: src/ext_l10n.h:81 -#, fuzzy +#: src/ext_l10n.h:87 msgid "Label...|L" -msgstr "Oznaka:|#z" +msgstr "Oznaka...|z" -#: src/ext_l10n.h:82 -#, fuzzy +#: src/ext_l10n.h:88 msgid "Footnote|F" -msgstr "Vstavi opombo pod črto" +msgstr "Opombo pod črto|p" -#: src/ext_l10n.h:83 -#, fuzzy +#: src/ext_l10n.h:89 msgid "Marginal Note|M" -msgstr "Vstavi opombo ob robu" +msgstr "Opomba ob robu|r" -#: src/ext_l10n.h:84 -#, fuzzy +#: src/ext_l10n.h:90 msgid "Index Entry...|I" -msgstr "Zamik" +msgstr "" #: src/ext_l10n.h:85 msgid "Index Entry of Preceeding Word|W" msgstr "" -#: src/ext_l10n.h:86 -#, fuzzy +#: src/ext_l10n.h:92 msgid "URL...|U" -msgstr "URL..." +msgstr "URL...|U" -#: src/ext_l10n.h:87 -#, fuzzy +#: src/ext_l10n.h:93 msgid "Note...|N" -msgstr "drugo..." +msgstr "" #: src/ext_l10n.h:88 msgid "Lists & TOC|O" @@ -1055,17 +975,15 @@ msgstr "" #: src/ext_l10n.h:89 #, fuzzy msgid "Figure...|g" -msgstr "Slika" +msgstr "Slika...|S" -#: src/ext_l10n.h:90 -#, fuzzy +#: src/ext_l10n.h:95 msgid "Tabular...|b" -msgstr "Načrt tabele" +msgstr "Tabela...|T" -#: src/ext_l10n.h:91 -#, fuzzy +#: src/ext_l10n.h:96 msgid "Floats|a" -msgstr "Floatflt|#F" +msgstr "Plovke|P" #: src/ext_l10n.h:92 #, fuzzy @@ -1081,42 +999,37 @@ msgstr "Vstavi sliko" msgid "External Material...|x" msgstr "" -#: src/ext_l10n.h:95 -#, fuzzy +#: src/ext_l10n.h:98 msgid "Superscript|S" -msgstr "Postscript|#P" +msgstr "Eksponent|E" -#: src/ext_l10n.h:96 -#, fuzzy +#: src/ext_l10n.h:99 msgid "Subscript|u" -msgstr "Postscript|#P" +msgstr "Indeks|I" #: src/ext_l10n.h:97 msgid "HFill|H" -msgstr "" +msgstr "HFill|H" -#: src/ext_l10n.h:98 -#, fuzzy +#: src/ext_l10n.h:101 msgid "Hyphenation Point|P" -msgstr "Vstavi mesto delitve" +msgstr "Mesto delitve|M" #: src/ext_l10n.h:99 msgid "Protected Blank|B" msgstr "" -#: src/ext_l10n.h:100 -#, fuzzy +#: src/ext_l10n.h:103 msgid "Linebreak|L" -msgstr "Prelomi vrstic|#N" +msgstr "Prelom vrstice|P" #: src/ext_l10n.h:101 msgid "Ellipsis|i" -msgstr "" +msgstr "Tropičje|T" -#: src/ext_l10n.h:102 -#, fuzzy +#: src/ext_l10n.h:105 msgid "End of Sentence|E" -msgstr "Vstavi piko za konec stavka" +msgstr "Konec stavka|K" #: src/ext_l10n.h:103 msgid "Ordinary Quote|Q" @@ -9155,52 +9068,12 @@ msgstr "Opombe ob robu ni mo msgid "Float would include float!" msgstr "Plovka bi zajemala plovko!" -#, fuzzy -#~ msgid "Insert|r" -#~ msgstr "Vstavi" - -#, fuzzy -#~ msgid "File...|F" -#~ msgstr "Datoteko|#D" - -#, fuzzy -#~ msgid "Math Text|T" -#~ msgstr "Matematični način" - -#, fuzzy -#~ msgid "Math Display|D" -#~ msgstr "Zaslon" - -#, fuzzy -#~ msgid "Math Panel...|P" -#~ msgstr "Matematična plošča" - -#, fuzzy -#~ msgid "Math units" -#~ msgstr "Matthias" - -#, fuzzy -#~ msgid "Name database|#N" -#~ msgstr "Ime|#N" - -#, fuzzy -#~ msgid "Usage" -#~ msgstr "Stran: " - #~ msgid "Unable to show log file!" #~ msgstr "Datoteke z dnevnikom ni moč prikazati!" #~ msgid "NO LATEX LOG FILE!" #~ msgstr "NI DNEVNIKA LATEXA!" -#, fuzzy -#~ msgid "ert" -#~ msgstr "Vstavi" - -#, fuzzy -#~ msgid "Open Insert Tabular Dialog" -#~ msgstr "Odprt vstavek" - #~ msgid "Fax no.:|#F" #~ msgstr "Faks št.:|#F"