From 87c5afa707ff1dcdc85aee6091d68ee8c719de64 Mon Sep 17 00:00:00 2001 From: Frans Schreuder Date: Wed, 8 Aug 2012 14:28:03 +0200 Subject: [PATCH] resolved conflicts --- ChangeLog | 3 - NEWS | 14 - README | 16 - RELEASE | 12 - autodsp.sh | 4 - configure.ac | 10 - contrib/innosetup/freehdl.iss | 11 - contrib/innosetup/qucs.iss | 11 - qucs-help/ChangeLog | 3 - qucs-help/docs/en/Makefile.am | 8 - qucs-help/docs/en/index.html | 3 - qucs-lib/ChangeLog | 3 - qucs-lib/library/Ideal.lib | 8 - qucs-lib/symbolwidget.cpp | 4 - qucs-transcalc/ChangeLog | 3 - qucs-transcalc/coax.cpp | 8 - qucs-transcalc/rectwaveguide.cpp | 65 - qucs/ChangeLog | 3 - qucs/Makefile.am | 16 - qucs/bitmaps/Makefile.am | 8 - qucs/components/ChangeLog | 3 - qucs/components/Makefile.am | 12 - qucs/components/component.cpp | 3 - qucs/components/components.h | 12 - qucs/components/libcomponents.ap | 8 - qucs/components/mslange.cpp | 4 - qucs/diagrams/graph.cpp | 16 - qucs/dialogs/settingsdialog.cpp | 27 - qucs/dialogs/settingsdialog.h | 6 - qucs/dialogs/simmessage.cpp | 12 +- qucs/dialogs/simmessage.h | 4 - qucs/main.cpp | 6 - qucs/main.h | 3 - qucs/module.cpp | 12 - qucs/paintings/graphictext.cpp | 4 - qucs/qucs.ap | 11 - qucs/qucs.cpp | 83 - qucs/qucs.h | 17 - qucs/qucs_ar.ts | 46 +- qucs/qucs_ca.ts | 34 +- qucs/qucs_cs.ts | 34 +- qucs/qucs_de.ts | 9323 +++--------------------------- qucs/qucs_es.ts | 46 +- qucs/qucs_fr.ts | 46 +- qucs/qucs_he.ts | 34 +- qucs/qucs_hu.ts | 34 +- qucs/qucs_init.cpp | 17 +- qucs/qucs_it.ts | 38 +- qucs/qucs_jp.ts | 34 +- qucs/qucs_kk.ts | 46 +- qucs/qucs_pl.ts | 634 +- qucs/qucs_pt.ts | 40 +- qucs/qucs_ro.ts | 34 +- qucs/qucs_ru.ts | 46 +- qucs/qucs_sv.ts | 34 +- qucs/qucs_tr.ts | 46 +- qucs/qucs_uk.ts | 38 +- qucs/qucsdigi.bat | 8 - qucs/qucsdigilib.bat | 12 - qucs/qucsdoc.cpp | 7 - qucs/qucsdoc.h | 8 - qucs/schematic.cpp | 6 - qucs/schematic_file.cpp | 25 +- qucs/syntax.cpp | 26 - qucs/syntax.h | 3 - qucs/textdoc.cpp | 29 - 66 files changed, 890 insertions(+), 10294 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fd75fe6..ea6cf0e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,8 @@ -<<<<<<< HEAD -======= 2011-03-18 Stefan Jahn * configure.ac: Released version 0.0.16 and bumped up to version 0.0.17. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2009-04-27 Stefan Jahn * qucs-filter-v2: Added preliminary 2nd version of qucs-filter diff --git a/NEWS b/NEWS index 5e79b99c..f85e8866 100644 --- a/NEWS +++ b/NEWS @@ -1,11 +1,7 @@ -- -- NEWS -- -<<<<<<< HEAD --- Copyright (C) 2003-2010 Stefan Jahn -======= -- Copyright (C) 2003-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d -- -- This is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -27,11 +23,6 @@ This file lists user visible changes that were made between releases. For more verbose descriptions of these and internal changes see the ChangeLog files. -<<<<<<< HEAD -Version 0.0.16 --------------- - -======= Version 0.0.17 -------------- @@ -40,7 +31,6 @@ Version 0.0.16 -------------- * implementation of interactive GNU Octave connection ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d * support for C++ code export of symbol drawings associated with Verilog-A files * direct association of symbol drawings to Verilog-HDL, Verilog-A @@ -48,12 +38,8 @@ Version 0.0.16 * added Verilog-HDL and Verilog-A syntax highlighting in text documents * support for pre-compiled VHDL modules and libraries made from user written VHDL code -<<<<<<< HEAD - * new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g -======= * new components: NIGBT, HICUM L2 v2.24, HICUM L0 v1.2g, tunnel diode, ideal coupled transmission line, hybrid, HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d * translation into Kazakh * allow equations in Verilog-HDL and VHDL subcircuits diff --git a/README b/README index 731a801a..ed307b84 100644 --- a/README +++ b/README @@ -1,11 +1,7 @@ -- -- README -- -<<<<<<< HEAD --- Copyright (C) 2003, 2005 Stefan Jahn -======= -- Copyright (C) 2003, 2005, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d -- -- This is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -76,17 +72,6 @@ file INSTALL included in this distribution. Please note: Users of the FreeBSD OS may use a GNU make (probably gmake) to compile and install the package. -<<<<<<< HEAD -Getting the latest CVS snapshot -=============================== - -You can always get the latest Qucs version from our CVS repository. -Please use an official release if you want to work with Qucs. The CVS -version might not even compile. - - $ cvs -z3 -d:pserver:anonymous@qucs.cvs.sourceforge.net:/cvsroot/qucs \ - co qucs -======= Getting the latest SVN snapshot =============================== @@ -95,7 +80,6 @@ Please use an official release if you want to work with Qucs. The SVN version might not even compile. $ svn co https://qucs.svn.sourceforge.net/svnroot/qucs/trunk/qucs ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Press 'Enter' when asked for a password. Run `sh autogen.sh' and `configure' with the appropriate options. Maintainance currently diff --git a/RELEASE b/RELEASE index d24ed344..5c9c7826 100644 --- a/RELEASE +++ b/RELEASE @@ -3,11 +3,7 @@ -- -- release instructions. -- -<<<<<<< HEAD --- Copyright (C) 2004, 2006 Stefan Jahn -======= -- Copyright (C) 2004, 2006, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d -- -- This is free software; you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -42,21 +38,13 @@ Distribution process: command `automake -a -f -c' with latest automake version installed. - Run `make distclean', `sh autogen.sh' and `make all'. - Run `make distcheck'. -<<<<<<< HEAD - - Check this status into CVS and tag it. -======= - Check this status into SVN and tag it. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d * Bump up version. - Add a ChangeLog entry in toplevel directory. - Add new section in NEWS. - Bump up version number in `configure.ac'. -<<<<<<< HEAD - - Check into CVS. -======= - Check into SVN. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d * Distribute the package. - Upload the package to the SourceForge server and add a News item. diff --git a/autodsp.sh b/autodsp.sh index 6b4e8e66..14a709c8 100755 --- a/autodsp.sh +++ b/autodsp.sh @@ -19,11 +19,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, # Boston, MA 02110-1301, USA. # -<<<<<<< HEAD -# $Id: autodsp.sh,v 1.1 2007/02/25 17:04:18 ela Exp $ -======= # $Id$ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # use strict; diff --git a/configure.ac b/configure.ac index edf1fc04..f8cf9496 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -<<<<<<< HEAD -AC_INIT(qucs,0.0.16,qucs-bugs@lists.sourceforge.net) -======= AC_INIT(qucs,0.0.17,qucs-bugs@lists.sourceforge.net) ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d AC_CONFIG_SRCDIR([qucs/qucs.cpp]) AC_CONFIG_HEADERS([config.h]) @@ -270,13 +266,10 @@ DOC_PATH="$prefix/share/qucs/docs/" AC_DEFINE_UNQUOTED([DOCDIR], ["$DOC_PATH"], [Where the documentation files go.]) unset DOC_PATH -<<<<<<< HEAD -======= OCTAVE_PATH="$prefix/share/qucs/octave/" AC_DEFINE_UNQUOTED([OCTAVEDIR], ["$OCTAVE_PATH"], [Where the octave script files go.]) unset OCTAVE_PATH ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d dnl Definitions at top of . AH_TOP([ @@ -323,10 +316,7 @@ AC_CONFIG_FILES([Makefile qucs-attenuator/bitmaps/Makefile qucs/Makefile qucs/bitmaps/Makefile -<<<<<<< HEAD -======= qucs/octave/Makefile ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d qucs/components/Makefile qucs/diagrams/Makefile qucs/paintings/Makefile diff --git a/contrib/innosetup/freehdl.iss b/contrib/innosetup/freehdl.iss index 8eb70389..641debdf 100644 --- a/contrib/innosetup/freehdl.iss +++ b/contrib/innosetup/freehdl.iss @@ -1,11 +1,7 @@ ; ; freehdl.iss - inno Setup script file ; -<<<<<<< HEAD -; Copyright (C) 2006, 2008 Stefan Jahn -======= ; Copyright (C) 2006, 2008, 2009, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d ; ; This is free software; you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by @@ -27,17 +23,10 @@ ; NOTE: additional files: bin/libregex.dll lib/libregex.a ; -<<<<<<< HEAD -#define RELEASE "0.0.7" -#define BASENAME "freehdl" -#define APPNAME "FreeHDL" -#define APPVERNAME "FreeHDL 0.0.7 binary package for Win32" -======= #define RELEASE "0.0.8" #define BASENAME "freehdl" #define APPNAME "FreeHDL" #define APPVERNAME "FreeHDL 0.0.8 binary package for Win32" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #define URL "http://www.freehdl.seul.org" #define TREE "C:\home\freetree" diff --git a/contrib/innosetup/qucs.iss b/contrib/innosetup/qucs.iss index 958f87cb..3840e6fb 100644 --- a/contrib/innosetup/qucs.iss +++ b/contrib/innosetup/qucs.iss @@ -1,11 +1,7 @@ ; ; qucs.iss - inno Setup script file ; -<<<<<<< HEAD -; Copyright (C) 2005, 2006, 2007, 2008 Stefan Jahn -======= ; Copyright (C) 2005-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d ; ; This is free software; you can redistribute it and/or modify ; it under the terms of the GNU General Public License as published by @@ -23,17 +19,10 @@ ; Boston, MA 02110-1301, USA. ; -<<<<<<< HEAD -#define RELEASE "0.0.14" -#define BASENAME "qucs" -#define APPNAME "Qucs" -#define APPVERNAME "Quite Universal Circuit Simulator 0.0.14 binary package for Win32" -======= #define RELEASE "0.0.16" #define BASENAME "qucs" #define APPNAME "Qucs" #define APPVERNAME "Quite Universal Circuit Simulator 0.0.16 binary package for Win32" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #define URL "http://qucs.sourceforge.net" #define TREE "C:\home\qucstree" diff --git a/qucs-help/ChangeLog b/qucs-help/ChangeLog index fdf6e29d..1ff52d3c 100644 --- a/qucs-help/ChangeLog +++ b/qucs-help/ChangeLog @@ -1,11 +1,8 @@ -<<<<<<< HEAD -======= 2011-03-11 Stefan Jahn * docs/en/octave.html: Added short description of Octave interface. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2009-10-08 Stefan Jahn * docs/cs/index.html: Updated Czech translations of internal help diff --git a/qucs-help/docs/en/Makefile.am b/qucs-help/docs/en/Makefile.am index c796cf9f..4e0123ac 100644 --- a/qucs-help/docs/en/Makefile.am +++ b/qucs-help/docs/en/Makefile.am @@ -4,11 +4,7 @@ # # Automake input file. # -<<<<<<< HEAD -# Copyright (C) 2004, 2005, 2006 Stefan Jahn -======= # Copyright (C) 2004, 2005, 2006, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,11 +24,7 @@ HTML = index.html short.html start.html mathfunc.html subcircuit.html \ programs.html internal.html characters.html matching.html start_digi.html \ -<<<<<<< HEAD - start_opt.html -======= start_opt.html octave.html ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d PIC = qucsmain.png paste.png wire.png select.png contab.png subcircuit.png \ qucsdigi.png optimization1.png optimization2.png optimization3.png \ optimization4.png optimization5.png optimization6.png optimization7.png \ diff --git a/qucs-help/docs/en/index.html b/qucs-help/docs/en/index.html index eb1b5cc8..f9116e1b 100755 --- a/qucs-help/docs/en/index.html +++ b/qucs-help/docs/en/index.html @@ -20,10 +20,7 @@ Help Index

Getting Started - Analog Simulation
Getting Started - Digital Simulation
Getting Started - Optimization
-<<<<<<< HEAD -======= Getting Started - Octave Scripts
->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Short Description of Actions
Working with Subcircuits
Short Description of mathematical Functions
diff --git a/qucs-lib/ChangeLog b/qucs-lib/ChangeLog index fcd64edd..a9a3e90a 100644 --- a/qucs-lib/ChangeLog +++ b/qucs-lib/ChangeLog @@ -1,10 +1,7 @@ -<<<<<<< HEAD -======= 2011-03-01 Stefan Jahn * library/Ideal.lib: Fixed HardLimiter and Abs components. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2010-10-23 Stefan Jahn * symbolwidget.cpp (createSymbol): Adjusted symbol for new HICUM diff --git a/qucs-lib/library/Ideal.lib b/qucs-lib/library/Ideal.lib index 1675be98..be9a1680 100644 --- a/qucs-lib/library/Ideal.lib +++ b/qucs-lib/library/Ideal.lib @@ -394,11 +394,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2" -<<<<<<< HEAD - <.PortSym 30 0 3 180> -======= <.PortSym 30 0 2 180> ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -578,11 +574,7 @@ EDD:D1 _net2 gnd gnd _net0 I1="D1.I1" Q1="D1.Q1" I2="D1.I2" Q2="D1.Q2" .Def:End -<<<<<<< HEAD - <.PortSym 30 0 3 180> -======= <.PortSym 30 0 2 180> ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d <.PortSym -30 0 1 0> diff --git a/qucs-lib/symbolwidget.cpp b/qucs-lib/symbolwidget.cpp index 034add70..6f01450a 100644 --- a/qucs-lib/symbolwidget.cpp +++ b/qucs-lib/symbolwidget.cpp @@ -263,11 +263,7 @@ int SymbolWidget::createSymbol(const QString& Lib_, const QString& Comp_) else if(Comp == "hicumL2V2p1" || Comp == "hic2_full" || Comp == "hic0_full" || Comp == "hicumL0V1p2" || Comp == "hicumL2V2p23" || Comp == "hicumL2V2p24" || -<<<<<<< HEAD - Comp == "hicumL0V1p2g") { -======= Comp == "hicumL0V1p2g" || Comp == "hicumL0V1p3") { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // normal bipolar Lines.append(new Line(-10,-15,-10, 15,QPen(QPen::darkBlue,3))); Lines.append(new Line(-30, 0,-10, 0,QPen(QPen::darkBlue,2))); diff --git a/qucs-transcalc/ChangeLog b/qucs-transcalc/ChangeLog index 64637eb6..07b9a4c9 100644 --- a/qucs-transcalc/ChangeLog +++ b/qucs-transcalc/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2011-04-03 Stefan Jahn * rectwaveguide.cpp (analyze): Fixed calculation of Z0 in @@ -10,7 +8,6 @@ * coax.cpp (alphac_coax): Fixed factor of 2 in conductor loss calculation. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2009-05-14 Stefan Jahn * coax.cpp (show_results): Fixed computation of cut-off diff --git a/qucs-transcalc/coax.cpp b/qucs-transcalc/coax.cpp index 2b4b7345..4e8731b6 100644 --- a/qucs-transcalc/coax.cpp +++ b/qucs-transcalc/coax.cpp @@ -3,11 +3,7 @@ * * Copyright (C) 2001 Gopal Narayanan * Copyright (C) 2002 Claudio Girardi -<<<<<<< HEAD - * Copyright (C) 2005, 2006, 2009 Stefan Jahn -======= * Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -104,11 +100,7 @@ double coax::alphac_coax () { double ac, Rs; Rs = sqrt((M_PI * f * mur* MU0)/sigma); -<<<<<<< HEAD - ac = (0.5 * sqrt(er)) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0); -======= ac = sqrt(er) * (((1/din) + (1/dout))/log(dout/din)) * (Rs/ZF0); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d ac = ac * 20.0 / log(10.0); return ac; } diff --git a/qucs-transcalc/rectwaveguide.cpp b/qucs-transcalc/rectwaveguide.cpp index 94370ccb..ea408c0d 100644 --- a/qucs-transcalc/rectwaveguide.cpp +++ b/qucs-transcalc/rectwaveguide.cpp @@ -43,11 +43,7 @@ rectwaveguide::~rectwaveguide() double rectwaveguide::kval () { double kval; -<<<<<<< HEAD - kval = 2. * M_PI * f * sqrt(mur * er)/C0; -======= kval = 2.0 * M_PI * f * sqrt (mur * er) / C0; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return kval; } @@ -58,11 +54,7 @@ double rectwaveguide::kval () double rectwaveguide::kc (int m, int n) { double kcval; -<<<<<<< HEAD - kcval = sqrt(pow((m*M_PI/a),2.0) + pow((n*M_PI/b),2.0)); -======= kcval = sqrt (pow ((m * M_PI / a), 2.0) + pow ((n * M_PI / b), 2.0)); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return kcval; } @@ -73,11 +65,7 @@ double rectwaveguide::kc (int m, int n) double rectwaveguide::fc (int m, int n) { double fcval; -<<<<<<< HEAD - fcval = (kc(m, n) * C0)/ (2 * M_PI * sqrt(mur * er)); -======= fcval = kc (m, n) * C0 / (2.0 * M_PI * sqrt (mur * er)); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return fcval; } @@ -91,17 +79,10 @@ double rectwaveguide::alphac () double ac; short m, n, mmax, nmax; -<<<<<<< HEAD - Rs = sqrt((M_PI * f * mur* MU0)/sigma); - k = kval(); - ac = 0.0; - mmax = (int) floor (f/fc(1,0)); -======= Rs = sqrt ((M_PI * f * mur * MU0) / sigma); k = kval (); ac = 0.0; mmax = (int) floor (f / fc (1,0)); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d nmax = mmax; /* below from Ramo, Whinnery & Van Duzer */ @@ -139,11 +120,7 @@ double rectwaveguide::alphac () } } -<<<<<<< HEAD - ac = ac * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */ -======= ac = ac * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return ac; } @@ -153,13 +130,8 @@ double rectwaveguide::alphac () double rectwaveguide::alphac_cutoff () { double acc; -<<<<<<< HEAD - acc = sqrt(pow(kc(1,0),2.0) - pow(kval(),2.0)); - acc = 20 * log10(exp(1.0)) * acc; -======= acc = sqrt (pow (kc(1,0), 2.0) - pow (kval (), 2.0)); acc = 20 * log10 (exp (1.0)) * acc; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return acc; } @@ -171,19 +143,11 @@ double rectwaveguide::alphad() double k, beta; double ad; -<<<<<<< HEAD - k = kval(); - beta = sqrt(pow(k,2.) - pow(kc(1,0),2.0)); - - ad = (pow(k,2.0) * tand)/(2.0 * beta); - ad = ad * 20.0 * log10(exp(1.)); /* convert from Np/m to db/m */ -======= k = kval (); beta = sqrt (pow (k, 2.0) - pow (kc (1,0), 2.0)); ad = (pow (k, 2.0) * tand) / (2.0 * beta); ad = ad * 20.0 * log10 (exp (1.0)); /* convert from Np/m to db/m */ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return ad; } @@ -222,10 +186,6 @@ void rectwaveguide::get_rectwaveguide_elec () ang_l = getProperty ("Ang_l", UNIT_ANG, ANG_RAD); } -<<<<<<< HEAD - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d /* * get_rectwaveguide_phys * get and assign rectwaveguide physical parameters @@ -238,10 +198,6 @@ void rectwaveguide::get_rectwaveguide_phys () l = getProperty ("L", UNIT_LENGTH, LENGTH_M); } -<<<<<<< HEAD - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d /* * analyze - analysis function */ @@ -260,26 +216,6 @@ void rectwaveguide::analyze () /* Get and assign physical parameters */ get_rectwaveguide_phys(); -<<<<<<< HEAD - k = kval(); - - if (kc(1,0) <= k) { - /*propagating modes */ - beta = sqrt(pow(k,2.) - pow(kc(1,0),2.0)); - lambda_g = (2. * M_PI)/beta; - /* Z0 = (k * ZF0)/beta; */ - Z0 = 2.0 * ZF0 * (b/a) * 1/ - sqrt(1.0 - pow((fc(1,0)/f),2.0)); - - /* calculate electrical angle */ - lambda_g = (2. * M_PI)/beta; - ang_l = (2.0 * M_PI * l)/lambda_g; /* in radians */ - atten_cond = alphac () * l; - atten_dielectric = alphad () * l; - er_eff = (1.0 - pow((fc(1,0)/f),2.0)); - } else { - /*evanascent modes */ -======= k = kval (); if (kc (1,0) <= k) { @@ -297,7 +233,6 @@ void rectwaveguide::analyze () er_eff = (1.0 - pow ((fc (1,0) / f), 2.0)); } else { /* evanascent modes */ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Z0 = 0; ang_l = 0; er_eff = 0; diff --git a/qucs/ChangeLog b/qucs/ChangeLog index 9b03cb93..d0ae6eba 100644 --- a/qucs/ChangeLog +++ b/qucs/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2011-03-18 Stefan Jahn * qucs.cpp (slotOpenContent): Allowing double click on .vhd files. @@ -72,7 +70,6 @@ * dialogs/simmessage.cpp (startSimulator): Avoid outputting file names of library file include names into the netlist. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2010-04-14 Stefan Jahn * schematic.cpp (setName): Handling schematic etc. filenames with diff --git a/qucs/Makefile.am b/qucs/Makefile.am index f8c1e253..a74d7d9f 100644 --- a/qucs/Makefile.am +++ b/qucs/Makefile.am @@ -4,11 +4,7 @@ # # Automake input file. # -<<<<<<< HEAD -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Stefan Jahn -======= # Copyright (C) 2004-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,11 +22,7 @@ # Boston, MA 02110-1301, USA. # -<<<<<<< HEAD -SUBDIRS = bitmaps components diagrams paintings dialogs -======= SUBDIRS = bitmaps components diagrams paintings dialogs octave ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if COND_WIN32 bin_SCRIPTS = qucsdigi.bat qucsveri.bat qucsdigilib.bat @@ -40,21 +32,13 @@ endif bin_PROGRAMS = qucs -<<<<<<< HEAD -MOCHEADERS = qucs.h schematic.h textdoc.h -======= MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d MOCFILES = $(MOCHEADERS:.h=.moc.cpp) qucs_SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \ qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \ viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \ -<<<<<<< HEAD - schematic_file.cpp syntax.cpp module.cpp -======= schematic_file.cpp syntax.cpp module.cpp octave_window.cpp ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d nodist_qucs_SOURCES = $(MOCFILES) diff --git a/qucs/bitmaps/Makefile.am b/qucs/bitmaps/Makefile.am index 351a1679..213ba7c5 100644 --- a/qucs/bitmaps/Makefile.am +++ b/qucs/bitmaps/Makefile.am @@ -4,11 +4,7 @@ # # Automake input file. # -<<<<<<< HEAD -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Stefan Jahn -======= # Copyright (C) 2004-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -57,11 +53,7 @@ XPMS = ac_voltage.png arrow.png capacitor.png dc_current.png dc_voltage.png \ dmux4to16.png ha1b.png fa1b.png fa2b.png pad2bit.png pad3bit.png \ pad4bit.png binarytogrey4bit.png greytobinary4bit.png comp_1bit.png \ comp_2bit.png comp_4bit.png hpribin4bit.png msrstub.png phototransistor.png \ -<<<<<<< HEAD - rlcg.png nigbt.png -======= rlcg.png nigbt.png hybrid.png ctline.png tunneldiode.png ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # toolbar pictures PNGS = fileopen.png filesave.png editdelete.png editcut.png editcopy.png \ diff --git a/qucs/components/ChangeLog b/qucs/components/ChangeLog index 1fb76155..9f29aeaa 100644 --- a/qucs/components/ChangeLog +++ b/qucs/components/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2011-04-05 Stefan Jahn * component.cpp (getComponentFromName): Fixing wrong rotation / @@ -18,7 +16,6 @@ * tunneldiode.cpp (TunnelDiode): Added tunnel diode model. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d 2010-10-23 Stefan Jahn * hicumL0V1p2g.cpp (hicumL0V1p2g): Added new HICUM/L0 v1.2g model. diff --git a/qucs/components/Makefile.am b/qucs/components/Makefile.am index 8dabe285..09487e53 100644 --- a/qucs/components/Makefile.am +++ b/qucs/components/Makefile.am @@ -4,11 +4,7 @@ # # Automake input file. # -<<<<<<< HEAD -# Copyright (C) 2004, 2007, 2008, 2009, 2010 Stefan Jahn -======= # Copyright (C) 2004-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -61,11 +57,7 @@ libcomponents_a_SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \ pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \ greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \ hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \ -<<<<<<< HEAD - hicumL0V1p2g.cpp -======= hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d nodist_libcomponents_a_SOURCES = $(MOCFILES) @@ -93,12 +85,8 @@ noinst_HEADERS = $(MOCHEADERS) resistor.h components.h capacitor.h vccs.h \ andor4x4.h dmux2to4.h dmux3to8.h dmux4to16.h ha1b.h fa1b.h fa2b.h pad2bit.h \ pad3bit.h pad4bit.h binarytogrey4bit.h greytobinary4bit.h comp_1bit.h \ comp_2bit.h comp_4bit.h hpribin4bit.h msrstub.h phototransistor.h nigbt.h \ -<<<<<<< HEAD - vafile.h hicumL2V2p24.h hicumL0V1p2g.h -======= vafile.h hicumL2V2p24.h hicumL0V1p2g.h hybrid.h ctline.h tunneldiode.h \ hicumL0V1p3.h ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d INCLUDES = $(X11_INCLUDES) $(QT_INCLUDES) -I$(top_srcdir)/qucs diff --git a/qucs/components/component.cpp b/qucs/components/component.cpp index c0ef852c..6911c63a 100644 --- a/qucs/components/component.cpp +++ b/qucs/components/component.cpp @@ -1522,10 +1522,7 @@ Component* getComponentFromName(QString& Line) cstr.remove (0,1); // remove leading "<" if (cstr == "Lib") c = new LibComp (); else if (cstr == "Eqn") c = new Equation (); -<<<<<<< HEAD -======= else if (cstr == "SPICE") c = new SpiceFile(); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d else if (cstr == "Rus") c = new Resistor (false); // backward compatible else if (cstr.left (6) == "SPfile" && cstr != "SPfile") { // backward compatible diff --git a/qucs/components/components.h b/qucs/components/components.h index ed1a2cfd..0f38dfda 100644 --- a/qucs/components/components.h +++ b/qucs/components/components.h @@ -56,10 +56,7 @@ #include "vcvs.h" #include "ccvs.h" #include "tline.h" -<<<<<<< HEAD -======= #include "ctline.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #include "tline_4port.h" #include "twistedpair.h" #include "coaxialline.h" @@ -91,10 +88,7 @@ #include "mosfet.h" #include "mosfet_sub.h" #include "eqndefined.h" -<<<<<<< HEAD -======= #include "tunneldiode.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #include "dc_sim.h" #include "ac_sim.h" #include "tr_sim.h" @@ -118,10 +112,7 @@ #include "mutual.h" #include "mutual2.h" #include "coupler.h" -<<<<<<< HEAD -======= #include "hybrid.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #include "switch.h" #include "relais.h" #include "am_modulator.h" @@ -158,10 +149,7 @@ #include "EKV26MOS.h" #include "hicumL0V1p2.h" #include "hicumL0V1p2g.h" -<<<<<<< HEAD -======= #include "hicumL0V1p3.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d #include "hicumL2V2p23.h" #include "hicumL2V2p24.h" #include "photodiode.h" diff --git a/qucs/components/libcomponents.ap b/qucs/components/libcomponents.ap index f073a755..12658f7d 100644 --- a/qucs/components/libcomponents.ap +++ b/qucs/components/libcomponents.ap @@ -1,11 +1,7 @@ # # qucs/components/libcomponents.ap - Autodsp input file. # -<<<<<<< HEAD -# Copyright (C) 2005-2010 Stefan Jahn -======= # Copyright (C) 2005-2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -58,11 +54,7 @@ SOURCES = phaseshifter.cpp gyrator.cpp componentdialog.cpp \ pad2bit.cpp pad3bit.cpp pad4bit.cpp binarytogrey4bit.cpp vafile.cpp \ greytobinary4bit.cpp comp_1bit.cpp comp_2bit.cpp comp_4bit.cpp \ hpribin4bit.cpp msrstub.cpp phototransistor.cpp nigbt.cpp hicumL2V2p24.cpp \ -<<<<<<< HEAD - hicumL0V1p2g.cpp -======= hicumL0V1p2g.cpp hybrid.cpp ctline.cpp tunneldiode.cpp hicumL0V1p3.cpp ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # List of special Qt files. MOCHEADERS = componentdialog.h spicedialog.h optimizedialog.h spicefile.h diff --git a/qucs/components/mslange.cpp b/qucs/components/mslange.cpp index f343aa2b..7bc53037 100644 --- a/qucs/components/mslange.cpp +++ b/qucs/components/mslange.cpp @@ -20,11 +20,7 @@ MSlange::MSlange() { -<<<<<<< HEAD - Description = QObject::tr("microchip lange coupler"); -======= Description = QObject::tr("microstrip lange coupler"); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Lines.append(new Line(-30,-30,-30, 10,QPen(QPen::darkBlue,2))); Lines.append(new Line(-30, 30,-30, 20,QPen(QPen::darkBlue,2))); diff --git a/qucs/diagrams/graph.cpp b/qucs/diagrams/graph.cpp index eb8530b7..062c0d16 100644 --- a/qucs/diagrams/graph.cpp +++ b/qucs/diagrams/graph.cpp @@ -159,20 +159,13 @@ int Graph::getSelected(int x, int y) if(*pp <= BRANCHEND) z++; pp++; if(*pp <= BRANCHEND) { -<<<<<<< HEAD -======= if(*pp <= GRAPHEND) return -1; // not even one point ? ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d z++; pp++; if(*pp < BRANCHEND) return -1; // not even one point ? } } -<<<<<<< HEAD - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(Style >= GRAPHSTYLE_STAR) { // for graph symbols while(*pp > GRAPHEND) { @@ -191,18 +184,9 @@ int Graph::getSelected(int x, int y) pp++; } } -<<<<<<< HEAD - return -1; } - - -======= - return -1; - } - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // for graph lines while(*pp > GRAPHEND) { while(*pp >= STROKEEND) { diff --git a/qucs/dialogs/settingsdialog.cpp b/qucs/dialogs/settingsdialog.cpp index 5d7ae51f..dabdc774 100644 --- a/qucs/dialogs/settingsdialog.cpp +++ b/qucs/dialogs/settingsdialog.cpp @@ -48,19 +48,6 @@ SettingsDialog::SettingsDialog(Schematic *Doc_) // ........................................................... QWidget *Tab1 = new QWidget(t); -<<<<<<< HEAD - QGridLayout *gp = new QGridLayout(Tab1,4,2,5,5); - - QLabel *l1 = new QLabel(tr("Data Display:"), Tab1); - gp->addWidget(l1,0,0); - Input_DataDisplay = new QLineEdit(Tab1); - gp->addWidget(Input_DataDisplay,0,1); - - QLabel *l2 = new QLabel(tr("Data Set:"), Tab1); - gp->addWidget(l2,1,0); - Input_DataSet = new QLineEdit(Tab1); - gp->addWidget(Input_DataSet,1,1); -======= QGridLayout *gp = new QGridLayout(Tab1,6,2,5,5); QLabel *l1 = new QLabel(tr("Data Display:"), Tab1); @@ -72,14 +59,11 @@ SettingsDialog::SettingsDialog(Schematic *Doc_) gp->addWidget(l2,0,0); Input_DataSet = new QLineEdit(Tab1); gp->addWidget(Input_DataSet,0,1); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Check_OpenDpl = new QCheckBox(tr("open data display after simulation"), Tab1); gp->addMultiCellWidget(Check_OpenDpl,2,2,0,1); -<<<<<<< HEAD -======= QLabel *l20 = new QLabel(tr("Octave Script:"), Tab1); gp->addWidget(l20,3,0); Input_Script = new QLineEdit(Tab1); @@ -89,7 +73,6 @@ SettingsDialog::SettingsDialog(Schematic *Doc_) Tab1); gp->addMultiCellWidget(Check_RunScript,4,4,0,1); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d t->addTab(Tab1, tr("Simulation")); // ........................................................... @@ -165,13 +148,9 @@ SettingsDialog::SettingsDialog(Schematic *Doc_) Input_DataSet->setText(Doc->DataSet); Input_DataDisplay->setText(Doc->DataDisplay); -<<<<<<< HEAD - Check_OpenDpl->setChecked(Doc->SimOpenDpl); -======= Input_Script->setText(Doc->Script); Check_OpenDpl->setChecked(Doc->SimOpenDpl); Check_RunScript->setChecked(Doc->SimRunScript); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Check_GridOn->setChecked(Doc->GridOn); Input_GridX->setText(QString::number(Doc->GridX)); Input_GridY->setText(QString::number(Doc->GridY)); @@ -218,27 +197,21 @@ void SettingsDialog::slotApply() changed = true; } -<<<<<<< HEAD -======= if(Doc->Script != Input_Script->text()) { Doc->Script = Input_Script->text(); changed = true; } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(Doc->SimOpenDpl != Check_OpenDpl->isChecked()) { Doc->SimOpenDpl = Check_OpenDpl->isChecked(); changed = true; } -<<<<<<< HEAD -======= if(Doc->SimRunScript != Check_RunScript->isChecked()) { Doc->SimRunScript = Check_RunScript->isChecked(); changed = true; } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(Doc->GridOn != Check_GridOn->isChecked()) { Doc->GridOn = Check_GridOn->isChecked(); changed = true; diff --git a/qucs/dialogs/settingsdialog.h b/qucs/dialogs/settingsdialog.h index 72691403..9ae3a7fc 100644 --- a/qucs/dialogs/settingsdialog.h +++ b/qucs/dialogs/settingsdialog.h @@ -45,15 +45,9 @@ public: QComboBox *Combo_Frame; QTextEdit *Input_Frame0; QLineEdit *Input_Frame1, *Input_Frame2, *Input_Frame3; -<<<<<<< HEAD - QLineEdit *Input_DataSet, *Input_DataDisplay; - QLineEdit *Input_GridX, *Input_GridY; - QCheckBox *Check_OpenDpl, *Check_GridOn; -======= QLineEdit *Input_DataSet, *Input_DataDisplay, *Input_Script; QLineEdit *Input_GridX, *Input_GridY; QCheckBox *Check_OpenDpl, *Check_GridOn, *Check_RunScript; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QVBoxLayout *all; QRegExpValidator *valExpr; diff --git a/qucs/dialogs/simmessage.cpp b/qucs/dialogs/simmessage.cpp index f701707b..7d03f07d 100644 --- a/qucs/dialogs/simmessage.cpp +++ b/qucs/dialogs/simmessage.cpp @@ -51,19 +51,13 @@ SimMessage::SimMessage(QWidget *w, QWidget *parent) DocName = Doc->DocName; DataDisplay = Doc->DataDisplay; -<<<<<<< HEAD -======= Script = Doc->Script; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QFileInfo Info(DocName); DataSet = QDir::convertSeparators(Info.dirPath()) + QDir::separator() + Doc->DataSet; showBias = Doc->showBias; // save some settings as the document... SimOpenDpl = Doc->SimOpenDpl; // ...could be closed during the simulation. -<<<<<<< HEAD -======= SimRunScript = Doc->SimRunScript; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d all = new QVBoxLayout(this); all->setSpacing(5); @@ -378,14 +372,10 @@ void SimMessage::startSimulator() for(QStringList::Iterator it = Collect.begin(); it != Collect.end(); ++it) { // don't put library includes into netlist... -<<<<<<< HEAD - if ((*it).right(4) != ".lst") { -======= if ((*it).right(4) != ".lst" && (*it).right(5) != ".vhdl" && (*it).right(4) != ".vhd" && (*it).right(2) != ".v") { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Stream << *it << '\n'; } } @@ -393,7 +383,7 @@ void SimMessage::startSimulator() isVerilog = ((Schematic*)DocWidget)->isVerilog; SimTime = ((Schematic*)DocWidget)->createNetlist(Stream, SimPorts); - if(SimTime.at(0) == '') { + if(SimTime.at(0) == '\A7') { NetlistFile.close(); ErrText->insert(SimTime.mid(1)); FinishSimulation(-1); diff --git a/qucs/dialogs/simmessage.h b/qucs/dialogs/simmessage.h index bae6140d..83434b74 100644 --- a/qucs/dialogs/simmessage.h +++ b/qucs/dialogs/simmessage.h @@ -77,12 +77,8 @@ public: QWidget *DocWidget; int showBias; bool SimOpenDpl; -<<<<<<< HEAD - QString DocName, DataSet, DataDisplay; -======= bool SimRunScript; QString DocName, DataSet, DataDisplay, Script; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QProcess SimProcess; QTextEdit *ProgText, *ErrText; diff --git a/qucs/main.cpp b/qucs/main.cpp index 8245cd2d..02873f90 100644 --- a/qucs/main.cpp +++ b/qucs/main.cpp @@ -560,20 +560,14 @@ int main(int argc, char *argv[]) QDir::convertSeparators (QucsDirStr + "/share/qucs/lang/"); QucsSettings.LibDir = QDir::convertSeparators (QucsDirStr + "/share/qucs/library/"); -<<<<<<< HEAD -======= QucsSettings.OctaveDir = QDir::convertSeparators (QucsDirStr + "/share/qucs/octave/"); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } else { QucsSettings.BinDir = BINARYDIR; QucsSettings.BitmapDir = BITMAPDIR; QucsSettings.LangDir = LANGUAGEDIR; QucsSettings.LibDir = LIBRARYDIR; -<<<<<<< HEAD -======= QucsSettings.OctaveDir = OCTAVEDIR; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } QucsSettings.Editor = QucsSettings.BinDir + "qucsedit"; diff --git a/qucs/main.h b/qucs/main.h index 0584e084..283eea04 100644 --- a/qucs/main.h +++ b/qucs/main.h @@ -54,10 +54,7 @@ struct tQucsSettings { QString LangDir; QString LibDir; QString AscoDir; -<<<<<<< HEAD -======= QString OctaveDir; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d unsigned int NodeWiring; diff --git a/qucs/module.cpp b/qucs/module.cpp index 76ae5bd5..f5646244 100644 --- a/qucs/module.cpp +++ b/qucs/module.cpp @@ -184,10 +184,7 @@ void Module::registerModules (void) { REGISTER_LUMPED_1 (Gyrator); REGISTER_LUMPED_1 (Phaseshifter); REGISTER_LUMPED_1 (Coupler); -<<<<<<< HEAD -======= REGISTER_LUMPED_1 (Hybrid); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d REGISTER_LUMPED_1 (iProbe); REGISTER_LUMPED_1 (vProbe); REGISTER_LUMPED_1 (Mutual); @@ -230,10 +227,7 @@ void Module::registerModules (void) { // transmission lines REGISTER_TRANS_1 (TLine); REGISTER_TRANS_1 (TLine_4Port); -<<<<<<< HEAD -======= REGISTER_TRANS_1 (CoupledTLine); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d REGISTER_TRANS_1 (TwistedPair); REGISTER_TRANS_1 (CoaxialLine); REGISTER_TRANS_1 (RectLine); @@ -270,10 +264,7 @@ void Module::registerModules (void) { REGISTER_NONLINEAR_1 (Diac); REGISTER_NONLINEAR_1 (Triac); REGISTER_NONLINEAR_1 (Thyristor); -<<<<<<< HEAD -======= REGISTER_NONLINEAR_1 (TunnelDiode); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // verilog-a devices REGISTER_VERILOGA_1 (hicumL2V2p1); @@ -287,10 +278,7 @@ void Module::registerModules (void) { REGISTER_VERILOGA_2 (EKV26MOS, info, info_pmos); REGISTER_VERILOGA_2 (hicumL0V1p2, info, info_pnp); REGISTER_VERILOGA_2 (hicumL0V1p2g, info, info_pnp); -<<<<<<< HEAD -======= REGISTER_VERILOGA_2 (hicumL0V1p3, info, info_pnp); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d REGISTER_VERILOGA_1 (hicumL2V2p23); REGISTER_VERILOGA_1 (hicumL2V2p24); REGISTER_VERILOGA_1 (photodiode); diff --git a/qucs/paintings/graphictext.cpp b/qucs/paintings/graphictext.cpp index cdf34f31..834fa116 100644 --- a/qucs/paintings/graphictext.cpp +++ b/qucs/paintings/graphictext.cpp @@ -189,11 +189,7 @@ QString GraphicText::saveCpp() QString ("new Text (%1, %2, \"%3\", QColor (\"%4\"), %5, %6, %7)"). arg(cx).arg(cy).arg(t). arg(Color.name()).arg(Font.pointSize()). -<<<<<<< HEAD - arg(sin(M_PI * Angle / 180.0)).arg(cos(M_PI * Angle / 180.0)); -======= arg(cos(M_PI * Angle / 180.0)).arg(sin(M_PI * Angle / 180.0)); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d s = "Texts.append (" + s + ");"; return s; } diff --git a/qucs/qucs.ap b/qucs/qucs.ap index 3b53d830..c3e74240 100644 --- a/qucs/qucs.ap +++ b/qucs/qucs.ap @@ -1,11 +1,7 @@ # # qucs/qucs.ap - Autodsp input file. # -<<<<<<< HEAD -# Copyright (C) 2005, 2006, 2009 Stefan Jahn -======= # Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # # This is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,17 +27,10 @@ NAME = qucs SOURCES = node.cpp element.cpp qucsdoc.cpp wire.cpp mouseactions.cpp \ qucs.cpp main.cpp wirelabel.cpp qucs_init.cpp qucs_actions.cpp \ viewpainter.cpp mnemo.cpp schematic.cpp schematic_element.cpp textdoc.cpp \ -<<<<<<< HEAD - schematic_file.cpp syntax.cpp module.cpp - -# List of special Qt files. -MOCHEADERS = qucs.h schematic.h textdoc.h -======= schematic_file.cpp syntax.cpp module.cpp octave_window.cpp # List of special Qt files. MOCHEADERS = qucs.h schematic.h textdoc.h octave_window.h ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d # Additional libraries. LIBS = -lcomponents -ldiagrams -lpaintings -ldialogs \ diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp index d185f8ac..76aee3b9 100644 --- a/qucs/qucs.cpp +++ b/qucs/qucs.cpp @@ -83,10 +83,7 @@ #include "dialogs/simmessage.h" #include "dialogs/vtabwidget.h" #include "dialogs/vtabbeddockwidget.h" -<<<<<<< HEAD -======= #include "octave_window.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d extern const char *empty_xpm[]; @@ -133,10 +130,7 @@ QucsApp::QucsApp() tr("VHDL Sources")+" (*.vhdl *.vhd);;"+ tr("Verilog Sources")+" (*.v);;"+ tr("Verilog-A Sources")+" (*.va);;"+ -<<<<<<< HEAD -======= tr("Octave Scripts")+" (*.m *.oct);;"+ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d tr("Any File")+" (*)"; QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs")); QucsHomeDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs")); @@ -144,14 +138,11 @@ QucsApp::QucsApp() move (QucsSettings.x, QucsSettings.y); resize(QucsSettings.dx, QucsSettings.dy); -<<<<<<< HEAD -======= MouseMoveAction = 0; MousePressAction = 0; MouseReleaseAction = 0; MouseDoubleClickAction = 0; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d initView(); initActions(); initMenuBar(); @@ -160,10 +151,7 @@ QucsApp::QucsApp() viewToolBar->setOn(true); viewStatusBar->setOn(true); viewBrowseDock->setOn(true); -<<<<<<< HEAD -======= slotViewOctaveDock(false); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d initCursorMenu(); HierarchyHistory.setAutoDelete(true); Module::registerModules (); @@ -191,11 +179,6 @@ QucsApp::QucsApp() QString arg = qApp->argv()[z]; if(*(arg) != '-') { // allow uri's: file:/home/linuxuser/Desktop/example.sch -<<<<<<< HEAD - QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg)); - if(f.isEmpty()) f = arg; - gotoPage(f); -======= if(arg.contains(":/")) { QString f = QDir::convertSeparators(QUriDrag::uriToLocalFile(arg)); if(f.isEmpty()) f = arg; @@ -203,7 +186,6 @@ QucsApp::QucsApp() } else { gotoPage(arg); } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } } } @@ -226,10 +208,7 @@ void QucsApp::initContentListView() ConOthers = new QListViewItem(Content, tr("Others")); ConDatasets = new QListViewItem(Content, tr("Datasets")); ConDisplays = new QListViewItem(Content, tr("Data Displays")); -<<<<<<< HEAD -======= ConOctave = new QListViewItem(Content, tr("Octave")); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d ConVerilog = new QListViewItem(Content, tr("Verilog")); ConVerilogA = new QListViewItem(Content, tr("Verilog-A")); ConSources = new QListViewItem(Content, tr("VHDL")); @@ -322,8 +301,6 @@ void QucsApp::initView() moveDockWindow(dock,DockLeft); TabView->setCurrentPage(0); -<<<<<<< HEAD -======= // ---------------------------------------------------------- // Octave docking window octDock = new QDockWindow(QDockWindow::InDock, this); @@ -332,7 +309,6 @@ void QucsApp::initView() octave = new OctaveWindow(octDock); moveDockWindow(octDock, Qt::DockBottom); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // ............................................ readProjects(); // reads all projects and inserts them into the ListBox } @@ -796,11 +772,8 @@ void QucsApp::readProjectFiles() delete ConVerilogA->firstChild(); while(ConOthers->firstChild()) delete ConOthers->firstChild(); -<<<<<<< HEAD -======= while(ConOctave->firstChild()) delete ConOctave->firstChild(); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d int n; // put all files into "Content"-ListView @@ -828,11 +801,8 @@ void QucsApp::readProjectFiles() new QListViewItem(ConVerilog, (*it).ascii()); else if(Str == "va") new QListViewItem(ConVerilogA, (*it).ascii()); -<<<<<<< HEAD -======= else if((Str == "m") || (Str == "oct")) new QListViewItem(ConOctave, (*it).ascii()); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d else new QListViewItem(ConOthers, (*it).ascii()); } @@ -857,10 +827,7 @@ void QucsApp::openProject(const QString& Path, const QString& Name) return; } QucsWorkDir.setPath(ProjDir.path()); -<<<<<<< HEAD -======= octave->adjustDirectory(); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Content->setColumnText(0,tr("Content of '")+Name+tr("'")); // column text ConSchematics->setOpen(false); // get sure to have it closed @@ -925,10 +892,7 @@ void QucsApp::slotMenuCloseProject() slotResetWarnings(); setCaption("Qucs " PACKAGE_VERSION + tr(" - Project: ")); QucsWorkDir.setPath(QDir::homeDirPath()+QDir::convertSeparators ("/.qucs")); -<<<<<<< HEAD -======= octave->adjustDirectory(); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Content->setColumnText(0,tr("Content of")); // column text initContentListView(); @@ -1183,21 +1147,14 @@ bool QucsApp::saveAs() } // list of known file extensions -<<<<<<< HEAD - QString ext = "vhdl;vhd;v;va;sch;dpl"; -======= QString ext = "vhdl;vhd;v;va;sch;dpl;m;oct"; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QStringList extlist = QStringList::split (';', ext); if(isTextDocument (w)) Filter = tr("VHDL Sources")+" (*.vhdl *.vhd);;" + tr("Verilog Sources")+" (*.v);;"+ tr("Verilog-A Sources")+" (*.va);;"+ -<<<<<<< HEAD -======= tr("Octave Scripts")+" (*.m *.oct);;"+ ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d tr("Any File")+" (*)"; else Filter = QucsFileFilter; @@ -1255,11 +1212,8 @@ bool QucsApp::saveAs() Content->setSelected(new QListViewItem(ConVerilog, s), true); else if(ext == "va") Content->setSelected(new QListViewItem(ConVerilogA, s), true); -<<<<<<< HEAD -======= else if(ext == "m" || ext == "oct") Content->setSelected(new QListViewItem(ConOctave, s), true); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d else Content->setSelected(new QListViewItem(ConOthers, s), true); } @@ -1428,17 +1382,12 @@ void QucsApp::slotFileSettings () QWidget * w = DocumentTab->currentPage (); if (isTextDocument (w)) { QucsDoc * Doc = (QucsDoc *) ((TextDoc *) w); -<<<<<<< HEAD - // Verilog-A properties - if (Doc->fileSuffix () == "va") { -======= QString ext = Doc->fileSuffix (); // Octave properties if (ext == "m" || ext == "oct") { } // Verilog-A properties else if (ext == "va") { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog * d = new VASettingsDialog ((TextDoc *) w); d->exec (); } @@ -1743,13 +1692,8 @@ void QucsApp::slotSimulate() if(!saveAs()) return; // ... save schematic before // Perhaps the document was modified from another program ? -<<<<<<< HEAD - if(Doc->lastSaved.isValid()) { - QFileInfo Info(Doc->DocName); -======= QFileInfo Info(Doc->DocName); if(Doc->lastSaved.isValid()) { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(Doc->lastSaved < Info.lastModified()) { int No = QMessageBox::warning(this, tr("Warning"), tr("The document was modified by another program !") + '\n' + @@ -1761,8 +1705,6 @@ void QucsApp::slotSimulate() } slotResetWarnings(); -<<<<<<< HEAD -======= if(Info.extension(false) == "m" || Info.extension(false) == "oct") { // It is an Octave script. @@ -1773,7 +1715,6 @@ void QucsApp::slotSimulate() return; } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage *sim = new SimMessage(w, this); // disconnect is automatically performed, if one of the involved objects // is destroyed ! @@ -1811,17 +1752,6 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim) Dia->show(); } } -<<<<<<< HEAD - else if(sim->SimOpenDpl) { - // switch to data display - slotChangePage(sim->DocName, sim->DataDisplay); - sim->slotClose(); // close and delete simulation window - } - else - if(w) if(!isTextDocument (sim->DocWidget)) - // load recent simulation data (if document is still open) - ((Schematic*)sim->DocWidget)->reloadGraphs(); -======= else { if(sim->SimRunScript) { // run script @@ -1844,7 +1774,6 @@ void QucsApp::slotAfterSimulation(int Status, SimMessage *sim) // load recent simulation data (if document is still open) ((Schematic*)sim->DocWidget)->reloadGraphs(); } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(!isTextDocument (sim->DocWidget)) ((Schematic*)sim->DocWidget)->viewport()->update(); @@ -1880,12 +1809,8 @@ void QucsApp::slotChangePage(QString& DocName, QString& DataDisplay) DocumentTab->setCurrentPage(z); else { // no open page found ? QString ext = QucsDoc::fileSuffix (DataDisplay); -<<<<<<< HEAD - if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va") -======= if (ext != "vhd" && ext != "vhdl" && ext != "v" && ext != "va" && ext != "oct" && ext != "m") ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d d = new Schematic (this, Name); else d = new TextDoc (this, Name); @@ -1937,15 +1862,11 @@ void QucsApp::slotToPage() return; } -<<<<<<< HEAD - slotChangePage(d->DocName, d->DataDisplay); -======= if(d->DocName.right(2) == ".m" || d->DocName.right(4) == ".oct") slotViewOctaveDock(true); else slotChangePage(d->DocName, d->DataDisplay); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } // ------------------------------------------------------------------- @@ -1971,12 +1892,8 @@ void QucsApp::slotOpenContent(QListViewItem *item) QString Suffix = Info.extension(false); if (Suffix == "sch" || Suffix == "dpl" || Suffix == "vhdl" || -<<<<<<< HEAD - Suffix == "v" || Suffix == "va") { -======= Suffix == "vhd" || Suffix == "v" || Suffix == "va" || Suffix == "m" || Suffix == "oct") { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d gotoPage(Info.absFilePath()); if(item->text(1).isEmpty()) // is subcircuit ? diff --git a/qucs/qucs.h b/qucs/qucs.h index 38d0c44b..484f9005 100644 --- a/qucs/qucs.h +++ b/qucs/qucs.h @@ -43,10 +43,7 @@ class QIconView; class QIconViewItem; class VTabbedDockWidget; class VTabWidget; -<<<<<<< HEAD -======= class OctaveWindow; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d typedef bool (Schematic::*pToggleFunc) (); typedef void (MouseActions::*pMouseFunc) (Schematic*, QMouseEvent*); @@ -166,20 +163,13 @@ private: // ********* Widgets on the main area ********************************** VTabbedDockWidget *dock; VTabWidget *TabView; -<<<<<<< HEAD -======= QDockWindow *octDock; OctaveWindow *octave; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QListBox *Projects; QListView *Content; QListViewItem *ConSchematics, *ConSources, *ConDisplays, *ConDatasets, -<<<<<<< HEAD - *ConOthers, *ConVerilog, *ConVerilogA; -======= *ConOthers, *ConVerilog, *ConVerilogA, *ConOctave; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QComboBox *CompChoose; @@ -222,11 +212,8 @@ private slots: void slotViewToolBar(bool toggle); // toggle the toolbar void slotViewStatusBar(bool toggle); // toggle the statusbar void slotViewBrowseDock(bool toggle); // toggle the dock window -<<<<<<< HEAD -======= void slotViewOctaveDock(bool); // toggle the dock window void slotToggleOctave(bool); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d void slotToggleDock(bool); void slotHelpAbout(); // shows an about dialog void slotHelpAboutQt(); // shows the standard about dialog for Qt @@ -238,11 +225,7 @@ private: void initStatusBar(); // setup the statusbar QAction *helpAboutApp, *helpAboutQt, *viewToolBar, *viewStatusBar, -<<<<<<< HEAD - *viewBrowseDock; -======= *viewBrowseDock, *viewOctaveDock; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // menus contain the items of their menubar QPopupMenu *fileMenu, *editMenu, *insMenu, *projMenu, *simMenu, *viewMenu, diff --git a/qucs/qucs_ar.ts b/qucs/qucs_ar.ts index abfbd359..deb5c18a 100644 --- a/qucs/qucs_ar.ts +++ b/qucs/qucs_ar.ts @@ -1391,8 +1391,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1400,7 +1398,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -6928,11 +6925,7 @@ qucsedit [-r] file :إستعمال HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - أجهزة فيريلوج v2.23 0 HICUM {1.3?} -======= أجهزة فيريلوج v2.23 0 HICUM {1.3?} ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -6956,19 +6949,11 @@ qucsedit [-r] file :إستعمال npn HICUM L0 v1.3 -<<<<<<< HEAD - npn HICUM L0 v1.3 - - - pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 -======= npn HICUM L0 v1.3 pnp HICUM L0 v1.3 pnp HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -6999,9 +6984,6 @@ qucsedit [-r] file :إستعمال -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7131,7 +7113,6 @@ qucsedit [-r] file :إستعمال microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8543,13 +8524,13 @@ Selects all diagram markers of the document Rotates the selected component by 90° - دوران العنصر المختار ب° 90 + دوران العنصر المختار ب° 90 Rotate Rotates the selected component by 90° counter-clockwise - + دوران العنصر المختار ب° 90 @@ -9269,8 +9250,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9293,7 +9272,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -10692,8 +10680,6 @@ are included in the search. Cancel إلغاء -<<<<<<< HEAD -======= Octave Script: @@ -10702,7 +10688,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -10979,17 +10964,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -11004,7 +10983,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_ca.ts b/qucs/qucs_ca.ts index e264f8c4..b70d9b1e 100644 --- a/qucs/qucs_ca.ts +++ b/qucs/qucs_ca.ts @@ -1527,8 +1527,6 @@ pero es %1! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1536,7 +1534,6 @@ pero es %1! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7219,9 +7216,6 @@ Use: qucsedit [-r] fitxer -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7363,7 +7357,6 @@ Use: qucsedit [-r] fitxer microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8783,13 +8776,13 @@ Selecciona todos els elementos del document Rotates the selected component by 90° - Rota el elemento seleccionado 90º + Rota el elemento seleccionado 90º Rotate Rotates the selected component by 90° counter-clockwise - Rotar + Rotar Rota el elemento seleccionado 90º en el sentido de les agujas del reloj @@ -9939,8 +9932,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9963,7 +9954,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12745,8 +12745,6 @@ en la búsqueda. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12755,7 +12753,6 @@ en la búsqueda. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13118,17 +13115,11 @@ Inserta esqueleto de la entidad VHDL -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13143,7 +13134,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_cs.ts b/qucs/qucs_cs.ts index 9e5eb0ab..41dc79b9 100644 --- a/qucs/qucs_cs.ts +++ b/qucs/qucs_cs.ts @@ -1626,8 +1626,6 @@ je ale %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1635,7 +1633,6 @@ je ale %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7441,9 +7438,6 @@ Použití: qucsedit [-r] soubor -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7585,7 +7579,6 @@ Použití: qucsedit [-r] soubor microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -9166,13 +9159,13 @@ Vybere všechny objekty v dokumentu Rotates the selected component by 90° - Otočí vybrané komponenty o 90° + Otočí vybrané komponenty o 90° Rotate Rotates the selected component by 90° counter-clockwise - Otočit + Otočit Otočí vybrané komponenty o 90° doleva @@ -10350,8 +10343,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10374,7 +10365,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -14842,8 +14842,6 @@ jméně je hledaný řetězec. Do hledání budou zahrnuty všechny knihovny.Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -14852,7 +14850,6 @@ jméně je hledaný řetězec. Do hledání budou zahrnuty všechny knihovny.run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -15229,17 +15226,11 @@ Vloží konstrukci VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -15254,7 +15245,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_de.ts b/qucs/qucs_de.ts index b12f27f1..bdaf6285 100644 --- a/qucs/qucs_de.ts +++ b/qucs/qucs_de.ts @@ -1217,11 +1217,7 @@ Matlab -<<<<<<< HEAD - -======= Matlab ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -1638,8 +1634,6 @@ ist aber %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1647,7 +1641,6 @@ ist aber %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -4483,7 +4476,6 @@ Verwendung: qucsedit [-r] Datei Zeit der Zustandsänderung (durch Kommas getrennte Liste möglich) -<<<<<<< HEAD Switch Schalter @@ -7455,7 +7447,7 @@ Verwendung: qucsedit [-r] Datei HICUM Level 0 v1.3 verilog device - HICUM Level 0 v1.3 Verilogmodell + HICUM Level 0 v1.3 Verilogmodell high-injection roll-off current @@ -7479,11 +7471,11 @@ Verwendung: qucsedit [-r] Datei npn HICUM L0 v1.3 - npn HICUM L0 v1.3 + npn HICUM L0 v1.3 pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 + pnp HICUM L0 v1.3 HICUM Level 0 v1.2g verilog device @@ -7514,11 +7506,139 @@ Verwendung: qucsedit [-r] Datei - microchip lange coupler + Microstrip Lange Coupler - Microstrip Lange Coupler + coupled transmission lines + + + + characteristic impedance of even mode + + + + characteristic impedance of odd mode + + + + relative dielectric constant of even mode + + + + relative dielectric constant of odd mode + + + + attenuation factor per length of even mode + + + + attenuation factor per length of odd mode + + + + Coupled Transmission Line + + + + Flag for using third order solution for transfer current + + + + bias dependence for reverse Early voltage + + + + Flag for turning temperature dependence of tef0 on and off + + + + TC of Reverse Early voltage + + + + TC of AVER + + + + Bandgap difference between base and BE-junction + + + + Frist-order TC of iqfh + + + + Second-order TC of iqfh + + + + hybrid (unsymmetrical 3dB coupler) + + + + Hybrid + + + + microstrip lange coupler + + + + resonance tunnel diode + + + + peak current + + + + valley current + + + + valley voltage + + + + resonance energy in Ws + + + + Fermi energy in Ws + + + + resonance width in Ws + + + + maximum of transmission + + + + fitting factor for electron density + + + + fitting factor for voltage drop + + + + fitting factor for diode current + + + + zero-bias depletion capacitance + + + + life-time of electrons + + + + Tunnel Diode @@ -7628,19 +7748,6 @@ Verwendung: qucsedit [-r] Datei Text Text - -<<<<<<< HEAD - Rectangle - Rechteck - - - filled Rectangle - gefülltes Rechteck -======= - Others - ->>>>>>> b4ab12f2ac6cfbd5b300105abf64c2c0fc8adc30 - wrong dependency falsche Abhängigkeit @@ -7804,11 +7911,11 @@ Overwrite ? QucsApp New - Neu + Neu &New - &Neu + &Neu Ctrl+N @@ -7816,7 +7923,7 @@ Overwrite ? Creates a new document - Erzeugt ein neues Dokument + Erzeugt ein neues Dokument Open File @@ -7824,17 +7931,17 @@ Overwrite ? &Open... - Ö&ffnen... + Ö&ffnen... Opens an existing document - Öffnet ein existierendes Dokument + Öffnet ein existierendes Dokument New Creates a new schematic or data display document - Neu + Neu Erzeugt einen neuen Schaltplan oder eine Datenvisualisierung @@ -7846,7 +7953,7 @@ Erzeugt einen neuen Schaltplan oder eine Datenvisualisierung Open File Opens an existing document - Öffne Datei + Öffne Datei Öffnet ein existierendes Dokument @@ -7856,7 +7963,7 @@ Opens an existing document &Save - &Speichern + &Speichern Ctrl+S @@ -7864,13 +7971,13 @@ Opens an existing document Saves the current document - Speichert das aktuelle Dokument + Speichert das aktuelle Dokument Save File Saves the current document - Datei speichern + Datei speichern Speichert das aktuelle Dokument @@ -7884,13 +7991,13 @@ Speichert das aktuelle Dokument Saves the current document under a new filename - Speichert das aktuelle Dokument unter einem neuen Dateinamen + Speichert das aktuelle Dokument unter einem neuen Dateinamen Save As Saves the current document under a new filename - Speichern unter + Speichern unter Speichert das aktuelle Dokument unter einem neuen Dateinamen @@ -7900,17 +8007,17 @@ Speichert das aktuelle Dokument unter einem neuen Dateinamen Save &All - &Alles speichern + &Alles speichern Saves all open documents - Speichert alle offenen Dokumente + Speichert alle offenen Dokumente Save All Files Saves all open documents - Alle Dateien speichern + Alle Dateien speichern Speichert alle offenen Dokumente @@ -7920,7 +8027,7 @@ Speichert alle offenen Dokumente &Close - Sch&ließen + Sch&ließen Ctrl+W @@ -7928,13 +8035,13 @@ Speichert alle offenen Dokumente Closes the current document - Schließt das aktuelle Dokument + Schließt das aktuelle Dokument Close File Closes the current document - Datei schließen + Datei schließen Schließt das aktuelle Dokument @@ -7950,7 +8057,7 @@ Schließt das aktuelle Dokument Settings Sets properties of the file - Einstellungen + Einstellungen Setzt die Eigenschaften der Datei @@ -7960,7 +8067,7 @@ Setzt die Eigenschaften der Datei &Print... - &Drucken... + &Drucken... Ctrl+P @@ -7968,13 +8075,13 @@ Setzt die Eigenschaften der Datei Prints the current document - Druckt das aktuelle Dokument + Druckt das aktuelle Dokument Print File Prints the current document - Datei drucken + Datei drucken Druckt das aktuelle Dokument @@ -7984,7 +8091,7 @@ Druckt das aktuelle Dokument E&xit - &Beenden + &Beenden Ctrl+Q @@ -7992,23 +8099,23 @@ Druckt das aktuelle Dokument Quits the application - Beendet die Applikation + Beendet die Applikation Exit Quits the application - Beenden + Beenden Beendet die Applikation Cut - Ausschneiden + Ausschneiden Cu&t - Aus&schneiden + Aus&schneiden Ctrl+X @@ -8028,11 +8135,11 @@ Schneidet den ausgewählten Bereich aus und kopiert diesen in die Zwischenablage Copy - Kopieren + &Copy - &Kopieren + Ctrl+C @@ -8052,11 +8159,11 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Paste - Einfügen + &Paste - &Einfügen + Ctrl+V @@ -8068,31 +8175,31 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Schematic - Schaltplan + Schaltplan Data Display - Datenvisualisierung + Datenvisualisierung Qucs Documents - Qucs-Dokumente + Qucs-Dokumente Any File - Alle Dateien + Alle Dateien Open - Öffnen + Öffnen Delete - Löschen + Löschen Projects - Projekte + Projekte content of the project directory @@ -8100,27 +8207,27 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Content of - Inhalt von + Inhalt von Note - Notiz + Notiz Datasets - Datensätze + Datensätze Data Displays - Datenvisualisierungen + Datenvisualisierungen Schematics - Schaltpläne + Schaltpläne Content - Inhalt + Inhalt content of the open project @@ -8128,11 +8235,11 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Components - Komponenten + Komponenten components and diagrams - Komponenten und Diagramme + Komponenten und Diagramme lumped components @@ -8168,55 +8275,55 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Rename - Umbenennen + Umbenennen Delete Group - Gruppe löschen + Gruppe löschen Error - Fehler + Fehler Cannot rename an open file! - Geöffnete Datei kann nicht umbenannt werden! + Geöffnete Datei kann nicht umbenannt werden! Rename file - Datei umbenennen + Datei umbenennen Enter new name: - Neuen Namen eingeben: + Neuen Namen eingeben: Cannot rename file: - Datei kann nicht umbenannt werden: + Datei kann nicht umbenannt werden: Cannot delete an open file! - Geöffnete Datei kann nicht gelöscht werden! + Geöffnete Datei kann nicht gelöscht werden! Warning - Warnung + Warnung This will delete the file permanently! Continue ? - Dies löscht die Datei unwiderruflich! Fortfahren ? + Dies löscht die Datei unwiderruflich! Fortfahren ? No - Nein + Nein Yes - Ja + Ja Cannot delete schematic: - Schaltplan kann nicht gelöscht werden: + Schaltplan kann nicht gelöscht werden: Cannot delete the open file: @@ -8234,11 +8341,11 @@ Kopiert den ausgewählten Bereich in die Zwischenablage Cannot create work directory ! - Arbeitsverzeichnis kann nicht erstellt werden ! + Arbeitsverzeichnis kann nicht erstellt werden ! Closing Qucs document - Schließe Qucs Dokument + Schließe Qucs Dokument This document contains unsaved changes! @@ -8248,57 +8355,57 @@ Wollen Sie die Änderungen vor dem Schließen speichern? Creating new schematic... - Erzeuge neuen Schaltplan... + Erzeuge neuen Schaltplan... Ready. - Fertig. + Opening file... - Öffne Datei... + Öffne Datei... Enter a Schematic Name - Geben Sie einen Schaltplannamen ein + Geben Sie einen Schaltplannamen ein Opening aborted - Öffnen abgebrochen + Öffnen abgebrochen -port - -Tor + -Tor Saving file... - Speichere Datei... + Speichere Datei... Saving aborted - Speichern abgebrochen + Speichern abgebrochen Enter a Document Name - Geben Sie einen Dokumentennamen ein + The file ' - Die Datei ' + Die Datei ' ' already exists! - ' existiert bereits! + ' existiert bereits! Saving will overwrite the old one! Continue? - Speichern überschreibt die alte Datei! Weiter? + Speichern überschreibt die alte Datei! Weiter? Cancel - Abbrechen + Abbrechen Only the extensions '.sch' and '.dpl' @@ -8312,113 +8419,113 @@ Wollen Sie die Änderungen vor dem Schließen speichern? Info - Information + Information Cannot overwrite an open document - Geöffnete Datei kann nicht überschrieben werden + Geöffnete Datei kann nicht überschrieben werden Saving file under new filename... - Datei unter neuem Namen speichern... + Datei unter neuem Namen speichern... Saving all files... - Speichere alle Dateien... + Speichere alle Dateien... Closing file... - Schließe Datei... + Schließe Datei... The document contains unsaved changes! - Das Dokument enthält ungespeicherte Änderungen! + Das Dokument enthält ungespeicherte Änderungen! Do you want to save the changes before closing? - Wollen Sie die Änderungen vor dem Schließen abspeichern? + Wollen Sie die Änderungen vor dem Schließen abspeichern? &Discard - &Verwerfen + Printing... - Drucke... + Drucke... Exiting application... - Beende Applikation... + Beende Applikation... Quit... - Beenden... + Beenden... Do you really want to quit? - Wollen Sie das Programm wirklich verlassen? + Wollen Sie das Programm wirklich verlassen? Cutting selection... - Schneide Auswahl aus... + Schneide Auswahl aus... Copying selection to clipboard... - Kopiere Auswahl in die Zwischenablage... + Kopiere Auswahl in die Zwischenablage... Cannot create - Kann nicht erzeugen + Kann nicht erzeugen No page set ! - Seite ist nicht eingestellt ! + Seite ist nicht eingestellt ! Cannot access project directory: - Auf das Projektverzeichnis kann nicht zugegriffen werden: + Auf das Projektverzeichnis kann nicht zugegriffen werden: - Project: - - Projekt: + - Projekt: Choose Project Directory for Opening - Wählen Sie eine Projektverzeichnis zum Öffnen + Wählen Sie eine Projektverzeichnis zum Öffnen Content of ' - Inhalt von ' + Inhalt von ' ' - ' + ' Cannot create project directory ! - Projektverzeichnis kann nicht erzeugt werden ! + Projektverzeichnis kann nicht erzeugt werden ! No project is selected ! - Es sind keine Projekte ausgewählt ! + Es sind keine Projekte ausgewählt ! Cannot delete an open project ! - Offenes Projekt kann nicht gelöscht werden ! + Offenes Projekt kann nicht gelöscht werden ! This will destroy all the project files permanently ! Continue ? - Dies löscht alle Projektdateien unwiderruflich ! Fortfahren ? + Dies löscht alle Projektdateien unwiderruflich ! Fortfahren ? &Yes - &Ja + &Ja &No - &Nein + &Nein Cannot remove project file: @@ -8426,11 +8533,11 @@ Wollen Sie die Änderungen vor dem Schließen speichern? Cannot remove project directory ! - Projektverzeichnis kann nicht gelöscht werden ! + Projektverzeichnis kann nicht gelöscht werden ! Choose Project Directory for Deleting - Wählen Sie ein Projektverzeichnis zum Löschen + Wählen Sie ein Projektverzeichnis zum Löschen SPICE netlist @@ -8466,13 +8573,13 @@ Wollen Sie die Änderungen vor dem Schließen speichern? Edits the symbol for this schematic - Bearbeitet das Symbol für diesen Schaltkreis + Bearbeitet das Symbol für diesen Schaltkreis Edit Circuit Symbol Edits the symbol for this schematic - Schaltkreissymol bearbeiten + Schaltkreissymol bearbeiten Bearbeitet das Symbol für diesen Schaltkreis @@ -8494,27 +8601,27 @@ Bearbeitet den Schaltplan Others - Andere + Cannot start "%1"! - Das Programm "%1" kann nicht gestartet werden! + VHDL Sources - VHDL Quellen + VHDL - VHDL + VHDL content of project directory - Inhalt des Projektverzeichnisses + content of current project - Inhalt des aktuellen Projekts + Cannot delete data display: @@ -8530,7 +8637,7 @@ Bearbeitet den Schaltplan Creating new text editor... - Erzeuge neuen Texteditor... + Printing selected... @@ -8538,113 +8645,111 @@ Bearbeitet den Schaltplan Could not load S[1,1]. - Der Datensatz S[1,1] kann nicht geladen werden. + Could not load S[1,2]. - Der Datensatz S[1,2] kann nicht geladen werden. + Could not load S[2,1]. - Der Datensatz S[2,1] kann nicht geladen werden. + Could not load S[2,2]. - Der Datensatz S[2,2] kann nicht geladen werden. + Wrong dependency! - Falsche Abhängigkeit! + At least two elements must be selected ! - Für diese Aktion müssen mindestens zwei Elemente ausgewählt werden ! + Für diese Aktion müssen mindestens zwei Elemente ausgewählt werden ! Cannot start text editor! - Der Texteditor kann nicht gestartet werden! + Der Texteditor kann nicht gestartet werden! Cannot start filter synthesis program! - Das Programm für die Filtersynthese kann nicht gestartet werden! + Das Programm für die Filtersynthese kann nicht gestartet werden! Cannot start line calculation program! - Das Programm für die Leitungsberechnung kann nicht gestartet werden! + Das Programm für die Leitungsberechnung kann nicht gestartet werden! Cannot start library program! - Das Bibliotheksprogramm kann nicht gestartet werden! + Das Bibliotheksprogramm kann nicht gestartet werden! Cannot start qucshelp! - Das Programm qucshelp kann nicht gestartet werden! + Das Programm qucshelp kann nicht gestartet werden! No project open! - Kein geöffnetes Projekt! + Kein geöffnetes Projekt! Select files to copy - Dateien für das Kopieren auswählen + Dateien für das Kopieren auswählen No files copied. - Es wurden keine Dateien kopiert. + Es wurden keine Dateien kopiert. Cannot open "%1" ! - Die Datei "%1" kann nicht geöffnet werden ! + Die Datei "%1" kann nicht geöffnet werden ! Overwrite - Überschreiben + Überschreiben File "%1" already exists. Overwrite ? - Die Datei "%1" existiert bereits. + Die Datei "%1" existiert bereits. Überschreiben ? Cannot create "%1" ! - Die Datei "%1" kann nicht erstellt werden ! + Die Datei "%1" kann nicht erstellt werden ! Cannot read "%1" ! - Die Datei "%1" kann nicht gelesen werden ! + Die Datei "%1" kann nicht gelesen werden ! Cannot write "%1" ! - Die Datei "%1" kann nicht geschrieben werden ! + Die Datei "%1" kann nicht geschrieben werden ! New Text - Neues Textdokument + New &Text - Neues &Textdokument + Creates a new text document - Erzeugt ein neues Textdokument + New Text Creates a new text document - Neues Textdokument - -Erzeugt ein neues Textdokument + Save as... - Speichern unter... + &Edit Circuit Symbol - &Schaltkreissymbol bearbeiten + &Document Settings @@ -8656,7 +8761,7 @@ Erzeugt ein neues Textdokument Document Settings - Dokumenteneinstellungen + Dokumenteneinstellungen Print Selected Elements @@ -8680,139 +8785,121 @@ Druckt ausgewählte Elemente des aktuellen Dokuments Application Settings - Applikationseinstellungen + Application Settings... - Applikationseinstellungen... + Qucs Settings Sets properties of the application - Qucs Einstellungen - -Setzt die Einstellungen der Applikation + Align top - Nach oben ausrichten + Align top selected elements - Ausgewählte Elemente nach oben ausrichten + Align top Align selected elements to their upper edge - Nach oben ausrichten - -Richtet ausgewählte Elemente an ihrer oberen Kante aus + Align bottom - Nach unten ausrichten + Align bottom selected elements - Ausgewählte Elemente nach unten ausrichten + Align bottom Align selected elements to their lower edge - Nach unten ausrichten - -Richtet ausgewählte Elemente an ihrer unteren Kante aus + Align left - Nach links ausrichten + Align left selected elements - Ausgewählte Elemente nach links ausrichten + Align left Align selected elements to their left edge - Nach links ausrichten - -Richtet ausgewählte Elemente an ihrer linken Kante aus + Align right - Nach rechts ausrichten + Align right selected elements - Ausgewählte Elemente nach rechts ausrichten + Align right Align selected elements to their right edge - Nach rechts ausrichten - -Richtet ausgewählte Elemente an ihrer rechten Kante aus + Distribute horizontally - Horizontal verteilen + Distribute equally horizontally - Gleichmäßig horizontal verteilen + Distribute horizontally Distribute horizontally selected elements - Horizontal verteilen - -Verteilt ausgewählte Elemente horizontal + Distribute vertically - Vertikal verteilen + Distribute equally vertically - Gleichmäßig vertikal verteilen + Distribute vertically Distribute vertically selected elements - Vertikal verteilen - -Verteilt ausgewählte Elemente vertikal + Set on Grid - Auf Gitternetz setzen + Set on Grid Sets selected elements on grid - Auf Gitternetz setzen - -Setzt ausgewählte Elemente auf das Gitternetz + Move Component Text - Komponententext verschieben + Move Component Text Moves the property text of components - Komponententext verschieben - -Verschiebt den Eigenschaftentext von Komponenten + Change Property Values... @@ -8832,69 +8919,69 @@ Change Property Value of Components Pastes the clipboard contents to the cursor position - Fügt den Inhalt der Zwischenablage an der Cursorposition ein + Fügt den Inhalt der Zwischenablage an der Cursorposition ein Paste Pastes the clipboard contents to the cursor position - Einfügen + Einfügen Fügt den Inhalt der Zwischenablage an der Cursorposition ein &Delete - &Löschen + &Löschen Deletes the selected components - Löscht die ausgewählten Komponenten + Löscht die ausgewählten Komponenten Delete Deletes the selected components - Löschen + Löschen Löscht die ausgewählten Komponenten Undo - Rückgängig + Rückgängig &Undo - &Rückgängig + &Rückgängig Undoes the last command - Letzte Aktion wird rückgängig gemacht + Macht das letzte Kommando rückgängig Undo Makes the last action undone - Rückgängig + Rückgängig -Letzte Aktion wird rückgängig gemacht +Macht das letzte Kommando rückgängig Redo - Wiederholen + Wiederholen &Redo - &Wiederholen + &Wiederholen Redoes the last command - Wiederholt das letzte Kommando + Wiederholt das letzte Kommando Redo Repeats the last action once more - Wiederholen + Wiederholen Wiederholt das letzte Kommando nochmal @@ -8904,17 +8991,17 @@ Wiederholt das letzte Kommando nochmal &New Project... - &Neues Projekt... + &Neues Projekt... Creates a new project - Erzeugt ein neues Projekt + Erzeugt ein neues Projekt New Project Creates a new project - Neues Projekt + Neues Projekt Erzeugt ein neues Projekt @@ -8924,7 +9011,7 @@ Erzeugt ein neues Projekt &Open Project... - &Projekt öffnen... + Projekt ö&ffnen Opens a project @@ -8934,7 +9021,7 @@ Erzeugt ein neues Projekt Open Project Opens an existing project - Projekt öffnen + Projekt öffnen Öffnet ein existierendes Projekt @@ -8944,7 +9031,7 @@ Opens an existing project &Delete Project... - Projekt &löschen... + Projekt &löschen Deletes a project @@ -8954,7 +9041,7 @@ Opens an existing project Delete Project Deletes an existing project - Projekt löschen + Projekt löschen Löscht ein existierendes Projekt @@ -8964,7 +9051,7 @@ Löscht ein existierendes Projekt &Close Project - Projekt &schließen + Close current project @@ -8974,9 +9061,7 @@ Löscht ein existierendes Projekt Close Project Closes the current project - Projekt schließen - -Schließt das aktuelle Projekt + Add Files to Project @@ -8984,23 +9069,21 @@ Schließt das aktuelle Projekt &Add Files to Project... - &Dateien zu Projekt hinzufügen... + Copies files to project directory - Kopiert Dateien in das Projektverzeichnis + Add Files to Project Copies files to project directory - Dateien zu Projekt hinzufügen - -Kopiert Dateien in das Projektverzeichnis + View All - Alles anzeigen + Alles anzeigen Views the whole page @@ -9010,61 +9093,59 @@ Kopiert Dateien in das Projektverzeichnis View All Shows the whole page content - Alles anzeigen + Alles anzeigen -Zeigt den gesamten Seiteninhalt an +Zeigt die ganze Seite an View 1:1 - Anzeige 1:1 + Anzeige 1:1 Views without magnification - Anzeige ohne Vergrößerung + Anzeige ohne Vergrößerung View 1:1 Shows the page content without magnification - Anzeige 1:1 + Anzeige 1:1 Zeigt den Seiteninhalt ohne Vergrößerung an Zoom in - Vergrößern + Näher Zooms into the current view - Vergrößert die aktuelle Ansicht + Vergrößert die aktuelle Ansicht Zoom in Zooms the current view - Vergrößern + Näher Vergrößert die aktuelle Ansicht Zoom out - Verkleinern + Weiter Zooms out the current view - Verkleinert die aktuelle Ansicht + Verkleinert die aktuelle Ansicht Zoom out Zooms out the current view - Verkleinern - -Verkleinert die aktuelle Ansicht + Select - Auswählen + Auswählen Select mode @@ -9080,39 +9161,27 @@ Auswählmodus Select All - Alles auswählen + Alle auswählen Selects all elements - Wählt alle Elemente aus + Wählt alles aus Select All Selects all elements of the document - Alles auswählen + Alles auswählen Wählt alle Elemente im Dokument aus Rotate - Drehen - - - Rotates the selected component by 90° - Dreht die ausgewählte Komponente um 90° - - - Rotate - -Rotates the selected component by 90° counter-clockwise - Drehen - -Dreht die ausgewählte Komponente um 90° nach links + Drehen Mirror about X Axis - Spiegeln an der X-Achse + Spiegeln an der X-Achse Mirrors the selected item about X axis @@ -9122,13 +9191,13 @@ Dreht die ausgewählte Komponente um 90° nach links Mirror about X Axis Mirrors the selected item about X Axis - Spiegeln an der X-Achse + Spiegeln an der X-Achse Spiegelt die Auswahl an der X-Achse Mirror about Y Axis - Spiegeln an der Y-Achse + Spiegeln an der Y-Achse Mirrors the selected item about Y axis @@ -9138,13 +9207,11 @@ Spiegelt die Auswahl an der X-Achse Mirror about Y Axis Mirrors the selected item about Y Axis - Spiegeln an der Y-Achse - -Spiegelt die Auswahl an der Y-Achse + Spiegeln der Auswahl an der Y-Achse Go into Subcircuit - Gehe in den Schaltkreis hinein + Gehe in den Schaltkreis hinein Goes inside subcircuit @@ -9154,29 +9221,29 @@ Spiegelt die Auswahl an der Y-Achse Go into Subcircuit Goes inside the selected subcircuit - Gehe in den Schaltkreis hinein + Gehe in den Schaltkreis hinein Geht in den ausgewählten Schaltkreis hinein Pop out - Verlasse den Schaltkreis + Verlasse den Schaltkreis Pop outside subcircuit - Verläßt den Unterschaltkreis + Verläßt den Schaltkreis Pop out Goes up one hierarchy level, i.e. leaves subcircuit - Verlasse den Schaltkreis + Verlasse den Schaltkreis -Verläßt den Unterschaltkreis, d.h. ein Hierarchieebene nach oben +Verläßt den Schaltkreis in die nächsthöhere Hierachieebene Deactivate/Activate - Deaktivieren/Aktivieren + Deaktivieren/Aktivieren Deactivate/Activate the selected item @@ -9192,7 +9259,7 @@ Deaktiviert/Aktiviert die Auswahl Insert Equation - Gleichung einfügen + Gleichung einfügen Inserts equation @@ -9202,13 +9269,13 @@ Deaktiviert/Aktiviert die Auswahl Insert Equation Inserts a user defined equation - Gleichung einfügen + Gleichung einfügen Fügt eine benutzerdefinierte Gleichung ein Insert Ground - Masse einfügen + Masse einfügen Inserts ground @@ -9218,13 +9285,13 @@ Fügt eine benutzerdefinierte Gleichung ein Insert Ground Inserts a ground symbol - Masse einfügen + Masse einfügen Fügt das Massesymbol ein Insert Port - Anschluss einfügen + Anschluß einfügen Inserts port @@ -9234,9 +9301,9 @@ Fügt das Massesymbol ein Insert Port Inserts a port symbol - Anschluss einfügen + Anschluß einfügen -Fügt eine Anschlusssymbol ein +Fügt ein Anschlußsymbol ein Insert Wire @@ -9244,17 +9311,17 @@ Fügt eine Anschlusssymbol ein Wire - Draht + Draht Inserts a wire - Fügt einen Draht ein + Fügt einen Draht ein Wire Inserts a wire - Draht + Draht Fügt einen Draht ein @@ -9264,17 +9331,17 @@ Fügt einen Draht ein Wire Label - Verbindungs-Bezeichnung + Verbindungs-Bezeichnung Inserts a wire or pin label - Fügt eine Verbindungs- oder Knotenbezeichnung ein + Fügt eine Verbindungs- oder Knotenbezeichnung ein Wire Label Inserts a wire or pin label - Verbindungs-Bezeichnung + Verbindungs-Bezeichnung Fügt eine Verbindungs- oder Knotenbezeichnung ein @@ -9284,131 +9351,117 @@ Fügt eine Verbindungs- oder Knotenbezeichnung ein Text Editor - Texteditor + Starts the Qucs text editor - Startet den Qucs Texteditor + Text editor Starts the Qucs text editor - Texteditor - -Startet den Qucs Texteditor + Filter synthesis - Filtersynthese + Starts QucsFilter - Startet das QucsFilter Programm + Filter synthesis Starts QucsFilter - Filtersynthese - -Startet das QucsFilter Programm + Line calculation - Leitungsberechnung + Starts QucsTrans - Startet das QucsTrans Programm + Line calculation Starts transmission line calculator - Leitungsberechnung - -Startet das Programm für die Leitungsberechnung + Component Library - Komponentenbibliothek + Starts QucsLib - Startet QucsLib + Component Library Starts component library program - Komponentenbibliothek - -Startet das Komponentenbibliotheksprogramm + Matching Circuit - Anpassnetzwerk + Creates Matching Circuit - Erzeugt Anpassnetzwerk + Matching Circuit Dialog for Creating Matching Circuit - Anpassnetzwerk - -Dialog zum Erstellen eines Anpassnetzwerkes + Simulate - Simulieren + Simulieren Simulates the current schematic - Simuliert den aktuellen Schaltplan + Simuliert den aktuellen Schaltplan Simulate Simulates the current schematic - Simulieren + Simulieren Simuliert den aktuellen Schaltplan View Data Display/Schematic - Zeige Daten/Schaltplan an + Zeige Daten/Schaltplan an Changes to data display or schematic page - Wechselt zur Datenvisualisierung oder zum Schaltplan + Wechselt zur Datenvisualisierung oder zum Schaltplan View Data Display/Schematic - Zeige Daten/Schaltplan an - - + Calculate DC bias - Berechnung des DC-Arbeitspunktes + Calculates DC bias and shows it - Berechnet DC-Arbeitspunkt und zeigt diesen an + Calculate DC bias Calculates DC bias and shows it - Berechnung des DC-Arbeitspunktes - -Berechnet den DC-Arbeitspunkt und zeigt diesen an + Set Marker @@ -9416,49 +9469,49 @@ Berechnet den DC-Arbeitspunkt und zeigt diesen an Set Marker on Graph - Markierung auf Diagramm setzen + Markierung auf Diagramm setzen Sets a marker on a diagram's graph - Setzt eine Markierung auf einen Graphen im Diagramm + Setzt eine Markierung auf einen Graphen im Diagramm Set Marker Sets a marker on a diagram's graph - Markierung setzen + Markierung setzen Setzt eine Markierung auf einen Graphen im Diagramm Show Last Messages - Letzte Meldungen anzeigen + Letzte Meldungen anzeigen Shows last simulation messages - Letzte Simulatormeldungen anzeigen + Letzte Simulatormeldungen anzeigen Show Last Messages Shows the messages of the last simulation - Letzte Meldungen anzeigen + Letzte Meldungen anzeigen Zeigt die Meldungen der letzten Simulation an Show Last Netlist - Letzte Netzliste anzeigen + Letzte Netzliste anzeigen Shows last simulation netlist - Zeigt die zuletzt simulierte Netzliste an + Zeigt die zuletzt simulierte Netzliste an Show Last Netlist Shows the netlist of the last simulation - Letzte Netzliste anzeigen + Letzte Netzliste anzeigen Zeigt die zuletzt simulierte Netzliste an @@ -9468,19 +9521,19 @@ Zeigt die zuletzt simulierte Netzliste an Tool&bar - Werkzeug&leiste + Werkzeug&leiste Enables/disables the toolbar - Schaltet die Werkzeugleiste ein/aus + Schaltet die Werkzeugleiste an/aus Toolbar Enables/disables the toolbar - Werkzeugleiste + Werkzeugleiste -Schaltet die Werkzeugleiste ein/aus +Schaltet die Werkzeugleiste an/aus Statusbar @@ -9488,19 +9541,19 @@ Schaltet die Werkzeugleiste ein/aus &Statusbar - &Statuszeile + &Statuszeile Enables/disables the statusbar - Schaltet die Statuszeile ein/aus + Aktiviert/Deaktiviert die Statuszeile Statusbar Enables/disables the statusbar - Statuszeile + Statuszeile -Schaltet die Statuszeile ein/aus +Aktiviert/Deaktiviert die Statuszeile Help Index @@ -9508,17 +9561,17 @@ Schaltet die Statuszeile ein/aus Help Index... - Hilfeindex... + Hilfeindex... Index of Qucs Help - Index der Qucs Hilfe + Index der Qucs Hilfe Help Index Index of intern Qucs help - Hilfe Index + Hilfe Index Index der internen Qucs Hilfe @@ -9528,17 +9581,17 @@ Index der internen Qucs Hilfe Getting Started... - Starthilfe... + Starthilfe... Getting Started with Qucs - Starthilfe für Qucs + Starthilfe für Qucs Getting Started Short introduction into Qucs - Starthilfe + Starthilfe Kurze Einführung in Qucs @@ -9548,33 +9601,33 @@ Kurze Einführung in Qucs &About Qucs... - &Über Qucs... + Ü&ber Qucs.. About the application - Über die Applikation + Über die Applikation About About the application - Über + Über Über die Applikation About Qt - Über Qt + Über Qt About Qt... - Über Qt... + About Qt About Qt by Trolltech - Über Qt + Über Qt Über Qt von Trolltech @@ -9584,43 +9637,43 @@ About Qt by Trolltech &File - &Datei + &Datei &Edit - &Bearbeiten + &Bearbeiten &Insert - &Einfügen + &Einfügen &Project - &Projekt + &Projekt &Tools - &Werkzeuge + &Simulation - &Simulation + &Simulation &View - &Ansicht + &Ansicht &Help - &Hilfe + &Hilfe Warnings in last simulation! Press F5 - In der letzten Simulation sind Warnungen aufgetreten! Drücken Sie F5 + no warnings - keine Warnungen + keine Warnungen Toggle toolbar... @@ -9632,59 +9685,59 @@ About Qt by Trolltech About... - Über... + Qucs Version - Qucs Version + Quite Universal Circuit Simulator - Ziemlich Universeller Schaltungssimulator + Copyright (C) - Copyright (C) + by Michael Margraf - by Michael Margraf + Simulator by Stefan Jahn - Simulator von Stefan Jahn + VHDL simulator 'FreeHDL' by Edwin Naroska and Marius Vollmer - VHDL-Simulator 'FreeHDL' von Edwin Naroska und Marius Vollmer + Special thanks to Jens Flucke and Raimund Jacob - Besonderen Dank an Jens Flucke und Raimund Jacob + Many thanks to Mike Brinson for correcting the VHDL output - Vielen Dank an Mike Brinson für Verbesserungen an den VHDL-Ausgaben + Translations: - Übersetzungen: + Übersetzungen: German by Stefan Jahn - Deutsch von Stefan Jahn + Polish by Dariusz Pienkowski - Polnisch von Dariusz Pienkowski + Romanian by Radu Circa - Rumänisch von Radu Circa + French by Vincent Habchi, F5RCS - Französisch von Vincent Habchi, F5RCS + Portuguese by Luciano Franca @@ -9692,31 +9745,31 @@ About Qt by Trolltech Spanish by Jose L. Redrejo Rodriguez - Spanisch von Jose L. Redrejo Rodriguez + Japanese by Toyoyuki Ishikawa - Japanisch von Toyoyuki Ishikawa + Italian by Giorgio Luparia and Claudio Girardi - Italienisch von Giorgio Luparia und Claudio Girardi + Hebrew by Dotan Nahum - Hebräisch von Dotan Nahum + Swedish by Peter Landgren - Schwedisch von Peter Landgren + Turkish by Onur and Ozgur Cobanoglu - Türkisch von Onur und Ozgur Cobanoglu + Hungarian by Jozsef Bus - Ungarisch von Jozsef Bus + Find @@ -9724,99 +9777,89 @@ About Qt by Trolltech Find... - Suchen... + Find a piece of text - Sucht einen Textausschnitt + Find Searches for a piece of text - Suchen - -Sucht nach einem Textausschnitt + Find Again - Weitersuchen + Find same text again - Sucht nach dem gleichen Textausschnitt + Find Searches for the same piece of text again - Suchen - -Sucht nach dem gleichen Text noch einmal + The document was modified by another program ! - Das Dokument wurde durch ein anderes Programm modifiziert ! + Do you want to reload or keep this version ? - Soll neu geladen werden oder mit dieser Version weitergearbeitet werden ? + Reload - Neu laden + Keep it - Erhalten + &Document Settings... - &Dokumenteneinstellungen... + Cuts out the selection and puts it into the clipboard - Schneidet die Auswahl aus und legt sie in die Zwischenablage + Cut Cuts out the selection and puts it into the clipboard - Ausschneiden - -Schneidet die Auswahl aus und legt sie in die Zwischenablage + Copies the selection into the clipboard - Kopiert die Auswahl in die Zwischenablage + Copy Copies the selection into the clipboard - Kopieren - -Kopiert die Auswahl in die Zwischenablage + Show the whole page - Vollständige Seite anzeigen + Activate select mode - Aktivieren des Auswahlmodus + Select Activates select mode - Auswählen - -Aktiviert den Auswahlmodus + VHDL entity - VHDL-Entität + Inserts sceleton of VHDL entity @@ -9832,23 +9875,21 @@ Fügt das Gerüst einer VHDL-Entität ein Russian by Igor Gorbounov - Russisch von Igor Gorbounov + Inserts skeleton of VHDL entity - Fügt das Gerüst einer VHDL-Entität ein + VHDL entity Inserts the skeleton of a VHDL entity - VHDL-Entität - -Fügt das Gerüst einer VHDL-Entität ein + Replace... - Ersetzen... + Replace @@ -9856,39 +9897,31 @@ Fügt das Gerüst einer VHDL-Entität ein Change component properties or text in VHDL code - Ersetzen - -Komponenteneigenschaften verändern -oder -Text im VHDL-Code ersetzen + Deactivate/Activate selected components - Deaktivieren/Aktivieren der ausgewählten Komponenten + Deactivate/Activate Deactivate/Activate the selected components - Deaktivieren/Aktivieren - -Deaktivieren/Aktivieren der ausgewählten Komponenten + Select Markers - Markierungen auswählen + Selects all markers - Wählt alle Markierungen aus + Select Markers Selects all diagram markers of the document - Markierungen auswählen - -Wählt alle Diagramm-Markierungen im Dokument aus + Align/Distribute @@ -9896,99 +9929,91 @@ Wählt alle Diagramm-Markierungen im Dokument aus Please open project with subcircuits! - Bitte öffnen Sie ein Projekt mit Unterschaltkreisen darin! + Create &Library... - &Bibliothek erzeugen... + Create Library from Subcircuits - Bibliothek aus Unterschaltkreisen erzeugen + Create Library Create Library from Subcircuits - Bibliothek erzeugen - -Bibliothek aus Unterschaltkreisen erzeugen + Cannot delete file: - Datei kann nicht gelöscht werden: + Cannot remove directory: - Das Verzeichnis kann nicht gelöscht werden: + Please open project first! - Bitte öffnen Sie zuerst ein Projekt! + Please select a diagram graph! - Bitte wählen Sie eine Diagrammkurve an! + CSV file - CSV Datei + Enter an Output File Name - Geben Sie einen Ausgabedateinamen ein + Output file already exists! - Die Ausgabedatei existiert bereits! + Die Ausgabedatei existiert bereits! Overwrite it? - Überschreiben? + Überschreiben? Print Fit to Page... - Alles auf eine Seite drucken... + Print Fit to Page Print and fit content to the page size - Alles auf eine Seite drucken - -Inhalt wird auf die Seitengröße angepasst und gedruckt + Create &Package... - &Packet erzeugen... + Create compressed Package from Projects - Erzeugt komprimiertes Packet aus Projekten + Create Package Create compressed Package from complete Projects - Packet erzeugen - -Erzeugt komprimiertes Packet aus vollständigen Projekten + E&xtract Package... - Packet e&xtrahieren... + Install Content of a Package - Installiert Inhalt eines Packetes + Extract Package Install Content of a Package - Packet extrahieren - -Installiert Inhalt eines Packetes + &Import Data... @@ -10008,187 +10033,177 @@ Konvertiert Datei in eine Qucs Datendatei Export to &CSV... - Exportieren nach &CSV... + Convert graph data to CSV file - Konvertiert Kurvendaten in eine CSV Datei + Export to CSV Convert graph data to CSV file - Exportieren nach CSV - -Konvertiert Kurvendaten in eine CSV Datei + &Dock Window - &Auswahlfenster + Enables/disables the browse dock window - Blendet das Auswahlfenster ein/aus + Browse Window Enables/disables the browse dock window - Auswahlfenster - -Blendet das Auswahlfenster ein/aus + Printer Error. - Druckerfehler. + Cannot start attenuator calculation program! - Das Programm für die Dämpfungsgliedberechnung kann nicht gestartet werden! + Attenuator synthesis - Dämpfungsgliedsynthese + Starts QucsAttenuator - Startet das QucsAttenuator Programm + Attenuator synthesis Starts attenuator calculation program - Dämpfungsgliedsynthese - -Startet das Programm zur Berechnung von Dämpfungsgliedern + GUI improvements by Gopala Krishna A - Verbesserungen an der GUI von Gopala Krishna A + Czech by Marek Straka - Tschechisch von Marek Straka + Catalan by Antoni Subirats - Katalanisch von Antoni Subirats + Center horizontally - Horizontal zentrieren + Center horizontally selected elements - Ausgewählte Elemente horizontal zentrieren + Center horizontally Center horizontally selected elements - Horizontal zentrieren - -Zentriert ausgewählte Elemente horizontal + Center vertically - Vertikal zentrieren + Center vertically selected elements - Ausgewählte Elemente vertikal zentrieren + Center vertically Center vertically selected elements - Vertikal zentrieren - -Zentriert ausgewählte Elemente vertikal + P&ositioning - P&ositionierung + Verilog-AMS interface by Helene Parruitte - Verilog-AMS Schnittstelle von Helene Parruitte + Print Fit to Page - Alles auf eine Seite drucken + Sets selected elements on grid - Setzt ausgewählte Elemente auf das Gitternetz + Moves the property text of components - Verschiebt den Eigenschaftentext von Komponenten + Replace component properties or VHDL code - Ersetze Komponenteneigenschaften oder VHDL-Code + Opens an existing project - Öffnet ein existierendes Projekt + Deletes an existing project - Löscht ein existierendes Projekt + Closes the current project - Schließt das aktuelle Projekt + Mirrors the selected item about X Axis - Spiegelt die Auswahl an der X-Achse + Mirrors the selected item about Y Axis - Spiegelt die Auswahl an der Y-Achse + Goes inside the selected subcircuit - Geht in den ausgewählten Schaltkreis hinein + Inserts an equation - Fügt eine Gleichung ein + Inserts a ground symbol - Fügt eine Massesymbol ein + Inserts a port symbol - Fügt eine Anschlusssymbol ein + Save - Speichern + Speichern Save All - Alles speichern + Close - Schließen + Schließen Print... - Drucken... + Verilog Sources - Verilog Quellen + Verilog - Verilog + Cannot delete Verilog source: @@ -10204,27 +10219,25 @@ Zentriert ausgewählte Elemente vertikal &Import/Export Data... - Daten &Import/Export... + Convert data file - Datendatei konvertieren + Import/Export Data Convert data file to various file formats - Daten Import/Export - -Konvertiert Datendatei in verschiedene Datenformate + Portuguese by Luciano Franca and Helio de Sousa - Portugiesisch von Luciano Franca und Helio de Sousa + Arabic by Chabane Noureddine - Arabisch von Chabane Noureddine + Kazakh by Erbol Keshubaev @@ -10290,124 +10303,154 @@ Konvertiert Datendatei in verschiedene Datenformate Cannot delete %1: "%2"! + + Octave Scripts + + + + Octave + + + + &Octave Window + + + + Shows/hides the Octave dock window + + + + Octave Window + +Shows/hides the Octave dock window + + + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator E&xit - &Beenden + &Beenden Help... - Hilfe... + &About QucsAttenuator... - &Über QucsAttenuator... + About Qt... - Über Qt... + &File - &Datei + &Datei &Help - &Hilfe + &Hilfe Attenuation: - Dämpfung: + 1 - 1 + 1 dB - dB + Zin: - Zin: + 50 - 50 + 50 Zout: - Zout: + Calculate and put into Clipboard - Berechnen und in die Zwischenablage kopieren + R1: - R1: + -- - -- + Ohm - Ohm + R2: - R2: + R3: - R3: + Result: - Ergebnis: + About Qt - Über Qt + Über Qt About... - Über... + Attenuator synthesis program - -Programm zur Dämpfungsgliedsynthese - + Copyright (C) 2006 by - Copyright (C) 2006 von + Copyright (C) 2006 von Topology - Topologie + Input - Eingabeparameter + Output - Ausgabe + Success! - Erfolg! + Error: Set Attenuation more than %1 dB - Fehler: Setzen Sie die Dämpfung auf mehr als %1 dB + @@ -10960,7 +11003,7 @@ Aktiviert/Deaktiviert die Statuszeile About - Über + Über &About Qucs... @@ -11180,7 +11223,7 @@ Wollen Sie die Änderungen vor dem Schließen speichern? &Discard - &Verwerfen + Cancel @@ -11224,7 +11267,7 @@ Wollen Sie die Änderungen vor dem Schließen speichern? About... - Über... + Qucs Version @@ -11318,7 +11361,7 @@ Fehler: Error - Fehler + Fehler No page set ! @@ -11804,7 +11847,7 @@ Setzt eine Markierung auf einen Graphen im Diagramm Enter a Document Name - Geben Sie einen Dokumentennamen ein + Qucs Documents (*.sch *.dpl);; Any File (*) @@ -11962,11 +12005,11 @@ Bearbeitet den Schaltplan File: - Datei: + Datei: Quit - Beenden + Qucs Editor Version @@ -11988,51 +12031,50 @@ Einfacher Texteditor für Qucs Enter a Filename - Geben Sie einen Dateinamen ein + Cannot write file: - Datei kann nicht geschrieben werden: + Cannot read file: - Datei kann nicht gelesen werden: + Closing document - Schließe Dokument + The text contains unsaved changes! - Der Text enthält ungespeicherte Änderungen! - + Do you want to save the changes? - Wollen Sie die Änderungen abspeichern? + &Save - &Speichern + &Speichern Very simple text editor for Qucs - + Einfacher Texteditor für Qucs Copyright (C) 2004, 2005 by Michael Margraf - Copyright (C) 2004, 2005 by Michael Margraf + Copyright (C) 2004, 2005 by Michael Margraf &Cancel - &Abbrechen + &Abbrechen Row: %1 - Column: %2 @@ -12040,86 +12082,84 @@ Einfacher Texteditor für Qucs Line: %1 - Column: %2 - Zeile: %1 - Spalte: %2 + QucsFilter E&xit - &Beenden + &Beenden Help... - Hilfe... + &About QucsFilter... - Ü&ber QucsFilter... + About Qt... - Über Qt... + &File - &Datei + &Datei &Help - &Hilfe + &Hilfe Filter type: - Filtertyp: + Filter class: - Filterklasse: + Low pass - Tiefpass + High pass - Hochpass + Order: - Ordnung: + Corner frequency: - Grenzfrequenz: + Stop frequency: - Stopfrequenz: + Pass band ripple: - Durchlasswelligkeit: + Impedance: - Impedanz: + Impedanz: Calculate and put into Clipboard - Berechnen und in die Zwischenablage kopieren + About... - Über... + Filter synthesis program - -Filtersynthese-Programm - + Copyright (C) 2005 by Toyoyuki Ishikawa and Michael Margraf @@ -12129,27 +12169,27 @@ Filtersynthese-Programm About Qt - Über Qt + Über Qt Result: - Ergebnis: + Result: -- - Ergebnis: -- + Successful - Erfolgreich + Band pass - Bandpass + Band stop - Bandsperre + Copyright (C) 2005 by @@ -12157,50 +12197,50 @@ Filtersynthese-Programm Error - Fehler + Fehler Stop frequency must be greater than start frequency. - Die Stopfrequenz muss größer als die Startfrequenz sein. + Filter order must not be less than two. - Die FIlterordnung darf nicht kleiner als zwei sein. + Start frequency: - Startfrequenz: + Bessel filter order must not be greater than 19. - Die Ordnung des Besselfilters darf nicht größer als 19 sein. + Stop band frequency: - Sperrbandfrequenz: + Stop band attenuation: - Sperrbanddämpfung: + Pass band frequency: - Durchlassbandfrequenz: + Pass band attenuation: - Durchlassbanddämpfung: + Copyright (C) 2005, 2006 by - Copyright (C) 2005, 2006 von + Copyright (C) 2005, 2006 von QucsHelp Qucs Help System - Qucs Hilfesystem + Qucs Hilfesystem Help Index @@ -12212,67 +12252,65 @@ Filtersynthese-Programm &Quit - &Beenden + &Back - &Zurück + &Forward - &Vorwärts + &Home - &Startseite + &Previous - V&orherige + &Next - &Nächste + Home - Startseite + &Table of Contents - &Inhaltsverzeichnis + Enables/disables the table of contents - Schaltet das Inhaltsverzeichnis ein/aus + Table of Contents Enables/disables the table of contents - Inhaltsverzeichnis - -Schaltet das Inhaltsverzeichnis ein/aus + &About Qt - Über &Qt + &File - &Datei + &Datei &View - &Ansicht + &Ansicht &Help - &Hilfe + &Hilfe Contents - Inhalte + @@ -12465,6919 +12503,9 @@ Beendet die Applikation Cu&t Aus&schneiden - - Cuts the selected section and puts it to the clipboard - Schneidet den ausgewählten Bereich aus und kopiert diesen in die Zwischenablage -======= - lumped components - - - - sources - - - - probes - - - - transmission lines - - - - nonlinear components - - - - verilog-a devices - - - - digital components - - - - file components - - - - simulations - - - - diagrams - - - - paintings - - - - Edit Properties - - - - power matching - - - - noise matching - - - - 2-port matching - - Info - Information - - - The ground potential cannot be labeled! - - - - Cannot create output file! - - - - Cannot save C++ file "%1"! - - - - WARNING: Skipping library component "%1". - - - - ERROR: No file name in %1 component "%2". - - - - WARNING: Equations in "%1" are 'time' typed. - - - - noise figure - - - - 4x2 andor verilog device - - - - transfer function high scaling factor - - - - output delay - - - - s - - - - 4x2 AndOr - - - - 4x3 andor verilog device - - - - 4x3 AndOr - - - - 4x4 andor verilog device - - - - 4x4 AndOr - - - - 4bit binary to grey converter verilog device - - - - transfer function scaling factor - - - - 4Bit Bin2Grey - - - - bond wire - - - - length of the wire - - - - diameter of the wire - - - - height above ground plane - - - - specific resistance of the metal - - - - relative permeability of the metal - - - - bond wire model - - - - Bond Wire - - - - initial voltage for transient simulation - - - - 1bit comparator verilog device - - - - 1Bit Comparator - - - - 2bit comparator verilog device - - - - 2Bit Comparator - - - - 4bit comparator verilog device - - - - 4Bit Comparator - - - - coupled transmission lines - - - - characteristic impedance of even mode - - - - characteristic impedance of odd mode - - - - relative dielectric constant of even mode - - - - relative dielectric constant of odd mode - - - - attenuation factor per length of even mode - - - - attenuation factor per length of odd mode - - - - Coupled Transmission Line - - - - D flip flop with set and reset verilog device - - - - cross coupled gate transfer function high scaling factor - - - - cross coupled gate transfer function low scaling factor - - - - cross coupled gate delay - - - - D-FlipFlop w/ SR - - - - diac (bidirectional trigger diode) - - - - (bidirectional) breakover voltage - - - - (bidirectional) breakover current - - - - parasitic capacitance - - - - intrinsic junction resistance - - - - simulation temperature - - - - Diac - - - - netlist format - - - - high-injection knee current (0=infinity) - - - - data voltage level shifter (digital to analogue) verilog device - - - - voltage level - - - - time delay - - - - D2A Level Shifter - - - - data voltage level shifter (analogue to digital) verilog device - - - - V - - - - A2D Level Shifter - - - - 2to4 demultiplexer verilog device - - - - 2to4 Demux - - - - 3to8 demultiplexer verilog device - - - - 3to8 Demux - - - - 4to16 demultiplexer verilog device - - - - 4to16 Demux - - - - EPFL-EKV MOS 2.6 verilog device - - - - long = 1, short = 2 - - - - length parameter - - - - m - - - - Width parameter - - - - parallel multiple device number - - - - series multiple device number - - - - gate oxide capacitance per unit area - - - - F/m**2 - - - - metallurgical junction depth - - - - channel width correction - - - - channel length correction - - - - long channel threshold voltage - - - - body effect parameter - - - - V**(1/2) - - - - bulk Fermi potential - - - - A/V**2 - - - - mobility reduction coefficient - - - - 1/V - - - - mobility coefficient - - - - V/m - - - - longitudinal critical field - - - - depletion length coefficient - - - - narrow-channel effect coefficient - - - - reverse short channel charge density - - - - A*s/m**2 - - - - characteristic length - - - - threshold voltage temperature coefficient - - - - V/K - - - - mobility temperature coefficient - - - - Longitudinal critical field temperature exponent - - - - Ibb temperature coefficient - - - - 1/K - - - - heavily doped diffusion length - - - - drain/source diffusion sheet resistance - - - - Ohm/square - - - - source contact resistance - - - - Ohm - - - - drain contact resistance - - - - gate to source overlap capacitance - - - - F/m - - - - gate to drain overlap capacitance - - - - gate to bulk overlap capacitance - - - - first impact ionization coefficient - - - - 1/m - - - - second impact ionization coefficient - - - - saturation voltage factor for impact ionization - - - - area related theshold voltage mismatch parameter - - - - V*m - - - - area related gain mismatch parameter - - - - area related body effect mismatch parameter - - - - sqrt(V)*m - - - - A - - - - F - - - - diode relative area - - - - charge partition parameter - - - - Celsius - - - - EPFL-EKV NMOS 2.6 - - - - EPFL-EKV PMOS 2.6 - - - - equation defined device - - - - type of equations - - - - number of branches - - - - current equation - - - - charge equation - - - - Equation Defined Device - - - - 1bit full adder verilog device - - - - 1Bit FullAdder - - - - 2bit full adder verilog device - - - - 2Bit FullAdder - - - - gated D latch verilog device - - - - Gated D-Latch - - - - 4bit grey to binary converter verilog device - - - - 4Bit Grey2Bin - - - - 1bit half adder verilog device - - - - 1Bit HalfAdder - - - - HBT model by Ferdinand-Braun-Institut (FBH), Berlin - - - - Ignored - - - - Device operating temperature, Celsius - - - - Thermal resistance, K/W - - - - Thermal capacitance - - - - Scaling factor, number of emitter fingers - - - - Length of emitter finger, m - - - - Width of emitter finger, m - - - - Forward saturation current density, A/um^2 - - - - Forward current emission coefficient - - - - Forward thermal activation energy, V, (0 == disables temperature dependence) - - - - B-E leakage saturation current density, A/um^2 - - - - B-E leakage emission coefficient - - - - Limiting resistor of B-E leakage diode, Ohm - - - - B-E leakage thermal activation energy, V, (0 == disables temperature dependence) - - - - 2nd B-E leakage saturation current density, A/um^2 - - - - 2nd B-E leakage emission coefficient - - - - 2nd Limiting resistor of B-E leakage diode, Ohm - - - - 2nd B-E leakage thermal activation energy, V, (0 == disables temperature dependence) - - - - Reverse saturation current density, A/um^2 - - - - Reverse current emission coefficient - - - - Reverse thermal activation energy, V, (0 == disables temperature dependence) - - - - Fraction of Cjc that goes to internal base node - - - - B-C leakage saturation current density, A/um^2 (0. switches off diode) - - - - B-C leakage emission coefficient (0. switches off diode) - - - - Limiting resistor of B-C leakage diode, Ohm - - - - B-C leakage thermal activation energy, V, (0 == disables temperature dependence) - - - - Ideal forward beta - - - - Temperature coefficient of forward current gain, -1/K, (0 == disables temperature dependence) - - - - Ideal reverse beta - - - - Forward Early voltage, V, (0 == disables Early Effect) - - - - Reverse Early voltage, V, (0 == disables Early Effect) - - - - Forward high-injection knee current, A, (0 == disables Webster Effect) - - - - Reverse high-injection knee current, A, (0 == disables Webster Effect) - - - - C-E breakdown exponent, (0 == disables collector break-down) - - - - C-E breakdown voltage, V, (0 == disables collector break-down) - - - - C-E breakdown factor, (0 == disables collector break-down) - - - - B-E breakdown voltage, V, (0 == disables emitter break-down) - - - - Ideal reverse transit time, s - - - - Extrinsic BC diffusion capacitance, F - - - - Ideal forward transit time, s - - - - Temperature coefficient of forward transit time - - - - Excess transit time coefficient at base push-out - - - - Smoothing parameter for Thcs - - - - B-E zero-bias depletion capacitance, F/um^2 - - - - B-E junction exponential factor - - - - B-E junction built-in potential, V - - - - B-C zero-bias depletion capacitance, F/um^2 - - - - B-C junction exponential factor - - - - B-C junction built-in potential, V - - - - not used - - - - Minimum B-C depletion capacitance (Vbc dependence), F/um^2 - - - - Collector current where Cbc reaches Cmin, A/um^2 (0 == disables Cbc reduction) - - - - Fraction of Cmin, lower limit of BC capacitance (Ic dependence) - - - - Onset of base push-out at low voltages, Ohm*um^2 (0 == disables base push-out) - - - - Onset of base push-out at high voltages, A/um^2, (0 == disables base push-out) - - - - Slope of Jk at high currents , Ohm*um^2 - - - - Voltage shift of base push-out onset, V - - - - Collector resistance, Ohm/finger - - - - Emitter resistance, Ohm/finger - - - - Extrinsic base resistance, Ohm/finger - - - - Inner Base ohmic resistance, Ohm/finger - - - - Collector inductance, H - - - - Emitter inductance, H - - - - Base inductance, H - - - - Extrinsic B-C capacitance, F - - - - Extrinsic base capacitance, F - - - - Extrinsic collector capacitance, F - - - - Flicker-noise coefficient - - - - Flicker-noise exponent - - - - Flicker-noise frequency exponent - - - - Burst noise coefficient - - - - Burst noise exponent - - - - Burst noise corner frequency, Hz - - - - Ambient temperature at which the parameters were determined - - - - FBH HBT - - - - HICUM Level 0 v1.12 verilog device - - - - (Modified) saturation current - - - - Non-ideality coefficient of forward collector current - - - - Non-ideality coefficient of reverse collector current - - - - forward Early voltage (normalization volt.) - - - - forward d.c. high-injection roll-off current - - - - inverse d.c. high-injection roll-off current - - - - high-injection correction current - - - - high-injection correction factor - - - - BE saturation current - - - - BE non-ideality factor - - - - BE recombination saturation current - - - - BE recombination non-ideality factor - - - - BC saturation current - - - - BC non-ideality factor - - - - Zero-bias BE depletion capacitance - - - - BE built-in voltage - - - - BE exponent factor - - - - Ratio of maximum to zero-bias value - - - - low current transit time at Vbici=0 - - - - Base width modulation contribution - - - - SCR width modulation contribution - - - - Storage time in neutral emitter - - - - Exponent factor for emitter transit time - - - - Saturation time at high current densities - - - - Smoothing factor for current dependence - - - - Storage time at inverse operation - - - - Low-field collector resistance under emitter - - - - Voltage dividing ohmic and satur.region - - - - Punch-through voltage - - - - Saturation voltage - - - - Total zero-bias BC depletion capacitance - - - - BC built-in voltage - - - - BC exponent factor - - - - Punch-through voltage of BC junction - - - - Zero-bias external BC depletion capacitance - - - - External BC built-in voltage - - - - External BC exponent factor - - - - Split factor = Cjci0/Cjc0 - - - - Internal base resistance at zero-bias - - - - Geometry factor - - - - External base series resistance - - - - Emitter series resistance - - - - External collector series resistance - - - - Substrate transistor transfer saturation current - - - - Substrate transistor transfer current non-ideality factor - - - - SC saturation current - - - - SC non-ideality factor - - - - Zero-bias SC depletion capacitance - - - - SC built-in voltage - - - - External SC exponent factor - - - - SC punch-through voltage - - - - Collector-base isolation (overlap) capacitance - - - - Emitter-base oxide capacitance - - - - Exponent factor - - - - Prefactor - - - - M^(1-AF) - - - - flicker noise exponent factor - - - - Bandgap-voltage - - - - Effective emitter bandgap-voltage - - - - Effective collector bandgap-voltage - - - - Effective substrate bandgap-voltage - - - - Coefficient K1 in T-dependent bandgap equation - - - - Coefficient K2 in T-dependent bandgap equation - - - - Frist-order TC of tf0 - - - - Second-order TC of tf0 - - - - 1/K^2 - - - - Exponent coefficient in transfer current temperature dependence - - - - Exponent coefficient in BE junction current temperature dependence - - - - TC of epi-collector diffusivity - - - - Relative TC of satur.drift velocity - - - - Relative TC of vces - - - - TC of internal base resistance - - - - TC of external base resistance - - - - TC of external collector resistance - - - - TC of emitter resistances - - - - TC of avalanche prefactor - - - - TC of avalanche exponential factor - - - - Flag for self-heating calculation - - - - Thermal resistance - - - - K/W - - - - Ws/K - - - - Temperature for which parameters are valid - - - - C - - - - Temperature change for particular transistor - - - - K - - - - npn HICUM L0 v1.12 - - - - pnp HICUM L0 v1.12 - - - - HICUM Level 2 v2.22 verilog device - - - - GICCR constant - - - - A^2s - - - - Zero-bias hole charge - - - - Coul - - - - High-current correction for 2D and 3D effects - - - - Emitter minority charge weighting factor in HBTs - - - - Collector minority charge weighting factor in HBTs - - - - B-E depletion charge weighting factor in HBTs - - - - B-C depletion charge weighting factor in HBTs - - - - Internal B-E saturation current - - - - Internal B-E current ideality factor - - - - Internal B-E recombination saturation current - - - - Internal B-E recombination current ideality factor - - - - Peripheral B-E saturation current - - - - Peripheral B-E current ideality factor - - - - Peripheral B-E recombination saturation current - - - - Peripheral B-E recombination current ideality factor - - - - Non-ideality factor for III-V HBTs - - - - Base current recombination time constant at B-C barrier for high forward injection - - - - Internal B-C saturation current - - - - Internal B-C current ideality factor - - - - External B-C saturation current - - - - External B-C current ideality factor - - - - B-E tunneling saturation current - - - - Exponent factor for tunneling current - - - - Specifies the base node connection for the tunneling current - - - - Avalanche current factor - - - - Exponent factor for avalanche current - - - - Relative TC for FAVL - - - - Relative TC for QAVL - - - - Zero bias internal base resistance - - - - Factor for geometry dependence of emitter current crowding - - - - Correction factor for modulation by B-E and B-C space charge layer - - - - Ratio of HF shunt to total internal capacitance (lateral NQS effect) - - - - Ration of internal to total minority charge - - - - Forward ideality factor of substrate transfer current - - - - C-S diode saturation current - - - - Ideality factor of C-S diode current - - - - Transit time for forward operation of substrate transistor - - - - Substrate series resistance - - - - Substrate shunt capacitance - - - - Internal B-E zero-bias depletion capacitance - - - - Internal B-E built-in potential - - - - Internal B-E grading coefficient - - - - Ratio of maximum to zero-bias value of internal B-E capacitance - - - - Peripheral B-E zero-bias depletion capacitance - - - - Peripheral B-E built-in potential - - - - Peripheral B-E grading coefficient - - - - Ratio of maximum to zero-bias value of peripheral B-E capacitance - - - - Internal B-C zero-bias depletion capacitance - - - - Internal B-C built-in potential - - - - Internal B-C grading coefficient - - - - Internal B-C punch-through voltage - - - - External B-C zero-bias depletion capacitance - - - - External B-C built-in potential - - - - External B-C grading coefficient - - - - External B-C punch-through voltage - - - - Partitioning factor of parasitic B-C cap - - - - Partitioning factor of parasitic B-E cap - - - - C-S zero-bias depletion capacitance - - - - C-S built-in potential - - - - C-S grading coefficient - - - - C-S punch-through voltage - - - - Low current forward transit time at VBC=0V - - - - Time constant for base and B-C space charge layer width modulation - - - - Time constant for modelling carrier jam at low VCE - - - - Neutral emitter storage time - - - - Exponent factor for current dependence of neutral emitter storage time - - - - Saturation time constant at high current densities - - - - Smoothing factor for current dependence of base and collector transit time - - - - Partitioning factor for base and collector portion - - - - Internal collector resistance at low electric field - - - - Voltage separating ohmic and saturation velocity regime - - - - Internal C-E saturation voltage - - - - Collector punch-through voltage - - - - Storage time for inverse operation - - - - Total parasitic B-E capacitance - - - - Total parasitic B-C capacitance - - - - Factor for additional delay time of minority charge - - - - Factor for additional delay time of transfer current - - - - Flag for turning on and off of vertical NQS effect - - - - Flicker noise coefficient - - - - Flicker noise exponent factor - - - - Flag for determining where to tag the flicker noise source - - - - Scaling factor for collector minority charge in direction of emitter width - - - - Scaling factor for collector minority charge in direction of emitter length - - - - Bandgap voltage extrapolated to 0 K - - - - First order relative TC of parameter T0 - - - - Second order relative TC of parameter T0 - - - - Temperature exponent for RCI0 - - - - Relative TC of saturation drift velocity - - - - Relative TC of VCES - - - - Temperature exponent of internal base resistance - - - - Temperature exponent of external base resistance - - - - Temperature exponent of external collector resistance - - - - Temperature exponent of emitter resistance - - - - Temperature exponent of mobility in substrate transistor transit time - - - - Effective emitter bandgap voltage - - - - Effective collector bandgap voltage - - - - Effective substrate bandgap voltage - - - - Coefficient K1 in T-dependent band-gap equation - - - - Coefficient K2 in T-dependent band-gap equation - - - - Exponent coefficient in B-E junction current temperature dependence - - - - Relative TC of forward current gain for V2.1 model - - - - Flag for turning on and off self-heating effect - - - - J/W - - - - Flag for compatibility with v2.1 model (0=v2.1) - - - - Temperature at which parameters are specified - - - - Temperature change w.r.t. chip temperature for particular transistor - - - - HICUM L2 v2.22 - - - - HICUM Level 0 v1.2 verilog device - - - - reverse Early voltage (normalization volt.) - - - - flag for turning on base related critical current - - - - Smoothing factor for the d.c. injection width - - - - BE charge built-in voltage for d.c. transfer current - - - - charge BE exponent factor for d.c. transfer current - - - - BE capacitance ratio (maximum to zero-bias value) for d.c. transfer current - - - - TC of iqf - - - - Exponent factor for temperature dependent thermal resistance - - - - npn HICUM L0 v1.2 - - - - pnp HICUM L0 v1.2 - - - - HICUM Level 0 v1.2g verilog device - - - - high-injection roll-off current - - - - TC of iqf (bandgap coefficient of zero bias hole charge) - - - - TC of avalanche prefactor, identical to alfav of Hicum/L2 - - - - TC of avalanche exponential factor, identical to alqav of Hicum/L2 - - - - Emitter part coefficient of the zero bias hole charge temperature variation - - - - Collector part coefficient of the zero bias hole charge temperature variation - - - - Bandgap TC parameter of ver - - - - Bandgap TC parameter of vef - - - - Specific recombination current at the BC barrier for high forward injection - - - - npn HICUM L0 v1.2g - - - - pnp HICUM L0 v1.2g - - - - HICUM Level 0 v1.3 verilog device - - - - Flag for using third order solution for transfer current - - - - bias dependence for reverse Early voltage - - - - Flag for turning temperature dependence of tef0 on and off - - - - TC of Reverse Early voltage - - - - TC of AVER - - - - Bandgap difference between base and BE-junction - - - - Frist-order TC of iqfh - - - - Second-order TC of iqfh - - - - npn HICUM L0 v1.3 - - - - pnp HICUM L0 v1.3 - - - - HICUM Level 2 v2.1 verilog device - - - - Partitioning factor of parasitic B-C capacitance - - - - Noise factor for internal base resistance - - - - HICUM L2 v2.1 - - - - HICUM Level 2 v2.23 verilog device - - - - HICUM L2 v2.23 - - - - HICUM Level 2 v2.24 verilog device - - - - HICUM L2 v2.24 - - - - 4bit highest priority encoder (binary form) verilog device - - - - 4Bit HPRI-Bin - - - - hybrid (unsymmetrical 3dB coupler) - - - - Hybrid - - - - exponential current source - - - - current before rising edge - - - - maximum current of the pulse - - - - start time of the exponentially rising edge - - - - start of exponential decay - - - - time constant of the rising edge - - - - time constant of the falling edge - - - - Exponential Current Pulse - - - - file based current source - - - - name of the sample file - - - - repeat waveform - - - - current gain - - - - File Based Current Source - - - - initial current for transient simulation - - - - initial delay time - - - - jk flip flop with set and reset verilog device - - - - JK-FlipFlop w/ SR - - - - Logarithmic Amplifier verilog device - - - - scale factor - - - - scale factor error - - - - % - - - - input I1 bias current - - - - input reference bias current - - - - number of decades - - - - conformity error - - - - output offset error - - - - amplifier input resistance - - - - amplifier 3dB frequency - - - - Hz - - - - amplifier output resistance - - - - conformity error temperature coefficient - - - - %/Celsius - - - - offset temperature coefficient - - - - V/Celsius - - - - scale factor error temperature coefficient - - - - input I1 bias current temperature coefficient - - - - A/Celsius - - - - input reference bias current temperature coefficient - - - - Logarithmic Amplifier - - - - I - - - - R - - - - logic 0 verilog device - - - - logic 0 voltage level - - - - Logic 0 - - - - logic 1 verilog device - - - - logic 1 voltage level - - - - Logic 1 - - - - logical buffer - - - - Buffer - - - - MESFET verilog device - - - - model selector - - - - pinch-off voltage - - - - A/(V*V) - - - - saturation voltage parameter - - - - channel length modulation parameter - - - - doping profile parameter - - - - power law exponent parameter - - - - power feedback parameter - - - - 1/W - - - - maximum junction voltage limit before capacitance limiting - - - - capacitance saturation transition voltage - - - - capacitance threshold transition voltage - - - - dc drain pull coefficient - - - - subthreshold conductance parameter - - - - diode saturation current - - - - diode emission coefficient - - - - built-in gate potential - - - - gate-drain junction reverse bias breakdown voltage - - - - diode saturation current temperature coefficient - - - - transit time under gate - - - - channel resistance - - - - area factor - - - - energy gap - - - - eV - - - - zero bias gate-drain junction capacitance - - - - zero bias gate-source junction capacitance - - - - zero bias drain-source junction capacitance - - - - Beta temperature coefficient - - - - Alpha temperature coefficient - - - - Gamma temperature coefficient - - - - Subthreshold slope gate parameter - - - - subthreshold drain pull parameter - - - - gate-source current equation selector - - - - gate-drain current equation selector - - - - gate-source charge equation selector - - - - gate-drain charge equation selector - - - - drain-source charge equation selector - - - - Vto temperature coefficient - - - - gate resistance - - - - Ohms - - - - drain resistance - - - - source resistance - - - - gate resistance temperature coefficient - - - - 1/Celsius - - - - drain resistance temperature coefficient - - - - source resistance temperature coefficient - - - - gate reverse breakdown currrent - - - - forward bias slope resistance - - - - breakdown slope resistance - - - - shot noise coefficient - - - - MESFET - - - - Modular Operational Amplifier verilog device - - - - Gain bandwidth product (Hz) - - - - Open-loop differential gain at DC (dB) - - - - Second pole frequency (Hz) - - - - Output resistance (Ohm) - - - - Differential input capacitance (F) - - - - Differential input resistance (Ohm) - - - - Input offset current (A) - - - - Input bias current (A) - - - - Input offset voltage (V) - - - - Common-mode rejection ratio at DC (dB) - - - - Common-mode zero corner frequency (Hz) - - - - Positive slew rate (V/s) - - - - Negative slew rate (V/s) - - - - Positive output voltage limit (V) - - - - Negative output voltage limit (V) - - - - Maximum DC output current (A) - - - - Current limit scale factor - - - - Modular OpAmp - - - - MOS field-effect transistor with substrate - - - - show port numbers in symbol or not - - - - microstrip lange coupler - - - - Microstrip Lange Coupler - - - - microstrip radial stub - - - - inner radius - - - - outer radius - - - - stub angle - - - - degrees - - - - Microstrip Radial Stub - - - - 2to1 multiplexer verilog device - - - - 2to1 Mux - - - - 4to1 multiplexer verilog device - - - - 4to1 Mux - - - - 8to1 multiplexer verilog device - - - - 8to1 Mux - - - - NIGBT verilog device - - - - gate-drain overlap area - - - - m**2 - - - - area of the device - - - - MOS transconductance - - - - ambipolar recombination lifetime - - - - metallurgical base width - - - - avalanche uniformity factor - - - - avalanche multiplication exponent - - - - gate-source capacitance per unit area - - - - F/cm**2 - - - - gate-drain oxide capacitance per unit area - - - - emitter saturation current density - - - - A/cm**2 - - - - triode region factor - - - - electron mobility - - - - cm**2/Vs - - - - hole mobility - - - - base doping - - - - 1/cm**3 - - - - transverse field factor - - - - gate-drain overlap depletion threshold - - - - NIGBT - - - - Optimization - - - - optimization - - - - 2bit pattern generator verilog device - - - - pad output value - - - - 2Bit Pattern - - - - 3bit pattern generator verilog device - - - - 3Bit Pattern - - - - 4bit pattern generator verilog device - - - - 4Bit Pattern - - - - Photodiode verilog device - - - - photodiode emission coefficient - - - - series lead resistance - - - - diode dark current - - - - responsivity - - - - A/W - - - - shunt resistance - - - - quantum efficiency - - - - light wavelength - - - - nm - - - - responsivity calculator selector - - - - Photodiode - - - - Phototransistor verilog device - - - - dark current - - - - collector series resistance - - - - emitter series resistance - - - - base series resistance - - - - responsivity at relative selectivity=100% - - - - relative selectivity polynomial coefficient - - - - Phototransistor - - - - Potentiometer verilog device - - - - nominal device resistance - - - - shaft/wiper arm rotation - - - - resistive law taper coefficient - - - - device type selector - - - - maximum shaft/wiper rotation - - - - linearity error - - - - wiper arm contact resistance - - - - resistance temperature coefficient - - - - PPM/Celsius - - - - Potentiometer - - - - B - - - - T - - - - Rectangular Waveguide - - - - widest side - - - - shortest side - - - - material parameter for temperature model - - - - relay - - - - threshold voltage in Volts - - - - hysteresis voltage in Volts - - - - resistance of "on" state in Ohms - - - - resistance of "off" state in Ohms - - - - Relay - - - - equation defined 2-port RF device - - - - type of parameters - - - - representation during DC analysis - - - - parameter equation - - - - Equation Defined 2-port RF Device - - - - equation defined RF device - - - - Equation Defined RF Device - - - - RF - - - - RLCG transmission line - - - - RLCG - - - - resistive load - - - - Ohm/m - - - - inductive load - - - - H/m - - - - capacitive load - - - - conductive load - - - - S/m - - - - RLCG Transmission Line - - - - (available) ac power in Watts - - - - ERROR: Cannot open SPICE file "%1". - - - - ERROR: Cannot save converted SPICE file "%1". - - - - ERROR: Cannot open converted SPICE file "%1". - - - - Preprocessing SPICE file "%1". - - - - ERROR: Cannot save preprocessed SPICE file "%1". - - - - ERROR: Cannot execute "%1". - - - - ERROR: Cannot start QucsConv! - - - - Converting SPICE file "%1". - - - - switch (time controlled) - - - - time when state changes (semicolon separated list possible) - - - - Switch - - - - T flip flop with set and reset verilog device - - - - T-FlipFlop w/ SR - - - - silicon controlled rectifier (SCR) - - - - breakover voltage - - - - gate trigger current - - - - Thyristor - - - - ideal 4-terminal transmission line - - - - attenuation factor per length in 1/m - - - - 4-Terminal Transmission Line - - - - triac (bidirectional thyristor) - - - - (bidirectional) gate trigger current - - - - Triac - - - - relax time step raster - - - - perform an initial DC analysis - - - - maximum step size in seconds - - - - resonance tunnel diode - - - - peak current - - - - valley current - - - - valley voltage - - - - resonance energy in Ws - - - - Fermi energy in Ws - - - - resonance width in Ws - - - - maximum of transmission - - - - fitting factor for electron density - - - - fitting factor for voltage drop - - - - fitting factor for diode current - - - - zero-bias depletion capacitance - - - - life-time of electrons - - - - Tunnel Diode - - - - twisted pair transmission line - - - - diameter of conductor - - - - diameter of wire (conductor and insulator) - - - - physical length of the line - - - - twists per length in 1/m - - - - dielectric constant of insulator - - - - Twisted-Pair - - - - Verilog file - - - - Name of Verilog file - - - - verilog - - - - ERROR: Cannot open %1 file "%2". - - - - exponential voltage source - - - - voltage before rising edge - - - - maximum voltage of the pulse - - - - rise time of the rising edge - - - - fall time of the falling edge - - - - Exponential Voltage Pulse - - - - file based voltage source - - - - File Based Voltage Source - - - - VHDL file - - - - Name of VHDL file - - - - vhdl - - - - generic variable - - - - ERROR: Cannot open file "%1". - - - - - ERROR: Cannot create user library subdirectory ! - - - - - ERROR: Cannot create file "%1". - - - - - - QucsApp - - Info - Information - - - At least two elements must be selected ! - - - - Error - Fehler - - - Cannot start text editor! - Der Texteditor kann nicht gestartet werden! - - - Cannot start filter synthesis program! - - - - Cannot start line calculation program! - - - - Cannot start library program! - - - - Cannot start attenuator calculation program! - - - - Cannot start qucshelp! - - - - No project open! - - - - Select files to copy - - - - No files copied. - - - - Cannot open "%1" ! - - - - Overwrite - - - - File "%1" already exists. -Overwrite ? - - - - Cannot create "%1" ! - - - - Cannot read "%1" ! - - - - Cannot write "%1" ! - - - - Ready. - - - - Please open project with subcircuits! - - - - Please open project first! - - - - Please select a diagram graph! - - - - CSV file - - - - Any File - Alle Dateien - - - Enter an Output File Name - - - - Output file already exists! - Die Ausgabedatei existiert bereits! - - - Overwrite it? - Überschreiben? - - - &Yes - &Ja - - - &No - &Nein - - - Schematic - - - - Data Display - - - - Qucs Documents - - - - VHDL Sources - - - - Verilog Sources - - - - Verilog-A Sources - - - - Octave Scripts - - - - microstrip lange coupler - - - - Others - - - - Datasets - - - - Data Displays - - - - Octave - - - - Verilog - - - - Verilog-A - - - - VHDL - VHDL - - - Schematics - - - - New - - - - Open - - - - Delete - Löschen - - - Projects - - - - content of project directory - - - - Content of - - - - Note - - - - Content - - - - content of current project - - - - Components - - - - components and diagrams - - - - Rename - Umbenennen - - - Delete Group - - - - Cannot rename an open file! - - - - Rename file - - - - Enter new name: - - - - Cannot rename file: - - - - Cannot delete an open file! - - - - Warning - Warnung - - - This will delete the file permanently! Continue ? - - - - No - - - - Yes - Ja - - - Cannot delete schematic: - - - - unknown - - - - Verilog source - - - - Verilog-A source - - - - VHDL source - - - - data file - - - - data display - - - - schematic - - - - symbol - - - - VHDL configuration - - - - configuration - - - - Cannot delete the open file "%1"! - - - - This will delete the files%1permanently! Continue ? - - - - Cannot delete %1: "%2"! - - - - Cannot create work directory ! - - - - Cannot create project directory ! - - - - -port - - - - Cannot access project directory: - - - - Content of ' - - - - ' - - - - - Project: - - - - Choose Project Directory for Opening - - - - No project is selected ! - - - - Cannot delete file: - - - - Cannot remove directory: - - - - Cannot delete an open project ! - - - - This will destroy all the project files permanently ! Continue ? - - - - Cannot remove project directory ! - - - - Choose Project Directory for Deleting - - - - Creating new schematic... - - - - Creating new text editor... - - - - Opening file... - - - - Enter a Schematic Name - - - - Opening aborted - - - - Saving file... - - - - Saving aborted - - - - Enter a Document Name - - - - The file ' - - - - ' already exists! - - - - - Saving will overwrite the old one! Continue? - - - - Cancel - Abbrechen - - - Cannot overwrite an open document - - - - Saving file under new filename... - - - - Saving all files... - - - - Closing file... - - - - Closing Qucs document - - - - The document contains unsaved changes! - - - - - Do you want to save the changes before closing? - - - - &Save - - - - &Discard - - - - Printing... - - - - Printer Error. - - - - Exiting application... - - - - Quit... - - - - Do you really want to quit? - - - - Cutting selection... - - - - Copying selection to clipboard... - - - - The document was modified by another program ! - - - - Do you want to reload or keep this version ? - - - - Reload - - - - Keep it - - - - Cannot create - - - - No page set ! - - - - Cannot start "%1"! - - - - Could not load S[1,1]. - - - - Could not load S[1,2]. - - - - Could not load S[2,1]. - - - - Could not load S[2,2]. - - - - Wrong dependency! - - - - &New - - - - Creates a new document - - - - New - -Creates a new schematic or data display document - - - - New Text - - - - New &Text - - - - Creates a new text document - - - - New Text - -Creates a new text document - - - - &Open... - - - - Opens an existing document - - - - Open File - -Opens an existing document - - - - Save - Speichern - - - Saves the current document - - - - Save File - -Saves the current document - - - - Save as... - - - - Saves the current document under a new filename - - - - Save As - -Saves the current document under a new filename - - - - Save All - - - - Save &All - - - - Saves all open documents - - - - Save All Files - -Saves all open documents - - - - Close - Schließen - - - &Close - - - - Closes the current document - - - - Close File - -Closes the current document - - - - &Edit Circuit Symbol - - - - Edits the symbol for this schematic - - - - Edit Circuit Symbol - -Edits the symbol for this schematic - - - - &Document Settings... - - - - Document Settings - Dokumenteneinstellungen - - - Settings - -Sets properties of the file - - - - Print... - - - - &Print... - - - - Prints the current document - - - - Print File - -Prints the current document - - - - Print Fit to Page... - - - - Print Fit to Page - - - - Print Fit to Page - -Print and fit content to the page size - - - - E&xit - - - - Quits the application - - - - Exit - -Quits the application - - - - Application Settings... - - - - Application Settings - - - - Qucs Settings - -Sets properties of the application - - - - Align top - - - - Align top selected elements - - - - Align top - -Align selected elements to their upper edge - - - - Align bottom - - - - Align bottom selected elements - - - - Align bottom - -Align selected elements to their lower edge - - - - Align left - - - - Align left selected elements - - - - Align left - -Align selected elements to their left edge - - - - Align right - - - - Align right selected elements - - - - Align right - -Align selected elements to their right edge - - - - Distribute horizontally - - - - Distribute equally horizontally - - - - Distribute horizontally - -Distribute horizontally selected elements - - - - Distribute vertically - - - - Distribute equally vertically - - - - Distribute vertically - -Distribute vertically selected elements - - - - Center horizontally - - - - Center horizontally selected elements - - - - Center horizontally - -Center horizontally selected elements - - - - Center vertically - - - - Center vertically selected elements - - - - Center vertically - -Center vertically selected elements - - - - Set on Grid - - - - Sets selected elements on grid - - - - Set on Grid - -Sets selected elements on grid - - - - Move Component Text - - - - Moves the property text of components - - - - Move Component Text - -Moves the property text of components - - - - Replace... - - - - Replace component properties or VHDL code - - - - Replace - -Change component properties -or -text in VHDL code - - - - Cut - - - - Cu&t - - - - Cuts out the selection and puts it into the clipboard - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Cut - -<<<<<<< HEAD -Cuts the selected section and puts it to the clipboard - Ausschneiden - -Schneidet den ausgewählten Bereich aus und kopiert diesen in die Zwischenablage - - - Copy - Kopieren - - - &Copy - &Kopieren - - - Copies the selected section to the clipboard - Kopiert den ausgewählten Bereich in die Zwischenablage -======= -Cuts out the selection and puts it into the clipboard - - - - Copy - - - - &Copy - - - - Copies the selection into the clipboard - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Copy - -<<<<<<< HEAD -Copies the selected section to the clipboard - Kopieren - -Kopiert den ausgewählten Bereich in die Zwischenablage - - - Paste - Einfügen - - - &Paste - &Einfügen - - - Pastes the clipboard contents to the cursor position - Fügt den Inhalt der Zwischenablage an der Cursorposition ein -======= -Copies the selection into the clipboard - - - - Paste - - - - &Paste - - - - Pastes the clipboard contents to the cursor position - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Paste - -Pastes the clipboard contents to the cursor position -<<<<<<< HEAD - Einfügen - -Fügt den Inhalt der Zwischenablage an der Cursorposition ein - - - Delete - Löschen - - - &Delete - &Löschen - - - Deletes the selected components - Löscht die ausgewählten Komponenten -======= - - - - &Delete - - - - Deletes the selected components - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Delete - -Deletes the selected components -<<<<<<< HEAD - Löschen - -Löscht die ausgewählten Komponenten - - - Undo - Rückgängig - - - &Undo - &Rückgängig - - - Undoes the last command - Widerruft das letzte Kommando -======= - - - - Find... - - - - Find a piece of text - - - - Find - -Searches for a piece of text - - - - Find Again - - - - Find same text again - - - - Find - -Searches for the same piece of text again - - - - Undo - - - - &Undo - - - - Undoes the last command - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Undo - -Makes the last action undone -<<<<<<< HEAD - Rückgängig - -Widerruft das letzte Kommando - - - Redo - Wiederholen - - - &Redo - &Wiederholen - - - Redoes the last command - Wiederholt das letzte Kommando -======= - - - - Redo - - - - &Redo - - - - Redoes the last command - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Redo - -Repeats the last action once more -<<<<<<< HEAD - Wiederholen - -Wiederholt das letzte Kommando nochmal - - - New Project - Neues Projekt - - - &New Project... - &Neues Projekt... - - - Creates a new project - Erzeugt ein neues Projekt -======= - - - - &New Project... - - - - Creates a new project - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - New Project - -Creates a new project -<<<<<<< HEAD - Neues Projekt - -Erzeugt ein neues Projekt - - - Open Project - Projekt öffnen - - - &Open Project... - Projekt ö&ffnen... - - - Opens a project - Öffnet ein Projekt -======= - - - - &Open Project... - - - - Opens an existing project - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Open Project - -Opens an existing project -<<<<<<< HEAD - Projekt öffnen - -Öffnet ein existierendes Projekt - - - Delete Project - Projekt löschen - - - &Delete Project... - Projekt &löschen... - - - Deletes a project - Löscht ein Projekt -======= - - - - &Delete Project... - - - - Deletes an existing project - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Delete Project - -Deletes an existing project -<<<<<<< HEAD - Projekt löschen - -Löscht ein existierendes Projekt - - - View All - Alles anzeigen - - - Views the whole page - Zeigt die ganze Seite an -======= - - - - &Close Project - - - - Closes the current project - - - - Close Project - -Closes the current project - - - - &Add Files to Project... - - - - Copies files to project directory - - - - Add Files to Project - -Copies files to project directory - - - - Create &Library... - - - - Create Library from Subcircuits - - - - Create Library - -Create Library from Subcircuits - - - - Create &Package... - - - - Create compressed Package from Projects - - - - Create Package - -Create compressed Package from complete Projects - - - - E&xtract Package... - - - - Install Content of a Package - - - - Extract Package - -Install Content of a Package - - - - &Import/Export Data... - - - - Convert data file - - - - Import/Export Data - -Convert data file to various file formats - - - - Export to &CSV... - - - - Convert graph data to CSV file - - - - Export to CSV - -Convert graph data to CSV file - - - - View All - - - - Show the whole page - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - View All - -Shows the whole page content -<<<<<<< HEAD - Alles anzeigen - -Zeigt den gesamten Seiteninhalt an - - - View 1:1 - Anzeige 1:1 - - - Views without magnification - Anzeige ohne Vergrößerung -======= - - - - View 1:1 - - - - Views without magnification - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - View 1:1 - -Shows the page content without magnification -<<<<<<< HEAD - Anzeige 1:1 - -Zeigt den Seiteninhalt ohne Vergrößerung an - - - Zoom in - Vergrößern - - - Zooms into the current view - Vergrößert die aktuelle Ansicht -======= - - - - Zoom in - - - - Zooms into the current view - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Zoom in - -Zooms the current view -<<<<<<< HEAD - Vergrößern - -Vergrößert die aktuelle Ansicht - - - Zoom out - Verkleinern - - - Zooms out the current view - Verkleinert die aktuelle Ansicht - - - Reduce - -Zooms out the current view - Verkleinern - -Verkleinert die aktuelle Ansicht - - - Select - Auswählen - - - Select mode - Auswählmodus -======= - - - - Zoom out - - - - Zooms out the current view - - - - Zoom out - -Zooms out the current view - - - - Select - - - - Activate select mode - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Select - -<<<<<<< HEAD -Select mode - Auswählen - -Auswählmodus - - - Select All - Alles auswählen - - - Selects all elements - Wählt alle Elemente aus -======= -Activates select mode - - - - Select All - Alle auswählen - - - Selects all elements - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Select All - -Selects all elements of the document -<<<<<<< HEAD - Alles auswählen - -Wählt alle Elemente im Dokument aus - - - Rotate - Drehen - - - Rotates the selected component by 90° - Dreht die ausgewählten Komponenten um 90° -======= - - - - Select Markers - - - - Selects all markers - - - - Select Markers - -Selects all diagram markers of the document - - - - Rotate - - - - Rotates the selected component by 90° - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Rotate - -Rotates the selected component by 90° counter-clockwise -<<<<<<< HEAD - Drehen - -Dreht die ausgewählten Komponenten um 90° nach links - - - Mirror about X Axis - Spiegeln an der X-Achse - - - Mirrors the selected item about X axis - Spiegelt die Auswahl an der X-Achse -======= - - - - Mirror about X Axis - - - - Mirrors the selected item about X Axis - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Mirror about X Axis - -Mirrors the selected item about X Axis -<<<<<<< HEAD - Spiegeln an der X-Achse - -Spiegelt die Auswahl an der X-Achse - - - Mirror about Y Axis - Spiegeln an der Y-Achse - - - Mirrors the selected item about Y axis - Spiegelt die Auswahl an der Y-Achse -======= - - - - Mirror about Y Axis - - - - Mirrors the selected item about Y Axis - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Mirror about Y Axis - -Mirrors the selected item about Y Axis -<<<<<<< HEAD - Spiegeln an der Y-Achse - -Spiegelt die Auswahl an der Y-Achse - - - Go into Subcircuit - Gehe in den Schaltkreis hinein - - - Goes inside subcircuit - Geht in den Schaltkreis hinein -======= - - - - Go into Subcircuit - - - - Goes inside the selected subcircuit - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Go into Subcircuit - -Goes inside the selected subcircuit -<<<<<<< HEAD - Gehe in den Schaltkreis hinein - -Geht in den ausgewählten Schaltkreis hinein - - - Pop out - Verlasse den Schaltkreis - - - Pop outside subcircuit - Verlässt den Schaltkreis -======= - - - - Pop out - - - - Pop outside subcircuit - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Pop out - -Goes up one hierarchy level, i.e. leaves subcircuit -<<<<<<< HEAD - Verlasse den Schaltkreis - -Verlässt den Schaltkreis in die nächsthöhere Hierachieebene - - - Deactivate/Activate - Deaktivieren/Aktivieren - - - Deactivate/Activate the selected item - Deaktiviert/Aktiviert die Auswahl -======= - - - - Deactivate/Activate - - - - Deactivate/Activate selected components - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Deactivate/Activate - -<<<<<<< HEAD -Deactivate/Activate the selected item - Deaktivieren/Aktivieren - -Deaktiviert/Aktiviert die Auswahl - - - Insert Equation - Gleichung einfügen - - - Inserts equation - Fügt eine Gleichung ein -======= -Deactivate/Activate the selected components - - - - Insert Equation - - - - Inserts an equation - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Insert Equation - -Inserts a user defined equation -<<<<<<< HEAD - Gleichung einfügen - -Fügt eine benutzerdefinierte Gleichung ein - - - Insert Ground - Masse einfügen - - - Inserts ground - Fügt das Massesymbol ein -======= - - - - Insert Ground - - - - Inserts a ground symbol - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Insert Ground - -Inserts a ground symbol -<<<<<<< HEAD - Masse einfügen - -Fügt das Massesymbol ein - - - Insert Port - Anschluss einfügen - - - Inserts port - Fügt einen Anschluss ein -======= - - - - Insert Port - - - - Inserts a port symbol - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Insert Port - -Inserts a port symbol -<<<<<<< HEAD - Anschluss einfügen - -Fügt ein Anschlusssymbol ein - - - Insert Wire - Draht einfügen - - - Wire - Draht - - - Inserts a wire - Fügt einen Draht ein -======= - - - - Wire - - - - Inserts a wire - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Wire - -Inserts a wire -<<<<<<< HEAD - Draht - -Fügt einen Draht ein - - - Insert Wire/Pin Label - Verbindungs-/Knoten-Bezeichnung einfügen - - - Wire Label - Verbindungs-Bezeichnung - - - Inserts a wire or pin label - Fügt eine Verbindungs- oder Knotenbezeichnung ein -======= - - - - Wire Label - - - - Inserts a wire or pin label - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Wire Label - -Inserts a wire or pin label -<<<<<<< HEAD - Verbindungs-Bezeichnung - -Fügt eine Verbindungs- oder Knotenbezeichnung ein - - - Simulate - Simulieren - - - Simulates the current schematic - Simuliert den aktuellen Schaltplan -======= - - - - VHDL entity - - - - Inserts skeleton of VHDL entity - - - - VHDL entity - -Inserts the skeleton of a VHDL entity - - - - Text Editor - - - - Starts the Qucs text editor - - - - Text editor - -Starts the Qucs text editor - - - - Filter synthesis - - - - Starts QucsFilter - - - - Filter synthesis - -Starts QucsFilter - - - - Line calculation - - - - Starts QucsTrans - - - - Line calculation - -Starts transmission line calculator - - - - Component Library - - - - Starts QucsLib - - - - Component Library - -Starts component library program - - - - Matching Circuit - - - - Creates Matching Circuit - - - - Matching Circuit - -Dialog for Creating Matching Circuit - - - - Attenuator synthesis - - - - Starts QucsAttenuator - - - - Attenuator synthesis - -Starts attenuator calculation program - - - - Simulate - - - - Simulates the current schematic - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Simulate - -Simulates the current schematic -<<<<<<< HEAD - Simulieren - -Simuliert den aktuellen Schaltplan - - - View Data Display/Schematic - Zeige Daten/Schaltplan an - - - Changes to data display or schematic page - Wechselt zur Datenvisualisierung oder zum Schaltplan -======= - - - - View Data Display/Schematic - - - - Changes to data display or schematic page - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - View Data Display/Schematic - - -<<<<<<< HEAD - Zeige Daten/Schaltplan an - - - - - Set Marker - Markierung setzen - - - Set Marker on Graph - Markierung auf Diagramm setzen - - - Sets a marker on a diagram's graph - Setzt eine Markierung auf einen Graphen im Diagramm -======= - - - - Calculate DC bias - - - - Calculates DC bias and shows it - - - - Calculate DC bias - -Calculates DC bias and shows it - - - - Set Marker on Graph - - - - Sets a marker on a diagram's graph - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Set Marker - -Sets a marker on a diagram's graph -<<<<<<< HEAD - Markierung setzen - -Setzt eine Markierung auf einen Graphen im Diagramm - - - Show Last Messages - Letzte Meldungen anzeigen - - - Shows last simulation messages - Letzte Simulatormeldungen anzeigen -======= - - - - Show Last Messages - - - - Shows last simulation messages - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Show Last Messages - -Shows the messages of the last simulation -<<<<<<< HEAD - Letzte Meldungen anzeigen - -Zeigt die Meldungen der letzten Simulation an - - - Show Last Netlist - Letzte Netzliste anzeigen - - - Shows last simulation netlist - Zeigt die zuletzt simulierte Netzliste an -======= - - - - Show Last Netlist - - - - Shows last simulation netlist - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Show Last Netlist - -Shows the netlist of the last simulation -<<<<<<< HEAD - Letzte Netzliste anzeigen - -Zeigt die zuletzt simulierte Netzliste an - - - Toolbar - Werkzeugleiste - - - Tool&bar - Werkzeug&leiste - - - Enables/disables the toolbar - Schaltet die Werkzeugleiste ein/aus -======= - - - - Tool&bar - - - - Enables/disables the toolbar - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Toolbar - -Enables/disables the toolbar -<<<<<<< HEAD - Werkzeugleiste - -Schaltet die Werkzeugleiste ein/aus - - - Statusbar - Statuszeile - - - &Statusbar - &Statuszeile - - - Enables/disables the statusbar - Aktiviert/deaktiviert die Statuszeile -======= - - - - &Statusbar - - - - Enables/disables the statusbar - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Statusbar - -Enables/disables the statusbar -<<<<<<< HEAD - Statuszeile - -Aktiviert/deaktiviert die Statuszeile - - - Help Index - Hilfeindex - - - Help Index... - Hilfeindex... - - - Index of Qucs Help - Index der Qucs Hilfe -======= - - - - &Dock Window - - - - Enables/disables the browse dock window - - - - Browse Window - -Enables/disables the browse dock window - - - - &Octave Window - - - - Shows/hides the Octave dock window - - - - Octave Window - -Shows/hides the Octave dock window - - - - Help Index... - - - - Index of Qucs Help - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Help Index - -Index of intern Qucs help -<<<<<<< HEAD - Hilfe Index - -Index der internen Qucs Hilfe - - - Getting Started - Starthilfe - - - Getting Started... - Starthilfe... - - - Getting Started with Qucs - Starthilfe für Qucs -======= - - - - Getting Started... - - - - Getting Started with Qucs - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - Getting Started - -Short introduction into Qucs -<<<<<<< HEAD - Starthilfe - -Kurze Einführung in Qucs - - - About - Über - - - &About Qucs... - Ü&ber Qucs... - - - About the application - Über die Applikation -======= - - - - &About Qucs... - - - - About the application - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - About - -About the application -<<<<<<< HEAD - Über - -Über die Applikation - - - About Qt - Über Qt - - - &About Qt... - Über &Qt... -======= - - - - About Qt... - - - - About Qt - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d - - - About Qt - -About Qt by Trolltech -<<<<<<< HEAD - Über Qt - -Über Qt von Trolltech - - - &File - &Datei - - - &Edit - &Bearbeiten - - - &Insert - &Einfügen - - - &Project - &Projekt - - - &Simulation - &Simulation - - - &View - &Ansicht - - - &Help - &Hilfe - - - Ready. - Bereit. - - - Toggle toolbar... - Umschalten der Werkzeugleiste... - - - Toggle statusbar... - Umschalten der Statuszeile... - - - About... - Über... - - - Qucs Version - Qucs Version - - - Quite Universal Circuit Simulator - Ziemlich Universeller Schaltungssimulator - - - Copyright (C) 2003,2004 by Michael Margraf - - Copyright (C) 2003,2004 by Michael Margraf - - - - Simulator by Stefan Jahn - Simulator von Stefan Jahn - - - Special thanks to Jens Flucke - Besonderen Dank an Jens Flucke - - - Translations: - Übersetzungen: - - - German by Stefan Jahn - Deutsch von Stefan Jahn - - - Polish by Dariusz Pienkowski - Polnisch von Dariusz Pienkowski - - - French by Eric Marzolf - Französisch von Eric Marzolf - - - Italian by Giorgio Luparia - Italienisch von Giorgio Luparia - - - Application Settings - Applikationseinstellungen - - - Application Settings... - Applikationseinstellungen... - - - Qucs Settings - -Sets properties of the application - Qucs Einstellungen - -Setzt die Einstellungen der Applikation - - - Document Settings - Dokumenteneinstellungen - - - Document Settings... - Dokumenteneinstellungen... - - - Align top - Nach oben ausrichten - - - Align top selected elements - Ausgewählte Elemente nach oben ausrichten - - - Align top - -Align selected elements to their upper edge - Nach oben ausrichten - -Richtet ausgewählte Elemente an ihrer oberen Kante aus - - - Align bottom - Nach unten ausrichten - - - Align bottom selected elements - Ausgewählte Elemente nach unten ausrichten - - - Align bottom - -Align selected elements to their lower edge - Nach unten ausrichten - -Richtet ausgewählte Elemente an ihrer unteren Kante aus - - - Align left - Nach links ausrichten - - - Align left selected elements - Ausgewählte Elemente nach links ausrichten - - - Align left - -Align selected elements to their left edge - Nach links ausrichten - -Richtet ausgewählte Elemente an ihrer linken Kante aus - - - Align right - Nach rechts ausrichten - - - Align right selected elements - Ausgewählte Elemente nach rechts ausrichten - - - Align right - -Align selected elements to their right edge - Nach rechts ausrichten - -Richtet ausgewählte Elemente an ihrer rechten Kante aus - - - Align - Ausrichten - - - Distribute horizontally - Horizontal verteilen - - - Distribute equally horizontally - Gleichmäßig horizontal verteilen - - - Distribute horizontally - -Distribute horizontally selected elements - Horizontal verteilen - -Verteilt ausgewählte Elemente horizontal - - - Distribute vertically - Vertikal verteilen - - - Distribute equally vertically - Gleichmäßig vertikal verteilen - - - Distribute vertically - -Distribute vertically selected elements - Vertikal verteilen - -Verteilt ausgewählte Elemente vertikal - - - Set on Grid - Auf Gitternetz setzen - - - Set on Grid - -Sets selected elements on grid - Auf Gitternetz setzen - -Setzt ausgewählte Elemente auf das Gitternetz - - - Close Project - Projekt schließen - - - &Close Project - Projekt &schließen - - - Close current project - Schließt das aktuelle Projekt - - - Close Project - -Closes the current project - Projekt schließen - -Schließt das aktuelle Projekt - - - Print Selected Elements - Auswahl drucken - - - Print Selection... - Drucke Auswahl... - - - Prints Selected Elements - Druckt ausgewählte Elemente - - - Print Selected Elements - -Prints selected elements of the current document - Auswahl drucken - -Druckt ausgewählte Elemente des aktuellen Dokuments - - - Romanian by Radu Circa - - Rumänisch von Radu Circa - - - - Edit Circuit Symbol - Schaltkreissymbol bearbeiten - - - Edits the symbol for this schematic - Bearbeitet das Symbol für diesen Schaltkreis - - - Edit Circuit Symbol - -Edits the symbol for this schematic - Schaltkreissymol bearbeiten - -Bearbeitet das Symbol für diesen Schaltkreis - - - Portuguese by Luciano Franca - - Portugiesisch von Luciano Franca - - - - Spanish by Jose L. Redrejo Rodriguez - - Spanisch von Jose L. Redrejo Rodriguez - - - - Move Component Text - Komponententext verschieben - - - Move Component Text - -Moves the property text of components - Komponententext verschieben - -Verschiebt den Eigenschaftentext von Komponenten - - - French by Vincent Habchi, F5RCS - - Französisch von Vincent Habchi, F5RCS - - - - Japanese by Toyoyuki ISHIKAWA - - Japanisch von Toyoyuki ISHIKAWA - - - - Italian by Giorgio Luparia - - Italienisch von Giorgio Luparia - - - - Hungarian by Bus Jozsef - Ungarisch von Bus Jozsef - - - Hungarian by Jozsef Bus - Ungarisch von Jozsef Bus - - - Copyright (C) 2003, 2004, 2005 by Michael Margraf - - Copyright (C) 2003, 2004, 2005 by Michael Margraf - - - - Special thanks to Jens Flucke and Raimund Jacob - Besonderen Dank an Jens Flucke und Raimund Jacob - - - Japanese by Toyoyuki Ishikawa - Japanisch von Toyoyuki Ishikawa - - - Hebrew by Dotan Nahum - Hebräisch von Dotan Nahum - - - About Qt... - Über Qt... - - - Text editor - Texteditor - - - Text Editor - Texteditor - - - Starts the Qucs text editor - Startet den Qucs Texteditor - - - Text editor - -Starts the Qucs text editor - Texteditor - -Startet den Qucs Texteditor - - - Filter synthesis - Filtersynthese - - - Starts QucsFilter - Startet das QucsFilter Programm - - - Filter synthesis - -Starts QucsFilter - Filtersynthese - -Startet das QucsFilter Programm - - - &Tools - &Werkzeuge - - - QucsFilter by Toyoyuki Ishikawa and Michael Margraf - - - QucsFilter von Toyoyuki Ishikawa und Michael Margraf - - - - - Swedish by Markus Gothe - Schwedisch von Markus Gothe - - - Line calculation - Leitungsberechnung - - - Starts QucsTrans - Startet das QucsTrans Programm - - - Line calculation - -Starts transmission line calculator - Leitungsberechnung - -Startet das Programm für die Leitungsberechnung - - - Component Library - Komponentenbibliothek - - - Starts QucsLib - Startet QucsLib - - - Component Library - -Starts component library program - Komponentenbibliothek - -Startet das Komponentenbibliotheksprogramm - - - no warnings - keine Warnungen - - - Warnings in last simulation! Press F5 - In der letzten Simulation sind Warnungen aufgetreten! Drücken Sie F5 - - - Change Property Values - Eigenschaftswerte ändern - - - Change Property Values - -Change Property Value of Components - Eigenschaftswerte ändern - -Ändert die Eigenschaftswerte von Komponenten - - - Matching Circuit - Anpassnetzwerk - - - Creates Matching Circuit - Erzeugt Anpassnetzwerk - - - Matching Circuit - -Dialog for Creating Matching Circuit - Anpassnetzwerk - -Dialog zum Erstellen eines Anpassnetzwerkes - - - Change Property Values... - Eigenschaftswerte ändern... - - - Change Property Values.. - Eigenschaftswerte ändern.. - - - Calculates DC bias and shows it - Berechnet DC-Arbeitspunkt und zeigt diesen an - - - Calculate DC bias - Berechnung des DC-Arbeitspunktes - - - Calculate DC bias - -Calculates DC bias and shows it - Berechnung des DC-Arbeitspunktes - -Berechnet den DC-Arbeitspunkt und zeigt diesen an - - - Italian by Giorgio Luparia and Claudio Girardi - - Italienisch von Giorgio Luparia und Claudio Girardi - - - - Swedish by Markus Gothe and Peter Landgren - Schwedisch von Markus Gothe und Peter Landgren - - - Add Files to Project - Dateien zu Projekt hinzufügen - - - &Add Files to Project... - &Dateien zu Projekt hinzufügen... - - - Copies files to project directory - Kopiert Dateien in das Projektverzeichnis - - - Add Files to Project - -Copies files to project directory - Dateien zu Projekt hinzufügen - -Kopiert Dateien in das Projektverzeichnis - - - Copyright (C) 2003, 2004, 2005, 2006 by Michael Margraf - - Copyright (C) 2003, 2004, 2005, 2006 von Michael Margraf - - - - - Swedish by Peter Landgren - Schwedisch von Peter Landgren - - - Qucs Version - Qucs Version - - - Copyright (C) - Copyright (C) - - - by Michael Margraf - by Michael Margraf - - - Romanian by Radu Circa - Rumänisch von Radu Circa - - - French by Vincent Habchi, F5RCS - Französisch von Vincent Habchi, F5RCS - - - Portuguese by Luciano Franca - Portugiesisch von Luciano Franca - - - Spanish by Jose L. Redrejo Rodriguez - Spanisch von Jose L. Redrejo Rodriguez - - - Italian by Giorgio Luparia and Claudio Girardi - Italienisch von Giorgio Luparia und Claudio Girardi - - - Turkish by Onur and Ozgur Cobanoglu - Türkisch von Onur und Ozgur Cobanoglu - - - VHDL simulator 'FreeHDL' by Edwin Naroska and Marius Vollmer - VHDL-Simulator 'FreeHDL' von Edwin Naroska und Marius Vollmer - - - Many thanks to Mike Brinson for correcting the VHDL output - Vielen Dank an Mike Brinson für Verbesserungen an den VHDL-Ausgaben - - - - QucsLib - - Quit - Beenden - - - &Quit - &Beenden - - - Help - Hilfe - - - &Help - &Hilfe - - - About - Über - - - &File - &Datei - - - Component Selection - Komponentenauswahl - - - Search... - Suchen... - - - Component - Komponente - - - Copy to clipboard - In die Zwischenablage kopieren - - - Show Model - Modell anzeigen - - - About... - Über... - - - Library Manager for Qucs - - Bibliotheksverwaltung für Qucs - - - - Copyright (C) 2005 by Michael Margraf - - Copyright (C) 2005 von Michael Margraf - - - - - QucsLib is a program to manage Qucs component libraries. On the left side of the application window the available libraries can be browsed to find the wanted component. By clicking on the component name its description can be seen on the right side. The selected component is transported to the Qucs application by clicking on the button "Copy to Clipboard". Being back in the schematic window the component can be inserted by pressing CTRL-V (paste from clipboard). - QucsLib ist ein Programm zur Verwaltung von Qucs Komponentenbibliotheken. Auf der linken Seite des Applikationsfensters können die verfügbaren Bibliotheken nach einer Komponente durchsucht werden. Durch Klicken auf den Komponentennamen wird dessen Beschreibung auf der rechten Seite angezeigt. Die so ausgewählte Komponente kann durch Drücken des "In die Zwischenablage kopieren"-Knopfes in die Qucs Applikation übertragen werden. Zurück in dem Schaltplanfenster kann die Komponente durch Drücken von STRG-V (aus der Zwischenablage einfügen) dort eingefügt werden. - - - Error - Fehler - - - Cannot open "%1". - Die Datei "%1" kann nicht geöffnet werden. - - - Library is corrupt. - Die Bibliotheksdatei ist beschädigt. - - - Search result - Suchergebnis - - - Result - Ergebnis - - - No appropriate component found. - Keine entsprechende Komponente gefunden. - - - Manage User &Libraries... - Verwalten der &Benutzerbibliotheken... - - - A more comfortable way: The component can also be placed onto the schematic by using Drag n'Drop. - Der komfortable Weg: Die Komponente kann auch mit Drag und Drop auf dem Schaltplan platziert werden. - - - QucsLib Help - QucsLib Hilfe - - - Model - Modell - - - Search Library Component - Bibliothekskomponente suchen - - - - QucsSettingsDialog - - Edit Qucs Properties - Eigenschaften von Qucs bearbeiten - - - Document Background Color: - Hintergrundfarbe der Dokumente: - - - Simulation - Simulation - - - OK - Fertig - - - Apply - Übernehmen - - - Cancel - Abbrechen - - - Design - Ansicht - - - Default Values - Voreinstellungen - - - Font (set after reload): - Schriftart (nach Neustart aktiviert): - - - maximum undo operations: - maximale Anzahl der Rückgängig-Operationen: - - - text editor: - Texteditor: - - - Settings - Einstellungen - - - Suffix - Dateiendung - - - Program - Programm - - - Suffix: - Dateiendung: - - - Program: - Programm: - - - Add - Hinzufügen - - - Remove - Löschen - - - File Types - Dateitypen - - - Register filename extensions here in order to -open files with an appropriate program. - Registrierung von Dateinamensendungen um Dateien -mit einem entsprechendem Programm zu assoziieren. - - - Set - Setzen - - - Error - Fehler - - - This suffix is already registered! - Diese Endung ist schon registriert! - - - Language (set after reload): - Sprache (nach Neustart aktiviert): - - - system language - Systemsprache - - - English - Englisch - - - German - Deutsch - - - French - Französisch - - - Spanish - Spanisch - - - Italian - Italienisch - - - Polish - Polnisch - - - Japanese - Japanisch - - - Romanian - Rumänisch - - - Hebrew - Hebräisch - - - Swedish - Schwedisch - - - Turkish - Türkisch - - - Hungarian - Ungarisch - - - Portuguese - Portugiesisch - - - Ukrainian - Ukrainisch - - - Russian - Russisch - - - Colors for Syntax Highlighting: - Farben für die Syntaxhervorhebung: - - - Comment - Kommentar - - - String - Zeichenkette - - - Integer Number - Ganzzahl - - - Real Number - Fließkommazahl - - - Character - Zeichen - - - Data Type - Datentyp - - - Attribute - Attribut - - - VHDL Editor - VHDL Editor - - - Czech - Tschechisch - - - Catalan - Katalanisch - - - start wiring when clicking open node: - Verdrahtung beginnen, wenn ein offener Knoten angeklickt wird: - - - Arabic - Arabisch - - - Kazakh - - - - Directive - - - - Task - - - - Source Code Editor -======= - - - - &File - - - - &Edit - - - - P&ositioning - - - - &Insert - - - - &Project - - - - &Tools - - - - &Simulation - - - - &View - - - - &Help - - - - no warnings - - - - Warnings in last simulation! Press F5 - - - - About... - - - - Qucs Version - - - - Quite Universal Circuit Simulator - - - - Copyright (C) - - - - by Michael Margraf - - - - Simulator by Stefan Jahn - - - - VHDL simulator 'FreeHDL' by Edwin Naroska and Marius Vollmer - - - - Special thanks to Jens Flucke and Raimund Jacob - - - - Many thanks to Mike Brinson for correcting the VHDL output - - - - GUI improvements by Gopala Krishna A - - - - Verilog-AMS interface by Helene Parruitte - - - - Translations: - - - - German by Stefan Jahn - - - - Polish by Dariusz Pienkowski - - - - Romanian by Radu Circa - - - - French by Vincent Habchi, F5RCS - - - - Portuguese by Luciano Franca and Helio de Sousa - - - - Spanish by Jose L. Redrejo Rodriguez - - - - Japanese by Toyoyuki Ishikawa - - - - Italian by Giorgio Luparia and Claudio Girardi - - - - Hebrew by Dotan Nahum - - - - Swedish by Peter Landgren - - - - Turkish by Onur and Ozgur Cobanoglu - - - - Hungarian by Jozsef Bus - - - - Russian by Igor Gorbounov - - - - Czech by Marek Straka - - - - Catalan by Antoni Subirats - - - - Arabic by Chabane Noureddine - - - - Kazakh by Erbol Keshubaev - - - - - QucsAttenuator - - E&xit - - - - Help... - - - - &About QucsAttenuator... - - - - About Qt... - - - - &File - - - - &Help - - - - Topology - - - - Input - - - - Attenuation: - - - - 1 - - - - dB - - - - Zin: - - - - 50 - - - - Ohm - - - - Zout: - - - - Calculate and put into Clipboard - - - - Output - - - - R1: - - - - -- - - - - R2: - - - - R3: - - - - Result: - - - - About Qt - - - - About... - - - - -Attenuator synthesis program - - - - - Copyright (C) 2006 by - - - - Success! - - - - Error: Set Attenuation more than %1 dB - - - - - QucsEdit - - File: - Datei: - - - Line: %1 - Column: %2 - - - - About - - - - Quit - - - - About... - - - - -Very simple text editor for Qucs - - -Einfacher Texteditor für Qucs - - - - Copyright (C) 2004, 2005 by Michael Margraf - - Copyright (C) 2004, 2005 by Michael Margraf - - - - Enter a Filename - - - - Enter a Document Name - - - - Error - Fehler - - - Cannot write file: - - - - Cannot read file: - - - - Closing document - - - - The text contains unsaved changes! - - - - - Do you want to save the changes? - - - - &Save - - - - &Discard - - - - &Cancel - &Abbrechen - - - - QucsFilter - - E&xit - - - - Help... - - - - &About QucsFilter... - - - - About Qt... - - - - &File - - - - &Help - - - - Filter type: - - - - Filter class: - - - - Low pass - - - - High pass - - - - Band pass - - - - Band stop - - - - Order: - - - - Corner frequency: - - - - Stop frequency: - - - - Stop band frequency: - - - - Pass band ripple: - - - - Stop band attenuation: - - - - Impedance: - Impedanz: - - - Calculate and put into Clipboard - - - - About... - - - - -Filter synthesis program - - - - - Copyright (C) 2005, 2006 by - - - - About Qt - - - - Result: - - - - Error - Fehler - - - Stop frequency must be greater than start frequency. - - - - Filter order must not be less than two. - - - - Bessel filter order must not be greater than 19. - - - - Successful - - - - Result: -- - - - - Start frequency: - - - - Pass band frequency: - - - - Pass band attenuation: - - - - - QucsHelp - - Qucs Help System - Qucs Hilfesystem - - - &Quit - - - - &Back - - - - &Forward - - - - &Home - - - - &Previous - - - - &Next - - - - &Table of Contents - - - - Enables/disables the table of contents - - - - Table of Contents - -Enables/disables the table of contents - - - - &About Qt - - - - &File - - - - &View - - - - &Help - - - - Contents - - - - Home - + Information @@ -19396,15 +12524,15 @@ Enables/disables the table of contents &Help - + &Hilfe About - + Über &File - + &Datei Component Selection @@ -19598,7 +12726,7 @@ Enables/disables the table of contents Settings - + Einstellungen Colors for Syntax Highlighting: @@ -19699,7 +12827,6 @@ open files with an appropriate program. This suffix is already registered! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -19707,277 +12834,6 @@ open files with an appropriate program. QucsTranscalc Load -<<<<<<< HEAD - Laden - - - &Load - &Laden - - - Save - Speichern - - - &Save - &Speichern - - - Options - Optionen - - - &Options - &Optionen - - - Quit - Beenden - - - &Quit - &Beenden - - - Copy to Clipboard - Kopie in die Zwischenablage - - - &Copy to Clipboard - In Zwischenablage &kopieren - - - Analyze - Analyse - - - &Analyze - &Analyse - - - Synthesize - Synthese - - - &Synthesize - &Synthese - - - Help - Hilfe - - - &Help - &Hilfe - - - About - Über - - - &File - &Datei - - - &Execute - &Ausführen - - - Transmission Line Type - Leitungstyp - - - Microstrip - Mikrostreifenleitung - - - Rectangular Waveguide - Hohlleiter - - - Coaxial Line - Koaxialkabel - - - Coupled Microstrip - Gekoppelte Mikrostreifen - - - Substrate Parameters - Substratparameter - - - Component Parameters - Komponentenparameter - - - Physical Parameters - Physikalische Parameter - - - Derive Electrical Parameters - Berechnung der elektrische Parameter - - - Compute Physical Parameters - Berechnung der physikalischen Parameter - - - Electrical Parameters - Elektrische Parameter - - - Calculated Results - Berechnete Ergebnisse - - - Ready. - Bereit. - - - Conductor Losses - Ohmsche Verluste - - - Dielectric Losses - Dielektrische Verluste - - - Skin Depth - Skintiefe - - - TE-Modes - TE-Moden - - - TM-Modes - TM-Moden - - - Conductor Losses Even - Ohmsche Verluste Gleichtakt - - - Conductor Losses Odd - Ohmsche Verluste Gegentakt - - - Dielectric Losses Even - Dielektrische Verluste Gleichtakt - - - Dielectric Losses Odd - Dielektrische Verluste Gegentakt - - - Relative Permittivity - Relative Permittivität - - - Relative Permeability - Relative Permeabilität - - - Height of Substrate - Substrathöhe - - - Height of Box Top - Höhe der Abdeckung - - - Strip Thickness - Streifendicke - - - Strip Conductivity - Leitfähigkeit des Streifens - - - Dielectric Loss Tangent - Dielektrischer Verlustwinkel - - - Conductor Roughness - Oberflächenrauhigkeit - - - Frequency - Frequenz - - - Line Width - Leitungsbreite - - - Line Length - Leitungslänge - - - Characteristic Impedance - Charakteristische Impedanz - - - Electrical Length - Elektrische Länge - - - Conductivity of Metal - Leitfähigkeit des Metalls - - - Magnetic Loss Tangent - Magnetischer Verlustwinkel - - - Width of Waveguide - Breite des Wellenleiters - - - Height of Waveguide - Höhe des Wellenleiters - - - Waveguide Length - Wellenleiterlänge - - - Inner Diameter - Innerer Durchmesser - - - Outer Diameter - Äußerer Durchmesser - - - Length - Länge - - - Gap Width - Spaltbreite - - - Even-Mode Impedance - Gleichtaktimpedanz - - - Odd-Mode Impedance - Gegentaktimpedanz - - - Selected for Calculation - Ausgewählt für die Berechnung - - - Check item for Calculation - Anklicken für die Berechnung - - - About... - Über... -======= @@ -19990,7 +12846,7 @@ open files with an appropriate program. &Save - + &Speichern Options @@ -20038,15 +12894,15 @@ open files with an appropriate program. &Help - + &Hilfe About - + Über &File - + &Datei &Execute @@ -20267,196 +13123,35 @@ open files with an appropriate program. About... ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Transmission Line Calculator for Qucs -<<<<<<< HEAD - Leitungsberechner für Qucs - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Copyright (C) 2001 by Gopal Narayanan -<<<<<<< HEAD - Copyright (C) 2001 von Gopal Narayanan - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Copyright (C) 2002 by Claudio Girardi -<<<<<<< HEAD - Copyright (C) 2002 von Claudio Girardi - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Copyright (C) 2005 by Stefan Jahn -<<<<<<< HEAD - Copyright (C) 2005 von Stefan Jahn -======= Copyright (C) 2008 by Michael Margraf Copyright (C) 2008 by Michael Margraf ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Values are consistent. -<<<<<<< HEAD - Werte sind konsistent. - - - Values are inconsistent. - Werte sind inkonsistent. - - - Loading file... - Datei wird geladen... - - - Transcalc File - Transcalc Datei - - - Enter a Filename - Geben Sie einen Dateinamen ein - - - Error - Fehler - - - Cannot load file: - Datei kann nicht geladen werden: - - - Loading aborted. - Das Laden wurde abgebrochen. - - - Saving file... - Speichere Datei... - - - Cannot save file: - Datei kann nicht gespeichert werden: - - - Saving aborted. - Das Speichern wurde abgebrochen. - - - Schematic copied into clipboard. - Schaltkreis wurde in die Zwischenablage kopiert. - - - Transmission line type not available. - Leitungstyp ist nicht verfügbar. - - - ErEff - Effektives Er - - - ErEff Even - Effektives Er Gleichtakt - - - ErEff Odd - Effektives Er Gegentakt - - - Microstrip Line - Mikrostreifenleitung - - - Coplanar Waveguide - Koplanarleitung - - - Grounded Coplanar - Koplanarleitung mit Rückseitenmetallisierung - - - Copyright (C) 2008 by Michael Margraf - - Copyright (C) 2008 von Michael Margraf - - - - - - QucsView - - Insert Nodename - Knotenbezeichnung eingeben - - - Enter the label: - Bezeichnung eingeben: - - - Info - Information - - - The ground potential cannot be labeled! - Massepotential kann nicht bezeichnet werden! - - - Edit Properties - Eigenschaften bearbeiten - - - power matching - Leistungsanpassung - - - Error - Fehler - - - noise matching - Rauschanpassung - - - 2-port matching - Zweitoranpassung - - - Could not load S[1,1]. - Der Datensatz S[1,1] kann nicht geladen werden. - - - Could not load S[1,2]. - Der Datensatz S[1,2] kann nicht geladen werden. - - - Could not load S[2,1]. - Der Datensatz S[2,1] kann nicht geladen werden. - - - Could not load S[2,2]. - Der Datensatz S[2,2] kann nicht geladen werden. - - - Wrong dependency! - Falsche Abhängigkeit! -======= @@ -20489,7 +13184,7 @@ open files with an appropriate program. Saving file... - + Speichere Datei... Cannot save file: @@ -20506,40 +13201,12 @@ open files with an appropriate program. Transmission line type not available. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SaveDialog Modified Files -<<<<<<< HEAD - Veränderte Dateien - - - Untitled - Unbenannt - - - Save the modified files - Veränderte Dateien speichern - - - Select files to be saved - Wählen Sie die Dateien aus, die gespeichert werden sollen - - - Abort Closing - Schließen abbrechen - - - Don't Save - Nicht speichern - - - Save Selected - Ausgewählte Dateien speichern -======= @@ -20565,35 +13232,12 @@ open files with an appropriate program. Save Selected ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Schematic Title -<<<<<<< HEAD - Titel - - - Drawn By: - Gezeichnet von: - - - Date: - Datum: - - - Revision: - Revision: - - - ERROR: Cannot create library file "%s". - FEHLER: Die Bibliotheksdatei "%1" kann nicht erstellt werden. - - - generic -======= @@ -20606,7 +13250,6 @@ open files with an appropriate program. Revision: ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -20625,25 +13268,16 @@ Edits the text file Edit Schematic -<<<<<<< HEAD Schaltplan bearbeiten Edits the schematic Bearbeitet den Schaltplan -======= - - - - Edits the schematic - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Edit Schematic Edits the schematic -<<<<<<< HEAD Schaltplan bearbeiten Bearbeitet den Schaltplan @@ -20655,124 +13289,15 @@ Bearbeitet den Schaltplan Edits the symbol for this schematic Bearbeitet das Symbol für diesen Schaltkreis -======= - - - - Edit Circuit Symbol - - - - Edits the symbol for this schematic - ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Edit Circuit Symbol Edits the symbol for this schematic -<<<<<<< HEAD Schaltkreissymol bearbeiten Bearbeitet das Symbol für diesen Schaltkreis - - - SearchDialog - - The search result contains all components whose -name contains the search string. All libraries -are included in the search. - Das Suchergebnis enthält alle Komponenten, deren -Name den Suchbegriff beinhalten. Alle Bibliotheken -werden in die Suche mit einbezogen. - - - Search string: - Suchbegriff: - - - Search - Suche - - - Close - Schließen - - - Search result - Suchergebnis - - - Search Text - Textsuche - - - Text to search for: - Text nach dem gesucht wird: - - - From cursor position - Von der aktuellen Cursorposition - - - Case sensitive - Beachte Klein-/Großschreibung - - - Whole words only - Nur ganze Wörter - - - Search backwards - Rückwärts suchen - - - Cancel - Abbrechen - - - Search... - Suchen... - - - Could not find search string! - Der Suchbegriff konnte nicht gefunden werden! - - - Text to search for - Text, nach dem gesucht wird - - - Text to replace with - Text, durch den ersetzt wird - - - Ask before replacing - Bestätigung vor dem Ersetzen - - - Replace Text - Text ersetzen - - - Replace... - Ersetzen... - - - Replace occurrence ? - Diesen Text ersetzen ? - - - Search string not found! - Der Suchtext wurde nicht gefunden! - - - Replaced %1 occurrences! - Es wurden %1 Suchtexte ersetzt! -======= - - generic @@ -20865,261 +13390,11 @@ are included in the search. Search result ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SettingsDialog -<<<<<<< HEAD - Data Display: - Datenvisualisierung: - - - Data Set: - Datensatz: - - - open data display after simulation - Öffnen der Datenvisualisierung nach Simulation - - - show Grid - Gitternetz anzeigen - - - horizontal Grid: - horizontales Gitternetz: - - - vertical Grid: - vertikales Gitternetz: - - - OK - Fertig - - - Apply - Übernehmen - - - Cancel - Abbrechen - - - Edit File Properties - Dateieigenschaften bearbeiten - - - Simulation - Simulation - - - Grid - Gitternetz - - - Frame - Rahmen - - - no Frame - kein Rahmen - - - DIN A5 landscape - DIN A5 Querformat - - - DIN A5 portrait - DIN A5 Hochformat - - - DIN A4 landscape - DIN A4 Querformat - - - DIN A4 portrait - DIN A4 Hochformat - - - DIN A3 landscape - DIN A3 Querformat - - - DIN A3 portrait - DIN A3 Hochformat - - - Letter landscape - Letter Querformat - - - Letter portrait - Letter Hochformat - - - - SimMessage - - Qucs Simulation Messages - Qucs Simulationsnachrichten - - - Progress: - Fortschritt: - - - Errors and Warnings: - Fehler und Warnungen: - - - Goto display page - Zur Anzeigeseite gehen - - - Abort simulation - Simulation abbrechen - - - Close window - Fenster schließen - - - Starting new simulation on - Starte neue Simulation am - - - at - um - - - creating netlist .... - Erzeuge Netzliste... - - - ERROR: Cannot create netlist file! -Aborted. - FEHLER: Netzlistendatei kann nicht erzeugt werden! -Abgebrochen. - - - done. - - fertig. - - - - ERROR: Simulator is still running! - FEHLER: Der Simulator läuft noch! - - - ERROR: Cannot start simulator! - FEHLER: Simulator kann nicht gestartet werden! - - - -Simulation ended on - -Simulation endete am - - - Ready. - - Fertig. - - - - -Errors occured during simulation on - -Während der Simulation sind Fehler aufgetreten am - - - Aborted. - - Abgebrochen. - - - - Output: ----------- - - - Ausgabe: ----------- - - - - - - - -Errors: --------- - - - - - -Fehler: --------- - - - - - ERROR: Cannot write netlist file! - FEHLER: Die Netzlistendatei kann nicht geschrieben werden! - - - ERROR: Cannot start QucsConv! - FEHLER: Das Programm QucsConv kann nicht gestartet werden! - - - ERROR: No time for simulation specified! - FEHLER: Für die Simulation wurde keine Zeit angegeben! - - - ERROR: Forgotten the digital simulation component? - FEHLER: Wurde die Digitalsimulationskomponente vergessen? - - - creating netlist... - Erzeuge Netzliste... - - - ERROR: Cannot copy "%1" ! - FEHLER: Die Datei "%1" kann nicht kopiert werden ! - - - ERROR: Cannot open SPICE file "%1". - FEHLER: Die SPICE-Datei "%1" kann nicht geöffnet werden. - - - Starting new simulation on %1 at %2 - Starte neue Simulation am %1 um %2 - - - done. - fertig. - - - Simulation ended on %1 at %2 - Simulation endete am %1 um %2 - - - Ready. - Fertig. - - - Errors occurred during simulation on %1 at %2 - Während der Simulation am %1 um %2 sind Fehler aufgetreten - - - Aborted. - Abgebrochen. -======= Edit File Properties @@ -21297,159 +13572,21 @@ Fehler: Aborted. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Output: ------- -<<<<<<< HEAD - Ausgabe: --------- -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Errors: ------- -<<<<<<< HEAD - Fehler: -------- - - - ERROR: Cannot create VHDL directory "%1"! - - - - ERROR: Cannot create "%1"! -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SpiceDialog -<<<<<<< HEAD - Edit Spice Component Properties - SPICE-Komponenteneigenschaften bearbeiten - - - Name: - Name: - - - File: - Datei: - - - Browse - Durchsuchen - - - Edit - Bearbeiten - - - Spice net nodes: - SPICE Netzknoten: - - - Add >> - Hinzufügen >> - - - << Remove - << Entfernen - - - Component ports: - Komponenten-Tore: - - - OK - OK - - - Apply - Übernehmen - - - Cancel - Abbrechen - - - All Files - Alle Dateien - - - Select a file - Datei auswählen - - - show file name in schematic - Anzeige des Dateinamens im Schaltplan - - - Error - Fehler - - - Cannot execute - Kann nicht ausführen - - - Info - Information - - - Converting ... - Konvertiere ... - - - QucsConv Error - QucsConv Fehler - - - SPICE netlist - SPICE Netzliste - - - Edit SPICE Component Properties - SPICE-Komponenteneigenschaften bearbeiten - - - SPICE net nodes: - SPICE Netzknoten: - - - include SPICE simulations - SPICE-Simulationen mit einbeziehen - - - Converting SPICE file "%1". - Die SPICE-Datei "%1" wird konvertiert. - - - preprocessor - Präprozessor - - - Preprocessing SPICE file "%1". - Die SPICE-Datei "%1" wird aufbereitet. - - - SPICE Preprocessor Error - SPICE-Präprozessor Fehler - - - Cannot save preprocessed SPICE file "%1". - Die aufbereitete SPICE-Datei "%1" kann nicht gespeichert werden. - - - Cannot execute "%1". - Das Programm "%1" kann nicht gestartet werden. -======= Edit SPICE Component Properties @@ -21552,65 +13689,33 @@ Fehler: QucsConv Error ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SweepDialog Bias Points -<<<<<<< HEAD - Arbeitspunkte - - - Close - Schließen -======= Close Schließen ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SymbolWidget Symbol: -<<<<<<< HEAD - Symbol: - - - ! Drag n'Drop me ! - ! Drag n'Drop mich ! -======= ! Drag n'Drop me ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d TextDoc -<<<<<<< HEAD - Error - Fehler - - - There is no selection! - Es existiert keine Auswahl! - - - Page %1 of %2 - Seite %1 von %2 - - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Edit Text Symbol @@ -21626,31 +13731,17 @@ Edits the symbol for this text document VHDL entity -<<<<<<< HEAD - VHDL-Entität - - - Inserts skeleton of VHDL entity - Fügt das Gerüst einer VHDL-Entität ein -======= Inserts skeleton of VHDL entity ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VHDL entity Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - VHDL-Entität - -Fügt das Gerüst einer VHDL-Entität ein -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Verilog module @@ -21661,59 +13752,11 @@ Fügt das Gerüst einer VHDL-Entität ein -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD - - - VASettingsDialog - - Document Settings - Dokumenteneinstellungen - - - Digital Simulation Settings - Einstellungen für die Digitalsimulation - - - Simulation - Simulation - - - Duration of Simulation: - Zeitdauer der Simulation: - - - Precompile Module - Modul vorkompilieren - - - Library Name: - Bibliotheksname: - - - Libraries: - Bibliotheken: - - - Ok - Ok - - - Cancel - Abbrechen - - - Error - Fehler -======= Octave function @@ -21746,7 +13789,6 @@ Inserts the skeleton of a Octave function Document Settings Dokumenteneinstellungen ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Code Creation Settings @@ -21797,8 +13839,6 @@ Inserts the skeleton of a Octave function -<<<<<<< HEAD -======= Ok Ok @@ -21807,7 +13847,6 @@ Inserts the skeleton of a Octave function Abbrechen ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d PNG files diff --git a/qucs/qucs_es.ts b/qucs/qucs_es.ts index 6741beb0..eaf56504 100644 --- a/qucs/qucs_es.ts +++ b/qucs/qucs_es.ts @@ -1528,8 +1528,6 @@ pero es %1! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1537,7 +1535,6 @@ pero es %1! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7196,11 +7193,7 @@ Use: qucsedit [-r] archivo HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - Componente verilog HICUM Level 0 v1.3 -======= Componente verilog HICUM Level 0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7224,19 +7217,11 @@ Use: qucsedit [-r] archivo npn HICUM L0 v1.3 -<<<<<<< HEAD - npn HICUM L0 v1.3 - - - pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 -======= npn HICUM L0 v1.3 pnp HICUM L0 v1.3 pnp HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -7267,9 +7252,6 @@ Use: qucsedit [-r] archivo -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7399,7 +7381,6 @@ Use: qucsedit [-r] archivo microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8819,13 +8800,13 @@ Selecciona todos los elementos del documento Rotates the selected component by 90° - Rota el elemento seleccionado 90º + Rota el elemento seleccionado 90º Rotate Rotates the selected component by 90° counter-clockwise - Rotar + Rotar Rota el elemento seleccionado 90º en el sentido de las agujas del reloj @@ -9991,8 +9972,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10015,7 +9994,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12799,8 +12787,6 @@ en la búsqueda. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12809,7 +12795,6 @@ en la búsqueda. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13174,17 +13159,11 @@ Inserta esqueleto de la entidad VHDL -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13199,7 +13178,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_fr.ts b/qucs/qucs_fr.ts index eaf7f05a..7d497cd1 100644 --- a/qucs/qucs_fr.ts +++ b/qucs/qucs_fr.ts @@ -1522,8 +1522,6 @@ or elle vaut %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1531,7 +1529,6 @@ or elle vaut %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7200,11 +7197,7 @@ Invocation : qucsedit [-r] fichier HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - Composant Verilog Hicum niveau 0 v1.3 -======= Composant Verilog Hicum niveau 0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7228,19 +7221,11 @@ Invocation : qucsedit [-r] fichier npn HICUM L0 v1.3 -<<<<<<< HEAD - NPN Hicum L0 v 1.3 - - - pnp HICUM L0 v1.3 - PNP Hicum L0 v 1.3 -======= NPN Hicum L0 v 1.3 pnp HICUM L0 v1.3 PNP Hicum L0 v 1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -7271,9 +7256,6 @@ Invocation : qucsedit [-r] fichier -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7403,7 +7385,6 @@ Invocation : qucsedit [-r] fichier microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8885,13 +8866,13 @@ Sélectionne tous les éléments de la page Rotates the selected component by 90° - Fait pivoter le composant sélectionné de 90° + Fait pivoter le composant sélectionné de 90° Rotate Rotates the selected component by 90° counter-clockwise - Pivoter + Pivoter Tourne le composant sélectionné de 90° dans le sens direct @@ -10051,8 +10032,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10075,7 +10054,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -13014,8 +13002,6 @@ le nom inclut le texte recherchée. La recherche est Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -13024,7 +13010,6 @@ le nom inclut le texte recherchée. La recherche est run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13384,17 +13369,11 @@ Insère un prototype d'entité VHDL -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13409,7 +13388,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_he.ts b/qucs/qucs_he.ts index ff4b1f7f..540ce2c0 100644 --- a/qucs/qucs_he.ts +++ b/qucs/qucs_he.ts @@ -1473,8 +1473,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1482,7 +1480,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7074,9 +7071,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7218,7 +7212,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8578,13 +8571,13 @@ Selects all elements of the document Rotates the selected component by 90° - מסובב את הרכיב הנבחר ב90 מעלות + מסובב את הרכיב הנבחר ב90 מעלות Rotate Rotates the selected component by 90° counter-clockwise - סובב + סובב מסובב את האלמנט הנבחר ב90 מעלות @@ -9660,8 +9653,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9684,7 +9675,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12273,8 +12273,6 @@ are included in the search. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12283,7 +12281,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -12624,17 +12621,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -12649,7 +12640,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_hu.ts b/qucs/qucs_hu.ts index 391c50fa..c32a9f78 100644 --- a/qucs/qucs_hu.ts +++ b/qucs/qucs_hu.ts @@ -1536,8 +1536,6 @@ de %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1545,7 +1543,6 @@ de %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7217,9 +7214,6 @@ Digitális szimuláció -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7361,7 +7355,6 @@ Digitális szimuláció microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8853,13 +8846,13 @@ Kijelöl minden elemet a dokumnetumban Rotates the selected component by 90° - Elforgatja a kiválasztott komponenst 90°-kal + Elforgatja a kiválasztott komponenst 90°-kal Rotate Rotates the selected component by 90° counter-clockwise - Forgatás + Forgatás Elforgatja a kiválasztott komponenst 90°-kal jobbra @@ -10029,8 +10022,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10053,7 +10044,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12911,8 +12911,6 @@ Rács megjelenítése Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12921,7 +12919,6 @@ Rács megjelenítése run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13288,17 +13285,11 @@ Váz illesztés a VHDL entitáshoz -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13313,7 +13304,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp index 5716ace2..b3d36de9 100644 --- a/qucs/qucs_init.cpp +++ b/qucs/qucs_init.cpp @@ -32,10 +32,8 @@ #include "main.h" #include "qucs.h" #include "dialogs/vtabbeddockwidget.h" -<<<<<<< HEAD -======= + #include "octave_window.h" ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // ---------------------------------------------------------- // initializes all QActions of the application @@ -410,9 +408,9 @@ void QucsApp::initActions() editRotate = new QAction(tr("Rotate"), QIconSet(QImage(QucsSettings.BitmapDir + "rotate_ccw.png")), tr("Rotate"), CTRL+Key_R, this); - editRotate->setStatusTip(tr("Rotates the selected component by 90")); + editRotate->setStatusTip(tr("Rotates the selected component by 90\B0")); editRotate->setWhatsThis( - tr("Rotate\n\nRotates the selected component by 90 counter-clockwise")); + tr("Rotate\n\nRotates the selected component by 90\B0 counter-clockwise")); editRotate->setToggleAction(true); connect(editRotate, SIGNAL(toggled(bool)), SLOT(slotEditRotate(bool))); @@ -613,8 +611,6 @@ void QucsApp::initActions() tr("Browse Window\n\nEnables/disables the browse dock window")); connect(viewBrowseDock, SIGNAL(toggled(bool)), SLOT(slotViewBrowseDock(bool))); -<<<<<<< HEAD -======= viewOctaveDock = new QAction(tr("&Octave Window"), 0, this, 0); viewOctaveDock->setToggleAction(true); viewOctaveDock->setStatusTip(tr("Shows/hides the Octave dock window")); @@ -622,7 +618,6 @@ void QucsApp::initActions() tr("Octave Window\n\nShows/hides the Octave dock window")); connect(viewOctaveDock, SIGNAL(toggled(bool)), SLOT(slotViewOctaveDock(bool))); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d helpIndex = new QAction("Help Index...", tr("Help Index..."), Key_F1, this); helpIndex->setStatusTip(tr("Index of Qucs Help")); helpIndex->setWhatsThis(tr("Help Index\n\nIndex of intern Qucs help")); @@ -754,10 +749,7 @@ void QucsApp::initMenuBar() viewToolBar->addTo(viewMenu); viewStatusBar->addTo(viewMenu); viewBrowseDock->addTo(viewMenu); -<<<<<<< HEAD -======= viewOctaveDock->addTo(viewMenu); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d helpMenu = new QPopupMenu(); // menuBar entry helpMenu helpIndex->addTo(helpMenu); @@ -928,8 +920,6 @@ void QucsApp::slotToggleDock(bool on) } // ---------------------------------------------------------- -<<<<<<< HEAD -======= // turn Octave Dock Window on or off void QucsApp::slotViewOctaveDock(bool toggle) { @@ -950,7 +940,6 @@ void QucsApp::slotToggleOctave(bool on) } // ---------------------------------------------------------- ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d void QucsApp::slotHelpAbout() { QMessageBox::about(this, tr("About..."), diff --git a/qucs/qucs_it.ts b/qucs/qucs_it.ts index 5504901f..f2841986 100644 --- a/qucs/qucs_it.ts +++ b/qucs/qucs_it.ts @@ -1651,8 +1651,6 @@ ma è %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1660,7 +1658,6 @@ ma è %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7345,11 +7342,7 @@ Usage: qucsedit [-r] file HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - Dispositivo verilog HICUM Level 0 v1.3 -======= Dispositivo verilog HICUM Level 0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7400,9 +7393,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7540,7 +7530,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8093,13 +8082,13 @@ Seleziona tutti gli elementi del documento Rotates the selected component by 90° - Ruota il componente selezionato di 90° + Ruota il componente selezionato di 90° Rotate Rotates the selected component by 90° counter-clockwise - Ruota + Ruota Ruota il componente selezionato di 90° in senso antiorario @@ -10401,8 +10390,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10425,7 +10412,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -13374,8 +13370,6 @@ sono incluse nella ricerca. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -13384,7 +13378,6 @@ sono incluse nella ricerca. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13747,17 +13740,11 @@ Inserisce scheletro entità VHDL -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13772,7 +13759,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_jp.ts b/qucs/qucs_jp.ts index 8f323eab..fd437fdd 100644 --- a/qucs/qucs_jp.ts +++ b/qucs/qucs_jp.ts @@ -1518,8 +1518,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1527,7 +1525,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7173,9 +7170,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7317,7 +7311,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8713,13 +8706,13 @@ Selects all elements of the document Rotates the selected component by 90° - 選択された部品を90°回転 + 選択された部品を90°回転 Rotate Rotates the selected component by 90° counter-clockwise - 回転 + 回転 選択された部品を時計周りに90°回転 @@ -9882,8 +9875,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9906,7 +9897,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12623,8 +12623,6 @@ are included in the search. Letter portrait Letter 縦 -<<<<<<< HEAD -======= Octave Script: @@ -12633,7 +12631,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -13000,17 +12997,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -13025,7 +13016,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_kk.ts b/qucs/qucs_kk.ts index 5e80548f..cf6885b2 100644 --- a/qucs/qucs_kk.ts +++ b/qucs/qucs_kk.ts @@ -1370,8 +1370,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1379,7 +1377,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -6878,11 +6875,7 @@ Usage: qucsedit [-r] file HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - HICUM Level 0 v1.3 Verilog-моделі -======= HICUM Level 0 v1.3 Verilog-моделі ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -6906,19 +6899,11 @@ Usage: qucsedit [-r] file npn HICUM L0 v1.3 -<<<<<<< HEAD - npn типті HICUM L0 1.3 нұсқасы {0?} - - - pnp HICUM L0 v1.3 - pnp типті HICUM L0 1.3 нұсқасы {0?} -======= npn типті HICUM L0 1.3 нұсқасы {0?} pnp HICUM L0 v1.3 pnp типті HICUM L0 1.3 нұсқасы {0?} ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -6949,9 +6934,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7081,7 +7063,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8495,13 +8476,13 @@ Selects all diagram markers of the document Rotates the selected component by 90° - Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады + Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады Rotate Rotates the selected component by 90° counter-clockwise - Бұру + Бұру Ерекшеленген компонентті сағат тіліне қарсы 90°-қа бұрады @@ -9205,8 +9186,6 @@ Trolltech Qt жайлы Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9229,7 +9208,16 @@ Trolltech Qt жайлы Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -10619,8 +10607,6 @@ are included in the search. Cancel Артқа қайтару -<<<<<<< HEAD -======= Octave Script: @@ -10629,7 +10615,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -10906,17 +10891,11 @@ VHDL объектісінің негізін қояды -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -10931,7 +10910,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_pl.ts b/qucs/qucs_pl.ts index 01bb6043..9b91ae8a 100644 --- a/qucs/qucs_pl.ts +++ b/qucs/qucs_pl.ts @@ -1525,8 +1525,6 @@ a jest %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1534,7 +1532,6 @@ a jest %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7232,11 +7229,7 @@ Stosowanie: qucsedit [-r] plik HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - komponent HICUM Level 0 v1.3 veriloga -======= komponent HICUM Level 0 v1.3 veriloga ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7260,19 +7253,11 @@ Stosowanie: qucsedit [-r] plik npn HICUM L0 v1.3 -<<<<<<< HEAD - npn HICUM L0 v1.3 - - - pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 -======= npn HICUM L0 v1.3 pnp HICUM L0 v1.3 pnp HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -7303,9 +7288,6 @@ Stosowanie: qucsedit [-r] plik -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7435,7 +7417,6 @@ Stosowanie: qucsedit [-r] plik microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8869,13 +8850,13 @@ Zaznacz wszystkie elementy w dokumencie Rotates the selected component by 90° - Obraca wybrany elelement o 90 stopni + Obraca wybrany elelement o 90 stopni Rotate Rotates the selected component by 90° counter-clockwise - Obróć + Obróć Obraca wybrany elelement o 90 stopni zgodnie z ruchem wskazówek zegara @@ -10034,8 +10015,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10058,7 +10037,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12516,73 +12504,11 @@ otworzyć ten plik odpowiednim programem. power matching dopasowanie mocy -<<<<<<< HEAD - - Error - Błąd - - - noise matching - dopasowanie szumowe - - - 2-port matching - dopasowanie dwuwrotowe - - - Could not load S[1,1]. - Nie można załadować S[1,1]. - - - Could not load S[1,2]. - Nie można załadować S[1,2]. - - - Could not load S[2,1]. - Nie można załadować S[2,1]. - - - Could not load S[2,2]. - Nie można załadować S[2,2]. - - - Wrong dependency! - Zła zależność! - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SaveDialog Modified Files -<<<<<<< HEAD - Zmienione pliki - - - Untitled - Bez nazwy - - - Save the modified files - Zapisz zmodyfikowane pliki - - - Select files to be saved - Wybierz pliki, które mają być zapisane - - - Abort Closing - Przerwij zamykanie - - - Save Selected - Zapisz zaznaczone - - - Don't Save - Nie zapisuj -======= @@ -12608,35 +12534,12 @@ otworzyć ten plik odpowiednim programem. Save Selected ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Schematic Title -<<<<<<< HEAD - Tytuł - - - Drawn By: - Stworzona przez: - - - Date: - Data: - - - Revision: - Rewizja: - - - ERROR: Cannot create library file "%s". - BŁĄD: Nie można utowrzyć biblioteki "%s". - - - generic -======= @@ -12649,7 +12552,6 @@ otworzyć ten plik odpowiednim programem. Revision: ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -12696,94 +12598,6 @@ Edytuj schemat Edits the symbol for this schematic -<<<<<<< HEAD - - - SearchDialog - - The search result contains all components whose -name contains the search string. All libraries -are included in the search. - Wyniki poszukiwań zawierają wszystkie elementy, -których nazwy zawiera szukany ciąg. W poszukiwaniach -uwzględniono wszystkie biblioteki. - - - Search string: - Szukany ciąg znaków: - - - Search - Szukaj - - - Close - Zamknij - - - Search result - Wyniki szukania - - - Search Text - Szukaj tekstu - - - From cursor position - Od pozycji kursora - - - Case sensitive - Rozróżniaj wielkość liter - - - Whole words only - Tylko całe wyrazy - - - Search backwards - Szukaj wstecz - - - Cancel - Porzuć - - - Search... - Szukaj... - - - Text to search for - Tekst do znalezienia - - - Text to replace with - Tekst do zamiany na - - - Ask before replacing - Spytaj przed zamianą - - - Replace Text - Zamień tekst - - - Replace... - Zamień... - - - Replace occurrence ? - Zamień wystąpienie ? - - - Search string not found! - Nie znaleziono szukanego ciąg znaków! - - - Replaced %1 occurrences! - Zamieniono %1 wystąpień! -======= generic @@ -12876,92 +12690,12 @@ are included in the search. Search result Wyniki szukania ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SettingsDialog Edit File Properties -<<<<<<< HEAD - Edytuj właściwości pliku - - - Data Display: - Prezentacja wyników: - - - Data Set: - Zbiór wyników: - - - open data display after simulation - otwórz prezentację wyników po symulacji - - - Simulation - Symulacja - - - show Grid - pokaż siatkę - - - horizontal Grid: - siatka pozioma: - - - vertical Grid: - siatka pionowa: - - - Grid - Siatka - - - OK - OK - - - Apply - Zastosuj - - - Cancel - Porzuć - - - Frame - Ramka - - - no Frame - bez Ramki - - - DIN A5 landscape - DIN A5 poziomo - - - DIN A5 portrait - DIN A5 pionowo - - - DIN A4 landscape - DIN A4 poziomo - - - DIN A4 portrait - DIN A4 pionowo - - - DIN A3 landscape - DIN A3 poziomo - - - DIN A3 portrait - DIN A3 pionowo -======= @@ -13031,7 +12765,6 @@ are included in the search. DIN A3 portrait ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Letter landscape @@ -13041,8 +12774,6 @@ are included in the search. Letter portrait -<<<<<<< HEAD -======= Frame @@ -13059,151 +12790,11 @@ are included in the search. Cancel Porzuć ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage Qucs Simulation Messages -<<<<<<< HEAD - Komunikaty z symulacji Qucs - - - Progress: - Postęp: - - - Errors and Warnings: - Błędy i ostrzeżenia: - - - Goto display page - Przejdź do strony wyników - - - Abort simulation - Przerwij symulację - - - Starting new simulation on - Rozpoczynanie nowej symulacji - - - at - o - - - ERROR: Simulator is still running! - BŁĄD: Symulacja ciągle w toku! - - - creating netlist .... - tworzenie netlisty ... - - - ERROR: Cannot write netlist file! - BŁĄD: Nie można zapisać netlisty! - - - ERROR: Cannot start QucsConv! - BŁĄD: Nie można uruchomić QucsConv! - - - done. - - zrobione. - - - - ERROR: Cannot start simulator! - BŁĄD: Nie mogę uruchomić symulatora! - - - Close window - Zamknij okno - - - -Simulation ended on - -Symulacja zakończona o - - - Ready. - - Gotowy. - - - - -Errors occured during simulation on - -Podczas symulacji wystąpiły błędy - - - Aborted. - - Przerwane. - - - - Output: ----------- - - - Wyjście: ----------- - - - - - - - -Errors: --------- - - - - - -Błędy: ----------- - - - - - creating netlist... - tworzenie netlisty... - - - ERROR: Cannot open SPICE file "%1". - BŁĄD: Nie można otworzyć pliku SPICE "%1". - - - Starting new simulation on %1 at %2 - Start nowej symulacji na %1 o %2 - - - done. - gotowe. - - - Simulation ended on %1 at %2 - Koniec symulacji na %1 o %2 - - - Ready. - Gotowy. - - - Errors occurred during simulation on %1 at %2 - Błędy podczas symulacji %1 o %2 - - - Aborted. - Przerwano. -======= @@ -13281,33 +12872,15 @@ Błędy: Aborted. ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Output: ------- -<<<<<<< HEAD - Wynik: ------- -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Errors: ------- -<<<<<<< HEAD - Błędy: -------- - - - ERROR: Cannot create VHDL directory "%1"! - - - - ERROR: Cannot create "%1"! -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -13315,117 +12888,6 @@ Błędy: SpiceDialog Edit SPICE Component Properties -<<<<<<< HEAD - Edytuj właściwości elementu SPICE - - - Name: - Nazwa: - - - File: - Plik: - - - Browse - Pokaż - - - Edit - Edytuj - - - show file name in schematic - pokaż nazwę pliku na schemacie - - - include SPICE simulations - dołącz symulację SPICE - - - SPICE net nodes: - węzły SPICE: - - - Add >> - Dodaj >> - - - << Remove - << Usuń - - - Component ports: - Porty elementów: - - - OK - OK - - - Apply - Zastosuj - - - Cancel - Porzuć - - - SPICE netlist - netlista w formacie SPICE - - - All Files - Wszystkie pliki - - - Select a file - Wybierz plik - - - Info - Informacja - - - Converting ... - Konwersja ... - - - Error - Błąd - - - Cannot execute - Nie można wykonać - - - QucsConv Error - Błąd QucsConv - - - Converting SPICE file "%1". - Konwersja pliku SPICE "%1". - - - preprocessor - preprocessor - - - Preprocessing SPICE file "%1". - Preprocessing SPICE file "%1". - - - SPICE Preprocessor Error - SPICE Preprocessor Error - - - Cannot save preprocessed SPICE file "%1". - Nie można zapisać pliku SPICE "%1". - - - Cannot execute "%1". - Nie mozna wykonać "%1". -======= @@ -13527,65 +12989,33 @@ Błędy: QucsConv Error ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SweepDialog Bias Points -<<<<<<< HEAD - Punkty pracy - - - Close - Zamknij -======= Close Zamknij ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SymbolWidget Symbol: -<<<<<<< HEAD - Symbol: - - - ! Drag n'Drop me ! - !Przeciągnij mnie i upuść! -======= ! Drag n'Drop me ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d TextDoc -<<<<<<< HEAD - Error - Błąd - - - There is no selection! - Nic nie wybrano! - - - Page %1 of %2 - Strona %1 z %2 - - -======= ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Edit Text Symbol @@ -13624,47 +13054,11 @@ wstawia szkielet VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD - - - VASettingsDialog - - Document Settings - Ustawienia dokumentu - - - Simulation - Symulacja - - - Duration of Simulation: - Czas trwania symulacji: - - - Library Name: - Nazwa biblioteki: - - - Ok - OK - - - Cancel - Porzuć - - - Error - Błąd -======= Octave function @@ -13697,7 +13091,6 @@ Inserts the skeleton of a Octave function Document Settings Ustawienia dokumentu ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Code Creation Settings @@ -13748,8 +13141,6 @@ Inserts the skeleton of a Octave function -<<<<<<< HEAD -======= Ok OK @@ -13758,7 +13149,6 @@ Inserts the skeleton of a Octave function Porzuć ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d PNG files diff --git a/qucs/qucs_pt.ts b/qucs/qucs_pt.ts index 58a648b9..50376976 100644 --- a/qucs/qucs_pt.ts +++ b/qucs/qucs_pt.ts @@ -1458,8 +1458,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1467,7 +1465,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Name: @@ -7085,9 +7082,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7229,7 +7223,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8362,16 +8355,6 @@ Selects all diagram markers of the document Rotate - - Rotates the selected component by 90° - - - - Rotate - -Rotates the selected component by 90° counter-clockwise - - Mirror about X Axis @@ -9162,8 +9145,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9186,7 +9167,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -10575,8 +10565,6 @@ are included in the search. Cancel Cancelar -<<<<<<< HEAD -======= Octave Script: @@ -10585,7 +10573,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -10860,17 +10847,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -10885,7 +10866,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_ro.ts b/qucs/qucs_ro.ts index 2f1babab..a83c96a1 100644 --- a/qucs/qucs_ro.ts +++ b/qucs/qucs_ro.ts @@ -1464,8 +1464,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1473,7 +1471,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7158,9 +7155,6 @@ Folosire: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7302,7 +7296,6 @@ Folosire: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8664,13 +8657,13 @@ Selectează toate elementele din document Rotates the selected component by 90° - Roteşte componenta curentă cu 90° + Roteşte componenta curentă cu 90° Rotate Rotates the selected component by 90° counter-clockwise - Roteşte + Roteşte Roteşte componenta selectată cu 90° sens antiorar @@ -9750,8 +9743,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9774,7 +9765,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12369,8 +12369,6 @@ are included in the search. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12379,7 +12377,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -12728,17 +12725,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -12753,7 +12744,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_ru.ts b/qucs/qucs_ru.ts index b68bf5a3..dda9fd88 100644 --- a/qucs/qucs_ru.ts +++ b/qucs/qucs_ru.ts @@ -1633,8 +1633,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1642,7 +1640,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7441,11 +7438,7 @@ Usage: qucsedit [-r] file HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - HICUM Level 0 v1.3 Verilog-модель -======= HICUM Level 0 v1.3 Verilog-модель ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7469,19 +7462,11 @@ Usage: qucsedit [-r] file npn HICUM L0 v1.3 -<<<<<<< HEAD - npn HICUM L0 v1.3 - - - pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 -======= npn HICUM L0 v1.3 pnp HICUM L0 v1.3 pnp HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -7512,9 +7497,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7644,7 +7626,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -9263,13 +9244,13 @@ Selects all elements of the document Rotates the selected component by 90° - Поворачивает выделенный компонент на 90° + Поворачивает выделенный компонент на 90° Rotate Rotates the selected component by 90° counter-clockwise - Повернуть + Повернуть Поворачивает выделенный компонент на 90° против часовой стрелки @@ -10405,8 +10386,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -10429,7 +10408,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -14908,8 +14896,6 @@ are included in the search. Letter portrait Letter портрет -<<<<<<< HEAD -======= Octave Script: @@ -14918,7 +14904,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -15299,17 +15284,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -15324,7 +15303,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_sv.ts b/qucs/qucs_sv.ts index b4860125..02769f02 100644 --- a/qucs/qucs_sv.ts +++ b/qucs/qucs_sv.ts @@ -1423,8 +1423,6 @@ men är nu %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1432,7 +1430,6 @@ men är nu %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7039,9 +7036,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7183,7 +7177,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8520,13 +8513,13 @@ Väljer alla element i dokumentet Rotates the selected component by 90° - Vrider den valda komponenten 90° + Vrider den valda komponenten 90° Rotate Rotates the selected component by 90° counter-clockwise - Rotera + Rotera Vrider den valda komponenten 90° motsols @@ -9638,8 +9631,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9662,7 +9653,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12473,8 +12473,6 @@ ingår i sökningen. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12483,7 +12481,6 @@ ingår i sökningen. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -12837,17 +12834,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -12862,7 +12853,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_tr.ts b/qucs/qucs_tr.ts index 65080d37..d32fd9c5 100644 --- a/qucs/qucs_tr.ts +++ b/qucs/qucs_tr.ts @@ -1438,8 +1438,6 @@ olmalı fakat şu anda %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1447,7 +1445,6 @@ olmalı fakat şu anda %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7035,11 +7032,7 @@ Kullanım: qucsedit [-r] kütük HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - HICUM Seviyesi 0 v1.3 verilog devre elemanı -======= HICUM Seviyesi 0 v1.3 verilog devre elemanı ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7063,19 +7056,11 @@ Kullanım: qucsedit [-r] kütük npn HICUM L0 v1.3 -<<<<<<< HEAD - npn HICUM L0 v1.3 - - - pnp HICUM L0 v1.3 - pnp HICUM L0 v1.3 -======= npn HICUM L0 v1.3 pnp HICUM L0 v1.3 pnp HICUM L0 v1.3 ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d HICUM Level 0 v1.2g verilog device @@ -7106,9 +7091,6 @@ Kullanım: qucsedit [-r] kütük -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7238,7 +7220,6 @@ Kullanım: qucsedit [-r] kütük microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8567,13 +8548,13 @@ Belgenin tüm bilesenlerini seçer Rotates the selected component by 90° - Seçili bilşeni 90° çevirir + Seçili bilşeni 90° çevirir Rotate Rotates the selected component by 90° counter-clockwise - Döndür + Döndür Seçili bileşeni saatin tersi yönde 90° çevirir @@ -9744,8 +9725,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9768,7 +9747,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -12564,8 +12552,6 @@ Bütün kütüphaneler aranır. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -12574,7 +12560,6 @@ Bütün kütüphaneler aranır. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -12929,17 +12914,11 @@ Bir VHDL varlığı iskeleti koyar -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -12954,7 +12933,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucs_uk.ts b/qucs/qucs_uk.ts index cb6ab85a..36deb4bf 100644 --- a/qucs/qucs_uk.ts +++ b/qucs/qucs_uk.ts @@ -1430,8 +1430,6 @@ but is %1 ! -<<<<<<< HEAD -======= OctaveWindow ERROR: Cannot start Octave! @@ -1439,7 +1437,6 @@ but is %1 ! ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d OptimizeDialog Edit Optimization Properties @@ -7030,11 +7027,7 @@ Usage: qucsedit [-r] file HICUM Level 0 v1.3 verilog device -<<<<<<< HEAD - HICUM Level 0 v1.3 Verilog-модель -======= HICUM Level 0 v1.3 Verilog-модель ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d high-injection roll-off current @@ -7085,9 +7078,6 @@ Usage: qucsedit [-r] file -<<<<<<< HEAD - microchip lange coupler -======= hybrid (unsymmetrical 3dB coupler) @@ -7225,7 +7215,6 @@ Usage: qucsedit [-r] file microstrip lange coupler ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d @@ -8240,7 +8229,7 @@ Selects all elements of the document Rotates the selected component by 90° - Повертає виділений компонент на 90° + Повертає виділений компонент на 90° Rotate @@ -9519,7 +9508,7 @@ Selects all diagram markers of the document Rotate Rotates the selected component by 90° counter-clockwise - Повернути + Повернути Повертає виділений компонент на 90° проти годинникової стрілки @@ -9853,8 +9842,6 @@ Convert data file to various file formats Cannot delete %1: "%2"! -<<<<<<< HEAD -======= Octave Scripts @@ -9877,7 +9864,16 @@ Convert data file to various file formats Shows/hides the Octave dock window ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d + + Rotates the selected component by 90B0 + + + + Rotate + +Rotates the selected component by 90B0 counter-clockwise + + QucsAttenuator @@ -11336,8 +11332,6 @@ are included in the search. Letter portrait -<<<<<<< HEAD -======= Octave Script: @@ -11346,7 +11340,6 @@ are included in the search. run script after simulation ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d SimMessage @@ -11689,17 +11682,11 @@ Inserts the skeleton of a VHDL entity -<<<<<<< HEAD - Verilog entity -======= Verilog module ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d Inserts the skeleton of a Verilog module -<<<<<<< HEAD -======= Octave function @@ -11714,7 +11701,6 @@ Inserts the skeleton of a Verilog module Inserts the skeleton of a Octave function ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d VASettingsDialog diff --git a/qucs/qucsdigi.bat b/qucs/qucsdigi.bat index 9b91ad98..ca3ca872 100644 --- a/qucs/qucsdigi.bat +++ b/qucs/qucsdigi.bat @@ -3,11 +3,7 @@ REM REM qucsdigi.bat - wrapper script for digital simulation REM -<<<<<<< HEAD -REM Copyright (C) 2005, 2006, 2009 Stefan Jahn -======= REM Copyright (C) 2005, 2006, 2009, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d REM REM This is free software; you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by @@ -25,11 +21,7 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, REM Boston, MA 02110-1301, USA. REM -<<<<<<< HEAD -if not exist "%6" goto usage -======= if "X%6"=="X" goto usage ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d set NAME=%1 set NAMEOUT=%2 diff --git a/qucs/qucsdigilib.bat b/qucs/qucsdigilib.bat index 924d8ff8..596fc1da 100644 --- a/qucs/qucsdigilib.bat +++ b/qucs/qucsdigilib.bat @@ -3,11 +3,7 @@ REM REM qucsdigilib.bat - wrapper script for digital modules and libraries REM -<<<<<<< HEAD -REM Copyright (C) 2009 Stefan Jahn -======= REM Copyright (C) 2009, 2011 Stefan Jahn ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d REM REM This is free software; you can redistribute it and/or modify REM it under the terms of the GNU General Public License as published by @@ -25,11 +21,7 @@ REM the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, REM Boston, MA 02110-1301, USA. REM -<<<<<<< HEAD -if not exist "%4" goto usage -======= if "X%4"=="X" goto usage ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d set NAME=%1 set DIR=%2 @@ -59,11 +51,7 @@ echo compiling functions... %CXX% %CXXFLAGS% -c %NAME%.cc echo copying modules to VHDL directory... -<<<<<<< HEAD -copy %NAME%.o vhdl/%LIBRARY% -======= copy %NAME%.o vhdl\%LIBRARY% > NUL ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d echo updating VHDL library... %AR% cru vhdl/lib%LIBRARY%.a vhdl/%LIBRARY%/*.o diff --git a/qucs/qucsdoc.cpp b/qucs/qucsdoc.cpp index 270bab70..78a18888 100644 --- a/qucs/qucsdoc.cpp +++ b/qucs/qucsdoc.cpp @@ -79,15 +79,11 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_) QString base = Info.baseName(true); QString ext = Info.extension(false); -<<<<<<< HEAD - DataSet = base + ".dat"; // name of the default dataset -======= if(ext == "m" || ext == "oct") SimTime = "1"; DataSet = base + ".dat"; // name of the default dataset Script = base + ".m"; // name of the default script ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(ext != "dpl") DataDisplay = base + ".dpl"; // name of default data display else { @@ -96,10 +92,7 @@ QucsDoc::QucsDoc(QucsApp *App_, const QString& Name_) } } SimOpenDpl = true; -<<<<<<< HEAD -======= SimRunScript = false; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d DocChanged = false; showBias = -1; // don't show DC bias (currently for "Schematic" only) diff --git a/qucs/qucsdoc.h b/qucs/qucsdoc.h index db3abc08..87396761 100644 --- a/qucs/qucsdoc.h +++ b/qucs/qucsdoc.h @@ -51,24 +51,16 @@ public: QString DocName; QString DataSet; // name of the default dataset QString DataDisplay; // name of the default data display -<<<<<<< HEAD -======= QString Script; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d QString SimTime; // used for VHDL simulation, but stored in datadisplay QDateTime lastSaved; float Scale; QucsApp *App; bool DocChanged; -<<<<<<< HEAD - bool SimOpenDpl; // open data display after simulation ? - int showBias; // -1=no, 0=calculation running, >0=show DC bias points -======= bool SimOpenDpl; // open data display after simulation ? bool SimRunScript; // run script after simulation ? int showBias; // -1=no, 0=calculation running, >0=show DC bias points ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d bool GridOn; int tmpPosX, tmpPosY; }; diff --git a/qucs/schematic.cpp b/qucs/schematic.cpp index 7fba450f..f2310df1 100644 --- a/qucs/schematic.cpp +++ b/qucs/schematic.cpp @@ -252,15 +252,9 @@ void Schematic::setName (const QString& Name_) if (App) App->DocumentTab->setTabLabel (this, Info.fileName ()); QString base = Info.baseName (true); -<<<<<<< HEAD - qDebug (base); - QString ext = Info.extension (false); - DataSet = base + ".dat"; -======= QString ext = Info.extension (false); DataSet = base + ".dat"; Script = base + ".m"; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if (ext != "dpl") DataDisplay = base + ".dpl"; else diff --git a/qucs/schematic_file.cpp b/qucs/schematic_file.cpp index 10e7e00f..f779d1d6 100644 --- a/qucs/schematic_file.cpp +++ b/qucs/schematic_file.cpp @@ -207,18 +207,6 @@ int Schematic::saveSymbolCpp (void) stream << " // symbol drawing code\n"; for (pp = SymbolPaints.first (); pp != 0; pp = SymbolPaints.next ()) { if (pp->Name == ".ID ") continue; -<<<<<<< HEAD - pp->Bounding (x1, y1, x2, y2); - if (x1 < xmin) xmin = x1; - if (x2 > xmax) xmax = x2; - if (y1 < ymin) ymin = y1; - if (y2 > ymax) ymax = y2; - if (pp->Name == ".PortSym ") { - if (((PortSymbol*)pp)->numberStr.toInt() > maxNum) - maxNum = ((PortSymbol*)pp)->numberStr.toInt(); - continue; - } -======= if (pp->Name == ".PortSym ") { if (((PortSymbol*)pp)->numberStr.toInt() > maxNum) maxNum = ((PortSymbol*)pp)->numberStr.toInt(); @@ -235,7 +223,6 @@ int Schematic::saveSymbolCpp (void) if (x2 > xmax) xmax = x2; if (y1 < ymin) ymin = y1; if (y2 > ymax) ymax = y2; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d stream << " " << pp->saveCpp () << "\n"; } @@ -292,11 +279,8 @@ int Schematic::saveDocument() stream << " \n"; stream << " \n"; stream << " \n"; -<<<<<<< HEAD -======= stream << " \n"; stream << " \n"; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d stream << " \n"; QString t; @@ -396,13 +380,10 @@ bool Schematic::loadProperties(QTextStream *stream) else if(cstr == "OpenDisplay") if(nstr.toInt(&ok) == 0) SimOpenDpl = false; else SimOpenDpl = true; -<<<<<<< HEAD -======= else if(cstr == "Script") Script = nstr; else if(cstr == "RunScript") if(nstr.toInt(&ok) == 0) SimRunScript = false; else SimRunScript = true; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d else if(cstr == "showFrame") showFrame = nstr.at(0).latin1() - '0'; else if(cstr == "FrameText0") convert2Unicode(Frame_Text0 = nstr); @@ -1376,7 +1357,7 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QTextEdit *ErrText, for(pc = DocComps.first(); pc != 0; pc = DocComps.next()) { if(pc->Model != "Eqn") { s = pc->get_Verilog_Code(NumPorts); - if(s.at(0) == '') { + if(s.at(0) == '\A7') { ErrText->insert(s.mid(1)); } else (*tstream) << s; @@ -1443,7 +1424,7 @@ void Schematic::createSubNetlistPlain(QTextStream *stream, QTextEdit *ErrText, for(pc = DocComps.first(); pc != 0; pc = DocComps.next()) { if(pc->Model != "Eqn") { s = pc->get_VHDL_Code(NumPorts); - if(s.at(0) == '') { + if(s.at(0) == '\A7') { ErrText->insert(s.mid(1)); } else (*tstream) << s; @@ -1660,7 +1641,7 @@ QString Schematic::createNetlist(QTextStream& stream, int NumPorts) } else { s = pc->get_VHDL_Code(NumPorts); } - if(s.at(0) == '') return s; // return error + if(s.at(0) == '\A7') return s; // return error } stream << s; } diff --git a/qucs/syntax.cpp b/qucs/syntax.cpp index d155134a..6cfa1d66 100644 --- a/qucs/syntax.cpp +++ b/qucs/syntax.cpp @@ -73,12 +73,9 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state) // ----- current text is a string ---------------------------- else if(iString >= 0) { setFormat(iString, i-iString+1, QucsSettings.String); -<<<<<<< HEAD -======= if (language == LANG_OCTAVE) if(c == '\'') iString = -1; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(c == '"') iString = -1; continue; @@ -154,14 +151,11 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state) } continue; } -<<<<<<< HEAD -======= // ----- maybe a Octave comment ------------------------------- else if((language == LANG_OCTAVE) && (c == '%' || c == '#')) { setFormat(i, text.length()-i+1, QucsSettings.Comment); return state; } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d // ----- no special syntax yet (or anymore) -------------- else { if((language == LANG_VERILOG || language == LANG_VERILOGA) @@ -183,20 +177,12 @@ int SyntaxHighlighter::highlightParagraph(const QString& text, int state) } if (state < STATE_COMMENT) { -<<<<<<< HEAD - if(c == '\'') { -======= if(c == '\'' && language != LANG_OCTAVE) { ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d if(i > 1) if(text.at(i-2) == '\'') setFormat(i-2, 3, QucsSettings.Character); } -<<<<<<< HEAD - else if(c == '"') -======= else if(c == '"' || (c == '\'' && language == LANG_OCTAVE)) ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d iString = i; } if ((language == LANG_VERILOG || language == LANG_VERILOGA) @@ -365,8 +351,6 @@ pChar VA_List_Functions[] = {"realtime", "temperature", "vt", "display", "strobe", 0}; // --------------------------------------------------- -<<<<<<< HEAD -======= // reserved Octave words in alphabetical order pChar OCT_List_C[] = {"case", "catch", 0}; pChar OCT_List_E[] = {"else", "elseif", "end", "endfor", "endfunction", @@ -398,7 +382,6 @@ pChar OCT_List_Functions[] = {"plot", 0}; // --------------------------------------------------- ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d void SyntaxHighlighter::markWord(const QString& text, int start, int len) { pChar *List; @@ -430,12 +413,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len) case LANG_VERILOG: List = V_WordList[idx]; break; -<<<<<<< HEAD -======= case LANG_OCTAVE: List = OCT_WordList[idx]; break; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d default: List = VA_WordList[idx];; break; @@ -459,12 +439,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len) case LANG_VERILOG: List = V_List_DataTypes; break; -<<<<<<< HEAD -======= case LANG_OCTAVE: List = OCT_List_DataTypes; break; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d default: List = VA_List_DataTypes; break; @@ -527,12 +504,9 @@ void SyntaxHighlighter::markWord(const QString& text, int start, int len) case LANG_VERILOGA: List = VA_List_Functions; break; -<<<<<<< HEAD -======= case LANG_OCTAVE: List = OCT_List_Functions; break; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d default: List = 0; break; diff --git a/qucs/syntax.h b/qucs/syntax.h index f2bb9837..5351b58d 100644 --- a/qucs/syntax.h +++ b/qucs/syntax.h @@ -23,10 +23,7 @@ enum language_type { LANG_VHDL, LANG_VERILOG, LANG_VERILOGA, -<<<<<<< HEAD -======= LANG_OCTAVE, ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d }; enum textstate_type { diff --git a/qucs/textdoc.cpp b/qucs/textdoc.cpp index 13e79e13..865d0016 100644 --- a/qucs/textdoc.cpp +++ b/qucs/textdoc.cpp @@ -94,14 +94,6 @@ TextDoc::~TextDoc() void TextDoc::setLanguage (const QString& FileName) { QFileInfo Info (FileName); -<<<<<<< HEAD - if (Info.extension (false) == "vhd" || Info.extension (false) == "vhdl") - setLanguage (LANG_VHDL); - else if (Info.extension (false) == "v") - setLanguage (LANG_VERILOG); - else if (Info.extension (false) == "va") - setLanguage (LANG_VERILOGA); -======= QString ext = Info.extension (false); if (ext == "vhd" || ext == "vhdl") setLanguage (LANG_VHDL); @@ -111,7 +103,6 @@ void TextDoc::setLanguage (const QString& FileName) setLanguage (LANG_VERILOGA); else if (ext == "m" || ext == "oct") setLanguage (LANG_OCTAVE); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d else setLanguage (LANG_NONE); } @@ -200,11 +191,8 @@ void TextDoc::setName (const QString& Name_) DataSet = Info.baseName (true) + ".dat"; DataDisplay = Info.baseName (true) + ".dpl"; -<<<<<<< HEAD -======= if(Info.extension(false) == "m" || Info.extension(false) == "oct") SimTime = "1"; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } // --------------------------------------------------- @@ -240,9 +228,6 @@ void TextDoc::becomeCurrent (bool) App->insEntity->setMenuText (tr("Verilog module")); App->insEntity->setStatusTip (tr("Inserts skeleton of Verilog module")); App->insEntity->setWhatsThis ( -<<<<<<< HEAD - tr("Verilog entity\n\nInserts the skeleton of a Verilog module")); -======= tr("Verilog module\n\nInserts the skeleton of a Verilog module")); } else if (language == LANG_OCTAVE) { @@ -250,7 +235,6 @@ void TextDoc::becomeCurrent (bool) App->insEntity->setStatusTip (tr("Inserts skeleton of Octave function")); App->insEntity->setWhatsThis ( tr("Octave function\n\nInserts the skeleton of a Octave function")); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } App->simulate->setEnabled (true); App->editActivate->setEnabled (true); @@ -291,13 +275,9 @@ void TextDoc::slotSetChanged() QPopupMenu *TextDoc::createPopupMenu( const QPoint &pos ) { QPopupMenu *popup = QTextEdit::createPopupMenu( pos ); -<<<<<<< HEAD - App->fileSettings->addTo(popup); -======= if (language != LANG_OCTAVE) { App->fileSettings->addTo(popup); } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d return popup; } @@ -451,12 +431,9 @@ void TextDoc::commentSelected () case LANG_VERILOGA: co = "//"; cl = 2; break; -<<<<<<< HEAD -======= case LANG_OCTAVE: co = "%"; cl = 1; break; ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d default: co = ""; cl = 0; break; @@ -486,12 +463,9 @@ void TextDoc::insertSkeleton () else if (language == LANG_VERILOG) insert ("module ( );\ninput ;\noutput ;\nbegin\n\nend\n" "endmodule\n\n"); -<<<<<<< HEAD -======= else if (language == LANG_OCTAVE) insert ("function = ( )\n" "endfunction\n\n"); ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d } // --------------------------------------------------- @@ -513,14 +487,11 @@ QString TextDoc::getModuleName (void) VerilogA_File_Info VInfo (text ()); return VInfo.ModuleName; } -<<<<<<< HEAD -======= case LANG_OCTAVE: { QFileInfo Info (DocName); return Info.baseName (true); } ->>>>>>> 80028cb8206ee83926db69b5bd20c9a3c932403d default: return ""; }